MAGECLOUD-4982: De-composed magento-cloud-patches fail to apply locally (magento#663)

* MAGECLOUD-4982: De-composed magento-cloud-patches fail to apply locally

Author: billygilbert

dist/front-static.php.dist

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Entry point for static resources (JS, CSS, etc.)
+ *
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+$_GET['resource'] = preg_replace('/^(\/static\/)(version(\d+)?\/)?|(\?.*)/', '', $_SERVER['REQUEST_URI'] ?: '');
+require realpath(__DIR__) . '/../app/bootstrap.php';
+$bootstrap = \Magento\Framework\App\Bootstrap::create(BP, $_SERVER);
+/** @var \Magento\Framework\App\StaticResource $app */
+$app = $bootstrap->createApplication(\Magento\Framework\App\StaticResource::class);
+$bootstrap->run($app);

src/Filesystem/FileList.php

@@ -119,8 +119,16 @@ public function getServicesConfig(): string
      *
      * @return string
      */
-    public function getServiceEolsConfig() : string
+    public function getServiceEolsConfig(): string
     {
         return $this->directoryList->getRoot() . '/config/eol.yaml';
     }
+
+    /**
+     * @return string
+     */
+    public function getFrontStaticDist(): string
+    {
+        return $this->directoryList->getRoot() . '/dist/front-static.php.dist';
+    }
 }

src/Step/Build/CopyPubStatic.php

@@ -9,6 +9,7 @@
 
 use Magento\MagentoCloud\Filesystem\DirectoryList;
 use Magento\MagentoCloud\Filesystem\Driver\File;
+use Magento\MagentoCloud\Filesystem\FileList;
 use Magento\MagentoCloud\Step\StepInterface;
 use Psr\Log\LoggerInterface;
 
@@ -32,19 +33,27 @@ class CopyPubStatic implements StepInterface
      */
     private $directoryList;
 
+    /**
+     * @var FileList
+     */
+    private $fileList;
+
     /**
      * @param LoggerInterface $logger
      * @param File $file
      * @param DirectoryList $directoryList
+     * @param FileList $fileList
      */
     public function __construct(
         LoggerInterface $logger,
         File $file,
-        DirectoryList $directoryList
+        DirectoryList $directoryList,
+        FileList $fileList
     ) {
         $this->logger = $logger;
         $this->file = $file;
         $this->directoryList = $directoryList;
+        $this->fileList = $fileList;
     }
 
     /**
@@ -54,16 +63,10 @@ public function execute(): void
     {
         $magentoRoot = $this->directoryList->getMagentoRoot();
 
-        if (!$this->file->isExists($magentoRoot . '/pub/static.php')) {
-            $this->logger->notice('File "static.php" was not found');
-
-            return;
-        }
-
         $this->file->copy(
-            $magentoRoot . '/pub/static.php',
+            $this->fileList->getFrontStaticDist(),
             $magentoRoot . '/pub/front-static.php'
         );
-        $this->logger->info('File "static.php" was copied');
+        $this->logger->info('File "front-static.php" was copied');
     }
 }

src/Test/Unit/Step/Build/CopyPubStaticTest.php

@@ -10,6 +10,7 @@
 use Magento\MagentoCloud\Step\Build\CopyPubStatic;
 use Magento\MagentoCloud\Filesystem\DirectoryList;
 use Magento\MagentoCloud\Filesystem\Driver\File;
+use Magento\MagentoCloud\Filesystem\FileList;
 use Magento\MagentoCloud\Step\StepException;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -40,6 +41,11 @@ class CopyPubStaticTest extends TestCase
      */
     private $directoryListMock;
 
+    /**
+     * @var FileList|MockObject
+     */
+    private $fileListMock;
+
     /**
      * @inheritDoc
      */
@@ -48,14 +54,16 @@ protected function setUp(): void
         $this->fileMock = $this->createMock(File::class);
         $this->loggerMock = $this->getMockForAbstractClass(LoggerInterface::class);
         $this->directoryListMock = $this->createMock(DirectoryList::class);
+        $this->fileListMock = $this->createMock(FileList::class);
 
         $this->directoryListMock->method('getMagentoRoot')
             ->willReturn('magento_root');
 
         $this->step = new CopyPubStatic(
             $this->loggerMock,
             $this->fileMock,
-            $this->directoryListMock
+            $this->directoryListMock,
+            $this->fileListMock
         );
     }
 
@@ -64,20 +72,21 @@ protected function setUp(): void
      */
     public function testExecute(): void
     {
-        $this->fileMock->expects($this->once())
-            ->method('isExists')
-            ->with('magento_root/pub/static.php')
-            ->willReturn(true);
+        $frontStaticDistPath = 'path/dist/front-static.php.dist';
+        $this->directoryListMock->expects($this->once())
+            ->method('getMagentoRoot')
+            ->willReturn('magento_root');
+        $this->fileListMock->expects($this->once())
+            ->method('getFrontStaticDist')
+            ->willReturn($frontStaticDistPath);
         $this->fileMock->expects($this->once())
             ->method('copy')
             ->with(
-                'magento_root/pub/static.php',
+                $frontStaticDistPath,
                 'magento_root/pub/front-static.php'
             );
         $this->loggerMock->method('info')
-            ->withConsecutive(
-                ['File "static.php" was copied']
-            );
+            ->with('File "front-static.php" was copied');
 
         $this->step->execute();
     }
@@ -87,16 +96,21 @@ public function testExecute(): void
      */
     public function testExecuteNotFound(): void
     {
+        $frontStaticDistPath = 'path/dist/front-static.php.dist';
+        $this->directoryListMock->expects($this->once())
+            ->method('getMagentoRoot')
+            ->willReturn('magento_root');
+        $this->fileListMock->expects($this->once())
+            ->method('getFrontStaticDist')
+            ->willReturn($frontStaticDistPath);
         $this->fileMock->expects($this->once())
-            ->method('isExists')
-            ->with('magento_root/pub/static.php')
-            ->willReturn(false);
-        $this->fileMock->expects($this->never())
-            ->method('copy');
-        $this->loggerMock->method('notice')
-            ->withConsecutive(
-                ['File "static.php" was not found']
+            ->method('copy')
+            ->with(
+                $frontStaticDistPath,
+                'magento_root/pub/front-static.php'
             );
+        $this->loggerMock->method('info')
+            ->with('File "front-static.php" was copied');
 
         $this->step->execute();
     }