Merge pull request #245 from magento/1.1-fwd

Forward-port 1.1

Author: shiftedreality

src/Config/Source/CliSource.php

@@ -70,17 +70,29 @@ class CliSource implements SourceInterface
      * @var array
      */
     private static $enableOptionsMap = [
-        self::OPTION_PHP => [self::PHP],
+        self::OPTION_PHP => [
+            self::PHP => true
+        ],
         self::OPTION_DB => [
-            self::SERVICES_DB,
-            self::SERVICES_DB_QUOTE,
-            self::SERVICES_DB_SALES
+            self::SERVICES_DB => true,
+            self::SERVICES_DB_QUOTE => false,
+            self::SERVICES_DB_SALES => false
+        ],
+        self::OPTION_NGINX => [
+            self::SERVICES_NGINX => true
+        ],
+        self::OPTION_REDIS => [
+            self::SERVICES_REDIS => true
+        ],
+        self::OPTION_ES => [
+            self::SERVICES_ES => true
+        ],
+        self::OPTION_NODE => [
+            self::SERVICES_NODE => true
+        ],
+        self::OPTION_RABBIT_MQ => [
+            self::SERVICES_RMQ => true
         ],
-        self::OPTION_NGINX => [self::SERVICES_NGINX],
-        self::OPTION_REDIS => [self::SERVICES_REDIS],
-        self::OPTION_ES => [self::SERVICES_ES],
-        self::OPTION_NODE => [self::SERVICES_NODE],
-        self::OPTION_RABBIT_MQ => [self::SERVICES_RMQ],
     ];
 
     /**
@@ -128,13 +140,25 @@ public function read(): Repository
             ]);
         }
 
+        /**
+         * Loop through options to enable services.
+         * Each option may have one or more dependencies.
+         *
+         * The dependencies must be in sync.
+         * The dependencies which does not change status, must keep their default status.
+         */
         foreach (self::$enableOptionsMap as $option => $services) {
             if ($value = $this->input->getOption($option)) {
-                foreach ($services as $service) {
+                foreach ($services as $service => $status) {
                     $repository->set([
-                        $service . '.enabled' => true,
                         $service . '.version' => $value
                     ]);
+
+                    if ($status === true) {
+                        $repository->set([
+                            $service . '.enabled' => true
+                        ]);
+                    }
                 }
             }
         }