Fix CS

.php_cs

@@ -1,21 +1,14 @@
 <?php
 
-$finder = Symfony\CS\Finder\DefaultFinder::create()
-    ->in(array(__DIR__))
-;
+$finder = PhpCsFixer\Finder::create()->in([__DIR__]);
 
-return Symfony\CS\Config\Config::create()
-    ->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
-    ->fixers(array(
-        '-phpdoc_scalar',
-        '-extra_empty_lines',
-        '-unalign_double_arrow',
-        '-unalign_equals',
-        'align_double_arrow',
-        'newline_after_open_tag',
-        'ordered_use',
-        'short_array_syntax',
-    ))
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        'ordered_imports' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'phpdoc_scalar' => false,
+    ])
     ->setUsingCache(false)
-    ->finder($finder)
+    ->setFinder($finder);
 ;

Command/CheckConfigCommand.php

@@ -22,7 +22,7 @@ class CheckConfigCommand extends Command
 
     public function __construct(KeyLoaderInterface $keyLoader, $signatureAlgorithm)
     {
-        $this->keyLoader          = $keyLoader;
+        $this->keyLoader = $keyLoader;
         $this->signatureAlgorithm = $signatureAlgorithm;
 
         parent::__construct();

Command/GenerateTokenCommand.php

@@ -28,7 +28,7 @@ public function __construct(JWTTokenManagerInterface $tokenManager, \Traversable
     {
         parent::__construct();
 
-        $this->tokenManager  = $tokenManager;
+        $this->tokenManager = $tokenManager;
         $this->userProviders = $userProviders;
     }
 

DependencyInjection/Configuration.php

@@ -109,7 +109,7 @@ public function getConfigTreeBuilder()
     private function getTokenExtractorsNode()
     {
         $builder = new TreeBuilder('token_extractors');
-        $node = \method_exists(TreeBuilder::class, 'getRootNode') ? $builder->getRootNode() : $builder->root('token_extractors');
+        $node = $builder->getRootNode();
         $node
             ->addDefaultsIfNotSet()
             ->children()

DependencyInjection/LexikJWTAuthenticationExtension.php

@@ -27,7 +27,7 @@ class LexikJWTAuthenticationExtension extends Extension
     public function load(array $configs, ContainerBuilder $container)
     {
         $configuration = new Configuration();
-        $config        = $this->processConfiguration($configuration, $configs);
+        $config = $this->processConfiguration($configuration, $configs);
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
 
@@ -63,7 +63,6 @@ public function load(array $configs, ContainerBuilder $container)
             $e->setPath('lexik_jwt_authentication');
 
             throw $e;
-
         }
 
         $container->setParameter('lexik_jwt_authentication.pass_phrase', $config['pass_phrase']);

DependencyInjection/Security/Factory/JWTFactory.php

@@ -158,9 +158,8 @@ public function addConfiguration(NodeDefinition $node)
     /**
      * Create an entry point, by default it sends a 401 header and ends the request.
      *
-     * @param ContainerBuilder $container
-     * @param string           $id
-     * @param mixed            $defaultEntryPoint
+     * @param string $id
+     * @param mixed  $defaultEntryPoint
      *
      * @return string
      */

Encoder/HeaderAwareJWTEncoderInterface.php

@@ -10,9 +10,6 @@
 interface HeaderAwareJWTEncoderInterface extends JWTEncoderInterface
 {
     /**
-     * @param array $data
-     * @param array $header
-     *
      * @return string the encoded token string
      *
      * @throws JWTEncodeFailureException If an error occurred while trying to create

Encoder/JWTEncoderInterface.php

@@ -13,8 +13,6 @@
 interface JWTEncoderInterface
 {
     /**
-     * @param array $data
-     *
      * @return string the encoded token string
      *
      * @throws JWTEncodeFailureException If an error occurred while trying to create

Encoder/LcobucciJWTEncoder.php

@@ -18,9 +18,6 @@ class LcobucciJWTEncoder implements JWTEncoderInterface, HeaderAwareJWTEncoderIn
      */
     protected $jwsProvider;
 
-    /**
-     * @param JWSProviderInterface $jwsProvider
-     */
     public function __construct(JWSProviderInterface $jwsProvider)
     {
         $this->jwsProvider = $jwsProvider;

Event/AuthenticationFailureEvent.php

@@ -24,14 +24,10 @@ class AuthenticationFailureEvent extends Event
      */
     protected $response;
 
-    /**
-     * @param AuthenticationException $exception
-     * @param Response                $response
-     */
     public function __construct(AuthenticationException $exception, Response $response)
     {
         $this->exception = $exception;
-        $this->response  = $response;
+        $this->response = $response;
     }
 
     /**
@@ -50,9 +46,6 @@ public function getResponse()
         return $this->response;
     }
 
-    /**
-     * @param Response $response
-     */
     public function setResponse(Response $response)
     {
         $this->response = $response;

Event/AuthenticationSuccessEvent.php

@@ -28,15 +28,10 @@ class AuthenticationSuccessEvent extends Event
      */
     protected $response;
 
-    /**
-     * @param array         $data
-     * @param UserInterface $user
-     * @param Response      $response
-     */
     public function __construct(array $data, UserInterface $user, Response $response)
     {
-        $this->data     = $data;
-        $this->user     = $user;
+        $this->data = $data;
+        $this->user = $user;
         $this->response = $response;
     }
 
@@ -48,9 +43,6 @@ public function getData()
         return $this->data;
     }
 
-    /**
-     * @param array $data
-     */
     public function setData(array $data)
     {
         $this->data = $data;

Event/JWTAuthenticatedEvent.php

@@ -20,14 +20,10 @@ class JWTAuthenticatedEvent extends Event
      */
     protected $token;
 
-    /**
-     * @param array          $payload
-     * @param TokenInterface $token
-     */
     public function __construct(array $payload, TokenInterface $token)
     {
         $this->payload = $payload;
-        $this->token   = $token;
+        $this->token = $token;
     }
 
     /**
@@ -38,9 +34,6 @@ public function getPayload()
         return $this->payload;
     }
 
-    /**
-     * @param array $payload
-     */
     public function setPayload(array $payload)
     {
         $this->payload = $payload;

Event/JWTCreatedEvent.php

@@ -25,15 +25,10 @@ class JWTCreatedEvent extends Event
      */
     protected $user;
 
-    /**
-     * @param array         $data
-     * @param UserInterface $user
-     * @param array         $header
-     */
     public function __construct(array $data, UserInterface $user, array $header = [])
     {
-        $this->data   = $data;
-        $this->user   = $user;
+        $this->data = $data;
+        $this->user = $user;
         $this->header = $header;
     }
 
@@ -45,9 +40,6 @@ public function getHeader()
         return $this->header;
     }
 
-    /**
-     * @param array $header
-     */
     public function setHeader(array $header)
     {
         $this->header = $header;
@@ -61,9 +53,6 @@ public function getData()
         return $this->data;
     }
 
-    /**
-     * @param array $data
-     */
     public function setData(array $data)
     {
         $this->data = $data;

Event/JWTDecodedEvent.php

@@ -21,9 +21,6 @@ class JWTDecodedEvent extends Event
      */
     protected $isValid;
 
-    /**
-     * @param array $payload
-     */
     public function __construct(array $payload)
     {
         $this->payload = $payload;
@@ -38,9 +35,6 @@ public function getPayload()
         return $this->payload;
     }
 
-    /**
-     * @param array $payload
-     */
     public function setPayload(array $payload)
     {
         $this->payload = $payload;

Event/JWTFailureEventInterface.php

@@ -30,8 +30,6 @@ public function getException();
     /**
      * Calling this allows to return a custom Response immediately after
      * the corresponding implementation of this event is dispatched.
-     *
-     * @param Response $response
      */
     public function setResponse(Response $response);
 }

Event/JWTNotFoundEvent.php

@@ -13,13 +13,9 @@
  */
 class JWTNotFoundEvent extends AuthenticationFailureEvent implements JWTFailureEventInterface
 {
-    /**
-     * @param AuthenticationException|null $exception
-     * @param Response|null                $response
-     */
     public function __construct(AuthenticationException $exception = null, Response $response = null)
     {
         $this->exception = $exception;
-        $this->response  = $response;
+        $this->response = $response;
     }
 }

Exception/JWTDecodeFailureException.php

@@ -9,9 +9,9 @@
  */
 class JWTDecodeFailureException extends JWTFailureException
 {
-    const INVALID_TOKEN    = 'invalid_token';
+    const INVALID_TOKEN = 'invalid_token';
 
     const UNVERIFIED_TOKEN = 'unverified_token';
 
-    const EXPIRED_TOKEN    = 'expired_token';
+    const EXPIRED_TOKEN = 'expired_token';
 }

Exception/UserNotFoundException.php

@@ -17,7 +17,7 @@ class UserNotFoundException extends AuthenticationException
     public function __construct(string $userIdentityField, string $identity)
     {
         $this->userIdentityField = $userIdentityField;
-        $this->identity          = $identity;
+        $this->identity = $identity;
     }
 
     /**

Helper/JWTSplitter.php

@@ -33,6 +33,7 @@ public function __construct(string $jwt)
 
     /**
      * @param array $parts
+     *
      * @return string
      */
     public function getParts($parts = [])

Response/JWTAuthenticationFailureResponse.php

@@ -13,7 +13,9 @@
  */
 final class JWTAuthenticationFailureResponse extends JsonResponse
 {
-    public function __construct(string $message = 'Bad credentials', string $statusCode = JsonResponse::HTTP_UNAUTHORIZED)
+    private $message;
+
+    public function __construct(string $message = 'Bad credentials', int $statusCode = JsonResponse::HTTP_UNAUTHORIZED)
     {
         $this->message = $message;
 

Response/JWTAuthenticationSuccessResponse.php

@@ -2,7 +2,6 @@
 
 namespace Lexik\Bundle\JWTAuthenticationBundle\Response;
 
-use Symfony\Component\HttpFoundation\Cookie;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**

Security/Authentication/Provider/JWTProvider.php

@@ -8,11 +8,11 @@
 use Lexik\Bundle\JWTAuthenticationBundle\Security\Authentication\Token\JWTUserToken;
 use Lexik\Bundle\JWTAuthenticationBundle\Security\Guard\JWTTokenAuthenticator;
 use Lexik\Bundle\JWTAuthenticationBundle\Services\JWTManagerInterface;
-use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
 use Symfony\Component\Security\Core\User\UserProviderInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * JWTProvider.
@@ -50,10 +50,7 @@ class JWTProvider implements AuthenticationProviderInterface
     private $userIdClaim;
 
     /**
-     * @param UserProviderInterface    $userProvider
-     * @param JWTManagerInterface      $jwtManager
-     * @param EventDispatcherInterface $dispatcher
-     * @param string                   $userIdClaim
+     * @param string $userIdClaim
      */
     public function __construct(
         UserProviderInterface $userProvider,
@@ -63,11 +60,11 @@ public function __construct(
     ) {
         @trigger_error(sprintf('The "%s" class is deprecated since version 2.0 and will be removed in 3.0. See "%s" instead.', __CLASS__, JWTTokenAuthenticator::class), E_USER_DEPRECATED);
 
-        $this->userProvider      = $userProvider;
-        $this->jwtManager        = $jwtManager;
-        $this->dispatcher        = $dispatcher;
+        $this->userProvider = $userProvider;
+        $this->jwtManager = $jwtManager;
+        $this->dispatcher = $dispatcher;
         $this->userIdentityField = 'username';
-        $this->userIdClaim       = $userIdClaim;
+        $this->userIdClaim = $userIdClaim;
     }
 
     /**
@@ -99,8 +96,6 @@ public function authenticate(TokenInterface $token)
      * Load user from payload, using username by default.
      * Override this to load by another property.
      *
-     * @param array $payload
-     *
      * @return \Symfony\Component\Security\Core\User\UserInterface
      */
     protected function getUserFromPayload(array $payload)

Security/Authentication/Token/PreAuthenticationJWTUserTokenInterface.php

@@ -6,9 +6,7 @@
 
 interface PreAuthenticationJWTUserTokenInterface extends GuardTokenInterface
 {
-
     /**
-     * @param array $payload
      * @return void
      */
     public function setPayload(array $payload);