summaryrefslogtreecommitdiff
path: root/vendor/composer
diff options
context:
space:
mode:
authorChih-Hsuan Yen <[email protected]>2022-07-02 22:01:51 +0800
committerAndrew Dolgov <[email protected]>2022-07-12 22:23:48 +0300
commit4b6161892000cb2b8392dce92a9cf2cabdf2d20e (patch)
tree5cad602010e4d13e1a48d6b922d4768c0893ac8b /vendor/composer
parentd9861038bcc3cb2f38c7153bdca7d5ab89597afa (diff)
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
Diffstat (limited to 'vendor/composer')
-rw-r--r--vendor/composer/installed.json50
-rw-r--r--vendor/composer/installed.php16
-rw-r--r--vendor/composer/platform_check.php4
3 files changed, 40 insertions, 30 deletions
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 3b8373d07..f3065c328 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -72,34 +72,34 @@
},
{
"name": "chillerlan/php-qrcode",
- "version": "3.4.1",
- "version_normalized": "3.4.1.0",
+ "version": "4.3.3",
+ "version_normalized": "4.3.3.0",
"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": {
"chillerlan/php-authenticator": "Yet another Google authenticator! Also creates URIs for mobile apps.",
"setasign/fpdf": "Required to use the QR FPDF output."
},
- "time": "2021-09-03T17:54:45+00:00",
+ "time": "2021-11-25T22:38:09+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -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",
@@ -149,27 +153,28 @@
},
{
"name": "chillerlan/php-settings-container",
- "version": "1.2.2",
- "version_normalized": "1.2.2.0",
+ "version": "2.1.3",
+ "version_normalized": "2.1.3.0",
"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"
},
- "time": "2021-09-03T17:33:25+00:00",
+ "time": "2022-03-09T13:18:58+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -188,14 +193,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",
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index de9c0f9c0..ad956d21b 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => '__root__',
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => 'b148d2f5153f9711120b3a3ac50ee84509c9cdfb',
+ 'reference' => '1e668c7572346f6adc47cc0359c2fd616481e730',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -13,7 +13,7 @@
'__root__' => array(
'pretty_version' => 'dev-master',
'version' => 'dev-master',
- 'reference' => 'b148d2f5153f9711120b3a3ac50ee84509c9cdfb',
+ 'reference' => '1e668c7572346f6adc47cc0359c2fd616481e730',
'type' => 'library',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -29,18 +29,18 @@
'dev_requirement' => false,
),
'chillerlan/php-qrcode' => array(
- 'pretty_version' => '3.4.1',
- 'version' => '3.4.1.0',
- 'reference' => '468603b687a5fe75c1ff33857a45f1726c7b95a9',
+ 'pretty_version' => '4.3.3',
+ 'version' => '4.3.3.0',
+ 'reference' => '6356b246948ac1025882b3f55e7c68ebd4515ae3',
'type' => 'library',
'install_path' => __DIR__ . '/../chillerlan/php-qrcode',
'aliases' => array(),
'dev_requirement' => false,
),
'chillerlan/php-settings-container' => array(
- 'pretty_version' => '1.2.2',
- 'version' => '1.2.2.0',
- 'reference' => 'd1b5284d6eb3a767459738bb0b20073f0cb3eeaf',
+ 'pretty_version' => '2.1.3',
+ 'version' => '2.1.3.0',
+ 'reference' => '125dd573b45ffc7cabecf385986a356ba2c6f602',
'type' => 'library',
'install_path' => __DIR__ . '/../chillerlan/php-settings-container',
'aliases' => array(),
diff --git a/vendor/composer/platform_check.php b/vendor/composer/platform_check.php
index 589e9e770..580fa9609 100644
--- a/vendor/composer/platform_check.php
+++ b/vendor/composer/platform_check.php
@@ -4,8 +4,8 @@
$issues = array();
-if (!(PHP_VERSION_ID >= 70200)) {
- $issues[] = 'Your Composer dependencies require a PHP version ">= 7.2.0". You are running ' . PHP_VERSION . '.';
+if (!(PHP_VERSION_ID >= 70400)) {
+ $issues[] = 'Your Composer dependencies require a PHP version ">= 7.4.0". You are running ' . PHP_VERSION . '.';
}
if ($issues) {