fix: dpr srcset when only h param (#76)

* fix: address issue where h only srcsets did not respect ar

* test: add h based srcset tests and comment out deprecated tests

* test: remove comments and add testHeightIncludesDPRParam

Author: luqven

src/Imgix/UrlBuilder.php

@@ -162,10 +162,9 @@ private function isDpr($params) {
         $hasHeight = array_key_exists('h', $params) ? $params['h'] : NULL;
         $hasAspectRatio = array_key_exists('ar', $params) ? $params['ar'] : NULL;
 
-        // If `params` have a width param or _both_ height and aspect
-        // ratio parameters then the srcset to be constructed with
-        // these params _is dpr based
-        return $hasWidth || ($hasHeight && $hasAspectRatio);
+        // If `params` have a width or height parameter then the
+        // srcset to be constructed with these params _is dpr based
+        return $hasWidth || $hasHeight;
     }
 
     private function createDPRSrcSet($path, $params, $disableVariableQuality=false) {

tests/Imgix/Tests/UrlBuilderTest.php

@@ -398,7 +398,7 @@ public function testGivenWidthSignsURLs() {
 
     public function testGivenHeightSrcsetGeneratesPairs() {
         $srcset = $this->srcsetBuilder(array("h"=>300));
-        $expectedNumberOfPairs = 31;
+        $expectedNumberOfPairs = 5;
         $this->assertEquals($expectedNumberOfPairs, count(explode(",", $srcset)));
     }
 
@@ -411,34 +411,23 @@ public function testGivenHeightRespectsParameter() {
         }
     }
 
-    public function testGivenHeightSrcsetPairsWithinBounds() {
+    public function testHeightBasedSrcsetHasDprValues() {
         $srcset = $this->srcsetBuilder(array("h"=>300));
         $srclist = explode(",", $srcset);
 
-        $minParsed = explode(" ", $srclist[0])[1];
-        $maxParsed = explode(" ", $srclist[count($srclist)-1])[1];
-        $min = $this->parseWidth($minParsed);
-        $max = $this->parseWidth($maxParsed);
-
-        $this->assertGreaterThanOrEqual(100, $min);
-        $this->assertLessThanOrEqual(8192, $max);
+        foreach ($srclist as $i=>$src) {
+            $dpr = explode(" ", $src)[1];
+            $this->assertMatchesRegularExpression("/x/", $dpr);
+        }
     }
 
-    public function testGivenHeightSrcsetIteratesEighteenPercent() {
-        $incrementAllowed = .18;
+    public function testHeightIncludesDPRParam() {
         $srcset = $this->srcsetBuilder(array("h"=>300));
         $srclist = explode(",", $srcset);
 
-        $widths = array_map(function ($src) {
-            return $this->parseWidth(explode(" ", $src)[1]);
-        }, $srclist);
-
-        $prev = $widths[0];
-        $size = count($widths);
-        for ($i = 1; $i < $size; $i++) {
-            $width = $widths[$i];
-            $this->assertLessThan((1 + $incrementAllowed), ($width / $prev));
-            $prev = $width;
+        foreach ($srclist as $i=>$src) {
+            $dpr = explode(" ", $src)[0];
+            $this->assertMatchesRegularExpression("/dpr=/", $dpr);
         }
     }