Merge remote-tracking branch 'origin/0.10.x-merge-up-into-0.11.x_6008acf73af1a0.91533706' into 0.11.x

# Conflicts:
#	CHANGELOG.md
#	src/Builder/ClassBuilderCollection.php
#	tests/Builder/FileCollectionTest.php

Author: sandrokeil

CHANGELOG.md

@@ -24,6 +24,26 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 0.10.2 - 2021-01-20
+
+
+-----
+
+### Release Notes for [0.10.2](https://github.com/open-code-modeling/php-code-ast/milestone/22)
+
+0.10.x bugfix release (patch)
+
+### 0.10.2
+
+- Total issues resolved: **2**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### bug
+
+ - [59: Fully qualified namespace not checked in note visitors](https://github.com/open-code-modeling/php-code-ast/issues/59) thanks to @sandrokeil
+ - [58: Empty collection not working](https://github.com/open-code-modeling/php-code-ast/issues/58) thanks to @sandrokeil
+
 ## 0.10.1 - 2021-01-15
 
 

src/Builder/FileCollection.php

@@ -32,6 +32,8 @@ public static function emptyList(): self
 
     private function __construct(File ...$files)
     {
+        $this->items = [];
+
         foreach ($files as $file) {
             $this->items[$this->identifier($file)] = $file;
         }

src/NodeVisitor/ClassExtends.php

@@ -57,7 +57,9 @@ public function afterTraverse(array $nodes): ?array
 
     private function checkExtendsExists(Stmt\Class_ $node): bool
     {
-        $exists = $this->extends === (string) $node->extends;
+        $exists = $this->extends === ($node->extends instanceof Name\FullyQualified
+                ? '\\' . $node->extends->toString()
+                : (string) $node->extends);
 
         if (false === $exists && null !== $node->extends) {
             throw new LogicException(\sprintf(

src/NodeVisitor/ClassImplements.php

@@ -11,6 +11,7 @@
 namespace OpenCodeModeling\CodeAst\NodeVisitor;
 
 use PhpParser\Node\Name;
+use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Stmt;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\NodeVisitorAbstract;
@@ -74,7 +75,9 @@ private function filterImplements(array $nodes): array
                     if ($stmt instanceof Stmt\Class_) {
                         foreach ($stmt->implements as $implementName) {
                             $implements = \array_filter($implements, static function (string $implement) use ($implementName) {
-                                return $implement !== (string) $implementName;
+                                return $implement !== ($implementName instanceof FullyQualified
+                                    ? '\\' . $implementName->toString()
+                                    : (string) $implementName);
                             });
                         }
                     }

src/NodeVisitor/ClassUseTrait.php

@@ -73,7 +73,9 @@ private function filterTraits(array $nodes): array
                                 foreach ($classStmt->traits as $trait) {
                                     $useTraits = \array_filter($useTraits,
                                         static function (string $implement) use ($trait) {
-                                            return $implement !== (string) $trait;
+                                            return $implement !== ($trait instanceof Name\FullyQualified
+                                                ? '\\' . $trait->toString()
+                                                : (string) $trait);
                                         });
                                 }
                             }

tests/Builder/ClassBuilderTest.php

@@ -76,6 +76,7 @@ final class TestClass extends BaseClass implements \Iterator, Bar
 EOF;
 
         $this->assertSame($expected, $this->printer->prettyPrintFile($nodeTraverser->traverse($ast)));
+        $this->assertSame($expected, $this->printer->prettyPrintFile($nodeTraverser->traverse($this->parser->parse($expected))));
     }
 
     /**

tests/Builder/FileCollectionTest.php

@@ -84,4 +84,15 @@ public function it_adds_anonymous_class_builder(): void
         $items = $cut->items();
         $this->assertArrayHasKey(\spl_object_hash($classBuilder), $items);
     }
+
+    /**
+     * @test
+     */
+    public function it_can_be_empty(): void
+    {
+        $cut = FileCollection::emptyList();
+        $this->assertCount(0, $cut);
+
+        $this->assertSame([], $cut->items());
+    }
 }

tests/NodeVisitor/ClassExtendsTest.php

@@ -170,6 +170,38 @@ class TestClass extends MyBaseClass
         $this->assertSame($expected, $this->printer->prettyPrintFile($nodeTraverser->traverse($ast)));
     }
 
+    /**
+     * @test
+     */
+    public function it_checks_class_extends_with_fully_qualified_namespace_for_existing_file(): void
+    {
+        $code = <<<EOF
+<?php
+
+namespace My\Awesome\Service;
+
+class TestClass extends \MyBaseClass {}
+EOF;
+
+        $ast = $this->parser->parse($code);
+
+        $nodeTraverser = new NodeTraverser();
+        $nodeTraverser->addVisitor(new ClassFile(new ClassGenerator('TestClass')));
+        $nodeTraverser->addVisitor(new ClassExtends('\\MyBaseClass'));
+
+        $expected = <<<EOF
+<?php
+
+namespace My\Awesome\Service;
+
+class TestClass extends \MyBaseClass
+{
+}
+EOF;
+
+        $this->assertSame($expected, $this->printer->prettyPrintFile($nodeTraverser->traverse($ast)));
+    }
+
     /**
      * @test
      */

tests/NodeVisitor/ClassUseTraitTest.php

@@ -43,7 +43,7 @@ public function it_add_namespace_imports_in_correct_order(): void
         $ast = $this->parser->parse($this->classCode());
 
         $nodeTraverser = new NodeTraverser();
-        $nodeTraverser->addVisitor(new ClassUseTrait('MyService\Foo', 'MyService\Bar'));
+        $nodeTraverser->addVisitor(new ClassUseTrait('\MyService\Foo', 'MyService\Bar', 'MyService\FooBar'));
 
         $this->assertSame($this->expectedClassCode(), $this->printer->prettyPrintFile($nodeTraverser->traverse($ast)));
     }
@@ -59,7 +59,8 @@ private function classCode(): string
 
         class TestClass
         {
-            use MyService\Foo;
+            use \MyService\Foo;
+            use MyService\FooBar;
 
             public function testMethod()
             {
@@ -79,7 +80,8 @@ private function expectedClassCode(): string
         class TestClass
         {
             use MyService\Bar;
-            use MyService\Foo;
+            use \MyService\Foo;
+            use MyService\FooBar;
             public function testMethod()
             {
             }