From 9dfaec84c3107ddcb6b412bbb508dc755e6c1b19 Mon Sep 17 00:00:00 2001
From: Olga Kopylova <okopylova@magento.com>
Date: Tue, 18 Oct 2016 16:00:12 -0500
Subject: [PATCH] MAGETWO-58691: Refactor Module_Quote, Module_Sales
- fixed static test to skip function declarations and calls to class methods
---
.../Magento/Test/Legacy/UnsecureFunctionsUsageTest.php | 4 ++--
.../Magento/Test/Legacy/_files/security/blacklist.php | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
index 52972683319..5220eb43644 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/UnsecureFunctionsUsageTest.php
@@ -64,7 +64,7 @@ class UnsecureFunctionsUsageTest extends \PHPUnit_Framework_TestCase
if ($regexp) {
$matches = preg_grep(
$regexp,
- file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
+ file($fileName)
);
if (!empty($matches)) {
foreach (array_keys($matches) as $line) {
@@ -161,7 +161,7 @@ class UnsecureFunctionsUsageTest extends \PHPUnit_Framework_TestCase
}
$regexArray = [];
foreach ($functions as $function) {
- $regexArray[] = '\b' . $function . '\b\(';
+ $regexArray[] = '(?<!function |[^\s])\b' . $function . '\b\(';
}
return '/' . implode('|', $regexArray) . '/i';
}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/blacklist.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/blacklist.php
index edcb6ab4d7f..3c93d37deba 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/blacklist.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/security/blacklist.php
@@ -6,5 +6,4 @@
return [
'Test/Unit',
'lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php',
- 'lib/internal/Magento/Framework/Serialize/SerializerInterface.php',
];
--
GitLab