fix dimensions validation when file not provided (#14025)

laravel · Jun 21, 2016 · a0dbc55 · a0dbc55
1 parent 002de78
commit a0dbc55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -1565,7 +1565,7 @@ protected function validateImage($attribute, $value)
      */
     protected function validateDimensions($attribute, $value, $parameters)
     {
-        if (! $sizeDetails = getimagesize($value->getRealPath())) {
+        if (! $this->isAValidFileInstance($value) || ! $sizeDetails = getimagesize($value->getRealPath())) {
             return false;
         }
 

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -1665,9 +1665,12 @@ public function testValidateImage()
     public function testValidateImageDimensions()
     {
         // Knowing that demo image.gif has width = 3 and height = 2
-        $uploadedFile = new \Symfony\Component\HttpFoundation\File\UploadedFile(__DIR__.'/fixtures/image.gif', '');
+        $uploadedFile = new \Symfony\Component\HttpFoundation\File\UploadedFile(__DIR__.'/fixtures/image.gif', '', null, null, null, true);
         $trans = $this->getRealTranslator();
 
+        $v = new Validator($trans, ['x' => 'file'], ['x' => 'dimensions']);
+        $this->assertTrue($v->fails());
+
         $v = new Validator($trans, [], ['x' => 'dimensions:min_width=1']);
         $v->setFiles(['x' => $uploadedFile]);
         $this->assertTrue($v->passes());