Merge branch '5.4' of github.com:laravel/framework into 5.4

laravel · Jun 13, 2017 · a7ebbfa · a7ebbfa
2 parents 097f02f + ca3955f
commit a7ebbfa
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git a/src/Illuminate/Queue/Worker.php b/src/Illuminate/Queue/Worker.php
@@ -247,7 +247,7 @@ protected function getNextJob($connection, $queue)
 
             $this->stopWorkerIfLostConnection($e);
         } catch (Throwable $e) {
-            $this->exceptions->report(new FatalThrowableError($e));
+            $this->exceptions->report($e = new FatalThrowableError($e));
 
             $this->stopWorkerIfLostConnection($e);
         }
@@ -270,7 +270,7 @@ protected function runJob($job, $connectionName, WorkerOptions $options)
 
             $this->stopWorkerIfLostConnection($e);
         } catch (Throwable $e) {
-            $this->exceptions->report(new FatalThrowableError($e));
+            $this->exceptions->report($e = new FatalThrowableError($e));
 
             $this->stopWorkerIfLostConnection($e);
         }

diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -478,7 +478,9 @@ protected function failsRatioCheck($parameters, $width, $height)
             [1, 1], array_filter(sscanf($parameters['ratio'], '%f/%d'))
         );
 
-        return abs($numerator / $denominator - $width / $height) > 0.000001;
+        $precision = 1 / max($width, $height);
+
+        return abs($numerator / $denominator - $width / $height) > $precision;
     }
 
     /**

diff --git a/tests/Validation/ValidationDimensionsRuleTest.php b/tests/Validation/ValidationDimensionsRuleTest.php
@@ -21,5 +21,9 @@ public function testItCorrectlyFormatsAStringVersionOfTheRule()
         $rule = Rule::dimensions()->maxWidth(1000)->maxHeight(500)->ratio(3 / 2);
 
         $this->assertEquals('dimensions:max_width=1000,max_height=500,ratio=1.5', (string) $rule);
+
+        $rule = new Dimensions(['ratio' => '2/3']);
+
+        $this->assertEquals('dimensions:ratio=2/3', (string) $rule);
     }
 }
diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -1972,6 +1972,9 @@ public function testValidateImage()
         $this->assertTrue($v->passes());
     }
 
+    /**
+     * @group dimension
+     */
     public function testValidateImageDimensions()
     {
         // Knowing that demo image.png has width = 3 and height = 2
@@ -2037,6 +2040,14 @@ public function testValidateImageDimensions()
 
         $v = new Validator($trans, ['x' => $emptyUploadedFile], ['x' => 'dimensions:min_width=1']);
         $this->assertTrue($v->fails());
+
+        // Knowing that demo image3.png has width = 7 and height = 10
+        $uploadedFile = new \Symfony\Component\HttpFoundation\File\UploadedFile(__DIR__.'/fixtures/image3.png', '', null, null, null, true);
+        $trans = $this->getIlluminateArrayTranslator();
+
+        // Ensure validation doesn't erroneously fail when ratio has no fractional part
+        $v = new Validator($trans, ['x' => $uploadedFile], ['x' => 'dimensions:ratio=2/3']);
+        $this->assertTrue($v->passes());
     }
 
     /**

diff --git a/tests/Validation/fixtures/image3.png b/tests/Validation/fixtures/image3.png