[9.x] Queue commands

src/Illuminate/Collections/Collection.php

@@ -1146,7 +1146,7 @@ public function firstOrFail($key = null, $operator = null, $value = null)
             ? $this->operatorForWhere(...func_get_args())
             : $key;
 
-        $items = $this->when($filter)->filter($filter);
+        $items = $this->unless($filter == null)->filter($filter);
 
         if ($items->isEmpty()) {
             throw new ItemNotFoundException;

src/Illuminate/Collections/LazyCollection.php

@@ -1091,7 +1091,7 @@ public function firstOrFail($key = null, $operator = null, $value = null)
             : $key;
 
         return $this
-            ->when($filter)
+            ->unless($filter == null)
             ->filter($filter)
             ->take(1)
             ->collect()

src/Illuminate/Database/Eloquent/Concerns/HasRelationships.php

@@ -731,9 +731,7 @@ public function getMorphClass()
             return array_search(static::class, $morphMap, true);
         }
 
-        return Relation::$useTableNamesForMorphMap
-                    ? $this->getTable()
-                    : static::class;
+        return static::class;
     }
 
     /**

src/Illuminate/Database/Eloquent/Relations/Relation.php

@@ -49,13 +49,6 @@ abstract class Relation implements BuilderContract
      */
     protected static $constraints = true;
 
-    /**
-     * Indicates that table names should be used when determining morph classes.
-     *
-     * @var bool
-     */
-    public static $useTableNamesForMorphMap = false;
-
     /**
      * An array to map class names to their morph names in the database.
      *
@@ -394,16 +387,6 @@ protected function whereInMethod(Model $model, $key)
                         : 'whereIn';
     }
 
-    /**
-     * Indicate that the table names should be used when determining morphed class names.
-     *
-     * @return void
-     */
-    public static function morphUsingTableNames()
-    {
-        static::$useTableNamesForMorphMap = true;
-    }
-
     /**
      * Set or get the morph map for polymorphic relations.
      *

src/Illuminate/Foundation/Providers/ArtisanServiceProvider.php

@@ -681,7 +681,7 @@ protected function registerQueueListenCommand()
      */
     protected function registerQueueMonitorCommand()
     {
-        $this->app->singleton('command.queue.monitor', function ($app) {
+        $this->app->singleton(QueueMonitorCommand::class, function ($app) {
             return new QueueMonitorCommand($app['queue'], $app['events']);
         });
     }
@@ -705,7 +705,7 @@ protected function registerQueuePruneBatchesCommand()
      */
     protected function registerQueuePruneFailedJobsCommand()
     {
-        $this->app->singleton('command.queue.prune-failed-jobs', function () {
+        $this->app->singleton(QueuePruneFailedJobsCommand::class, function () {
             return new QueuePruneFailedJobsCommand;
         });
     }

src/Illuminate/Queue/Console/MonitorCommand.php

@@ -19,6 +19,15 @@ class MonitorCommand extends Command
                        {queues : The names of the queues to monitor}
                        {--max=1000 : The maximum number of jobs that can be on the queue before an event is dispatched}';
 
+    /**
+     * The name of the console command.
+     *
+     * This name is used to identify the command during lazy loading.
+     *
+     * @var string|null
+     */
+    protected static $defaultName = 'queue:monitor';
+
     /**
      * The console command description.
      *

src/Illuminate/Queue/Console/PruneFailedJobsCommand.php

@@ -16,6 +16,15 @@ class PruneFailedJobsCommand extends Command
     protected $signature = 'queue:prune-failed
                 {--hours=24 : The number of hours to retain failed jobs data}';
 
+    /**
+     * The name of the console command.
+     *
+     * This name is used to identify the command during lazy loading.
+     *
+     * @var string|null
+     */
+    protected static $defaultName = 'queue:prune-failed';
+
     /**
      * The console command description.
      *

src/Illuminate/Validation/ConditionalRules.php

@@ -20,17 +20,26 @@ class ConditionalRules
      */
     protected $rules;
 
+    /**
+     * The rules to be added to the attribute if the condition fails.
+     *
+     * @var array|string
+     */
+    protected $defaultRules;
+
     /**
      * Create a new conditional rules instance.
      *
      * @param  callable|bool  $condition
      * @param  array|string  $rules
+     * @param  array|string  $defaultRules
      * @return void
      */
-    public function __construct($condition, $rules)
+    public function __construct($condition, $rules, $defaultRules = [])
     {
         $this->condition = $condition;
         $this->rules = $rules;
+        $this->defaultRules = $defaultRules;
     }
 
     /**
@@ -55,4 +64,14 @@ public function rules()
     {
         return is_string($this->rules) ? explode('|', $this->rules) : $this->rules;
     }
+
+    /**
+     * Get the default rules.
+     *
+     * @return array
+     */
+    public function defaultRules()
+    {
+        return is_string($this->defaultRules) ? explode('|', $this->defaultRules) : $this->defaultRules;
+    }
 }

src/Illuminate/Validation/Rule.php

@@ -20,11 +20,12 @@ class Rule
      *
      * @param  callable|bool  $condition
      * @param  array|string  $rules
+     * @param  array|string  $defaultRules
      * @return \Illuminate\Validation\ConditionalRules
      */
-    public static function when($condition, $rules)
+    public static function when($condition, $rules, $defaultRules = [])
     {
-        return new ConditionalRules($condition, $rules);
+        return new ConditionalRules($condition, $rules, $defaultRules);
     }
 
     /**

src/Illuminate/Validation/ValidationRuleParser.php

@@ -291,15 +291,17 @@ public static function filterConditionalRules($rules, array $data = [])
             }
 
             if ($attributeRules instanceof ConditionalRules) {
-                return [$attribute => $attributeRules->passes($data) ? $attributeRules->rules() : null];
+                return [$attribute => $attributeRules->passes($data)
+                                ? $attributeRules->rules()
+                                : $attributeRules->defaultRules(), ];
             }
 
             return [$attribute => collect($attributeRules)->map(function ($rule) use ($data) {
                 if (! $rule instanceof ConditionalRules) {
                     return [$rule];
                 }
 
-                return $rule->passes($data) ? $rule->rules() : null;
+                return $rule->passes($data) ? $rule->rules() : $rule->defaultRules();
             })->filter()->flatten(1)->values()->all()];
         })->filter()->all();
     }

tests/Database/DatabaseEloquentModelTest.php

@@ -1217,16 +1217,6 @@ public function testMorphOneCreatesProperRelation()
         $this->assertEquals(EloquentModelStub::class, $relation->getMorphClass());
     }
 
-    public function testMorphOneCreatesProperRelationWhenUsingTableNames()
-    {
-        Relation::morphUsingTableNames();
-        $model = new EloquentModelStub;
-        $this->addMockConnection($model);
-        $relation = $model->morphOne(EloquentModelSaveStub::class, 'morph');
-        $this->assertEquals('stub', $relation->getMorphClass());
-        Relation::$useTableNamesForMorphMap = false;
-    }
-
     public function testCorrectMorphClassIsReturned()
     {
         Relation::morphMap(['alias' => 'AnotherModel']);

tests/Validation/ValidationRuleParserTest.php

@@ -30,4 +30,23 @@ public function test_conditional_rules_are_properly_expanded_and_filtered()
             'city' => ['required', 'min:2'],
         ], $rules);
     }
+
+    public function test_conditional_rules_with_default()
+    {
+        $rules = ValidationRuleParser::filterConditionalRules([
+            'name' => Rule::when(true, ['required', 'min:2'], ['string', 'max:10']),
+            'email' => Rule::when(false, ['required', 'min:2'], ['string', 'max:10']),
+            'password' => Rule::when(false, 'required|min:2', 'string|max:10'),
+            'username' => ['required', Rule::when(true, ['min:2'], ['string', 'max:10'])],
+            'address' => ['required', Rule::when(false, ['min:2'], ['string', 'max:10'])],
+        ]);
+
+        $this->assertEquals([
+            'name' => ['required', 'min:2'],
+            'email' => ['string', 'max:10'],
+            'password' => ['string', 'max:10'],
+            'username' => ['required', 'min:2'],
+            'address' => ['required', 'string', 'max:10'],
+        ], $rules);
+    }
 }