mirror of
https://tt-rss.org/git/tt-rss.git
synced 2024-07-03 13:00:51 +02:00
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] 68bc5019c8 (diff-359c7f7a6d32d9935951e1b0742eb116fb654f4a932c8d40328bb5dcab2fa111L162)
[2] https://github.com/chillerlan/php-qrcode/issues/97
52 lines
1.1 KiB
PHP
52 lines
1.1 KiB
PHP
<?php
|
|
/**
|
|
* @created 28.08.2018
|
|
* @author smiley <smiley@chillerlan.net>
|
|
* @copyright 2018 smiley
|
|
* @license MIT
|
|
*/
|
|
|
|
namespace chillerlan\SettingsExamples;
|
|
|
|
use chillerlan\Settings\SettingsContainerAbstract;
|
|
|
|
require_once __DIR__.'/../vendor/autoload.php';
|
|
|
|
// from library #1
|
|
trait SomeOptions{
|
|
protected string $foo = '';
|
|
|
|
// this method will be called in SettingsContainerAbstract::__construct() after the properties have been set
|
|
protected function SomeOptions(){
|
|
// just some constructor stuff...
|
|
$this->foo = strtoupper($this->foo);
|
|
}
|
|
}
|
|
|
|
// from library #2
|
|
trait MoreOptions{
|
|
protected string $bar = 'whatever'; // provide default values
|
|
}
|
|
|
|
$commonOptions = [
|
|
// SomeOptions
|
|
'foo' => 'whatever',
|
|
// MoreOptions
|
|
'bar' => 'nothing',
|
|
];
|
|
|
|
// now plug the several library options together to a single object
|
|
|
|
/**
|
|
* @property string $foo
|
|
* @property string $bar
|
|
*/
|
|
class MySettings extends SettingsContainerAbstract{
|
|
use SomeOptions, MoreOptions; // ...
|
|
};
|
|
|
|
$container = new MySettings($commonOptions);
|
|
|
|
var_dump($container->foo); // -> WHATEVER (constructor ran strtoupper on the value)
|
|
var_dump($container->bar); // -> nothing
|