MAGETWO-60201: Test UnsecureFunctionsUsageTest fails in case of changes in files with unsecure code

vgoncharenko · vgoncharenko · commit 05c2f2f11240 · 2016-12-01T14:58:40.000+02:00
- changes after CR
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php b/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
@@ -56,7 +56,7 @@ function (&$file) {
      * Get changed content.
      *
      * @param string $fileName
-     * @return string|null
+     * @return string
      */
     public static function getChangedContent($fileName)
     {
@@ -65,7 +65,7 @@ public static function getChangedContent($fileName)
         $changedContent = file_get_contents(BP . sprintf(self::CHANGED_FILES_CONTENT_FILE, $extension));
         $data = json_decode($changedContent, true);
 
-        return isset($data[$fileName]) ? $data[$fileName] : [];
+        return isset($data[$fileName]) ? $data[$fileName] : '';
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function (&$file) {`
`56`	`56`	`* Get changed content.`
`57`	`57`	`*`
`58`	`58`	`* @param string $fileName`
`59`		`- * @return string\|null`
	`59`	`+ * @return string`
`60`	`60`	`*/`
`61`	`61`	`public static function getChangedContent($fileName)`
`62`	`62`	`{`
`@@ -65,7 +65,7 @@ public static function getChangedContent($fileName)`
`65`	`65`	`$changedContent = file_get_contents(BP . sprintf(self::CHANGED_FILES_CONTENT_FILE, $extension));`
`66`	`66`	`$data = json_decode($changedContent, true);`
`67`	`67`
`68`		`- return isset($data[$fileName]) ? $data[$fileName] : [];`
	`68`	`+ return isset($data[$fileName]) ? $data[$fileName] : '';`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`/**`