[10.x] Fix validation message used for max file size (#49879)

* Use correct validation message * Add tests * Apply styleci fixes * Update src/Illuminate/Validation/Concerns/FormatsMessages.php * Use symfony file to get attribute type * Apply fixes from styleci --------- Co-authored-by: Dries Vints <[email protected]>
laravel · Jan 29, 2024 · d410d61 · d410d61
1 parent fb9d508
commit d410d61
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/src/Illuminate/Validation/Concerns/FormatsMessages.php b/src/Illuminate/Validation/Concerns/FormatsMessages.php
@@ -5,6 +5,7 @@
 use Closure;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
+use Symfony\Component\HttpFoundation\File\File;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 trait FormatsMessages
@@ -218,15 +219,13 @@ protected function getAttributeType($attribute)
         // We assume that the attributes present in the file array are files so that
         // means that if the attribute does not have a numeric rule and the files
         // list doesn't have it we'll just consider it a string by elimination.
-        if ($this->hasRule($attribute, $this->numericRules)) {
-            return 'numeric';
-        } elseif ($this->hasRule($attribute, ['Array'])) {
-            return 'array';
-        } elseif ($this->getValue($attribute) instanceof UploadedFile) {
-            return 'file';
-        }
-
-        return 'string';
+        return match (true) {
+            $this->hasRule($attribute, $this->numericRules) => 'numeric',
+            $this->hasRule($attribute, ['Array']) => 'array',
+            $this->getValue($attribute) instanceof UploadedFile,
+            $this->getValue($attribute) instanceof File => 'file',
+            default => 'string',
+        };
     }
 
     /**

diff --git a/tests/Validation/ValidationFileRuleTest.php b/tests/Validation/ValidationFileRuleTest.php
@@ -344,6 +344,21 @@ public function testMacro()
         );
     }
 
+    public function testItUsesTheCorrectValidationMessageForFile(): void
+    {
+        file_put_contents($path = __DIR__.'/test.json', 'this-is-a-test');
+
+        $file = new \Illuminate\Http\File($path);
+
+        $this->fails(
+            ['max:0'],
+            $file,
+            ['validation.max.file']
+        );
+
+        unlink($path);
+    }
+
     public function testItCanSetDefaultUsing()
     {
         $this->assertInstanceOf(File::class, File::default());