zendframework · Ocramius · Oct 3, 2017 · Oct 2, 2017 · Oct 2, 2017 · Oct 2, 2017
diff --git a/src/Generator/ParameterGenerator.php b/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;
+    }
 }
diff --git a/src/Generator/PropertyGenerator.php b/src/Generator/PropertyGenerator.php
@@ -29,6 +29,11 @@ class PropertyGenerator extends AbstractMemberGenerator
      */
     protected $defaultValue;
 
+    /**
+     * @var bool
+     */
+    private $omitDefaultValue = false;
+
     /**
      * @param  PropertyReflection $reflectionProperty
      * @return PropertyGenerator
@@ -220,14 +225,26 @@ public function generate()
             }
             $output .= $this->indentation . 'const ' . $name . ' = '
                 . ($defaultValue !== null ? $defaultValue->generate() : 'null;');
-        } else {
-            $output .= $this->indentation
-                . $this->getVisibility()
-                . ($this->isStatic() ? ' static' : '')
-                . ' $' . $name . ' = '
-                . ($defaultValue !== null ? $defaultValue->generate() : 'null;');
+
+            return $output;
+        }
+
+        $output .= $this->indentation . $this->getVisibility() . ($this->isStatic() ? ' static' : '') . ' $' . $name;
+
+        if ($this->omitDefaultValue) {
+            return $output . ';';
         }
 
-        return $output;
+        return $output . ' = ' . ($defaultValue !== null ? $defaultValue->generate() : 'null;');
+    }
+
+    /**
+     * @return PropertyGenerator
+     */
+    public function omitDefaultValue()
+    {
+        $this->omitDefaultValue = true;
+
+        return $this;
     }
 }
diff --git a/test/Generator/ParameterGeneratorTest.php b/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());
+    }
 }
diff --git a/test/Generator/PropertyGeneratorTest.php b/test/Generator/PropertyGeneratorTest.php
@@ -281,4 +281,12 @@ public function testSetDefaultValue(string $type, $value) : void
         self::assertEquals($type, $property->getDefaultValue()->getType());
         self::assertEquals($value, $property->getDefaultValue()->getValue());
     }
+
+    public function testOmitType()
+    {
+        $property = new PropertyGenerator('foo', null);
+        $property->omitDefaultValue();
+
+        self::assertEquals('    public $foo;', $property->generate());
+    }
 }