[HttpKernel] Arrays with scalar values passed to ESI fragment renderer throw deprecation notice

Amrouche Hamza · Amrouche Hamza · commit c34abc0a77c4 · 2017-11-29T07:49:56.000+01:00
diff --git a/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
@@ -100,8 +100,8 @@ private function generateSignedFragmentUri($uri, Request $request)
     private function containsNonScalars(array $values)
     {
         foreach ($values as $value) {
-            if (is_array($value) && $this->containsNonScalars($value)) {
-                return true;
+            if (is_array($value)) {
+                return $this->containsNonScalars($value);
             } elseif (!is_scalar($value) && null !== $value) {
                 return true;
             }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
@@ -33,7 +33,15 @@ public function testRenderFallbackWithObjectAttributesIsDeprecated()
     {
         $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
         $request = Request::create('/');
-        $reference = new ControllerReference('main_controller', array('foo' => array('a' => array(), 'b' => new \stdClass())), array());
+        $reference = new ControllerReference('main_controller', array('foo' => new \stdClass()), array());
+        $strategy->render($reference, $request);
+    }
+
+    public function testRenderFallbackWithScalarIsNotDeprecated()
+    {
+        $strategy = new EsiFragmentRenderer(new Esi(), $this->getInlineStrategy(true), new UriSigner('foo'));
+        $request = Request::create('/');
+        $reference = new ControllerReference('main_controller', array('foo' => array(true)), array());
         $strategy->render($reference, $request);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -100,8 +100,8 @@ private function generateSignedFragmentUri($uri, Request $request)`
`100`	`100`	`private function containsNonScalars(array $values)`
`101`	`101`	`{`
`102`	`102`	`foreach ($values as $value) {`
`103`		`- if (is_array($value) && $this->containsNonScalars($value)) {`
`104`		`- return true;`
	`103`	`+ if (is_array($value)) {`
	`104`	`+ return $this->containsNonScalars($value);`
`105`	`105`	`} elseif (!is_scalar($value) && null !== $value) {`
`106`	`106`	`return true;`
`107`	`107`	`}`