Merge pull request #192 from maMykola/fix-closure-with-use-statment

Fix ContextFactory::createForNamespace with closure and use statement
phpDocumentor · Aug 12, 2023 · 3219c6e · 3219c6e
2 parents 07100e6 + 4ec06f8
commit 3219c6e
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 0 deletions.
diff --git a/src/Types/ContextFactory.php b/src/Types/ContextFactory.php
@@ -181,6 +181,7 @@ public function createForNamespace(string $namespace, string $fileContents): Con
                     $currentNamespace = $this->parseNamespace($tokens);
                     break;
                 case T_CLASS:
+                case T_TRAIT:
                     // Fast-forward the iterator through the class so that any
                     // T_USE tokens found within are skipped - these are not
                     // valid namespace use statements so should be ignored.

diff --git a/tests/unit/Types/ContextFactoryTest.php b/tests/unit/Types/ContextFactoryTest.php
@@ -139,6 +139,35 @@ public function bar()
             $this->assertSame([], $context->getNamespaceAliases());
         }
 
+        /**
+         * @covers ::createForNamespace
+         * @uses phpDocumentor\Reflection\Types\Context
+         */
+        public function testTraitContainsClosureWithUseStatement() : void
+        {
+            $php = '<?php declare(strict_types=1);
+                namespace Foo;
+
+                trait FooTrait {
+                    protected function check(array $data, string $key) : void
+                    {
+                        array_walk($data, function(&$item) use ($key) {
+                            // update item based on the key
+                        });
+                    }
+                }
+
+                class FooClass {
+                    use FooTrait;
+                }
+            ';
+
+            $fixture = new ContextFactory();
+            $context = $fixture->createForNamespace('Foo', $php);
+
+            $this->assertSame([], $context->getNamespaceAliases());
+        }
+
         /**
          * @covers ::createFromReflector
          */