Merge pull request #44 from magento-thunder/MAGECLOUD-1057

MAGECLOUD-1057: Add possibility to change SCD strategy

Author: shiftedreality

src/Magento/MagentoCloud/App/Container.php

@@ -19,6 +19,7 @@
 
 /**
  * @inheritdoc
+ * @codeCoverageIgnore
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Container extends \Illuminate\Container\Container implements ContainerInterface
@@ -79,7 +80,7 @@ public function __construct(string $root, array $config)
                         $this->make(BuildProcess\ComposerDumpAutoload::class),
                         $this->make(BuildProcess\DeployStaticContent::class),
                         $this->make(BuildProcess\ClearInitDirectory::class),
-                        $this->make(BuildProcess\BackupToInitDirectory::class),
+                        $this->make(BuildProcess\BackupData::class),
                     ],
                 ]);
             });
@@ -160,13 +161,22 @@ public function __construct(string $root, array $config)
             ->give(function () {
                 return $this->makeWith(ProcessPool::class, [
                     'processes' => [
-                        $this->get(DeployProcess\DeployStaticContent\GenerateFresh::class),
+                        $this->get(DeployProcess\DeployStaticContent\Generate::class),
                     ],
                 ]);
             });
         $this->when(\Magento\MagentoCloud\Config\Build::class)
             ->needs(\Magento\MagentoCloud\Filesystem\Reader\ReaderInterface::class)
             ->give(\Magento\MagentoCloud\Config\Build\Reader::class);
+        $this->when(BuildProcess\DeployStaticContent::class)
+            ->needs(ProcessInterface::class)
+            ->give(function () {
+                return $this->makeWith(ProcessPool::class, [
+                    'processes' => [
+                        $this->get(BuildProcess\DeployStaticContent\Generate::class),
+                    ],
+                ]);
+            });
     }
 
     /**

src/Magento/MagentoCloud/Command/ConfigDump.php

@@ -17,6 +17,8 @@
  */
 class ConfigDump extends Command
 {
+    const NAME = 'dump';
+
     /**
      * @var LoggerInterface
      */
@@ -44,7 +46,7 @@ public function __construct(ProcessInterface $process, LoggerInterface $logger)
      */
     protected function configure()
     {
-        $this->setName('dump')
+        $this->setName(static::NAME)
             ->setDescription('Dump static content');
 
         parent::configure();

src/Magento/MagentoCloud/Config/Build.php

@@ -12,9 +12,11 @@
  */
 class Build
 {
-    const BUILD_OPT_SCD_EXCLUDE_THEMES = 'exclude_themes';
-    const BUILD_OPT_SCD_THREADS = 'scd_threads';
-    const BUILD_OPT_SKIP_SCD = 'skip_scd';
+    const OPT_SCD_EXCLUDE_THEMES = 'exclude_themes';
+    const OPT_SCD_THREADS = 'scd_threads';
+    const OPT_SKIP_SCD = 'skip_scd';
+    const OPT_SCD_STRATEGY = 'SCD_STRATEGY';
+    const OPT_VERBOSE_COMMANDS = 'VERBOSE_COMMANDS';
 
     /**
      * @var ReaderInterface
@@ -36,8 +38,8 @@ public function __construct(ReaderInterface $reader)
 
     /**
      * @param string $key
-     * @param mixed $default
-     * @return mixed
+     * @param string|null $default
+     * @return string|null
      */
     public function get(string $key, $default = null)
     {
@@ -53,6 +55,6 @@ public function get(string $key, $default = null)
      */
     public function getVerbosityLevel(): string
     {
-        return $this->get('VERBOSE_COMMANDS') === 'enabled' ? ' -vv ' : '';
+        return $this->get(static::OPT_VERBOSE_COMMANDS) === 'enabled' ? ' -vv ' : '';
     }
 }

src/Magento/MagentoCloud/Config/Environment.php

@@ -27,6 +27,11 @@ class Environment
     const VAL_ENABLED = 'enabled';
     const VAL_DISABLED = 'disabled';
 
+    /**
+     * Let's keep variable names same for both phases.
+     */
+    const VAR_SCD_STRATEGY = Build::OPT_SCD_STRATEGY;
+
     /**
      * @var LoggerInterface
      */
@@ -42,6 +47,11 @@ class Environment
      */
     private $directoryList;
 
+    /**
+     * @var array
+     */
+    private $data = [];
+
     /**
      * @param LoggerInterface $logger
      * @param File $file
@@ -56,8 +66,8 @@ public function __construct(LoggerInterface $logger, File $file, DirectoryList $
 
     /**
      * @param string $key
-     * @param mixed $default
-     * @return array
+     * @param string|int|null $default
+     * @return array|string|int|null
      */
     public function get(string $key, $default = null)
     {
@@ -69,19 +79,27 @@ public function get(string $key, $default = null)
      *
      * @return mixed
      */
-    public function getRoutes()
+    public function getRoutes(): array
     {
-        return $this->get('MAGENTO_CLOUD_ROUTES', []);
+        if (isset($this->data['routes'])) {
+            return $this->data['routes'];
+        }
+
+        return $this->data['routes'] = $this->get('MAGENTO_CLOUD_ROUTES', []);
     }
 
     /**
      * Get relationships information from MagentoCloud environment variable.
      *
-     * @return mixed
+     * @return array
      */
-    public function getRelationships()
+    public function getRelationships(): array
     {
-        return $this->get('MAGENTO_CLOUD_RELATIONSHIPS');
+        if (isset($this->data['relationships'])) {
+            return $this->data['relationships'];
+        }
+
+        return $this->data['relationships'] = $this->get('MAGENTO_CLOUD_RELATIONSHIPS', []);
     }
 
     /**
@@ -100,11 +118,27 @@ public function getRelationship(string $key)
     /**
      * Get custom variables from MagentoCloud environment variable.
      *
+     * @return array
+     */
+    public function getVariables(): array
+    {
+        if (isset($this->data['variables'])) {
+            return $this->data['variables'];
+        }
+
+        return $this->data['variables'] = $this->get('MAGENTO_CLOUD_VARIABLES', []);
+    }
+
+    /**
+     * Returns variable value if such variable exists otherwise return $default
+     *
+     * @param string $name
+     * @param mixed $default
      * @return mixed
      */
-    public function getVariables()
+    public function getVariable($name, $default = null)
     {
-        return $this->get('MAGENTO_CLOUD_VARIABLES');
+        return $this->getVariables()[$name] ?? $default;
     }
 
     /**
@@ -272,7 +306,7 @@ public function doCleanStaticFiles(): bool
      */
     public function getStaticDeployExcludeThemes(): string
     {
-        return $this->getVariables()['STATIC_CONTENT_EXCLUDE_THEMES'] ?? '';
+        return $this->getVariable('STATIC_CONTENT_EXCLUDE_THEMES', '');
     }
 
     /**