prepare release

spatie · Aug 23, 2017 · b861152 · b861152
1 parent 0ba7a77
commit b861152
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to `mixed-content-scanner` will be documented in this file
 
+## 1.1.1 - 2017-08-23
+
+- do not mark shortlinks as mixed content
+
 ## 1.1.0 - 2017-08-11
 
 - add `toArray` to `MixedContent`

diff --git a/src/MixedContentExtractor.php b/src/MixedContentExtractor.php
@@ -16,13 +16,7 @@ public static function extract(string $html, string $currentUri): array
                 return (new DomCrawler($html, $currentUri))
                     ->filterXPath("//{$tagName}[@{$attribute}]")
                     ->reduce(function (DomCrawler $node) {
-                        $relAttr = $node->getNode(0)->attributes->getNamedItem('rel');
-
-                        if ($relAttr !== null && strtolower($relAttr->nodeValue) === 'shortlink') {
-                            return false;
-                        }
-
-                        return true;
+                        return ! self::isShortLink($node);
                     })
                     ->each(function (DomCrawler $node) use ($tagName, $attribute) {
                         $url = Url::create($node->attr($attribute));
@@ -56,4 +50,15 @@ protected static function getSearchNodes(): Collection
             ['video', 'src'],
         ]);
     }
+
+    protected static function isShortLink(DomCrawler $node)
+    {
+        $relAttribute = $node->getNode(0)->attributes->getNamedItem('rel');
+
+        if (is_null($relAttribute)) {
+            return false;
+        }
+
+        return strtolower($relAttribute->nodeValue) === 'shortlink';
+    }
 }