[console] Tag 1.0.0-rc21 release. (#3337)

hechoendrupal · Jun 7, 2017 · e01db04 · e01db04
1 parent 843315c
commit e01db04
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -37,23 +37,24 @@
     },
     "require": {
         "php": "^5.5.9 || ^7.0",
-        "drupal/console-core" : "1.0.0-rc20",
-        "drupal/console-extend-plugin": "~0",
         "alchemy/zippy": "0.4.3",
-        "doctrine/collections":"~1.3",
         "composer/installers": "~1.0",
+        "doctrine/annotations": "1.2.*",
+        "doctrine/collections": "~1.3",
+        "drupal/console-core": "1.0.0-rc21",
+        "drupal/console-extend-plugin": "~0",
+        "gabordemooij/redbean": "~4.3",
+        "guzzlehttp/guzzle": "~6.1",
+        "psy/psysh": "0.6.* || ~0.8",
         "symfony/css-selector": ">=2.7 <3.0",
         "symfony/dom-crawler": ">=2.7 <3.3",
-        "symfony/http-foundation": ">=2.7 <3.0",
-        "guzzlehttp/guzzle": "~6.1",
-        "gabordemooij/redbean": "~4.3",
-        "doctrine/annotations": "1.2.*",
         "symfony/expression-language": ">=2.7 <3.0",
-        "psy/psysh": "0.6.* || ~0.8"
+        "symfony/http-foundation": ">=2.7 <3.0"
     },
     "bin": ["bin/drupal"],
     "config": {
-        "bin-dir": "bin/"
+        "bin-dir": "bin/",
+        "sort-packages": true
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

diff --git a/composer.lock b/composer.lock
diff --git a/src/Application.php b/src/Application.php
@@ -25,7 +25,7 @@ class Application extends BaseApplication
     /**
      * @var string
      */
-    const VERSION = '1.0.0-rc20';
+    const VERSION = '1.0.0-rc21';
 
     public function __construct(ContainerInterface $container)
     {

diff --git a/src/Bootstrap/AddServicesCompilerPass.php b/src/Bootstrap/AddServicesCompilerPass.php
@@ -57,9 +57,18 @@ public function process(ContainerBuilder $container)
             new FileLocator($this->root)
         );
 
-        $loader->load($this->root. DRUPAL_CONSOLE_CORE . 'services.yml');
-        $loader->load($this->root. DRUPAL_CONSOLE . 'uninstall.services.yml');
-        $loader->load($this->root. DRUPAL_CONSOLE . 'services.yml');
+        $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',
+        ];
+
+        foreach ($servicesFiles as $servicesFile) {
+            if (file_exists($servicesFile)) {
+                $loader->load($servicesFile);
+            }
+        }
 
         $container->get('console.configuration_manager')
             ->loadConfiguration($this->root)