fix conflicts

taylorotwell · taylorotwell · commit 2d133034fefd · 2025-03-05T09:30:35.000-06: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>>  $type
+     * @param  class-string<TEnsureOfType>|array<array-key, class-string<TEnsureOfType>>|scalar|'array'|'null'  $type
      * @return static<TKey, TEnsureOfType>
      *
      * @throws \UnexpectedValueException
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -257,7 +257,7 @@ public static function inferBasePath()
             isset($_ENV['APP_BASE_PATH']) => $_ENV['APP_BASE_PATH'],
             default => dirname(array_values(array_filter(
                 array_keys(ClassLoader::getRegisteredLoaders()),
-                fn ($path) => ! str_contains($path, '/vendor/'),
+                fn ($path) => ! str_starts_with($path, 'phar://'),
             ))[0]),
         };
     }
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -307,11 +307,11 @@ class Validator implements ValidatorContract
     protected $defaultNumericRules = ['Numeric', 'Integer', 'Decimal'];
 
     /**
-     * The current placeholder for dots in rule keys.
+     * The current random hash for the validator.
      *
      * @var string
      */
-    protected $dotPlaceholder;
+    protected static $placeholderHash;
 
     /**
      * The exception to throw upon failure.
@@ -344,7 +344,9 @@ public function __construct(
         array $messages = [],
         array $attributes = [],
     ) {
-        $this->dotPlaceholder = Str::random();
+        if (! isset(static::$placeholderHash)) {
+            static::$placeholderHash = Str::random();
+        }
 
         $this->initialRules = $rules;
         $this->translator = $translator;
@@ -372,7 +374,7 @@ public function parseData(array $data)
 
             $key = str_replace(
                 ['.', '*'],
-                [$this->dotPlaceholder, '__asterisk__'],
+                ['__dot__'.static::$placeholderHash, '__asterisk__'.static::$placeholderHash],
                 $key
             );
 
@@ -410,7 +412,7 @@ protected function replacePlaceholders($data)
     protected function replacePlaceholderInString(string $value)
     {
         return str_replace(
-            [$this->dotPlaceholder, '__asterisk__'],
+            ['__dot__'.static::$placeholderHash, '__asterisk__'.static::$placeholderHash],
             ['.', '*'],
             $value
         );
@@ -425,7 +427,7 @@ protected function replacePlaceholderInString(string $value)
     protected function replaceDotPlaceholderInParameters(array $parameters)
     {
         return array_map(function ($field) {
-            return str_replace($this->dotPlaceholder, '.', $field);
+            return str_replace('__dot__'.static::$placeholderHash, '.', $field);
         }, $parameters);
     }
 
@@ -746,7 +748,7 @@ protected function getPrimaryAttribute($attribute)
     protected function replaceDotInParameters(array $parameters)
     {
         return array_map(function ($field) {
-            return str_replace('\.', $this->dotPlaceholder, $field);
+            return str_replace('\.', '__dot__'.static::$placeholderHash, $field);
         }, $parameters);
     }
 
@@ -872,11 +874,24 @@ protected function hasNotFailedPreviousRuleIfPresenceRule($rule, $attribute)
      */
     protected function validateUsingCustomRule($attribute, $value, $rule)
     {
-        $attribute = $this->replacePlaceholderInString($attribute);
+        $originalAttribute = $this->replacePlaceholderInString($attribute);
+
+        $attribute = match (true) {
+            $rule instanceof Rules\Email => $attribute,
+            $rule instanceof Rules\File => $attribute,
+            $rule instanceof Rules\Password => $attribute,
+            default => $originalAttribute,
+        };
 
         $value = is_array($value) ? $this->replacePlaceholders($value) : $value;
 
         if ($rule instanceof ValidatorAwareRule) {
+            if ($attribute !== $originalAttribute) {
+                $this->addCustomAttributes([
+                    $attribute => $this->customAttributes[$originalAttribute] ?? $originalAttribute,
+                ]);
+            }
+
             $rule->setValidator($this);
         }
 
@@ -889,14 +904,14 @@ protected function validateUsingCustomRule($attribute, $value, $rule)
                 get_class($rule->invokable()) :
                 get_class($rule);
 
-            $this->failedRules[$attribute][$ruleClass] = [];
+            $this->failedRules[$originalAttribute][$ruleClass] = [];
 
-            $messages = $this->getFromLocalArray($attribute, $ruleClass) ?? $rule->message();
+            $messages = $this->getFromLocalArray($originalAttribute, $ruleClass) ?? $rule->message();
 
             $messages = $messages ? (array) $messages : [$ruleClass];
 
             foreach ($messages as $key => $message) {
-                $key = is_string($key) ? $key : $attribute;
+                $key = is_string($key) ? $key : $originalAttribute;
 
                 $this->messages->add($key, $this->makeReplacements(
                     $message, $key, $ruleClass, []
@@ -1189,7 +1204,7 @@ public function getRulesWithoutPlaceholders()
     {
         return (new Collection($this->rules))
             ->mapWithKeys(fn ($value, $key) => [
-                str_replace($this->dotPlaceholder, '\\.', $key) => $value,
+                str_replace('__dot__'.static::$placeholderHash, '\\.', $key) => $value,
             ])
             ->all();
     }
@@ -1203,7 +1218,7 @@ public function getRulesWithoutPlaceholders()
     public function setRules(array $rules)
     {
         $rules = (new Collection($rules))->mapWithKeys(function ($value, $key) {
-            return [str_replace('\.', $this->dotPlaceholder, $key) => $value];
+            return [str_replace('\.', '__dot__'.static::$placeholderHash, $key) => $value];
         })->toArray();
 
         $this->initialRules = $rules;
diff --git a/tests/Integration/Cache/DynamoDbStoreTest.php b/tests/Integration/Cache/DynamoDbStoreTest.php
@@ -65,7 +65,7 @@ public function testLocksCanBeAcquired()
      * @param  \Illuminate\Foundation\Application  $app
      * @return void
      */
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         if (! env('DYNAMODB_CACHE_TABLE')) {
             $this->markTestSkipped('DynamoDB not configured.');
diff --git a/tests/Integration/Cookie/CookieTest.php b/tests/Integration/Cookie/CookieTest.php
@@ -42,7 +42,7 @@ public function test_cookie_is_sent_back_with_proper_expire_time_with_respect_to
         $this->assertEquals(Carbon::now()->getTimestamp() + 60, $response->headers->getCookies()[1]->getExpiresTime());
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app->instance(
             ExceptionHandler::class,
diff --git a/tests/Integration/Database/EloquentTransactionWithAfterCommitUsingDatabaseTransactionsTest.php b/tests/Integration/Database/EloquentTransactionWithAfterCommitUsingDatabaseTransactionsTest.php
@@ -32,7 +32,7 @@ protected function setUp(): void
         }
     }
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $connection = $app->make('config')->get('database.default');
 
diff --git a/tests/Integration/Database/MariaDb/DatabaseEmulatePreparesMariaDbConnectionTest.php b/tests/Integration/Database/MariaDb/DatabaseEmulatePreparesMariaDbConnectionTest.php
@@ -10,9 +10,9 @@
 #[RequiresPhpExtension('pdo_mysql')]
 class DatabaseEmulatePreparesMariaDbConnectionTest extends DatabaseMariaDbConnectionTest
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
-        parent::getEnvironmentSetUp($app);
+        parent::defineEnvironment($app);
 
         $app['config']->set('database.connections.mariadb.options', [
             PDO::ATTR_EMULATE_PREPARES => true,
diff --git a/tests/Integration/Database/MySql/DatabaseEmulatePreparesMySqlConnectionTest.php b/tests/Integration/Database/MySql/DatabaseEmulatePreparesMySqlConnectionTest.php
@@ -10,9 +10,9 @@
 #[RequiresPhpExtension('pdo_mysql')]
 class DatabaseEmulatePreparesMySqlConnectionTest extends DatabaseMySqlConnectionTest
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
-        parent::getEnvironmentSetUp($app);
+        parent::defineEnvironment($app);
 
         $app['config']->set('database.connections.mysql.options', [
             PDO::ATTR_EMULATE_PREPARES => true,
diff --git a/tests/Integration/Database/Postgres/PostgresSchemaBuilderTest.php b/tests/Integration/Database/Postgres/PostgresSchemaBuilderTest.php
@@ -13,9 +13,9 @@
 #[RequiresPhpExtension('pdo_pgsql')]
 class PostgresSchemaBuilderTest extends PostgresTestCase
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
-        parent::getEnvironmentSetUp($app);
+        parent::defineEnvironment($app);
 
         $app['config']->set('database.connections.pgsql.search_path', 'public,private');
     }
diff --git a/tests/Integration/Mail/SendingMarkdownMailTest.php b/tests/Integration/Mail/SendingMarkdownMailTest.php
@@ -12,7 +12,7 @@
 
 class SendingMarkdownMailTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('mail.driver', 'array');
 
diff --git a/tests/Integration/Mail/SendingQueuedMailTest.php b/tests/Integration/Mail/SendingQueuedMailTest.php
@@ -11,7 +11,7 @@
 
 class SendingQueuedMailTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('mail.driver', 'array');
 
diff --git a/tests/Integration/Queue/JobEncryptionTest.php b/tests/Integration/Queue/JobEncryptionTest.php
@@ -21,9 +21,9 @@ class JobEncryptionTest extends DatabaseTestCase
 {
     use DatabaseMigrations;
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
-        parent::getEnvironmentSetUp($app);
+        parent::defineEnvironment($app);
 
         $app['config']->set('app.key', Str::random(32));
         $app['config']->set('queue.default', 'database');
diff --git a/tests/Integration/Queue/ModelSerializationTest.php b/tests/Integration/Queue/ModelSerializationTest.php
@@ -18,7 +18,7 @@ class ModelSerializationTest extends TestCase
 {
     use RefreshDatabase;
 
-    protected function getEnvironmentSetUp($app)
+    protected function defineEnvironment($app)
     {
         $app['config']->set('database.connections.custom', [
             'driver' => 'sqlite',
diff --git a/tests/Integration/Queue/QueueConnectionTest.php b/tests/Integration/Queue/QueueConnectionTest.php
@@ -8,17 +8,14 @@
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Support\Facades\Bus;
 use Mockery as m;
+use Orchestra\Testbench\Attributes\WithConfig;
 use Orchestra\Testbench\TestCase;
 use Throwable;
 
+#[WithConfig('queue.default', 'sqs')]
+#[WithConfig('queue.connections.sqs.after_commit', true)]
 class QueueConnectionTest extends TestCase
 {
-    protected function getEnvironmentSetUp($app)
-    {
-        $app['config']->set('queue.default', 'sqs');
-        $app['config']->set('queue.connections.sqs.after_commit', true);
-    }
-
     protected function tearDown(): void
     {
         QueueConnectionTestJob::$ran = false;
diff --git a/tests/Integration/Validation/Rules/EmailValidationTest.php b/tests/Integration/Validation/Rules/EmailValidationTest.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Validation\Rules;
+
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rules\Email;
+use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\Attributes\TestWith;
+
+class EmailValidationTest extends TestCase
+{
+    #[TestWith(['0'])]
+    #[TestWith(['.'])]
+    #[TestWith(['*'])]
+    #[TestWith(['__asterisk__'])]
+    public function test_it_can_validate_attribute_as_array(string $attribute)
+    {
+        $validator = Validator::make([
+            'emails' => [
+                $attribute => 'taylor@laravel.com',
+            ],
+        ], [
+            'emails.*' => ['required', Email::default()->rfcCompliant()],
+        ]);
+
+        $this->assertTrue($validator->passes());
+    }
+
+    #[TestWith(['0'])]
+    #[TestWith(['.'])]
+    #[TestWith(['*'])]
+    #[TestWith(['__asterisk__'])]
+    public function test_it_can_validate_attribute_as_array_when_validation_should_fails(string $attribute)
+    {
+        $validator = Validator::make([
+            'emails' => [
+                $attribute => 'taylor[at]laravel.com',
+            ],
+        ], [
+            'emails.*' => ['required', Email::default()->rfcCompliant()],
+        ]);
+
+        $this->assertFalse($validator->passes());
+
+        $this->assertSame([
+            0 => __('validation.email', ['attribute' => sprintf('emails.%s', str_replace('_', ' ', $attribute))]),
+        ], $validator->messages()->all());
+    }
+}
diff --git a/tests/Integration/Validation/Rules/FileValidationTest.php b/tests/Integration/Validation/Rules/FileValidationTest.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Illuminate\Tests\Integration\Validation\Rules;
+
+use Illuminate\Http\UploadedFile;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rules\File;
+use Orchestra\Testbench\TestCase;
+use PHPUnit\Framework\Attributes\TestWith;
+
+class FileValidationTest extends TestCase
+{
+    #[TestWith(['0'])]
+    #[TestWith(['.'])]
+    #[TestWith(['*'])]
+    #[TestWith(['__asterisk__'])]
+    public function test_it_can_validate_attribute_as_array(string $attribute)
+    {
+        $file = UploadedFile::fake()->create('laravel.png', 1, 'image/png');
+
+        $validator = Validator::make([
+            'files' => [
+                $attribute => $file,
+            ],
+        ], [
+            'files.*' => ['required', File::types(['image/png', 'image/jpeg'])],
+        ]);
+
+        $this->assertTrue($validator->passes());
+    }
+
+    #[TestWith(['0'])]
+    #[TestWith(['.'])]
+    #[TestWith(['*'])]
+    #[TestWith(['__asterisk__'])]
+    public function test_it_can_validate_attribute_as_array_when_validation_should_fails(string $attribute)
+    {
+        $file = UploadedFile::fake()->create('laravel.php', 1, 'image/php');
+
+        $validator = Validator::make([
+            'files' => [
+                $attribute => $file,
+            ],
+        ], [
+            'files.*' => ['required', File::types($mimes = ['image/png', 'image/jpeg'])],
+        ]);
+
+        $this->assertFalse($validator->passes());
+
+        $this->assertSame([
+            0 => __('validation.mimetypes', ['attribute' => sprintf('files.%s', str_replace('_', ' ', $attribute)), 'values' => implode(', ', $mimes)]),
+        ], $validator->messages()->all());
+    }
+}
diff --git a/tests/Integration/Validation/Rules/PasswordValidationTest.php b/tests/Integration/Validation/Rules/PasswordValidationTest.php
diff --git a/tests/Integration/View/BladeAnonymousComponentTest.php b/tests/Integration/View/BladeAnonymousComponentTest.php
diff --git a/tests/Integration/View/BladeTest.php b/tests/Integration/View/BladeTest.php
diff --git a/tests/Integration/View/RenderableViewExceptionTest.php b/tests/Integration/View/RenderableViewExceptionTest.php

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>> $type`
	`345`	`+ * @param class-string<TEnsureOfType>\|array<array-key, class-string<TEnsureOfType>>\|scalar\|'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
`@@ -257,7 +257,7 @@ public static function inferBasePath()`
`257`	`257`	`isset($_ENV['APP_BASE_PATH']) => $_ENV['APP_BASE_PATH'],`
`258`	`258`	`default => dirname(array_values(array_filter(`
`259`	`259`	`array_keys(ClassLoader::getRegisteredLoaders()),`
`260`		`- fn ($path) => ! str_contains($path, '/vendor/'),`
	`260`	`+ fn ($path) => ! str_starts_with($path, 'phar://'),`
`261`	`261`	`))[0]),`
`262`	`262`	`};`
`263`	`263`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function testLocksCanBeAcquired()`
`65`	`65`	`* @param \Illuminate\Foundation\Application $app`
`66`	`66`	`* @return void`
`67`	`67`	`*/`
`68`		`- protected function getEnvironmentSetUp($app)`
	`68`	`+ protected function defineEnvironment($app)`
`69`	`69`	`{`
`70`	`70`	`if (! env('DYNAMODB_CACHE_TABLE')) {`
`71`	`71`	`$this->markTestSkipped('DynamoDB not configured.');`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function test_cookie_is_sent_back_with_proper_expire_time_with_respect_to`
`42`	`42`	`$this->assertEquals(Carbon::now()->getTimestamp() + 60, $response->headers->getCookies()[1]->getExpiresTime());`
`43`	`43`	`}`
`44`	`44`
`45`		`- protected function getEnvironmentSetUp($app)`
	`45`	`+ protected function defineEnvironment($app)`
`46`	`46`	`{`
`47`	`47`	`$app->instance(`
`48`	`48`	`ExceptionHandler::class,`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected function setUp(): void`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- protected function getEnvironmentSetUp($app)`
	`35`	`+ protected function defineEnvironment($app)`
`36`	`36`	`{`
`37`	`37`	`$connection = $app->make('config')->get('database.default');`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -10,9 +10,9 @@`
`10`	`10`	`#[RequiresPhpExtension('pdo_mysql')]`
`11`	`11`	`class DatabaseEmulatePreparesMariaDbConnectionTest extends DatabaseMariaDbConnectionTest`
`12`	`12`	`{`
`13`		`- protected function getEnvironmentSetUp($app)`
	`13`	`+ protected function defineEnvironment($app)`
`14`	`14`	`{`
`15`		`- parent::getEnvironmentSetUp($app);`
	`15`	`+ parent::defineEnvironment($app);`
`16`	`16`
`17`	`17`	`$app['config']->set('database.connections.mariadb.options', [`
`18`	`18`	`PDO::ATTR_EMULATE_PREPARES => true,`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,9 @@`
`13`	`13`	`#[RequiresPhpExtension('pdo_pgsql')]`
`14`	`14`	`class PostgresSchemaBuilderTest extends PostgresTestCase`
`15`	`15`	`{`
`16`		`- protected function getEnvironmentSetUp($app)`
	`16`	`+ protected function defineEnvironment($app)`
`17`	`17`	`{`
`18`		`- parent::getEnvironmentSetUp($app);`
	`18`	`+ parent::defineEnvironment($app);`
`19`	`19`
`20`	`20`	`$app['config']->set('database.connections.pgsql.search_path', 'public,private');`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`class SendingMarkdownMailTest extends TestCase`
`14`	`14`	`{`
`15`		`- protected function getEnvironmentSetUp($app)`
	`15`	`+ protected function defineEnvironment($app)`
`16`	`16`	`{`
`17`	`17`	`$app['config']->set('mail.driver', 'array');`
`18`	`18`