[HttpKernel] added a unit test to demonstrate that passing objects works for inline controllers

fabpot · fabpot · commit 43ce368deaf9 · 2013-07-12T09:33:20.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php b/src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
@@ -64,13 +64,11 @@ protected function generateFragmentUri(ControllerReference $reference, Request $
 
     private function checkNonScalar($values)
     {
-        foreach ($values as $value) {
+        foreach ($values as $key => $value) {
             if (is_array($value)) {
                 $this->checkNonScalar($value);
-            }
-
-            if (!is_scalar($value)) {
-                throw new \LogicException('Controller attributes cannot contain non-scalar values.');
+            } elseif (!is_scalar($value)) {
+                throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar values (value for key "%s" is not a scalar).', $key));
             }
         }
     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/InlineFragmentRendererTest.php
@@ -71,6 +71,24 @@ public function testRenderWithObjectsAsAttributes()
         $strategy->render(new ControllerReference('main_controller', array('object' => $object), array()), Request::create('/'));
     }
 
+    public function testRenderWithObjectsAsAttributesPassedAsObjectsInTheController()
+    {
+        $resolver = $this->getMock('Symfony\\Component\\HttpKernel\\Controller\\ControllerResolver', array('getController'));
+        $resolver
+            ->expects($this->once())
+            ->method('getController')
+            ->will($this->returnValue(function (\stdClass $object, Bar $object1) {
+                return new Response($object1->getBar());
+            }))
+        ;
+
+        $kernel = new HttpKernel(new EventDispatcher(), $resolver);
+        $renderer = new InlineFragmentRenderer($kernel);
+
+        $response = $renderer->render(new ControllerReference('main_controller', array('object' => new \stdClass(), 'object1' => new Bar()), array()), Request::create('/'));
+        $this->assertEquals('bar', $response->getContent());
+    }
+
     /**
      * @expectedException \RuntimeException
      */
@@ -168,3 +186,12 @@ public function testESIHeaderIsKeptInSubrequest()
         $strategy->render('/', $request);
     }
 }
+
+class Bar {
+    public $bar = 'bar';
+
+    public function getBar()
+    {
+        return $this->bar;
+    }
+}
diff --git a/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php b/src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
@@ -47,14 +47,21 @@ public function testGenerateFragmentUriWithARequest()
 
     /**
      * @expectedException LogicException
+     * @dataProvider      getGenerateFragmentUriDataWithNonScalar
      */
-    public function testGenerateFragmentUriWithObject()
+    public function testGenerateFragmentUriWithNonScalar($controller)
     {
-        $controller = new ControllerReference('controller', array('foo' => new Foo(), 'bar' => 'bar'), array());
-
         $this->callGenerateFragmentUriMethod($controller, Request::create('/'));
     }
 
+    public function getGenerateFragmentUriDataWithNonScalar()
+    {
+        return array(
+            array(new ControllerReference('controller', array('foo' => new Foo(), 'bar' => 'bar'), array())),
+            array(new ControllerReference('controller', array('foo' => array('foo' => 'foo'), 'bar' => array('bar' => new Foo())), array())),
+        );
+    }
+
     private function callGenerateFragmentUriMethod(ControllerReference $reference, Request $request)
     {
         $renderer = $this->getMockForAbstractClass('Symfony\Component\HttpKernel\Fragment\RoutableFragmentRenderer');

Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,11 @@ protected function generateFragmentUri(ControllerReference $reference, Request $`
`64`	`64`
`65`	`65`	`private function checkNonScalar($values)`
`66`	`66`	`{`
`67`		`- foreach ($values as $value) {`
	`67`	`+ foreach ($values as $key => $value) {`
`68`	`68`	`if (is_array($value)) {`
`69`	`69`	`$this->checkNonScalar($value);`
`70`		`- }`
`71`		`-`
`72`		`- if (!is_scalar($value)) {`
`73`		`- throw new \LogicException('Controller attributes cannot contain non-scalar values.');`
	`70`	`+ } elseif (!is_scalar($value)) {`
	`71`	`+ throw new \LogicException(sprintf('Controller attributes cannot contain non-scalar values (value for key "%s" is not a scalar).', $key));`
`74`	`72`	`}`
`75`	`73`	`}`
`76`	`74`	`}`