Review rector config

danielebarbaro · Jun 16, 2024 · 671e060 · 671e060
1 parent ac6314e
commit 671e060
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 11 deletions.
diff --git a/rector.php b/rector.php
@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
 use Rector\TypeDeclaration\Rector\ClassMethod\AddVoidReturnTypeWhereNoReturnRector;
 use RectorLaravel\Set\LaravelSetList;
@@ -16,14 +17,19 @@
     ->withSets([
         LaravelSetList::LARAVEL_100,
         LaravelSetList::LARAVEL_110,
+        LaravelSetList::LARAVEL_CODE_QUALITY,
+        LaravelSetList::LARAVEL_FACADE_ALIASES_TO_FULL_NAMES,
+        LaravelSetList::LARAVEL_ARRAY_STR_FUNCTION_TO_STATIC_CALL,
+        LaravelSetList::LARAVEL_LEGACY_FACTORIES_TO_CLASSES,
 
         SetList::PHP_83,
         SetList::PHP_82,
+        LevelSetList::UP_TO_PHP_82,
+
         SetList::CODING_STYLE,
         SetList::CODE_QUALITY,
         SetList::TYPE_DECLARATION,
 
-        \Rector\Set\ValueObject\LevelSetList::UP_TO_PHP_82,
     ])
     ->withRules([
         AddVoidReturnTypeWhereNoReturnRector::class,

diff --git a/src/VatValidatorServiceProvider.php b/src/VatValidatorServiceProvider.php
@@ -21,23 +21,23 @@ public function boot(): void
          */
         Validator::extend('vat_number', static function ($attribute, $value, $parameters, $validator): void {
             $rule = new VatNumber();
-            $rule->validate($attribute, $value, fn (string $message = null) => null);
+            $rule->validate($attribute, $value, static fn (string $message = null): null => null);
         });
 
         /**
          * Register the "vat_number_exist" validation rule.
          */
         Validator::extend('vat_number_exist', static function ($attribute, $value, $parameters, $validator): void {
             $rule = new VatNumberExist();
-            $rule->validate($attribute, $value, fn (string $message = null) => null);
+            $rule->validate($attribute, $value, static fn (string $message = null): null => null);
         });
 
         /**
          * Register the "vat_number_format" validation rule.
          */
         Validator::extend('vat_number_format', static function ($attribute, $value, $parameters, $validator): void {
             $rule = new VatNumberFormat();
-            $rule->validate($attribute, $value, fn (string $message = null) => null);
+            $rule->validate($attribute, $value, static fn (string $message = null): null => null);
         });
     }
 

diff --git a/src/Vies/Client.php b/src/Vies/Client.php
@@ -54,7 +54,7 @@ public function check(string $countryCode, string $vatNumber): bool
      */
     protected function getClient(): SoapClient
     {
-        if ($this->client === null) {
+        if (!$this->client instanceof \SoapClient) {
             $this->client = new SoapClient(self::URL, ['connection_timeout' => $this->timeout]);
         }
 

diff --git a/tests/Rules/VatNumberExistTest.php b/tests/Rules/VatNumberExistTest.php
@@ -18,7 +18,7 @@ public function testVatNumberExist(): void
             ->with($fake_vat)
             ->andReturn(true);
 
-        $this->assertNull($rule->validate('vat_number_exist', $fake_vat, function () {
+        $this->assertNull($rule->validate('vat_number_exist', $fake_vat, function (): never {
             $this->fail('Validation should not fail');
         }));
     }
@@ -36,7 +36,7 @@ public function testVatNumberDoesNotExist(): void
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The :attribute must be write in a valid number format {country_name}{vat_number}.');
 
-        $rule->validate('vat_number_exist', $fake_vat, function ($message) {
+        $rule->validate('vat_number_exist', $fake_vat, static function ($message): never {
             throw new \Exception($message);
         });
     }

diff --git a/tests/Rules/VatNumberFormatTest.php b/tests/Rules/VatNumberFormatTest.php
@@ -18,7 +18,7 @@ public function testVatNumberFormat(): void
             ->with($fake_vat)
             ->andReturn(true);
 
-        $this->assertNull($rule->validate('vat_number_format', $fake_vat, function () {
+        $this->assertNull($rule->validate('vat_number_format', $fake_vat, function (): never {
             $this->fail('Validation should not fail');
         }));
     }
@@ -36,7 +36,7 @@ public function testVatNumberFormatNotExist(): void
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('VAT number :attribute  not exist.');
 
-        $rule->validate('vat_number_format', $fake_vat, function ($message) {
+        $rule->validate('vat_number_format', $fake_vat, static function ($message): never {
             throw new \Exception($message);
         });
     }

diff --git a/tests/Rules/VatNumberTest.php b/tests/Rules/VatNumberTest.php
@@ -18,7 +18,7 @@ public function testVatNumber(): void
             ->with($fake_vat)
             ->andReturn(true);
 
-        $this->assertNull($rule->validate('vat_number', $fake_vat, function () {
+        $this->assertNull($rule->validate('vat_number', $fake_vat, function (): never {
             $this->fail('Validation should not fail');
         }));
     }
@@ -36,7 +36,7 @@ public function testVatNumberNotExist(): void
         $this->expectException(\Exception::class);
         $this->expectExceptionMessage('The :attribute must be a valid VAT number.');
 
-        $rule->validate('vat_number', $fake_vat, function ($message) {
+        $rule->validate('vat_number', $fake_vat, static function ($message): never {
             throw new \Exception($message);
         });
     }