From b43baac802bd6cdd4ead4f84c93bb8619596a2ec Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Tue, 21 Aug 2018 09:56:51 +0200 Subject: [PATCH] Cache --- src/Gist/Controller/Controller.php | 20 ++++++++++++++------ src/Gist/Controller/EditController.php | 4 ++-- src/Gist/Controller/LoginController.php | 4 ++-- src/Gist/Controller/MyController.php | 2 +- src/Gist/Controller/ViewController.php | 8 ++++---- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/Gist/Controller/Controller.php b/src/Gist/Controller/Controller.php index b77fa11..d239e5c 100644 --- a/src/Gist/Controller/Controller.php +++ b/src/Gist/Controller/Controller.php @@ -159,11 +159,10 @@ abstract class Controller * * @param string $template * @param array $params - * @param bool $renderResponse * * @return string */ - public function render($template, array $params = null, $renderResponse = true) + public function render($template, array $params = null) { $app = $this->getApp(); @@ -175,14 +174,23 @@ abstract class Controller $params['user'] = $this->getUser(); } - $body = $app['twig']->render( + return $app['twig']->render( $template, $params ); + } - if (!$renderResponse) { - return $body; - } + /** + * Creates a Response. + * + * @param string $template + * @param array $params + * + * @return Response + */ + public function createResponse($template, array $params = null) + { + $body = $this->render($template, $params); $response = new Response($body); diff --git a/src/Gist/Controller/EditController.php b/src/Gist/Controller/EditController.php index cc7271f..0eb82d6 100644 --- a/src/Gist/Controller/EditController.php +++ b/src/Gist/Controller/EditController.php @@ -55,7 +55,7 @@ class EditController extends Controller } } - return $this->render( + return $this->createResponse( 'Edit/index.html.twig', array( 'gist' => isset($gist) ? $gist : null, @@ -110,6 +110,6 @@ class EditController extends Controller $viewOptions['form'] = $form->createView(); - return $this->render('Edit/clone.html.twig', $viewOptions); + return $this->createResponse('Edit/clone.html.twig', $viewOptions); } } diff --git a/src/Gist/Controller/LoginController.php b/src/Gist/Controller/LoginController.php index 5547be3..6732462 100644 --- a/src/Gist/Controller/LoginController.php +++ b/src/Gist/Controller/LoginController.php @@ -57,7 +57,7 @@ class LoginController extends Controller } } - return $this->render( + return $this->createResponse( 'Login/register.html.twig', [ 'form' => $form->createView(), @@ -97,7 +97,7 @@ class LoginController extends Controller $error = $app['translator']->trans('login.login.invalid'); } - return $this->render( + return $this->createResponse( 'Login/login.html.twig', [ 'form' => $form->createView(), diff --git a/src/Gist/Controller/MyController.php b/src/Gist/Controller/MyController.php index 9b4a170..3367ffa 100644 --- a/src/Gist/Controller/MyController.php +++ b/src/Gist/Controller/MyController.php @@ -120,7 +120,7 @@ class MyController extends Controller } } - return $this->render( + return $this->createResponse( 'My/my.html.twig', array( 'gists' => $gists, diff --git a/src/Gist/Controller/ViewController.php b/src/Gist/Controller/ViewController.php index d80d3b3..48c9a75 100644 --- a/src/Gist/Controller/ViewController.php +++ b/src/Gist/Controller/ViewController.php @@ -31,7 +31,7 @@ class ViewController extends Controller $viewOptions = $this->getViewOptions($request, $gist, $commit); if (is_array($viewOptions)) { - return $this->render('View/view.html.twig', $viewOptions); + return $this->createResponse('View/view.html.twig', $viewOptions); } else { return $this->notFoundResponse(); } @@ -53,7 +53,7 @@ class ViewController extends Controller $viewOptions = $this->getViewOptions($request, $gist, $commit); if (is_array($viewOptions)) { - return $app['twig']->render('View/embed.html.twig', $viewOptions); + return $app['twig']->createResponse('View/embed.html.twig', $viewOptions); } else { return $this->notFoundResponse(); } @@ -73,7 +73,7 @@ class ViewController extends Controller $viewOptions = $this->getViewOptions($request, $gist, $commit); return new Response( - $this->render('View/embedJs.html.twig', $viewOptions, false), + $this->render('View/embedJs.html.twig', $viewOptions), 200, array( 'Content-Type' => 'text/javascript', @@ -165,7 +165,7 @@ class ViewController extends Controller return $this->notFoundResponse(); } - return $this->render( + return $this->createResponse( 'View/revisions.html.twig', array( 'gist' => $gist,