Set typed = true as default for properties - Close #8

open-code-modeling · Dec 11, 2020 · db2ec95 · db2ec95
1 parent a532ff6
commit db2ec95
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/src/Builder/ClassBuilder.php b/src/Builder/ClassBuilder.php
@@ -35,7 +35,7 @@ final class ClassBuilder implements File
     private bool $strict = false;
 
     /** @var bool */
-    private bool $typed = false;
+    private bool $typed = true;
 
     /** @var bool */
     private bool $final = false;

diff --git a/src/Builder/ClassMethodBuilder.php b/src/Builder/ClassMethodBuilder.php
@@ -44,7 +44,7 @@ final class ClassMethodBuilder
     private int $visibility;
 
     /** @var bool */
-    private bool $typed = false;
+    private bool $typed = true;
 
     /**
      * @var string|null

diff --git a/src/Builder/ClassPropertyBuilder.php b/src/Builder/ClassPropertyBuilder.php
@@ -36,7 +36,7 @@ final class ClassPropertyBuilder
     private int $visibility;
 
     /** @var bool */
-    private bool $typed = false;
+    private bool $typed = true;
 
     /**
      * @var string|null

diff --git a/src/Builder/InterfaceBuilder.php b/src/Builder/InterfaceBuilder.php
@@ -33,7 +33,7 @@ final class InterfaceBuilder implements File
     private bool $strict = false;
 
     /** @var bool */
-    private bool $typed = false;
+    private bool $typed = true;
 
     /** @var string[] */
     private array $extends = [];

diff --git a/src/Code/MethodGenerator.php b/src/Code/MethodGenerator.php
@@ -45,7 +45,7 @@ final class MethodGenerator extends AbstractMemberGenerator
     /**
      * @var bool
      */
-    private bool $typed = false;
+    private bool $typed = true;
 
     /**
      * @var string|null

diff --git a/src/Code/PropertyGenerator.php b/src/Code/PropertyGenerator.php
@@ -60,7 +60,7 @@ public function __construct(
         string $name = null,
         string $type = null,
         $defaultValue = null,
-        bool $typed = false,
+        bool $typed = true,
         int $flags = self::FLAG_PRIVATE
     ) {
         if (null !== $name) {

diff --git a/src/NodeVisitor/Property.php b/src/NodeVisitor/Property.php
@@ -33,7 +33,7 @@ public static function forClassProperty(
         string $name = null,
         string $type = null,
         $defaultValue = null,
-        bool $typed = false,
+        bool $typed = true,
         int $flags = PropertyGenerator::FLAG_PRIVATE
     ): self {
         return new self(

diff --git a/tests/Code/PropertyGeneratorTest.php b/tests/Code/PropertyGeneratorTest.php
@@ -40,7 +40,7 @@ public function setUp(): void
      */
     public function it_generates_property_with_doc_block(): void
     {
-        $property = new PropertyGenerator('sourceFolder', 'string');
+        $property = new PropertyGenerator('sourceFolder', 'string', null, false);
         $property->setDocBlockComment('source folder');
 
         $expectedOutput = <<<'EOF'
@@ -62,7 +62,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', null, false);
         $property->setDocBlockComment('source folder');
         $property->overrideDocBlock(new DocBlock('Awesome'));
 
@@ -92,7 +92,7 @@ public function it_generates_property_with_array_type_doc_block(): void
 /**
  * @var array<string, \stdClass>
  */
-private $items;
+private array $items;
 EOF;
 
         $this->assertSame($expectedOutput, $this->printer->prettyPrintFile([$property->generate()]));
@@ -130,7 +130,7 @@ public function it_generates_property_with_long_doc_block(): void
  *
  * @var string
  */
-private $sourceFolder;
+private string $sourceFolder;
 EOF;
 
         $this->assertSame($expectedOutput, $this->printer->prettyPrintFile([$property->generate()]));