Skip to content

refactor: add PHPStan generic type annotations and simplify detector implementations #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 22, 2025
Merged

refactor: add PHPStan generic type annotations and simplify detector implementations #563

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a43526
refactor: add PHPStan generic type annotations to Extractors and Dete…
sasezaki Oct 20, 2025
02a058b
refactor: remove redundant intermediate variables in Detector classes
sasezaki Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
refactor: remove redundant intermediate variables in Detector classes 
  Simplify code by directly accessing API from extractor property instead of
  using intermediate  variable across multiple adapter detectors
  • Loading branch information
@sasezaki
sasezaki committed Oct 22, 2025
commit 02a058bd48a128023edf3e505bca23fb4673f0ab
3 changes: 1 addition & 2 deletions src/Adapters/Archive/Detectors/AuthorName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ class AuthorName extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('metadata', 'creator');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Archive/Detectors/Description.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ class Description extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('metadata', 'extract');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Archive/Detectors/PublishedTime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class PublishedTime extends Detector
{
public function detect(): ?DateTime
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$fields = ['publicdate', 'addeddate', 'date'];
foreach ($fields as $field) {
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Archive/Detectors/Title.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ class Title extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('metadata', 'title');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Gist/Detectors/AuthorName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ class AuthorName extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('owner');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Gist/Detectors/Code.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ public function detect(): ?EmbedCode

private function fallback(): ?EmbedCode
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$code = $api->html('div');
$stylesheet = $api->str('stylesheet');
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Gist/Detectors/PublishedTime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class PublishedTime extends Detector
{
public function detect(): ?DateTime
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->time('created_at');
return $result !== null ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/ImageShack/Detectors/AuthorName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class AuthorName extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('owner', 'username');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/ImageShack/Detectors/Description.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ class Description extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('description');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/ImageShack/Detectors/Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class Image extends Detector
{
public function detect(): ?UriInterface
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->url('direct_link');
return $result !== null ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/ImageShack/Detectors/PublishedTime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ class PublishedTime extends Detector
{
public function detect(): ?DateTime
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->time('creation_date');
return $result !== null ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/ImageShack/Detectors/Title.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ class Title extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('title');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Twitter/Detectors/AuthorName.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class AuthorName extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('includes', 'users', '0', 'name');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Twitter/Detectors/Description.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class Description extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('data', 'text');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Twitter/Detectors/Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ class Image extends Detector
{
public function detect(): ?UriInterface
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();
$preview = $api->url('includes', 'media', '0', 'preview_image_url');

if ($preview !== null) {
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Twitter/Detectors/PublishedTime.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ class PublishedTime extends Detector
{
public function detect(): ?DateTime
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->time('data', 'created_at');
return $result !== null ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Twitter/Detectors/Title.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class Title extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();
$name = $api->str('includes', 'users', '0', 'name');

if ($name !== null) {
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Wikipedia/Detectors/Description.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ class Description extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('extract');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down
3 changes: 1 addition & 2 deletions src/Adapters/Wikipedia/Detectors/Title.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ class Title extends Detector
{
public function detect(): ?string
{
$extractor = $this->extractor;
$api = $extractor->getApi();
$api = $this->extractor->getApi();

$result = $api->str('title');
return (is_string($result) && trim($result) !== '') ? $result : parent::detect();
Expand Down