Merge branch 'mihaliak/9.x' into 9.x

Author: taylorotwell

src/Illuminate/Console/Scheduling/Event.php

@@ -149,6 +149,13 @@ class Event
      */
     public $mutex;
 
+    /**
+     * The mutex name resolver callback.
+     *
+     * @var \Closure|null
+     */
+    public $mutexNameResolver;
+
     /**
      * The exit status code of the command.
      *
@@ -935,9 +942,28 @@ public function preventOverlapsUsing(EventMutex $mutex)
      */
     public function mutexName()
     {
+        $mutexNameResolver = $this->mutexNameResolver;
+
+        if (! is_null($mutexNameResolver) && is_callable($mutexNameResolver)) {
+            return $mutexNameResolver($this);
+        }
+
         return 'framework'.DIRECTORY_SEPARATOR.'schedule-'.sha1($this->expression.$this->command);
     }
 
+    /**
+     * Set the mutex name or name resolver callback.
+     *
+     * @param  \Closure|string  $mutexName
+     * @return $this
+     */
+    public function createMutexNameUsing(Closure|string $mutexName)
+    {
+        $this->mutexNameResolver = is_string($mutexName) ? fn () => $mutexName : $mutexName;
+
+        return $this;
+    }
+
     /**
      * Delete the mutex for the event.
      *

tests/Console/Scheduling/EventTest.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Console\Scheduling\Event;
 use Illuminate\Console\Scheduling\EventMutex;
+use Illuminate\Support\Str;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
 
@@ -94,4 +95,18 @@ public function testNextRunDate()
 
         $this->assertSame('10:15:00', $event->nextRunDate()->toTimeString());
     }
+
+    public function testCustomMutexName()
+    {
+        $event = new Event(m::mock(EventMutex::class), 'php -i');
+        $event->description('Fancy command description');
+
+        $this->assertSame('framework'.DIRECTORY_SEPARATOR.'schedule-eeb46c93d45e928d62aaf684d727e213b7094822', $event->mutexName());
+
+        $event->createMutexNameUsing(function (Event $event) {
+            return Str::slug($event->description);
+        });
+
+        $this->assertSame('fancy-command-description', $event->mutexName());
+    }
 }