Skip to content

Commit 783e7c2

Browse files
committed
refactor: improve empty string handling in adapter detectors for PHPStan compliance
Replace short ternary operators (?:) with explicit null and empty string checks in adapter detector classes to comply with PHPStan strict rules while maintaining the original behavior of falling back to parent::detect() for both null and empty string values. Changes: - String detectors: Use ($result !== null && $result !== '') check to preserve fallback behavior for empty strings - DateTime/UriInterface detectors: Use ($result !== null) check as these types cannot have empty values - Ensures backward compatibility with master branch behavior - Fixes 15 PHPStan ternary.shortNotAllowed errors - All tests pass without regressions
1 parent efa32ce commit 783e7c2

File tree

13 files changed

+11
-16
lines changed

13 files changed

+11
-16
lines changed

src/Adapters/Archive/Detectors/AuthorName.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public function detect(): ?string
1515
$api = $extractor->getApi();
1616

1717
$result = $api->str('metadata', 'creator');
18-
return $result !== null ? $result : parent::detect();
18+
return ($result !== null && $result !== '') ? $result : parent::detect();
1919
}
2020
}

src/Adapters/Archive/Detectors/Description.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public function detect(): ?string
1515
$api = $extractor->getApi();
1616

1717
$result = $api->str('metadata', 'extract');
18-
return $result !== null ? $result : parent::detect();
18+
return ($result !== null && $result !== '') ? $result : parent::detect();
1919
}
2020
}

src/Adapters/Archive/Detectors/Title.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public function detect(): ?string
1515
$api = $extractor->getApi();
1616

1717
$result = $api->str('metadata', 'title');
18-
return $result !== null ? $result : parent::detect();
18+
return ($result !== null && $result !== '') ? $result : parent::detect();
1919
}
2020
}

src/Adapters/Gist/Detectors/AuthorName.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public function detect(): ?string
1515
$api = $extractor->getApi();
1616

1717
$result = $api->str('owner');
18-
return $result !== null ? $result : parent::detect();
18+
return ($result !== null && $result !== '') ? $result : parent::detect();
1919
}
2020
}

src/Adapters/ImageShack/Detectors/AuthorName.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public function detect(): ?string
1515
$api = $extractor->getApi();
1616

1717
$result = $api->str('owner', 'username');
18-
19-
return $result !== null ? $result : parent::detect();
18+
return ($result !== null && $result !== '') ? $result : parent::detect();
2019
}
2120
}

src/Adapters/ImageShack/Detectors/Description.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public function detect(): ?string
1515
$api = $extractor->getApi();
1616

1717
$result = $api->str('description');
18-
19-
return $result !== null ? $result : parent::detect();
18+
return ($result !== null && $result !== '') ? $result : parent::detect();
2019
}
2120
}

src/Adapters/ImageShack/Detectors/Image.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public function detect(): ?UriInterface
1616
$api = $extractor->getApi();
1717

1818
$result = $api->url('direct_link');
19-
2019
return $result !== null ? $result : parent::detect();
2120
}
2221
}

src/Adapters/ImageShack/Detectors/PublishedTime.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ public function detect(): ?DateTime
1616
$api = $extractor->getApi();
1717

1818
$result = $api->time('creation_date');
19-
2019
return $result !== null ? $result : parent::detect();
2120
}
2221
}

src/Adapters/ImageShack/Detectors/Title.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public function detect(): ?string
1515
$api = $extractor->getApi();
1616

1717
$result = $api->str('title');
18-
19-
return $result !== null ? $result : parent::detect();
18+
return ($result !== null && $result !== '') ? $result : parent::detect();
2019
}
2120
}

src/Adapters/Twitter/Detectors/AuthorName.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ public function detect(): ?string
1515
$api = $extractor->getApi();
1616

1717
$result = $api->str('includes', 'users', '0', 'name');
18-
return $result !== null ? $result : parent::detect();
18+
return ($result !== null && $result !== '') ? $result : parent::detect();
1919
}
2020
}

0 commit comments

Comments
 (0)