8000 [SecurityBundle] removed usage of the templating component · symfony/symfony@17240eb · GitHub
[go: up one dir, main page]
Skip to content

Commit 17240eb

Browse files
fabpotfabpot
committed
[SecurityBundle] removed usage of the templating component
1 parent a97cdd6 commit 17240eb

File tree

10 files changed

+13
-17
lines changed

10 files changed

+13
-17
lines changed

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Controller/LoginController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ public function loginAction()
2424
{
2525
$form = $this->container->get('form.factory')->create('Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Form\UserLoginType');
2626

27-
return $this->container->get('templating')->renderResponse('CsrfFormLoginBundle:Login:login.html.twig', array(
27+
return new Response($this->container->get('twig')->render('@CsrfFormLogin/Login/login.html.twig', array(
2828
'form' => $form->createView(),
29-
));
29+
)));
3030
}
3131

3232
public function afterLoginAction()
3333
{
34-
return $this->container->get('templating')->renderResponse('CsrfFormLoginBundle:Login:after_login.html.twig');
34+
return new Response($this->container->get('twig')->render('@CsrfFormLogin/Login/after_login.html.twig'));
3535
}
3636

3737
public function loginCheckAction()

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/after_login.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "::base.html.twig" %}
1+
{% extends "base.html.twig" %}
22

33
{% block body %}
44
Hello {{ app.user.username }}!<br /><br />

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/CsrfFormLoginBundle/Resources/views/Login/login.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "::base.html.twig" %}
1+
{% extends "base.html.twig" %}
22

33
{% block body %}
44

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LocalizedController.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public function loginAction(Request $request)
3030
$error = $request->getSession()->get(Security::AUTHENTICATION_ERROR);
3131
}
3232

33-
return $this->container->get('templating')->renderResponse('FormLoginBundle:Localized:login.html.twig', array(
33+
return new Response($this->container->get('twig')->render('@FormLogin/Localized/login.html.twig', array(
3434
// last username entered by the user
3535
'last_username' => $request->getSession()->get(Security::LAST_USERNAME),
3636
'error' => $error,
37-
));
37+
)));
3838
}
3939

4040
public function loginCheckAction()

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Controller/LoginController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ public function loginAction(Request $request, UserInterface $user = null)
3232
$error = $request->getSession()->get(Security::AUTHENTICATION_ERROR);
3333
}
3434

35-
return $this->container->get('templating')->renderResponse('FormLoginBundle:Login:login.html.twig', array(
35+
return new Response($this->container->get('twig')->render('@FormLogin/Login/login.html.twig', array(
3636
// last username entered by the user
3737
'last_username' => $request->getSession()->get(Security::LAST_USERNAME),
3838
'error' => $error,
39-
));
39+
)));
4040
}
4141

4242
public function afterLoginAction(UserInterface $user)
4343
{
44-
return $this->container->get('templating')->renderResponse('FormLoginBundle:Login:after_login.html.twig', array('user' => $user));
44+
return new Response($this->container->get('twig')->render('@FormLogin/Login/after_login.html.twig', array('user' => $user)));
4545
}
4646

4747
public function loginCheckAction()

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Localized/login.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "::base.html.twig" %}
1+
{% extends "base.html.twig" %}
22

33
{% block body %}
44

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/after_login.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "::base.html.twig" %}
1+
{% extends "base.html.twig" %}
22

33
{% block body %}
44
Hello {{ user.username }}!<br /><br />

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Resources/views/Login/login.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{% extends "::base.html.twig" %}
1+
{% extends "base.html.twig" %}
22

33
{% block body %}
44

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/config/twig.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
framework:
2-
templating: { engines: ['twig'] }
3-
41
# Twig Configuration
52
twig:
63
debug: '%kernel.debug%'

‎src/Symfony/Bundle/SecurityBundle/composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
"symfony/framework-bundle": "~3.1",
3333
"symfony/http-foundation": "~2.8|~3.0",
3434
"symfony/security-acl": "~2.8|~3.0",
35-
"symfony/templating": "~2.8|~3.0",
3635
"symfony/twig-bundle": "~2.8|~3.0",
3736
"symfony/twig-bridge": "~2.8|~3.0",
3837
"symfony/process": "~2.8|~3.0",

0 commit comments

Comments
 (0)
0