Requested changes

Author: janvernieuwe

src/Generator/PropertyGenerator.php

@@ -226,13 +226,20 @@ public function generate()
 
         $output .= $this->indentation . $this->getVisibility() . ($this->isStatic() ? ' static' : '') . ' $' . $name;
 
-        if ($this->defaultValue instanceof PropertyValueGenerator &&
-            $this->defaultValue->getType() === ValueGenerator::TYPE_OMIT) {
+        if ($this->defaultValue instanceof PropertyValueGenerator && $this->defaultValue->omitValue()) {
             return $output . ';';
         }
 
-        $output .= ' = ' . ($defaultValue !== null ? $defaultValue->generate() : 'null;');
+        return $output . ' = ' . ($defaultValue !== null ? $defaultValue->generate() : 'null;');
+    }
 
-        return $output;
+    /**
+     * @return PropertyGenerator
+     */
+    public function omitDefaultValue()
+    {
+        $this->defaultValue = new PropertyValueGenerator(null, PropertyValueGenerator::OMIT);
+
+        return $this;
     }
 }

src/Generator/ValueGenerator.php

@@ -35,6 +35,7 @@ class ValueGenerator extends AbstractGenerator
     /**#@+
      * Constant values
      */
+    const OMIT             = 'omit';
     const TYPE_AUTO        = 'auto';
     const TYPE_BOOLEAN     = 'boolean';
     const TYPE_BOOL        = 'bool';
@@ -50,7 +51,6 @@ class ValueGenerator extends AbstractGenerator
     const TYPE_CONSTANT    = 'constant';
     const TYPE_NULL        = 'null';
     const TYPE_OBJECT      = 'object';
-    const TYPE_OMIT        = 'omit';
     const TYPE_OTHER       = 'other';
     /**#@-*/
 
@@ -486,4 +486,12 @@ public function __toString()
     {
         return $this->generate();
     }
+
+    /**
+     * @return bool
+     */
+    public function omitValue()
+    {
+        return $this->type === self::OMIT;
+    }
 }

test/Generator/PropertyGeneratorTest.php

@@ -285,7 +285,7 @@ public function testSetDefaultValue(string $type, $value) : void
     public function testOmitType()
     {
         $property = new PropertyGenerator('test', null);
-        $property->setDefaultValue(null, ValueGenerator::TYPE_OMIT);
+        $property->omitDefaultValue();
 
         self::assertEquals('    public $test;', $property->generate());
     }