SW-17552 - Check isDefaultValueAvailable since isOptional is not enough

bcremer · bcremer · commit 7c8c9a0f6ca3 · 2017-01-24T16:21:52.000+01:00
diff --git a/engine/Library/Enlight/Hook/ProxyFactory.php b/engine/Library/Enlight/Hook/ProxyFactory.php
@@ -286,7 +286,7 @@ protected function generateMethods($class)
                 $proxy_params .= '$' . $rp->getName();
                 $array_param .= '$' . $rp->getName();
                 $array_params .= '\'' . $rp->getName() . '\'=>' . $array_param;
-                if ($rp->isOptional()) {
+                if ($rp->isOptional() && $rp->isDefaultValueAvailable()) {
                     $params .= ' = ' . str_replace("\n", '', var_export($rp->getDefaultValue(), true));
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ protected function generateMethods($class)`
`286`	`286`	`$proxy_params .= '$' . $rp->getName();`
`287`	`287`	`$array_param .= '$' . $rp->getName();`
`288`	`288`	`$array_params .= '\'' . $rp->getName() . '\'=>' . $array_param;`
`289`		`- if ($rp->isOptional()) {`
	`289`	`+ if ($rp->isOptional() && $rp->isDefaultValueAvailable()) {`
`290`	`290`	`$params .= ' = ' . str_replace("\n", '', var_export($rp->getDefaultValue(), true));`
`291`	`291`	`}`
`292`	`292`	`}`