fix conflicts

Author: taylorotwell

config/database.php

@@ -149,6 +149,7 @@
         'options' => [
             'cluster' => env('REDIS_CLUSTER', 'redis'),
             'prefix' => env('REDIS_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_database_'),
+            'persistent' => env('REDIS_PERSISTENT', false),
         ],
 
         'default' => [

src/Illuminate/Bus/PendingBatch.php

@@ -98,7 +98,7 @@ public function add($jobs)
     protected function ensureJobIsBatchable(object|array $job): void
     {
         foreach (Arr::wrap($job) as $job) {
-            if ($job instanceof PendingBatch) {
+            if ($job instanceof PendingBatch || $job instanceof Closure) {
                 return;
             }
 

src/Illuminate/Collections/Arr.php

@@ -930,6 +930,18 @@ public static function where($array, callable $callback)
         return array_filter($array, $callback, ARRAY_FILTER_USE_BOTH);
     }
 
+    /**
+     * Filter the array using the negation of the given callback.
+     *
+     * @param  array  $array
+     * @param  callable  $callback
+     * @return array
+     */
+    public static function reject($array, callable $callback)
+    {
+        return static::where($array, fn ($value, $key) => ! $callback($value, $key));
+    }
+
     /**
      * Filter items where the value is not null.
      *

src/Illuminate/Collections/Collection.php

@@ -629,7 +629,7 @@ public function implode($value, $glue = null)
 
         $first = $this->first();
 
-        if (is_array($first) || (is_object($first) && ! $first instanceof Stringable)) {
+        if (is_array($first) || (is_object($first) && ! $first instanceof \Stringable)) {
             return implode($glue ?? '', $this->pluck($value)->all());
         }
 

src/Illuminate/Database/Concerns/BuildsQueries.php

@@ -22,7 +22,6 @@
 /**
  * @template TValue
  *
- * @mixin \Illuminate\Database\Eloquent\Builder
  * @mixin \Illuminate\Database\Query\Builder
  */
 trait BuildsQueries

src/Illuminate/Database/Eloquent/Builder.php

@@ -477,6 +477,21 @@ public function find($id, $columns = ['*'])
         return $this->whereKey($id)->first($columns);
     }
 
+    /**
+     * Find a sole model by its primary key.
+     *
+     * @param  mixed  $id
+     * @param  array|string  $columns
+     * @return TModel
+     *
+     * @throws \Illuminate\Database\Eloquent\ModelNotFoundException<TModel>
+     * @throws \Illuminate\Database\MultipleRecordsFoundException
+     */
+    public function findSole($id, $columns = ['*'])
+    {
+        return $this->whereKey($id)->sole($columns);
+    }
+
     /**
      * Find multiple models by their primary keys.
      *
@@ -1013,10 +1028,7 @@ public function paginate($perPage = null, $columns = ['*'], $pageName = 'page',
 
         $total = value($total) ?? $this->toBase()->getCountForPagination();
 
-        $perPage = ($perPage instanceof Closure
-            ? $perPage($total)
-            : $perPage
-        ) ?: $this->model->getPerPage();
+        $perPage = value($perPage, $total) ?? $this->model->getPerPage();
 
         $results = $total
             ? $this->forPage($page, $perPage)->get($columns)

src/Illuminate/Database/Eloquent/Collection.php

@@ -335,6 +335,19 @@ public function contains($key, $operator = null, $value = null)
         return parent::contains(fn ($model) => $model->getKey() == $key);
     }
 
+    /**
+     * Determine if a key does not exist in the collection.
+     *
+     * @param  (callable(TModel, TKey): bool)|TModel|string|int  $key
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @return bool
+     */
+    public function doesntContain($key, $operator = null, $value = null)
+    {
+        return ! $this->contains(...func_get_args());
+    }
+
     /**
      * Get the array of primary keys.
      *

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

@@ -161,7 +161,9 @@ public function getUpdatedAtColumn()
      */
     public function getQualifiedCreatedAtColumn()
     {
-        return $this->qualifyColumn($this->getCreatedAtColumn());
+        $column = $this->getCreatedAtColumn();
+
+        return $column ? $this->qualifyColumn($column) : null;
     }
 
     /**
@@ -171,7 +173,9 @@ public function getQualifiedCreatedAtColumn()
      */
     public function getQualifiedUpdatedAtColumn()
     {
-        return $this->qualifyColumn($this->getUpdatedAtColumn());
+        $column = $this->getUpdatedAtColumn();
+
+        return $column ? $this->qualifyColumn($column) : null;
     }
 
     /**

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

@@ -165,7 +165,7 @@ public function whereHas($relation, ?Closure $callback = null, $operator = '>=',
     /**
      * Add a relationship count / exists condition to the query with where clauses.
      *
-     * Also load the relationship with same condition.
+     * Also load the relationship with the same condition.
      *
      * @param  string  $relation
      * @param  (\Closure(\Illuminate\Database\Eloquent\Builder<*>|\Illuminate\Database\Eloquent\Relations\Relation<*, *, *>): mixed)|null  $callback
@@ -374,7 +374,7 @@ public function whereHasMorph($relation, $types, ?Closure $callback = null, $ope
      * @template TRelatedModel of \Illuminate\Database\Eloquent\Model
      *
      * @param  \Illuminate\Database\Eloquent\Relations\MorphTo<TRelatedModel, *>|string  $relation
-     * @param  string|array<int, array>  $types
+     * @param  string|array<int, string>  $types
      * @param  (\Closure(\Illuminate\Database\Eloquent\Builder<TRelatedModel>, string): mixed)|null  $callback
      * @param  string  $operator
      * @param  int  $count
@@ -437,6 +437,25 @@ public function whereRelation($relation, $column, $operator = null, $value = nul
         });
     }
 
+    /**
+     * Add a basic where clause to a relationship query and eager-load the relationship with the same conditions.
+     *
+     * @param  \Illuminate\Database\Eloquent\Relations\Relation<*, *, *>|string  $relation
+     * @param  \Closure|string|array|\Illuminate\Contracts\Database\Query\Expression  $column
+     * @param  mixed  $operator
+     * @param  mixed  $value
+     * @return $this
+     */
+    public function withWhereRelation($relation, $column, $operator = null, $value = null)
+    {
+        return $this->whereRelation($relation, $column, $operator, $value)
+            ->with([
+                $relation => fn ($query) => $column instanceof Closure
+                    ? $column($query)
+                    : $query->where($column, $operator, $value),
+            ]);
+    }
+
     /**
      * Add an "or where" clause to a relationship query.
      *

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

@@ -114,11 +114,11 @@ abstract class Factory
     public static $namespace = 'Database\\Factories\\';
 
     /**
-     * The default model name resolver.
+     * The default model name resolvers.
      *
-     * @var callable(self): class-string<TModel>
+     * @var array<class-string, callable(self): class-string<TModel>>
      */
-    protected static $modelNameResolver;
+    protected static $modelNameResolvers = [];
 
     /**
      * The factory name resolver.
@@ -810,9 +810,9 @@ public function modelName()
             return $this->model;
         }
 
-        $resolver = static::$modelNameResolver ?? function (self $factory) {
+        $resolver = static::$modelNameResolvers[static::class] ?? static::$modelNameResolvers[self::class] ?? function (self $factory) {
             $namespacedFactoryBasename = Str::replaceLast(
-                'Factory', '', Str::replaceFirst(static::$namespace, '', get_class($factory))
+                'Factory', '', Str::replaceFirst(static::$namespace, '', $factory::class)
             );
 
             $factoryBasename = Str::replaceLast('Factory', '', class_basename($factory));
@@ -835,7 +835,7 @@ public function modelName()
      */
     public static function guessModelNamesUsing(callable $callback)
     {
-        static::$modelNameResolver = $callback;
+        static::$modelNameResolvers[static::class] = $callback;
     }
 
     /**
@@ -924,6 +924,18 @@ protected static function appNamespace()
         }
     }
 
+    /**
+     * Flush the factory's global state.
+     *
+     * @return void
+     */
+    public static function flushState()
+    {
+        static::$modelNameResolvers = [];
+        static::$factoryNameResolver = null;
+        static::$namespace = 'Database\\Factories\\';
+    }
+
     /**
      * Proxy dynamic factory methods onto their proper methods.
      *