From 7633e3f448e772f3c070b4cc20abd75ef22c3f14 Mon Sep 17 00:00:00 2001 From: Tobias Schultze Date: Wed, 11 Oct 2017 18:32:20 +0200 Subject: [PATCH] Default value of ParameterGenerator is always a ValueGenerator --- src/Generator/ParameterGenerator.php | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Generator/ParameterGenerator.php b/src/Generator/ParameterGenerator.php index 72b849ec..7f1c4633 100644 --- a/src/Generator/ParameterGenerator.php +++ b/src/Generator/ParameterGenerator.php @@ -30,7 +30,7 @@ class ParameterGenerator extends AbstractGenerator protected $type; /** - * @var string|ValueGenerator + * @var ValueGenerator */ protected $defaultValue; @@ -226,7 +226,7 @@ public function setDefaultValue($defaultValue) } /** - * @return string + * @return ValueGenerator */ public function getDefaultValue() { @@ -306,16 +306,10 @@ public function generate() $output .= '$' . $this->name; - if ($this->defaultValue !== null) { + if ($this->defaultValue instanceof ValueGenerator) { $output .= ' = '; - if (is_string($this->defaultValue)) { - $output .= ValueGenerator::escape($this->defaultValue); - } elseif ($this->defaultValue instanceof ValueGenerator) { - $this->defaultValue->setOutputMode(ValueGenerator::OUTPUT_SINGLE_LINE); - $output .= $this->defaultValue; - } else { - $output .= $this->defaultValue; - } + $this->defaultValue->setOutputMode(ValueGenerator::OUTPUT_SINGLE_LINE); + $output .= $this->defaultValue; } return $output;