Strict types

JBZoo · Jul 7, 2020 · 354c7cf · 354c7cf
1 parent 5da3e52
commit 354c7cf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/src/Driver/Auto.php b/src/Driver/Auto.php
@@ -31,21 +31,21 @@ class Auto extends AbstractDriver
      */
     public function request(Request $request): Response
     {
-        return $this->getClient()->request($request);
+        return static::getClient()->request($request);
     }
 
     /**
      * @inheritDoc
      */
     public function multiRequest(array $requestList): array
     {
-        return $this->getClient()->multiRequest($requestList);
+        return static::getClient()->multiRequest($requestList);
     }
 
     /**
      * @return AbstractDriver
      */
-    protected function getClient(): AbstractDriver
+    protected static function getClient(): AbstractDriver
     {
         if (class_exists(Client::class) && method_exists(Client::class, 'request')) {
             return new Guzzle();

diff --git a/src/Driver/Guzzle.php b/src/Driver/Guzzle.php
@@ -40,7 +40,7 @@ public function request(Request $request): Response
         $httpResult = $client->request(
             $request->getMethod(),
             $request->getUri(),
-            $this->getDriverOptions(
+            self::getDriverOptions(
                 $request->getOptions(),
                 $request->getHeaders(),
                 $request->getMethod(),
@@ -68,7 +68,7 @@ public function multiRequest(array $requestList): array
             $promises[$name] = $client->requestAsync(
                 $request->getMethod(),
                 $request->getUri(),
-                $this->getDriverOptions(
+                self::getDriverOptions(
                     $request->getOptions(),
                     $request->getHeaders(),
                     $request->getMethod(),
@@ -98,7 +98,7 @@ public function multiRequest(array $requestList): array
      * @param string|array|null $args
      * @return array
      */
-    protected function getDriverOptions(Options $options, array $headers, string $method, $args)
+    protected static function getDriverOptions(Options $options, array $headers, string $method, $args): array
     {
         $headers['User-Agent'] = $options->getUserAgent('Guzzle');
 
@@ -121,15 +121,15 @@ protected function getDriverOptions(Options $options, array $headers, string $me
             'verify'          => $options->isVerify(),
             'exceptions'      => $options->allowException(),
             'auth'            => $options->getAuth(),
-            'allow_redirects' => $this->getAllowRedirects($options)
+            'allow_redirects' => self::getAllowRedirects($options)
         ];
     }
 
     /**
      * @param Options $options
      * @return array|bool
      */
-    protected function getAllowRedirects(Options $options)
+    protected static function getAllowRedirects(Options $options)
     {
         $allowRedirects = false;
 

diff --git a/src/Driver/Rmccue.php b/src/Driver/Rmccue.php
@@ -46,7 +46,7 @@ public function request(Request $request): Response
             /** @phan-suppress-next-line PhanPartialTypeMismatchArgument */
             $request->getArgs(),
             $request->getMethod(),
-            $this->getDriverOptions($options)
+            self::getDriverOptions($options)
         );
 
         if ($httpResult->status_code >= self::INVALID_CODE_LINE && $options->allowException()) {
@@ -73,7 +73,7 @@ public function multiRequest(array $requestList): array
                 'data'    => $request->getArgs(),
                 'type'    => $request->getMethod(),
                 'headers' => $request->getHeaders(),
-                'options' => $this->getDriverOptions($request->getOptions()),
+                'options' => self::getDriverOptions($request->getOptions()),
             ];
         }
 
@@ -83,7 +83,6 @@ public function multiRequest(array $requestList): array
         foreach ($httpResults as $name => $httpResult) {
             $result[$name] = (new Response())
                 ->setCode((int)$httpResult->status_code)
-                /** @phan-suppress-next-line PhanPossiblyNonClassMethodCall */
                 ->setHeaders($httpResult->headers->getAll())
                 ->setBody($httpResult->body)
                 ->setRequest($requestList[$name]);
@@ -96,7 +95,7 @@ public function multiRequest(array $requestList): array
      * @param Options $options
      * @return array
      */
-    protected function getDriverOptions(Options $options)
+    protected static function getDriverOptions(Options $options): array
     {
         return [
             'timeout'          => $options->getTimeout(),

diff --git a/src/HttpClient.php b/src/HttpClient.php
@@ -104,7 +104,7 @@ public function request(
      * @param array $options
      * @return Response[]
      */
-    public function multiRequest(array $requestList, array $options = [])
+    public function multiRequest(array $requestList, array $options = []): array
     {
         /** @var Request[] $cleanedRequestList */
         $cleanedRequestList = [];