composer: Update dependencies

The SimplePie bump required replacing `SimplePieFileGuzzle` with newly introduced PSR-18 support due to PHPStan complaining about a ton of deprecations and type mismatch in `set_curl_options` hack.

Changelogs summary:

 - php-http/message-factory removed (installed version was 1.1.0)

 - bcosca/fatfree-core updated from 3.9.0 to 3.9.1 patch
   See changes: f3-factory/fatfree-core@3.9.0...3.9.1
   Release notes: https://github.com/f3-factory/fatfree-core/releases/tag/3.9.1

 - guzzlehttp/psr7 updated from 2.7.0 to 2.8.0 minor
   See changes: guzzle/psr7@2.7.0...2.8.0
   Release notes: https://github.com/guzzle/psr7/releases/tag/2.8.0

 - guzzlehttp/promises updated from 2.0.4 to 2.3.0 minor
   See changes: guzzle/promises@2.0.4...2.3.0
   Release notes: https://github.com/guzzle/promises/releases/tag/2.3.0

 - guzzlehttp/guzzle updated from 7.9.2 to 7.10.0 minor
   See changes: guzzle/guzzle@7.9.2...7.10.0
   Release notes: https://github.com/guzzle/guzzle/releases/tag/7.10.0

 - symfony/polyfill-php80 updated from v1.31.0 to v1.33.0 minor
   See changes: symfony/polyfill-php80@v1.31.0...v1.33.0
   Release notes: https://github.com/symfony/polyfill-php80/releases/tag/v1.33.0

 - symfony/polyfill-php84 installed in version v1.33.0
   Release notes: https://github.com/symfony/polyfill-php84/releases/tag/v1.33.0

 - symfony/polyfill-php81 updated from v1.31.0 to v1.33.0 minor
   See changes: symfony/polyfill-php81@v1.31.0...v1.33.0
   Release notes: https://github.com/symfony/polyfill-php81/releases/tag/v1.33.0

 - symfony/polyfill-mbstring updated from v1.31.0 to v1.33.0 minor
   See changes: symfony/polyfill-mbstring@v1.31.0...v1.33.0
   Release notes: https://github.com/symfony/polyfill-mbstring/releases/tag/v1.33.0

 - symfony/polyfill-php73 updated from v1.31.0 to v1.33.0 minor
   See changes: symfony/polyfill-php73@v1.31.0...v1.33.0
   Release notes: https://github.com/symfony/polyfill-php73/releases/tag/v1.33.0

 - symfony/polyfill-ctype updated from v1.31.0 to v1.33.0 minor
   See changes: symfony/polyfill-ctype@v1.31.0...v1.33.0
   Release notes: https://github.com/symfony/polyfill-ctype/releases/tag/v1.33.0

 - symfony/polyfill-intl-normalizer updated from v1.31.0 to v1.33.0 minor
   See changes: symfony/polyfill-intl-normalizer@v1.31.0...v1.33.0
   Release notes: https://github.com/symfony/polyfill-intl-normalizer/releases/tag/v1.33.0

 - symfony/polyfill-intl-grapheme updated from v1.31.0 to v1.33.0 minor
   See changes: symfony/polyfill-intl-grapheme@v1.31.0...v1.33.0
   Release notes: https://github.com/symfony/polyfill-intl-grapheme/releases/tag/v1.33.0

 - react/promise updated from v3.2.0 to v3.3.0 minor
   See changes: reactphp/promise@v3.2.0...v3.3.0
   Release notes: https://github.com/reactphp/promise/releases/tag/v3.3.0

 - fidry/cpu-core-counter updated from 1.2.0 to 1.3.0 minor
   See changes: theofidry/cpu-core-counter@1.2.0...1.3.0
   Release notes: https://github.com/theofidry/cpu-core-counter/releases/tag/1.3.0

 - composer/semver updated from 3.4.3 to 3.4.4 patch
   See changes: composer/semver@3.4.3...3.4.4
   Release notes: https://github.com/composer/semver/releases/tag/3.4.4

 - friendsofphp/php-cs-fixer updated from v3.72.0 to v3.88.1 patch
   See changes: PHP-CS-Fixer/PHP-CS-Fixer@v3.72.0...v3.88.1
   Release notes: https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v3.88.0
   Release notes: https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/releases/tag/v3.88.1

 - symfony/polyfill-intl-idn updated from v1.31.0 to v1.33.0 minor
   See changes: symfony/polyfill-intl-idn@v1.31.0...v1.33.0
   Release notes: https://github.com/symfony/polyfill-intl-idn/releases/tag/v1.33.0

 - simplepie/simplepie updated from 1.8.1 to 1.9.0 minor
   See changes: simplepie/simplepie@1.8.1...1.9.0
   Release notes: https://github.com/simplepie/simplepie/releases/tag/1.9.0

 - masterminds/html5 updated from 2.9.0 to 2.10.0 minor
   See changes: Masterminds/html5-php@2.9.0...2.10.0
   Release notes: https://github.com/Masterminds/html5-php/releases/tag/2.10.0

 - j0k3r/php-readability updated from 1.2.12 to 1.3.0 minor
   See changes: j0k3r/php-readability@1.2.12...1.3.0
   Release notes: https://github.com/j0k3r/php-readability/releases/tag/1.3.0

 - j0k3r/httplug-ssrf-plugin updated from v2.0.2 to v3.0.1 major
   See changes: j0k3r/httplug-ssrf-plugin@v2.0.2...v3.0.1
   Release notes: https://github.com/j0k3r/httplug-ssrf-plugin/releases/tag/v3.0.1

 - j0k3r/graby-site-config updated from 1.0.197 to 1.0.203 patch
   See changes: j0k3r/graby-site-config@1.0.197...1.0.203
   Release notes: https://github.com/j0k3r/graby-site-config/releases/tag/1.0.203

 - j0k3r/graby updated from 2.4.6 to v2.5.0 minor
   See changes: j0k3r/graby@2.4.6...v2.5.0
   Release notes: https://github.com/j0k3r/graby/releases/tag/v2.5.0

 - phpstan/phpstan updated from 2.1.8 to 2.1.29 patch
   See changes: phpstan/phpstan-phar-composer-source@phpstan:2.1.8...phpstan:2.1.29
   Release notes: https://github.com/phpstan/phpstan-phar-composer-source/releases/tag/2.1.29

 - phpstan/phpstan-deprecation-rules updated from 2.0.1 to 2.0.3 patch
   See changes: phpstan/phpstan-deprecation-rules@2.0.1...2.0.3
   Release notes: https://github.com/phpstan/phpstan-deprecation-rules/releases/tag/2.0.3

 - symfony/phpunit-bridge updated from v7.2.0 to v7.3.3 minor
   See changes: symfony/phpunit-bridge@v7.2.0...v7.3.3
   Release notes: https://github.com/symfony/phpunit-bridge/releases/tag/v7.3.3

 - vstelmakh/url-highlight updated from v3.1.1 to v3.1.2 patch
   See changes: vstelmakh/url-highlight@v3.1.1...v3.1.2
   Release notes: https://github.com/vstelmakh/url-highlight/releases/tag/v3.1.2

Author: jtojnar

composer.lock

@@ -18,9 +18,6 @@ parameters:
         - utils/PHPStan/Stubs/IcoFileLoader.stub
 
     ignoreErrors:
-        # The arguments are provided by SimplePie and we want the value of a later one.
-        - '(Constructor of class helpers\\SimplePieFileGuzzle has an unused parameter \$force_fsockopen\.)'
-
         # Bad PHPStan typing rules.
         - '(Parameter #3 \$namespace of method XMLWriter::writeAttributeNs\(\) expects string, null given\.)'
 

phpstan.dist.neon

@@ -4,12 +4,14 @@
 
 use helpers\Configuration;
 use helpers\DatabaseConnection;
+use helpers\WebClient;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\ErrorLogHandler;
 use Monolog\Handler\NullHandler;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Psr\Container\ContainerInterface;
+use Psr\Http\Client\ClientInterface;
 use Psr\SimpleCache\CacheInterface;
 use Slince\Di\Container;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
@@ -252,6 +254,11 @@ function(string $pattern, string $text): bool {
     ->setShared(true)
 ;
 
+$container
+    ->register(ClientInterface::class, WebClient::class)
+    ->setShared(true)
+;
+
 $container
     ->register(ContainerInterface::class, $container)
     ->setShared(true)

src/common.php

@@ -4,6 +4,8 @@
 
 namespace helpers;
 
+use GuzzleHttp\Psr7\HttpFactory;
+use Psr\Http\Client\ClientInterface;
 use Psr\SimpleCache\CacheInterface;
 use SimplePie\SimplePie;
 
@@ -14,8 +16,9 @@ class FeedReader {
     private SimplePie $simplepie;
 
     public function __construct(
+        HttpFactory $httpFactory,
         SimplePie $simplepie,
-        WebClient $webClient,
+        ClientInterface $webClient,
         ?CacheInterface $cache = null
     ) {
         $this->simplepie = $simplepie;
@@ -25,14 +28,14 @@ public function __construct(
             $this->simplepie->set_cache($cache);
         }
 
-        // abuse set_curl_options since there is no sane way to pass data to SimplePie\File
-        $this->simplepie->set_curl_options([
-            WebClient::class => $webClient,
-        ]);
+        $this->simplepie->set_http_client(
+            $webClient,
+            $httpFactory,
+            $httpFactory,
+        );
 
-        $this->simplepie->get_registry()->register(\SimplePie\File::class, SimplePieFileGuzzle::class, true);
+        // @phpstan-ignore argument.type (https://github.com/simplepie/simplepie/pull/946)
         $this->simplepie->set_autodiscovery_level(SimplePie::LOCATOR_AUTODISCOVERY | SimplePie::LOCATOR_LOCAL_EXTENSION | SimplePie::LOCATOR_LOCAL_BODY);
-        $this->simplepie->set_useragent($webClient->getUserAgent());
     }
 
     /**
@@ -48,7 +51,6 @@ public function load(string $url): array {
         @$this->simplepie->init();
 
         // on error retry with force_feed
-        // @phpstan-ignore-next-line notIdentical.alwaysTrue (The upstream type is incorrect: https://github.com/simplepie/simplepie/pull/903)
         if ($this->simplepie->error() !== null) {
             @$this->simplepie->set_autodiscovery_level(SimplePie::LOCATOR_NONE);
             @$this->simplepie->force_feed(true);

src/helpers/FeedReader.php

@@ -157,6 +157,7 @@ public function loadImage(
         // get image type
         if (extension_loaded('imagick')) {
             // check for svgz or svg
+            // @phpstan-ignore notIdentical.alwaysTrue (fatfree includes gzdecode polyfill which has incorrect phpdoc type)
             if (str_starts_with($data, "\x1f\x8b") && ($d = gzdecode($data)) !== false) {
                 $data = $d;
             }

src/helpers/Image.php

@@ -8,7 +8,11 @@
 use Fossar\GuzzleTranscoder\GuzzleTranscoder;
 use GuzzleHttp;
 use GuzzleHttp\HandlerStack;
+use GuzzleHttp\Psr7\HttpFactory;
 use Monolog\Logger;
+use Override;
+use Psr\Http\Client\ClientInterface;
+use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 
 /**
@@ -18,13 +22,19 @@
  * @license    GPLv3 (https://www.gnu.org/licenses/gpl-3.0.html)
  * @author     Alexandre Rossi <[email protected]>
  */
-class WebClient {
+class WebClient implements ClientInterface {
     private Configuration $configuration;
     private ?GuzzleHttp\Client $httpClient = null;
+    private HttpFactory $httpFactory;
     private Logger $logger;
 
-    public function __construct(Configuration $configuration, Logger $logger) {
+    public function __construct(
+        Configuration $configuration,
+        HttpFactory $httpFactory,
+        Logger $logger
+    ) {
         $this->configuration = $configuration;
+        $this->httpFactory = $httpFactory;
         $this->logger = $logger;
     }
 
@@ -113,8 +123,7 @@ public function getUserAgent(?array $agentInfo = null): string {
      * @throws Exception Unless 200 0K response is received
      */
     public function request(string $url, ?string $agentInfo = null): string {
-        $http = $this->getHttpClient();
-        $response = $http->get($url);
+        $response = $this->sendRequest($this->httpFactory->createRequest('GET', $url));
         $data = (string) $response->getBody();
 
         if ($response->getStatusCode() !== 200) {
@@ -124,6 +133,13 @@ public function request(string $url, ?string $agentInfo = null): string {
         return $data;
     }
 
+    #[Override]
+    public function sendRequest(RequestInterface $request): ResponseInterface {
+        $http = $this->getHttpClient();
+
+        return $http->send($request);
+    }
+
     /**
      * Get effective URL of the response.
      * RedirectMiddleware will need to be enabled for this to work.

src/helpers/SimplePieFileGuzzle.php

@@ -10,9 +10,9 @@
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
 use helpers\HtmlString;
-use helpers\WebClient;
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
+use Psr\Http\Client\ClientInterface;
 use Slince\Di\Container;
 use spouts\youtube\youtube;
 
@@ -62,13 +62,7 @@ function(array $remoteFile): Response {
             ->setShared(true)
         ;
         $container
-            ->register(WebClient::class, function() use ($httpClient) {
-                $stub = $this->createMock(WebClient::class);
-                $stub->method('getHttpClient')->willReturn($httpClient);
-
-                return $stub;
-            })
-        ;
+            ->register(ClientInterface::class, $httpClient);
 
         $yt = $container->get(youtube::class);