Merge branch '0.11.x' into 0.10.x-merge-up-into-0.11.x_6001ae7cb9f6e2.93351564

Author: sandrokeil

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 0.11.0 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 0.10.1 - 2021-01-15
 
 

src/Builder/ClassBuilder.php

@@ -212,16 +212,6 @@ public function hasNamespaceImport(string $namespace): bool
         return isset($this->namespaceImports[$namespace]);
     }
 
-    /**
-     * @deprecated Use setNamespaceImports()
-     * @param string ...$namespaces
-     * @return self
-     */
-    public function setNamespaceUse(string ...$namespaces): self
-    {
-        return $this->setNamespaceImports(...$namespaces);
-    }
-
     /**
      * Replacing will not work on existing files
      *
@@ -274,16 +264,6 @@ public function hasTrait(string $trait): bool
         return isset($this->traits[$trait]);
     }
 
-    /**
-     * @deprecated Use setTraits()
-     * @param string ...$traits
-     * @return self
-     */
-    public function setUseTrait(string ...$traits): self
-    {
-        return $this->setTraits(...$traits);
-    }
-
     /**
      * Replacing will not work on existing files
      *
@@ -498,15 +478,6 @@ public function getImplements(): array
         return $this->implements;
     }
 
-    /**
-     * @deprecated Use namespaceImports()
-     * @return string[]
-     */
-    public function getNamespaceUse(): array
-    {
-        return $this->namespaceImports;
-    }
-
     /**
      * @return string[]
      */
@@ -515,15 +486,6 @@ public function getNamespaceImports(): array
         return $this->namespaceImports;
     }
 
-    /**
-     * @deprecated Use getTraits()
-     * @return string[]
-     */
-    public function getUseTrait(): array
-    {
-        return $this->traits;
-    }
-
     /**
      * @return string[]
      */
@@ -621,16 +583,6 @@ public function sortNamespaceImports(callable $sort): self
         return $this;
     }
 
-    /**
-     * @deprecated Use sortNamespaceImports()
-     * @param callable $sort
-     * @return $this
-     */
-    public function sortNamespaceUse(callable $sort): self
-    {
-        return $this->sortNamespaceImports($sort);
-    }
-
     /**
      * @param Parser $parser
      * @return NodeVisitor[]

src/Builder/ClassBuilderCollection.php

@@ -11,6 +11,7 @@
 namespace OpenCodeModeling\CodeAst\Builder;
 
 use OpenCodeModeling\CodeAst\Code\ClassConstGenerator;
+use OpenCodeModeling\CodeAst\Code\IdentifierGenerator;
 use OpenCodeModeling\CodeAst\NodeVisitor\ClassConstant;
 use PhpParser\Node;
 use PhpParser\NodeTraverser;
@@ -98,7 +99,12 @@ public function setPublic(): self
 
     public function generate(): NodeVisitor
     {
-        return ClassConstant::forClassConstant($this->name, $this->value, $this->visibility);
+        return new ClassConstant(
+            new IdentifierGenerator(
+                $this->name,
+                new ClassConstGenerator($this->name, $this->value, $this->visibility)
+            )
+        );
     }
 
     public function injectVisitors(NodeTraverser $nodeTraverser): void

src/Builder/ClassConstBuilder.php

@@ -167,16 +167,6 @@ public function hasNamespaceImport(string $namespace): bool
         return isset($this->namespaceImports[$namespace]);
     }
 
-    /**
-     * @deprecated Use setNamespaceImports()
-     * @param string ...$namespaces
-     * @return self
-     */
-    public function setNamespaceUse(string ...$namespaces): self
-    {
-        return $this->setNamespaceImports(...$namespaces);
-    }
-
     /**
      * Replacing will not work on existing files
      *
@@ -346,15 +336,6 @@ public function getExtends(): array
         return $this->extends;
     }
 
-    /**
-     * @deprecated Use namespaceImports()
-     * @return string[]
-     */
-    public function getNamespaceUse(): array
-    {
-        return $this->namespaceImports;
-    }
-
     /**
      * @return string[]
      */

src/Builder/InterfaceBuilder.php

@@ -10,7 +10,6 @@
 
 namespace OpenCodeModeling\CodeAst\NodeVisitor;
 
-use OpenCodeModeling\CodeAst\Code\ClassConstGenerator;
 use OpenCodeModeling\CodeAst\Code\IdentifierGenerator;
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
@@ -29,19 +28,6 @@ public function __construct(IdentifierGenerator $lineGenerator)
         $this->lineGenerator = $lineGenerator;
     }
 
-    public static function forClassConstant(
-        string $constantName,
-        $constantValue,
-        int $flags = ClassConstGenerator::FLAG_PUBLIC
-    ): ClassConstant {
-        return new self(
-            new IdentifierGenerator(
-                $constantName,
-                new ClassConstGenerator($constantName, $constantValue, $flags)
-            )
-        );
-    }
-
     public function afterTraverse(array $nodes): ?array
     {
         $newNodes = [];

src/NodeVisitor/ClassConstant.php

@@ -29,18 +29,6 @@ public function __construct(PropertyGenerator $propertyGenerator)
         $this->propertyGenerator = $propertyGenerator;
     }
 
-    public static function forClassProperty(
-        string $name = null,
-        string $type = null,
-        $defaultValue = null,
-        bool $typed = true,
-        int $flags = PropertyGenerator::FLAG_PRIVATE
-    ): self {
-        return new self(
-            new PropertyGenerator($name, $type, $defaultValue, $typed, $flags)
-        );
-    }
-
     public function afterTraverse(array $nodes): ?array
     {
         $newNodes = [];

src/NodeVisitor/Property.php

@@ -11,18 +11,18 @@
 namespace OpenCodeModelingTest\CodeAst\Builder;
 
 use OpenCodeModeling\CodeAst\Builder\ClassBuilder;
-use OpenCodeModeling\CodeAst\Builder\ClassBuilderCollection;
+use OpenCodeModeling\CodeAst\Builder\FileCollection;
 use PHPUnit\Framework\TestCase;
 
-final class ClassBuilderCollectionTest extends TestCase
+final class FileCollectionTest extends TestCase
 {
     /**
      * @test
      */
     public function it_adds_same_class_builder_not_twice(): void
     {
         $classBuilder = ClassBuilder::fromScratch('MyClass');
-        $cut = ClassBuilderCollection::fromItems($classBuilder);
+        $cut = FileCollection::fromItems($classBuilder);
         $this->assertCount(1, $cut);
 
         $cut->add($classBuilder);
@@ -40,7 +40,7 @@ public function it_adds_and_removes_class_builder(): void
         $classBuilderWithoutNamespace = ClassBuilder::fromScratch('MyClass');
         $classBuilderNamespace = ClassBuilder::fromScratch('MyClass', 'MyNamespace');
 
-        $cut = ClassBuilderCollection::fromItems($classBuilderWithoutNamespace);
+        $cut = FileCollection::fromItems($classBuilderWithoutNamespace);
         $this->assertCount(1, $cut);
 
         $cut->add($classBuilderNamespace);
@@ -78,7 +78,7 @@ public function it_adds_anonymous_class_builder(): void
     {
         $classBuilder = ClassBuilder::fromScratch(null);
 
-        $cut = ClassBuilderCollection::fromItems($classBuilder);
+        $cut = FileCollection::fromItems($classBuilder);
         $this->assertCount(1, $cut);
 
         $items = $cut->items();