From 46a4e4eb7a185a24deeac0db76b7d57a8f03cf17 Mon Sep 17 00:00:00 2001 From: "webgrip-renovate[bot]" <260330706+webgrip-renovate[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 06:27:08 +0000 Subject: [PATCH] fix(deps): update dependency psr/http-factory to v1.1.0 --- .../extensions/af_readability/composer.json | 2 +- .../extensions/af_readability/composer.lock | 30 ++++++------- .../vendor/composer/InstalledVersions.php | 45 +++++++++++++++++-- .../vendor/composer/installed.json | 22 ++++----- .../vendor/composer/installed.php | 18 ++++---- .../vendor/psr/http-factory/.gitignore | 2 - .../vendor/psr/http-factory/.pullapprove.yml | 7 --- .../vendor/psr/http-factory/README.md | 12 ++--- .../vendor/psr/http-factory/composer.json | 11 +++-- .../src/UploadedFileFactoryInterface.php | 12 ++--- 10 files changed, 97 insertions(+), 64 deletions(-) delete mode 100644 ops/docker/application/extensions/af_readability/vendor/psr/http-factory/.gitignore delete mode 100644 ops/docker/application/extensions/af_readability/vendor/psr/http-factory/.pullapprove.yml diff --git a/ops/docker/application/extensions/af_readability/composer.json b/ops/docker/application/extensions/af_readability/composer.json index 7ee5e0e..50a7454 100644 --- a/ops/docker/application/extensions/af_readability/composer.json +++ b/ops/docker/application/extensions/af_readability/composer.json @@ -20,6 +20,6 @@ }, "require": { "fivefilters/readability.php": "*", - "psr/http-factory": "1.0.1" + "psr/http-factory": "1.1.0" } } diff --git a/ops/docker/application/extensions/af_readability/composer.lock b/ops/docker/application/extensions/af_readability/composer.lock index 89797b5..ffdf9bb 100644 --- a/ops/docker/application/extensions/af_readability/composer.lock +++ b/ops/docker/application/extensions/af_readability/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8303e4ece757b331a6f0d7f6ffac4001", + "content-hash": "fb4e20de3b5306cbd8eae3ce4db9817c", "packages": [ { "name": "fivefilters/readability.php", @@ -322,21 +322,21 @@ }, { "name": "psr/http-factory", - "version": "1.0.1", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", "shasum": "" }, "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0" + "php": ">=7.1", + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { @@ -356,10 +356,10 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "factory", "http", @@ -371,9 +371,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/http-factory" }, - "time": "2019-04-30T12:38:16+00:00" + "time": "2024-04-15T12:06:14+00:00" }, { "name": "psr/http-message", @@ -482,13 +482,13 @@ "packages-dev": [], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": true, "prefer-lowest": false, - "platform": [], - "platform-dev": [], + "platform": {}, + "platform-dev": {}, "platform-overrides": { "php": "8.1.0" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } diff --git a/ops/docker/application/extensions/af_readability/vendor/composer/InstalledVersions.php b/ops/docker/application/extensions/af_readability/vendor/composer/InstalledVersions.php index 51e734a..2052022 100644 --- a/ops/docker/application/extensions/af_readability/vendor/composer/InstalledVersions.php +++ b/ops/docker/application/extensions/af_readability/vendor/composer/InstalledVersions.php @@ -26,12 +26,23 @@ */ class InstalledVersions { + /** + * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to + * @internal + */ + private static $selfDir = null; + /** * @var mixed[]|null * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array}|array{}|null */ private static $installed; + /** + * @var bool + */ + private static $installedIsLocalDir; + /** * @var bool|null */ @@ -309,6 +320,24 @@ public static function reload($data) { self::$installed = $data; self::$installedByVendor = array(); + + // when using reload, we disable the duplicate protection to ensure that self::$installed data is + // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not, + // so we have to assume it does not, and that may result in duplicate data being returned when listing + // all installed packages for example + self::$installedIsLocalDir = false; + } + + /** + * @return string + */ + private static function getSelfDir() + { + if (self::$selfDir === null) { + self::$selfDir = strtr(__DIR__, '\\', '/'); + } + + return self::$selfDir; } /** @@ -322,19 +351,27 @@ private static function getInstalled() } $installed = array(); + $copiedLocalDir = false; if (self::$canGetVendors) { + $selfDir = self::getSelfDir(); foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) { + $vendorDir = strtr($vendorDir, '\\', '/'); if (isset(self::$installedByVendor[$vendorDir])) { $installed[] = self::$installedByVendor[$vendorDir]; } elseif (is_file($vendorDir.'/composer/installed.php')) { /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ $required = require $vendorDir.'/composer/installed.php'; - $installed[] = self::$installedByVendor[$vendorDir] = $required; - if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { - self::$installed = $installed[count($installed) - 1]; + self::$installedByVendor[$vendorDir] = $required; + $installed[] = $required; + if (self::$installed === null && $vendorDir.'/composer' === $selfDir) { + self::$installed = $required; + self::$installedIsLocalDir = true; } } + if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) { + $copiedLocalDir = true; + } } } @@ -350,7 +387,7 @@ private static function getInstalled() } } - if (self::$installed !== array()) { + if (self::$installed !== array() && !$copiedLocalDir) { $installed[] = self::$installed; } diff --git a/ops/docker/application/extensions/af_readability/vendor/composer/installed.json b/ops/docker/application/extensions/af_readability/vendor/composer/installed.json index d1e4006..4bef5f6 100644 --- a/ops/docker/application/extensions/af_readability/vendor/composer/installed.json +++ b/ops/docker/application/extensions/af_readability/vendor/composer/installed.json @@ -328,24 +328,24 @@ }, { "name": "psr/http-factory", - "version": "1.0.1", - "version_normalized": "1.0.1.0", + "version": "1.1.0", + "version_normalized": "1.1.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", - "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", "shasum": "" }, "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0" + "php": ">=7.1", + "psr/http-message": "^1.0 || ^2.0" }, - "time": "2019-04-30T12:38:16+00:00", + "time": "2024-04-15T12:06:14+00:00", "type": "library", "extra": { "branch-alias": { @@ -365,10 +365,10 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "factory", "http", @@ -380,7 +380,7 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" + "source": "https://github.com/php-fig/http-factory" }, "install-path": "../psr/http-factory" }, diff --git a/ops/docker/application/extensions/af_readability/vendor/composer/installed.php b/ops/docker/application/extensions/af_readability/vendor/composer/installed.php index 048f41d..8498d74 100644 --- a/ops/docker/application/extensions/af_readability/vendor/composer/installed.php +++ b/ops/docker/application/extensions/af_readability/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => '__root__', - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', - 'reference' => 'ecc96987909acb2ed49fd750cdac5921ae04b8c6', + 'pretty_version' => 'dev-main', + 'version' => 'dev-main', + 'reference' => '4d385554f34e8befef03e513e242732aab85cca6', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -11,9 +11,9 @@ ), 'versions' => array( '__root__' => array( - 'pretty_version' => 'dev-master', - 'version' => 'dev-master', - 'reference' => 'ecc96987909acb2ed49fd750cdac5921ae04b8c6', + 'pretty_version' => 'dev-main', + 'version' => 'dev-main', + 'reference' => '4d385554f34e8befef03e513e242732aab85cca6', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -56,9 +56,9 @@ 'dev_requirement' => false, ), 'psr/http-factory' => array( - 'pretty_version' => '1.0.1', - 'version' => '1.0.1.0', - 'reference' => '12ac7fcd07e5b077433f5f2bee95b3a771bf61be', + 'pretty_version' => '1.1.0', + 'version' => '1.1.0.0', + 'reference' => '2b4765fddfe3b508ac62f829e852b1501d3f6e8a', 'type' => 'library', 'install_path' => __DIR__ . '/../psr/http-factory', 'aliases' => array(), diff --git a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/.gitignore b/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/.gitignore deleted file mode 100644 index d8a7996..0000000 --- a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -composer.lock -vendor/ diff --git a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/.pullapprove.yml b/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/.pullapprove.yml deleted file mode 100644 index 8cf0819..0000000 --- a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/.pullapprove.yml +++ /dev/null @@ -1,7 +0,0 @@ -extends: default -reviewers: - - - name: contributors - required: 1 - teams: - - http-factory-contributors diff --git a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/README.md b/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/README.md index 41d362a..bf8913b 100644 --- a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/README.md +++ b/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/README.md @@ -1,10 +1,12 @@ HTTP Factories ============== -This repository holds all interfaces related to [PSR-17 (HTTP Message Factories)][psr-17]. -Please refer to the specification for a description. +This repository holds all interfaces related to [PSR-17 (HTTP Factories)][psr-url]. -You can find implementations of the specification by looking for packages providing the -[psr/http-factory-implementation](https://packagist.org/providers/psr/http-factory-implementation) virtual package. +Note that this is not a HTTP Factory implementation of its own. It is merely interfaces that describe the components of a HTTP Factory. -[psr-17]: https://www.php-fig.org/psr/psr-17/ +The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist. + +[psr-url]: https://www.php-fig.org/psr/psr-17/ +[package-url]: https://packagist.org/packages/psr/http-factory +[implementation-url]: https://packagist.org/providers/psr/http-factory-implementation diff --git a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/composer.json b/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/composer.json index af62b29..82a1d32 100644 --- a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/composer.json +++ b/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/composer.json @@ -1,6 +1,6 @@ { "name": "psr/http-factory", - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "psr", "psr-7", @@ -15,12 +15,15 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], + "support": { + "source": "https://github.com/php-fig/http-factory" + }, "require": { - "php": ">=7.0.0", - "psr/http-message": "^1.0" + "php": ">=7.1", + "psr/http-message": "^1.0 || ^2.0" }, "autoload": { "psr-4": { diff --git a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php b/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php index 7db4e30..d7adbf0 100644 --- a/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php +++ b/ops/docker/application/extensions/af_readability/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php @@ -15,10 +15,10 @@ interface UploadedFileFactoryInterface * * @param StreamInterface $stream Underlying stream representing the * uploaded file content. - * @param int $size in bytes + * @param int|null $size in bytes * @param int $error PHP file upload error - * @param string $clientFilename Filename as provided by the client, if any. - * @param string $clientMediaType Media type as provided by the client, if any. + * @param string|null $clientFilename Filename as provided by the client, if any. + * @param string|null $clientMediaType Media type as provided by the client, if any. * * @return UploadedFileInterface * @@ -26,9 +26,9 @@ interface UploadedFileFactoryInterface */ public function createUploadedFile( StreamInterface $stream, - int $size = null, + ?int $size = null, int $error = \UPLOAD_ERR_OK, - string $clientFilename = null, - string $clientMediaType = null + ?string $clientFilename = null, + ?string $clientMediaType = null ): UploadedFileInterface; }