Deprecation of Rule

Author: Menkveld-24

src/Commands/ExportPostmanCommand.php

@@ -6,6 +6,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Facades\Storage;
@@ -358,7 +359,7 @@ protected function parseRulesIntoHumanReadable($attribute, $rules): string
         if (! $this->config['rules_to_human_readable']) {
             foreach ($rules as $i => $rule) {
                 // because we don't support custom rule classes, we remove them from the rules
-                if (is_subclass_of($rule, Rule::class)) {
+                if (is_subclass_of($rule, Rule::class) || is_subclass_of($rule, ValidationRule::class)) {
                     unset($rules[$i]);
                 }
             }
@@ -523,7 +524,7 @@ protected function handleEdgeCases(array $messages): array
      */
     protected function safelyStringifyClassBasedRule($probableRule): string
     {
-        if (! is_object($probableRule) || is_subclass_of($probableRule, Rule::class) || ! method_exists($probableRule, '__toString')) {
+        if (! is_object($probableRule) || is_subclass_of($probableRule, Rule::class) || is_subclass_of($probableRule, ValidationRule::class) || ! method_exists($probableRule, '__toString')) {
             return '';
         }
 

tests/Fixtures/UppercaseRule.php

@@ -2,29 +2,23 @@
 
 namespace AndreasElia\PostmanGenerator\Tests\Fixtures;
 
-use Illuminate\Contracts\Validation\Rule;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Closure;
 
-class UppercaseRule implements Rule
+class UppercaseRule implements ValidationRule
 {
     /**
-     * Determine if the validation rule passes.
+     * Run the validation rule.
      *
      * @param  string  $attribute
      * @param  mixed  $value
-     * @return bool
+     * @param  \Closure(string): \Illuminate\Translation\PotentiallyTranslatedString  $fail
+     * @return void
      */
-    public function passes($attribute, $value)
+    public function validate(string $attribute, mixed $value, Closure $fail): void 
     {
-        return strtoupper($value) === $value;
-    }
-
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return 'The :attribute must be uppercase.';
+        if (strtoupper($value) !== $value) {
+            $fail("The {$attribute} must be uppercase.");
+        }
     }
 }