Run rector

j0k3r · Jan 27, 2022 · 84a3cec · 84a3cec
1 parent b3290dd
commit 84a3cec
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/maintenance/Rector/MockGrabyResponseRector.php b/maintenance/Rector/MockGrabyResponseRector.php
@@ -144,7 +144,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $url = $fetchUrls[0];
+        $url = (string) $fetchUrls[0];
 
         // Add imports.
         $this->useNodesToAddCollector->addUseImport(

diff --git a/src/Extractor/ContentExtractor.php b/src/Extractor/ContentExtractor.php
@@ -1082,7 +1082,7 @@ private function extractEntityFromPattern(string $entity, string $pattern, $retu
             $returnCallback = fn ($e) => trim($e);
         }
 
-        if (!$this->xpath) {
+        if (!$this->xpath || !$this->readability) {
             return false;
         }
 
@@ -1139,7 +1139,7 @@ private function extractMultipleEntityFromPattern(string $entity, string $patter
             $returnCallback = fn ($e) => trim($e);
         }
 
-        if (!$this->xpath) {
+        if (!$this->xpath || !$this->readability) {
             return false;
         }
 

diff --git a/src/Extractor/HttpClient.php b/src/Extractor/HttpClient.php
@@ -241,7 +241,7 @@ private function cleanupUrl(string $url): string
     {
         // rewrite part of urls to something more readable
         foreach ($this->config->getRewriteUrl() as $find => $action) {
-            if (false !== strpos($url, $find) && \is_array($action)) {
+            if (false !== strpos($url, (string) $find) && \is_array($action)) {
                 $url = strtr($url, $action);
             }
         }

diff --git a/src/Graby.php b/src/Graby.php
@@ -147,18 +147,19 @@ public function cleanupHtml($contentBlock, string $url): string
             return trim($this->cleanupXss($originalContentBlock));
         }
 
-        $this->extractor->readability->clean($contentBlock, 'select');
+        if ($this->extractor->readability) {
+            $this->extractor->readability->clean($contentBlock, 'select');
+        }
 
         if ($this->config->getRewriteRelativeUrls()) {
             $this->makeAbsolute($url, $contentBlock);
         }
 
         // footnotes
-        if ('footnotes' === $this->config->getContentLinks() && false === strpos($url, 'wikipedia.org')) {
+        if ('footnotes' === $this->config->getContentLinks() && false === strpos($url, 'wikipedia.org') && $this->extractor->readability) {
             $this->extractor->readability->addFootnotes($contentBlock);
         }
 
-        // normalise
         $contentBlock->normalize();
 
         // remove empty text nodes
@@ -282,6 +283,7 @@ private function doFetchContent(string $url): array
         $this->logger->info('Attempting to extract content');
 
         $extractResult = $this->extractor->process($html, $effectiveUrl);
+        /** @var Readability */
         $readability = $this->extractor->readability;
         $contentBlock = $this->extractor->getContent();
         $extractedTitle = $this->extractor->getTitle();