Cellcote / laravel-proxify

src/ApiProxyServiceProvider.php

Doc Comments +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
     /**
      * Get the services provided by the provider.
      *
-     * @return array
+     * @return string[]
      */
     public function provides() {
         return array('api-proxy.proxy');

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
      */
     public function boot() {
         $this->publishes([
-            __DIR__.'/config/proxy.php' => config_path('proxy.php'),
+            __DIR__ . '/config/proxy.php' => config_path('proxy.php'),
         ]);
         
     }
@@ -52,7 +52,7 @@ 
      * @return void
      */
     public function registerApiProxy() {
-        $this->app->bindShared('api-proxy.proxy', function ($app) {
+        $this->app->bindShared('api-proxy.proxy', function($app) {
             $params = $app['config']['proxy'];
             $proxy = new Proxy($params);
             return $proxy;

src/Managers/CookieManager.php

Braces +2 added lines, -4 removed lines

@@ -39,8 +39,7 @@ 
         if (isset($parsedCookie)) {
             $parsedCookie = json_decode($parsedCookie, true);
             $this->validateCookie($parsedCookie);
-        }
-        else {
+        } else {
             if ($callMode !== ProxyAux::MODE_LOGIN) {
                 throw new CookieExpiredException();
             }
@@ -56,8 +55,7 @@ 
     public function createCookie(Array $content) {
         if (!isset($this->info[CookieManager::COOKIE_TIME]) || $this->info[CookieManager::COOKIE_TIME] == null) {
             $cookie = Cookie::forever($this->info[CookieManager::COOKIE_NAME], json_encode($content));
-        }
-        else {
+        } else {
             $cookie = Cookie::make($this->info[CookieManager::COOKIE_NAME], json_encode($content), $this->info[CookieManager::COOKIE_TIME]);
         }
 

src/Managers/RequestManager.php

Spacing +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
         if ($this->callMode === ProxyAux::MODE_TOKEN && $this->useHeader === true) {
             $accessToken = ProxyAux::getQueryValue($inputs, ProxyAux::ACCESS_TOKEN);
             $inputs = ProxyAux::removeQueryValue($inputs, ProxyAux::ACCESS_TOKEN);
-            $options = array_add($options, 'headers', [ ProxyAux::HEADER_AUTH => 'Bearer ' . $accessToken ]);
+            $options = array_add($options, 'headers', [ProxyAux::HEADER_AUTH => 'Bearer ' . $accessToken]);
         }
 
         if ($method === 'GET') {

Braces +5 added lines, -10 removed lines

@@ -68,8 +68,7 @@ 
                 if ($proxyResponse->getStatusCode() != 200) {
                     if (array_key_exists(ProxyAux::REFRESH_TOKEN, $parsedCookie)) {
                         $ret = $this->tryRefreshToken($inputs, $parsedCookie);
-                    }
-                    else {
+                    } else {
                         $cookie = $this->cookieManager->destroyCookie();
                     }
                 }
@@ -111,8 +110,7 @@ 
 
             //Set a new cookie with updated access token and refresh token
             $cookie = $this->cookieManager->createCookie($parsedCookie);
-        }
-        else {
+        } else {
             $cookie = $this->cookieManager->destroyCookie();
         }
 
@@ -169,8 +167,7 @@ 
 
         if ($method === 'GET') {
             $options = array_add($options, 'query', $inputs);
-        }
-        else {
+        } else {
             $options = array_add($options, 'body', $inputs);
         }
 
@@ -178,8 +175,7 @@ 
 
         try {
             $response = $client->send($request);
-        }
-        catch (ClientException $ex) {
+        } catch (ClientException $ex) {
             $response = $ex->getResponse();
         }
 
@@ -200,8 +196,7 @@ 
             }
             $info['id'] = $clientId;
             $info['secret'] = $this->clientSecrets[$clientId];
-        }
-        else if (count($this->clientSecrets) >= 1) {
+        } else if (count($this->clientSecrets) >= 1) {
             $firstKey = key($this->clientSecrets);
             $info['id'] = $firstKey;
             $info['secret'] = $this->clientSecrets[$firstKey];

Doc Comments +6 added lines, -2 removed lines

@@ -27,6 +27,10 @@ 
     private $cookieManager = null;
     private $useHeader = false;
 
+    /**
+     * @param string $callMode
+     * @param CookieManager $cookieManager
+     */
     public function __construct($uri, $method, $clientSecrets, $callMode, $cookieManager) {
         $this->uri = $uri;
         $this->method = $method;
@@ -136,7 +140,7 @@ 
     }
 
     /**
-     * @param $response
+     * @param \GuzzleHttp\Message\ResponseInterface $response
      * @return mixed
      */
     private function getResponseContent($response) {
@@ -155,7 +159,7 @@ 
      * @param $method
      * @param $uriVal
      * @param $inputs
-     * @return \GuzzleHttp\Message\FutureResponse|\GuzzleHttp\Message\ResponseInterface|\GuzzleHttp\Ring\Future\FutureInterface|mixed|null
+     * @return \GuzzleHttp\Message\ResponseInterface
      */
     private function sendGuzzleRequest($method, $uriVal, $inputs) {
         $options = array();

src/Exceptions/ProxyMissingParamException.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 class ProxyMissingParamException extends ProxyException {
 
     public function __construct($parameter) {
-	    $this->httpStatusCode = 400;
-	    $this->errorType = 'proxy_missing_param';
+        $this->httpStatusCode = 400;
+        $this->errorType = 'proxy_missing_param';
         parent::__construct(\Lang::get('api-proxy-laravel::messages.proxy_missing_param', array('param' => $parameter)));
     }
 

src/Exceptions/CookieInvalidException.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 class CookieInvalidException extends ProxyException {
 
     public function __construct($parameter) {
-	    $this->httpStatusCode = 500;
-	    $this->errorType = 'proxy_cookie_invalid';
+        $this->httpStatusCode = 500;
+        $this->errorType = 'proxy_cookie_invalid';
         parent::__construct(\Lang::get('api-proxy-laravel::messages.proxy_cookie_invalid', array('param' => $parameter)));
     }
 

src/Exceptions/MissingClientSecretException.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 class MissingClientSecretException extends ProxyException {
 
     public function __construct($parameter) {
-	    $this->httpStatusCode = 500;
-	    $this->errorType = 'missing_client_secret';
+        $this->httpStatusCode = 500;
+        $this->errorType = 'missing_client_secret';
         parent::__construct(\Lang::get('api-proxy-laravel::messages.missing_client_secret', array('client' => $parameter)));
     }
 

src/Exceptions/CookieExpiredException.php

Indentation +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 class CookieExpiredException extends ProxyException {
 
     public function __construct() {
-	    $this->httpStatusCode = 403;
-	    $this->errorType = 'proxy_cookie_expired';
+        $this->httpStatusCode = 403;
+        $this->errorType = 'proxy_cookie_expired';
         parent::__construct(\Lang::get('api-proxy-laravel::messages.proxy_cookie_expired'));
     }
 

src/Proxy.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         }
 
         //Create the new request
-        $requestManager  = new RequestManager($this->uri, $method, $this->clientSecrets, $this->callMode, $this->cookieManager);
+        $requestManager = new RequestManager($this->uri, $method, $this->clientSecrets, $this->callMode, $this->cookieManager);
         if ($this->useHeader) {
             $requestManager->enableHeader();
         }

Braces +1 added lines, -2 removed lines

@@ -95,8 +95,7 @@
             if ($grantType === ProxyAux::PASSWORD_GRANT) {
                 $mode = ProxyAux::MODE_LOGIN;
             }
-        }
-        else if (isset($skip) && strtolower($skip) === 'true') {
+        } else if (isset($skip) && strtolower($skip) === 'true') {
             $mode = ProxyAux::MODE_SKIP;
         }
 

src/lang/en/messages.php

Indentation +5 added lines, -5 removed lines

@@ -11,9 +11,9 @@
  */
 
 return array(
-	'access_token_ok' => 'Access token retrieved successfully',
-	'proxy_missing_param' => 'Missing mandatory parameter <b>:param</b> in the request call',
-	'missing_client_secret' => 'Missing secret key for client id <b>:client</b>',
-	'proxy_cookie_expired' => 'Cookie expired or not found. Return to the login form.',
-	'proxy_cookie_invalid' => 'Cookie format not valid. Missing attribute <b>:param</b>.'
+    'access_token_ok' => 'Access token retrieved successfully',
+    'proxy_missing_param' => 'Missing mandatory parameter <b>:param</b> in the request call',
+    'missing_client_secret' => 'Missing secret key for client id <b>:client</b>',
+    'proxy_cookie_expired' => 'Cookie expired or not found. Return to the login form.',
+    'proxy_cookie_invalid' => 'Cookie format not valid. Missing attribute <b>:param</b>.'
 );
\ No newline at end of file