lifeboat-app / php-sdk

src/factory/ObjectFactory.php

Braces +6 added lines, -2 removed lines

@@ -21,7 +21,9 @@ 
     public static function create(Connector $connector, string $model, array $data = []): Model
     {
         $model = strtolower($model);
-        if (!array_key_exists($model, ClassMap::MODELS)) return new LifeboatModel($connector, $data);
+        if (!array_key_exists($model, ClassMap::MODELS)) {
+            return new LifeboatModel($connector, $data);
+        }
 
         $cls = ClassMap::MODELS[$model];
         return new $cls($connector, $data);
@@ -35,7 +37,9 @@ 
     public static function make(Connector $connector, array $data): Model
     {
         $model = $data['model'] ?? '';
-        if (!$model) return new LifeboatModel($connector, $data);
+        if (!$model) {
+            return new LifeboatModel($connector, $data);
+        }
         return self::create($connector, $model, $data);
     }
 }

src/resource/ListResource.php

Spacing +4 added lines, -4 removed lines

@@ -212,20 +212,20 @@
         $t = $this->getItems(1);
         $c = $this->count();
 
-        return (function () use ($t, $c) {
+        return (function() use ($t, $c) {
             $i = 0;
             $x = 0;
 
             while ($i < $c) {
                 if ($x === 0) {
                     $x = $this->_page_length;
-                    $t = $this->getItems((int) floor($i / $this->_page_length) + 1);
+                    $t = $this->getItems((int) floor($i / $this->_page_length)+1);
                 }
 
-                yield $i => $t[$this->_page_length - $x];
+                yield $i => $t[$this->_page_length-$x];
 
                 $x -= 1;
-                $i ++;
+                $i++;
             }
         })();
     }

Braces +18 added lines, -6 removed lines

@@ -129,16 +129,22 @@ 
             $response   = $this->getClient()->curl_api($this->getURL(), 'GET', $data);
             $data       = ($response->isValid() && $response->isJSON()) ? $response->getJSON() : [];
 
-            if (empty($data)) throw new ApiException($response->getError());
+            if (empty($data)) {
+                throw new ApiException($response->getError());
+            }
 
             $this->_max_items = (int) $data['available_items'];
 
-            if (empty($data['items'])) return $this->_items[$page] = [];
+            if (empty($data['items'])) {
+                return $this->_items[$page] = [];
+            }
 
 
             foreach ($data['items'] as $item) {
                 $obj = ObjectFactory::make($this->getClient(), $item);
-                if (!$obj) continue;
+                if (!$obj) {
+                    continue;
+                }
 
                 $this->_items[$page][] = $obj;
             }
@@ -153,7 +159,9 @@ 
      */
     public function offsetGet($offset): ?ObjectResource
     {
-        foreach ($this as $i => $obj) if ($i === $offset) return $obj;
+        foreach ($this as $i => $obj) {
+            if ($i === $offset) return $obj;
+        }
         return null;
     }
 
@@ -184,7 +192,9 @@ 
      */
     public function offsetExists($offset): bool
     {
-        foreach ($this as $i => $obj) if ($offset === $i) return true;
+        foreach ($this as $i => $obj) {
+            if ($offset === $i) return true;
+        }
         return false;
     }
 
@@ -240,6 +250,8 @@ 
      */
     public function first(): ?Model
     {
-        foreach ($this as $obj) return $obj;
+        foreach ($this as $obj) {
+            return $obj;
+        }
     }
 }

tests/AppTest.php

Spacing +4 added lines, -4 removed lines

@@ -54,10 +54,10 @@
     {
         $app    = new App('id', 'secret', 'http://test.domain');
         $url    = $app->getAuthURL('process.php', 'error.php', 'challenge');
-        $expect = 'http://test.domain/oauth/code?app_id=id&process_url=' .
-            urlencode('process.php') .
-            '&error_url=' . urlencode('error.php') .
-            '&challenge=' . Utils::pack('challenge');
+        $expect = 'http://test.domain/oauth/code?app_id=id&process_url='.
+            urlencode('process.php').
+            '&error_url='.urlencode('error.php').
+            '&challenge='.Utils::pack('challenge');
 
         $this->assertEquals($expect, $url);
     }

src/includes/functions.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     if (!$date) return null;
 
     try {
-        $date = new \DateTime($date . ' CET');
+        $date = new \DateTime($date.' CET');
         return $date;
     } catch (Exception $e) {
         return null;

Braces +3 added lines, -1 removed lines

@@ -6,7 +6,9 @@
  */
 function lifeboat_date_formatter(string $date): ?DateTime
 {
-    if (!$date) return null;
+    if (!$date) {
+        return null;
+    }
 
     try {
         $date = new \DateTime($date . ' CET');

tests/factory/ObjectFactoryTest.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      */
     public function testFactory()
     {
-        $mock_data  = ['ID' => 0];
+        $mock_data = ['ID' => 0];
 
         foreach (ClassMap::MODELS as $name => $class) {
             $this->assertInstanceOf($class, ObjectFactory::create($this->getMockClient(), $name, $mock_data));

tests/UtilsTest.php

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
     public function test_is_associative_array()
     {
         $this->assertEquals(true, ArrayLib::is_associative(['a' => 1]));
-        $this->assertEquals(false, ArrayLib::is_associative([1,2,3]));
+        $this->assertEquals(false, ArrayLib::is_associative([1, 2, 3]));
         $this->assertEquals(false, ArrayLib::is_associative([]));
 
         try {
@@ -42,16 +42,16 @@ 
     public function test_set_get_var()
     {
         $rel_path = '/path';
-        $this->assertEquals($rel_path . '?var=1', URL::setGetVar('var', 1, $rel_path));
+        $this->assertEquals($rel_path.'?var=1', URL::setGetVar('var', 1, $rel_path));
 
         $rel_path_t = '/path/';
-        $this->assertEquals($rel_path_t . '?var=1', URL::setGetVar('var', 1, $rel_path_t));
+        $this->assertEquals($rel_path_t.'?var=1', URL::setGetVar('var', 1, $rel_path_t));
 
         $absolute = 'https://test.com';
-        $this->assertEquals($absolute . '?var=1', URL::setGetVar('var', 1, $absolute));
+        $this->assertEquals($absolute.'?var=1', URL::setGetVar('var', 1, $absolute));
 
         $absolute_t = 'https://test.com/';
-        $this->assertEquals($absolute_t . '?var=1', URL::setGetVar('var', 1, $absolute_t));
+        $this->assertEquals($absolute_t.'?var=1', URL::setGetVar('var', 1, $absolute_t));
     }
 
     /**
@@ -71,7 +71,7 @@ 
         while (count($generated) < 100000) $generated[] = Utils::create_random_string();
         $count  = count($generated);
         $unique = count(array_unique($generated));
-        $random = 100 - ((100 / $count) * $unique);
+        $random = 100-((100 / $count) * $unique);
 
         // Less than 2% repeat
         $this->assertTrue($random < 2);

Braces +3 added lines, -1 removed lines

@@ -68,7 +68,9 @@
 
         // Test the randomness
         $generated = [];
-        while (count($generated) < 100000) $generated[] = Utils::create_random_string();
+        while (count($generated) < 100000) {
+            $generated[] = Utils::create_random_string();
+        }
         $count  = count($generated);
         $unique = count(array_unique($generated));
         $random = 100 - ((100 / $count) * $unique);

src/utils/URL.php

Spacing +8 added lines, -8 removed lines

@@ -20,13 +20,13 @@ 
     public static function setGetVar(string $key, string $value, string $url): string
     {
         if (!self::is_absolute_url($url)) {
-            $url = 'http://dummy.com/' . ltrim($url, '/');
+            $url = 'http://dummy.com/'.ltrim($url, '/');
         }
 
         // try to parse uri
         $parts = parse_url($url);
         if (empty($parts)) {
-            throw new InvalidArgumentException("Can't parse URL: " . $url);
+            throw new InvalidArgumentException("Can't parse URL: ".$url);
         }
 
         // Parse params and add new variable
@@ -40,18 +40,18 @@ 
         // Generate URI segments and formatting
         $scheme = (array_key_exists('scheme', $parts)) ? $parts['scheme'] : 'http';
         $user = (array_key_exists('user', $parts)) ? $parts['user'] : '';
-        $port = (array_key_exists('port', $parts) && $parts['port']) ? ':' . $parts['port'] : '';
+        $port = (array_key_exists('port', $parts) && $parts['port']) ? ':'.$parts['port'] : '';
 
         if ($user != '') {
             // format in either user:pass@host.com or user@host.com
-            $user .= (array_key_exists('pass', $parts) && $parts['pass']) ? ':' . $parts['pass'] . '@' : '';
+            $user .= (array_key_exists('pass', $parts) && $parts['pass']) ? ':'.$parts['pass'].'@' : '';
         }
 
         // handle URL params which are existing / new
-        $params = ($params) ? '?' . http_build_query($params) : '';
+        $params = ($params) ? '?'.http_build_query($params) : '';
 
         // Recompile URI segments
-        $newUri = $scheme . '://' . $user . $parts['host'] . $port . ($parts['path'] ?? '') . $params;
+        $newUri = $scheme.'://'.$user.$parts['host'].$port.($parts['path'] ?? '').$params;
 
         return str_replace('http://dummy.com', '', $newUri);
     }
@@ -64,10 +64,10 @@ 
     {
         // Strip off the query and fragment parts of the URL before checking
         if (($queryPosition = strpos($url, '?')) !== false) {
-            $url = substr($url, 0, $queryPosition - 1);
+            $url = substr($url, 0, $queryPosition-1);
         }
         if (($hashPosition = strpos($url, '#')) !== false) {
-            $url = substr($url, 0, $hashPosition - 1);
+            $url = substr($url, 0, $hashPosition-1);
         }
         $colonPosition = strpos($url, ':');
         $slashPosition = strpos($url, '/');

tests/services/ServicesTest.php

Spacing +1 added lines, -1 removed lines

@@ -148,7 +148,7 @@
         string $url,
         string $list_class = ListResource::class,
         array $params = []
-    ){
+    ) {
         $this->assertInstanceOf($list_class, $all);
         $this->assertEquals($url, $all->getURL());
         $this->assertEquals($this->getMockClient(), $all->getClient());

src/Connector.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 
 namespace Lifeboat;
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'functions.php';
+require_once __DIR__.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR.'functions.php';
 
 use Lifeboat\Exceptions\BadMethodException;
 use Lifeboat\Exceptions\OAuthException;
@@ -165,7 +165,7 @@ 
     public function curl_api(string $url, string $method = 'GET', array $data = [], array $headers = []): CurlResponse
     {
         $url = URL::is_absolute_url($url) ? $url
-            : 'https://' . rtrim($this->getHost(), '/') . '/' . ltrim($url, '/');
+            : 'https://'.rtrim($this->getHost(), '/').'/'.ltrim($url, '/');
 
         $curl = new Curl($url, $data, $headers);
 
@@ -184,6 +184,6 @@ 
      */
     protected function auth_url(string $path): string
     {
-        return rtrim($this->_auth_domain, '/') . '/' . ltrim($path, '/');
+        return rtrim($this->_auth_domain, '/').'/'.ltrim($path, '/');
     }
 }

Braces +18 added lines, -6 removed lines

@@ -60,7 +60,9 @@ 
     public function __get(string $service): ?ApiService
     {
         $obj = ServiceFactory::inst($this, $service);
-        if (!$obj) throw new BadMethodException("Service for `{$service}` does not exist");
+        if (!$obj) {
+            throw new BadMethodException("Service for `{$service}` does not exist");
+        }
 
         return $obj;
     }
@@ -118,7 +120,9 @@ 
      */
     public function getHost(): ?string
     {
-        if (!$this->getActiveSite(true)) return null;
+        if (!$this->getActiveSite(true)) {
+            return null;
+        }
         return $this->_host;
     }
 
@@ -127,7 +131,9 @@ 
      */
     public function getSiteKey(): ?string
     {
-        if (!$this->getActiveSite(true)) return null;
+        if (!$this->getActiveSite(true)) {
+            return null;
+        }
         return $this->_site_key;
     }
 
@@ -151,7 +157,9 @@ 
         $curl->addHeader('Host', $this->getHost());
 
         foreach ($this->getAuthHeaders() as $header => $value) {
-            if ($value) $curl->addHeader($header, $value);
+            if ($value) {
+                $curl->addHeader($header, $value);
+            }
         }
 
         return $curl->curl_json();
@@ -163,8 +171,12 @@ 
      */
     public function getAuthHeaders(): array
     {
-        if (!$this->getAccessToken()) $this->fetchAccessToken();
-        if (!$this->getAccessToken()) throw new OAuthException("Access token has not been retreived");
+        if (!$this->getAccessToken()) {
+            $this->fetchAccessToken();
+        }
+        if (!$this->getAccessToken()) {
+            throw new OAuthException("Access token has not been retreived");
+        }
 
         return [
             'access-token'  => $this->getAccessToken(),