jaeger-app / rest-server

src/Rest/AbstractServer.php

Doc Comments +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     /**
      * Set it up
      * @param \JaegerApp\Platforms\AbstractPlatform $platform
-     * @param \JaegerApp\BackupPro\Rest $rest
+     * @param  $rest
      */
     public function __construct(\JaegerApp\Platforms\AbstractPlatform $platform, \JaegerApp\Rest $rest)
     {

Spacing +3 added lines, -3 removed lines

@@ -65,13 +65,13 @@
      */
     public function getVersion($version_key)
     {
-        if(is_null($this->version))
+        if (is_null($this->version))
         {
             //determine the version
             $headers = \getallheaders();
-            if(isset($headers[$version_key]) && is_numeric($headers[$version_key]) && in_array($headers[$version_key], $this->api_versions))
+            if (isset($headers[$version_key]) && is_numeric($headers[$version_key]) && in_array($headers[$version_key], $this->api_versions))
             {
-                $version = 'V'.str_replace('.','_',$headers[$version_key]);
+                $version = 'V'.str_replace('.', '_', $headers[$version_key]);
             }
             else
             {

Braces +1 added lines, -2 removed lines

@@ -72,8 +72,7 @@
             if(isset($headers[$version_key]) && is_numeric($headers[$version_key]) && in_array($headers[$version_key], $this->api_versions))
             {
                 $version = 'V'.str_replace('.','_',$headers[$version_key]);
-            }
-            else
+            } else
             {
                 $version = 'V1';
             }

src/Platforms/View/Rest.php

Spacing +5 added lines, -5 removed lines

@@ -79,16 +79,16 @@ 
     public function renderOutput(\Nocarrier\Hal $hal)
     {
         $this->sendHeaders();
-        if($this->getSystemErrors())
+        if ($this->getSystemErrors())
         {
             $system_errors = array();
-            foreach($this->getSystemErrors() As $key => $value) {
+            foreach ($this->getSystemErrors() As $key => $value) {
                 $system_errors[$key] = $this->m62Lang($key);
             }
             $hal->setData($hal->getData() + array('_system_errors' => $system_errors));
     
         }
-        if(isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos(strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'xml') !== false)
+        if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos(strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'xml') !== false)
         {
             header('Content-Type: application/hal+xml');
             return $hal->asXml(true);
@@ -118,13 +118,13 @@ 
         $problem = $this->getApiProblem($title, $type);
         $problem->setStatus($code);
         $problem->setDetail($detail);
-        if($errors)
+        if ($errors)
         {
             $problem['errors'] = $errors;
         }
     
         $this->sendHeaders();
-        if(isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos(strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'xml') !== false)
+        if (isset($_SERVER['HTTP_ACCEPT_ENCODING']) && strpos(strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'xml') !== false)
         {
             header('Content-Type: application/problem+xml');
             return $problem->asXml(true);

Braces +2 added lines, -4 removed lines

@@ -92,8 +92,7 @@ 
         {
             header('Content-Type: application/hal+xml');
             return $hal->asXml(true);
-        }
-        else
+        } else
         {
             header('Content-Type: application/hal+json');
             return $hal->asJson(true);
@@ -128,8 +127,7 @@ 
         {
             header('Content-Type: application/problem+xml');
             return $problem->asXml(true);
-        }
-        else
+        } else
         {
             header('Content-Type: application/problem+json');
             return $problem->asJson(true);

Unused Use Statements +1 added lines, -1 removed lines

@@ -9,8 +9,8 @@
  */
 namespace JaegerApp\Platforms\View;
 
-use Nocarrier\Hal;
 use Crell\ApiProblem\ApiProblem;
+use Nocarrier\Hal;
 
 /**
  * Jaeger - Rest View Object

src/Platforms/Controllers/Rest.php

Spacing +4 added lines, -4 removed lines

@@ -92,7 +92,7 @@ 
                      ->setMethod($_SERVER['REQUEST_METHOD'])
                      ->auth($this->settings['api_key'], $this->settings['api_secret']);
         
-        if(!$auth) {
+        if (!$auth) {
             return false;
         }
         
@@ -105,10 +105,10 @@ 
      */
     public function getBodyData()
     {
-        if(is_null($this->body_data)) 
+        if (is_null($this->body_data)) 
         {
             $data = json_decode(file_get_contents("php://input"), true);
-            if(!$data)
+            if (!$data)
             {
                 $data = array();
             }
@@ -126,7 +126,7 @@ 
     public function getRequestHeaders($auth = true)
     {
         $headers = \getallheaders();
-        if($auth) {
+        if ($auth) {
             $hmac = $this->getRest()->getServer()->getHmac();
             $return = array(
                 $hmac->getPrefix().'timestamp' => (isset($headers[$hmac->getPrefix().'timestamp']) ? $headers[$hmac->getPrefix().'timestamp'] : ''),

Indentation +3 added lines, -3 removed lines

@@ -88,9 +88,9 @@
         $hmac = $this->getRest()->getServer()->getHmac();
         $data = array_merge($this->getRequestHeaders(true), $this->getBodyData());
         $auth = $hmac->setData($data)
-                     ->setRoute($this->getPlatform()->getPost('api_method'))
-                     ->setMethod($_SERVER['REQUEST_METHOD'])
-                     ->auth($this->settings['api_key'], $this->settings['api_secret']);
+                        ->setRoute($this->getPlatform()->getPost('api_method'))
+                        ->setMethod($_SERVER['REQUEST_METHOD'])
+                        ->auth($this->settings['api_key'], $this->settings['api_secret']);
         
         if(!$auth) {
             return false;

src/Rest/Hmac.php

Spacing +3 added lines, -3 removed lines

@@ -62,14 +62,14 @@
         //make sure we have the require attributes
         $required = array('timestamp');
         $data = $this->getData();
-        foreach($required AS $require) {
-            if(!isset($data[$this->prefix.$require])) {
+        foreach ($required AS $require) {
+            if (!isset($data[$this->prefix.$require])) {
                 return false;
             }
         }
         
         //looks good, now let's process it
-        $auth  = new Auth($this->getMethod(), $this->getRoute(), $this->getData(), [
+        $auth = new Auth($this->getMethod(), $this->getRoute(), $this->getData(), [
             new CheckKey,
             new CheckVersion,
             new CheckTimestamp,

Braces +1 added lines, -3 removed lines

@@ -79,9 +79,7 @@
         
         try {
             return $auth->attempt($token, $this->prefix);
-        }
-        
-        catch (SignatureException $e) {
+        } catch (SignatureException $e) {
             return false;
         }
     }

Unused Use Statements +4 added lines, -4 removed lines

@@ -11,12 +11,12 @@
 namespace JaegerApp\Rest;
 
 use PhilipBrown\Signature\Auth;
-use PhilipBrown\Signature\Token;
+use PhilipBrown\Signature\Exceptions\SignatureException;
 use PhilipBrown\Signature\Guards\CheckKey;
-use PhilipBrown\Signature\Guards\CheckVersion;
-use PhilipBrown\Signature\Guards\CheckTimestamp;
 use PhilipBrown\Signature\Guards\CheckSignature;
-use PhilipBrown\Signature\Exceptions\SignatureException;
+use PhilipBrown\Signature\Guards\CheckTimestamp;
+use PhilipBrown\Signature\Guards\CheckVersion;
+use PhilipBrown\Signature\Token;
 
 /**
  * Jaeger - REST Hmac Object