Use composers autoloader for path retrieval

Author: webflo

src/Bootstrap/DrupalConsoleCore.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\Console\Bootstrap;
 
+use Drupal\Console\ConsolePaths;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
@@ -17,8 +18,10 @@ class DrupalConsoleCore
      * @var string
      */
     protected $appRoot;
+
     /**
      * DrupalConsole constructor.
+     *
      * @param $root
      * @param $appRoot
      */
@@ -32,23 +35,23 @@ public function boot()
     {
         $container = new ContainerBuilder();
         $loader = new YamlFileLoader($container, new FileLocator($this->root));
-        $loader->load($this->root.DRUPAL_CONSOLE_CORE.'/services.yml');
+        $loader->load(DRUPAL_CONSOLE_CORE.'/services.yml');
         if (file_exists($this->root.'/services.yml')) {
             $loader->load('services.yml');
         }
 
-        if (file_exists($this->root.DRUPAL_CONSOLE.'/services-drupal-install.yml')) {
+        if (file_exists(DRUPAL_CONSOLE.'/services-drupal-install')) {
             $loader->load(
-                $this->root . DRUPAL_CONSOLE . '/services-drupal-install.yml'
+                DRUPAL_CONSOLE . '/services-drupal-install'
             );
         }
 
         $container->get('console.configuration_manager')
-            ->loadConfiguration($this->root)
+            ->loadConfiguration(ConsolePaths::consoleCore())
             ->getConfiguration();
 
         $container->get('console.translator_manager')
-            ->loadCoreLanguage('en', $this->root);
+            ->loadCoreLanguage('en', dirname(dirname(dirname(ConsolePaths::consoleCore()))));
 
         $container->set(
             'app.root',
@@ -59,7 +62,7 @@ public function boot()
             ->setSkeletonDirs(
                 [
                     $this->root.'/templates/',
-                    $this->root.DRUPAL_CONSOLE_CORE.'/templates/'
+                    DRUPAL_CONSOLE_CORE.'/templates/'
                 ]
             );
 

src/Command/CheckCommand.php

@@ -81,14 +81,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             if (!file_exists($phpCheckFile)) {
                 $phpCheckFile =
-                    $this->configurationManager->getApplicationDirectory().
                     DRUPAL_CONSOLE_CORE.
-                    'config/dist/phpcheck.yml';
+                    '/config/dist/phpcheck.yml';
 
                 $phpCheckFileDisplay =
-                    realpath($this->configurationManager->getApplicationDirectory()).
                     DRUPAL_CONSOLE_CORE.
-                    'config/dist/phpcheck.yml';
+                    '/config/dist/phpcheck.yml';
             }
 
             $io->newLine();

src/Command/Exclude/DrupliconCommand.php

@@ -52,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $directory = sprintf(
             '%s/templates/core/druplicon/',
-            $this->appRoot . DRUPAL_CONSOLE_CORE
+            DRUPAL_CONSOLE_CORE
         );
 
         $finder = new Finder();

src/Command/Exclude/ElephpantCommand.php

@@ -52,7 +52,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $directory = sprintf(
             '%stemplates/core/elephpant/',
-            $this->appRoot . DRUPAL_CONSOLE_CORE
+            DRUPAL_CONSOLE_CORE
         );
 
         $finder = new Finder();

src/Command/InitCommand.php

@@ -162,17 +162,15 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $finder = new Finder();
         $finder->in(
             sprintf(
-                '%s%s/config/dist/',
-                $this->configurationManager->getApplicationDirectory(),
+                '%s/config/dist/',
                 DRUPAL_CONSOLE_CORE
             )
         );
         $finder->files();
 
         foreach ($finder as $configFile) {
             $source = sprintf(
-                '%s%s/config/dist/%s',
-                $this->configurationManager->getApplicationDirectory(),
+                '%s/config/dist/%s',
                 DRUPAL_CONSOLE_CORE,
                 $configFile->getRelativePathname()
             );

src/ConsolePaths.php

@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Console\ConsolePaths.
+ */
+
+namespace Drupal\Console;
+
+use ReflectionClass;
+
+class ConsolePaths {
+
+  public static function consoleCore() {
+    return dirname(__DIR__);
+  }
+
+  public static function consoleLauncher() {
+
+  }
+
+  public static function console() {
+    $reflector = new ReflectionClass(Application::class);
+    return dirname(dirname($reflector->getFileName()));
+  }
+
+  public static function consoleTranslation($language) {
+    $path = dirname(static::consoleCore());
+    return "{$path}/console-{$language}/translations";
+  }
+
+}

src/Utils/ConfigurationManager.php

@@ -43,8 +43,8 @@ public function loadConfiguration($applicationDirectory)
 
         $files = [
             $applicationDirectory.'config.yml',
-            $applicationDirectory.DRUPAL_CONSOLE_CORE.'config.yml',
-            $applicationDirectory.DRUPAL_CONSOLE.'config.yml',
+            DRUPAL_CONSOLE_CORE.'/config.yml',
+            DRUPAL_CONSOLE.'/config.yml',
             $this->getConsoleDirectory().'config.yml',
             getcwd().'/console/config.yml',
             $applicationDirectory.'console/config.yml',
@@ -188,7 +188,7 @@ public function readDrushEquivalents($commandName)
         $equivalents = [];
         $aliasInformation = Yaml::parse(
             file_get_contents(
-                $this->applicationDirectory.DRUPAL_CONSOLE_CORE.'config/drush.yml'
+                DRUPAL_CONSOLE_CORE.'/config/drush.yml'
             )
         );
 

src/Utils/TranslatorManager.php

@@ -7,6 +7,7 @@
 
 namespace Drupal\Console\Utils;
 
+use Drupal\Console\ConsolePaths;
 use Symfony\Component\Translation\Translator;
 use Symfony\Component\Translation\Loader\YamlFileLoader;
 use Symfony\Component\Translation\Loader\ArrayLoader;
@@ -84,12 +85,7 @@ private function buildCoreLanguageDirectory(
         $language,
         $directoryRoot
     ) {
-        $coreLanguageDirectory =
-            $directoryRoot .
-            sprintf(
-                DRUPAL_CONSOLE_LANGUAGE,
-                $language
-            );
+        $coreLanguageDirectory = ConsolePaths::consoleTranslation($language);
 
         if (!is_dir($coreLanguageDirectory)) {
             return $this->buildCoreLanguageDirectory('en', $directoryRoot);

src/constants.php

@@ -1,6 +1,7 @@
 <?php
 
-define("DRUPAL_CONSOLE_CORE", "/vendor/drupal/console-core/");
+use Drupal\Console\ConsolePaths;
+
+define("DRUPAL_CONSOLE_CORE", ConsolePaths::consoleCore());
 define("DRUPAL_CONSOLE_LAUNCHER", "/vendor/drupal/console-launcher/");
-define("DRUPAL_CONSOLE", "/vendor/drupal/console/");
-define("DRUPAL_CONSOLE_LANGUAGE", "/vendor/drupal/console-%s/translations/");
+define("DRUPAL_CONSOLE", ConsolePaths::console());