Merge remote-tracking branch 'karyna/php8-compatibility/fix-static-tests-to-be-php8-compatible' into platform-health

xmav · xmav · commit 3c1118198d25 · 2021-10-04T10:32:32.000-05:00
diff --git a/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/CurlClient.php b/dev/tests/api-functional/framework/Magento/TestFramework/Authentication/Rest/CurlClient.php
@@ -13,7 +13,7 @@
 class CurlClient extends \OAuth\Common\Http\Client\CurlClient
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function retrieveResponse(
         UriInterface $endpoint,
diff --git a/dev/tests/static/framework/Magento/TestFramework/Integrity/Library/PhpParser/StaticCalls.php b/dev/tests/static/framework/Magento/TestFramework/Integrity/Library/PhpParser/StaticCalls.php
@@ -82,6 +82,13 @@ protected function getClassByStaticCall($staticCall)
     {
         $step = 1;
         $staticClassParts = [];
+
+        $token = $this->tokens->getTokenCodeByKey($staticCall - $step);
+        if ($token === T_NAME_FULLY_QUALIFIED || $token === T_NAME_QUALIFIED) {
+            return $this->tokens->getTokenValueByKey($staticCall - $step);
+        }
+
+        // PHP 7 compatibility
         while ($this->tokens->getTokenCodeByKey(
             $staticCall - $step
         ) == T_STRING || $this->tokens->getTokenCodeByKey(
@@ -90,6 +97,7 @@ protected function getClassByStaticCall($staticCall)
             $staticClassParts[] = $this->tokens->getTokenValueByKey($staticCall - $step);
             $step++;
         }
+
         return implode(array_reverse($staticClassParts));
     }
 
diff --git a/dev/tests/static/framework/Magento/TestFramework/Integrity/Library/PhpParser/Throws.php b/dev/tests/static/framework/Magento/TestFramework/Integrity/Library/PhpParser/Throws.php
@@ -57,14 +57,19 @@ public function getDependencies(Uses $uses)
             $class = '';
             if ($this->tokens->getTokenCodeByKey($throw + 2) == T_NEW) {
                 $step = 4;
-                while ($this->tokens->getTokenCodeByKey(
-                    $throw + $step
-                ) == T_STRING || $this->tokens->getTokenCodeByKey(
-                    $throw + $step
-                ) == T_NS_SEPARATOR) {
-                    $class .= trim($this->tokens->getTokenValueByKey($throw + $step));
-                    $step++;
+
+                $token = $this->tokens->getTokenCodeByKey($throw + $step);
+                if ($token === T_NAME_FULLY_QUALIFIED || $token === T_NAME_QUALIFIED) {
+                    $class = $this->tokens->getTokenValueByKey($throw + $step);
+                } else {
+                    // PHP 7 compatibility
+                    while ($this->tokens->getTokenCodeByKey($throw + $step) === T_STRING
+                        || $this->tokens->getTokenCodeByKey($throw + $step) === T_NS_SEPARATOR) {
+                        $class .= trim($this->tokens->getTokenValueByKey($throw + $step));
+                        $step++;
+                    }
                 }
+
                 if ($uses->hasUses()) {
                     $class = $uses->getClassNameWithNamespace($class);
                 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Di/CompilerTest.php
@@ -127,11 +127,9 @@ private function getPluginBlacklist(): array
             );
             $blacklistItems = [];
             foreach (glob($blacklistFiles) as $fileName) {
-                $blacklistItems = array_merge(
-                    $blacklistItems,
-                    file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)
-                );
+                $blacklistItems[] = file($fileName, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
             }
+            $blacklistItems = array_merge([], ...$blacklistItems);
             $this->pluginBlacklist = $blacklistItems;
         }
         return $this->pluginBlacklist;
@@ -243,10 +241,10 @@ protected function _phpClassesDataProvider()
         $allowedFiles = array_keys($classes);
         foreach ($classes as $class) {
             if (!in_array($class, $output)) {
-                $output = array_merge($output, $this->_buildInheritanceHierarchyTree($class, $allowedFiles));
-                $output = array_unique($output);
+                $output[] = $this->_buildInheritanceHierarchyTree($class, $allowedFiles);
             }
         }
+        $output = array_unique(array_merge([], ...$output));
 
         /** Convert data into data provider format */
         $outputClasses = [];
@@ -409,7 +407,7 @@ protected function pluginDataProvider()
                     $plugin = $node->attributes->getNamedItem('type')->nodeValue;
                     if (!in_array($plugin, $this->getPluginBlacklist())) {
                         $plugin = \Magento\Framework\App\Utility\Classes::resolveVirtualType($plugin);
-                        $plugins[] = ['plugin' => $plugin, 'intercepted type' => $type];
+                        $plugins[] = [$plugin, $type];
                     }
                 }
             }
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Magento/Framework/Api/ExtensibleInterfacesTest.php
@@ -135,9 +135,10 @@ private function checkSetExtensionAttributes(
             } else {
                 // Get the parameter name via a regular expression capture because the class may
                 // not exist which causes a fatal error
-                preg_match('/\[\s\<\w+?>\s([\w]+)/s', $methodParameters[0]->__toString(), $matches);
+                preg_match('/\[\s\<\w+?>\s([?]?[\w\\\]+)/s', $methodParameters[0]->__toString(), $matches);
                 $isCorrectParameter = false;
-                if (isset($matches[1]) && '\\' . $matches[1] != $extensionInterfaceName) {
+                if (isset($matches[1])
+                    && ('\\' . ltrim($matches[1], '?')) === $extensionInterfaceName) {
                     $isCorrectParameter = true;
                 }
 
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
@@ -11,6 +11,7 @@
 use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 use ReflectionException;
+use ReflectionMethod;
 use ReflectionParameter;
 
 /**
@@ -111,9 +112,9 @@ public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
     {
         $nonPublishedClasses = [];
         $reflection = new \ReflectionClass($class);
-        $filter = \ReflectionMethod::IS_PUBLIC;
+        $filter = ReflectionMethod::IS_PUBLIC;
         if ($reflection->isAbstract()) {
-            $filter = $filter | \ReflectionMethod::IS_PROTECTED;
+            $filter = $filter | ReflectionMethod::IS_PROTECTED;
         }
         $methods = $reflection->getMethods($filter);
         foreach ($methods as $method) {
@@ -125,8 +126,11 @@ public function testAllPHPClassesReferencedFromPublicClassesArePublic($class)
              is written on early php 7 when return types are not actively used */
             $returnTypes = [];
             if ($method->hasReturnType()) {
-                if (!$method->getReturnType()->isBuiltin()) {
-                    $returnTypes = [trim($method->getReturnType()->getName(), '?[]')];
+                $methodReturnType = $method->getReturnType();
+                // For PHP 8.0 - ReflectionUnionType doesn't have isBuiltin method.
+                if (method_exists($methodReturnType, 'isBuiltin')
+                    && !$methodReturnType->isBuiltin()) {
+                    $returnTypes = [trim($methodReturnType->getName(), '?[]')];
                 }
             } else {
                 $returnTypes = $this->getReturnTypesFromDocComment($method->getDocComment());
@@ -260,16 +264,20 @@ private function checkReturnValues($class, array $returnTypes, array $nonPublish
 
     /**
      * Check if all method parameters are public
+     *
      * @param string $class
-     * @param \ReflectionMethod $method
+     * @param ReflectionMethod $method
      * @param array $nonPublishedClasses
+     *
      * @return array
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
-    private function checkParameters($class, \ReflectionMethod $method, array $nonPublishedClasses)
+    private function checkParameters($class, ReflectionMethod $method, array $nonPublishedClasses)
     {
         /* Ignoring docblocks for argument types */
         foreach ($method->getParameters() as $parameter) {
             if ($parameter->hasType()
+                && method_exists($parameter->getType(), 'isBuiltin')
                 && !$parameter->getType()->isBuiltin()
                 && !$this->isGenerated($parameter->getType()->getName())
             ) {
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Readme/ReadmeTest.php
@@ -57,7 +57,7 @@ private function getDirectories()
         $directories = [];
         foreach ($this->scanList as $dir) {
             if (!$this->isInBlacklist($dir)) {
-                $directories[][$dir] = $dir;
+                $directories[][] = $dir;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`class CurlClient extends \OAuth\Common\Http\Client\CurlClient`
`14`	`14`	`{`
`15`	`15`	`/**`
`16`		`- * {@inheritdoc}`
	`16`	`+ * @inheritdoc`
`17`	`17`	`*/`
`18`	`18`	`public function retrieveResponse(`
`19`	`19`	`UriInterface $endpoint,`
Original file line number	Diff line number	Diff line change
`@@ -127,11 +127,9 @@ private function getPluginBlacklist(): array`
`127`	`127`	`);`
`128`	`128`	`$blacklistItems = [];`
`129`	`129`	`foreach (glob($blacklistFiles) as $fileName) {`
`130`		`- $blacklistItems = array_merge(`
`131`		`- $blacklistItems,`
`132`		`- file($fileName, FILE_IGNORE_NEW_LINES \| FILE_SKIP_EMPTY_LINES)`
`133`		`- );`
	`130`	`+ $blacklistItems[] = file($fileName, FILE_IGNORE_NEW_LINES \| FILE_SKIP_EMPTY_LINES);`
`134`	`131`	`}`
	`132`	`+ $blacklistItems = array_merge([], ...$blacklistItems);`
`135`	`133`	`$this->pluginBlacklist = $blacklistItems;`
`136`	`134`	`}`
`137`	`135`	`return $this->pluginBlacklist;`
`@@ -243,10 +241,10 @@ protected function _phpClassesDataProvider()`
`243`	`241`	`$allowedFiles = array_keys($classes);`
`244`	`242`	`foreach ($classes as $class) {`
`245`	`243`	`if (!in_array($class, $output)) {`
`246`		`- $output = array_merge($output, $this->_buildInheritanceHierarchyTree($class, $allowedFiles));`
`247`		`- $output = array_unique($output);`
	`244`	`+ $output[] = $this->_buildInheritanceHierarchyTree($class, $allowedFiles);`
`248`	`245`	`}`
`249`	`246`	`}`
	`247`	`+ $output = array_unique(array_merge([], ...$output));`
`250`	`248`
`251`	`249`	`/** Convert data into data provider format */`
`252`	`250`	`$outputClasses = [];`
`@@ -409,7 +407,7 @@ protected function pluginDataProvider()`
`409`	`407`	`$plugin = $node->attributes->getNamedItem('type')->nodeValue;`
`410`	`408`	`if (!in_array($plugin, $this->getPluginBlacklist())) {`
`411`	`409`	`$plugin = \Magento\Framework\App\Utility\Classes::resolveVirtualType($plugin);`
`412`		`- $plugins[] = ['plugin' => $plugin, 'intercepted type' => $type];`
	`410`	`+ $plugins[] = [$plugin, $type];`
`413`	`411`	`}`
`414`	`412`	`}`
`415`	`413`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ private function getDirectories()`
`57`	`57`	`$directories = [];`
`58`	`58`	`foreach ($this->scanList as $dir) {`
`59`	`59`	`if (!$this->isInBlacklist($dir)) {`
`60`		`- $directories[][$dir] = $dir;`
	`60`	`+ $directories[][] = $dir;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`