refactor: updates for php 84 compatibilities

Author: oniice

composer.json

@@ -22,7 +22,7 @@
   ],
   "require": {
     "ext-intl": "*",
-    "php": "^8.2",
+    "php": "^8.4",
     "guzzlehttp/guzzle": "^7.2",
     "illuminate/config": "^11.0",
     "illuminate/support": "^11.0",

src/Facades/Rules.php

@@ -12,8 +12,6 @@ class Rules extends Facade
 {
     /**
      * Get the registered name of the component.
-     *
-     * @return string
      */
     protected static function getFacadeAccessor(): string
     {

src/Helpers.php

@@ -21,9 +21,7 @@ function sanitizeDomainString(string $domain): string
 /**
  * Is a given string a valid domain
  *
- * @param  string  $domain
  *
- * @return bool
  */
 function isDomain(string $domain): bool
 {
@@ -39,9 +37,7 @@ function isDomain(string $domain): bool
 /**
  * Is the given value a valid known TLD
  *
- * @param  string  $input
  *
- * @return bool
  */
 function isTLD(string $input): bool
 {

src/ServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace Myerscode\Laravel\DomainValidator;
 
+use Override;
 use Closure;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\ServiceProvider as BaseServiceProvider;
@@ -18,41 +19,30 @@ class ServiceProvider extends BaseServiceProvider
 {
     /**
      * Register any application services.
-     *
-     * @return void
      */
+    #[Override]
     public function register(): void
     {
         $this->registerConfig();
 
         $this->registerLanguage();
 
-        $this->app->singleton('ldv.factory', function () {
-            return new RulesFactory;
-        });
+        $this->app->singleton('ldv.factory', fn(): RulesFactory => new RulesFactory);
 
-        $this->app->singleton('ldv.rules', function ($app) {
-            return $app->make('ldv.factory')->createPublicSuffixRules();
-        });
+        $this->app->singleton('ldv.rules', fn($app) => $app->make('ldv.factory')->createPublicSuffixRules());
 
-        $this->app->singleton('ldv.tld', function ($app) {
-            return $app->make('ldv.factory')->createTopLevelDomains();
-        });
+        $this->app->singleton('ldv.tld', fn($app) => $app->make('ldv.factory')->createTopLevelDomains());
 
-        $this->app->singleton('ldv.suffix', function ($app) {
-            return new class {
-                public function __call($method, $parameters)
-                {
-                    return Suffix::$method(...$parameters);
-                }
-            };
+        $this->app->singleton('ldv.suffix', fn($app): object => new class {
+            public function __call(string $method, array $parameters)
+            {
+                return Suffix::$method(...$parameters);
+            }
         });
     }
 
     /**
      * Bootstrap any application services.
-     *
-     * @return void
      */
     public function boot(): void
     {

tests/DomainValidator/HelpersTest.php

@@ -2,6 +2,7 @@
 
 namespace Tests\DomainValidator;
 
+use Exception;
 use Myerscode\Laravel\DomainValidator\Facades\Rules;
 use Myerscode\Laravel\DomainValidator\Facades\Suffix;
 use Myerscode\Laravel\DomainValidator\Facades\TopLevelDomain;
@@ -18,9 +19,9 @@ class HelpersTest extends TestCase
     protected function makeFacadesFails(): void
     {
         $throwException = new class {
-            public function __call($method, $parameters)
+            public function __call(string $method, array $parameters)
             {
-                throw new \Exception();
+                throw new Exception();
             }
         };
 
@@ -29,7 +30,7 @@ public function __call($method, $parameters)
         TopLevelDomain::swap($throwException);
     }
 
-    public function testRuleReturnsFalseIfException()
+    public function testRuleReturnsFalseIfException(): void
     {
         $this->makeFacadesFails();
 

tests/DomainValidator/Rules/RulesTestCase.php

@@ -11,10 +11,6 @@ abstract class RulesTestCase extends TestCase
     abstract public static function ruleTestProvider();
 
     /**
-     * @param  string  $attribute
-     * @param  string|array  $inputs
-     * @param  array  $constraints
-     * @param  bool  $valid
      * @param  ?string  $message  null
      */
     #[DataProvider('ruleTestProvider')]

tests/TestCase.php

@@ -2,6 +2,8 @@
 
 namespace Tests;
 
+use Override;
+use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Support\Facades\Validator;
@@ -11,7 +13,8 @@
 
 class TestCase extends OrchestraTestCase
 {
-    public function setUp(): void
+    #[Override]
+    protected function setUp(): void
     {
         parent::setUp();
         Artisan::call('cache:clear');
@@ -21,7 +24,7 @@ public function setUp(): void
     protected function defineEnvironment($app): void
     {
         // Setup default database to use sqlite :memory:
-        tap($app['config'], function (Repository $config) {
+        tap($app['config'], function (Repository $config): void {
             $config->set('domain-validator.storage_driver', 'local');
             $config->set('domain-validator.cache_driver', 'array');
             $config->set('filesystems.disks.local.root', __DIR__ . '/storage');
@@ -31,7 +34,7 @@ protected function defineEnvironment($app): void
     /**
      * Get package providers.
      *
-     * @param  \Illuminate\Foundation\Application  $app
+     * @param Application $app
      *
      * @return array<int, class-string>
      */
@@ -45,7 +48,7 @@ protected function getPackageProviders($app): array
     /**
      * Get package aliases.
      *
-     * @param  \Illuminate\Foundation\Application  $app
+     * @param Application $app
      *
      * @return array<string, class-string>
      */