Added laravel 9 and PHP 8.1 support

Author: korridor

.gitignore

@@ -2,5 +2,5 @@
 /.idea
 /coverage
 .phpunit.result.cache
-.php_cs.cache
+.php-cs-fixer.cache
 composer.lock

.php_cs renamed to .php-cs-fixer.php

@@ -1,6 +1,6 @@
 <?php
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRiskyAllowed(false)
     ->setRules([
         '@PSR2' => true,

.travis.yml

@@ -4,6 +4,8 @@ cache:
 
 language: php
 
+dist: bionic
+
 matrix:
     include:
         # Laravel 5.8.*
@@ -28,12 +30,17 @@ matrix:
         -   php: 8.0
             env: LARAVEL='7.*' TESTBENCH='5.*' COMPOSER_FLAGS='--prefer-stable'
         # Laravel 8.*
-        -   php: 7.3
-            env: LARAVEL='8.*' TESTBENCH='6.*' COMPOSER_FLAGS='--prefer-stable'
         -   php: 7.4
             env: LARAVEL='8.*' TESTBENCH='6.*' COMPOSER_FLAGS='--prefer-stable'
         -   php: 8.0
             env: LARAVEL='8.*' TESTBENCH='6.*' COMPOSER_FLAGS='--prefer-stable'
+        -   php: 8.1.0
+            env: LARAVEL='8.*' TESTBENCH='6.*' COMPOSER_FLAGS='--prefer-stable'
+        # Laravel 9.*
+        -   php: 8.0
+            env: LARAVEL='9.*' TESTBENCH='7.*' COMPOSER_FLAGS='--prefer-stable'
+        -   php: 8.1.0
+            env: LARAVEL='9.*' TESTBENCH='7.*' COMPOSER_FLAGS='--prefer-stable'
     fast_finish: true
 
 before_install:

composer.json

@@ -12,13 +12,13 @@
     "license": "MIT",
     "require": {
         "php": "^7.1|^8.0",
-        "illuminate/support": "^5.8|^6|^7|^8",
-        "illuminate/database": "^5.8|^6|^7|^8"
+        "illuminate/support": "^5.8|^6|^7|^8|^9",
+        "illuminate/database": "^5.8|^6|^7|^8|^9"
     },
     "require-dev": {
-        "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0",
+        "orchestra/testbench": "^3.8|^4.0|^5.0|^6.0|^7.0",
         "phpunit/phpunit": "^7.0|^8.0|^9.0",
-        "friendsofphp/php-cs-fixer": "^2.16",
+        "friendsofphp/php-cs-fixer": "2.*|^3.6",
         "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {

src/Rules/ExistsEloquent.php

@@ -59,9 +59,9 @@ class ExistsEloquent implements Rule
     /**
      * Create a new rule instance.
      *
-     * @param string $model Class name of model
-     * @param string|null $key Relevant key in the model
-     * @param Closure|null $builderClosure Closure that can extend the eloquent builder
+     * @param  string  $model  Class name of model
+     * @param  string|null  $key  Relevant key in the model
+     * @param  Closure|null  $builderClosure  Closure that can extend the eloquent builder
      */
     public function __construct(string $model, ?string $key = null, ?Closure $builderClosure = null)
     {
@@ -86,7 +86,6 @@ public function setMessage(string $message, bool $translated): void
      * Set a custom validation message.
      *
      * @param  string  $message
-     *
      * @return $this
      */
     public function withMessage(string $message): self
@@ -100,7 +99,6 @@ public function withMessage(string $message): self
      * Set a translated custom validation message.
      *
      * @param  string  $translationKey
-     *
      * @return $this
      */
     public function withCustomTranslation(string $translationKey): self
@@ -170,15 +168,15 @@ public function message(): string
     }
 
     /**
-     * @param Closure|null $builderClosure
+     * @param  Closure|null  $builderClosure
      */
     public function setBuilderClosure(?Closure $builderClosure)
     {
         $this->builderClosure = $builderClosure;
     }
 
     /**
-     * @param Closure $builderClosure
+     * @param  Closure  $builderClosure
      * @return $this
      */
     public function query(Closure $builderClosure): self

src/Rules/UniqueEloquent.php

@@ -58,9 +58,10 @@ class UniqueEloquent implements Rule
 
     /**
      * UniqueEloquent constructor.
-     * @param string $model
-     * @param string|null $key
-     * @param Closure|null $builderClosure
+     *
+     * @param  string  $model
+     * @param  string|null  $key
+     * @param  Closure|null  $builderClosure
      */
     public function __construct(string $model, ?string $key = null, ?Closure $builderClosure = null)
     {
@@ -72,8 +73,8 @@ public function __construct(string $model, ?string $key = null, ?Closure $builde
     /**
      * 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): bool
@@ -115,7 +116,6 @@ public function setMessage(string $message, bool $translated): void
      * Set a custom validation message.
      *
      * @param  string  $message
-     *
      * @return $this
      */
     public function withMessage(string $message): self
@@ -129,7 +129,6 @@ public function withMessage(string $message): self
      * Set a translated custom validation message.
      *
      * @param  string  $translationKey
-     *
      * @return $this
      */
     public function withCustomTranslation(string $translationKey): self
@@ -172,15 +171,15 @@ public function message(): string
     }
 
     /**
-     * @param Closure|null $builderClosure
+     * @param  Closure|null  $builderClosure
      */
     public function setBuilderClosure(?Closure $builderClosure): void
     {
         $this->builderClosure = $builderClosure;
     }
 
     /**
-     * @param Closure $builderClosure
+     * @param  Closure  $builderClosure
      * @return $this
      */
     public function query(Closure $builderClosure): self
@@ -191,8 +190,8 @@ public function query(Closure $builderClosure): self
     }
 
     /**
-     * @param mixed $id
-     * @param string|null $column
+     * @param  mixed  $id
+     * @param  string|null  $column
      */
     public function setIgnore($id, ?string $column = null): void
     {
@@ -202,7 +201,7 @@ public function setIgnore($id, ?string $column = null): void
 
     /**
      * @param $id
-     * @param string|null $column
+     * @param  string|null  $column
      * @return UniqueEloquent
      */
     public function ignore($id, ?string $column = null): self

tests/TestCase.php

@@ -20,7 +20,7 @@ public function setUp(): void
     }
 
     /**
-     * @param Application $app
+     * @param  Application  $app
      * @return array
      */
     protected function getPackageProviders($app): array