Merge remote-tracking branch 'upstream/master' into 11/persist-databa…

…se-connections

.github/workflows/pull-requests.yml

@@ -8,5 +8,5 @@ permissions:
   pull-requests: write
 
 jobs:
-  uneditable:
+  pull-requests:
     uses: laravel/.github/.github/workflows/pull-requests.yml@main

config/app.php

@@ -119,8 +119,8 @@
     |--------------------------------------------------------------------------
     |
     | This key is utilized by Laravel's encryption services and should be set
-    | to a random, 32 character string or all of the encrypted strings are
-    | not secure. You should do this prior to deploying the application.
+    | to a random, 32 character string to ensure that all encrypted values
+    | are secure. You should do this prior to deploying the application.
     |
     */
 

config/cache.php

@@ -100,8 +100,8 @@
     | Cache Key Prefix
     |--------------------------------------------------------------------------
     |
-    | When utilizing the APC, database, memcached, Redis, or DynamoDB cache
-    | stores there might be other applications using the same cache. For
+    | When utilizing the APC, database, memcached, Redis, and DynamoDB cache
+    | stores, there might be other applications using the same cache. For
     | that reason, you may prefix every cache key to avoid collisions.
     |
     */

config/queue.php

@@ -22,7 +22,7 @@
     |
     | Here you may configure the connection information for each server that
     | is used by your application. A default configuration has been added
-    | for each back-end shipped with Laravel. You are free to add more.
+    | for each backend included with Laravel. You are free to add more.
     |
     | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
     |

src/Illuminate/Auth/Access/Gate.php

@@ -320,25 +320,25 @@ public function after(callable $callback)
     /**
      * Determine if all of the given abilities should be granted for the current user.
      *
-     * @param  iterable|string  $abilities
+     * @param  iterable|string  $ability
      * @param  array|mixed  $arguments
      * @return bool
      */
-    public function allows($abilities, $arguments = [])
+    public function allows($ability, $arguments = [])
     {
-        return $this->check($abilities, $arguments);
+        return $this->check($ability, $arguments);
     }
 
     /**
      * Determine if any of the given abilities should be denied for the current user.
      *
-     * @param  iterable|string  $abilities
+     * @param  iterable|string  $ability
      * @param  array|mixed  $arguments
      * @return bool
      */
-    public function denies($abilities, $arguments = [])
+    public function denies($ability, $arguments = [])
     {
-        return ! $this->allows($abilities, $arguments);
+        return ! $this->allows($ability, $arguments);
     }
 
     /**

src/Illuminate/Console/GeneratorCommand.php

@@ -249,7 +249,7 @@ protected function possibleModels()
     {
         $modelPath = is_dir(app_path('Models')) ? app_path('Models') : app_path();
 
-        return collect((new Finder)->files()->depth(0)->in($modelPath))
+        return collect(Finder::create()->files()->depth(0)->in($modelPath))
             ->map(fn ($file) => $file->getBasename('.php'))
             ->sort()
             ->values()
@@ -269,7 +269,7 @@ protected function possibleEvents()
             return [];
         }
 
-        return collect((new Finder)->files()->depth(0)->in($eventPath))
+        return collect(Finder::create()->files()->depth(0)->in($eventPath))
             ->map(fn ($file) => $file->getBasename('.php'))
             ->sort()
             ->values()

src/Illuminate/Contracts/Auth/Access/Gate.php

@@ -59,20 +59,20 @@ public function after(callable $callback);
     /**
      * Determine if all of the given abilities should be granted for the current user.
      *
-     * @param  iterable|string  $abilities
+     * @param  iterable|string  $ability
      * @param  array|mixed  $arguments
      * @return bool
      */
-    public function allows($abilities, $arguments = []);
+    public function allows($ability, $arguments = []);
 
     /**
      * Determine if any of the given abilities should be denied for the current user.
      *
-     * @param  iterable|string  $abilities
+     * @param  iterable|string  $ability
      * @param  array|mixed  $arguments
      * @return bool
      */
-    public function denies($abilities, $arguments = []);
+    public function denies($ability, $arguments = []);
 
     /**
      * Determine if all of the given abilities should be granted for the current user.

src/Illuminate/Contracts/Translation/Translator.php

@@ -18,7 +18,7 @@ public function get($key, array $replace = [], $locale = null);
      * Get a translation according to an integer value.
      *
      * @param  string  $key
-     * @param  \Countable|int|array  $number
+     * @param  \Countable|int|float|array  $number
      * @param  array  $replace
      * @param  string|null  $locale
      * @return string

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

@@ -175,9 +175,9 @@ protected function createMissingSqliteDatabase($path)
             return false;
         }
 
-        $this->components->warn('The SQLite database does not exist: '.$path);
+        $this->components->warn('The SQLite database configured for this application does not exist: '.$path);
 
-        if (! confirm('Would you like to create it?', default: false)) {
+        if (! confirm('Would you like to create it?', default: true)) {
             return false;
         }
 

src/Illuminate/Database/Console/PruneCommand.php

@@ -126,7 +126,7 @@ protected function models()
             throw new InvalidArgumentException('The --models and --except options cannot be combined.');
         }
 
-        return collect((new Finder)->in($this->getPath())->files()->name('*.php'))
+        return collect(Finder::create()->in($this->getPath())->files()->name('*.php'))
             ->map(function ($model) {
                 $namespace = $this->laravel->getNamespace();
 

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

@@ -2157,7 +2157,7 @@ public function originalIsEquivalent($key)
         }
 
         return is_numeric($attribute) && is_numeric($original)
-            && BigDecimal::of($attribute)->isEqualTo($original);
+            && strcmp((string) $attribute, (string) $original) === 0;
     }
 
     /**

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

@@ -11,6 +11,7 @@
 use Illuminate\Database\Eloquent\Relations\Concerns\AsPivot;
 use Illuminate\Database\Eloquent\Relations\Concerns\InteractsWithDictionary;
 use Illuminate\Database\Eloquent\Relations\Concerns\InteractsWithPivotTable;
+use Illuminate\Database\Query\Grammars\MySqlGrammar;
 use Illuminate\Database\UniqueConstraintViolationException;
 use Illuminate\Support\Str;
 use InvalidArgumentException;
@@ -1347,6 +1348,42 @@ public function getRelationExistenceQueryForSelfJoin(Builder $query, Builder $pa
         return parent::getRelationExistenceQuery($query, $parentQuery, $columns);
     }
 
+    /**
+     * Alias to set the "limit" value of the query.
+     *
+     * @param  int  $value
+     * @return $this
+     */
+    public function take($value)
+    {
+        return $this->limit($value);
+    }
+
+    /**
+     * Set the "limit" value of the query.
+     *
+     * @param  int  $value
+     * @return $this
+     */
+    public function limit($value)
+    {
+        if ($this->parent->exists) {
+            $this->query->limit($value);
+        } else {
+            $column = $this->getExistenceCompareKey();
+
+            $grammar = $this->query->getQuery()->getGrammar();
+
+            if ($grammar instanceof MySqlGrammar && $grammar->useLegacyGroupLimit($this->query->getQuery())) {
+                $column = 'pivot_'.last(explode('.', $column));
+            }
+
+            $this->query->groupLimit($value, $column);
+        }
+
+        return $this;
+    }
+
     /**
      * Get the key for comparing against the parent key in "has" query.
      *

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

@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Relations\Concerns\InteractsWithDictionary;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Grammars\MySqlGrammar;
 use Illuminate\Database\UniqueConstraintViolationException;
 
 class HasManyThrough extends Relation
@@ -762,6 +763,42 @@ public function getRelationExistenceQueryForThroughSelfRelation(Builder $query,
         );
     }
 
+    /**
+     * Alias to set the "limit" value of the query.
+     *
+     * @param  int  $value
+     * @return $this
+     */
+    public function take($value)
+    {
+        return $this->limit($value);
+    }
+
+    /**
+     * Set the "limit" value of the query.
+     *
+     * @param  int  $value
+     * @return $this
+     */
+    public function limit($value)
+    {
+        if ($this->farParent->exists) {
+            $this->query->limit($value);
+        } else {
+            $column = $this->getQualifiedFirstKeyName();
+
+            $grammar = $this->query->getQuery()->getGrammar();
+
+            if ($grammar instanceof MySqlGrammar && $grammar->useLegacyGroupLimit($this->query->getQuery())) {
+                $column = 'laravel_through_key';
+            }
+
+            $this->query->groupLimit($value, $column);
+        }
+
+        return $this;
+    }
+
     /**
      * Get the qualified foreign key on the related model.
      *

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

@@ -453,6 +453,34 @@ public function getRelationExistenceQueryForSelfRelation(Builder $query, Builder
         );
     }
 
+    /**
+     * Alias to set the "limit" value of the query.
+     *
+     * @param  int  $value
+     * @return $this
+     */
+    public function take($value)
+    {
+        return $this->limit($value);
+    }
+
+    /**
+     * Set the "limit" value of the query.
+     *
+     * @param  int  $value
+     * @return $this
+     */
+    public function limit($value)
+    {
+        if ($this->parent->exists) {
+            $this->query->limit($value);
+        } else {
+            $this->query->groupLimit($value, $this->getExistenceCompareKey());
+        }
+
+        return $this;
+    }
+
     /**
      * Get the key for comparing against the parent key in "has" query.
      *

src/Illuminate/Database/Query/Builder.php

@@ -152,6 +152,13 @@ class Builder implements BuilderContract
      */
     public $limit;
 
+    /**
+     * The maximum number of records to return per group.
+     *
+     * @var array
+     */
+    public $groupLimit;
+
     /**
      * The number of records to skip.
      *
@@ -2444,6 +2451,22 @@ public function limit($value)
         return $this;
     }
 
+    /**
+     * Add a "group limit" clause to the query.
+     *
+     * @param  int  $value
+     * @param  string  $column
+     * @return $this
+     */
+    public function groupLimit($value, $column)
+    {
+        if ($value >= 0) {
+            $this->groupLimit = compact('value', 'column');
+        }
+
+        return $this;
+    }
+
     /**
      * Set the limit and offset for a given page.
      *
@@ -2737,9 +2760,13 @@ public function soleValue($column)
      */
     public function get($columns = ['*'])
     {
-        return collect($this->onceWithColumns(Arr::wrap($columns), function () {
+        $items = collect($this->onceWithColumns(Arr::wrap($columns), function () {
             return $this->processor->processSelect($this, $this->runSelect());
         }));
+
+        return isset($this->groupLimit)
+            ? $this->withoutGroupLimitKeys($items)
+            : $items;
     }
 
     /**
@@ -2754,6 +2781,32 @@ protected function runSelect()
         );
     }
 
+    /**
+     * Remove the group limit keys from the results in the collection.
+     *
+     * @param  \Illuminate\Support\Collection  $items
+     * @return \Illuminate\Support\Collection
+     */
+    protected function withoutGroupLimitKeys($items)
+    {
+        $keysToRemove = ['laravel_row'];
+
+        if (is_string($this->groupLimit['column'])) {
+            $column = last(explode('.', $this->groupLimit['column']));
+
+            $keysToRemove[] = '@laravel_group := '.$this->grammar->wrap($column);
+            $keysToRemove[] = '@laravel_group := '.$this->grammar->wrap('pivot_'.$column);
+        }
+
+        $items->each(function ($item) use ($keysToRemove) {
+            foreach ($keysToRemove as $key) {
+                unset($item->$key);
+            }
+        });
+
+        return $items;
+    }
+
     /**
      * Paginate the given query into a simple paginator.
      *