[console] Load extend uninstall services. (#3338)

hechoendrupal · Jun 8, 2017 · 8b0c5f5 · 8b0c5f5
1 parent e01db04
commit 8b0c5f5
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/src/Bootstrap/AddServicesCompilerPass.php b/src/Bootstrap/AddServicesCompilerPass.php
@@ -60,8 +60,7 @@ public function process(ContainerBuilder $container)
         $servicesFiles = [
             $this->root. DRUPAL_CONSOLE_CORE . 'services.yml',
             $this->root. DRUPAL_CONSOLE . 'uninstall.services.yml',
-            $this->root. DRUPAL_CONSOLE . 'services.yml',
-//            $this->root. DRUPAL_CONSOLE . 'extend.console.uninstall.services.yml',
+            $this->root. DRUPAL_CONSOLE . 'services.yml'
         ];
 
         foreach ($servicesFiles as $servicesFile) {
@@ -167,20 +166,32 @@ public function process(ContainerBuilder $container)
             }
         }
 
-        $consoleExtendServicesFile = $this->root . DRUPAL_CONSOLE . '/extend.console.services.yml';
+        $extendServicesFiles = [
+            $this->root . DRUPAL_CONSOLE . 'extend.console.services.yml',
+            $this->root . DRUPAL_CONSOLE . 'extend.console.uninstall.services.yml',
+        ];
 
-        if (file_exists($consoleExtendServicesFile)) {
-            $loader->load($consoleExtendServicesFile);
+        foreach ($extendServicesFiles as $extendServicesFile) {
+            if (file_exists($extendServicesFile)) {
+                $loader->load($extendServicesFile);
+            }
         }
 
         $configurationManager = $container->get('console.configuration_manager');
         $directory = $configurationManager->getConsoleDirectory() . 'extend/';
         $autoloadFile = $directory . 'vendor/autoload.php';
         if (is_file($autoloadFile)) {
             include_once $autoloadFile;
-            $extendServicesFile = $directory . 'extend.console.services.yml';
-            if (is_file($extendServicesFile)) {
-                $loader->load($extendServicesFile);
+
+            $extendServicesFiles = [
+                $directory . 'extend.console.services.yml',
+                $directory . 'extend.console.uninstall.services.yml',
+            ];
+
+            foreach ($extendServicesFiles as $extendServicesFile) {
+                if (file_exists($extendServicesFile)) {
+                    $loader->load($extendServicesFile);
+                }
             }
         }