MAGETWO-25088: Static Obsolete Tests Don't Recognize Partial Namespaces

Safwan Khan · Safwan Khan · commit 7a6db9ffab3a · 2015-03-19T12:24:39.000-05:00
- Correcting a QA testcase failure.
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -508,7 +508,7 @@ private function checkConstantWithClasspath($constant, $class, $replacement, $co
                 $classRegex .= '|' . preg_quote(rtrim($regexClassPartialPath, '\\'));
             }
             // Checks condition when classpath is distributed over namespace and class definition
-            $classRegexNamespaceClass = '/namespace\s+' . preg_quote('\\') . '?(' . $classRegex . ')(\s|;)(\r\n)+'
+            $classRegexNamespaceClass = '/namespace\s+' . preg_quote('\\') . '?(' . $classRegex . ')(\s|;)(\r?\n)+'
                 . 'class\s+' . preg_quote('\\') . '?(' . preg_quote(rtrim($classPartialPath, '\\')) . ')\s*/';
             $matchNamespaceClass = preg_match($classRegexNamespaceClass, $content);
             $constantRegexPartial = '/\b(?P<classWithConst>([a-zA-Z0-9_' . preg_quote('\\') . ']*))('

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ private function checkConstantWithClasspath($constant, $class, $replacement, $co`
`508`	`508`	`$classRegex .= '\|' . preg_quote(rtrim($regexClassPartialPath, '\\'));`
`509`	`509`	`}`
`510`	`510`	`// Checks condition when classpath is distributed over namespace and class definition`
`511`		`- $classRegexNamespaceClass = '/namespace\s+' . preg_quote('\\') . '?(' . $classRegex . ')(\s\|;)(\r\n)+'`
	`511`	`+ $classRegexNamespaceClass = '/namespace\s+' . preg_quote('\\') . '?(' . $classRegex . ')(\s\|;)(\r?\n)+'`
`512`	`512`	`. 'class\s+' . preg_quote('\\') . '?(' . preg_quote(rtrim($classPartialPath, '\\')) . ')\s*/';`
`513`	`513`	`$matchNamespaceClass = preg_match($classRegexNamespaceClass, $content);`
`514`	`514`	`$constantRegexPartial = '/\b(?P<classWithConst>([a-zA-Z0-9_' . preg_quote('\\') . ']*))('`