[HttpKernel] allow null value in fragment handler

kbond · kbond · commit 534deefff973 · 2014-01-18T16:57:04.000-05:00
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`	`}`