Merge pull request #437 from GrahamCampbell/patch-1

Use the laravel preset, nearly
tymondesigns · Jan 27, 2016 · 676fa41 · 676fa41
2 parents eda599a + 25011a4
commit 676fa41
Show file tree

Hide file tree

Showing 17 changed files with 52 additions and 67 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -1,22 +1,12 @@
-preset: psr2
+preset: laravel
 
 enabled:
-  - duplicate_semicolon
-  - extra_empty_lines
-  - logical_not_operators_with_successor_space
-  - phpdoc_scalar
-  - return
-  - short_array_syntax
-  - single_quote
-  - spaces_cast
-  - standardize_not_equal
-  - ternary_spaces
-  - trim_array_spaces
+  - concat_with_spaces
   - unalign_double_arrow
-  - unalign_equals
-  - unneeded_control_parentheses
-  - unused_use
-  - whitespacy_lines
+
+disabled:
+  - concat_without_spaces
+  - phpdoc_short_description
 
 linting: true
 

diff --git a/src/Claims/Factory.php b/src/Claims/Factory.php
@@ -23,7 +23,7 @@ class Factory
         'iss' => Issuer::class,
         'jti' => JwtId::class,
         'nbf' => NotBefore::class,
-        'sub' => Subject::class
+        'sub' => Subject::class,
     ];
 
     /**

diff --git a/src/Commands/JWTGenerateSecretCommand.php b/src/Commands/JWTGenerateSecretCommand.php
@@ -57,7 +57,7 @@ public function fire()
 
                 if ($confirmed) {
                     file_put_contents($path, str_replace(
-                        'JWT_SECRET='.$this->laravel['config']['jwt.secret'], 'JWT_SECRET='.$key, file_get_contents($path)
+                        'JWT_SECRET=' . $this->laravel['config']['jwt.secret'], 'JWT_SECRET=' . $key, file_get_contents($path)
                     ));
                 } else {
                     return $this->comment('Phew... No changes were made to your secret key.');

diff --git a/src/Http/AuthHeaders.php b/src/Http/AuthHeaders.php
@@ -57,7 +57,7 @@ public function parse(Request $request)
         $header = $request->headers->get($this->header, $this->fromAltHeaders($request));
 
         if (! $header || ! Str::startsWith(strtolower($header), $this->prefix)) {
-            return null;
+            return;
         }
 
         return trim(str_ireplace($this->prefix, '', $header));

diff --git a/src/Http/LumenRouteParams.php b/src/Http/LumenRouteParams.php
@@ -28,10 +28,10 @@ public function parse(Request $request)
         // It will only work with poorly-specified aspects of certain Lumen releases.
         $route = $request->route();
 
-        if (! is_array($route) || ! array_has($route, '2.'.$this->key)) {
+        if (! is_array($route) || ! array_has($route, '2.' . $this->key)) {
             // Route is not the expected kind of array, or does not have a parameter
             // with the key we want.
-            return null;
+            return;
         }
 
         return $route[2][$this->key];

diff --git a/src/Http/Parser.php b/src/Http/Parser.php
@@ -87,7 +87,7 @@ public function parseToken()
             }
         }
 
-        return null;
+        return;
     }
 
     /**

diff --git a/src/Http/RouteParams.php b/src/Http/RouteParams.php
@@ -37,7 +37,7 @@ public function parse(Request $request)
         if (! is_callable([$route, 'parameter'])) {
             // Route may not be an instance of Illuminate\Routing\Route (it's an array
             // in Lumen <5.2) or not exist at all (if the request was never dispatched)
-            return null;
+            return;
         }
 
         return $route->parameter($this->key);

diff --git a/src/JWTGuard.php b/src/JWTGuard.php
@@ -68,7 +68,7 @@ public function user()
         }
 
         if (! $this->requireToken()->check()) {
-            return null;
+            return;
         }
 
         $id = $this->jwt->getPayload()->get('sub');
@@ -149,8 +149,6 @@ public function tokenById($id)
         if (! is_null($user = $this->provider->retrieveById($id))) {
             return $this->jwt->fromUser($user);
         }
-
-        return null;
     }
 
     /**

diff --git a/src/Validators/PayloadValidator.php b/src/Validators/PayloadValidator.php
@@ -17,8 +17,6 @@
 
 /**
  * Class PayloadValidator
- *
- * @package Tymon\JWTAuth\Validators
  */
 class PayloadValidator extends Validator
 {

diff --git a/tests/BlacklistTest.php b/tests/BlacklistTest.php
@@ -66,7 +66,7 @@ public function it_should_add_a_valid_token_to_the_blacklist()
             'exp' => new Expiration(123 + 3600),
             'nbf' => new NotBefore(123),
             'iat' => new IssuedAt(123),
-            'jti' => new JwtId('foo')
+            'jti' => new JwtId('foo'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
 
@@ -82,7 +82,7 @@ public function it_should_add_a_token_with_no_exp_to_the_blacklist_forever()
             'iss' => new Issuer('http://example.com'),
             'nbf' => new NotBefore(123),
             'iat' => new IssuedAt(123),
-            'jti' => new JwtId('foo')
+            'jti' => new JwtId('foo'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
 
@@ -99,7 +99,7 @@ public function it_should_return_true_when_adding_an_expired_token_to_the_blackl
             'exp' => new Expiration(123 - 3600),
             'nbf' => new NotBefore(123),
             'iat' => new IssuedAt(123),
-            'jti' => new JwtId('foo')
+            'jti' => new JwtId('foo'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator, true);
 
@@ -116,7 +116,7 @@ public function it_should_check_whether_a_token_has_been_blacklisted()
             'exp' => new Expiration(123 + 3600),
             'nbf' => new NotBefore(123),
             'iat' => new IssuedAt(123),
-            'jti' => new JwtId('foobar')
+            'jti' => new JwtId('foobar'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
 
@@ -134,7 +134,7 @@ public function it_should_check_whether_a_token_has_been_blacklisted_forever()
             'exp' => new Expiration(123 + 3600),
             'nbf' => new NotBefore(123),
             'iat' => new IssuedAt(123),
-            'jti' => new JwtId('foobar')
+            'jti' => new JwtId('foobar'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
 
@@ -152,7 +152,7 @@ public function it_should_check_whether_a_token_has_been_blacklisted_when_the_to
             'exp' => new Expiration(123 + 3600),
             'nbf' => new NotBefore(123),
             'iat' => new IssuedAt(123),
-            'jti' => new JwtId('foobar')
+            'jti' => new JwtId('foobar'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
 
@@ -170,7 +170,7 @@ public function it_should_remove_a_token_from_the_blacklist()
             'exp' => new Expiration(123 + 3600),
             'nbf' => new NotBefore(123),
             'iat' => new IssuedAt(123),
-            'jti' => new JwtId('foobar')
+            'jti' => new JwtId('foobar'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
 
@@ -187,7 +187,7 @@ public function it_should_set_a_custom_unique_key_for_the_blacklist()
             'exp' => new Expiration(123 + 3600),
             'nbf' => new NotBefore(123),
             'iat' => new IssuedAt(123),
-            'jti' => new JwtId('foobar')
+            'jti' => new JwtId('foobar'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
 

diff --git a/tests/Http/ParserTest.php b/tests/Http/ParserTest.php
@@ -32,7 +32,7 @@ public function it_should_return_the_token_from_the_authorization_header()
         $parser->setChainOrder([
             new QueryString,
             new AuthHeaders,
-            new RouteParams
+            new RouteParams,
         ]);
 
         $this->assertSame($parser->parseToken(), 'foobar');
@@ -51,7 +51,7 @@ public function it_should_return_the_token_from_the_alt_authorization_headers()
         $parser = new Parser($request1, [
             new AuthHeaders,
             new QueryString,
-            new RouteParams
+            new RouteParams,
         ]);
 
         $this->assertSame($parser->parseToken(), 'foobar');
@@ -71,7 +71,7 @@ public function it_should_return_the_token_from_query_string()
         $parser->setChainOrder([
             new AuthHeaders,
             new QueryString,
-            new RouteParams
+            new RouteParams,
         ]);
 
         $this->assertSame($parser->parseToken(), 'foobar');
@@ -90,7 +90,7 @@ public function it_should_return_the_token_from_route()
         $parser->setChainOrder([
             new AuthHeaders,
             new QueryString,
-            new RouteParams
+            new RouteParams,
         ]);
 
         $this->assertSame($parser->parseToken(), 'foobar');
@@ -102,14 +102,14 @@ public function it_should_ignore_routeless_requests()
     {
         $request = Request::create('foo', 'GET', ['foo' => 'bar']);
         $request->setRouteResolver(function () {
-            return null;
+            return;
         });
 
         $parser = new Parser($request);
         $parser->setChainOrder([
             new AuthHeaders,
             new QueryString,
-            new RouteParams
+            new RouteParams,
         ]);
 
         $this->assertNull($parser->parseToken());
@@ -121,14 +121,14 @@ public function it_should_ignore_lumen_request_arrays()
     {
         $request = Request::create('foo', 'GET', ['foo' => 'bar']);
         $request->setRouteResolver(function () {
-            return [false, ['uses'=>'someController'], ['token'=>'foobar']];
+            return [false, ['uses' => 'someController'], ['token' => 'foobar']];
         });
 
         $parser = new Parser($request);
         $parser->setChainOrder([
             new AuthHeaders,
             new QueryString,
-            new RouteParams
+            new RouteParams,
         ]);
 
         $this->assertNull($parser->parseToken());
@@ -140,14 +140,14 @@ public function it_should_accept_lumen_request_arrays_with_special_class()
     {
         $request = Request::create('foo', 'GET', ['foo' => 'bar']);
         $request->setRouteResolver(function () {
-            return [false, ['uses'=>'someController'], ['token'=>'foobar']];
+            return [false, ['uses' => 'someController'], ['token' => 'foobar']];
         });
 
         $parser = new Parser($request);
         $parser->setChainOrder([
             new AuthHeaders,
             new QueryString,
-            new LumenRouteParams
+            new LumenRouteParams,
         ]);
 
         $this->assertSame($parser->parseToken(), 'foobar');
@@ -166,7 +166,7 @@ public function it_should_return_null_if_no_token_in_request()
         $parser->setChainOrder([
             new AuthHeaders,
             new QueryString,
-            new RouteParams
+            new RouteParams,
         ]);
 
         $this->assertNull($parser->parseToken());
@@ -179,7 +179,7 @@ public function it_should_retrieve_the_chain()
         $chain = [
             new AuthHeaders,
             new QueryString,
-            new RouteParams
+            new RouteParams,
         ];
 
         $parser = new Parser(Mockery::mock('Illuminate\Http\Request'));

diff --git a/tests/ManagerTest.php b/tests/ManagerTest.php
@@ -75,7 +75,7 @@ public function it_should_encode_a_payload()
             new Expiration(123 + 3600),
             new NotBefore(123),
             new IssuedAt(123),
-            new JwtId('foo')
+            new JwtId('foo'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
 
@@ -95,7 +95,7 @@ public function it_should_decode_a_token()
             new Expiration(123 + 3600),
             new NotBefore(123),
             new IssuedAt(123),
-            new JwtId('foo')
+            new JwtId('foo'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
         $token = new Token('foo.bar.baz');
@@ -125,7 +125,7 @@ public function it_should_throw_exception_when_token_is_blacklisted()
             new Expiration(123 + 3600),
             new NotBefore(123),
             new IssuedAt(123),
-            new JwtId('foo')
+            new JwtId('foo'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
         $token = new Token('foo.bar.baz');
@@ -150,7 +150,7 @@ public function it_should_refresh_a_token()
             new Expiration(123 - 3600),
             new NotBefore(123),
             new IssuedAt(123),
-            new JwtId('foo')
+            new JwtId('foo'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator, true);
         $token = new Token('foo.bar.baz');
@@ -181,7 +181,7 @@ public function it_should_invalidate_a_token()
             new Expiration(123 + 3600),
             new NotBefore(123),
             new IssuedAt(123),
-            new JwtId('foo')
+            new JwtId('foo'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
         $token = new Token('foo.bar.baz');
@@ -208,7 +208,7 @@ public function it_should_force_invalidate_a_token_forever()
             new Expiration(123 + 3600),
             new NotBefore(123),
             new IssuedAt(123),
-            new JwtId('foo')
+            new JwtId('foo'),
         ];
         $payload = new Payload(Collection::make($claims), $this->validator);
         $token = new Token('foo.bar.baz');

diff --git a/tests/Middleware/RefreshTokenTest.php b/tests/Middleware/RefreshTokenTest.php
@@ -26,7 +26,6 @@ class RefreshTokenTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Mockery\MockInterface
      */
-
     protected $request;
     /**
      * @var \Tymon\JWTAuth\Middleware\RefreshToken

diff --git a/tests/PayloadTest.php b/tests/PayloadTest.php
@@ -42,7 +42,7 @@ public function setUp()
             'exp' => new Expiration(time() + 3600),
             'nbf' => new NotBefore(time()),
             'iat' => new IssuedAt(time()),
-            'jti' => new JwtId('foo')
+            'jti' => new JwtId('foo'),
         ];
 
         $this->validator = Mockery::mock('Tymon\JWTAuth\Validators\PayloadValidator');

diff --git a/tests/Providers/Storage/IlluminateTest.php b/tests/Providers/Storage/IlluminateTest.php
@@ -102,7 +102,7 @@ private function emulateTags()
         $this->cache->shouldReceive('tags')->with('tymon.jwt')->once()->andReturn(Mockery::self());
     }
 
-        /** @test */
+    /** @test */
     public function it_should_add_the_item_to_tagged_storage()
     {
         $this->emulateTags();

diff --git a/tests/Stubs/UserStub.php b/tests/Stubs/UserStub.php
@@ -24,7 +24,7 @@ public function getJWTCustomClaims()
     {
         return [
             'foo' => 'bar',
-            'role' => 'admin'
+            'role' => 'admin',
         ];
     }
 }