diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index b233fbe..304521d 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -25,6 +25,7 @@ jobs: - "8.2" - "8.3" - "8.4" + - "8.5" steps: - name: "Checkout" diff --git a/src/Readability.php b/src/Readability.php index c4ea980..cf823f2 100644 --- a/src/Readability.php +++ b/src/Readability.php @@ -88,7 +88,7 @@ class Readability implements LoggerAwareInterface 'enclose-text' => true, 'merge-divs' => true, // 'merge-spans' => true, - 'input-encoding' => '????', + 'input-encoding' => 'utf8', 'output-encoding' => 'utf8', 'hide-comments' => true, ]; @@ -1118,7 +1118,7 @@ class Readability implements LoggerAwareInterface $topCandidates = array_filter( $topCandidates, - fn ($v, $idx) => 0 === $idx || null !== $v, + static fn ($v, $idx) => 0 === $idx || null !== $v, \ARRAY_FILTER_USE_BOTH ); $topCandidate = $topCandidates[0]; @@ -1481,7 +1481,7 @@ class Readability implements LoggerAwareInterface private function hasSingleTagInsideElement(\DOMElement $node, string $tag): bool { $childNodes = iterator_to_array($node->childNodes); - $children = array_filter($childNodes, fn ($childNode) => $childNode instanceof \DOMElement); + $children = array_filter($childNodes, static fn ($childNode) => $childNode instanceof \DOMElement); // There should be exactly 1 element child with given tag if (1 !== \count($children) || $children[0]->nodeName !== $tag) { diff --git a/tests/ReadabilityTest.php b/tests/ReadabilityTest.php index e38b2e9..e93efb0 100644 --- a/tests/ReadabilityTest.php +++ b/tests/ReadabilityTest.php @@ -21,6 +21,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase public function testConstructDefault(): void { $readability = $this->getReadability(''); + $this->assertSame('utf8', $readability->tidy_config['input-encoding']); $readability->init(); $this->assertNull($readability->url); @@ -323,7 +324,7 @@ class ReadabilityTest extends \PHPUnit\Framework\TestCase $oldErrorReporting = error_reporting(\E_ALL); $oldDisplayErrors = ini_set('display_errors', '1'); // dummy function to be used to the next test - set_error_handler(function (int $errno, string $errstr, string $errfile, int $errline) { + set_error_handler(static function (int $errno, string $errstr, string $errfile, int $errline) { throw new \Exception($errstr, $errno); });