Merge remote-tracking branch 'origin/MAGETWO-60201' into troll_pr

dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php

@@ -60,10 +60,14 @@ class ChangedFiles
      */
     public static function getChangedContent($fileName)
     {
+        $data = [];
         $extension = self::getFileExtension($fileName);
         $fileName = ltrim(str_replace(BP, '', $fileName), DIRECTORY_SEPARATOR);
-        $changedContent = file_get_contents(BP . sprintf(self::CHANGED_FILES_CONTENT_FILE, $extension));
-        $data = json_decode($changedContent, true);
+        $changedFilesContentFile = BP . sprintf(self::CHANGED_FILES_CONTENT_FILE, $extension);
+        if (file_exists($changedFilesContentFile)) {
+            $changedContent = file_get_contents($changedFilesContentFile);
+            $data = json_decode($changedContent, true);
+        }
 
         return isset($data[$fileName]) ? $data[$fileName] : '';
     }

dev/tests/static/framework/Magento/TestFramework/Utility/FunctionDetector.php

@@ -36,22 +36,64 @@ class FunctionDetector
         $result = [];
         $regexp = $this->composeRegexp($functions);
 
-        if ($regexp) {
-            $fileContent = \Magento\TestFramework\Utility\ChangedFiles::getChangedContent($filePath);
-            $matches = preg_grep($regexp, explode("\n", $fileContent));
-            $file = file($filePath);
-            if (!empty($matches)) {
-                foreach ($matches as $line) {
-                    $actualFunctions = [];
-                    foreach ($functions as $function) {
-                        if (false !== strpos($line, $function)) {
-                            $actualFunctions[] = $function;
-                        }
+        if (!$regexp) {
+            return $result;
+        }
+
+        $fileContent = \Magento\TestFramework\Utility\ChangedFiles::getChangedContent($filePath);
+        $file = file($filePath);
+
+        return $fileContent
+            ? $this->grepChangedContent($file, $regexp, $functions, $fileContent)
+            : $this->grepFile($file, $regexp);
+    }
+
+    /**
+     * Grep only changed content.
+     *
+     * @param array $file
+     * @param string $regexp
+     * @param string[] $functions
+     * @param string $fileContent
+     * @return array
+     */
+    public function grepChangedContent(array $file, $regexp, $functions, $fileContent)
+    {
+        $result = [];
+        $matches = preg_grep($regexp, explode("\n", $fileContent));
+        if (!empty($matches)) {
+            foreach ($matches as $line) {
+                $actualFunctions = [];
+                foreach ($functions as $function) {
+                    if (false !== strpos($line, $function)) {
+                        $actualFunctions[] = $function;
                     }
-                    $result[array_search($line . "\n", $file) + 1] = $actualFunctions;
                 }
+                $result[array_search($line . "\n", $file) + 1] = $actualFunctions;
             }
         }
+
+        return $result;
+    }
+
+    /**
+     * Grep File.
+     *
+     * @param array $file
+     * @param string $regexp
+     * @return array
+     */
+    public function grepFile(array $file, $regexp)
+    {
+        $result = [];
+        array_unshift($file, '');
+        $lines = preg_grep($regexp, $file);
+        foreach ($lines as $lineNumber => $line) {
+            if (preg_match_all($regexp, $line, $matches)) {
+                $result[$lineNumber] = $matches[1];
+            }
+        }
+
         return $result;
     }
 

dev/tests/static/get_github_changes.php

@@ -56,7 +56,11 @@ function saveChangedFileContent(GitRepo $repo)
 {
     $changedFilesContentFileName = BP . Magento\TestFramework\Utility\ChangedFiles::CHANGED_FILES_CONTENT_FILE;
     foreach ($repo->getChangedContentFiles() as $key => $changedContentFile) {
-        file_put_contents(sprintf($changedFilesContentFileName, $key), json_encode($changedContentFile), FILE_APPEND);
+        $filePath = sprintf($changedFilesContentFileName, $key);
+        $oldContent = file_exists($filePath) ? file_get_contents($filePath) : '{}';
+        $oldData = json_decode($oldContent, true);
+        $data = array_merge($oldData, $changedContentFile);
+        file_put_contents($filePath, json_encode($data));
     }
 }