use UriInterface instead strings

Author: oscarotero

src/Adapters/Archive/Api.php

@@ -11,7 +11,7 @@ class Api
 
     protected function fetchData(): array
     {
-        $this->endpoint = (string) $this->extractor->getUri()->withQuery('output=json');
+        $this->endpoint = $this->extractor->getUri()->withQuery('output=json');
 
         return $this->fetchJSON($this->endpoint);
     }

src/Adapters/Gist/Api.php

@@ -12,7 +12,7 @@ class Api
     protected function fetchData(): array
     {
         $uri = $this->extractor->getUri();
-        $this->endpoint = (string) $uri->withPath($uri->getPath().'.json');
+        $this->endpoint = $uri->withPath($uri->getPath().'.json');
 
         return $this->fetchJSON($this->endpoint);
     }

src/Adapters/Gist/Detectors/AuthorUrl.php

@@ -4,16 +4,17 @@
 namespace Embed\Adapters\Gist\Detectors;
 
 use Embed\Detectors\AuthorUrl as Detector;
+use Psr\Http\Message\UriInterface;
 
 class AuthorUrl extends Detector
 {
-    public function detect(): ?string
+    public function detect(): ?UriInterface
     {
         $api = $this->extractor->getApi();
         $owner = $api->str('owner');
 
         if ($owner) {
-            return "https://github.com/{$owner}";
+            return $this->extractor->getCrawler()->createUri("https://github.com/{$owner}");
         }
 
         return parent::detect();

src/Adapters/ImageShack/Api.php

@@ -29,7 +29,7 @@ protected function fetchData(): array
             return [];
         }
 
-        $this->endpoint = "https://api.imageshack.com/v2/images/{$id}";
+        $this->endpoint = $this->extractor->getCrawler()->createUri("https://api.imageshack.com/v2/images/{$id}");
         $data = $this->fetchJSON($this->endpoint);
         return $data['result'] ?? [];
     }

src/Adapters/ImageShack/Detectors/AuthorUrl.php

@@ -4,16 +4,17 @@
 namespace Embed\Adapters\ImageShack\Detectors;
 
 use Embed\Detectors\AuthorUrl as Detector;
+use Psr\Http\Message\UriInterface;
 
 class AuthorUrl extends Detector
 {
-    public function detect(): ?string
+    public function detect(): ?UriInterface
     {
         $api = $this->extractor->getApi();
         $owner = $api->str('owner', 'username');
 
         if ($owner) {
-            return "https://imageshack.com/{$owner}";
+            return $this->extractor->getCrawler()->createUri("https://imageshack.com/{$owner}");
         }
 
         return parent::detect();

src/Adapters/ImageShack/Detectors/Image.php

@@ -4,10 +4,11 @@
 namespace Embed\Adapters\ImageShack\Detectors;
 
 use Embed\Detectors\Image as Detector;
+use Psr\Http\Message\UriInterface;
 
 class Image extends Detector
 {
-    public function detect(): ?string
+    public function detect(): ?UriInterface
     {
         $api = $this->extractor->getApi();
 

src/Adapters/Wikipedia/Api.php

@@ -21,7 +21,7 @@ protected function fetchData(): array
 
         $titles = getDirectory($uri->getPath(), 1);
 
-        $this->endpoint = (string) $uri
+        $this->endpoint = $uri
             ->withPath('/w/api.php')
             ->withQuery(http_build_query([
                 'action' => 'query',

src/Adapters/Youtube/Detectors/Feeds.php

@@ -6,9 +6,13 @@
 use Embed\Detectors\Feeds as Detector;
 use function Embed\getDirectory;
 use function Embed\match;
+use Psr\Http\Message\UriInterface;
 
 class Feeds extends Detector
 {
+    /**
+     * @return UriInterface[]
+     */
     public function detect(): array
     {
         return parent::detect()
@@ -24,7 +28,8 @@ private function fallback(): array
         }
 
         $id = getDirectory($uri->getPath(), 1);
+        $feed = $this->extractor->getCrawler()->createUri("https://www.youtube.com/feeds/videos.xml?channel_id={$id}");
 
-        return ["https://www.youtube.com/feeds/videos.xml?channel_id={$id}"];
+        return [$feed];
     }
 }

src/ApiTrait.php

@@ -3,24 +3,18 @@
 
 namespace Embed;
 
-use Exception;
+use Psr\Http\Message\UriInterface;
 
 trait ApiTrait
 {
     private Extractor $extractor;
     private array $data;
-    private ?string $endpoint;
 
     public function __construct(Extractor $extractor)
     {
         $this->extractor = $extractor;
     }
 
-    public function getEndpoint(): ?string
-    {
-        return $this->endpoint;
-    }
-
     public function all(): array
     {
         if (!isset($this->data)) {
@@ -78,31 +72,16 @@ public function int(string ...$keys): ?int
         return $value ? (int) $value : null;
     }
 
-    public function url(string ...$keys): ?string
+    public function url(string ...$keys): ?UriInterface
     {
         $url = $this->str(...$keys);
 
         if (!$url) {
             return null;
         }
 
-        $uri = $this->extractor->getCrawler()->createUri($url);
-
-        return (string) resolveUri($this->extractor->getUri(), $uri);
+        return $this->extractor->resolveUri($url);
     }
 
     abstract protected function fetchData(): array;
-
-    private function fetchJSON(string $url): array
-    {
-        $crawler = $this->extractor->getCrawler();
-        $request = $crawler->createRequest('GET', $url);
-        $response = $crawler->sendRequest($request);
-
-        try {
-            return json_decode((string) $response->getBody(), true) ?: [];
-        } catch (Exception $exception) {
-            return [];
-        }
-    }
 }

src/Detectors/AuthorUrl.php

@@ -3,20 +3,24 @@
 
 namespace Embed\Detectors;
 
+use Psr\Http\Message\UriInterface;
+
 class AuthorUrl extends Detector
 {
-    public function detect(): ?string
+    public function detect(): ?UriInterface
     {
         $oembed = $this->extractor->getOEmbed();
 
         return $oembed->url('author_url')
             ?: $this->detectFromTwitter();
     }
 
-    private function detectFromTwitter(): ?string
+    private function detectFromTwitter(): ?UriINterface
     {
         $user = $this->extractor->getDocument()->meta('twitter:creator');
 
-        return $user ? sprintf('https://twitter.com/%s', ltrim($user, '@')) : null;
+        return $user
+            ? $this->extractor->getCrawler()->createUri(sprintf('https://twitter.com/%s', ltrim($user, '@')))
+            : null;
     }
 }