[console] Make loading alias, mappings, chain and config commands. (#189

)
hechoendrupal · Jul 10, 2017 · ffc9109 · ffc9109
1 parent 7e8ebb0
commit ffc9109
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 15 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -85,23 +85,35 @@ public function trans($key)
     /**
      * {@inheritdoc}
      */
-    public function doRun(InputInterface $input, OutputInterface $output) {
+    public function doRun(InputInterface $input, OutputInterface $output)
+    {
         $io = new DrupalStyle($input, $output);
         $messages = [];
         if ($commandName = $this->getCommandName($input)) {
             $this->commandName = $commandName;
         }
         $this->registerEvents();
         $this->registerExtendCommands();
-        $this->registerCommandsFromAutoWireConfiguration();
-        $this->registerChainCommands();
 
         /**
          * @var ConfigurationManager $configurationManager
          */
         $configurationManager = $this->container
             ->get('console.configuration_manager');
 
+        $config = $configurationManager->getConfiguration()
+            ->get('application.extras.config')?:'true';
+        if ($config === 'true') {
+            $this->registerCommandsFromAutoWireConfiguration();
+        }
+
+        $chains = $configurationManager->getConfiguration()
+            ->get('application.extras.chains')?:'true';
+        if ($chains === 'true') {
+            $this->registerChainCommands();
+        }
+
+
         if ($commandName && !$this->has($commandName)) {
             $config = $configurationManager->getConfiguration();
             $mappings = $config
@@ -117,8 +129,7 @@ public function doRun(InputInterface $input, OutputInterface $output) {
                 $this->add(
                     $this->find($commandNameMap)->setAliases([$commandName])
                 );
-            }
-            else {
+            } else {
                 $io->error(
                     sprintf(
                         $this->trans('application.errors.invalid-command'),
@@ -136,7 +147,7 @@ public function doRun(InputInterface $input, OutputInterface $output) {
         );
 
         if ($this->commandName != 'init' && $configurationManager->getMissingConfigurationFiles(
-            )
+        )
         ) {
             $io->warning(
                 $this->trans('application.site.errors.missing-config-file')
@@ -150,8 +161,8 @@ public function doRun(InputInterface $input, OutputInterface $output) {
         }
 
         if ($this->getCommandName(
-                $input
-            ) == 'list' && $this->container->hasParameter('console.warning')
+            $input
+        ) == 'list' && $this->container->hasParameter('console.warning')
         ) {
             $io->warning(
                 $this->trans($this->container->getParameter('console.warning'))

diff --git a/src/Utils/ConfigurationManager.php b/src/Utils/ConfigurationManager.php
@@ -93,8 +93,14 @@ public function loadConfiguration($applicationDirectory)
 
         $builder = new YamlFileConfigurationBuilder($configurationFiles);
         $this->configuration = $builder->build();
-        $this->appendCommandAliases();
-        $this->appendCommandMappings();
+        $aliases = $this->configuration->get('application.extras.alias')?:'true';
+        if ($aliases === 'true') {
+            $this->appendCommandAliases();
+        }
+        $mappings = $this->configuration->get('application.extras.mappings')?:'true';
+        if ($mappings === 'true') {
+            $this->appendCommandMappings();
+        }
 
         if ($configurationFiles) {
             $this->missingConfigurationFiles = [];
@@ -248,7 +254,7 @@ public function getConfigurationDirectories()
     /**
      * @return void
      */
-    public function appendCommandMappings()
+    private function appendCommandMappings()
     {
         $mappings = [];
         $mappingsFile = $this->applicationDirectory.DRUPAL_CONSOLE_CORE.'config/mappings.yml';
@@ -268,7 +274,7 @@ public function appendCommandMappings()
     /**
      * @return void
      */
-    public function appendCommandAliases()
+    private function appendCommandAliases()
     {
         $aliases = [];
         foreach ($this->configurationDirectories as $directory) {
@@ -344,7 +350,8 @@ public function getSites()
         return $this->sites;
     }
 
-    public function getHomeDirectory() {
+    public function getHomeDirectory()
+    {
         return Path::getHomeDirectory();
     }
 }
diff --git a/templates/core/init/config.yml.twig b/templates/core/init/config.yml.twig
@@ -3,12 +3,16 @@ application:
   language: '{{language}}'
   editor: 'vim'
   temp: '{{temp}}'
-  cache:
-    directory: 'console/cache/'
   develop: 'false'
   command: 'about'
   checked: 'false'
   clear: 'false'
+  extras:
+    alias: 'true'
+    extend: 'true'
+    config: 'true'
+    chains: 'true'
+    mappings: 'true'
   remote:
     user: 'drupal'
 #    password: 'drupal'