This commit is contained in:
Simon Vieille 2018-08-21 09:56:51 +02:00
parent 2ac9737409
commit b43baac802
No known key found for this signature in database
GPG key ID: 919533E2B946EA10
5 changed files with 23 additions and 15 deletions

View file

@ -159,11 +159,10 @@ abstract class Controller
* *
* @param string $template * @param string $template
* @param array $params * @param array $params
* @param bool $renderResponse
* *
* @return string * @return string
*/ */
public function render($template, array $params = null, $renderResponse = true) public function render($template, array $params = null)
{ {
$app = $this->getApp(); $app = $this->getApp();
@ -175,14 +174,23 @@ abstract class Controller
$params['user'] = $this->getUser(); $params['user'] = $this->getUser();
} }
$body = $app['twig']->render( return $app['twig']->render(
$template, $template,
$params $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); $response = new Response($body);

View file

@ -55,7 +55,7 @@ class EditController extends Controller
} }
} }
return $this->render( return $this->createResponse(
'Edit/index.html.twig', 'Edit/index.html.twig',
array( array(
'gist' => isset($gist) ? $gist : null, 'gist' => isset($gist) ? $gist : null,
@ -110,6 +110,6 @@ class EditController extends Controller
$viewOptions['form'] = $form->createView(); $viewOptions['form'] = $form->createView();
return $this->render('Edit/clone.html.twig', $viewOptions); return $this->createResponse('Edit/clone.html.twig', $viewOptions);
} }
} }

View file

@ -57,7 +57,7 @@ class LoginController extends Controller
} }
} }
return $this->render( return $this->createResponse(
'Login/register.html.twig', 'Login/register.html.twig',
[ [
'form' => $form->createView(), 'form' => $form->createView(),
@ -97,7 +97,7 @@ class LoginController extends Controller
$error = $app['translator']->trans('login.login.invalid'); $error = $app['translator']->trans('login.login.invalid');
} }
return $this->render( return $this->createResponse(
'Login/login.html.twig', 'Login/login.html.twig',
[ [
'form' => $form->createView(), 'form' => $form->createView(),

View file

@ -120,7 +120,7 @@ class MyController extends Controller
} }
} }
return $this->render( return $this->createResponse(
'My/my.html.twig', 'My/my.html.twig',
array( array(
'gists' => $gists, 'gists' => $gists,

View file

@ -31,7 +31,7 @@ class ViewController extends Controller
$viewOptions = $this->getViewOptions($request, $gist, $commit); $viewOptions = $this->getViewOptions($request, $gist, $commit);
if (is_array($viewOptions)) { if (is_array($viewOptions)) {
return $this->render('View/view.html.twig', $viewOptions); return $this->createResponse('View/view.html.twig', $viewOptions);
} else { } else {
return $this->notFoundResponse(); return $this->notFoundResponse();
} }
@ -53,7 +53,7 @@ class ViewController extends Controller
$viewOptions = $this->getViewOptions($request, $gist, $commit); $viewOptions = $this->getViewOptions($request, $gist, $commit);
if (is_array($viewOptions)) { if (is_array($viewOptions)) {
return $app['twig']->render('View/embed.html.twig', $viewOptions); return $app['twig']->createResponse('View/embed.html.twig', $viewOptions);
} else { } else {
return $this->notFoundResponse(); return $this->notFoundResponse();
} }
@ -73,7 +73,7 @@ class ViewController extends Controller
$viewOptions = $this->getViewOptions($request, $gist, $commit); $viewOptions = $this->getViewOptions($request, $gist, $commit);
return new Response( return new Response(
$this->render('View/embedJs.html.twig', $viewOptions, false), $this->render('View/embedJs.html.twig', $viewOptions),
200, 200,
array( array(
'Content-Type' => 'text/javascript', 'Content-Type' => 'text/javascript',
@ -165,7 +165,7 @@ class ViewController extends Controller
return $this->notFoundResponse(); return $this->notFoundResponse();
} }
return $this->render( return $this->createResponse(
'View/revisions.html.twig', 'View/revisions.html.twig',
array( array(
'gist' => $gist, 'gist' => $gist,