lifeboat-app / php-sdk

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, '/');

src/services/DeliveryZones.php

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
     public function fetch(int $id): ?DeliveryZone
     {
         /** @var DeliveryZone|null $fetch */
-        $fetch = $this->_get('api/delivery-zones/zone' . $id);
+        $fetch = $this->_get('api/delivery-zones/zone'.$id);
         return $fetch;
     }
 
@@ -49,7 +49,7 @@ 
     public function update(int $id, array $data): ?DeliveryZone
     {
         /** @var DeliveryZone|null $post */
-        $post = $this->_post('api/delivery-zones/zone/' . $id, $data);
+        $post = $this->_post('api/delivery-zones/zone/'.$id, $data);
         return $post;
     }
 

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/App.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
     public function __construct(string $app_id, string $app_secret, $auth_domain = self::AUTH_DOMAIN)
     {
         if (!$app_id || !$app_secret) {
-            throw new InvalidArgumentException(static::class . "expects an app_id and app_secret");
+            throw new InvalidArgumentException(static::class."expects an app_id and app_secret");
         }
 
         $this->setAppID($app_id);
@@ -157,7 +157,7 @@ 
 
         if (!$response->isValid() || !$json || !array_key_exists('access_token', $json)) {
             return '';
-        } else {
+        }else {
             $this->setAccessToken($json['access_token']);
             return $this->getAccessToken(false);
         }

Braces +6 added lines, -2 removed lines

@@ -109,7 +109,9 @@ 
      */
     public function getAPIChallenge(bool $check_session = true): string
     {
-        if ($this->_api_challenge) return $this->_api_challenge;
+        if ($this->_api_challenge) {
+            return $this->_api_challenge;
+        }
 
         if ($check_session && session_status() === PHP_SESSION_ACTIVE) {
             $this->setAPIChallenge($_SESSION[self::API_CHALLENGE_PARAM] ?? '');
@@ -169,7 +171,9 @@ 
      */
     public function getAccessToken(bool $check_session = true): string
     {
-        if ($this->_access_token) return $this->_access_token;
+        if ($this->_access_token) {
+            return $this->_access_token;
+        }
 
         if ($check_session && session_status() === PHP_SESSION_ACTIVE) {
             $this->setAccessToken($_SESSION[self::ACCESS_TOKEN_PARAM] ?? '');