Drop support for older Laravels, apply formatting

.github/workflows/run-tests.yml

@@ -9,12 +9,11 @@ jobs:
       fail-fast: true
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: [8.1, 8.2]
-        laravel: [9.*, 10.*]
+        php: [8.4, 8.5]
+        laravel: [13.*]
         stability: [prefer-lowest, prefer-stable]
         include:
-          - laravel: 9.*
-          - laravel: 10.*
+          - laravel: 13.*
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
 

composer.json

@@ -14,16 +14,17 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "illuminate/contracts": "~9.0|~10.0|~11.0|~12.0|~13.0",
-        "illuminate/database": "~9.0|~10.0|~11.0|~12.0|~13.0",
-        "illuminate/events": "~9.0|~10.0|~11.0|~12.0|~13.0",
-        "illuminate/support": "~9.0|~10.0|~11.0|~12.0|~13.0",
-        "illuminate/validation": "~9.0|~10.0|~11.0|~12.0|~13.0"
+        "php": "^8.4",
+        "illuminate/contracts": "~13.0",
+        "illuminate/database": "~13.0",
+        "illuminate/events": "~13.0",
+        "illuminate/support": "~13.0",
+        "illuminate/validation": "~13.0"
     },
     "require-dev": {
         "mockery/mockery": "^1.4.4",
-        "phpunit/phpunit": "~9.0"
+        "phpunit/phpunit": "~12.0",
+        "laravel/pint": "^1.29"
     },
     "autoload": {
         "psr-4": {

phpunit.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <testsuites>
     <testsuite name="Package Test Suite">
-      <directory suffix=".php">./tests/</directory>
+      <directory suffix="Test.php">./tests/</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>

src/Injectors/UniqueInjector.php

@@ -9,7 +9,7 @@ trait UniqueInjector
      * if required.
      *
      * @param  array  $parameters
-     * @param  string $field
+     * @param  string  $field
      * @return string
      */
     protected function prepareUniqueRule($parameters, $field)
@@ -51,6 +51,6 @@ protected function prepareUniqueRule($parameters, $field)
             }
         }
 
-        return 'unique:' . implode(',', $parameters);
+        return 'unique:'.implode(',', $parameters);
     }
 }

src/Injectors/UniqueWithInjector.php

@@ -8,7 +8,7 @@ trait UniqueWithInjector
      * Prepare a unique_with rule, adding the model identifier if required.
      *
      * @param  array  $parameters
-     * @param  string $field
+     * @param  string  $field
      * @return string
      */
     protected function prepareUniqueWithRule($parameters, $field)
@@ -22,6 +22,6 @@ protected function prepareUniqueWithRule($parameters, $field)
             }
         }
 
-        return 'unique_with:' . implode(',', $parameters);
+        return 'unique_with:'.implode(',', $parameters);
     }
 }

src/ValidatingInterface.php

@@ -2,9 +2,9 @@
 
 namespace Watson\Validating;
 
-use Illuminate\Support\MessageBag;
-use Illuminate\Support\Facades\Input;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Support\MessageBag;
 use Illuminate\Validation\Factory;
 
 interface ValidatingInterface
@@ -17,10 +17,10 @@ interface ValidatingInterface
      */
     public function getValidating();
 
-     /**
+    /**
      * Set whether the model should attempt validation on saving.
      *
-     * @param  bool $value
+     * @param  bool  $value
      * @return void
      */
     public function setValidating($value);
@@ -37,8 +37,9 @@ public function getThrowValidationExceptions();
      * Set whether the model should raise an exception or
      * return a boolean on a failed validation.
      *
-     * @param  bool $value
+     * @param  bool  $value
      * @return void
+     *
      * @throws InvalidArgumentException
      */
     public function setThrowValidationExceptions($value);
@@ -55,16 +56,17 @@ public function getInjectUniqueIdentifier();
      * Set the model to add unique identifier to rules when performing
      * validation.
      *
-     * @param  bool $value
+     * @param  bool  $value
      * @return void
+     *
      * @throws InvalidArgumentException
      */
     public function setInjectUniqueIdentifier($value);
 
     /**
      * Get the model.
      *
-     * @return \Illuminate\Database\Eloquent\Model
+     * @return Model
      */
     public function getModel();
 
@@ -85,22 +87,20 @@ public function getRules();
     /**
      * Set the global validation rules.
      *
-     * @param  array $rules
      * @return void
      */
     public function setRules(?array $rules = null);
 
     /**
      * Get the validation error messages from the model.
      *
-     * @return \Illuminate\Support\MessageBag
+     * @return MessageBag
      */
     public function getErrors();
 
     /**
      * Set the error messages.
      *
-     * @param  \Illuminate\Support\MessageBag $validationErrors
      * @return void
      */
     public function setErrors(MessageBag $validationErrors);
@@ -116,7 +116,8 @@ public function isValid();
      * Returns if the model is valid, otherwise throws an exception.
      *
      * @return bool
-     * @throws \Watson\Validating\ValidationException
+     *
+     * @throws ValidationException
      */
     public function isValidOrFail();
 
@@ -139,7 +140,8 @@ public function forceSave();
      * instead of returning a boolean (which is the default behaviour).
      *
      * @return void
-     * @throws \Watson\Validating\ValidatingException
+     *
+     * @throws ValidationException
      */
     public function saveOrFail();
 
@@ -154,22 +156,20 @@ public function saveOrReturn();
     /**
      * Get the Validator instance
      *
-     * @return \Illuminate\Validation\Factory
+     * @return Factory
      */
     public function getValidator();
 
     /**
      * Set the Validator instance
-     *
-     * @param \Illuminate\Validation\Factory $validator
      */
     public function setValidator(Factory $validator);
 
     /**
      * Throw a validation exception.
      *
-     * @throws \Watson\Validating\ValidationException
-    */
+     * @throws ValidationException
+     */
     public function throwValidationException();
 
     /**

src/ValidatingModel.php

@@ -2,15 +2,16 @@
 
 namespace Watson\Validating;
 
-use Illuminate\Database\Eloquent\Model as Eloquent;
 use Illuminate\Contracts\Support\MessageProvider;
+use Illuminate\Database\Eloquent\Model as Eloquent;
+use Illuminate\Support\MessageBag;
 
 abstract class ValidatingModel extends Eloquent implements MessageProvider, ValidatingInterface
 {
     /**
      * Make model validate attributes.
      *
-     * @see \Watson\Validating\ValidatingTrait
+     * @see ValidatingTrait
      */
     use ValidatingTrait;
 
@@ -24,7 +25,7 @@ abstract class ValidatingModel extends Eloquent implements MessageProvider, Vali
     /**
      * Get the messages for the instance.
      *
-     * @return \Illuminate\Support\MessageBag
+     * @return MessageBag
      */
     public function getMessageBag()
     {

src/ValidatingObserver.php

@@ -4,16 +4,14 @@
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Event;
-use Watson\Validating\ValidationException;
 
 class ValidatingObserver
 {
     /**
      * Register the validation event for saving the model. Saving validation
      * should only occur if creating and updating validation does not.
      *
-     * @param  \Illuminate\Database\Eloquent\Model $model
-     * @return boolean
+     * @return bool
      */
     public function saving(Model $model)
     {
@@ -23,8 +21,7 @@ public function saving(Model $model)
     /**
      * Register the validation event for restoring the model.
      *
-     * @param  \Illuminate\Database\Eloquent\Model $model
-     * @return boolean
+     * @return bool
      */
     public function restoring(Model $model)
     {
@@ -34,9 +31,8 @@ public function restoring(Model $model)
     /**
      * Perform validation with the specified ruleset.
      *
-     * @param  \Illuminate\Database\Eloquent\Model $model
-     * @param  string $event
-     * @return boolean
+     * @param  string  $event
+     * @return bool
      */
     protected function performValidation(Model $model, $event)
     {
@@ -68,24 +64,22 @@ protected function performValidation(Model $model, $event)
     /**
      * Fire the namespaced validating event.
      *
-     * @param  \Illuminate\Database\Eloquent\Model $model
-     * @param  string $event
+     * @param  string  $event
      * @return mixed
      */
     protected function fireValidatingEvent(Model $model, $event)
     {
-        return Event::until("eloquent.validating: ".get_class($model), [$model, $event]);
+        return Event::until('eloquent.validating: '.get_class($model), [$model, $event]);
     }
 
     /**
      * Fire the namespaced post-validation event.
      *
-     * @param  \Illuminate\Database\Eloquent\Model $model
-     * @param  string $status
+     * @param  string  $status
      * @return void
      */
     protected function fireValidatedEvent(Model $model, $status)
     {
-        Event::dispatch("eloquent.validated: ".get_class($model), [$model, $status]);
+        Event::dispatch('eloquent.validated: '.get_class($model), [$model, $status]);
     }
 }