bug symfony#10067 [HttpKernel] allow null value in fragment handler (kbond)

fabpot · fabpot · commit 783a45d0e454 · 2014-01-20T07:30:15.000+01:00
This PR was submitted for the 2.4-dev branch but it was merged into the 2.4 branch instead (closes symfony#10067). Discussion ---------- [HttpKernel] allow null value in fragment handler | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#10066 | License | MIT | Doc PR | n/a Commits ------- 534deef [HttpKernel] allow null value in fragment handler
diff --git a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
@@ -82,8 +82,8 @@ private function checkNonScalar($values)
         foreach ($values as $key => $value) {
             if (is_array($value)) {
                 $this->checkNonScalar($value);
-            } elseif (!is_scalar($value)) {
-                throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar values (value for key "%s" is not a scalar).', $key));
+            } elseif (!is_scalar($value) && null !== $value) {
+                throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar/non-null values (value for key "%s" is not a scalar or null).', $key));
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -82,8 +82,8 @@ private function checkNonScalar($values)`
`82`	`82`	`foreach ($values as $key => $value) {`
`83`	`83`	`if (is_array($value)) {`
`84`	`84`	`$this->checkNonScalar($value);`
`85`		`- } elseif (!is_scalar($value)) {`
`86`		`- throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar values (value for key "%s" is not a scalar).', $key));`
	`85`	`+ } elseif (!is_scalar($value) && null !== $value) {`
	`86`	`+ throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar/non-null values (value for key "%s" is not a scalar or null).', $key));`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`}`