From 4b6161892000cb2b8392dce92a9cf2cabdf2d20e Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 2 Jul 2022 22:01:51 +0800 Subject: Update php-qrcode and php-settings-container for PHP 8.1 By running the following command after updating composer.json ``` composer update chillerlan/php-qrcode chillerlan/php-settings-container ``` This change fixes a deprecation warning from Preferences -> Personal data / Authentication -> Authenticator (OTP). ``` Return type of chillerlan\Settings\SettingsContainerAbstract::jsonSerialize() should either be compatible with JsonSerializable::jsonSerialize(): mixed, or the #[\ReturnTypeWillChange] attribute should be used to temporarily suppress the notice 1. vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php(19): ttrss_error_handler(Return type of chillerlan\Settings\SettingsContainerAbstract::jsonSerialize() should either be compatible with JsonSerializable::jsonSerialize(): mixed, or the #[\ReturnTypeWillChange] attribute should be used to temporarily suppress the notice, vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php) 2. vendor/composer/ClassLoader.php(571): include(/usr/share/webapps/tt-rss/vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php) 3. vendor/composer/ClassLoader.php(428): Composer\Autoload\includeFile(/usr/share/webapps/tt-rss/vendor/composer/../chillerlan/php-settings-container/src/SettingsContainerAbstract.php) 4. vendor/chillerlan/php-qrcode/src/QROptions.php(59): loadClass(chillerlan\Settings\SettingsContainerAbstract) 5. vendor/composer/ClassLoader.php(571): include(/usr/share/webapps/tt-rss/vendor/chillerlan/php-qrcode/src/QROptions.php) 6. vendor/composer/ClassLoader.php(428): Composer\Autoload\includeFile(/usr/share/webapps/tt-rss/vendor/composer/../chillerlan/php-qrcode/src/QROptions.php) 7. vendor/chillerlan/php-qrcode/src/QRCode.php(113): loadClass(chillerlan\QRCode\QROptions) 8. classes/pref/prefs.php(958): __construct() 9. classes/pref/prefs.php(469): _get_otp_qrcode_img() 10. classes/pref/prefs.php(541): index_auth_2fa() 11. backend.php(136): index_auth() ``` The issue is fixed in php-settings-container 2.1.1 [1] Here I use the latest php-qrcode version for another PHP 8.1 fix [2]. [1] https://github.com/chillerlan/php-settings-container/commit/68bc5019c8b38956c83906431ef879668366b036#diff-359c7f7a6d32d9935951e1b0742eb116fb654f4a932c8d40328bb5dcab2fa111L162 [2] https://github.com/chillerlan/php-qrcode/issues/97 --- composer.lock | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) (limited to 'composer.lock') diff --git a/composer.lock b/composer.lock index 747c218aa..8471ee42a 100644 --- a/composer.lock +++ b/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": "0c52fd6b8f33561f7c03f12df6f5480f", + "content-hash": "8bb918e9a6d0b833ebcb0b525885d36d", "packages": [ { "name": "beberlei/assert", @@ -75,26 +75,26 @@ }, { "name": "chillerlan/php-qrcode", - "version": "3.4.1", + "version": "4.3.3", "source": { "type": "git", "url": "https://github.com/chillerlan/php-qrcode.git", - "reference": "468603b687a5fe75c1ff33857a45f1726c7b95a9" + "reference": "6356b246948ac1025882b3f55e7c68ebd4515ae3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/468603b687a5fe75c1ff33857a45f1726c7b95a9", - "reference": "468603b687a5fe75c1ff33857a45f1726c7b95a9", + "url": "https://api.github.com/repos/chillerlan/php-qrcode/zipball/6356b246948ac1025882b3f55e7c68ebd4515ae3", + "reference": "6356b246948ac1025882b3f55e7c68ebd4515ae3", "shasum": "" }, "require": { - "chillerlan/php-settings-container": "^1.2.2", + "chillerlan/php-settings-container": "^2.1", "ext-mbstring": "*", - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { - "phan/phan": "^3.2.2", - "phpunit/phpunit": "^8.5", + "phan/phan": "^5.3", + "phpunit/phpunit": "^9.5", "setasign/fpdf": "^1.8.2" }, "suggest": { @@ -126,7 +126,7 @@ "homepage": "https://github.com/chillerlan/php-qrcode/graphs/contributors" } ], - "description": "A QR code generator. PHP 7.2+", + "description": "A QR code generator. PHP 7.4+", "homepage": "https://github.com/chillerlan/php-qrcode", "keywords": [ "phpqrcode", @@ -135,6 +135,10 @@ "qrcode", "qrcode-generator" ], + "support": { + "issues": "https://github.com/chillerlan/php-qrcode/issues", + "source": "https://github.com/chillerlan/php-qrcode/tree/4.3.3" + }, "funding": [ { "url": "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4", @@ -145,28 +149,29 @@ "type": "ko_fi" } ], - "time": "2021-09-03T17:54:45+00:00" + "time": "2021-11-25T22:38:09+00:00" }, { "name": "chillerlan/php-settings-container", - "version": "1.2.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/chillerlan/php-settings-container.git", - "reference": "d1b5284d6eb3a767459738bb0b20073f0cb3eeaf" + "reference": "125dd573b45ffc7cabecf385986a356ba2c6f602" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/d1b5284d6eb3a767459738bb0b20073f0cb3eeaf", - "reference": "d1b5284d6eb3a767459738bb0b20073f0cb3eeaf", + "url": "https://api.github.com/repos/chillerlan/php-settings-container/zipball/125dd573b45ffc7cabecf385986a356ba2c6f602", + "reference": "125dd573b45ffc7cabecf385986a356ba2c6f602", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "^8.4" + "phan/phan": "^5.3", + "phpunit/phpunit": "^9.5" }, "type": "library", "autoload": { @@ -185,14 +190,19 @@ "homepage": "https://github.com/codemasher" } ], - "description": "A container class for immutable settings objects. Not a DI container. PHP 7.2+", + "description": "A container class for immutable settings objects. Not a DI container. PHP 7.4+", "homepage": "https://github.com/chillerlan/php-settings-container", "keywords": [ "PHP7", "Settings", + "configuration", "container", "helper" ], + "support": { + "issues": "https://github.com/chillerlan/php-settings-container/issues", + "source": "https://github.com/chillerlan/php-settings-container" + }, "funding": [ { "url": "https://www.paypal.com/donate?hosted_button_id=WLYUNAT9ZTJZ4", @@ -203,7 +213,7 @@ "type": "ko_fi" } ], - "time": "2021-09-03T17:33:25+00:00" + "time": "2022-03-09T13:18:58+00:00" }, { "name": "j4mie/idiorm", -- cgit v1.2.3