Coding standards

Author: Loek van der Linde

src/AppBundle/Controller/TokenController.php

@@ -2,6 +2,7 @@
 
 namespace AppBundle\Controller;
 
+use AppBundle\Exception\InvalidRequestArgumentException;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -25,14 +26,14 @@ public function newTokenAction(Request $request)
         $user = $repository->findOneBy(['username' => $username]);
 
         if (is_null($user)) {
-            throw new BadCredentialsException();
+            throw new InvalidRequestArgumentException('User not found', 401);
         }
 
         $encoder = $this->get('security.password_encoder');
         $passwordValid = $encoder->isPasswordValid($user, $password);
 
         if (!$passwordValid) {
-            throw new BadCredentialsException();
+            throw new InvalidRequestArgumentException('Password invalid', 401);
         }
 
         $tokenEncoder = $this->get('lexik_jwt_authentication.encoder');

src/AppBundle/DataFixtures/ORM/LoadUserData.php

@@ -20,7 +20,8 @@ class LoadUserData implements FixtureInterface, ContainerAwareInterface
      *
      * @param ObjectManager $manager
      */
-    public function load(ObjectManager $manager) {
+    public function load(ObjectManager $manager)
+    {
         $user = new User();
 
         $plainPassword = 'unsafepassword';
@@ -39,7 +40,8 @@ public function load(ObjectManager $manager) {
      *
      * @param ContainerInterface|null $container A ContainerInterface instance or null
      */
-    public function setContainer(ContainerInterface $container = NULL) {
+    public function setContainer(ContainerInterface $container = null)
+    {
         $this->container = $container;
     }
 }

src/AppBundle/Entity/User.php

@@ -112,7 +112,8 @@ public function getPassword()
      *
      * @return (Role|string)[] The user roles
      */
-    public function getRoles() {
+    public function getRoles()
+    {
         return ['ROLE_USER'];
     }
 
@@ -123,7 +124,8 @@ public function getRoles() {
      *
      * @return string|null The salt
      */
-    public function getSalt() {
+    public function getSalt()
+    {
         return null;
     }
 
@@ -133,7 +135,8 @@ public function getSalt() {
      * This is important if, at any given point, sensitive information like
      * the plain-text password is stored on this object.
      */
-    public function eraseCredentials() {
+    public function eraseCredentials()
+    {
     }
 
     /**
@@ -142,7 +145,8 @@ public function eraseCredentials() {
      * @return string the string representation of the object or null
      * @since 5.1.0
      */
-    public function serialize() {
+    public function serialize()
+    {
         return serialize([
             $this->id,
             $this->username,
@@ -159,12 +163,12 @@ public function serialize() {
      * @return void
      * @since 5.1.0
      */
-    public function unserialize($serialized) {
+    public function unserialize($serialized)
+    {
         list (
             $this->id,
             $this->username,
             $this->password
             ) = unserialize($serialized);
     }
 }
-

src/AppBundle/EventDispatcher/Listener/InvalidRequestArgumentListener.php

@@ -27,10 +27,13 @@ public function onInvalidRequestArgumentException(GetResponseForExceptionEvent $
             ],
         ];
 
+        $statusCode = $exception->getCode();
+
         if ($responseData['error'][0]['code'] === 0) {
             $responseData['error'][0]['code'] = Response::HTTP_BAD_REQUEST;
+            $statusCode = Response::HTTP_BAD_REQUEST;
         }
 
-        $event->setResponse(new JsonResponse($responseData, Response::HTTP_BAD_REQUEST));
+        $event->setResponse(new JsonResponse($responseData, $statusCode));
     }
 }

src/AppBundle/Security/JwtTokenAuthenticator.php

@@ -51,7 +51,8 @@ public function __construct(JWTEncoderInterface $encoder, EntityManager $em)
      *
      * @return Response
      */
-    public function start(Request $request, AuthenticationException $authException = NULL) {
+    public function start(Request $request, AuthenticationException $authException = null)
+    {
         return new JsonResponse([
             'error' => 'Auth required'
         ], 401);
@@ -83,7 +84,8 @@ public function start(Request $request, AuthenticationException $authException =
      *
      * @return mixed|null
      */
-    public function getCredentials(Request $request) {
+    public function getCredentials(Request $request)
+    {
         $tokenExctractor = new AuthorizationHeaderTokenExtractor(
             'Bearer',
             'Authorization'
@@ -113,7 +115,8 @@ public function getCredentials(Request $request) {
      *
      * @return UserInterface|null
      */
-    public function getUser($credentials, UserProviderInterface $userProvider) {
+    public function getUser($credentials, UserProviderInterface $userProvider)
+    {
         try {
             $data = $this->encoder->decode($credentials);
         } catch (JWTDecodeFailureException $e) {
@@ -143,7 +146,8 @@ public function getUser($credentials, UserProviderInterface $userProvider) {
      *
      * @throws AuthenticationException
      */
-    public function checkCredentials($credentials, UserInterface $user) {
+    public function checkCredentials($credentials, UserInterface $user)
+    {
         // We've done all stuff like password checking before, so nothing needs to happen here
         return true;
     }
@@ -162,7 +166,8 @@ public function checkCredentials($credentials, UserInterface $user) {
      *
      * @return Response|null
      */
-    public function onAuthenticationFailure(Request $request, AuthenticationException $exception) {
+    public function onAuthenticationFailure(Request $request, AuthenticationException $exception)
+    {
         // TODO: Implement onAuthenticationFailure() method.
     }
 
@@ -181,7 +186,8 @@ public function onAuthenticationFailure(Request $request, AuthenticationExceptio
      *
      * @return Response|null
      */
-    public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey) {
+    public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey)
+    {
         return null;
     }
 
@@ -198,7 +204,8 @@ public function onAuthenticationSuccess(Request $request, TokenInterface $token,
      *
      * @return bool
      */
-    public function supportsRememberMe() {
+    public function supportsRememberMe()
+    {
         return false;
     }
 }