Merge pull request #119 from magento-thunder/MAGECLOUD-1413-2

MAGECLOUD-1413: Gzip fails with exception when directory on file name contains spaces

Author: shiftedreality

src/Test/Integration/UpgradeTest.php

@@ -83,7 +83,6 @@ public function testDefault(string $fromVersion, string $toVersion)
     public function defaultDataProvider(): array
     {
         return [
-            ['^2.1', '2.2.0'],
             ['2.2.0', '^2.2'],
         ];
     }
@@ -103,6 +102,9 @@ private function assertContentPresence()
         $this->assertContains('Home Page', $pageContent, 'Check "Home Page" phrase presence');
     }
 
+    /**
+     * @param string $version
+     */
     private function updateToVersion($version)
     {
         $sandboxDir = $this->bootstrap->getSandboxDir();

src/Test/Unit/Util/StaticContentCompressorTest.php

@@ -62,7 +62,7 @@ public function testCompression()
                 $runningArray[] = [
                     $this->logicalAnd(
                         $this->stringContains('gzip -q --keep'),
-                        $this->stringContains('xargs'),
+                        $this->stringContains('-print0 | xargs -0'),
                         $this->stringContains($this->staticContentCompressor::TARGET_DIR),
                         $this->stringContains("-$i")
                     ),

src/Util/PasswordGenerator.php

@@ -37,7 +37,7 @@ public function generateRandomPassword(int $length = 20) : string
         while (true) {
             $password = $this->generateRandomString($length);
             /* http://docs.magento.com/m2/ee/user_guide/stores/admin-signin.html
-             *	An Admin password must be seven or more characters long, and include both letters and numbers.
+             * An Admin password must be seven or more characters long, and include both letters and numbers.
              */
             if (( preg_match('/.*[A-Za-z].*/', $password) ) && ( preg_match('/.*[\d].*/', $password) )) {
                 return $password;

src/Util/StaticContentCompressor.php

@@ -98,8 +98,8 @@ private function innerCompressionCommand(): string
     {
         return "find " . escapeshellarg(static::TARGET_DIR) . " -type f -size +300c"
             . " '(' -name '*.js' -or -name '*.css' -or -name '*.svg'"
-            . " -or -name '*.html' -or -name '*.htm' ')'"
-            . " | xargs -n100 -P16 gzip -q --keep";
+            . " -or -name '*.html' -or -name '*.htm' ')' -print0"
+            . " | xargs -0 -n100 -P16 gzip -q --keep";
     }
 
     /**