From 6819a977bff92662a9a3b2b8707d9bb220d1f8d5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sat, 16 Jul 2022 21:49:36 +0300 Subject: [PATCH] af_readability: add dependency on psr/http-factory (again) --- plugins/af_readability/composer.json | 3 +- plugins/af_readability/composer.lock | 55 +----------------- .../vendor/composer/autoload_psr4.php | 4 +- .../vendor/composer/autoload_static.php | 5 +- .../vendor/composer/installed.json | 56 ------------------- .../vendor/composer/installed.php | 13 ++++- 6 files changed, 19 insertions(+), 117 deletions(-) diff --git a/plugins/af_readability/composer.json b/plugins/af_readability/composer.json index b22733315..4bc9ea9a7 100644 --- a/plugins/af_readability/composer.json +++ b/plugins/af_readability/composer.json @@ -7,6 +7,7 @@ } ], "require": { - "fivefilters/readability.php": "dev-master" + "fivefilters/readability.php": "dev-master", + "psr/http-factory": "1.0.1" } } diff --git a/plugins/af_readability/composer.lock b/plugins/af_readability/composer.lock index 01143fa28..db642f443 100644 --- a/plugins/af_readability/composer.lock +++ b/plugins/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": "9b8120263fb98662acec8e8101e47465", + "content-hash": "351bb4bce6353ca338c03626bab6413f", "packages": [ { "name": "fivefilters/readability.php", @@ -305,59 +305,6 @@ }, "time": "2021-07-01T14:25:37+00:00" }, - { - "name": "psr/http-message", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "support": { - "source": "https://github.com/php-fig/http-message/tree/master" - }, - "time": "2016-08-06T14:39:51+00:00" - }, { "name": "psr/http-factory", "version": "1.0.1", diff --git a/plugins/af_readability/vendor/composer/autoload_psr4.php b/plugins/af_readability/vendor/composer/autoload_psr4.php index e16ed7f2d..ec14cbb94 100644 --- a/plugins/af_readability/vendor/composer/autoload_psr4.php +++ b/plugins/af_readability/vendor/composer/autoload_psr4.php @@ -8,7 +8,7 @@ $baseDir = dirname($vendorDir); return array( 'fivefilters\\Readability\\' => array($vendorDir . '/fivefilters/readability.php/src'), 'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'), - 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'), + 'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src', $vendorDir . '/psr/http-factory/src'), 'Masterminds\\' => array($vendorDir . '/masterminds/html5/src'), - 'League\\Uri\\' => array($vendorDir . '/league/uri-interfaces/src', $vendorDir . '/league/uri/src'), + 'League\\Uri\\' => array($vendorDir . '/league/uri/src', $vendorDir . '/league/uri-interfaces/src'), ); diff --git a/plugins/af_readability/vendor/composer/autoload_static.php b/plugins/af_readability/vendor/composer/autoload_static.php index e269612f2..b4d70b4f4 100644 --- a/plugins/af_readability/vendor/composer/autoload_static.php +++ b/plugins/af_readability/vendor/composer/autoload_static.php @@ -38,6 +38,7 @@ class ComposerStaticInitb44cc79a0eaef9cd9c2f2ac697cbe9c0 'Psr\\Http\\Message\\' => array ( 0 => __DIR__ . '/..' . '/psr/http-message/src', + 1 => __DIR__ . '/..' . '/psr/http-factory/src', ), 'Masterminds\\' => array ( @@ -45,8 +46,8 @@ class ComposerStaticInitb44cc79a0eaef9cd9c2f2ac697cbe9c0 ), 'League\\Uri\\' => array ( - 0 => __DIR__ . '/..' . '/league/uri-interfaces/src', - 1 => __DIR__ . '/..' . '/league/uri/src', + 0 => __DIR__ . '/..' . '/league/uri/src', + 1 => __DIR__ . '/..' . '/league/uri-interfaces/src', ), ); diff --git a/plugins/af_readability/vendor/composer/installed.json b/plugins/af_readability/vendor/composer/installed.json index 608ac5e69..210558b4a 100644 --- a/plugins/af_readability/vendor/composer/installed.json +++ b/plugins/af_readability/vendor/composer/installed.json @@ -311,62 +311,6 @@ }, "install-path": "../masterminds/html5" }, - { - "name": "psr/http-message", - "version": "1.0.1", - "version_normalized": "1.0.1.0", - "source": { - "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "time": "2016-08-06T14:39:51+00:00", - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "installation-source": "dist", - "autoload": { - "psr-4": { - "Psr\\Http\\Message\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", - "keywords": [ - "http", - "http-message", - "psr", - "psr-7", - "request", - "response" - ], - "support": { - "source": "https://github.com/php-fig/http-message/tree/master" - }, - "install-path": "../psr/http-message" - }, { "name": "psr/http-factory", "version": "1.0.1", diff --git a/plugins/af_readability/vendor/composer/installed.php b/plugins/af_readability/vendor/composer/installed.php index 9254e7280..4fc7f2760 100644 --- a/plugins/af_readability/vendor/composer/installed.php +++ b/plugins/af_readability/vendor/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'fdd1c43612011060b4b876db438eb7ec62dd077d', + 'reference' => 'c523f3726a412d095a7264174821ca07370b5092', 'name' => '__root__', 'dev' => true, ), @@ -16,7 +16,7 @@ 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'fdd1c43612011060b4b876db438eb7ec62dd077d', + 'reference' => 'c523f3726a412d095a7264174821ca07370b5092', 'dev_requirement' => false, ), 'fivefilters/readability.php' => array( @@ -57,6 +57,15 @@ 'reference' => 'f640ac1bdddff06ea333a920c95bbad8872429ab', 'dev_requirement' => false, ), + 'psr/http-factory' => array( + 'pretty_version' => '1.0.1', + 'version' => '1.0.1.0', + 'type' => 'library', + 'install_path' => __DIR__ . '/../psr/http-factory', + 'aliases' => array(), + 'reference' => '12ac7fcd07e5b077433f5f2bee95b3a771bf61be', + 'dev_requirement' => false, + ), 'psr/http-message' => array( 'pretty_version' => '1.0.1', 'version' => '1.0.1.0',