From 6c46a807f985084d38e034f36174715d0c6d846c Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 5 Mar 2015 19:47:19 +0100 Subject: [PATCH] psr --- .../Resources/config/schema.xml | 53 ++++++++----------- .../Handler/AuthenticationFailureHandler.php | 2 +- .../Handler/AuthenticationSuccessHandler.php | 13 ++--- 3 files changed, 31 insertions(+), 37 deletions(-) diff --git a/src/Trinity/Bundle/SlideshowBundle/Resources/config/schema.xml b/src/Trinity/Bundle/SlideshowBundle/Resources/config/schema.xml index 6dc537e..40c6066 100644 --- a/src/Trinity/Bundle/SlideshowBundle/Resources/config/schema.xml +++ b/src/Trinity/Bundle/SlideshowBundle/Resources/config/schema.xml @@ -1,32 +1,25 @@ - - - - - - - - - - - - - - - - - - - - - - -
- - -
\ No newline at end of file + namespace="Trinity\Bundle\SlideshowBundle\Model" + defaultIdMethod="native" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:noNamespaceSchemaLocation="http://xsd.propelorm.org/1.6/database.xsd"> + + + + + + + + + + + + + + + + + +
+ diff --git a/src/Trinity/Bundle/UserBundle/Handler/AuthenticationFailureHandler.php b/src/Trinity/Bundle/UserBundle/Handler/AuthenticationFailureHandler.php index bde4c37..95f025f 100644 --- a/src/Trinity/Bundle/UserBundle/Handler/AuthenticationFailureHandler.php +++ b/src/Trinity/Bundle/UserBundle/Handler/AuthenticationFailureHandler.php @@ -43,4 +43,4 @@ class AuthenticationFailureHandler extends DefaultAuthenticationFailureHandler return parent::onAuthenticationFailure($request, $exception); } -} \ No newline at end of file +} diff --git a/src/Trinity/Bundle/UserBundle/Handler/AuthenticationSuccessHandler.php b/src/Trinity/Bundle/UserBundle/Handler/AuthenticationSuccessHandler.php index 16673ee..7bb5522 100644 --- a/src/Trinity/Bundle/UserBundle/Handler/AuthenticationSuccessHandler.php +++ b/src/Trinity/Bundle/UserBundle/Handler/AuthenticationSuccessHandler.php @@ -2,11 +2,11 @@ namespace Trinity\Bundle\UserBundle\Handler; -use \Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler; -use \Symfony\Component\HttpFoundation\Request; -use \Symfony\Component\HttpFoundation\Response; -use \Symfony\Component\Security\Core\Authentication\Token\TokenInterface; -use \Symfony\Component\Security\Http\HttpUtils; +use Symfony\Component\Security\Http\Authentication\DefaultAuthenticationSuccessHandler; +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; +use Symfony\Component\Security\Http\HttpUtils; class AuthenticationSuccessHandler extends DefaultAuthenticationSuccessHandler { @@ -30,9 +30,10 @@ class AuthenticationSuccessHandler extends DefaultAuthenticationSuccessHandler $result = array('success' => true); $response = new Response(json_encode($result)); $response->headers->set('Content-Type', 'application/json'); + return $response; } return parent::onAuthenticationSuccess($request, $token); } -} \ No newline at end of file +}