magento
diff --git a/‎composer.json
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions b/‎composer.json
Copy file name to clipboard
+4-3Lines changed: 4 additions & 3 deletions
diff --git a/‎composer.lock
Copy file name to clipboard
+366-236Lines changed: 366 additions & 236 deletions b/‎composer.lock
Copy file name to clipboard
+366-236Lines changed: 366 additions & 236 deletions
diff --git a/‎dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
Copy file name to clipboard
+33-10Lines changed: 33 additions & 10 deletions b/‎dev/tests/static/framework/Magento/CodeMessDetector/Rule/Design/CookieAndSessionMisuse.php
Copy file name to clipboard
+33-10Lines changed: 33 additions & 10 deletions
diff --git a/‎dev/tests/static/framework/Magento/TestFramework/Integrity/Library/Injectable.php
Copy file name to clipboard
+20-1Lines changed: 20 additions & 1 deletion b/‎dev/tests/static/framework/Magento/TestFramework/Integrity/Library/Injectable.php
Copy file name to clipboard
+20-1Lines changed: 20 additions & 1 deletion
diff --git a/‎dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
Copy file name to clipboard
+21-2Lines changed: 21 additions & 2 deletions b/‎dev/tests/static/testsuite/Magento/Test/Integrity/PublicCodeTest.php
Copy file name to clipboard
+21-2Lines changed: 21 additions & 2 deletions
diff --git a/‎lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
Copy file name to clipboard
+35-15Lines changed: 35 additions & 15 deletions b/‎lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php
Copy file name to clipboard
+35-15Lines changed: 35 additions & 15 deletions
diff --git a/‎lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
Copy file name to clipboard
+25-3Lines changed: 25 additions & 3 deletions b/‎lib/internal/Magento/Framework/Code/Reader/ArgumentsReader.php
Copy file name to clipboard
+25-3Lines changed: 25 additions & 3 deletions
@@ -41,7 +41,7 @@
         "laminas/laminas-crypt": "^3.4.0",
         "laminas/laminas-db": "^2.12.0",
         "laminas/laminas-dependency-plugin": "^2.1.0",
-        "laminas/laminas-di": "^2.6.1",
+        "laminas/laminas-di": "^3.2.0",
         "laminas/laminas-eventmanager": "^3.0.0",
         "laminas/laminas-feed": "^2.9.0",
         "laminas/laminas-form": "^2.10.0",
@@ -52,10 +52,11 @@
         "laminas/laminas-mail": "^2.9.0",
         "laminas/laminas-mime": "^2.5.0",
         "laminas/laminas-modulemanager": "^2.7",
-        "laminas/laminas-mvc": "~2.7.0",
+        "laminas/laminas-mvc": "^3.2.0",
+        "laminas/laminas-mvc-console": "^1.3.0",
         "laminas/laminas-serializer": "^2.7.2",
         "laminas/laminas-server": "^2.6.1",
-        "laminas/laminas-servicemanager": "^2.7.8",
+        "laminas/laminas-servicemanager": "^3.6.0",
         "laminas/laminas-session": "^2.7.3",
         "laminas/laminas-soap": "^2.7.0",
         "laminas/laminas-stdlib": "^3.2.1",
 
@@ -8,11 +8,16 @@
 
 namespace Magento\CodeMessDetector\Rule\Design;
 
+use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Framework\Stdlib\Cookie\CookieReaderInterface;
 use PDepend\Source\AST\ASTClass;
 use PHPMD\AbstractNode;
 use PHPMD\AbstractRule;
 use PHPMD\Node\ClassNode;
 use PHPMD\Rule\ClassAware;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionParameter;
 
 /**
  * Session and Cookies must be used only in HTML Presentation layer.
@@ -105,7 +110,7 @@ private function isControllerPlugin(\ReflectionClass $class): bool
         foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
             if (preg_match('/^(after|around|before).+/i', $method->getName())) {
                 try {
-                    $argument = $method->getParameters()[0]->getClass();
+                    $argument = $this->getParameterClass($method->getParameters()[0]);
                 } catch (\Throwable $exception) {
                     //Non-existing class (autogenerated perhaps) or doesn't have an argument.
                     continue;
@@ -134,7 +139,7 @@ private function isBlockPlugin(\ReflectionClass $class): bool
         foreach ($class->getMethods(\ReflectionMethod::IS_PUBLIC) as $method) {
             if (preg_match('/^(after|around|before).+/i', $method->getName())) {
                 try {
-                    $argument = $method->getParameters()[0]->getClass();
+                    $argument = $this->getParameterClass($method->getParameters()[0]);
                 } catch (\Throwable $exception) {
                     //Non-existing class (autogenerated perhaps) or doesn't have an argument.
                     continue;
@@ -164,14 +169,16 @@ 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(SessionManagerInterface::class)
+                        || $class->getName() === SessionManagerInterface::class
+                        || $class->isSubclassOf(CookieReaderInterface::class)
+                        || $class->getName() === CookieReaderInterface::class
+                    ) {
+                        return true;
                     }
                 } catch (\ReflectionException $exception) {
                     //Failed to load the argument's class information
@@ -183,6 +190,22 @@ private function doesUseRestrictedClasses(\ReflectionClass $class): bool
         return false;
     }
 
+    /**
+     * Get class by reflection parameter
+     *
+     * @param ReflectionParameter $reflectionParameter
+     * @return ReflectionClass|null
+     * @throws ReflectionException
+     */
+    private function getParameterClass(ReflectionParameter $reflectionParameter): ?ReflectionClass
+    {
+        $parameterType = $reflectionParameter->getType();
+
+        return $parameterType && !$parameterType->isBuiltin()
+            ? new ReflectionClass($parameterType->getName())
+            : null;
+    }
+
     /**
      * @inheritdoc
      *
 
@@ -8,6 +8,9 @@
 use Laminas\Code\Reflection\ClassReflection;
 use Laminas\Code\Reflection\FileReflection;
 use Laminas\Code\Reflection\ParameterReflection;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionParameter;
 
 /**
  * Provide dependencies for the file
@@ -39,7 +42,7 @@ public function getDependencies(FileReflection $fileReflection)
                 foreach ($method->getParameters() as $parameter) {
                     try {
                         /** @var ParameterReflection $parameter */
-                        $dependency = $parameter->getClass();
+                        $dependency = $this->getParameterClass($parameter);
                         if ($dependency instanceof ClassReflection) {
                             $this->dependencies[] = $dependency->getName();
                         }
@@ -56,4 +59,20 @@ public function getDependencies(FileReflection $fileReflection)
 
         return $this->dependencies;
     }
+
+    /**
+     * Get class by reflection parameter
+     *
+     * @param ReflectionParameter $reflectionParameter
+     * @return ReflectionClass|null
+     * @throws ReflectionException
+     */
+    private function getParameterClass(ReflectionParameter $reflectionParameter): ?ReflectionClass
+    {
+        $parameterType = $reflectionParameter->getType();
+
+        return $parameterType && !$parameterType->isBuiltin()
+            ? new ReflectionClass($parameterType->getName())
+            : null;
+    }
 }
@@ -6,6 +6,9 @@
 namespace Magento\Test\Integrity;
 
 use Magento\Framework\App\Utility\Files;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionParameter;
 
 /**
  * Tests @api annotated code integrity
@@ -277,7 +280,7 @@ private function checkParameters($class, \ReflectionMethod $method, array $nonPu
                 && !$parameter->getType()->isBuiltin()
                 && !$this->isGenerated($parameter->getType()->getName())
             ) {
-                $parameterClass = $parameter->getClass();
+                $parameterClass = $this->getParameterClass($parameter);
                 /*
                  * We don't want to check integrity of @api coverage of classes
                  * that belong to different vendors, because it is too complicated.
@@ -286,7 +289,7 @@ private function checkParameters($class, \ReflectionMethod $method, array $nonPu
                  *  we don't want to fail test, because Zend is considered public by default,
                  *  and we don't care if Zend classes are @api-annotated
                  */
-                if (!$parameterClass->isInternal()
+                if ($parameterClass && !$parameterClass->isInternal()
                     && $this->areClassesFromSameVendor($parameterClass->getName(), $class)
                     && !$this->isPublished($parameterClass)
                 ) {
@@ -296,4 +299,20 @@ private function checkParameters($class, \ReflectionMethod $method, array $nonPu
         }
         return $nonPublishedClasses;
     }
+
+    /**
+     * Get class by reflection parameter
+     *
+     * @param ReflectionParameter $reflectionParameter
+     * @return ReflectionClass|null
+     * @throws ReflectionException
+     */
+    private function getParameterClass(ReflectionParameter $reflectionParameter): ?ReflectionClass
+    {
+        $parameterType = $reflectionParameter->getType();
+
+        return $parameterType && !$parameterType->isBuiltin()
+            ? new ReflectionClass($parameterType->getName())
+            : null;
+    }
 }
@@ -6,6 +6,9 @@
 namespace Magento\Framework\Code\Generator;
 
 use Laminas\Code\Generator\ValueGenerator;
+use ReflectionClass;
+use ReflectionException;
+use ReflectionParameter;
 
 /**
  * Abstract entity
@@ -323,29 +326,46 @@ protected function _getNullDefaultValue()
     private function extractParameterType(
         \ReflectionParameter $parameter
     ): ?string {
+        if (!$parameter->hasType()) {
+            return null;
+        }
+
         /** @var string|null $typeName */
         $typeName = null;
-        if ($parameter->hasType()) {
-            if ($parameter->isArray()) {
-                $typeName = 'array';
-            } elseif ($parameter->getClass()) {
-                $typeName = $this->_getFullyQualifiedClassName(
-                    $parameter->getClass()->getName()
-                );
-            } elseif ($parameter->isCallable()) {
-                $typeName = 'callable';
-            } else {
-                $typeName = $parameter->getType()->getName();
-            }
 
-            if ($parameter->allowsNull()) {
-                $typeName = '?' .$typeName;
-            }
+        if ($parameter->isArray()) {
+            $typeName = 'array';
+        } elseif ($parameterClass = $this->getParameterClass($parameter)) {
+            $typeName = $this->_getFullyQualifiedClassName($parameterClass->getName());
+        } elseif ($parameter->isCallable()) {
+            $typeName = 'callable';
+        } else {
+            $typeName = $parameter->getType()->getName();
+        }
+
+        if ($parameter->allowsNull()) {
+            $typeName = '?' . $typeName;
         }
 
         return $typeName;
     }
 
+    /**
+     * Get class by reflection parameter
+     *
+     * @param ReflectionParameter $reflectionParameter
+     * @return ReflectionClass|null
+     * @throws ReflectionException
+     */
+    private function getParameterClass(ReflectionParameter $reflectionParameter): ?ReflectionClass
+    {
+        $parameterType = $reflectionParameter->getType();
+
+        return $parameterType && !$parameterType->isBuiltin()
+            ? new ReflectionClass($parameterType->getName())
+            : null;
+    }
+
     /**
      * Extract parameter default value
      *
 
@@ -5,6 +5,10 @@
  */
 namespace Magento\Framework\Code\Reader;
 
+use ReflectionClass;
+use ReflectionException;
+use ReflectionParameter;
+
 /**
  * The class arguments reader
  */
@@ -98,11 +102,13 @@ public function getConstructorArguments(\ReflectionClass $class, $groupByPositio
      */
     private function processType(\ReflectionClass $class, \Laminas\Code\Reflection\ParameterReflection $parameter)
     {
-        if ($parameter->getClass()) {
-            return NamespaceResolver::NS_SEPARATOR . $parameter->getClass()->getName();
+        $parameterClass = $this->getParameterClass($parameter);
+
+        if ($parameterClass) {
+            return NamespaceResolver::NS_SEPARATOR . $parameterClass->getName();
         }
 
-        $type =  $parameter->detectType();
+        $type = $parameter->detectType();
 
         if ($type === 'null') {
             return null;
@@ -121,6 +127,22 @@ private function processType(\ReflectionClass $class, \Laminas\Code\Reflection\P
         return $type;
     }
 
+    /**
+     * Get class by reflection parameter
+     *
+     * @param ReflectionParameter $reflectionParameter
+     * @return ReflectionClass|null
+     * @throws ReflectionException
+     */
+    private function getParameterClass(ReflectionParameter $reflectionParameter): ?ReflectionClass
+    {
+        $parameterType = $reflectionParameter->getType();
+
+        return $parameterType && !$parameterType->isBuiltin()
+            ? new ReflectionClass($parameterType->getName())
+            : null;
+    }
+
     /**
      * Get arguments of parent __construct call
      *