From 05c2f2f11240e492e22f1d9e7de2b9b4a5f7b106 Mon Sep 17 00:00:00 2001
From: Vitaliy Goncharenko <vgoncharenko@magento.com>
Date: Thu, 1 Dec 2016 14:58:40 +0200
Subject: [PATCH] MAGETWO-60201: Test UnsecureFunctionsUsageTest fails in case
of changes in files with unsecure code
- changes after CR
---
.../framework/Magento/TestFramework/Utility/ChangedFiles.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php b/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
index c32078c4cdb..42b34560ae4 100644
--- a/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
+++ b/dev/tests/static/framework/Magento/TestFramework/Utility/ChangedFiles.php
@@ -56,7 +56,7 @@ class ChangedFiles
* Get changed content.
*
* @param string $fileName
- * @return string|null
+ * @return string
*/
public static function getChangedContent($fileName)
{
@@ -65,7 +65,7 @@ class ChangedFiles
$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] : '';
}
/**
--
GitLab