make invokable rules default (#43868)

Author: timacdonald

src/Illuminate/Foundation/Console/RuleMakeCommand.php

@@ -54,15 +54,9 @@ protected function buildClass($name)
      */
     protected function getStub()
     {
-        $stub = '/stubs/rule.stub';
-
-        if ($this->option('invokable')) {
-            $stub = '/stubs/rule.invokable.stub';
-        }
-
-        if ($this->option('implicit') && $this->option('invokable')) {
-            $stub = str_replace('.stub', '.implicit.stub', $stub);
-        }
+        $stub = $this->option('implicit')
+            ? '/stubs/rule.implicit.stub'
+            : '/stubs/rule.stub';
 
         return file_exists($customPath = $this->laravel->basePath(trim($stub, '/')))
             ? $customPath
@@ -89,7 +83,6 @@ protected function getOptions()
     {
         return [
             ['implicit', 'i', InputOption::VALUE_NONE, 'Generate an implicit rule.'],
-            ['invokable', null, InputOption::VALUE_NONE, 'Generate a single method, invokable rule class.'],
         ];
     }
 }

src/Illuminate/Foundation/Console/stubs/rule.invokable.implicit.stub renamed to src/Illuminate/Foundation/Console/stubs/rule.implicit.stub

@@ -2,39 +2,20 @@
 
 namespace {{ namespace }};
 
-use Illuminate\Contracts\Validation\{{ ruleType }};
+use Illuminate\Contracts\Validation\InvokableRule;
 
-class {{ class }} implements {{ ruleType }}
+class {{ class }} implements InvokableRule
 {
     /**
-     * Create a new rule instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * 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 __invoke($attribute, $value, $fail)
     {
         //
     }
-
-    /**
-     * Get the validation error message.
-     *
-     * @return string
-     */
-    public function message()
-    {
-        return 'The validation error message.';
-    }
 }