Merge pull request #325 from spira/analysis-zR3wK8

Applied fixes from StyleCI
spira · Dec 17, 2015 · 6eedd3d · 6eedd3d
2 parents 3b29ed2 + dcb74b4
commit 6eedd3d
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 27 deletions.
diff --git a/api/app/Console/Commands/CreateUserCommand.php b/api/app/Console/Commands/CreateUserCommand.php
@@ -60,7 +60,7 @@ public function handle()
         $validator = Validator::make($userData, $validationRules);
 
         if ($validator->fails()) {
-            $this->error("Validation failed:");
+            $this->error('Validation failed:');
             // @codeCoverageIgnoreStart
             if (env('APP_ENV') != 'testing') {
                 (new Dumper)->dump($validator->errors()->toArray());
@@ -76,7 +76,7 @@ public function handle()
 
         $user->setCredential(new UserCredential(['password' => $password]));
 
-        $this->info("Successfully created user:");
+        $this->info('Successfully created user:');
 
         // @codeCoverageIgnoreStart
         if (env('APP_ENV') != 'testing') {

diff --git a/api/app/Models/User.php b/api/app/Models/User.php
@@ -66,7 +66,7 @@ class User extends IndexedModel implements AuthenticatableContract, SocialiteAut
     ];
 
     /**
-     * Model validation
+     * Model validation.
      * @param null $entityId
      * @return array
      */

diff --git a/api/app/Providers/AuthDriverServiceProvider.php b/api/app/Providers/AuthDriverServiceProvider.php
@@ -37,10 +37,10 @@ protected function getPayloadGenerators()
 
                     return $transformer->transformItem($user);
                 },
-                'method' => function (SocialiteAuthenticatable $user) { return $user->getCurrentAuthMethod() ?: 'password';},
-                'iss' => function () use ($request) { return $request->getHttpHost();},
-                'aud' => function () use ($request) { return str_replace('api.', '', $request->getHttpHost());},
-                'sub' => function (Authenticatable $user) {return $user->getAuthIdentifier();},
+                'method' => function (SocialiteAuthenticatable $user) { return $user->getCurrentAuthMethod() ?: 'password'; },
+                'iss' => function () use ($request) { return $request->getHttpHost(); },
+                'aud' => function () use ($request) { return str_replace('api.', '', $request->getHttpHost()); },
+                'sub' => function (Authenticatable $user) {return $user->getAuthIdentifier(); },
             ]
         );
     }

diff --git a/api/src/Auth/Providers/JWTAuthDriverServiceProvider.php b/api/src/Auth/Providers/JWTAuthDriverServiceProvider.php
@@ -261,11 +261,11 @@ protected function getPayloadGenerators()
         $request = $this->app['request'];
 
         return [
-            'iss' => function () use ($request) { return $request->url();},
-            'iat' => function () { return Carbon::now()->format('U');},
-            'exp' => function () { return Carbon::now()->addMinutes($this->ttl)->format('U');},
-            'nbf' => function () { return Carbon::now()->format('U');},
-            'jti' => function () { return str_random(16);},
+            'iss' => function () use ($request) { return $request->url(); },
+            'iat' => function () { return Carbon::now()->format('U'); },
+            'exp' => function () { return Carbon::now()->addMinutes($this->ttl)->format('U'); },
+            'nbf' => function () { return Carbon::now()->format('U'); },
+            'jti' => function () { return str_random(16); },
         ];
     }
 

diff --git a/api/src/Rbac/Access/Gate.php b/api/src/Rbac/Access/Gate.php
@@ -118,7 +118,7 @@ public function check($itemName, $arguments = [])
      */
     public function forUser(Authenticatable $user)
     {
-        return new static($this->getStorage(), function () use ($user) {return $user;}, $this->defaultRoles);
+        return new static($this->getStorage(), function () use ($user) {return $user; }, $this->defaultRoles);
     }
 
     /**

diff --git a/api/tests/Auth/PayloadFactoryTest.php b/api/tests/Auth/PayloadFactoryTest.php
@@ -26,7 +26,7 @@ public function testFactory()
         $user = m::mock(Authenticatable::class);
         $this->assertEquals($array, $factory->createFromUser($user));
 
-        $factory->addPayloadGenerator('user', function ($user) {return $user;});
+        $factory->addPayloadGenerator('user', function ($user) {return $user; });
 
         $array['user'] = $user;
 

diff --git a/api/tests/Auth/PayloadValidatorFactoryTest.php b/api/tests/Auth/PayloadValidatorFactoryTest.php
@@ -17,21 +17,21 @@ public function testFactory()
     {
         $payload = ['one' => true, 'two' => 'two'];
         $closure = [
-            'one' => function ($payload) {return $payload['one'];},
+            'one' => function ($payload) {return $payload['one']; },
         ];
 
         $factory = new PayloadValidationFactory($closure);
         $this->assertNull($factory->validatePayload($payload));
 
-        $factory->addValidationRule('two', function ($payload) {return $payload['two'] == 'two';});
+        $factory->addValidationRule('two', function ($payload) {return $payload['two'] == 'two'; });
         $this->assertNull($factory->validatePayload($payload));
     }
 
     public function testRuleFailed()
     {
         $payload = ['one' => true, 'two' => 'two'];
         $closure = [
-            'one' => function () {return false;},
+            'one' => function () {return false; },
         ];
 
         $factory = new PayloadValidationFactory($closure);
@@ -42,7 +42,7 @@ public function testRuleFailed()
     public function testMissingRule()
     {
         $closure = [
-            'three' => function ($payload) {return true;},
+            'three' => function ($payload) {return true; },
         ];
 
         $factory = new PayloadValidationFactory($closure);

diff --git a/api/tests/CommandTest.php b/api/tests/CommandTest.php
@@ -45,7 +45,6 @@ public function testGenerateKeysCommandMakeDirectory()
 
     public function testCreateUserCommand()
     {
-
         $email = 'john.command.example@example.com';
         $name = 'John';
         $username = 'john';
@@ -67,17 +66,15 @@ public function testCreateUserCommand()
         $this->assertEquals($name, $userCreated->first_name);
         $this->assertEquals($username, $userCreated->username);
 
-        $this->assertTrue($userCreated->roles->contains(function ($key, Role $roleModel) use ($role){
+        $this->assertTrue($userCreated->roles->contains(function ($key, Role $roleModel) use ($role) {
             return $roleModel->key == $role;
         }), 'Role is applied');
 
         $this->assertTrue(Auth::attempt(['email' => $email, 'password' => $password]), 'Credentials work.');
-
     }
 
     public function testCreateInvalidUserCommand()
     {
-
         $email = 'invalid-email';
         $name = 'John';
         $username = 'john';
@@ -101,7 +98,7 @@ public function testCreateInvalidUserCommand()
     private function mockUserCreateCommand($email, $name, $username, $password, $role)
     {
         /** @var CreateUserCommand $cmd */
-        $cmd = Mockery::mock(CreateUserCommand::class . "[ask, secret, choice, info, error]");
+        $cmd = Mockery::mock(CreateUserCommand::class.'[ask, secret, choice, info, error]');
 
         $cmd->shouldReceive('ask')
             ->with('Enter email')
@@ -127,8 +124,7 @@ private function mockUserCreateCommand($email, $name, $username, $password, $rol
             ->with('What roles should be applied? (comma separate options)', ROLE::$roles, null, null, true)
             ->once()
             ->andReturn([$role]);
+
         return $cmd;
     }
-
-
 }
diff --git a/api/tests/integration/AuthTest.php b/api/tests/integration/AuthTest.php
@@ -550,8 +550,8 @@ public function testValidateCustomPayload()
     {
         /** @var Guard $guard */
         $guard = $this->app['auth'];
-        $guard->getPayloadFactory()->addPayloadGenerator('foo', function () {return 'foo';});
-        $guard->getValidationFactory()->addValidationRule('foo', function () { return false;});
+        $guard->getPayloadFactory()->addPayloadGenerator('foo', function () {return 'foo'; });
+        $guard->getValidationFactory()->addValidationRule('foo', function () { return false; });
 
         $user = $this->createUser();
         $token = $this->tokenFromUser($user);