[console] Update configuration file paths. (#3657)

hechoendrupal · Jan 8, 2018 · 6c809c5 · 6c809c5
1 parent 7af7c4b
commit 6c809c5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 42 deletions.
diff --git a/src/Command/ServerCommand.php b/src/Command/ServerCommand.php
@@ -77,7 +77,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
             return 1;
         }
 
-        $router = $this->getRouterPath();
+        $router = $this->configurationManager
+            ->getVendorCoreDirectory() . 'router.php';
+
         $processBuilder = new ProcessBuilder([$binary, '-S', $address, $router]);
         $processBuilder->setTimeout(null);
         $processBuilder->setWorkingDirectory($this->appRoot);
@@ -114,36 +116,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
         return 0;
     }
 
-    /**
-     * @return null|string
-     */
-    private function getRouterPath()
-    {
-        $routerPath = [
-            sprintf(
-                '%s/.console/router.php',
-                $this->configurationManager->getHomeDirectory()
-            ),
-            sprintf(
-                '%s/console/router.php',
-                $this->configurationManager->getApplicationDirectory()
-            ),
-            sprintf(
-                '%s/%s/config/dist/router.php',
-                $this->configurationManager->getApplicationDirectory(),
-                DRUPAL_CONSOLE_CORE
-            )
-        ];
-
-        foreach ($routerPath as $router) {
-            if (file_exists($router)) {
-                return $router;
-            }
-        }
-
-        return null;
-    }
-
     /**
      * @param string $address
      * @return string

diff --git a/src/Command/Site/ModeCommand.php b/src/Command/Site/ModeCommand.php
@@ -237,17 +237,8 @@ protected function processServicesFile($environment, $servicesSettings, DrupalSt
 
     protected function loadConfigurations($env)
     {
-        $configFile = sprintf(
-            '%s/.console/site.mode.yml',
-            $this->configurationManager->getHomeDirectory()
-        );
-
-        if (!file_exists($configFile)) {
-            $configFile = sprintf(
-                '%s/config/dist/site.mode.yml',
-                $this->configurationManager->getApplicationDirectory() . DRUPAL_CONSOLE_CORE
-            );
-        }
+        $configFile = $this->configurationManager
+                ->getVendorCoreDirectory() . 'site.mode.yml';
 
         $siteModeConfiguration = Yaml::parse(file_get_contents($configFile));
         $configKeys = array_keys($siteModeConfiguration);