Merge remote-tracking branch 'bary/patch-1' into 2.4-develop

Author: vzabaznov

dev/tests/api-functional/testsuite/Magento/Downloadable/Api/SampleRepositoryTest.php

@@ -36,8 +36,17 @@ class SampleRepositoryTest extends WebapiAbstract
      */
     protected $deleteServiceInfo;
 
+    /**
+     * @var DomainManagerInterface
+     */
+    private $domainManager;
+
     protected function setUp(): void
     {
+        $objectManager = Bootstrap::getObjectManager();
+        $this->domainManager = $objectManager->get(DomainManagerInterface::class);
+        $this->domainManager->addDomains(['example.com']);
+
         $this->createServiceInfo = [
             'rest' => [
                 'resourcePath' => '/V1/products/downloadable-product/downloadable-links/samples',
@@ -75,6 +84,15 @@ protected function setUp(): void
         $this->testImagePath = __DIR__ . str_replace('/', DIRECTORY_SEPARATOR, '/_files/test_image.jpg');
     }
 
+    /**
+     * Remove example domain from whitelist and call parent restore configuration
+     */
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->domainManager->removeDomains(['example.com']);
+    }
+
     /**
      * Retrieve product that was updated by test
      *

lib/internal/Magento/Framework/App/DeploymentConfig/Reader.php

@@ -100,7 +100,6 @@ public function load($fileKey = null)
         if ($fileKey) {
             $filePath = $path . '/' . $this->configFilePool->getPath($fileKey);
             if ($fileDriver->isExists($filePath)) {
-                $this->refreshCache($filePath);
                 $result = include $filePath;
                 if (!is_array($result)) {
                     throw new RuntimeException(new Phrase("Invalid configuration file: '%1'", [$filePath]));
@@ -111,7 +110,6 @@ public function load($fileKey = null)
             foreach ($configFiles as $file) {
                 $configFile = $path . '/' . $file;
                 if ($fileDriver->isExists($configFile)) {
-                    $this->refreshCache($configFile);
                     $fileData = include $configFile;
                     if (!is_array($fileData)) {
                         throw new RuntimeException(new Phrase("Invalid configuration file: '%1'", [$configFile]));
@@ -126,17 +124,4 @@ public function load($fileKey = null)
         }
         return $result ?: [];
     }
-
-    /**
-     * Invalidate cache
-     *
-     * @param string $filePath
-     */
-    private function refreshCache(string $filePath): void
-    {
-        if (function_exists('opcache_invalidate')
-            && filter_var(ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN)) {
-            opcache_invalidate($filePath);
-        }
-    }
 }