Rector 8.1 rule (#485)

Author: SecondeJK

composer.json

@@ -31,7 +31,7 @@
     "squizlabs/php_codesniffer": "^3.5",
     "softcreatr/jsonpath": "^0.7 || ^0.8",
     "phpspec/prophecy-phpunit": "^2.0",
-    "rector/rector": "^0.14.8",
+    "rector/rector": "^1.1",
     "phpstan/phpstan": "^1.10"
   },
   "config": {

rector.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Core\ValueObject\PhpVersion;
+use Rector\Set\ValueObject\SetList;
+
+return static function (RectorConfig $rectorConfig): void {
+    // Define the paths to refactor
+    $rectorConfig->paths([
+        __DIR__ . '/src',
+        __DIR__ . '/test',
+    ]);
+
+    // Set the target PHP version to 8.1
+    $rectorConfig->sets([
+        \Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_81
+    ]);
+
+    // Define sets of rules
+    $rectorConfig->sets([
+        SetList::PHP_81,
+    ]);
+};

src/Account/Network.php

@@ -73,7 +73,7 @@ public function fromArray(array $data): void
         $storage = [];
 
         foreach ($data as $k => $v) {
-            $k = strtolower(ltrim(preg_replace('/[A-Z]([A-Z](?![a-z]))*/', '_$0', $k), '_'));
+            $k = strtolower(ltrim((string) preg_replace('/[A-Z]([A-Z](?![a-z]))*/', '_$0', $k), '_'));
             $storage[$k] = $v;
         }
 

src/Account/Price.php

@@ -89,7 +89,7 @@ public function fromArray(array $data): void
         $storage = [];
 
         foreach ($data as $k => $v) {
-            $k = strtolower(ltrim(preg_replace('/[A-Z]([A-Z](?![a-z]))*/', '_$0', $k), '_'));
+            $k = strtolower(ltrim((string) preg_replace('/[A-Z]([A-Z](?![a-z]))*/', '_$0', $k), '_'));
 
             // PrefixPrice fixes
             switch ($k) {

src/Application/Webhook.php

@@ -29,7 +29,7 @@ public function getUrl(): ?string
 
     public function __toString(): string
     {
-        return $this->getUrl();
+        return (string) $this->getUrl();
     }
 
     public function getSocketTimeout(): ?string

src/Client.php

@@ -157,7 +157,7 @@ public function __construct(
         if (is_null($client)) {
             // Since the user did not pass a client, try and make a client
             // using the Guzzle 6 adapter or Guzzle 7 (depending on availability)
-            list($guzzleVersion) = explode('@', InstalledVersions::getVersion('guzzlehttp/guzzle'), 1);
+            [$guzzleVersion] = explode('@', (string) InstalledVersions::getVersion('guzzlehttp/guzzle'), 1);
             $guzzleVersion = (float) $guzzleVersion;
 
             if ($guzzleVersion >= 6.0 && $guzzleVersion < 7) {
@@ -235,15 +235,13 @@ public function __construct(
 
             // Additional utility classes
             APIResource::class => APIResource::class,
-            Client::class => function () {
-                return $this;
-            }
+            Client::class => fn() => $this
         ];
 
         if (class_exists('Vonage\Video\ClientFactory')) {
             $services['video'] = 'Vonage\Video\ClientFactory';
         } else {
-            $services['video'] = function () {
+            $services['video'] = function (): never {
                 throw new \RuntimeException('Please install @vonage/video to use the Video API');
             };
         }
@@ -258,15 +256,7 @@ public function __construct(
         // Disable throwing E_USER_DEPRECATED notices by default, the user can turn it on during development
         if (array_key_exists('show_deprecations', $this->options) && ($this->options['show_deprecations'] == true)) {
             set_error_handler(
-                static function (
-                    int $errno,
-                    string $errstr,
-                    string $errfile = null,
-                    int $errline = null,
-                    array $errorcontext = null
-                ) {
-                    return true;
-                },
+                static fn(int $errno, string $errstr, string $errfile = null, int $errline = null, array $errorcontext = null) => true,
                 E_USER_DEPRECATED
             );
         }
@@ -539,7 +529,7 @@ protected function validateAppOptions($app): void
             }
 
             foreach ($disallowedCharacters as $char) {
-                if (strpos($app[$key], $char) !== false) {
+                if (str_contains((string) $app[$key], $char)) {
                     throw new InvalidArgumentException('app.' . $key . ' cannot contain the ' . $char . ' character');
                 }
             }
@@ -611,8 +601,8 @@ public function getCredentials(): CredentialsInterface
     protected static function requiresBasicAuth(RequestInterface $request): bool
     {
         $path = $request->getUri()->getPath();
-        $isSecretManagementEndpoint = strpos($path, '/accounts') === 0 && strpos($path, '/secrets') !== false;
-        $isApplicationV2 = strpos($path, '/v2/applications') === 0;
+        $isSecretManagementEndpoint = str_starts_with($path, '/accounts') && str_contains($path, '/secrets');
+        $isApplicationV2 = str_starts_with($path, '/v2/applications');
 
         return $isSecretManagementEndpoint || $isApplicationV2;
     }
@@ -625,8 +615,8 @@ protected static function requiresAuthInUrlNotBody(RequestInterface $request): b
     {
         $path = $request->getUri()->getPath();
 
-        $isRedact =  strpos($path, '/v1/redact') === 0;
-        $isMessages =  strpos($path, '/v1/messages') === 0;
+        $isRedact =  str_starts_with($path, '/v1/redact');
+        $isMessages =  str_starts_with($path, '/v1/messages');
 
         return $isRedact || $isMessages;
     }
@@ -638,10 +628,10 @@ protected static function requiresAuthInUrlNotBody(RequestInterface $request): b
     protected function needsKeypairAuthentication(RequestInterface $request): bool
     {
         $path = $request->getUri()->getPath();
-        $isCallEndpoint = strpos($path, '/v1/calls') === 0;
-        $isRecordingUrl = strpos($path, '/v1/files') === 0;
-        $isStitchEndpoint = strpos($path, '/beta/conversation') === 0;
-        $isUserEndpoint = strpos($path, '/beta/users') === 0;
+        $isCallEndpoint = str_starts_with($path, '/v1/calls');
+        $isRecordingUrl = str_starts_with($path, '/v1/files');
+        $isStitchEndpoint = str_starts_with($path, '/beta/conversation');
+        $isUserEndpoint = str_starts_with($path, '/beta/users');
 
         return $isCallEndpoint || $isRecordingUrl || $isStitchEndpoint || $isUserEndpoint;
     }

src/Client/APIResource.php

@@ -74,7 +74,7 @@ public function addAuth(RequestInterface $request): RequestInterface
                 try {
                     $request = $handler($request, $credentials);
                     break;
-                } catch (\RuntimeException $e) {
+                } catch (\RuntimeException) {
                     continue; // We are OK if multiple are sent but only one match
                     // This has a really nasty side effect for complex handlers where we never see the error
                 }

src/Client/Exception/Validation.php

@@ -8,7 +8,7 @@
 
 class Validation extends Request
 {
-    public function __construct(string $message = '', int $code = 0, Throwable $previous = null, private array $errors = [])
+    public function __construct(string $message = '', int $code = 0, Throwable $previous = null, private readonly array $errors = [])
     {
         parent::__construct($message, $code, $previous);
     }

src/Client/Signature.php

@@ -81,7 +81,7 @@ protected function sign($signatureMethod, $data, $secret): string
             case 'sha1':
             case 'sha256':
             case 'sha512':
-                return strtoupper(hash_hmac($signatureMethod, $data, $secret));
+                return strtoupper(hash_hmac((string) $signatureMethod, (string) $data, (string) $secret));
             default:
                 throw new ClientException(
                     'Unknown signature algorithm: ' . $signatureMethod .
@@ -135,7 +135,7 @@ public function check($signature): bool
             throw new InvalidArgumentException('signature must be string, or present in array or parameters');
         }
 
-        return strtolower($signature) === strtolower($this->signed['sig']);
+        return strtolower($signature) === strtolower((string) $this->signed['sig']);
     }
 
     /**

src/Conversation/ConversationObjects/ConversationCallback.php

@@ -9,7 +9,7 @@
 class ConversationCallback implements ArrayHydrateInterface
 {
     protected string $method = 'POST';
-    protected ?array $params;
+    protected ?array $params = null;
 
     public function __construct(
         protected ?string $url = null,