Add omitValue

use a property instead of constant

Author: janvernieuwe

src/Generator/ParameterGenerator.php

@@ -49,6 +49,11 @@ class ParameterGenerator extends AbstractGenerator
      */
     private $variadic = false;
 
+    /**
+     * @var bool
+     */
+    private $omitDefaultValue = false;
+
     /**
      * @param  ParameterReflection $reflectionParameter
      * @return ParameterGenerator
@@ -306,6 +311,10 @@ public function generate()
 
         $output .= '$' . $this->name;
 
+        if ($this->omitDefaultValue) {
+            return $output;
+        }
+
         if ($this->defaultValue !== null) {
             $output .= ' = ';
             if (is_string($this->defaultValue)) {
@@ -402,4 +411,14 @@ private function generateTypeHint()
 
         return $this->type->generate() . ' ';
     }
+
+    /**
+     * @return ParameterGenerator
+     */
+    public function omitDefaultValue()
+    {
+        $this->omitDefaultValue = true;
+
+        return $this;
+    }
 }

src/Generator/PropertyGenerator.php

@@ -29,6 +29,11 @@ class PropertyGenerator extends AbstractMemberGenerator
      */
     protected $defaultValue;
 
+    /**
+     * @var bool
+     */
+    private $omitDefaultValue = false;
+
     /**
      * @param  PropertyReflection $reflectionProperty
      * @return PropertyGenerator
@@ -226,7 +231,7 @@ public function generate()
 
         $output .= $this->indentation . $this->getVisibility() . ($this->isStatic() ? ' static' : '') . ' $' . $name;
 
-        if ($this->defaultValue instanceof PropertyValueGenerator && $this->defaultValue->omitValue()) {
+        if ($this->omitDefaultValue) {
             return $output . ';';
         }
 
@@ -238,6 +243,8 @@ public function generate()
      */
     public function omitDefaultValue()
     {
-        return $this->setDefaultValue(null, PropertyValueGenerator::OMIT);
+        $this->omitDefaultValue = true;
+
+        return $this;
     }
 }

src/Generator/ValueGenerator.php

@@ -35,7 +35,6 @@ class ValueGenerator extends AbstractGenerator
     /**#@+
      * Constant values
      */
-    const OMIT             = 'omit';
     const TYPE_AUTO        = 'auto';
     const TYPE_BOOLEAN     = 'boolean';
     const TYPE_BOOL        = 'bool';
@@ -486,12 +485,4 @@ public function __toString()
     {
         return $this->generate();
     }
-
-    /**
-     * @return bool
-     */
-    public function omitValue()
-    {
-        return $this->type === self::OMIT;
-    }
 }

test/Generator/ParameterGeneratorTest.php

@@ -582,4 +582,12 @@ public function testGetInternalClassDefaultParameterValue()
 
         self::assertSame('null', strtolower((string) $parameter->getDefaultValue()));
     }
+
+    public function testOmitType()
+    {
+        $parameter = new ParameterGenerator('foo', 'string', 'bar');
+        $parameter->omitDefaultValue();
+
+        self::assertEquals('string $foo', $parameter->generate());
+    }
 }

test/Generator/PropertyGeneratorTest.php

@@ -284,9 +284,9 @@ public function testSetDefaultValue(string $type, $value) : void
 
     public function testOmitType()
     {
-        $property = new PropertyGenerator('test', null);
+        $property = new PropertyGenerator('foo', null);
         $property->omitDefaultValue();
 
-        self::assertEquals('    public $test;', $property->generate());
+        self::assertEquals('    public $foo;', $property->generate());
     }
 }