Merge branch '9.x'

Author: GrahamCampbell

src/Illuminate/Auth/Console/ClearResetsCommand.php

@@ -3,9 +3,7 @@
 namespace Illuminate\Auth\Console;
 
 use Illuminate\Console\Command;
-use Symfony\Component\Console\Attribute\AsCommand;
 
-#[AsCommand(name: 'auth:clear-resets')]
 class ClearResetsCommand extends Command
 {
     /**

src/Illuminate/Cache/Console/CacheTableCommand.php

@@ -5,9 +5,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Support\Composer;
-use Symfony\Component\Console\Attribute\AsCommand;
 
-#[AsCommand(name: 'cache:table')]
 class CacheTableCommand extends Command
 {
     /**

src/Illuminate/Cache/Console/ClearCommand.php

@@ -5,11 +5,9 @@
 use Illuminate\Cache\CacheManager;
 use Illuminate\Console\Command;
 use Illuminate\Filesystem\Filesystem;
-use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputOption;
 
-#[AsCommand(name: 'cache:clear')]
 class ClearCommand extends Command
 {
     /**

src/Illuminate/Cache/Console/ForgetCommand.php

@@ -4,9 +4,7 @@
 
 use Illuminate\Cache\CacheManager;
 use Illuminate\Console\Command;
-use Symfony\Component\Console\Attribute\AsCommand;
 
-#[AsCommand(name: 'cache:forget')]
 class ForgetCommand extends Command
 {
     /**

src/Illuminate/Cache/Repository.php

@@ -529,7 +529,7 @@ protected function getSeconds($ttl)
             $duration = Carbon::now()->diffInRealSeconds($duration, false);
         }
 
-        return (int) $duration > 0 ? $duration : 0;
+        return (int) ($duration > 0 ? $duration : 0);
     }
 
     /**

src/Illuminate/Collections/Collection.php

@@ -488,7 +488,11 @@ public function groupBy($groupBy, $preserveKeys = false)
             }
 
             foreach ($groupKeys as $groupKey) {
-                $groupKey = is_bool($groupKey) ? (int) $groupKey : $groupKey;
+                $groupKey = match (true) {
+                    is_bool($groupKey) => (int) $groupKey,
+                    $groupKey instanceof \Stringable => (string) $groupKey,
+                    default => $groupKey,
+                };
 
                 if (! array_key_exists($groupKey, $results)) {
                     $results[$groupKey] = new static;
@@ -842,8 +846,8 @@ public function nth($step, $offset = 0)
 
         $position = 0;
 
-        foreach ($this->items as $item) {
-            if ($position % $step === $offset) {
+        foreach ($this->slice($offset)->items as $item) {
+            if ($position % $step === 0) {
                 $new[] = $item;
             }
 

src/Illuminate/Collections/Enumerable.php

@@ -460,8 +460,10 @@ public function whereNotInStrict($key, $values);
     /**
      * Filter the items, removing any items that don't match the given type(s).
      *
-     * @param  class-string|array<array-key, class-string>  $type
-     * @return static
+     * @template TWhereInstanceOf
+     *
+     * @param  class-string<TWhereInstanceOf>|array<array-key, class-string<TWhereInstanceOf>>  $type
+     * @return static<TKey, TWhereInstanceOf>
      */
     public function whereInstanceOf($type);
 

src/Illuminate/Collections/LazyCollection.php

@@ -848,8 +848,8 @@ public function nth($step, $offset = 0)
         return new static(function () use ($step, $offset) {
             $position = 0;
 
-            foreach ($this as $item) {
-                if ($position % $step === $offset) {
+            foreach ($this->slice($offset) as $item) {
+                if ($position % $step === 0) {
                     yield $item;
                 }
 

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -679,8 +679,10 @@ public function whereNotInStrict($key, $values)
     /**
      * Filter the items, removing any items that don't match the given type(s).
      *
-     * @param  class-string|array<array-key, class-string>  $type
-     * @return static
+     * @template TWhereInstanceOf
+     *
+     * @param  class-string<TWhereInstanceOf>|array<array-key, class-string<TWhereInstanceOf>>  $type
+     * @return static<TKey, TWhereInstanceOf>
      */
     public function whereInstanceOf($type)
     {

src/Illuminate/Console/Command.php

@@ -3,6 +3,7 @@
 namespace Illuminate\Console;
 
 use Illuminate\Support\Traits\Macroable;
+use ReflectionClass;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -86,6 +87,40 @@ public function __construct()
         }
     }
 
+    /**
+     * Return the command name.
+     *
+     * @return string|null
+     */
+    public static function getDefaultName(): ?string
+    {
+        $class = static::class;
+
+        $signature = (new ReflectionClass($class))->getDefaultProperties()['signature'] ?? null;
+
+        if (isset($signature)) {
+            return Parser::parse($signature)[0];
+        }
+
+        $name = (new ReflectionClass($class))->getDefaultProperties()['name'] ?? null;
+
+        return $name ?: parent::getDefaultName();
+    }
+
+    /**
+     * Return the command description.
+     *
+     * @return string|null
+     */
+    public static function getDefaultDescription(): ?string
+    {
+        $class = static::class;
+
+        $description = (new ReflectionClass($class))->getDefaultProperties()['description'] ?? null;
+
+        return $description ?: parent::getDefaultDescription();
+    }
+
     /**
      * Configure the console command using a fluent definition.
      *