[10.x] Use method on UploadedFile to validate image dimensions (larav…

…el#46912) * imageSize method on uploadedfile * formatting * fix variable --------- Co-authored-by: Taylor Otwell <taylor@laravel.com>
bert-w · May 1, 2023 · a2f35fa · a2f35fa
1 parent 8de1aa2
commit a2f35fa
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 2 deletions.
diff --git a/src/Illuminate/Http/FileHelpers.php b/src/Illuminate/Http/FileHelpers.php
@@ -53,4 +53,14 @@ public function hashName($path = null)
 
         return $path.$hash.$extension;
     }
+
+    /**
+     * Get the dimensions of the image (if applicable).
+     *
+     * @return array|null
+     */
+    public function dimensions()
+    {
+        return @getimagesize($this->getRealPath());
+    }
 }
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -683,13 +683,21 @@ public function validateDimensions($attribute, $value, $parameters)
             return true;
         }
 
-        if (! $this->isValidFileInstance($value) || ! $sizeDetails = @getimagesize($value->getRealPath())) {
+        if (! $this->isValidFileInstance($value)) {
+            return false;
+        }
+
+        $dimensions = method_exists($value, 'dimensions')
+                ? $value->dimensions()
+                : @getimagesize($value->getRealPath());
+
+        if (! $dimensions) {
             return false;
         }
 
         $this->requireParameterCount(1, $parameters, 'dimensions');
 
-        [$width, $height] = $sizeDetails;
+        [$width, $height] = $dimensions;
 
         $parameters = $this->parseNamedParameters($parameters);
 

diff --git a/tests/Validation/ValidationImageFileRuleTest.php b/tests/Validation/ValidationImageFileRuleTest.php
@@ -30,6 +30,20 @@ public function testDimensions()
         );
     }
 
+    public function testDimensionsWithCustomImageSizeMethod()
+    {
+        $this->fails(
+            File::image()->dimensions(Rule::dimensions()->width(100)->height(100)),
+            new UploadedFileWithCustomImageSizeMethod(stream_get_meta_data($tmpFile = tmpfile())['uri'], 'foo.png'),
+            ['validation.dimensions'],
+        );
+
+        $this->passes(
+            File::image()->dimensions(Rule::dimensions()->width(200)->height(200)),
+            new UploadedFileWithCustomImageSizeMethod(stream_get_meta_data($tmpFile = tmpfile())['uri'], 'foo.png'),
+        );
+    }
+
     protected function fails($rule, $values, $messages)
     {
         $this->assertValidationRules($rule, $values, false, $messages);
@@ -84,3 +98,21 @@ protected function tearDown(): void
         Facade::setFacadeApplication(null);
     }
 }
+
+class UploadedFileWithCustomImageSizeMethod extends UploadedFile
+{
+    public function isValid(): bool
+    {
+        return true;
+    }
+
+    public function guessExtension(): string
+    {
+        return 'png';
+    }
+
+    public function dimensions()
+    {
+        return [200, 200];
+    }
+}