refactor: add PHPStan generic type annotations and simplify detector implementations

src/Adapters/Archive/Detectors/AuthorName.php

@@ -3,16 +3,16 @@
 
 namespace Embed\Adapters\Archive\Detectors;
 
-use Embed\Adapters\Archive\Extractor;
 use Embed\Detectors\AuthorName as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\Archive\Extractor>
+ */
 class AuthorName extends Detector
 {
     public function detect(): ?string
     {
-        /** @var Extractor $extractor */
-        $extractor = $this->extractor;
-        $api = $extractor->getApi();
+        $api = $this->extractor->getApi();
 
         $result = $api->str('metadata', 'creator');
         return (is_string($result) && trim($result) !== '') ? $result : parent::detect();

src/Adapters/Archive/Detectors/Code.php

@@ -8,6 +8,9 @@
 use function Embed\html;
 use function Embed\matchPath;
 
+/**
+ * @extends Detector<\Embed\Adapters\Archive\Extractor>
+ */
 class Code extends Detector
 {
     public function detect(): ?EmbedCode

src/Adapters/Archive/Detectors/Description.php

@@ -3,16 +3,16 @@
 
 namespace Embed\Adapters\Archive\Detectors;
 
-use Embed\Adapters\Archive\Extractor;
 use Embed\Detectors\Description as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\Archive\Extractor>
+ */
 class Description extends Detector
 {
     public function detect(): ?string
     {
-        /** @var Extractor $extractor */
-        $extractor = $this->extractor;
-        $api = $extractor->getApi();
+        $api = $this->extractor->getApi();
 
         $result = $api->str('metadata', 'extract');
         return (is_string($result) && trim($result) !== '') ? $result : parent::detect();

src/Adapters/Archive/Detectors/ProviderName.php

@@ -5,6 +5,9 @@
 
 use Embed\Detectors\ProviderName as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\Archive\Extractor>
+ */
 class ProviderName extends Detector
 {
     public function detect(): string

src/Adapters/Archive/Detectors/PublishedTime.php

@@ -4,16 +4,16 @@
 namespace Embed\Adapters\Archive\Detectors;
 
 use DateTime;
-use Embed\Adapters\Archive\Extractor;
 use Embed\Detectors\PublishedTime as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\Archive\Extractor>
+ */
 class PublishedTime extends Detector
 {
     public function detect(): ?DateTime
     {
-        /** @var Extractor $extractor */
-        $extractor = $this->extractor;
-        $api = $extractor->getApi();
+        $api = $this->extractor->getApi();
 
         $fields = ['publicdate', 'addeddate', 'date'];
         foreach ($fields as $field) {

src/Adapters/Archive/Detectors/Title.php

@@ -3,16 +3,16 @@
 
 namespace Embed\Adapters\Archive\Detectors;
 
-use Embed\Adapters\Archive\Extractor;
 use Embed\Detectors\Title as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\Archive\Extractor>
+ */
 class Title extends Detector
 {
     public function detect(): ?string
     {
-        /** @var Extractor $extractor */
-        $extractor = $this->extractor;
-        $api = $extractor->getApi();
+        $api = $this->extractor->getApi();
 
         $result = $api->str('metadata', 'title');
         return (is_string($result) && trim($result) !== '') ? $result : parent::detect();

src/Adapters/Archive/Extractor.php

@@ -9,6 +9,9 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
 
+/**
+ * @template-extends Base<\Embed\Detectors\Detector<self>>
+ */
 class Extractor extends Base
 {
     private Api $api;
@@ -28,9 +31,6 @@ public function getApi(): Api
         return $this->api;
     }
 
-    /**
-     * @return array<string, \Embed\Detectors\Detector>
-     */
     public function createCustomDetectors(): array
     {
         return [

src/Adapters/Bandcamp/Detectors/ProviderName.php

@@ -5,6 +5,9 @@
 
 use Embed\Detectors\ProviderName as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\Bandcamp\Extractor>
+ */
 class ProviderName extends Detector
 {
     public function detect(): string

src/Adapters/Bandcamp/Extractor.php

@@ -5,11 +5,11 @@
 
 use Embed\Extractor as Base;
 
+/**
+ * @template-extends Base<\Embed\Detectors\Detector<self>>
+ */
 class Extractor extends Base
 {
-    /**
-     * @return array<string, \Embed\Detectors\Detector>
-     */
     public function createCustomDetectors(): array
     {
         return [

src/Adapters/CadenaSer/Detectors/Code.php

@@ -9,6 +9,9 @@
 use function Embed\html;
 use function Embed\matchPath;
 
+/**
+ * @extends Detector<\Embed\Adapters\CadenaSer\Extractor>
+ */
 class Code extends Detector
 {
     public function detect(): ?EmbedCode

src/Adapters/CadenaSer/Extractor.php

@@ -5,11 +5,11 @@
 
 use Embed\Extractor as Base;
 
+/**
+ * @template-extends Base<\Embed\Detectors\Detector<self>>
+ */
 class Extractor extends Base
 {
-    /**
-     * @return array<string, \Embed\Detectors\Detector>
-     */
     public function createCustomDetectors(): array
     {
         return [

src/Adapters/Facebook/Detectors/Title.php

@@ -5,6 +5,9 @@
 
 use Embed\Detectors\Title as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\Facebook\Extractor>
+ */
 class Title extends Detector
 {
     /**

src/Adapters/Facebook/Extractor.php

@@ -8,7 +8,7 @@
 class Extractor extends Base
 {
     /**
-     * @return array<string, \Embed\Detectors\Detector>
+     * @return array{title: Detectors\Title}
      */
     public function createCustomDetectors(): array
     {

src/Adapters/Flickr/Detectors/Code.php

@@ -9,6 +9,9 @@
 use function Embed\html;
 use function Embed\matchPath;
 
+/**
+ * @extends Detector<\Embed\Adapters\Flickr\Extractor>
+ */
 class Code extends Detector
 {
     public function detect(): ?EmbedCode

src/Adapters/Flickr/Extractor.php

@@ -5,11 +5,11 @@
 
 use Embed\Extractor as Base;
 
+/**
+ * @template-extends Base<\Embed\Detectors\Detector<self>>
+ */
 class Extractor extends Base
 {
-    /**
-     * @return array<string, \Embed\Detectors\Detector>
-     */
     public function createCustomDetectors(): array
     {
         return [

src/Adapters/Gist/Detectors/AuthorName.php

@@ -3,16 +3,16 @@
 
 namespace Embed\Adapters\Gist\Detectors;
 
-use Embed\Adapters\Gist\Extractor;
 use Embed\Detectors\AuthorName as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\Gist\Extractor>
+ */
 class AuthorName extends Detector
 {
     public function detect(): ?string
     {
-        /** @var Extractor $extractor */
-        $extractor = $this->extractor;
-        $api = $extractor->getApi();
+        $api = $this->extractor->getApi();
 
         $result = $api->str('owner');
         return (is_string($result) && trim($result) !== '') ? $result : parent::detect();

src/Adapters/Gist/Detectors/AuthorUrl.php

@@ -3,15 +3,16 @@
 
 namespace Embed\Adapters\Gist\Detectors;
 
-use Embed\Adapters\Gist\Extractor;
 use Embed\Detectors\AuthorUrl as Detector;
 use Psr\Http\Message\UriInterface;
 
+/**
+ * @extends Detector<\Embed\Adapters\Gist\Extractor>
+ */
 class AuthorUrl extends Detector
 {
     public function detect(): ?UriInterface
     {
-        /** @var Extractor $extractor */
         $extractor = $this->extractor;
         $api = $extractor->getApi();
         $owner = $api->str('owner');

src/Adapters/Gist/Detectors/Code.php

@@ -3,11 +3,13 @@
 
 namespace Embed\Adapters\Gist\Detectors;
 
-use Embed\Adapters\Gist\Extractor;
 use Embed\Detectors\Code as Detector;
 use Embed\EmbedCode;
 use function Embed\html;
 
+/**
+ * @extends Detector<\Embed\Adapters\Gist\Extractor>
+ */
 class Code extends Detector
 {
     public function detect(): ?EmbedCode
@@ -18,9 +20,7 @@ public function detect(): ?EmbedCode
 
     private function fallback(): ?EmbedCode
     {
-        /** @var Extractor $extractor */
-        $extractor = $this->extractor;
-        $api = $extractor->getApi();
+        $api = $this->extractor->getApi();
 
         $code = $api->html('div');
         $stylesheet = $api->str('stylesheet');

src/Adapters/Gist/Detectors/PublishedTime.php

@@ -4,16 +4,16 @@
 namespace Embed\Adapters\Gist\Detectors;
 
 use DateTime;
-use Embed\Adapters\Gist\Extractor;
 use Embed\Detectors\PublishedTime as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\Gist\Extractor>
+ */
 class PublishedTime extends Detector
 {
     public function detect(): ?DateTime
     {
-        /** @var Extractor $extractor */
-        $extractor = $this->extractor;
-        $api = $extractor->getApi();
+        $api = $this->extractor->getApi();
 
         $result = $api->time('created_at');
         return $result !== null ? $result : parent::detect();

src/Adapters/Gist/Extractor.php

@@ -9,6 +9,9 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\UriInterface;
 
+/**
+ * @template-extends Base<\Embed\Detectors\Detector<self>>
+ */
 class Extractor extends Base
 {
     private Api $api;
@@ -28,9 +31,6 @@ public function getApi(): Api
         return $this->api;
     }
 
-    /**
-     * @return array<string, \Embed\Detectors\Detector>
-     */
     public function createCustomDetectors(): array
     {
         return [

src/Adapters/Github/Detectors/Code.php

@@ -8,6 +8,9 @@
 use function Embed\html;
 use function Embed\matchPath;
 
+/**
+ * @extends Detector<\Embed\Adapters\Github\Extractor>
+ */
 class Code extends Detector
 {
     public function detect(): ?EmbedCode

src/Adapters/Github/Extractor.php

@@ -5,11 +5,11 @@
 
 use Embed\Extractor as Base;
 
+/**
+ * @template-extends Base<\Embed\Detectors\Detector<self>>
+ */
 class Extractor extends Base
 {
-    /**
-     * @return array<string, \Embed\Detectors\Detector>
-     */
     public function createCustomDetectors(): array
     {
         return [

src/Adapters/Ideone/Detectors/Code.php

@@ -7,6 +7,9 @@
 use Embed\EmbedCode;
 use function Embed\html;
 
+/**
+ * @extends Detector<\Embed\Adapters\Ideone\Extractor>
+ */
 class Code extends Detector
 {
     public function detect(): ?EmbedCode

src/Adapters/Ideone/Extractor.php

@@ -5,11 +5,11 @@
 
 use Embed\Extractor as Base;
 
+/**
+ * @template-extends Base<\Embed\Detectors\Detector<self>>
+ */
 class Extractor extends Base
 {
-    /**
-     * @return array<string, \Embed\Detectors\Detector>
-     */
     public function createCustomDetectors(): array
     {
         return [

src/Adapters/ImageShack/Detectors/AuthorName.php

@@ -6,13 +6,14 @@
 use Embed\Adapters\ImageShack\Extractor;
 use Embed\Detectors\AuthorName as Detector;
 
+/**
+ * @extends Detector<\Embed\Adapters\ImageShack\Extractor>
+ */
 class AuthorName extends Detector
 {
     public function detect(): ?string
     {
-        /** @var Extractor $extractor */
-        $extractor = $this->extractor;
-        $api = $extractor->getApi();
+        $api = $this->extractor->getApi();
 
         $result = $api->str('owner', 'username');
         return (is_string($result) && trim($result) !== '') ? $result : parent::detect();