symfony
diff --git a/‎src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
+2-2Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
+9-1Lines changed: 9 additions & 1 deletion b/‎src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/Fragment/EsiFragmentRendererTest.php
+9-1Lines changed: 9 additions & 1 deletion
@@ -98,8 +98,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;
             }
 
@@ -34,7 +34,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
`@@ -98,8 +98,8 @@ private function generateSignedFragmentUri($uri, Request $request)`
`98`	`98`	`private function containsNonScalars(array $values)`
`99`	`99`	`{`
`100`	`100`	`foreach ($values as $value) {`
`101`		`- if (is_array($value) && $this->containsNonScalars($value)) {`
`102`		`- return true;`
	`101`	`+ if (is_array($value)) {`
	`102`	`+ return $this->containsNonScalars($value);`
`103`	`103`	`} elseif (!is_scalar($value) && null !== $value) {`
`104`	`104`	`return true;`
`105`	`105`	`}`