Friends of PHP code lint fixer

Vonage · Oct 14, 2024 · 0f67d02 · 0f67d02
1 parent 938c437
commit 0f67d02
Show file tree

Hide file tree

Showing 22 changed files with 414 additions and 109 deletions.
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     "softcreatr/jsonpath": "^0.7 || ^0.8",
     "phpspec/prophecy-phpunit": "^2.0",
     "rector/rector": "^1.1",
-    "phpstan/phpstan": "^1.10"
+    "phpstan/phpstan": "^1.10",
   },
   "config": {
     "optimize-autoloader": true,

diff --git a/src/Client.php b/src/Client.php
@@ -210,7 +210,7 @@ public function __construct(
 
             // Additional utility classes
             APIResource::class => APIResource::class,
-            Client::class => fn() => $this
+            Client::class => fn () => $this
         ];
 
         if (class_exists('Vonage\Video\ClientFactory')) {
@@ -231,7 +231,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 fn(int $errno, string $errstr, string $errfile = null, int $errline = null, array $errorcontext = null) => true,
+                static fn (int $errno, string $errstr, string $errfile = null, int $errline = null, array $errorcontext = null) => true,
                 E_USER_DEPRECATED
             );
         }

diff --git a/src/Client/APIResource.php b/src/Client/APIResource.php
@@ -182,8 +182,13 @@ public function delete(string $id, array $headers = []): ?array
      * @throws ClientExceptionInterface
      * @throws Exception\Exception
      */
-    public function get($id, array $query = [], array $headers = [], bool $jsonResponse = true, bool $uriOverride = false)
-    {
+    public function get(
+        $id,
+        array $query = [],
+        array $headers = [],
+        bool $jsonResponse = true,
+        bool $uriOverride = false
+    ) {
         $uri = $this->getBaseUrl() . $this->baseUri . '/' . $id;
 
         // This is a necessary hack if you want to fetch a totally different URL but use Vonage Auth

diff --git a/src/Client/Credentials/Handler/HandlerInterface.php b/src/Client/Credentials/Handler/HandlerInterface.php
@@ -10,5 +10,5 @@ interface HandlerInterface
     /**
      * Add authentication to a request
      */
-    function __invoke(RequestInterface $request, CredentialsInterface $credentials): RequestInterface;
+    public function __invoke(RequestInterface $request, CredentialsInterface $credentials): RequestInterface;
 }
diff --git a/src/Client/Exception/Validation.php b/src/Client/Exception/Validation.php
@@ -8,8 +8,12 @@
 
 class Validation extends Request
 {
-    public function __construct(string $message = '', int $code = 0, Throwable $previous = null, private readonly array $errors = [])
-    {
+    public function __construct(
+        string $message = '',
+        int $code = 0,
+        Throwable $previous = null,
+        private readonly array $errors = []
+    ) {
         parent::__construct($message, $code, $previous);
     }
 

diff --git a/src/Conversation/Client.php b/src/Conversation/Client.php
@@ -103,7 +103,7 @@ public function listMembersByConversationId(
         ?ListMembersFilter $filter = null
     ): IterableAPICollection {
         $api = clone $this->getAPIResource();
-        $api->setBaseUrl('https://api.nexmo.com/v1/users');
+        $api->setBaseUrl('https://api.nexmo.com/v1/users/');
         $api->setCollectionName('members');
         $response = $api->search($filter, $conversationId . '/members');
         $response->setHasPagination(true);

diff --git a/src/Meetings/Room.php b/src/Meetings/Room.php
@@ -21,7 +21,7 @@ public function fromArray(array $data): static
 
     public function toArray(): array
     {
-        return array_filter($this->data, static fn($value) => $value !== '');
+        return array_filter($this->data, static fn ($value) => $value !== '');
     }
 
     public function __get($value)

diff --git a/src/Numbers/Client.php b/src/Numbers/Client.php
@@ -204,7 +204,7 @@ public function purchase($number, ?string $country = null): void
                 'msisdn' => $number->getMsisdn(),
                 'country' => $number->getCountry()
             ];
-        // Evil else that will be removed in the next major version.
+            // Evil else that will be removed in the next major version.
         } else {
             $body = [
                 'msisdn' => $number,

diff --git a/src/ProactiveConnect/Objects/ManualList.php b/src/ProactiveConnect/Objects/ManualList.php
@@ -86,6 +86,6 @@ public function toArray(): array
             'attributes' => $this->getAttributes() ?: null
         ];
 
-        return array_filter($returnArray, fn($value) => $value !== null);
+        return array_filter($returnArray, fn ($value) => $value !== null);
     }
 }
diff --git a/src/ProactiveConnect/Objects/SalesforceList.php b/src/ProactiveConnect/Objects/SalesforceList.php
@@ -112,6 +112,6 @@ public function toArray(): array
             'attributes' => $this->getAttributes() ?: null
         ];
 
-        return array_filter($returnArray, fn($value) => $value !== null);
+        return array_filter($returnArray, fn ($value) => $value !== null);
     }
 }
diff --git a/src/Subaccount/Client.php b/src/Subaccount/Client.php
@@ -54,7 +54,7 @@ public function getSubaccounts(string $apiKey): array
         $hydrator->setPrototype(new Account());
         $subaccounts = $collection->getPageData()['_embedded'][$api->getCollectionName()];
 
-        return array_map(fn($item) => $hydrator->hydrate($item), $subaccounts);
+        return array_map(fn ($item) => $hydrator->hydrate($item), $subaccounts);
     }
 
     public function createSubaccount(string $apiKey, Account $account): ?array
@@ -64,14 +64,20 @@ public function createSubaccount(string $apiKey, Account $account): ?array
 
     public function makeBalanceTransfer(TransferBalanceRequest $transferRequest): BalanceTransfer
     {
-        $response = $this->api->create($transferRequest->toArray(), '/' . $transferRequest->getApiKey() . '/balance-transfers');
+        $response = $this->api->create(
+            $transferRequest->toArray(),
+            '/' . $transferRequest->getApiKey() . '/balance-transfers'
+        );
 
         return (new BalanceTransfer())->fromArray($response);
     }
 
     public function makeCreditTransfer(TransferCreditRequest $transferRequest): CreditTransfer
     {
-        $response = $this->api->create($transferRequest->toArray(), '/' . $transferRequest->getApiKey() . '/credit-transfers');
+        $response = $this->api->create(
+            $transferRequest->toArray(),
+            '/' . $transferRequest->getApiKey() . '/credit-transfers'
+        );
         return (new CreditTransfer())->fromArray($response);
     }
 
@@ -92,7 +98,7 @@ public function getCreditTransfers(string $apiKey, FilterInterface $filter = nul
         $hydrator->setPrototype(new CreditTransfer());
         $transfers = $response['_embedded']['credit_transfers'];
 
-        return array_map(fn($item) => $hydrator->hydrate($item), $transfers);
+        return array_map(fn ($item) => $hydrator->hydrate($item), $transfers);
     }
 
     public function getBalanceTransfers(string $apiKey, FilterInterface $filter = null): mixed
@@ -107,7 +113,7 @@ public function getBalanceTransfers(string $apiKey, FilterInterface $filter = nu
         $hydrator->setPrototype(new BalanceTransfer());
         $transfers = $response['_embedded']['balance_transfers'];
 
-        return array_map(fn($item) => $hydrator->hydrate($item), $transfers);
+        return array_map(fn ($item) => $hydrator->hydrate($item), $transfers);
     }
 
     public function makeNumberTransfer(NumberTransferRequest $request): ?array

diff --git a/src/Verify2/Request/BaseVerifyRequest.php b/src/Verify2/Request/BaseVerifyRequest.php
@@ -124,7 +124,7 @@ public function setBrand(string $brand): static
 
     public function getWorkflows(): array
     {
-        return array_map(static fn($workflow) => $workflow->toArray(), $this->workflows);
+        return array_map(static fn ($workflow) => $workflow->toArray(), $this->workflows);
     }
 
     public function addWorkflow(VerificationWorkflow $verificationWorkflow): static

diff --git a/test/Client/Credentials/Handler/GnpHandlerTest.php b/test/Client/Credentials/Handler/GnpHandlerTest.php
@@ -59,7 +59,11 @@ public function testWillReturnSimSwapCheckWithValidCredentials(): void
                 );
 
                 $this->assertRequestFormBodyContains('login_hint', 'tel:+447700900000', $request);
-                $this->assertRequestFormBodyContains('scope', 'dpv:FraudPreventionAndDetection#check-sim-swap', $request);
+                $this->assertRequestFormBodyContains(
+                    'scope',
+                    'dpv:FraudPreventionAndDetection#check-sim-swap',
+                    $request
+                );
 
                 $this->assertEquals(
                     'Bearer ',
@@ -79,8 +83,17 @@ public function testWillReturnSimSwapCheckWithValidCredentials(): void
                     $uriString
                 );
 
-                $this->assertRequestFormBodyContains('grant_type', 'urn:openid:params:grant-type:ciba', $request);
-                $this->assertRequestFormBodyContains('auth_req_id', '0dadaeb4-7c79-4d39-b4b0-5a6cc08bf537', $request);
+                $this->assertRequestFormBodyContains(
+                    'grant_type',
+                    'urn:openid:params:grant-type:ciba',
+                    $request
+                );
+
+                $this->assertRequestFormBodyContains(
+                    'auth_req_id',
+                    '0dadaeb4-7c79-4d39-b4b0-5a6cc08bf537',
+                    $request
+                );
 
                 return true;
             }
@@ -118,8 +131,17 @@ public function testWillReturnSimSwapDateWithValidCredentials(): void
                     $uriString
                 );
 
-                $this->assertRequestFormBodyContains('login_hint', 'tel:+447700900000', $request);
-                $this->assertRequestFormBodyContains('scope', 'dpv:FraudPreventionAndDetection#check-sim-swap', $request);
+                $this->assertRequestFormBodyContains(
+                    'login_hint',
+                    'tel:+447700900000',
+                    $request
+                );
+
+                $this->assertRequestFormBodyContains(
+                    'scope',
+                    'dpv:FraudPreventionAndDetection#check-sim-swap',
+                    $request
+                );
 
                 $this->assertEquals(
                     'Bearer ',
@@ -139,8 +161,17 @@ public function testWillReturnSimSwapDateWithValidCredentials(): void
                     $uriString
                 );
 
-                $this->assertRequestFormBodyContains('grant_type', 'urn:openid:params:grant-type:ciba', $request);
-                $this->assertRequestFormBodyContains('auth_req_id', '0dadaeb4-7c79-4d39-b4b0-5a6cc08bf537', $request);
+                $this->assertRequestFormBodyContains(
+                    'grant_type',
+                    'urn:openid:params:grant-type:ciba',
+                    $request
+                );
+
+                $this->assertRequestFormBodyContains(
+                    'auth_req_id',
+                    '0dadaeb4-7c79-4d39-b4b0-5a6cc08bf537',
+                    $request
+                );
 
                 return true;
             }