feat: refactor Extractor classes to improve constructor dependency injection

Author: uzulla

src/Adapters/Archive/Extractor.php

@@ -4,16 +4,27 @@
 namespace Embed\Adapters\Archive;
 
 use Embed\Extractor as Base;
+use Embed\Http\Crawler;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
 
 class Extractor extends Base
 {
-    private ?Api $api = null;
+    private Api $api;
+
+    public function __construct(
+        UriInterface $uri,
+        RequestInterface $request,
+        ResponseInterface $response,
+        Crawler $crawler
+    ) {
+        parent::__construct($uri, $request, $response, $crawler);
+        $this->api = new Api($this);
+    }
 
     public function getApi(): Api
     {
-        if ($this->api === null) {
-            $this->api = new Api($this);
-        }
         return $this->api;
     }
 

src/Adapters/Gist/Extractor.php

@@ -4,16 +4,27 @@
 namespace Embed\Adapters\Gist;
 
 use Embed\Extractor as Base;
+use Embed\Http\Crawler;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
 
 class Extractor extends Base
 {
-    private ?Api $api = null;
+    private Api $api;
+
+    public function __construct(
+        UriInterface $uri,
+        RequestInterface $request,
+        ResponseInterface $response,
+        Crawler $crawler
+    ) {
+        parent::__construct($uri, $request, $response, $crawler);
+        $this->api = new Api($this);
+    }
 
     public function getApi(): Api
     {
-        if ($this->api === null) {
-            $this->api = new Api($this);
-        }
         return $this->api;
     }
 

src/Adapters/ImageShack/Extractor.php

@@ -4,16 +4,27 @@
 namespace Embed\Adapters\ImageShack;
 
 use Embed\Extractor as Base;
+use Embed\Http\Crawler;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
 
 class Extractor extends Base
 {
-    private ?Api $api = null;
+    private Api $api;
+
+    public function __construct(
+        UriInterface $uri,
+        RequestInterface $request,
+        ResponseInterface $response,
+        Crawler $crawler
+    ) {
+        parent::__construct($uri, $request, $response, $crawler);
+        $this->api = new Api($this);
+    }
 
     public function getApi(): Api
     {
-        if ($this->api === null) {
-            $this->api = new Api($this);
-        }
         return $this->api;
     }
 

src/Adapters/Twitter/Extractor.php

@@ -4,16 +4,27 @@
 namespace Embed\Adapters\Twitter;
 
 use Embed\Extractor as Base;
+use Embed\Http\Crawler;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
 
 class Extractor extends Base
 {
-    private ?Api $api = null;
+    private Api $api;
+
+    public function __construct(
+        UriInterface $uri,
+        RequestInterface $request,
+        ResponseInterface $response,
+        Crawler $crawler
+    ) {
+        parent::__construct($uri, $request, $response, $crawler);
+        $this->api = new Api($this);
+    }
 
     public function getApi(): Api
     {
-        if ($this->api === null) {
-            $this->api = new Api($this);
-        }
         return $this->api;
     }
 

src/Adapters/Wikipedia/Extractor.php

@@ -4,16 +4,27 @@
 namespace Embed\Adapters\Wikipedia;
 
 use Embed\Extractor as Base;
+use Embed\Http\Crawler;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\UriInterface;
 
 class Extractor extends Base
 {
-    private ?Api $api = null;
+    private Api $api;
+
+    public function __construct(
+        UriInterface $uri,
+        RequestInterface $request,
+        ResponseInterface $response,
+        Crawler $crawler
+    ) {
+        parent::__construct($uri, $request, $response, $crawler);
+        $this->api = new Api($this);
+    }
 
     public function getApi(): Api
     {
-        if ($this->api === null) {
-            $this->api = new Api($this);
-        }
         return $this->api;
     }