13
13
use Knuckles \Scribe \Tools \DocumentationConfig ;
14
14
use Knuckles \Scribe \Tests \Fixtures ;
15
15
16
- $ invokableRulesSupported = interface_exists (\Illuminate \Contracts \Validation \InvokableRule::class);
17
16
$ laravel10Rules = version_compare (Application::VERSION , '10.0 ' , '>= ' );
18
17
19
18
class ValidationRuleParsingTest extends BaseLaravelTest
@@ -531,10 +530,7 @@ public function can_parse_custom_rule_classes()
531
530
'param1 ' => ['bail ' , 'required ' , new DummyWithDocsValidationRule ],
532
531
];
533
532
534
- global $ invokableRulesSupported ;
535
- if ($ invokableRulesSupported ) {
536
- $ ruleset ['param2 ' ] = [new DummyInvokableValidationRule ];
537
- }
533
+ $ ruleset ['param2 ' ] = [new DummyInvokableValidationRule ];
538
534
global $ laravel10Rules ;
539
535
if ($ laravel10Rules ) {
540
536
$ ruleset ['param3 ' ] = [new DummyL10ValidationRule ];
@@ -543,7 +539,7 @@ public function can_parse_custom_rule_classes()
543
539
$ results = $ this ->strategy ->parse ($ ruleset );
544
540
$ this ->assertEquals (true , $ results ['param1 ' ]['required ' ]);
545
541
$ this ->assertEquals ('This is a dummy test rule. ' , $ results ['param1 ' ]['description ' ]);
546
- if ( isset ( $ results [ ' param2 ' ])) $ this ->assertEquals ('This rule is invokable. ' , $ results ['param2 ' ]['description ' ]);
542
+ $ this ->assertEquals ('This rule is invokable. ' , $ results ['param2 ' ]['description ' ]);
547
543
if (isset ($ results ['param3 ' ])) $ this ->assertEquals ('This is a custom rule. ' , $ results ['param3 ' ]['description ' ]);
548
544
}
549
545
@@ -718,23 +714,22 @@ public static function docs()
718
714
}
719
715
}
720
716
721
- if ($ invokableRulesSupported ) {
722
- class DummyInvokableValidationRule implements \Illuminate \Contracts \Validation \InvokableRule
717
+ // Laravel 9 introduced InvokableRule
718
+ class DummyInvokableValidationRule implements \Illuminate \Contracts \Validation \InvokableRule
719
+ {
720
+ public function __invoke ($ attribute , $ value , $ fail )
723
721
{
724
- public function __invoke ($ attribute , $ value , $ fail )
725
- {
726
- if (strtoupper ($ value ) !== $ value ) {
727
- $ fail (':attribute must be uppercase. ' );
728
- }
722
+ if (strtoupper ($ value ) !== $ value ) {
723
+ $ fail (':attribute must be uppercase. ' );
729
724
}
725
+ }
730
726
731
- public function docs ()
732
- {
727
+ public function docs ()
728
+ {
733
729
734
- return [
735
- 'description ' => 'This rule is invokable. ' ,
736
- ];
737
- }
730
+ return [
731
+ 'description ' => 'This rule is invokable. ' ,
732
+ ];
738
733
}
739
734
}
740
735
0 commit comments