Merge pull request #144 from ampproject/update/tiny-image-detection

Author: schlessera

src/Dom/Document.php

@@ -2081,7 +2081,7 @@ public function createElementWithAttributes($name, $attributes, $value = null)
             return false;
         }
 
-        $element->addAttributes($attributes);
+        $element->setAttributes($attributes);
 
         return $element;
     }

src/Dom/Element.php

@@ -240,7 +240,7 @@ public function getAttributesAsAssocArray()
      *
      * @param string[] $attributes One or more attributes for the node's HTML element.
      */
-    public function addAttributes($attributes)
+    public function setAttributes($attributes)
     {
         foreach ($attributes as $name => $value) {
             try {

src/Optimizer/ImageDimensions.php

@@ -113,6 +113,11 @@ public function getDimensionsFromParent()
                 continue;
             }
 
+            // If layout is responsive, consider dimensions to be unbounded.
+            if (Layout::RESPONSIVE === $element->getAttribute(Attribute::LAYOUT)) {
+                return [PHP_INT_MAX, PHP_INT_MAX];
+            }
+
             return [(int)$width, (int)$height];
         }
 

tests/Dom/ElementTest.php

@@ -393,27 +393,27 @@ public function testCopyAttributes($attributes, Element $from, Element $to, $exp
     /**
      * Test adding no attributes to node.
      *
-     * @covers \AmpProject\Dom\Element::addAttributes()
+     * @covers \AmpProject\Dom\Element::setAttributes()
      */
     public function testAddAttributesToNodeForNoAttributes()
     {
         $dom     = Document::fromHtml('<p>Hello World</p>');
         $element = $dom->createElement('b');
-        $element->addAttributes([]);
+        $element->setAttributes([]);
         $this->assertFalse($element->hasAttributes());
     }
 
     /**
      * Test adding attribute with no value to node.
      *
-     * @covers \AmpProject\Dom\Element::addAttributes()
+     * @covers \AmpProject\Dom\Element::setAttributes()
      */
     public function testAddAttributesToNodeForAttributeWithoutValue()
     {
         $dom        = Document::fromHtml('<p>Hello World</p>');
         $element    = $dom->createElement('div');
         $attributes = [ 'placeholder' => '' ];
-        $element->addAttributes($attributes);
+        $element->setAttributes($attributes);
 
         $this->assertTrue($element->hasAttributes());
         $this->checkElementHasAttributes($element, $attributes);
@@ -422,7 +422,7 @@ public function testAddAttributesToNodeForAttributeWithoutValue()
     /**
      * Test adding attribute with value to node.
      *
-     * @covers \AmpProject\Dom\Element::addAttributes()
+     * @covers \AmpProject\Dom\Element::setAttributes()
      */
     public function testAddAttributesToNodeForAttributeWithValue()
     {
@@ -432,7 +432,7 @@ public function testAddAttributesToNodeForAttributeWithValue()
             'class' => 'myClass',
             'id'    => 'myId',
         ];
-        $element->addAttributes($attributes);
+        $element->setAttributes($attributes);
 
         $this->assertTrue($element->hasAttributes());
         $this->checkElementHasAttributes($element, $attributes);

tests/Optimizer/ImageDimensionsTest.php

@@ -410,28 +410,46 @@ public function dataItCanCheckIfAnImageIsTiny()
     public function testItCanCheckIfAnImageIsTiny($width, $height, $layout, $threshold, $expected)
     {
         $dom   = new Document();
-        $image = $dom->createElement(Tag::IMG);
+        $attrs = [];
 
         if ($width !== null) {
-            $image->setAttribute(Attribute::WIDTH, $width);
+            $attrs[Attribute::WIDTH] = $width;
         }
 
         if ($height !== null) {
-            $image->setAttribute(Attribute::HEIGHT, $height);
+            $attrs[Attribute::HEIGHT] = $height;
         }
 
         if ($layout !== null) {
-            $image->setAttribute(Attribute::LAYOUT, $layout);
+            $attrs[Attribute::LAYOUT] = $layout;
         }
 
-        $parent = $dom->createElement(Tag::FIGURE);
-        $parent->setAttribute(Attribute::WIDTH, 400);
-        $parent->setAttribute(Attribute::HEIGHT, 200);
-
+        // Check in fixed layout parent.
+        $parent = $dom->createElementWithAttributes(
+            'amp-layout',
+            [
+                Attribute::LAYOUT => Layout::FIXED,
+                Attribute::WIDTH  => 400,
+                Attribute::HEIGHT => 200,
+            ]
+        );
+        $image = $dom->createElementWithAttributes(Tag::IMG, $attrs);
         $parent->appendChild($image);
-
         $imageDimensions = new ImageDimensions($image);
+        $this->assertEquals($expected, $imageDimensions->isTiny($threshold));
 
+        // Check in responsive layout parent.
+        $parent = $dom->createElementWithAttributes(
+            'amp-layout',
+            [
+                Attribute::LAYOUT => Layout::RESPONSIVE,
+                Attribute::WIDTH  => 3,
+                Attribute::HEIGHT => 4,
+            ]
+        );
+        $image = $dom->createElementWithAttributes(Tag::IMG, $attrs);
+        $parent->appendChild($image);
+        $imageDimensions = new ImageDimensions($image);
         $this->assertEquals($expected, $imageDimensions->isTiny($threshold));
     }
 }