Merge pull request #40 from open-code-modeling/0.8.x-merge-up-into-0.9.x_5fb7a50989a891.92911533

Merge release 0.8.5 into 0.9.x

Author: sandrokeil

CHANGELOG.md

@@ -24,6 +24,27 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 0.8.5 - 2020-11-20
+
+
+-----
+
+### Release Notes for [0.8.5](https://github.com/open-code-modeling/php-code-ast/milestone/15)
+
+0.8.x bugfix release (patch)
+
+### 0.8.5
+
+- Total issues resolved: **2**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### bug
+
+ - [39: Fix missing fluent interface for setter](https://github.com/open-code-modeling/php-code-ast/issues/39) thanks to @sandrokeil
+ - [38: Fix PHPStan issues level 5](https://github.com/open-code-modeling/php-code-ast/issues/38) thanks to @sandrokeil
+
+
 ## 0.8.4 - 2020-11-20
 
 

phpstan.neon.dist

@@ -1,4 +1,4 @@
 parameters:
-  level: 3
+  level: 5
   paths:
     - src/

src/Code/ClassConstGenerator.php

@@ -21,7 +21,7 @@ final class ClassConstGenerator extends AbstractMemberGenerator
 
     /**
      * @param string $name
-     * @param ValueGenerator|string|array $value
+     * @param ValueGenerator|mixed $value
      * @param int $flags
      */
     public function __construct(string $name, $value, $flags = self::FLAG_PUBLIC)
@@ -56,7 +56,7 @@ public function getValue(): ValueGenerator
         return $this->value;
     }
 
-    public function generate(): \PhpParser\Node\Stmt\ClassConst
+    public function generate(): Node\Stmt\ClassConst
     {
         return new Node\Stmt\ClassConst(
             [

src/Code/ClassGenerator.php

@@ -37,7 +37,7 @@ final class ClassGenerator implements StatementGenerator
 
     /**
      * @param  string|null $name
-     * @param  array|string $flags
+     * @param  array|int $flags
      */
     public function __construct(
         ?string $name,

src/Code/MethodGenerator.php

@@ -172,35 +172,35 @@ public function getDocBlockComment(): ?string
         return $this->docBlockComment;
     }
 
-    public function setDocBlockComment(?string $docBlockComment): void
+    public function setDocBlockComment(?string $docBlockComment): self
     {
         $this->docBlockComment = $docBlockComment;
+
+        return $this;
     }
 
     public function getReturnTypeDocBlockHint(): ?string
     {
         return $this->returnTypeDocBlockHint;
     }
 
-    public function setReturnTypeDocBlockHint(?string $typeDocBlockHint): void
+    public function setReturnTypeDocBlockHint(?string $typeDocBlockHint): self
     {
         $this->returnTypeDocBlockHint = $typeDocBlockHint;
+
+        return $this;
     }
 
-    /**
-     * @return bool
-     */
     public function getTyped(): bool
     {
         return $this->typed;
     }
 
-    /**
-     * @param bool $typed
-     */
-    public function setTyped(bool $typed): void
+    public function setTyped(bool $typed): self
     {
         $this->typed = $typed;
+
+        return $this;
     }
 
     /**

src/Code/ParameterGenerator.php

@@ -33,7 +33,7 @@ final class ParameterGenerator
     private $type;
 
     /**
-     * @var ValueGenerator
+     * @var ValueGenerator|null
      */
     private $defaultValue;
 
@@ -77,11 +77,7 @@ public function __construct(
         }
     }
 
-    /**
-     * @param  string $type
-     * @return ParameterGenerator
-     */
-    public function setType($type): self
+    public function setType(string $type): self
     {
         $this->type = TypeGenerator::fromTypeString($type);
 
@@ -99,7 +95,7 @@ public function getType(): ?TypeGenerator
      */
     public function setName(string $name): self
     {
-        $this->name = (string) $name;
+        $this->name = $name;
 
         return $this;
     }
@@ -117,7 +113,7 @@ public function getName(): string
      *
      * Certain variables are difficult to express
      *
-     * @param  null|bool|string|int|float|array|ValueGenerator $defaultValue
+     * @param  ValueGenerator|mixed $defaultValue
      * @return ParameterGenerator
      */
     public function setDefaultValue($defaultValue): self
@@ -130,10 +126,7 @@ public function setDefaultValue($defaultValue): self
         return $this;
     }
 
-    /**
-     * @return ValueGenerator
-     */
-    public function getDefaultValue(): ValueGenerator
+    public function getDefaultValue(): ?ValueGenerator
     {
         return $this->defaultValue;
     }
@@ -188,17 +181,19 @@ public function getTypeDocBlockHint(): ?string
     /**
      * @param string|null $typeDocBlockHint
      */
-    public function setTypeDocBlockHint(?string $typeDocBlockHint): void
+    public function setTypeDocBlockHint(?string $typeDocBlockHint): self
     {
         $this->typeDocBlockHint = $typeDocBlockHint;
+
+        return $this;
     }
 
     public function generate(): Node\Param
     {
         return new Node\Param(
             new Node\Expr\Variable($this->name),
             $this->defaultValue ? $this->defaultValue->generate() : null,
-            $this->type ? $this->type->generate() : null,
+            $this->type ? $this->type->generate() : null, // @phpstan-ignore-line
             $this->passedByReference,
             $this->variadic
         );

src/Code/PropertyGenerator.php

@@ -32,7 +32,7 @@ final class PropertyGenerator extends AbstractMemberGenerator
     private $type;
 
     /**
-     * @var ValueGenerator
+     * @var ValueGenerator|null
      */
     private $defaultValue;
 
@@ -99,9 +99,11 @@ public function getDocBlockComment(): ?string
         return $this->docBlockComment;
     }
 
-    public function setDocBlockComment(?string $docBlockComment): void
+    public function setDocBlockComment(?string $docBlockComment): self
     {
         $this->docBlockComment = $docBlockComment;
+
+        return $this;
     }
 
     /**
@@ -133,10 +135,7 @@ public function setDefaultValue(
         return $this;
     }
 
-    /**
-     * @return ValueGenerator
-     */
-    public function getDefaultValue(): ValueGenerator
+    public function getDefaultValue(): ?ValueGenerator
     {
         return $this->defaultValue;
     }
@@ -149,9 +148,11 @@ public function getTypeDocBlockHint(): ?string
         return $this->typeDocBlockHint;
     }
 
-    public function setTypeDocBlockHint(?string $typeDocBlockHint): void
+    public function setTypeDocBlockHint(?string $typeDocBlockHint): self
     {
         $this->typeDocBlockHint = $typeDocBlockHint;
+
+        return $this;
     }
 
     public function generate(): Property
@@ -165,6 +166,7 @@ public function generate(): Property
                 ),
             ],
             $this->generateAttributes(),
+            // @phpstan-ignore-next-line
             $this->typed && null !== $this->type ? $this->type->generate() : null
         );
     }

src/NodeVisitor/ClassNamespace.php

@@ -11,6 +11,7 @@
 namespace OpenCodeModeling\CodeAst\NodeVisitor;
 
 use PhpParser\BuilderFactory;
+use PhpParser\Node;
 use PhpParser\Node\Stmt;
 use PhpParser\NodeVisitorAbstract;
 
@@ -57,7 +58,7 @@ public function afterTraverse(array $nodes): ?array
         return $newNodes;
     }
 
-    private function isNodeStrictType(Stmt $node): bool
+    private function isNodeStrictType(Node $node): bool
     {
         return $node instanceof Stmt\Declare_
             && \strtolower($node->declares[0]->key->name) === 'strict_types';