Merge branch 'master' into 1.0

findbrok · Sep 2, 2016 · 820c768 · 820c768
2 parents 50326fe + 421ae01
commit 820c768
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 22 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Exceptions/WatsonBridgeException.php b/src/Exceptions/WatsonBridgeException.php
@@ -24,7 +24,7 @@ class WatsonBridgeException extends RuntimeException
     public function __construct($message = '', $code = 400, Exception $previous = null)
     {
         //Format message
-        $message = 'Watson Bridge: '.(($message != '') ? $message : $this->message);
+        $message = 'Watson Bridge: ' . (($message != '') ? $message : $this->message);
         //Call parent exception
         parent::__construct($message, $code, $previous);
     }

diff --git a/src/Token.php b/src/Token.php
@@ -34,7 +34,7 @@ public function __construct($username, $payLoad = [])
         //Set Username for token
         $this->username = $username;
         //Have payload to set
-        if (!empty($payLoad)) {
+        if (! empty($payLoad)) {
             $this->payLoad = $payLoad;
         } else {
             //Load from file
@@ -49,7 +49,7 @@ public function __construct($username, $payLoad = [])
      */
     public function hasPayLoad()
     {
-        return !empty($this->payLoad);
+        return ! empty($this->payLoad);
     }
 
     /**
@@ -59,7 +59,7 @@ public function hasPayLoad()
      */
     public function exists()
     {
-        return file_exists(__DIR__.'/Storage/'.'token-'.$this->username.'.json');
+        return file_exists(__DIR__ . '/Storage/' . 'token-' . $this->username . '.json');
     }
 
     /**
@@ -79,7 +79,7 @@ public function isExpired()
      */
     public function isNotExpired()
     {
-        return !$this->isExpired();
+        return ! $this->isExpired();
     }
 
     /**
@@ -100,7 +100,7 @@ public function isValid()
     public function save()
     {
         //No payload to save
-        if (!$this->hasPayLoad()) {
+        if (! $this->hasPayLoad()) {
             return false;
         }
         //Save the token
@@ -114,7 +114,7 @@ public function save()
      */
     public function getFilePath()
     {
-        return __DIR__.'/Storage/token-'.$this->username.'.json';
+        return __DIR__ . '/Storage/token-' . $this->username . '.json';
     }
 
     /**
@@ -125,7 +125,7 @@ public function getFilePath()
     public function loadPayLoadFromFile()
     {
         //Not found
-        if (!$this->exists()) {
+        if (! $this->exists()) {
             //We return empty array
             return [];
         }

diff --git a/tests/TestToken.php b/tests/TestToken.php
@@ -47,7 +47,7 @@ public function tearDown()
     public function createTestTokenFile($name = '', $data = [])
     {
         file_put_contents(
-            $this->getTokenStoragePath($name.'.json'),
+            $this->getTokenStoragePath($name . '.json'),
             collect($data)->toJson(),
             LOCK_EX
         );
@@ -62,7 +62,7 @@ public function createTestTokenFile($name = '', $data = [])
      */
     public function deleteTestTokenFile($name = '')
     {
-        unlink($this->getTokenStoragePath($name.'.json'));
+        unlink($this->getTokenStoragePath($name . '.json'));
     }
 
     /**
@@ -74,7 +74,7 @@ public function deleteTestTokenFile($name = '')
      */
     public function getTokenStoragePath($file = '')
     {
-        return __DIR__.'/../src/Storage/'.$file;
+        return __DIR__ . '/../src/Storage/' . $file;
     }
 
     /**