Upgrade laminas-code to 4.4.2

magento · Aug 18, 2021 · 67898d6 · 67898d6
1 parent 7e364fd
commit 67898d6
Show file tree

Hide file tree

Showing 36 changed files with 407 additions and 381 deletions.
diff --git a/composer.json b/composer.json
@@ -37,7 +37,7 @@
         "elasticsearch/elasticsearch": "~7.13.1",
         "guzzlehttp/guzzle": "^6.3.3",
         "laminas/laminas-captcha": "^2.10",
-        "laminas/laminas-code": "^3.5.1",
+        "laminas/laminas-code": "~4.4.2",
         "laminas/laminas-db": "^2.12.0",
         "laminas/laminas-dependency-plugin": "^2.1.0",
         "laminas/laminas-di": "^3.2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/static/framework/Magento/TestFramework/Integrity/Library/Injectable.php b/dev/tests/static/framework/Magento/TestFramework/Integrity/Library/Injectable.php
@@ -6,8 +6,6 @@
 namespace Magento\TestFramework\Integrity\Library;
 
 use Laminas\Code\Reflection\ClassReflection;
-use Laminas\Code\Reflection\FileReflection;
-use Laminas\Code\Reflection\ParameterReflection;
 use ReflectionClass;
 use ReflectionException;
 use ReflectionParameter;
@@ -18,40 +16,36 @@
 class Injectable
 {
     /**
-     * @var \ReflectionException[]
+     * @var string[]
      */
     protected $dependencies = [];
 
     /**
      * Get dependencies
      *
-     * @param FileReflection $fileReflection
-     * @return \ReflectionException[]
-     * @throws \ReflectionException
+     * @param ClassReflection $class
+     *
+     * @return string[]
+     * @throws ReflectionException
      */
-    public function getDependencies(FileReflection $fileReflection)
+    public function getDependencies(ClassReflection $class): array
     {
-        foreach ($fileReflection->getClasses() as $class) {
-            /** @var ClassReflection $class */
-            foreach ($class->getMethods() as $method) {
-                /** @var \Laminas\Code\Reflection\MethodReflection $method */
-                if ($method->getDeclaringClass()->getName() != $class->getName()) {
-                    continue;
-                }
+        foreach ($class->getMethods() as $method) {
+            if ($method->getDeclaringClass()->getName() !== $class->getName()) {
+                continue;
+            }
 
-                foreach ($method->getParameters() as $parameter) {
-                    try {
-                        /** @var ParameterReflection $parameter */
-                        $dependency = $this->getParameterClass($parameter);
-                        if ($dependency instanceof ClassReflection) {
-                            $this->dependencies[] = $dependency->getName();
-                        }
-                    } catch (\ReflectionException $e) {
-                        if (preg_match('#^Class ([A-Za-z0-9_\\\\]+) does not exist$#', $e->getMessage(), $result)) {
-                            $this->dependencies[] = $result[1];
-                        } else {
-                            throw $e;
-                        }
+            foreach ($method->getParameters() as $parameter) {
+                try {
+                    $dependency = $this->getParameterClass($parameter);
+                    if ($dependency !== null) {
+                        $this->dependencies[] = $dependency->getName();
+                    }
+                } catch (ReflectionException $e) {
+                    if (preg_match('#^Class ([A-Za-z0-9_\\\\]+) does not exist$#', $e->getMessage(), $result)) {
+                        $this->dependencies[] = $result[1];
+                    } else {
+                        throw $e;
                     }
                 }
             }

diff --git a/...s/static/framework/tests/unit/testsuite/Magento/Test/Integrity/Library/InjectableTest.php b/...s/static/framework/tests/unit/testsuite/Magento/Test/Integrity/Library/InjectableTest.php
diff --git a/...framework/tests/unit/testsuite/Magento/TestFramework/Integrity/Library/InjectableTest.php b/...framework/tests/unit/testsuite/Magento/TestFramework/Integrity/Library/InjectableTest.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\TestFramework\Integrity\Library;
+
+use Laminas\Code\Reflection\ClassReflection;
+use PHPUnit\Framework\TestCase;
+use ReflectionException;
+
+require_once __DIR__ . '/_files/DummyInjectableClass.php';
+
+/**
+ * Test for Magento\TestFramework\Integrity\Library\Injectable
+ */
+class InjectableTest extends TestCase
+{
+    /**
+     * Covered getDependencies
+     *
+     * @return void
+     * @throws ReflectionException
+     */
+    public function testGetDependencies(): void
+    {
+        $injectable = new Injectable();
+        $classReflection = new ClassReflection(DummyInjectableClass::class);
+
+        $actualResult = $injectable->getDependencies($classReflection);
+        $expectedResult = [
+            'Magento\Framework\DataObject',
+            'TestNamespace\Some\SomeTestClass',
+            'TestNamespace\Other\Test',
+        ];
+
+        $this->assertEquals($expectedResult, $actualResult);
+    }
+}
diff --git a/...y/Library/PhpParser/ParserFactoryTest.php → ...y/Library/PhpParser/ParserFactoryTest.php b/...y/Library/PhpParser/ParserFactoryTest.php → ...y/Library/PhpParser/ParserFactoryTest.php
@@ -3,9 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Test\Integrity\Library\PhpParser;
-
-use Magento\TestFramework\Integrity\Library\PhpParser\ParserFactory;
+namespace Magento\TestFramework\Integrity\Library\PhpParser;
 
 /**
  */