Merge remote-tracking branch 'trigger/MC-33780-2' into web-api-pr

Author: xmav

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

@@ -100,6 +100,7 @@ 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]));
@@ -110,6 +111,7 @@ 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]));
@@ -124,4 +126,17 @@ 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);
+        }
+    }
 }