style patch

spira · Sep 17, 2015 · e61f702 · e61f702
1 parent 9d0e8f8
commit e61f702
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 34 deletions.
diff --git a/api/src/Auth/Blacklist/Blacklist.php b/api/src/Auth/Blacklist/Blacklist.php
@@ -1,14 +1,22 @@
 <?php
+
+/*
+ * This file is part of the Spira framework.
+ *
+ * @link https://github.com/spira/spira
+ *
+ * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
+ */
+
 /**
  * Created by PhpStorm.
  * User: ivanmatveev
  * Date: 17.09.15
- * Time: 20:27
+ * Time: 20:27.
  */
 
 namespace Spira\Auth\Blacklist;
 
-
 use Carbon\Carbon;
 use Spira\Auth\Token\TokenExpiredException;
 
@@ -40,7 +48,7 @@ public function __construct(StorageInterface $driver, $key, $exp = null)
     public function add($payload)
     {
         $seconds = null;
-        if ($this->exp && isset($payload[$this->exp])){
+        if ($this->exp && isset($payload[$this->exp])) {
             $exp = Carbon::createFromTimeStampUTC($payload['exp']);
             if ($exp->isPast()) {
                 return;
@@ -49,23 +57,23 @@ public function add($payload)
             $seconds = $exp->diffInSeconds(Carbon::now()->subSecond(10));
         }
 
-        if (isset($payload[$this->key])){
+        if (isset($payload[$this->key])) {
             $this->driver->add($payload[$this->key], $seconds);
         }
     }
 
     /**
-     * Checks if token in a blacklist
+     * Checks if token in a blacklist.
      * @param $payload
      * @return bool
      * @throw TokenExpiredException
      */
     public function check($payload)
     {
-        if (isset($payload[$this->key]) && $this->driver->get($payload[$this->key])){
+        if (isset($payload[$this->key]) && $this->driver->get($payload[$this->key])) {
             throw new TokenExpiredException;
         }
 
         return false;
     }
-}
+}
diff --git a/api/src/Auth/Blacklist/CacheDriver.php b/api/src/Auth/Blacklist/CacheDriver.php
@@ -1,27 +1,33 @@
 <?php
+
+/*
+ * This file is part of the Spira framework.
+ *
+ * @link https://github.com/spira/spira
+ *
+ * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
+ */
+
 /**
  * Created by PhpStorm.
  * User: ivanmatveev
  * Date: 17.09.15
- * Time: 20:42
+ * Time: 20:42.
  */
 
 namespace Spira\Auth\Blacklist;
 
-
 use Illuminate\Contracts\Cache\Repository;
 
 class CacheDriver implements StorageInterface
 {
-
     /**
      * @var Repository
      */
     private $cache;
 
     public function __construct(Repository $cache)
     {
-
         $this->cache = $cache;
     }
 
@@ -32,11 +38,11 @@ public function __construct(Repository $cache)
      */
     public function add($id, $seconds = null)
     {
-        if ($seconds = null){
-            $seconds = 60*60;
+        if ($seconds = null) {
+            $seconds = 60 * 60;
         }
 
-        $this->cache->add($id,$id,ceil($seconds/60));
+        $this->cache->add($id, $id, ceil($seconds / 60));
     }
 
     /**
@@ -47,4 +53,4 @@ public function get($id)
     {
         return $this->cache->get($id);
     }
-}
+}
diff --git a/api/src/Auth/Blacklist/StorageInterface.php b/api/src/Auth/Blacklist/StorageInterface.php
@@ -1,14 +1,22 @@
 <?php
+
+/*
+ * This file is part of the Spira framework.
+ *
+ * @link https://github.com/spira/spira
+ *
+ * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
+ */
+
 /**
  * Created by PhpStorm.
  * User: ivanmatveev
  * Date: 17.09.15
- * Time: 20:29
+ * Time: 20:29.
  */
 
 namespace Spira\Auth\Blacklist;
 
-
 interface StorageInterface
 {
     /**
@@ -23,4 +31,4 @@ public function add($id, $seconds = null);
      * @return mixed
      */
     public function get($id);
-}
+}
diff --git a/api/src/Auth/Driver/Guard.php b/api/src/Auth/Driver/Guard.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
  */
 
-
 namespace Spira\Auth\Driver;
 
 use Illuminate\Contracts\Auth\Authenticatable;
@@ -19,7 +18,6 @@
 use Spira\Auth\Payload\PayloadValidationFactory;
 use Spira\Auth\Token\JWTInterface;
 use Spira\Auth\Token\RequestParser;
-use Spira\Auth\Token\TokenExpiredException;
 use Spira\Contract\Exception\NotImplementedException;
 
 class Guard implements \Illuminate\Contracts\Auth\Guard
@@ -303,10 +301,11 @@ public function viaToken()
      */
     public function logout()
     {
-        try{
+        try {
             $token = $this->getTokenFromRequest();
             $this->blacklist->add($this->getTokenizer()->decode($token));
-        }catch (\Exception $e){}
+        } catch (\Exception $e) {
+        }
         $this->user = false;
     }
 

diff --git a/api/src/Auth/Payload/PayloadValidationFactory.php b/api/src/Auth/Payload/PayloadValidationFactory.php
@@ -13,8 +13,7 @@
 use Spira\Auth\Token\TokenInvalidException;
 
 /**
- * Class PayloadValidationFactory
- * @package Spira\Auth\Payload
+ * Class PayloadValidationFactory.
  */
 class PayloadValidationFactory
 {

diff --git a/api/src/Auth/Providers/JWTAuthDriverServiceProvider.php b/api/src/Auth/Providers/JWTAuthDriverServiceProvider.php
@@ -173,7 +173,7 @@ protected function registerTokenizer()
 
     /**
      * Base payload factory
-     * Rules can be overridden in
+     * Rules can be overridden in.
      * @see getPayloadGenerators
      */
     protected function registerPayloadFactory()
@@ -185,7 +185,7 @@ protected function registerPayloadFactory()
 
     /**
      * Base payload validator factory
-     * Rules can be overridden in
+     * Rules can be overridden in.
      * @see getValidationRules
      */
     protected function registerPayloadValidatorFactory()
@@ -250,7 +250,7 @@ protected function getPayloadGenerators()
     }
 
     /**
-     * Validation rules for payload
+     * Validation rules for payload.
      * @return array
      */
     protected function getValidationRules()
@@ -299,17 +299,17 @@ abstract protected function getSecretPrivate();
 
     /**
      * Needed for token invalidation during logout
-     * Optional
+     * Optional.
      */
     protected function registerBlackList()
     {
         $this->app->bind(Blacklist::class, function ($app) {
-            return new Blacklist($this->app[StorageInterface::class],$this->tokenKey, $this->tokenExp);
+            return new Blacklist($this->app[StorageInterface::class], $this->tokenKey, $this->tokenExp);
         });
     }
 
     /**
-     * Driver used to store invalid tokens
+     * Driver used to store invalid tokens.
      */
     protected function registerBlackListDriver()
     {

diff --git a/api/src/Auth/Token/TokenExpiredException.php b/api/src/Auth/Token/TokenExpiredException.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
  */
 
-
 namespace Spira\Auth\Token;
 
 use Exception;

diff --git a/api/src/Contract/Exception/ForbiddenException.php b/api/src/Contract/Exception/ForbiddenException.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
  */
 
-
 namespace Spira\Contract\Exception;
 
 use Exception;

diff --git a/api/src/Contract/Exception/NotImplementedException.php b/api/src/Contract/Exception/NotImplementedException.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
  */
 
-
 namespace Spira\Contract\Exception;
 
 use Exception;

diff --git a/api/src/Contract/Exception/UnauthorizedException.php b/api/src/Contract/Exception/UnauthorizedException.php
@@ -8,7 +8,6 @@
  * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
  */
 
-
 namespace Spira\Contract\Exception;
 
 use Exception;