Fixes #48 and #50

Spomky-Labs · May 30, 2020 · 2984144 · 2984144
1 parent ee7a0dd
commit 2984144
Show file tree

Hide file tree

Showing 27 changed files with 195 additions and 150 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -2,7 +2,7 @@
 
 $header = 'The MIT License (MIT)
 
-Copyright (c) 2014-2019 Spomky-Labs
+Copyright (c) 2014-2020 Spomky-Labs
 
 This software may be modified and distributed under the terms
 of the MIT license.  See the LICENSE file for details.';
@@ -14,7 +14,6 @@ $finder = PhpCsFixer\Finder::create()
     ->in(__DIR__.'/Features')
     ->in(__DIR__.'/Resources')
     ->in(__DIR__.'/Tests')
-    ->path(__DIR__.'/SpomkyLabsLexikJoseBundle.php')
 ;
 
 return PhpCsFixer\Config::create()
@@ -57,6 +56,11 @@ return PhpCsFixer\Config::create()
             'style' => 'annotation',
         ],
         'php_unit_test_case_static_method_calls' => true,
+        'global_namespace_import' => [
+            'import_classes' => true,
+            'import_constants' => true,
+            'import_functions' => true,
+        ],
     ])
     ->setRiskyAllowed(true)
     ->setUsingCache(true)

diff --git a/Checker/AlgHeaderChecker.php b/Checker/AlgHeaderChecker.php
@@ -5,14 +5,15 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2019 Spomky-Labs
+ * Copyright (c) 2014-2020 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
 namespace SpomkyLabs\LexikJoseBundle\Checker;
 
+use function is_string;
 use Jose\Component\Checker\HeaderChecker;
 use Jose\Component\Checker\InvalidHeaderException;
 use function Safe\sprintf;
@@ -37,7 +38,7 @@ public function __construct(string $algorithm)
      */
     public function checkHeader($algorithm): void
     {
-        if (!\is_string($algorithm)) {
+        if (!is_string($algorithm)) {
             throw new InvalidHeaderException('The value of the header "alg" is not valid', 'alg', $algorithm);
         }
 

diff --git a/Checker/EncHeaderChecker.php b/Checker/EncHeaderChecker.php
@@ -5,14 +5,15 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2019 Spomky-Labs
+ * Copyright (c) 2014-2020 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
 namespace SpomkyLabs\LexikJoseBundle\Checker;
 
+use function is_string;
 use Jose\Component\Checker\HeaderChecker;
 use Jose\Component\Checker\InvalidHeaderException;
 use function Safe\sprintf;
@@ -37,7 +38,7 @@ public function __construct(string $algorithm)
      */
     public function checkHeader($algorithm): void
     {
-        if (!\is_string($algorithm)) {
+        if (!is_string($algorithm)) {
             throw new InvalidHeaderException('The value of the header "enc" is not valid', 'enc', $algorithm);
         }
 

diff --git a/Checker/IssuerChecker.php b/Checker/IssuerChecker.php
@@ -5,14 +5,15 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2019 Spomky-Labs
+ * Copyright (c) 2014-2020 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
 namespace SpomkyLabs\LexikJoseBundle\Checker;
 
+use Exception;
 use Jose\Component\Checker\ClaimChecker;
 use Jose\Component\Checker\HeaderChecker;
 use function Safe\sprintf;
@@ -45,7 +46,7 @@ public function supportedClaim(): string
     public function checkClaim($issuer): void
     {
         if ($this->issuer !== $issuer) {
-            throw new \Exception(sprintf('The issuer "%s" is not allowed.', $issuer));
+            throw new Exception(sprintf('The issuer "%s" is not allowed.', $issuer));
         }
     }
 

diff --git a/DependencyInjection/Compiler/EncryptionSupportCompilerPass.php b/DependencyInjection/Compiler/EncryptionSupportCompilerPass.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2019 Spomky-Labs
+ * Copyright (c) 2014-2020 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.

diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
@@ -5,15 +5,15 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2019 Spomky-Labs
+ * Copyright (c) 2014-2020 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
 namespace SpomkyLabs\LexikJoseBundle\DependencyInjection;
 
-use Assert\Assertion;
+use RuntimeException;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -27,7 +27,9 @@ public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('lexik_jose');
         $rootNode = $treeBuilder->getRootNode();
-        Assertion::isInstanceOf($rootNode, ArrayNodeDefinition::class, 'Invalid root node');
+        if (!$rootNode instanceof ArrayNodeDefinition) {
+            throw new RuntimeException('Invalid root node');
+        }
         $rootNode
             ->addDefaultsIfNotSet()
             ->children()

diff --git a/DependencyInjection/SpomkyLabsLexikJoseExtension.php b/DependencyInjection/SpomkyLabsLexikJoseExtension.php
@@ -5,14 +5,15 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2019 Spomky-Labs
+ * Copyright (c) 2014-2020 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
  */
 
 namespace SpomkyLabs\LexikJoseBundle\DependencyInjection;
 
+use function array_key_exists;
 use Jose\Bundle\JoseFramework\Helper\ConfigurationHelper;
 use SpomkyLabs\LexikJoseBundle\Encoder\LexikJoseEncoder;
 use Symfony\Component\Config\FileLocator;
@@ -75,7 +76,7 @@ public function prepend(ContainerBuilder $container): void
     {
         $isDebug = $container->getParameter('kernel.debug');
         $bridgeConfig = current($container->getExtensionConfig($this->getAlias()));
-        if (!\array_key_exists('claim_checked', $bridgeConfig)) {
+        if (!array_key_exists('claim_checked', $bridgeConfig)) {
             $bridgeConfig['claim_checked'] = [];
         }
         $claim_aliases = array_merge(
@@ -96,11 +97,6 @@ public function prepend(ContainerBuilder $container): void
         $container->prependExtensionConfig('lexik_jwt_authentication', $lexikConfig);
     }
 
-    /**
-     * @param ContainerBuilder $container
-     * @param array            $bridgeConfig
-     * @param bool             $isDebug
-     */
     private function enableEncryptionSupport(ContainerBuilder $container, array $bridgeConfig, bool $isDebug): void
     {
         ConfigurationHelper::addJWEBuilder($container, $this->getAlias(), [$bridgeConfig['encryption']['key_encryption_algorithm']], [$bridgeConfig['encryption']['content_encryption_algorithm']], ['DEF'], $isDebug);

diff --git a/Encoder/LexikJoseEncoder.php b/Encoder/LexikJoseEncoder.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2019 Spomky-Labs
+ * Copyright (c) 2014-2020 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
@@ -15,6 +15,7 @@
 
 use Base64Url\Base64Url;
 use Exception;
+use function is_string;
 use Jose\Component\Checker\ClaimCheckerManager;
 use Jose\Component\Checker\HeaderCheckerManager;
 use Jose\Component\Checker\InvalidClaimException;
@@ -134,16 +135,7 @@ final class LexikJoseEncoder implements JWTEncoderInterface
     /**
      * LexikJoseEncoder constructor.
      *
-     * @param JWSBuilder           $jwsBuilder
-     * @param JWSVerifier          $jwsLoader
-     * @param ClaimCheckerManager  $claimCheckerManager
-     * @param HeaderCheckerManager $signatureHeaderCheckerManager
-     * @param JWKSet               $signatureKeyset
-     * @param int|string           $signatureKeyIndex
-     * @param string               $signatureAlgorithm
-     * @param string               $issuer
-     * @param int                  $ttl
-     * @param array                $mandatoryClaims
+     * @param int|string $signatureKeyIndex
      */
     public function __construct(JWSBuilder $jwsBuilder,
                                 JWSVerifier $jwsLoader,
@@ -171,13 +163,7 @@ public function __construct(JWSBuilder $jwsBuilder,
     }
 
     /**
-     * @param JWEBuilder           $jweBuilder
-     * @param JWEDecrypter         $jweLoader
-     * @param HeaderCheckerManager $encryptionHeaderCheckerManager
-     * @param JWKSet               $encryptionKeyset
-     * @param int|string           $encryptionKeyIndex
-     * @param string               $keyEncryptionAlgorithm
-     * @param string               $contentEncryptionAlgorithm
+     * @param int|string $encryptionKeyIndex
      */
     public function enableEncryptionSupport(JWEBuilder $jweBuilder, JWEDecrypter $jweLoader, HeaderCheckerManager $encryptionHeaderCheckerManager, JWKSet $encryptionKeyset, $encryptionKeyIndex, string $keyEncryptionAlgorithm, string $contentEncryptionAlgorithm): void
     {
@@ -208,11 +194,6 @@ public function encode(array $payload): string
         }
     }
 
-    /**
-     * @param array $payload
-     *
-     * @return string
-     */
     private function sign(array $payload): string
     {
         $payload += $this->getAdditionalPayload();
@@ -233,11 +214,6 @@ private function sign(array $payload): string
         return $serializer->serialize($jws, 0);
     }
 
-    /**
-     * @param string $jws
-     *
-     * @return string
-     */
     public function encrypt(string $jws): string
     {
         $headers = $this->getEncryptionHeader();
@@ -260,11 +236,7 @@ public function encrypt(string $jws): string
     }
 
     /**
-     * @param string $token
-     *
      * @throws JWTDecodeFailureException
-     *
-     * @return string
      */
     private function decrypt(string $token): string
     {
@@ -279,15 +251,11 @@ private function decrypt(string $token): string
     }
 
     /**
-     * @param string $token
-     *
      * @throws InvalidClaimException
      * @throws InvalidHeaderException
      * @throws JWTDecodeFailureException
      * @throws MissingMandatoryClaimException
      * @throws MissingMandatoryHeaderParameterException
-     *
-     * @return array
      */
     private function verify(string $token): array
     {
@@ -298,7 +266,7 @@ private function verify(string $token): array
             throw new JWTDecodeFailureException('decoding_error', 'An error occurred while trying to verify the JWT token.');
         }
         $jwt = $jws->getPayload();
-        if (!\is_string($jwt)) {
+        if (!is_string($jwt)) {
             throw new JWTDecodeFailureException('decoding_error', 'An error occurred while trying to verify the JWT token.');
         }
 
@@ -336,9 +304,6 @@ public function decode($token): array
         }
     }
 
-    /**
-     * @return array
-     */
     private function getAdditionalPayload(): array
     {
         return [
@@ -350,9 +315,6 @@ private function getAdditionalPayload(): array
         ];
     }
 
-    /**
-     * @return array
-     */
     private function getSignatureHeader(): array
     {
         return [
@@ -362,9 +324,6 @@ private function getSignatureHeader(): array
         ];
     }
 
-    /**
-     * @return array
-     */
     private function getEncryptionHeader(): array
     {
         return [

diff --git a/Resources/config/encryption_services.php b/Resources/config/encryption_services.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2019 Spomky-Labs
+ * Copyright (c) 2014-2020 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
@@ -15,7 +15,7 @@
 use SpomkyLabs\LexikJoseBundle\Checker\EncHeaderChecker;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 
-return function (ContainerConfigurator $container) {
+return static function (ContainerConfigurator $container): void {
     $container = $container->services()->defaults()
         ->private()
         ->autoconfigure()

diff --git a/Resources/config/services.php b/Resources/config/services.php
@@ -5,7 +5,7 @@
 /*
  * The MIT License (MIT)
  *
- * Copyright (c) 2014-2019 Spomky-Labs
+ * Copyright (c) 2014-2020 Spomky-Labs
  *
  * This software may be modified and distributed under the terms
  * of the MIT license.  See the LICENSE file for details.
@@ -18,7 +18,7 @@
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\ref;
 
-return function (ContainerConfigurator $container) {
+return static function (ContainerConfigurator $container): void {
     $container = $container->services()->defaults()
         ->private()
         ->autoconfigure()