Adding strict types

.php-cs-fixer.dist.php

@@ -4,8 +4,10 @@
 use PhpCsFixer\Finder;
 
 $rules = [
-    '@PSR2' => true,
-    '@PSR12' => true,
+    '@PER-CS2.0' => true,
+    '@PER-CS2.0:risky' => true,
+    'declare_strict_types' => true,
+    'strict_param' => true,
     'array_syntax' => [
         'syntax' => 'short',
     ],

src/BasicShopifyAPI.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI;
 
 use Closure;
@@ -377,7 +379,7 @@ public function verifyRequest(array $params): bool
                     $value = '["'.implode('", "', $value).'"]';
                 }
             }
-            
+
             ksort($params);
 
             // Encode and hash the params (without HMAC), add the API secret, and compare to the HMAC from params

src/Clients/AbstractClient.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Clients;
 
 use Exception;

src/Clients/Graph.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Clients;
 
 use Gnikyt\BasicShopifyAPI\Contracts\GraphRequester;

src/Clients/Rest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Clients;
 
 use Exception;
@@ -112,7 +114,7 @@ public function request(string $type, string $path, ?array $params = null, array
         $guzzleParams = [];
         if ($params !== null) {
             $keys = array_keys($params);
-            if (isset($keys[0]) && in_array($keys[0], ['query', 'json'])) {
+            if (isset($keys[0]) && in_array($keys[0], ['query', 'json'], true)) {
                 // Inputted type
                 $guzzleParams = $params;
             } else {

src/Contracts/ClientAware.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Gnikyt\BasicShopifyAPI\Options;

src/Contracts/GraphRequester.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use GuzzleHttp\Promise\Promise;

src/Contracts/LimitAccesser.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 /**

src/Contracts/Respondable.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Gnikyt\BasicShopifyAPI\ResponseAccess;

src/Contracts/RestRequester.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Exception;

src/Contracts/SessionAware.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Gnikyt\BasicShopifyAPI\Session;

src/Contracts/StateStorage.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 use Gnikyt\BasicShopifyAPI\Session;

src/Contracts/TimeAccesser.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 /**

src/Contracts/TimeDeferrer.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Contracts;
 
 /**

src/Deferrers/Sleep.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Deferrers;
 
 use Gnikyt\BasicShopifyAPI\Contracts\TimeDeferrer;

src/Middleware/AbstractMiddleware.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;

src/Middleware/AuthRequest.php

@@ -1,12 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Exception;
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;
 use Gnikyt\BasicShopifyAPI\Options;
 use Gnikyt\BasicShopifyAPI\Traits\IsRequestType;
 use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\UriInterface;
 
 /**
  * Ensures we have the proper request for private and public calls.
@@ -38,8 +41,8 @@ public function __invoke(callable $handler): callable
             $apiPassword = $self->api->getOptions()->getApiPassword();
             $accessToken = $self->api->getSession()->getAccessToken();
 
-            if ($self->isAuthableRequest((string) $uri)) {
-                if ($self->isRestRequest((string) $uri)) {
+            if ($self->isAuthableRequest($uri)) {
+                if ($self->isRestRequest($uri)) {
                     // Checks for REST
                     if ($isPrivate && ($apiKey === null || $apiPassword === null)) {
                         // Key and password are required for private API calls
@@ -50,7 +53,7 @@ public function __invoke(callable $handler): callable
                         // Private: Add auth for REST calls, add the basic auth header
                         $request = $request->withHeader(
                             'Authorization',
-                            'Basic '.base64_encode("{$apiKey}:{$apiPassword}")
+                            'Basic ' . base64_encode("{$apiKey}:{$apiPassword}")
                         );
                     } else {
                         // Public: Add the token header
@@ -78,7 +81,7 @@ public function __invoke(callable $handler): callable
             $uri = $request->getUri();
             $request = $request->withUri(
                 $uri->withPath(
-                    $this->versionPath($uri->getPath())
+                    $this->versionPath($uri)
                 )
             );
 
@@ -88,53 +91,42 @@ public function __invoke(callable $handler): callable
 
     /**
      * Determines if the request requires auth headers.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return bool
      */
-    protected function isAuthableRequest(string $uri): bool
+    protected function isAuthableRequest(UriInterface $uri): bool
     {
-        return preg_match('/\/admin\/oauth\/(authorize|access_token)/', $uri) === 0;
+        return preg_match('/\/admin\/oauth\/(authorize|access_token)/', $uri->getPath()) === 0;
     }
 
     /**
      * Versions the API call with the set version.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return string
      */
-    protected function versionPath(string $uri): string
+    protected function versionPath(UriInterface $uri): string
     {
         $version = $this->api->getOptions()->getVersion();
-        if ($version === null ||
-            preg_match(Options::VERSION_PATTERN, $uri) ||
-            !$this->isAuthableRequest($uri) ||
-            !$this->isVersionableRequest($uri)
+        if (
+            $version === null
+            || preg_match(Options::VERSION_PATTERN, $uri->getPath())
+            || !$this->isAuthableRequest($uri)
+            || !$this->isVersionableRequest($uri)
         ) {
             // No version set, or already versioned... nothing to do
-            return $uri;
+            return $uri->getPath();
         }
 
         // Graph request
         if ($this->isGraphRequest($uri)) {
-            return str_replace('/admin/api', "/admin/api/{$version}", $uri);
+            return preg_replace('/\/admin(\/api)?\//', "/admin/api/{$version}/", $uri->getPath());
         }
 
         // REST request
-        return preg_replace('/\/admin(\/api)?\//', "/admin/api/{$version}/", $uri);
+        return preg_replace('/\/admin(\/api)?\//', "/admin/api/{$version}/", $uri->getPath());
     }
 
     /**
      * Determines if the request requires versioning.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return bool
      */
-    protected function isVersionableRequest(string $uri): bool
+    protected function isVersionableRequest(UriInterface $uri): bool
     {
-        return preg_match('/\/admin\/(oauth\/access_scopes)/', $uri) === 0;
+        return preg_match('/\/admin\/(oauth\/access_scopes)/', $uri->getPath()) === 0;
     }
 }

src/Middleware/RateLimiting.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;

src/Middleware/UpdateApiLimits.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;

src/Middleware/UpdateRequestTime.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Middleware;
 
 use Gnikyt\BasicShopifyAPI\Traits\IsRequestType;

src/Options.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI;
 
 use Exception;

src/ResponseAccess.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI;
 
 use ArrayAccess;

src/Session.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI;
 
 /**

src/Store/Memory.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Store;
 
 use Gnikyt\BasicShopifyAPI\Contracts\StateStorage;

src/Traits/IsRequestType.php

@@ -1,32 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Traits;
 
+use Psr\Http\Message\UriInterface;
+
 /**
  * Determine GraphQL or REST request type.
  */
 trait IsRequestType
 {
     /**
      * Determines if the request is to Graph API.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return bool
      */
-    protected function isGraphRequest(string $uri): bool
+    protected function isGraphRequest(UriInterface $uri): bool
     {
-        return strpos($uri, 'graphql.json') !== false;
+        return strpos($uri->getPath(), 'graphql.json') !== false;
     }
 
     /**
      * Determines if the request is to REST API.
-     *
-     * @param string $uri The request URI.
-     *
-     * @return bool
      */
-    protected function isRestRequest(string $uri): bool
+    protected function isRestRequest(UriInterface $uri): bool
     {
         return $this->isGraphRequest($uri) === false;
     }

src/Traits/IsResponseType.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Traits;
 
 use Gnikyt\BasicShopifyAPI\BasicShopifyAPI;

src/Traits/ResponseTransform.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Traits;
 
 use Gnikyt\BasicShopifyAPI\ResponseAccess;
@@ -15,8 +17,11 @@ trait ResponseTransform
      */
     public function toResponse(StreamInterface $body): ResponseAccess
     {
-        $decoded = json_decode($body, true, 512, JSON_BIGINT_AS_STRING);
-
+        $decoded = json_decode(
+            json: (string) $body,
+            associative: true,
+            flags: JSON_BIGINT_AS_STRING
+        );
         return new ResponseAccess($decoded);
     }
 }

test/BaseTest.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Gnikyt\BasicShopifyAPI\Test;
 
 use Closure;