Updating some code that was correct in the script, but had gotten lost in the finish product of the code

weaverryan · weaverryan · commit 3e0cdb954c8b · 2013-09-23T13:45:03.000-05:00
diff --git a/finish/app/config/config.yml b/finish/app/config/config.yml
@@ -4,6 +4,11 @@ imports:
     - { resource: "@EventBundle/Resources/config/services.yml" }
     - { resource: "@UserBundle/Resources/config/services.yml" }
 
+services:
+    yoda_event.controller.exception_controller:
+        parent: twig.controller.exception
+        class:  Yoda\EventBundle\Controller\ExceptionController
+
 framework:
     #esi:             ~
     translator:      { fallback: %locale% }
@@ -24,7 +29,7 @@ framework:
 twig:
     debug:            %kernel.debug%
     strict_variables: %kernel.debug%
-    exception_controller: "EventBundle:Exception:show"
+    exception_controller: "yoda_event.controller.exception_controller:showAction"
 
 # Assetic Configuration
 assetic:
diff --git a/finish/src/Yoda/EventBundle/Controller/ExceptionController.php b/finish/src/Yoda/EventBundle/Controller/ExceptionController.php
@@ -4,26 +4,27 @@
 
 use Symfony\Bundle\TwigBundle\Controller\ExceptionController as BaseController;
 use Symfony\Component\HttpKernel\Exception\FlattenException;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;
 
 class ExceptionController extends BaseController
 {
     private $exceptionClass;
 
-    public function showAction(FlattenException $exception, DebugLoggerInterface $logger = null, $format = 'html')
+    public function showAction(Request $request, FlattenException $exception, DebugLoggerInterface $logger = null, $format = 'html')
     {
         $this->exceptionClass = $exception->getClass();
 
-        return parent::showAction($exception, $logger, $format);
+        return parent::showAction($request, $exception, $logger, $format);
     }
 
-    protected function findTemplate($templating, $format, $code, $debug)
+    protected function findTemplate(Request $request, $format, $code, $debug)
     {
         if (!$debug && $this->exceptionClass == 'Yoda\EventBundle\Exception\EventNotFoundException') {
             return 'EventBundle:Exception:error404.html.twig';
         }
 
-        return parent::findTemplate($templating, $format, $code, $debug);
+        return parent::findTemplate($request, $format, $code, $debug);
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -4,26 +4,27 @@`
`4`	`4`
`5`	`5`	`use Symfony\Bundle\TwigBundle\Controller\ExceptionController as BaseController;`
`6`	`6`	`use Symfony\Component\HttpKernel\Exception\FlattenException;`
	`7`	`+use Symfony\Component\HttpFoundation\Request;`
`7`	`8`	`use Symfony\Component\HttpKernel\Log\DebugLoggerInterface;`
`8`	`9`
`9`	`10`	`class ExceptionController extends BaseController`
`10`	`11`	`{`
`11`	`12`	`private $exceptionClass;`
`12`	`13`
`13`		`- public function showAction(FlattenException $exception, DebugLoggerInterface $logger = null, $format = 'html')`
	`14`	`+ public function showAction(Request $request, FlattenException $exception, DebugLoggerInterface $logger = null, $format = 'html')`
`14`	`15`	`{`
`15`	`16`	`$this->exceptionClass = $exception->getClass();`
`16`	`17`
`17`		`- return parent::showAction($exception, $logger, $format);`
	`18`	`+ return parent::showAction($request, $exception, $logger, $format);`
`18`	`19`	`}`
`19`	`20`
`20`		`- protected function findTemplate($templating, $format, $code, $debug)`
	`21`	`+ protected function findTemplate(Request $request, $format, $code, $debug)`
`21`	`22`	`{`
`22`	`23`	`if (!$debug && $this->exceptionClass == 'Yoda\EventBundle\Exception\EventNotFoundException') {`
`23`	`24`	`return 'EventBundle:Exception:error404.html.twig';`
`24`	`25`	`}`
`25`	`26`
`26`		`- return parent::findTemplate($templating, $format, $code, $debug);`
	`27`	`+ return parent::findTemplate($request, $format, $code, $debug);`
`27`	`28`	`}`
`28`	`29`
`29`	`30`