Merge pull request #5656 from magento-trigger/web-api-pr

[Trigger] Fixes for Web-Api tests

Author: fascinosum

.travis.yml.sample

@@ -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);
+        }
+    }
 }

dev/tests/static/testsuite/Magento/Test/Integrity/HhvmCompatibilityTest.php

@@ -39,7 +39,7 @@ public function translatePatternFromGlob($path)
     protected function translateGroupsFromGlob($pattern)
     {
         preg_match_all('~\\\\\\{[^,\\}]+(?:,[^,\\}]*)*\\\\\\}~', $pattern, $matches, PREG_OFFSET_CAPTURE);
-        for ($index = count($matches[0]) - 1; $index >= 0; $index -= 1) {
+        for ($index = count($matches[0]) - 1; $index >= 0; $index--) {
             list($match, $offset) = $matches[0][$index];
             $replacement = substr_replace($match, '(?:', 0, 2);
             $replacement = substr_replace($replacement, ')', -2);
@@ -65,9 +65,9 @@ protected function translateGroupsFromGlob($pattern)
     protected function translateCharacterGroupsFromGlob($pattern)
     {
         preg_match_all('~\\\\\\[(\\\\\\!)?[^\\]]+\\\\\\]~i', $pattern, $matches, PREG_OFFSET_CAPTURE);
-        for ($index = count($matches[0]) - 1; $index >= 0; $index -= 1) {
+        for ($index = count($matches[0]) - 1; $index >= 0; $index--) {
             list($match, $offset) = $matches[0][$index];
-            $exclude = !empty($matches[1][$index]);
+            $exclude = !(empty($matches[1][$index]) || empty($matches[1][$index][0]));
             $replacement = substr_replace($match, '[' . ($exclude ? '^' : ''), 0, $exclude ? 4 : 2);
             $replacement = substr_replace($replacement, ']', -2);
             $replacement = str_replace('\\-', '-', $replacement);