Run linter

phpstan.dist.neon

@@ -34,5 +34,14 @@ parameters:
             paths:
                 - %currentWorkingDirectory%/tests/Extractor/HttpClientTest.php
                 - %currentWorkingDirectory%/tests/SiteConfig/ConfigBuilderTest.php
+        -
+            identifier: argument.type
+            path: %currentWorkingDirectory%/src/Extractor/ContentExtractor.php
+            count: 18
+        -
+            identifier: property.notFound
+            path: %currentWorkingDirectory%/src/Extractor/ContentExtractor.php
+            count: 5
 
     inferPrivatePropertyTypeFromConstructor: true
+    treatPhpDocTypesAsCertain: false

src/Extractor/ContentExtractor.php

@@ -20,7 +20,6 @@
 class ContentExtractor
 {
     private readonly ContentExtractorConfig $config;
-    private LoggerInterface $logger;
     private readonly ConfigBuilder $configBuilder;
 
     /**
@@ -39,11 +38,12 @@ class ContentExtractor
      *   json_ld_ignore_types?: string[],
      * } $config
      */
-    public function __construct(array $config = [], ?LoggerInterface $logger = null, ?ConfigBuilder $configBuilder = null)
-    {
+    public function __construct(
+        array $config = [],
+        private ?LoggerInterface $logger = new NullLogger(),
+        ?ConfigBuilder $configBuilder = null
+    ) {
         $this->config = new ContentExtractorConfig($config);
-
-        $this->logger = $logger ?? new NullLogger();
         $this->configBuilder = $configBuilder ?? new ConfigBuilder($this->config->getConfigBuilder(), $this->logger);
     }
 
@@ -488,7 +488,7 @@ public function process(string $html, UriInterface $url, ?SiteConfig $siteConfig
             $readability->dom,
             'Author found (rel="author"): {author}',
             $xpath,
-            fn ($element, $currentEntity) => $currentEntity + [trim((string) $element)]
+            static fn ($element, $currentEntity) => $currentEntity + [trim((string) $element)]
         );
         if (null !== $extractedAuthors) {
             $authors = array_merge($authors, $extractedAuthors);
@@ -501,7 +501,7 @@ public function process(string $html, UriInterface $url, ?SiteConfig $siteConfig
             $readability->dom,
             'Author found (meta name="author"): {author}',
             $xpath,
-            fn ($element, $currentEntity) => $currentEntity + [trim((string) $element)]
+            static fn ($element, $currentEntity) => $currentEntity + [trim((string) $element)]
         );
         if (null !== $extractedAuthors) {
             $authors = array_merge($authors, $extractedAuthors);
@@ -846,7 +846,7 @@ private function extractEntityFromQuery(string $entity, bool $detectEntity, stri
 
         // we define the default callback here
         if (null === $returnCallback) {
-            $returnCallback = fn ($element) => trim((string) $element);
+            $returnCallback = static fn ($element) => trim((string) $element);
         }
 
         // check for given css class
@@ -1101,7 +1101,7 @@ private function extractEntityFromPattern(string $entity, string $pattern, \DOMX
     {
         // we define the default callback here
         if (null === $returnCallback) {
-            $returnCallback = fn ($e) => trim((string) $e);
+            $returnCallback = static fn ($e) => trim((string) $e);
         }
 
         $elems = $xpath->evaluate($pattern, $readability->dom);
@@ -1148,7 +1148,7 @@ private function extractMultipleEntityFromPattern(string $entity, string $patter
     {
         // we define the default callback here
         if (null === $returnCallback) {
-            $returnCallback = fn ($e) => trim((string) $e);
+            $returnCallback = static fn ($e) => trim((string) $e);
         }
 
         $elems = $xpath->evaluate($pattern, $readability->dom);

src/Extractor/ContentExtractorConfig.php

@@ -98,7 +98,7 @@ public function __construct(array $config)
         $resolver->setAllowedTypes('src_lazy_load_attributes', 'string[]');
         $resolver->setAllowedTypes('json_ld_ignore_types', 'string[]');
 
-        $resolver->setDefault('readability', function (OptionsResolver $readabilityResolver): void {
+        $resolver->setDefault('readability', static function (OptionsResolver $readabilityResolver): void {
             $readabilityResolver->setDefaults([
                 'pre_filters' => [],
                 'post_filters' => [],

src/Extractor/HttpClient.php

@@ -364,7 +364,7 @@ private function getCookie(UriInterface $url, array $httpHeader = []): ?string
             $this->logger->info('Found cookie "{cookie}" for url "{url}" from site config', ['cookie' => $httpHeader['cookie'], 'url' => (string) $url]);
 
             $cookies = [];
-            $pieces = array_filter(array_map('trim', explode(';', $httpHeader['cookie'])));
+            $pieces = array_filter(array_map(trim(...), explode(';', $httpHeader['cookie'])));
 
             foreach ($pieces as $part) {
                 $cookieParts = explode('=', $part, 2);
@@ -382,7 +382,7 @@ private function getCookie(UriInterface $url, array $httpHeader = []): ?string
             }
 
             // see https://tools.ietf.org/html/rfc6265.html#section-4.2.1
-            return implode('; ', array_map(fn ($name) => $name . '=' . $cookies[$name], array_keys($cookies)));
+            return implode('; ', array_map(static fn ($name) => $name . '=' . $cookies[$name], array_keys($cookies)));
         }
 
         return null;
@@ -515,7 +515,7 @@ private function removeTrackersFromUrl(UriInterface $uri): UriInterface
             // Remove utm_* parameters
             $clean_query = array_filter(
                 $q_array,
-                fn (string $param): bool => !str_starts_with($param, 'utm_')
+                static fn (string $param): bool => !str_starts_with($param, 'utm_')
             );
             $uri = $uri->withQuery(implode('&', $clean_query));
         }

src/GrabyConfig.php

@@ -143,7 +143,7 @@ public function __construct(array $config)
         $resolver->setAllowedTypes('http_client', 'array');
         $resolver->setAllowedTypes('extractor', 'array');
 
-        $resolver->setNormalizer('content_type_exc', function (Options $options, $value) {
+        $resolver->setNormalizer('content_type_exc', static function (Options $options, $value) {
             $resolver = new OptionsResolver();
             $resolver->setRequired(['action', 'name']);
             $resolver->setAllowedValues('action', ['link', 'exclude']);

src/HttpClient/Plugin/CookiePlugin.php

@@ -84,7 +84,7 @@ public function handleRequest(RequestInterface $request, callable $next, callabl
      */
     private function createCookie(RequestInterface $request, string $setCookieHeader): ?Cookie
     {
-        $parts = array_map('trim', explode(';', $setCookieHeader));
+        $parts = array_map(trim(...), explode(';', $setCookieHeader));
 
         if ('' === $parts[0] || !str_contains($parts[0], '=')) {
             return null;

src/SiteConfig/ConfigBuilder.php

@@ -11,7 +11,6 @@
 
 class ConfigBuilder
 {
-    private LoggerInterface $logger;
     private readonly ConfigBuilderConfig $config;
     /** @var array<string, string> */
     private array $configFiles = [];
@@ -43,12 +42,12 @@ class ConfigBuilder
      *   hostname_regex?: string,
      * } $config
      */
-    public function __construct(array $config = [], ?LoggerInterface $logger = null)
-    {
+    public function __construct(
+        array $config = [],
+        private ?LoggerInterface $logger = new NullLogger(),
+    ) {
         $this->config = new ConfigBuilderConfig($config);
 
-        $this->logger = $logger ?? new NullLogger();
-
         $this->loadConfigFiles();
     }
 

src/SiteConfig/ConfigBuilderConfig.php

@@ -36,7 +36,7 @@ public function __construct(array $config)
         $resolver->setAllowedTypes('site_config', 'string[]');
         $resolver->setAllowedTypes('hostname_regex', 'string');
 
-        $resolver->setNormalizer('site_config', function (Options $options, $value) {
+        $resolver->setNormalizer('site_config', static function (Options $options, $value) {
             foreach ($value as $key => $path) {
                 $value[$key] = rtrim($path, '/');
             }

tests/Extractor/HttpClientTest.php

@@ -313,9 +313,9 @@ public function testNbRedirectsReached(): void
             $httpMockClient->addResponse(new Response(
                 308,
                 [
-                    'Location' => 'http://fr.wikipedia.org/wiki/Copyright?' . random_int(0, mt_getrandmax()),
+                    'Location' => 'http://fr.wikipedia.org/wiki/Copyright?' . random_int(0, getrandmax()),
                 ],
-                '<meta HTTP-EQUIV="REFRESH" content="0; url=http://fr.wikipedia.org/wiki/Copyright?' . random_int(0, mt_getrandmax()) . '">'
+                '<meta HTTP-EQUIV="REFRESH" content="0; url=http://fr.wikipedia.org/wiki/Copyright?' . random_int(0, getrandmax()) . '">'
             ));
         }