PHP 8.1 compatibility

Author: sashas777

framework/Magento/TestFramework/GetParameterClassTrait.php

@@ -0,0 +1,38 @@
+<?php
+/*
+ * @author     The S Group <[email protected]>
+ * @copyright  2022  Sashas IT Support Inc. (https://www.sashas.org)
+ * @license     http://opensource.org/licenses/GPL-3.0  GNU General Public License, version 3 (GPL-3.0)
+ */
+
+namespace Magento\TestFramework;
+
+use ReflectionClass;
+use ReflectionParameter;
+
+/**
+ * Returns a reflection parameter's class if possible.
+ */
+trait GetParameterClassTrait
+{
+    /**
+     * Get class by reflection parameter
+     *
+     * @param ReflectionParameter $reflectionParameter
+     *
+     * @return ReflectionClass|null
+     * @throws ReflectionException
+     */
+    private function getParameterClass(ReflectionParameter $reflectionParameter): ?ReflectionClass
+    {
+        $parameterType = $reflectionParameter->getType();
+        // In PHP8, $parameterType could be an instance of ReflectionUnionType, which doesn't have isBuiltin method.
+        if ($parameterType !== null && method_exists($parameterType, 'isBuiltin') === false) {
+            return null;
+        }
+
+        return $parameterType && !$parameterType->isBuiltin()
+            ? new ReflectionClass($parameterType->getName())
+            : null;
+    }
+}

static/integrity/testsuite/Magento/Test/Integrity/Di/CompilerTest.php

@@ -412,7 +412,12 @@ 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];
+                        if (version_compare(PHP_VERSION, '8.0.0', '<')) {
+                            $plugins[] = ['plugin' => $plugin, 'intercepted type' => $type];
+                        } else {
+                            $plugins[] = [$plugin, $type];
+                        }
+
                     }
                 }
             }

static/phpmd/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php

@@ -13,14 +13,16 @@
 use PHPMD\AbstractRule;
 use PHPMD\Node\ClassNode;
 use PHPMD\Rule\ClassAware;
-
+use Magento\TestFramework\GetParameterClassTrait;
 /**
  * Session and Cookies must be used only in HTML Presentation layer.
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class CookieAndSessionMisuse extends AbstractRule implements ClassAware
 {
+    use GetParameterClassTrait;
+
     /**
      * Is given class a controller?
      *
@@ -164,15 +166,18 @@ private function doesUseRestrictedClasses(\ReflectionClass $class): bool
         if ($constructor) {
             foreach ($constructor->getParameters() as $argument) {
                 try {
-                    if ($class = $argument->getClass()) {
-                        if ($class->isSubclassOf(\Magento\Framework\Session\SessionManagerInterface::class)
-                            || $class->getName() === \Magento\Framework\Session\SessionManagerInterface::class
-                            || $class->isSubclassOf(\Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class)
-                            || $class->getName() === \Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class
-                        ) {
-                            return true;
-                        }
+                    $class = $this->getParameterClass($argument);
+                    if ($class === null) {
+                        continue;
                     }
+                    if ($class->isSubclassOf(\Magento\Framework\Session\SessionManagerInterface::class)
+                        || $class->getName() === \Magento\Framework\Session\SessionManagerInterface::class
+                        || $class->isSubclassOf(\Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class)
+                        || $class->getName() === \Magento\Framework\Stdlib\Cookie\CookieReaderInterface::class
+                    ) {
+                        return true;
+                    }
+
                 } catch (\ReflectionException $exception) {
                     //Failed to load the argument's class information
                     continue;

unit/framework/bootstrap.php

@@ -51,7 +51,10 @@ function ($errNo, $errStr, $errFile, $errLine) {
                 ];
 
                 $errName = isset($errorNames[$errNo]) ? $errorNames[$errNo] : "";
-
+                //PHP 8.1 compatibility
+                if ($errStr == 'auto_detect_line_endings is deprecated') {
+                    return;
+                }
                 throw new \PHPUnit\Framework\Exception(
                     sprintf("%s: %s in %s:%s.", $errName, $errStr, $errFile, $errLine),
                     $errNo