properly set request attributes in controller test

xabbuh · xabbuh · commit 8facb9ba16cf · 2014-11-21T16:18:07.000+01:00
diff --git a/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php b/src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
@@ -122,7 +122,7 @@ protected function findTemplate(Request $request, $format, $code, $showException
         // default to a generic HTML exception
         $request->setRequestFormat('html');
 
-        return new TemplateReference('TwigBundle', 'Exception', $this->debug ? 'exception_full' : $name, 'html', 'twig');
+        return new TemplateReference('TwigBundle', 'Exception', $name, 'html', 'twig');
     }
 
     // to be removed when the minimum required version of Twig is >= 2.0
diff --git a/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php b/src/Symfony/Bundle/TwigBundle/Tests/Controller/ExceptionControllerTest.php
@@ -51,7 +51,8 @@ public function testShowActionCanBeForcedToShowErrorPage()
             ))
         );
 
-        $request = Request::create('whatever', 'GET', array('showException' => false));
+        $request = Request::create('whatever', 'GET');
+        $request->attributes->set('showException', false);
         $exception = FlattenException::create(new \Exception(), 404);
         $controller = new ExceptionController($twig, /* "showException" defaults to --> */ true);
 

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ protected function findTemplate(Request $request, $format, $code, $showException`
`122`	`122`	`// default to a generic HTML exception`
`123`	`123`	`$request->setRequestFormat('html');`
`124`	`124`
`125`		`- return new TemplateReference('TwigBundle', 'Exception', $this->debug ? 'exception_full' : $name, 'html', 'twig');`
	`125`	`+ return new TemplateReference('TwigBundle', 'Exception', $name, 'html', 'twig');`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`// to be removed when the minimum required version of Twig is >= 2.0`