resolve conflicts

Author: taylorotwell

src/Illuminate/Collections/Collection.php

@@ -1078,7 +1078,7 @@ public function reverse()
      *
      * @param  TValue|(callable(TValue,TKey): bool)  $value
      * @param  bool  $strict
-     * @return TKey|bool
+     * @return TKey|false
      */
     public function search($value, $strict = false)
     {

src/Illuminate/Collections/LazyCollection.php

@@ -1035,7 +1035,7 @@ public function reverse()
      *
      * @param  TValue|(callable(TValue,TKey): bool)  $value
      * @param  bool  $strict
-     * @return TKey|bool
+     * @return TKey|false
      */
     public function search($value, $strict = false)
     {

src/Illuminate/Collections/Traits/EnumeratesValues.php

@@ -464,6 +464,25 @@ public function partition($key, $operator = null, $value = null)
         return new static([new static($passed), new static($failed)]);
     }
 
+    /**
+     * Calculate the percentage of items that pass a given truth test.
+     *
+     * @param  (callable(TValue, TKey): bool)  $callback
+     * @param  int  $precision
+     * @return float|null
+     */
+    public function percentage(callable $callback, int $precision = 2)
+    {
+        if ($this->isEmpty()) {
+            return null;
+        }
+
+        return round(
+            $this->filter($callback)->count() / $this->count() * 100,
+            $precision
+        );
+    }
+
     /**
      * Get the sum of the given values.
      *

src/Illuminate/Console/Concerns/InteractsWithIO.php

@@ -450,4 +450,14 @@ public function getOutput()
     {
         return $this->output;
     }
+
+    /**
+     * Get the output component factory implementation.
+     *
+     * @return \Illuminate\Console\View\Components\Factory
+     */
+    public function outputComponents()
+    {
+        return $this->components;
+    }
 }

src/Illuminate/Console/Parser.php

@@ -16,7 +16,7 @@ class Parser
      *
      * @throws \InvalidArgumentException
      */
-    public static function parse($expression)
+    public static function parse(string $expression)
     {
         $name = static::name($expression);
 
@@ -35,7 +35,7 @@ public static function parse($expression)
      *
      * @throws \InvalidArgumentException
      */
-    protected static function name($expression)
+    protected static function name(string $expression)
     {
         if (! preg_match('/[^\s]+/', $expression, $matches)) {
             throw new InvalidArgumentException('Unable to determine command name from signature.');
@@ -45,7 +45,7 @@ protected static function name($expression)
     }
 
     /**
-     * Extract all of the parameters from the tokens.
+     * Extract all parameters from the tokens.
      *
      * @param  array  $tokens
      * @return array
@@ -57,7 +57,7 @@ protected static function parameters(array $tokens)
         $options = [];
 
         foreach ($tokens as $token) {
-            if (preg_match('/-{2,}(.*)/', $token, $matches)) {
+            if (preg_match('/^-{2,}(.*)/', $token, $matches)) {
                 $options[] = static::parseOption($matches[1]);
             } else {
                 $arguments[] = static::parseArgument($token);
@@ -73,7 +73,7 @@ protected static function parameters(array $tokens)
      * @param  string  $token
      * @return \Symfony\Component\Console\Input\InputArgument
      */
-    protected static function parseArgument($token)
+    protected static function parseArgument(string $token)
     {
         [$token, $description] = static::extractDescription($token);
 
@@ -99,7 +99,7 @@ protected static function parseArgument($token)
      * @param  string  $token
      * @return \Symfony\Component\Console\Input\InputOption
      */
-    protected static function parseOption($token)
+    protected static function parseOption(string $token)
     {
         [$token, $description] = static::extractDescription($token);
 
@@ -132,7 +132,7 @@ protected static function parseOption($token)
      * @param  string  $token
      * @return array
      */
-    protected static function extractDescription($token)
+    protected static function extractDescription(string $token)
     {
         $parts = preg_split('/\s+:\s+/', trim($token), 2);
 

src/Illuminate/Database/Connection.php

@@ -1080,7 +1080,7 @@ public function escape($value, $binary = false)
      */
     protected function escapeString($value)
     {
-        return $this->getPdo()->quote($value);
+        return $this->getReadPdo()->quote($value);
     }
 
     /**

src/Illuminate/Database/Console/Migrations/StatusCommand.php

@@ -60,20 +60,24 @@ public function handle()
 
             $batches = $this->migrator->getRepository()->getMigrationBatches();
 
-            if (count($migrations = $this->getStatusFor($ran, $batches)) > 0) {
+            $migrations = $this->getStatusFor($ran, $batches)
+                ->when($this->option('pending'), fn ($collection) => $collection->filter(function ($migration) {
+                    return str($migration[1])->contains('Pending');
+                }));
+
+            if (count($migrations) > 0) {
                 $this->newLine();
 
                 $this->components->twoColumnDetail('<fg=gray>Migration name</>', '<fg=gray>Batch / Status</>');
 
                 $migrations
-                    ->when($this->option('pending'), fn ($collection) => $collection->filter(function ($migration) {
-                        return str($migration[1])->contains('Pending');
-                    }))
                     ->each(
                         fn ($migration) => $this->components->twoColumnDetail($migration[0], $migration[1])
                     );
 
                 $this->newLine();
+            } elseif ($this->option('pending')) {
+                $this->components->info('No pending migrations');
             } else {
                 $this->components->info('No migrations found');
             }

src/Illuminate/Database/Eloquent/Builder.php

@@ -1139,10 +1139,21 @@ protected function addUpdatedAtColumn(array $values)
 
         $column = $this->model->getUpdatedAtColumn();
 
-        $values = array_merge(
-            [$column => $this->model->freshTimestampString()],
-            $values
-        );
+        if (! array_key_exists($column, $values)) {
+            $timestamp = $this->model->freshTimestampString();
+
+            if (
+                $this->model->hasSetMutator($column)
+                || $this->model->hasAttributeSetMutator($column)
+                || $this->model->hasCast($column)
+            ) {
+                $timestamp = $this->model->newInstance()
+                    ->forceFill([$column => $timestamp])
+                    ->getAttributes()[$column];
+            }
+
+            $values = array_merge([$column => $timestamp], $values);
+        }
 
         $segments = preg_split('/\s+as\s+/i', $this->query->from);
 

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

@@ -22,7 +22,7 @@ public function usesUniqueIds()
     }
 
     /**
-     * Generate a unique keys for model.
+     * Generate unique keys for the model.
      *
      * @return void
      */

src/Illuminate/Database/Eloquent/Factories/Factory.php

@@ -235,11 +235,15 @@ public function createOneQuietly($attributes = [])
     /**
      * Create a collection of models and persist them to the database.
      *
-     * @param  iterable<int, array<string, mixed>>  $records
+     * @param  int|iterable<int, array<string, mixed>>  $records
      * @return \Illuminate\Database\Eloquent\Collection<int, \Illuminate\Database\Eloquent\Model|TModel>
      */
-    public function createMany(iterable $records)
+    public function createMany(int|iterable $records)
     {
+        if (is_numeric($records)) {
+            $records = array_fill(0, $records, []);
+        }
+
         return new EloquentCollection(
             collect($records)->map(function ($record) {
                 return $this->state($record)->create();
@@ -250,10 +254,10 @@ public function createMany(iterable $records)
     /**
      * Create a collection of models and persist them to the database without dispatching any model events.
      *
-     * @param  iterable<int, array<string, mixed>>  $records
+     * @param  int|iterable<int, array<string, mixed>>  $records
      * @return \Illuminate\Database\Eloquent\Collection<int, \Illuminate\Database\Eloquent\Model|TModel>
      */
-    public function createManyQuietly(iterable $records)
+    public function createManyQuietly(int|iterable $records)
     {
         return Model::withoutEvents(function () use ($records) {
             return $this->createMany($records);