MC-16249: [CLOUD] Attachment is not opened on storefront

Author: ameysar

app/code/Magento/PageCache/Model/App/Response/HttpPlugin.php

@@ -6,6 +6,9 @@
 
 namespace Magento\PageCache\Model\App\Response;
 
+use Magento\Framework\App\PageCache\NotCacheableInterface;
+use Magento\Framework\App\Response\Http as HttpResponse;
+
 /**
  * HTTP response plugin for frontend.
  */
@@ -14,12 +17,12 @@ class HttpPlugin
     /**
      * Set proper value of X-Magento-Vary cookie.
      *
-     * @param \Magento\Framework\App\Response\Http $subject
+     * @param HttpResponse $subject
      * @return void
      */
-    public function beforeSendResponse(\Magento\Framework\App\Response\Http $subject)
+    public function beforeSendResponse(HttpResponse $subject)
     {
-        if ($subject instanceof \Magento\Framework\App\PageCache\NotCacheableInterface || headers_sent()) {
+        if ($subject instanceof NotCacheableInterface || $subject->headersSent()) {
             return;
         }
 

app/code/Magento/PageCache/Test/Unit/Model/App/Response/HttpPluginTest.php

@@ -3,76 +3,63 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
-// @codingStandardsIgnoreStart
-namespace Magento\PageCache\Model\App\Response {
-    $mockPHPFunctions = false;
+namespace Magento\PageCache\Test\Unit\Model\App\Response;
 
-    function headers_sent()
-    {
-        global $mockPHPFunctions;
-        if ($mockPHPFunctions) {
-            return false;
-        }
-
-        return call_user_func_array('\headers_sent', func_get_args());
-    }
-}
-
-namespace Magento\PageCache\Test\Unit\Model\App\Response {
-
-    use Magento\Framework\App\Response\Http;
-    use Magento\MediaStorage\Model\File\Storage\Response;
-    use Magento\PageCache\Model\App\Response\HttpPlugin;
+use Magento\Framework\App\Response\Http as HttpResponse;
+use Magento\MediaStorage\Model\File\Storage\Response as FileResponse;
+use Magento\PageCache\Model\App\Response\HttpPlugin;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
 
-    // @codingStandardsIgnoreEnd
+/**
+ * Tests \Magento\PageCache\Model\App\Response\HttpPlugin.
+ */
+class HttpPluginTest extends TestCase
+{
+    /**
+     * @var HttpPlugin
+     */
+    private $httpPlugin;
 
-    class HttpPluginTest extends \PHPUnit\Framework\TestCase
+    /**
+     * @inheritdoc
+     */
+    protected function setUp()
     {
-        /**
-         * @inheritdoc
-         */
-        protected function setUp()
-        {
-            global $mockPHPFunctions;
-            $mockPHPFunctions = true;
-        }
+        parent::setUp();
+        $this->httpPlugin = new HttpPlugin();
+    }
 
-        /**
-         * @inheritdoc
-         */
-        protected function tearDown()
-        {
-            global $mockPHPFunctions;
-            $mockPHPFunctions = false;
-        }
+    /**
+     * @param string $responseClass
+     * @param bool $headersSent
+     * @param int $sendVaryCalled
+     * @return void
+     *
+     * @dataProvider beforeSendResponseDataProvider
+     */
+    public function testBeforeSendResponse(string $responseClass, bool $headersSent, int $sendVaryCalled): void
+    {
+        /** @var HttpResponse|MockObject $responseMock */
+        $responseMock = $this->createMock($responseClass);
+        $responseMock->expects($this->any())->method('headersSent')->willReturn($headersSent);
+        $responseMock->expects($this->exactly($sendVaryCalled))->method('sendVary');
 
-        /**
-         * @param string $responseInstanceClass
-         * @param int $sendVaryCalled
-         * @return void
-         *
-         * @dataProvider beforeSendResponseDataProvider
-         */
-        public function testBeforeSendResponse(string $responseInstanceClass, int $sendVaryCalled): void
-        {
-            /** @var Http | \PHPUnit_Framework_MockObject_MockObject $responseMock */
-            $responseMock = $this->createMock($responseInstanceClass);
-            $responseMock->expects($this->exactly($sendVaryCalled))
-                ->method('sendVary');
-            $plugin = new HttpPlugin();
-            $plugin->beforeSendResponse($responseMock);
-        }
+        $this->httpPlugin->beforeSendResponse($responseMock);
+    }
 
-        /**
-         * @return array
-         */
-        public function beforeSendResponseDataProvider(): array
-        {
-            return [
-                [Http::class, 1],
-                [Response::class, 0]
-            ];
-        }
+    /**
+     * @return array
+     */
+    public function beforeSendResponseDataProvider(): array
+    {
+        return [
+            'http_response_headers_not_sent' => [HttpResponse::class, false, 1],
+            'http_response_headers_sent' => [HttpResponse::class, true, 0],
+            'file_response_headers_not_sent' => [FileResponse::class, false, 0],
+            'file_response_headers_sent' => [FileResponse::class, true, 0],
+        ];
     }
 }

dev/tests/static/testsuite/Magento/Test/Php/_files/phpstan/blacklist/common.txt

@@ -14,4 +14,3 @@ dev/tests/api-functional/testsuite/Magento/Customer/Api/AddressRepositoryTest.ph
 dev/tests/api-functional/testsuite/Magento/Framework/Model/Entity/HydratorTest.php
 dev/tests/api-functional/testsuite/Magento/Integration/Model/AdminTokenServiceTest.php
 dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php
-app/code/Magento/PageCache/Test/Unit/Model/App/Response/HttpPluginTest.php