Merge branch '12.x'

Author: GrahamCampbell

.gitattributes

@@ -6,6 +6,9 @@
 *.md diff=markdown
 *.php diff=php
 
+*.stub linguist-language=php
+*.neon.dist linguist-language=neon
+
 /.github export-ignore
 /bin export-ignore
 /tests export-ignore

.styleci.yml

@@ -1,8 +1,6 @@
 php:
   preset: laravel
   version: 8.2
-  enabled:
-    - nullable_type_declarations
   finder:
     not-name:
       - bad-syntax-strategy.php

src/Illuminate/Auth/Passwords/PasswordBroker.php

@@ -30,7 +30,7 @@ class PasswordBroker implements PasswordBrokerContract
     /**
      * The event dispatcher instance.
      *
-     * @var \Illuminate\Contracts\Events\Dispatcher
+     * @var \Illuminate\Contracts\Events\Dispatcher|null
      */
     protected $events;
 
@@ -91,7 +91,7 @@ public function sendResetLink(#[\SensitiveParameter] array $credentials, ?Closur
      *
      * @param  array  $credentials
      * @param  \Closure  $callback
-     * @return mixed
+     * @return string
      */
     public function reset(#[\SensitiveParameter] array $credentials, Closure $callback)
     {

src/Illuminate/Cache/Events/CacheFlushed.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Illuminate\Cache\Events;
+
+class CacheFlushed
+{
+    /**
+     * The name of the cache store.
+     *
+     * @var string|null
+     */
+    public $storeName;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  string|null  $storeName
+     * @return void
+     */
+    public function __construct($storeName)
+    {
+        $this->storeName = $storeName;
+    }
+}

src/Illuminate/Cache/Events/CacheFlushing.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Illuminate\Cache\Events;
+
+class CacheFlushing
+{
+    /**
+     * The name of the cache store.
+     *
+     * @var string|null
+     */
+    public $storeName;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param  string|null  $storeName
+     * @return void
+     */
+    public function __construct($storeName)
+    {
+        $this->storeName = $storeName;
+    }
+}

src/Illuminate/Cache/Repository.php

@@ -6,6 +6,8 @@
 use BadMethodCallException;
 use Closure;
 use DateTimeInterface;
+use Illuminate\Cache\Events\CacheFlushed;
+use Illuminate\Cache\Events\CacheFlushing;
 use Illuminate\Cache\Events\CacheHit;
 use Illuminate\Cache\Events\CacheMissed;
 use Illuminate\Cache\Events\ForgettingKey;
@@ -576,7 +578,15 @@ public function deleteMultiple($keys): bool
      */
     public function clear(): bool
     {
-        return $this->store->flush();
+        $this->event(new CacheFlushing($this->getName()));
+
+        $result = $this->store->flush();
+
+        if ($result) {
+            $this->event(new CacheFlushed($this->getName()));
+        }
+
+        return $result;
     }
 
     /**

src/Illuminate/Console/Scheduling/CallbackEvent.php

@@ -46,7 +46,6 @@ class CallbackEvent extends Event
      * @param  string|callable  $callback
      * @param  array  $parameters
      * @param  \DateTimeZone|string|null  $timezone
-     * @return void
      *
      * @throws \InvalidArgumentException
      */

src/Illuminate/Console/Scheduling/Schedule.php

@@ -102,7 +102,6 @@ class Schedule
      * Create a new schedule instance.
      *
      * @param  \DateTimeZone|string|null  $timezone
-     * @return void
      *
      * @throws \RuntimeException
      */

src/Illuminate/Console/View/Components/Component.php

@@ -56,7 +56,7 @@ protected function renderView($view, $data, $verbosity)
      *
      * @param  string  $view
      * @param  array  $data
-     * @return void
+     * @return string
      */
     protected function compile($view, $data)
     {

src/Illuminate/Console/View/Components/Task.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Console\View\Components;
 
+use Illuminate\Database\Migrations\MigrationResult;
 use Illuminate\Support\InteractsWithTime;
 use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;
@@ -34,10 +35,10 @@ public function render($description, $task = null, $verbosity = OutputInterface:
 
         $startTime = microtime(true);
 
-        $result = false;
+        $result = MigrationResult::Failure;
 
         try {
-            $result = ($task ?: fn () => true)();
+            $result = ($task ?: fn () => MigrationResult::Success)();
         } catch (Throwable $e) {
             throw $e;
         } finally {
@@ -53,7 +54,11 @@ public function render($description, $task = null, $verbosity = OutputInterface:
             $this->output->write("<fg=gray>$runTime</>", false, $verbosity);
 
             $this->output->writeln(
-                $result !== false ? ' <fg=green;options=bold>DONE</>' : ' <fg=red;options=bold>FAIL</>',
+                match ($result) {
+                    MigrationResult::Failure => ' <fg=red;options=bold>FAIL</>',
+                    MigrationResult::Skipped => ' <fg=yellow;options=bold>SKIPPED</>',
+                    default => ' <fg=green;options=bold>DONE</>'
+                },
                 $verbosity,
             );
         }