Merge pull request #8 from mbiencinto/feature/SR-78

[SR-78] - fix request with extension not html and content-type text/html
holadev · Dec 18, 2020 · 6be060d · 6be060d
2 parents ddb4d23 + 9659af1
commit 6be060d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/EventSubscriber/AmpOptimizerSubscriber.php b/EventSubscriber/AmpOptimizerSubscriber.php
@@ -118,7 +118,12 @@ private function isAmpHtml(Response $response, Request $request): bool
             return false;
         }
 
-        $htmlElementAttrs = $dom->find('html', 0)->getAllAttributes();
+        $htmlElement = $dom->find('html', 0);
+        if (null === $htmlElement) {
+            return false;
+        }
+
+        $htmlElementAttrs = $htmlElement->getAllAttributes();
         if (empty(array_intersect(['⚡', 'amp'], array_keys($htmlElementAttrs)))) {
             return false;
         }

diff --git a/Tests/Unit/EventSubscriber/AmpOptimizerSubscriberTest.php b/Tests/Unit/EventSubscriber/AmpOptimizerSubscriberTest.php
@@ -91,6 +91,9 @@ public function testNotAmpRequest()
         $event = $this->getEventNotAmpRequestMocked('text/html', '<html></html>');
         $instance->onKernelResponse($event);
 
+        $event = $this->getEventNotAmpRequestMocked('text/html', '<body></body>');
+        $instance->onKernelResponse($event);
+
         $event = $this->getEventNotAmpRequestMocked('text/html', '');
         $instance->onKernelResponse($event);
     }