From e9f5a364b7c168a625aa14ae228ad4ee33224c4d Mon Sep 17 00:00:00 2001 From: Robin Chalas Date: Thu, 20 Oct 2016 20:34:32 +0200 Subject: [PATCH] CS Tweaks and Fixes (#258) --- .../Security/Factory/JWTFactory.php | 3 +++ Services/JWSProvider/LcobucciJWSProvider.php | 14 +++++++------- Services/KeyLoader/RawKeyLoader.php | 2 +- .../SubscribedTokenAuthenticationTest.php | 2 +- .../JWSProvider/AbstractJWSProviderTest.php | 18 ++++++++---------- .../JWSProvider/DefaultJWSProviderTest.php | 4 +++- .../JWSProvider/LcobucciJWSProviderTest.php | 4 +++- 7 files changed, 26 insertions(+), 21 deletions(-) diff --git a/DependencyInjection/Security/Factory/JWTFactory.php b/DependencyInjection/Security/Factory/JWTFactory.php index 8837a583..609efe0f 100644 --- a/DependencyInjection/Security/Factory/JWTFactory.php +++ b/DependencyInjection/Security/Factory/JWTFactory.php @@ -11,6 +11,9 @@ /** * JWTFactory. * + * @deprecated since 2.0, use the "lexik_jwt_authentication.jwt_token_authenticator" Guard + * authenticator instead + * * @author Nicolas Cabot */ class JWTFactory implements SecurityFactoryInterface diff --git a/Services/JWSProvider/LcobucciJWSProvider.php b/Services/JWSProvider/LcobucciJWSProvider.php index d2d8a98b..a32dd636 100644 --- a/Services/JWSProvider/LcobucciJWSProvider.php +++ b/Services/JWSProvider/LcobucciJWSProvider.php @@ -7,14 +7,14 @@ use Lcobucci\JWT\Signer; use Lcobucci\JWT\Signer\Key; use Lcobucci\JWT\ValidationData; -use Lexik\Bundle\JWTAuthenticationBundle\Services\KeyLoader\KeyLoaderInterface; +use Lexik\Bundle\JWTAuthenticationBundle\Services\KeyLoader\RawKeyLoader; use Lexik\Bundle\JWTAuthenticationBundle\Signature\CreatedJWS; use Lexik\Bundle\JWTAuthenticationBundle\Signature\LoadedJWS; class LcobucciJWSProvider implements JWSProviderInterface { /** - * @var KeyLoaderInterface + * @var RawKeyLoader */ private $keyLoader; @@ -29,14 +29,14 @@ class LcobucciJWSProvider implements JWSProviderInterface private $ttl; /** - * @param KeyLoaderInterface $keyLoader - * @param string $cryptoEngine - * @param string $signatureAlgorithm - * @param int $ttl + * @param RawKeyLoader $keyLoader + * @param string $cryptoEngine + * @param string $signatureAlgorithm + * @param int $ttl * * @throws \InvalidArgumentException If the given algorithm|engine is not supported */ - public function __construct(KeyLoaderInterface $keyLoader, $cryptoEngine, $signatureAlgorithm, $ttl) + public function __construct(RawKeyLoader $keyLoader, $cryptoEngine, $signatureAlgorithm, $ttl) { $this->keyLoader = $keyLoader; $this->signer = $this->getSignerForAlgorithm($signatureAlgorithm); diff --git a/Services/KeyLoader/RawKeyLoader.php b/Services/KeyLoader/RawKeyLoader.php index ab0eb6cc..bc68dad2 100644 --- a/Services/KeyLoader/RawKeyLoader.php +++ b/Services/KeyLoader/RawKeyLoader.php @@ -10,7 +10,7 @@ class RawKeyLoader extends AbstractKeyLoader { /** - * {@inheritdoc} + * @param string $type * * @return string * diff --git a/Tests/Functional/SubscribedTokenAuthenticationTest.php b/Tests/Functional/SubscribedTokenAuthenticationTest.php index fa1e566b..3167db9a 100644 --- a/Tests/Functional/SubscribedTokenAuthenticationTest.php +++ b/Tests/Functional/SubscribedTokenAuthenticationTest.php @@ -82,7 +82,7 @@ public function testAccessSecuredRouteWithExpiredToken($fail = true) $response = $e->getResponse(); if ($response instanceof JWTAuthenticationFailureResponse) { - $e->getResponse()->setMessage('Custom JWT Expired Token message'); + $response->setMessage('Custom JWT Expired Token message'); } }); diff --git a/Tests/Services/JWSProvider/AbstractJWSProviderTest.php b/Tests/Services/JWSProvider/AbstractJWSProviderTest.php index ba4559b1..1d039dc1 100644 --- a/Tests/Services/JWSProvider/AbstractJWSProviderTest.php +++ b/Tests/Services/JWSProvider/AbstractJWSProviderTest.php @@ -58,6 +58,7 @@ abstract class AbstractJWSProviderTest extends \PHPUnit_Framework_TestCase '; protected static $providerClass; + protected static $keyLoaderClass; /** * Tests to create a signed JWT Token. @@ -69,14 +70,14 @@ public function testCreate() ->expects($this->once()) ->method('loadKey') ->with('private') - ->willReturn(self::$privateKey); + ->willReturn(static::$privateKey); $keyLoaderMock ->expects($this->once()) ->method('getPassphrase') ->willReturn('foobar'); $payload = ['username' => 'chalasr']; - $jwsProvider = new self::$providerClass($keyLoaderMock, 'openssl', 'RS384', 3600); + $jwsProvider = new static::$providerClass($keyLoaderMock, 'openssl', 'RS384', 3600); $this->assertInstanceOf(CreatedJWS::class, $created = $jwsProvider->create($payload)); @@ -95,9 +96,9 @@ public function testLoad($jwt) ->expects($this->once()) ->method('loadKey') ->with('public') - ->willReturn(self::$publicKey); + ->willReturn(static::$publicKey); - $jwsProvider = new self::$providerClass($keyLoaderMock, 'openssl', 'RS384', 3600); + $jwsProvider = new static::$providerClass($keyLoaderMock, 'openssl', 'RS384', 3600); $loadedJWS = $jwsProvider->load($jwt); $this->assertInstanceOf(LoadedJWS::class, $loadedJWS); @@ -113,16 +114,13 @@ public function testLoad($jwt) */ public function testInvalidsignatureAlgorithm() { - new self::$providerClass($this->getKeyLoaderMock(), 'openssl', 'wrongAlgorithm', 3600); + new static::$providerClass($this->getKeyLoaderMock(), 'openssl', 'wrongAlgorithm', 3600); } - /** - * @return \PHPUnit_Framework_MockObject_MockObject - */ - protected function getKeyLoaderMock() + private function getKeyLoaderMock() { return $this - ->getMockBuilder('Lexik\Bundle\JWTAuthenticationBundle\Services\KeyLoader\KeyLoaderInterface') + ->getMockBuilder(static::$keyLoaderClass) ->disableOriginalConstructor() ->getMock(); } diff --git a/Tests/Services/JWSProvider/DefaultJWSProviderTest.php b/Tests/Services/JWSProvider/DefaultJWSProviderTest.php index 68cf5114..16a7b63b 100644 --- a/Tests/Services/JWSProvider/DefaultJWSProviderTest.php +++ b/Tests/Services/JWSProvider/DefaultJWSProviderTest.php @@ -3,6 +3,7 @@ namespace Lexik\Bundle\JWTAuthenticationBundle\Tests\Services\JWSProvider; use Lexik\Bundle\JWTAuthenticationBundle\Services\JWSProvider\DefaultJWSProvider; +use Lexik\Bundle\JWTAuthenticationBundle\Services\KeyLoader\KeyLoaderInterface; /** * Tests the DefaultJWSProvider. @@ -13,6 +14,7 @@ final class DefaultJWSProviderTest extends AbstractJWSProviderTest { public function __construct() { - self::$providerClass = DefaultJWSProvider::class; + self::$providerClass = DefaultJWSProvider::class; + self::$keyLoaderClass = KeyLoaderInterface::class; } } diff --git a/Tests/Services/JWSProvider/LcobucciJWSProviderTest.php b/Tests/Services/JWSProvider/LcobucciJWSProviderTest.php index 5c114a60..e3a79410 100644 --- a/Tests/Services/JWSProvider/LcobucciJWSProviderTest.php +++ b/Tests/Services/JWSProvider/LcobucciJWSProviderTest.php @@ -3,6 +3,7 @@ namespace Lexik\Bundle\JWTAuthenticationBundle\Tests\Services\JWSProvider; use Lexik\Bundle\JWTAuthenticationBundle\Services\JWSProvider\LcobucciJWSProvider; +use Lexik\Bundle\JWTAuthenticationBundle\Services\KeyLoader\RawKeyLoader; /** * Tests the LcobucciJWSProvider. @@ -13,6 +14,7 @@ final class LcobucciJWSProviderTest extends AbstractJWSProviderTest { public function __construct() { - self::$providerClass = LcobucciJWSProvider::class; + self::$providerClass = LcobucciJWSProvider::class; + self::$keyLoaderClass = RawKeyLoader::class; } }