fix conflicts

taylorotwell · taylorotwell · commit 3c0d065a29e9 · 2025-03-12T09:34:58.000-05:00
diff --git a/src/Illuminate/Collections/Traits/EnumeratesValues.php b/src/Illuminate/Collections/Traits/EnumeratesValues.php
@@ -342,7 +342,7 @@ public function value($key, $default = null)
      *
      * @template TEnsureOfType
      *
-     * @param  class-string<TEnsureOfType>|array<array-key, class-string<TEnsureOfType>>|scalar|'array'|'null'  $type
+     * @param  class-string<TEnsureOfType>|array<array-key, class-string<TEnsureOfType>>|'string'|'int'|'float'|'bool'|'array'|'null'  $type
      * @return static<TKey, TEnsureOfType>
      *
      * @throws \UnexpectedValueException
diff --git a/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php b/src/Illuminate/Database/Eloquent/Concerns/QueriesRelationships.php
@@ -674,7 +674,7 @@ public function whereNotMorphedTo($relation, $model, $boolean = 'and')
             $models->groupBy(fn ($model) => $model->getMorphClass())->each(function ($models) use ($query, $relation) {
                 $query->orWhere(function ($query) use ($relation, $models) {
                     $query->where($relation->qualifyColumn($relation->getMorphType()), '<=>', $models->first()->getMorphClass())
-                        ->whereNotIn($relation->qualifyColumn($relation->getForeignKeyName()), $models->map->getKey());
+                        ->whereIn($relation->qualifyColumn($relation->getForeignKeyName()), $models->map->getKey());
                 });
             });
         }, null, null, $boolean);
diff --git a/src/Illuminate/Database/Seeder.php b/src/Illuminate/Database/Seeder.php
@@ -110,11 +110,15 @@ public function callSilent($class, array $parameters = [])
      */
     public function callOnce($class, $silent = false, array $parameters = [])
     {
-        if (in_array($class, static::$called)) {
-            return;
-        }
+        $classes = Arr::wrap($class);
+
+        foreach ($classes as $class) {
+            if (in_array($class, static::$called)) {
+                continue;
+            }
 
-        $this->call($class, $silent, $parameters);
+            $this->call($class, $silent, $parameters);
+        }
     }
 
     /**
diff --git a/src/Illuminate/Redis/Connections/PacksPhpRedisValues.php b/src/Illuminate/Redis/Connections/PacksPhpRedisValues.php
@@ -95,26 +95,26 @@ public function withoutSerializationOrCompression(callable $callback)
         $oldSerializer = null;
 
         if ($this->serialized()) {
-            $oldSerializer = $client->getOption($client::OPT_SERIALIZER);
-            $client->setOption($client::OPT_SERIALIZER, $client::SERIALIZER_NONE);
+            $oldSerializer = $client->getOption(Redis::OPT_SERIALIZER);
+            $client->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);
         }
 
         $oldCompressor = null;
 
         if ($this->compressed()) {
-            $oldCompressor = $client->getOption($client::OPT_COMPRESSION);
-            $client->setOption($client::OPT_COMPRESSION, $client::COMPRESSION_NONE);
+            $oldCompressor = $client->getOption(Redis::OPT_COMPRESSION);
+            $client->setOption(Redis::OPT_COMPRESSION, Redis::COMPRESSION_NONE);
         }
 
         try {
             return $callback();
         } finally {
             if ($oldSerializer !== null) {
-                $client->setOption($client::OPT_SERIALIZER, $oldSerializer);
+                $client->setOption(Redis::OPT_SERIALIZER, $oldSerializer);
             }
 
             if ($oldCompressor !== null) {
-                $client->setOption($client::OPT_COMPRESSION, $oldCompressor);
+                $client->setOption(Redis::OPT_COMPRESSION, $oldCompressor);
             }
         }
     }
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -421,8 +421,8 @@ protected function replacePlaceholderInString(string $value)
     /**
      * Replace each field parameter dot placeholder with dot.
      *
-     * @param  string  $value
-     * @return string
+     * @param  array  $parameters
+     * @return array
      */
     protected function replaceDotPlaceholderInParameters(array $parameters)
     {
diff --git a/tests/Database/DatabaseEloquentBuilderTest.php b/tests/Database/DatabaseEloquentBuilderTest.php
@@ -1859,7 +1859,7 @@ public function testWhereNotMorphedTo()
 
         $builder = $model->whereNotMorphedTo('morph', $relatedModel);
 
-        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?)))', $builder->toSql());
+        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?)))', $builder->toSql());
         $this->assertEquals([$relatedModel->getMorphClass(), $relatedModel->getKey()], $builder->getBindings());
     }
 
@@ -1876,7 +1876,7 @@ public function testWhereNotMorphedToCollection()
 
         $builder = $model->whereNotMorphedTo('morph', new Collection([$firstRelatedModel, $secondRelatedModel]));
 
-        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?, ?)))', $builder->toSql());
+        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?, ?)))', $builder->toSql());
         $this->assertEquals([$firstRelatedModel->getMorphClass(), $firstRelatedModel->getKey(), $secondRelatedModel->getKey()], $builder->getBindings());
     }
 
@@ -1896,7 +1896,7 @@ public function testWhereNotMorphedToCollectionWithDifferentModels()
 
         $builder = $model->whereNotMorphedTo('morph', [$firstRelatedModel, $secondRelatedModel, $thirdRelatedModel]);
 
-        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?, ?)) or ("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?)))', $builder->toSql());
+        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?, ?)) or ("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?)))', $builder->toSql());
         $this->assertEquals([$firstRelatedModel->getMorphClass(), $firstRelatedModel->getKey(), $thirdRelatedModel->getKey(), $secondRelatedModel->getMorphClass(), $secondRelatedModel->id], $builder->getBindings());
     }
 
@@ -1972,7 +1972,7 @@ public function testOrWhereNotMorphedTo()
 
         $builder = $model->where('bar', 'baz')->orWhereNotMorphedTo('morph', $relatedModel);
 
-        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?)))', $builder->toSql());
+        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?)))', $builder->toSql());
         $this->assertEquals(['baz', $relatedModel->getMorphClass(), $relatedModel->getKey()], $builder->getBindings());
     }
 
@@ -1989,7 +1989,7 @@ public function testOrWhereNotMorphedToCollection()
 
         $builder = $model->where('bar', 'baz')->orWhereNotMorphedTo('morph', new Collection([$firstRelatedModel, $secondRelatedModel]));
 
-        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?, ?)))', $builder->toSql());
+        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?, ?)))', $builder->toSql());
         $this->assertEquals(['baz', $firstRelatedModel->getMorphClass(), $firstRelatedModel->getKey(), $secondRelatedModel->getKey()], $builder->getBindings());
     }
 
@@ -2009,7 +2009,7 @@ public function testOrWhereNotMorphedToCollectionWithDifferentModels()
 
         $builder = $model->where('bar', 'baz')->orWhereNotMorphedTo('morph', [$firstRelatedModel, $secondRelatedModel, $thirdRelatedModel]);
 
-        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?, ?)) or ("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?)))', $builder->toSql());
+        $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?, ?)) or ("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?)))', $builder->toSql());
         $this->assertEquals(['baz', $firstRelatedModel->getMorphClass(), $firstRelatedModel->getKey(), $thirdRelatedModel->getKey(), $secondRelatedModel->getMorphClass(), $secondRelatedModel->id], $builder->getBindings());
     }
 
diff --git a/tests/Validation/ValidationEmailRuleTest.php b/tests/Validation/ValidationEmailRuleTest.php
@@ -11,6 +11,7 @@
 use Illuminate\Validation\Rules\Email;
 use Illuminate\Validation\ValidationServiceProvider;
 use Illuminate\Validation\Validator;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\Attributes\TestWith;
 use PHPUnit\Framework\TestCase;
 
@@ -165,6 +166,7 @@ public function testRfcCompliantStrict()
         );
     }
 
+    #[RequiresPhpExtension('intl')]
     public function testValidateMxRecord()
     {
         $this->fails(
@@ -696,6 +698,7 @@ public function testEmailsThatFailBothNativeValidationAndRfcCompliantStrict($ema
         );
     }
 
+    #[RequiresPhpExtension('intl')]
     public function testCombiningRules()
     {
         $this->passes(

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ public function value($key, $default = null)`
`342`	`342`	`*`
`343`	`343`	`* @template TEnsureOfType`
`344`	`344`	`*`
`345`		`- * @param class-string<TEnsureOfType>\|array<array-key, class-string<TEnsureOfType>>\|scalar\|'array'\|'null' $type`
	`345`	`+ * @param class-string<TEnsureOfType>\|array<array-key, class-string<TEnsureOfType>>\|'string'\|'int'\|'float'\|'bool'\|'array'\|'null' $type`
`346`	`346`	`* @return static<TKey, TEnsureOfType>`
`347`	`347`	`*`
`348`	`348`	`* @throws \UnexpectedValueException`
Original file line number	Diff line number	Diff line change
`@@ -95,26 +95,26 @@ public function withoutSerializationOrCompression(callable $callback)`
`95`	`95`	`$oldSerializer = null;`
`96`	`96`
`97`	`97`	`if ($this->serialized()) {`
`98`		`- $oldSerializer = $client->getOption($client::OPT_SERIALIZER);`
`99`		`- $client->setOption($client::OPT_SERIALIZER, $client::SERIALIZER_NONE);`
	`98`	`+ $oldSerializer = $client->getOption(Redis::OPT_SERIALIZER);`
	`99`	`+ $client->setOption(Redis::OPT_SERIALIZER, Redis::SERIALIZER_NONE);`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`$oldCompressor = null;`
`103`	`103`
`104`	`104`	`if ($this->compressed()) {`
`105`		`- $oldCompressor = $client->getOption($client::OPT_COMPRESSION);`
`106`		`- $client->setOption($client::OPT_COMPRESSION, $client::COMPRESSION_NONE);`
	`105`	`+ $oldCompressor = $client->getOption(Redis::OPT_COMPRESSION);`
	`106`	`+ $client->setOption(Redis::OPT_COMPRESSION, Redis::COMPRESSION_NONE);`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`try {`
`110`	`110`	`return $callback();`
`111`	`111`	`} finally {`
`112`	`112`	`if ($oldSerializer !== null) {`
`113`		`- $client->setOption($client::OPT_SERIALIZER, $oldSerializer);`
	`113`	`+ $client->setOption(Redis::OPT_SERIALIZER, $oldSerializer);`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`if ($oldCompressor !== null) {`
`117`		`- $client->setOption($client::OPT_COMPRESSION, $oldCompressor);`
	`117`	`+ $client->setOption(Redis::OPT_COMPRESSION, $oldCompressor);`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -421,8 +421,8 @@ protected function replacePlaceholderInString(string $value)`
`421`	`421`	`/**`
`422`	`422`	`* Replace each field parameter dot placeholder with dot.`
`423`	`423`	`*`
`424`		`- * @param string $value`
`425`		`- * @return string`
	`424`	`+ * @param array $parameters`
	`425`	`+ * @return array`
`426`	`426`	`*/`
`427`	`427`	`protected function replaceDotPlaceholderInParameters(array $parameters)`
`428`	`428`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1859,7 +1859,7 @@ public function testWhereNotMorphedTo()`
`1859`	`1859`
`1860`	`1860`	`$builder = $model->whereNotMorphedTo('morph', $relatedModel);`
`1861`	`1861`
`1862`		`- $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?)))', $builder->toSql());`
	`1862`	`+ $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?)))', $builder->toSql());`
`1863`	`1863`	`$this->assertEquals([$relatedModel->getMorphClass(), $relatedModel->getKey()], $builder->getBindings());`
`1864`	`1864`	`}`
`1865`	`1865`
`@@ -1876,7 +1876,7 @@ public function testWhereNotMorphedToCollection()`
`1876`	`1876`
`1877`	`1877`	`$builder = $model->whereNotMorphedTo('morph', new Collection([$firstRelatedModel, $secondRelatedModel]));`
`1878`	`1878`
`1879`		`- $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?, ?)))', $builder->toSql());`
	`1879`	`+ $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?, ?)))', $builder->toSql());`
`1880`	`1880`	`$this->assertEquals([$firstRelatedModel->getMorphClass(), $firstRelatedModel->getKey(), $secondRelatedModel->getKey()], $builder->getBindings());`
`1881`	`1881`	`}`
`1882`	`1882`
`@@ -1896,7 +1896,7 @@ public function testWhereNotMorphedToCollectionWithDifferentModels()`
`1896`	`1896`
`1897`	`1897`	`$builder = $model->whereNotMorphedTo('morph', [$firstRelatedModel, $secondRelatedModel, $thirdRelatedModel]);`
`1898`	`1898`
`1899`		`- $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?, ?)) or ("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?)))', $builder->toSql());`
	`1899`	`+ $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?, ?)) or ("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?)))', $builder->toSql());`
`1900`	`1900`	`$this->assertEquals([$firstRelatedModel->getMorphClass(), $firstRelatedModel->getKey(), $thirdRelatedModel->getKey(), $secondRelatedModel->getMorphClass(), $secondRelatedModel->id], $builder->getBindings());`
`1901`	`1901`	`}`
`1902`	`1902`
`@@ -1972,7 +1972,7 @@ public function testOrWhereNotMorphedTo()`
`1972`	`1972`
`1973`	`1973`	`$builder = $model->where('bar', 'baz')->orWhereNotMorphedTo('morph', $relatedModel);`
`1974`	`1974`
`1975`		`- $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?)))', $builder->toSql());`
	`1975`	`+ $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?)))', $builder->toSql());`
`1976`	`1976`	`$this->assertEquals(['baz', $relatedModel->getMorphClass(), $relatedModel->getKey()], $builder->getBindings());`
`1977`	`1977`	`}`
`1978`	`1978`
`@@ -1989,7 +1989,7 @@ public function testOrWhereNotMorphedToCollection()`
`1989`	`1989`
`1990`	`1990`	`$builder = $model->where('bar', 'baz')->orWhereNotMorphedTo('morph', new Collection([$firstRelatedModel, $secondRelatedModel]));`
`1991`	`1991`
`1992`		`- $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?, ?)))', $builder->toSql());`
	`1992`	`+ $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?, ?)))', $builder->toSql());`
`1993`	`1993`	`$this->assertEquals(['baz', $firstRelatedModel->getMorphClass(), $firstRelatedModel->getKey(), $secondRelatedModel->getKey()], $builder->getBindings());`
`1994`	`1994`	`}`
`1995`	`1995`
`@@ -2009,7 +2009,7 @@ public function testOrWhereNotMorphedToCollectionWithDifferentModels()`
`2009`	`2009`
`2010`	`2010`	`$builder = $model->where('bar', 'baz')->orWhereNotMorphedTo('morph', [$firstRelatedModel, $secondRelatedModel, $thirdRelatedModel]);`
`2011`	`2011`
`2012`		`- $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?, ?)) or ("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" not in (?)))', $builder->toSql());`
	`2012`	`+ $this->assertSame('select * from "eloquent_builder_test_model_parent_stubs" where "bar" = ? or not (("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?, ?)) or ("eloquent_builder_test_model_parent_stubs"."morph_type" <=> ? and "eloquent_builder_test_model_parent_stubs"."morph_id" in (?)))', $builder->toSql());`
`2013`	`2013`	`$this->assertEquals(['baz', $firstRelatedModel->getMorphClass(), $firstRelatedModel->getKey(), $thirdRelatedModel->getKey(), $secondRelatedModel->getMorphClass(), $secondRelatedModel->id], $builder->getBindings());`
`2014`	`2014`	`}`
`2015`	`2015`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`use Illuminate\Validation\Rules\Email;`
`12`	`12`	`use Illuminate\Validation\ValidationServiceProvider;`
`13`	`13`	`use Illuminate\Validation\Validator;`
	`14`	`+use PHPUnit\Framework\Attributes\RequiresPhpExtension;`
`14`	`15`	`use PHPUnit\Framework\Attributes\TestWith;`
`15`	`16`	`use PHPUnit\Framework\TestCase;`
`16`	`17`
`@@ -165,6 +166,7 @@ public function testRfcCompliantStrict()`
`165`	`166`	`);`
`166`	`167`	`}`
`167`	`168`
	`169`	`+ #[RequiresPhpExtension('intl')]`
`168`	`170`	`public function testValidateMxRecord()`
`169`	`171`	`{`
`170`	`172`	`$this->fails(`
`@@ -696,6 +698,7 @@ public function testEmailsThatFailBothNativeValidationAndRfcCompliantStrict($ema`
`696`	`698`	`);`
`697`	`699`	`}`
`698`	`700`
	`701`	`+ #[RequiresPhpExtension('intl')]`
`699`	`702`	`public function testCombiningRules()`
`700`	`703`	`{`
`701`	`704`	`$this->passes(`