Remove built in support for contao-manager.php b/c @aschempp insisted…

… to remove it.
contao · Nov 26, 2018 · aafb0f1 · aafb0f1
1 parent 5d27444
commit aafb0f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 30 deletions.
diff --git a/manager-bundle/src/DependencyInjection/ContaoManagerExtension.php b/manager-bundle/src/DependencyInjection/ContaoManagerExtension.php
@@ -19,14 +19,6 @@
 
 class ContaoManagerExtension extends ConfigurableExtension
 {
-    /**
-     * @var array
-     */
-    private static $managerPaths = [
-        'contao-manager.phar.php',
-        'contao-manager.php'
-    ];
-
     /**
      * {@inheritdoc}
      */
@@ -57,23 +49,18 @@ protected function loadInternal(array $mergedConfig, ContainerBuilder $container
      */
     protected function configureManagerUrlParameter(array $mergedConfig, ContainerBuilder $container): void
     {
-        $managerUrl = null;
+        $managerPath = null;
 
         if ($mergedConfig['manager_path']) {
-            $managerUrl = $mergedConfig['manager_path'];
+            $managerPath = $mergedConfig['manager_path'];
         } else {
             $projectDir = $container->getParameter('kernel.project_dir');
 
-            foreach (static::$managerPaths as $path) {
-                if (!is_file($projectDir . '/web/' . $path)) {
-                    continue;
-                }
-
-                $managerUrl = $path;
-                break;
+            if (is_file($projectDir . '/web/contao-manager.phar.php')) {
+                $managerPath = 'contao-manager.phar.php';
             }
         }
 
-        $container->setParameter('contao_manager.manager_path', $managerUrl);
+        $container->setParameter('contao_manager.manager_path', $managerPath);
     }
 }
diff --git a/manager-bundle/tests/DependencyInjection/ContaoManagerExtensionTest.php b/manager-bundle/tests/DependencyInjection/ContaoManagerExtensionTest.php
@@ -112,11 +112,9 @@ public function testRegistersTheRoutingLoader(): void
         $this->assertSame('%kernel.project_dir%', (string) $definition->getArgument(3));
     }
 
-    /**
-     * @dataProvider getDefaultManagerPaths
-     */
-    public function testDefaultContaoManagerPathIsRegisteredAutomatically(string $defaultPath): void
+    public function testDefaultContaoManagerPathIsRegisteredAutomatically(): void
     {
+        $defaultPath = 'contao-manager.phar.php';
         $container = new ContainerBuilder();
         $container->setParameter('kernel.project_dir', $this->getTempDir());
 
@@ -151,12 +149,4 @@ public function testCustomContaoManagerPathIsRegistered(): void
 
         $fs->remove($tmpDir . '/web/custom.phar.php');
     }
-
-    public function getDefaultManagerPaths(): array
-    {
-        return [
-            ['contao-manager.phar.php'],
-            ['contao-manager.php']
-        ];
-    }
 }