Merge remote-tracking branch 'origin/0.12.x-merge-up-into-0.13.x_602a78393aa0f9.70627591' into 0.13.x

# Conflicts:
#	CHANGELOG.md

Author: sandrokeil

CHANGELOG.md

@@ -24,6 +24,25 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 0.12.1 - 2021-02-15
+
+
+-----
+
+### Release Notes for [0.12.1](https://github.com/open-code-modeling/php-code-ast/milestone/27)
+
+0.12.x bugfix release (patch)
+
+### 0.12.1
+
+- Total issues resolved: **1**
+- Total pull requests resolved: **0**
+- Total contributors: **1**
+
+#### bug
+
+ - [69: ClassPropertyBuilder with typed=false not working](https://github.com/open-code-modeling/php-code-ast/issues/69) thanks to @sandrokeil
+
 ## 0.12.0 - 2021-02-12
 
 

src/Builder/ClassPropertyBuilder.php

@@ -80,7 +80,7 @@ public static function fromNode(Node\Stmt\Property $node, bool $typed = true): s
         $self->type = $type;
         $self->visibility = $node->flags;
         $self->typed = $typed;
-        $self->propertyGenerator = new PropertyGenerator($self->name, $self->type);
+        $self->propertyGenerator = new PropertyGenerator($self->name, $self->type, $typed);
 
         $defaultValue = $node->props[0]->default;
 
@@ -129,7 +129,7 @@ public static function fromScratch(string $name, string $type, bool $typed = tru
         $self->type = $type;
         $self->typed = $typed;
         $self->visibility = ClassConstGenerator::FLAG_PRIVATE;
-        $self->propertyGenerator = new PropertyGenerator($self->name, $self->type);
+        $self->propertyGenerator = new PropertyGenerator($self->name, $self->type, $typed);
 
         return $self;
     }

tests/Builder/ClassMethodBuilderTest.php

@@ -412,4 +412,37 @@ public function setActive() : void
 
         $this->assertSame($expected, $this->printer->prettyPrintFile($nodeTraverser->traverse($this->parser->parse(''))));
     }
+
+    /**
+     * @test
+     */
+    public function it_generates_method_with_args_and_default_value(): void
+    {
+        $ast = $this->parser->parse('');
+
+        $methodBuilder = ClassMethodBuilder::fromScratch('setActive')->setReturnType('void');
+        $methodBuilder->setParameters(ParameterBuilder::fromScratch('active', 'bool')->setDefaultValue(null));
+
+        $classFactory = ClassBuilder::fromScratch('TestClass', 'My\\Awesome\\Service');
+        $classFactory->setMethods($methodBuilder);
+
+        $nodeTraverser = new NodeTraverser();
+        $classFactory->injectVisitors($nodeTraverser, $this->parser);
+
+        $expected = <<<'EOF'
+<?php
+
+declare (strict_types=1);
+namespace My\Awesome\Service;
+
+class TestClass
+{
+    public function setActive(bool $active = null) : void
+    {
+    }
+}
+EOF;
+
+        $this->assertSame($expected, $this->printer->prettyPrintFile($nodeTraverser->traverse($ast)));
+    }
 }

tests/Builder/ClassPropertyBuilderTest.php

@@ -45,7 +45,7 @@ public function it_generates_property_for_empty_class(): void
         $ast = $this->parser->parse('');
 
         $classFactory = ClassBuilder::fromScratch('TestClass', 'My\\Awesome\\Service');
-        $classFactory->setProperties(ClassPropertyBuilder::fromScratch('aggregateId', 'string'));
+        $classFactory->setProperties(ClassPropertyBuilder::fromScratch('aggregateId', 'string', false));
 
         $this->assertTrue($classFactory->hasProperty('aggregateId'));
 
@@ -60,7 +60,10 @@ public function it_generates_property_for_empty_class(): void
 
 class TestClass
 {
-    private string $aggregateId;
+    /**
+     * @var string
+     */
+    private $aggregateId;
 }
 EOF;
 

tests/Code/PropertyGeneratorTest.php

@@ -41,7 +41,7 @@ public function setUp(): void
      */
     public function it_generates_property_with_doc_block(): void
     {
-        $property = new PropertyGenerator('sourceFolder', 'string');
+        $property = new PropertyGenerator('sourceFolder', 'string', false);
         $property->setDocBlockComment('source folder');
 
         $expectedOutput = <<<'EOF'
@@ -52,7 +52,7 @@ public function it_generates_property_with_doc_block(): void
  *
  * @var string
  */
-private string $sourceFolder;
+private $sourceFolder;
 EOF;
 
         $this->assertSame($expectedOutput, $this->printer->prettyPrintFile([$property->generate()]));
@@ -63,7 +63,7 @@ public function it_generates_property_with_doc_block(): void
      */
     public function it_generates_property_with_overridden_doc_block(): void
     {
-        $property = new PropertyGenerator('sourceFolder', 'string');
+        $property = new PropertyGenerator('sourceFolder', 'string', false);
         $property->setDocBlockComment('source folder');
         $property->overrideDocBlock(new DocBlock('Awesome'));
 
@@ -73,7 +73,7 @@ public function it_generates_property_with_overridden_doc_block(): void
 /**
  * Awesome
  */
-private string $sourceFolder;
+private $sourceFolder;
 EOF;
 
         $this->assertSame($expectedOutput, $this->printer->prettyPrintFile([$property->generate()]));