Added php v8 compatibility

Author: dacoto

.github/workflows/main.yml

@@ -1,6 +1,6 @@
 name: CI
 
-on: [push]
+on: [ push ]
 
 jobs:
   build:
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Install composer
-        uses: php-actions/composer@v1
+        uses: php-actions/composer@v4
 
       - name: Run PHPUnit
         uses: php-actions/phpunit@v9

composer.json

@@ -3,7 +3,7 @@
     "description": "A domain validator rule for Laravel",
     "type": "library",
     "require": {
-        "php": "^7.2",
+        "php": "^7.2|^8.0",
         "illuminate/validation": "^6.0|^7.0|^8.0"
     },
     "require-dev": {

src/LaravelDomainValidationServiceProvider.php

@@ -17,7 +17,7 @@ class LaravelDomainValidationServiceProvider extends ServiceProvider
      *
      * @return void
      */
-    public function boot()
+    public function boot(): void
     {
         Validator::extend('domain', Domain::class);
     }

src/Validator/Domain.php

@@ -13,25 +13,25 @@ class Domain implements Rule
     /**
      * Determine if the validation rule passes.
      *
-     * @param string $attribute
-     * @param mixed $value
+     * @param  string  $attribute
+     * @param  mixed  $value
      * @return bool
      */
-    public function passes($attribute, $value)
+    public function passes($attribute, $value): bool
     {
-        if (stristr($value, 'localhost') !== false) {
+        if (stripos($value, 'localhost') !== false) {
             return true;
         }
 
-        return !!preg_match('/^(?:[a-z0-9](?:[a-z0-9-æøå]{0,61}[a-z0-9])?\.)+[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$/isu', $value);
+        return (bool) preg_match('/^(?:[a-z0-9](?:[a-z0-9-æøå]{0,61}[a-z0-9])?\.)+.[a-z0-9][a-z0-9-]{0,61}[a-z0-9]$/isu', $value);
     }
 
     /**
      * Get the validation error message.
      *
      * @return string
      */
-    public function message()
+    public function message(): string
     {
         return trans('The :attribute is not a valid domain.');
     }

tests/DomainTest.php

@@ -16,15 +16,19 @@ protected function setUp(): void
         $this->validator = new Domain();
     }
 
-    public function testPasses()
+    public function testPasses(): void
     {
-        $this->assertTrue($this->validator->passes('domain', 'dacoto.com'));
-        $this->assertTrue($this->validator->passes('domain', 'www.dacoto.com'));
+        self::assertTrue($this->validator->passes('domain', 'dacoto.com'));
+        self::assertTrue($this->validator->passes('domain', 'www.dacoto.com'));
     }
 
-    public function testFails()
+    public function testFails(): void
     {
-        $this->assertFalse($this->validator->passes('domain', 'https://dacoto.com'));
-        $this->assertFalse($this->validator->passes('domain', 'https://www.dacoto.com'));
+        self::assertFalse($this->validator->passes('domain', '.'));
+        self::assertFalse($this->validator->passes('domain', 'empty'));
+        self::assertFalse($this->validator->passes('domain', 'empty.'));
+        self::assertFalse($this->validator->passes('domain', '.empty'));
+        self::assertFalse($this->validator->passes('domain', 'https://dacoto.com'));
+        self::assertFalse($this->validator->passes('domain', 'https://www.dacoto.com'));
     }
 }