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

Author: ameysar

app/code/Magento/Customer/Model/CustomerRegistry.php

@@ -195,7 +195,7 @@ public function removeByEmail($customerEmail, $websiteId = null)
             $websiteId = $this->storeManager->getStore()->getWebsiteId();
         }
         $emailKey = $this->getEmailKey($customerEmail, $websiteId);
-        if ($emailKey) {
+        if (isset($this->customerRegistryByEmail[$emailKey])) {
             /** @var Customer $customer */
             $customer = $this->customerRegistryByEmail[$emailKey];
             unset($this->customerRegistryByEmail[$emailKey]);

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

@@ -19,9 +19,10 @@ class HttpPlugin
      */
     public function beforeSendResponse(\Magento\Framework\App\Response\Http $subject)
     {
-        if ($subject instanceof \Magento\Framework\App\PageCache\NotCacheableInterface) {
+        if ($subject instanceof \Magento\Framework\App\PageCache\NotCacheableInterface || headers_sent()) {
             return;
         }
+
         $subject->sendVary();
     }
 }

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

@@ -4,36 +4,75 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\PageCache\Test\Unit\Model\App\Response;
-
-use Magento\PageCache\Model\App\Response\HttpPlugin;
-
-class HttpPluginTest extends \PHPUnit\Framework\TestCase
-{
-    /**
-     * @param \Magento\Framework\App\Response\FileInterface $responseInstanceClass
-     * @param int $sendVaryCalled
-     *
-     * @dataProvider beforeSendResponseDataProvider
-     */
-    public function testBeforeSendResponse($responseInstanceClass, $sendVaryCalled)
+// @codingStandardsIgnoreStart
+namespace Magento\PageCache\Model\App\Response {
+    $mockPHPFunctions = false;
+
+    function headers_sent()
     {
-        /** @var \Magento\Framework\App\Response\Http | \PHPUnit_Framework_MockObject_MockObject $responseMock */
-        $responseMock = $this->createMock($responseInstanceClass);
-        $responseMock->expects($this->exactly($sendVaryCalled))
-            ->method('sendVary');
-        $plugin = new HttpPlugin();
-        $plugin->beforeSendResponse($responseMock);
+        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;
 
-    /**
-     * @return array
-     */
-    public function beforeSendResponseDataProvider()
+    // @codingStandardsIgnoreEnd
+
+    class HttpPluginTest extends \PHPUnit\Framework\TestCase
     {
-        return [
-            [\Magento\Framework\App\Response\Http::class, 1],
-            [\Magento\MediaStorage\Model\File\Storage\Response::class, 0]
-        ];
+        /**
+         * @inheritdoc
+         */
+        protected function setUp()
+        {
+            global $mockPHPFunctions;
+            $mockPHPFunctions = true;
+        }
+
+        /**
+         * @inheritdoc
+         */
+        protected function tearDown()
+        {
+            global $mockPHPFunctions;
+            $mockPHPFunctions = false;
+        }
+
+        /**
+         * @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);
+        }
+
+        /**
+         * @return array
+         */
+        public function beforeSendResponseDataProvider(): array
+        {
+            return [
+                [Http::class, 1],
+                [Response::class, 0]
+            ];
+        }
     }
 }

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

@@ -14,3 +14,4 @@ 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