MAGETWO-58017: [GITHUB] Error creating configurable products in 2.1.1 #6424

Enable static content signing by default

Author: Igor Melnikov

app/code/Magento/Deploy/Console/Command/DeployStaticContentCommand.php

@@ -402,7 +402,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         if ($this->isCanBeParalleled()) {
             return $this->runProcessesInParallel($deployer, $deployableAreaThemeMap, $deployableLanguages);
         } else {
-            return $this->deploy($deployer, $deployableLanguages, $deployableAreaThemeMap);
+            return $deployer->deploy(
+                $this->objectManagerFactory,
+                $deployableLanguages,
+                $deployableAreaThemeMap
+            );
         }
     }
 
@@ -465,21 +469,6 @@ private function prepareDeployableEntities($filesUtil)
         return [$deployableLanguages, $deployableAreaThemeMap, $requestedThemes];
     }
 
-    /**
-     * @param \Magento\Deploy\Model\Deployer $deployer
-     * @param array $deployableLanguages
-     * @param array $deployableAreaThemeMap
-     * @return int
-     */
-    private function deploy($deployer, $deployableLanguages, $deployableAreaThemeMap)
-    {
-        return $deployer->deploy(
-            $this->objectManagerFactory,
-            $deployableLanguages,
-            $deployableAreaThemeMap
-        );
-    }
-
     /**
      * @param \Magento\Deploy\Model\Deployer $deployer
      * @param array $deployableAreaThemeMap
@@ -493,11 +482,23 @@ private function runProcessesInParallel($deployer, $deployableAreaThemeMap, $dep
         $processManager = $this->objectManager->create(ProcessManager::class);
         $processNumber = 0;
         $processQueue = [];
+        $staticContentVersion = time();
         foreach ($deployableAreaThemeMap as $area => &$themes) {
             foreach ($themes as $theme) {
                 foreach ($deployableLanguages as $lang) {
-                    $deployerFunc = function (Process $process) use ($area, $theme, $lang, $deployer) {
-                        return $this->deploy($deployer, [$lang], [$area => [$theme]]);
+                    $deployerFunc = function (Process $process) use (
+                        $area,
+                        $theme,
+                        $lang,
+                        $deployer,
+                        $staticContentVersion
+                    ) {
+                        return $deployer->deploy(
+                            $this->objectManagerFactory,
+                            [$lang],
+                            [$area => [$theme]],
+                            $staticContentVersion
+                        );
                     };
                     if ($processNumber >= $this->getProcessesAmount()) {
                         $processQueue[] = $deployerFunc;

app/code/Magento/Deploy/Model/Deployer.php

@@ -200,13 +200,18 @@ private function checkSkip($filePath)
      * @param ObjectManagerFactory $omFactory
      * @param array $locales
      * @param array $deployableAreaThemeMap
+     * @param int $staticContentVersion
      * @return int
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function deploy(ObjectManagerFactory $omFactory, array $locales, array $deployableAreaThemeMap = [])
-    {
+    public function deploy(
+        ObjectManagerFactory $omFactory,
+        array $locales,
+        array $deployableAreaThemeMap = [],
+        $staticContentVersion = null
+    ) {
         $this->omFactory = $omFactory;
 
         if ($this->getOption(Options::DRY_RUN)) {
@@ -215,6 +220,11 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales, array $d
         $libFiles = $this->filesUtil->getStaticLibraryFiles();
         $appFiles = $this->filesUtil->getStaticPreProcessingFiles();
 
+        $staticContentVersion = $staticContentVersion ?: time();
+        if (!$this->getOption(Options::DRY_RUN)) {
+            $this->versionStorage->save($staticContentVersion);
+        }
+
         foreach ($deployableAreaThemeMap as $area => $themes) {
             $this->emulateApplicationArea($area);
             foreach ($locales as $locale) {
@@ -319,11 +329,7 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales, array $d
             $this->output->writeln("\nSuccessful: {$this->count} files modified\n---\n");
         }
 
-        $version = (new \DateTime())->getTimestamp();
-        $this->output->writeln("New version of deployed files: {$version}");
-        if (!$this->getOption(Options::DRY_RUN)) {
-            $this->versionStorage->save($version);
-        }
+        $this->output->writeln("New version of deployed files: {$staticContentVersion}");
 
         if ($this->errorCount > 0) {
             // we must have an exit code higher than zero to indicate something was wrong