Fix: Release/5.3.x Support relative links (#422)

* Update Explorer.php (Fix relative URLs in links) * Update Feed.php (Fix relative URLs in links) * Update Node.php (Fix relative URLs in links) * Update XmlParser.php (Fix relative URLs in links) * Update Reader.php (Fix relative URLs in links) * Update Link.php (Fix relative URLs in links)
alexdebril · Oct 24, 2023 · 7c206ea · 7c206ea
1 parent d8dcd77
commit 7c206ea
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 4 deletions.
diff --git a/src/FeedIo/Explorer.php b/src/FeedIo/Explorer.php
@@ -29,14 +29,14 @@ public function discover(string $url): array
         $stream = $this->client->getResponse($url, new DateTime('@0'));
 
         $internalErrors = libxml_use_internal_errors(true);
-        $feeds = $this->extractFeeds($stream->getBody());
+        $feeds = $this->extractFeeds($stream->getBody(), $url);
 
         libxml_use_internal_errors($internalErrors);
 
         return $feeds;
     }
 
-    protected function extractFeeds(string $html): array
+    protected function extractFeeds(string $html, string $url = null): array    
     {
         $dom = new DOMDocument();
         $dom->loadHTML($html);
@@ -53,6 +53,9 @@ protected function extractFeeds(string $html): array
                     // returning
                     $href = 'https:' . $href;
                 }
+                if (!parse_url($href, PHP_URL_HOST) && $url){
+                    $href = parse_url($url, PHP_URL_SCHEME) . '://' . parse_url($url, PHP_URL_HOST) . '/' . ltrim($href,'/');
+                }
                 $feeds[] = $href;
             }
         }

diff --git a/src/FeedIo/Feed.php b/src/FeedIo/Feed.php
@@ -134,6 +134,8 @@ public function rewind(): void
 
     public function add(ItemInterface $item): FeedInterface
     {
+        $item->setHostInContent($this->getHostFromLink());
+
         if ($item->getLastModified() > $this->getLastModified()) {
             $this->setLastModified($item->getLastModified());
         }

diff --git a/src/FeedIo/Feed/Node.php b/src/FeedIo/Feed/Node.php
@@ -150,6 +150,33 @@ protected function setHost(string $link = null): void
         }
     }
 
+    protected function setHostInContent(string $host = null): void
+    {
+        if (property_exists($this, 'content')){
+            if (!is_null($host) && !is_null($this->content)) {
+                $this->content = preg_replace('!(<*\s*[^>]*)(href=)(.?)(\/[^\/])!','\1 href=\3'.$host.'\4', $this->content );
+                $this->content = preg_replace('!(<*\s*[^>]*)(src=)(.?)(\/[^\/])!','\1 src=\3'.$host.'\4', $this->content );
+            }
+        }
+        if (property_exists($this, 'description')){
+            if (!is_null($host) && !is_null($this->description)) {
+                $this->description = preg_replace('!(<*\s*[^>]*)(href=)(.?)(\/[^\/])!','\1 href=\3'.$host.'\4', $this->description );
+                $this->description = preg_replace('!(<*\s*[^>]*)(src=)(.?)(\/[^\/])!','\1 src=\3'.$host.'\4', $this->description );
+            }
+        }
+    }
+
+    public function getHostFromLink(): ?string
+    {
+        if (!is_null($this->getLink())) {
+            $partsUrl  = parse_url($this->getLink());
+            $result = $partsUrl['scheme']."://".$partsUrl['host'];
+        } else
+            $result = null;
+
+        return $result;
+    }
+
     public function getValue(string $name): ?string
     {
         foreach ($this->getElementIterator($name) as $element) {

diff --git a/src/FeedIo/Parser/XmlParser.php b/src/FeedIo/Parser/XmlParser.php
@@ -76,7 +76,8 @@ public function parseNode(NodeInterface $item, DOMElement $element, RuleSet $rul
     protected function handleNode(NodeInterface $item, DOMElement $node, RuleSet $ruleSet): void
     {
         if ($this->isItem($node->tagName) && $item instanceof FeedInterface) {
-            $newItem = $this->parseNode($item->newItem(), $node, $this->getItemRuleSet());
+            $linkItem = $item->getLink();
+            $newItem = $this->parseNode($item->newItem()->setLink($linkItem), $node, $this->getItemRuleSet());
             $this->addValidItem($item, $newItem);
         } else {
             $rule = $ruleSet->get($node->tagName);

diff --git a/src/FeedIo/Reader.php b/src/FeedIo/Reader.php
@@ -73,6 +73,7 @@ public function read(string $url, FeedInterface $feed, DateTime $modifiedSince =
         try {
             $this->logger->info("hitting {$url}");
             $response = $this->client->getResponse($url, $modifiedSince);
+            $feed->setLink($url);
             $document = $this->handleResponse($response, $feed);
 
             return new Result($document, $feed, $modifiedSince, $response, $url);

diff --git a/src/FeedIo/Rule/Link.php b/src/FeedIo/Rule/Link.php
@@ -17,7 +17,11 @@ class Link extends RuleAbstract
      */
     public function setProperty(NodeInterface $node, \DOMElement $element): void
     {
-        $node->setLink($element->nodeValue);
+        $nodeValue = $element->nodeValue;
+        if (parse_url($nodeValue, PHP_URL_HOST) == null) {
+            $nodeValue = $node->getHostFromLink(). $nodeValue;
+        }
+        $node->setLink($nodeValue);
     }
 
     /**