diff options
author | Chih-Hsuan Yen <[email protected]> | 2022-07-02 22:01:51 +0800 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2022-07-12 22:23:48 +0300 |
commit | 4b6161892000cb2b8392dce92a9cf2cabdf2d20e (patch) | |
tree | 5cad602010e4d13e1a48d6b922d4768c0893ac8b /vendor/chillerlan/php-settings-container/src/SettingsContainerInterface.php | |
parent | d9861038bcc3cb2f38c7153bdca7d5ab89597afa (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/chillerlan/php-settings-container/src/SettingsContainerInterface.php')
-rw-r--r-- | vendor/chillerlan/php-settings-container/src/SettingsContainerInterface.php | 32 |
1 files changed, 1 insertions, 31 deletions
diff --git a/vendor/chillerlan/php-settings-container/src/SettingsContainerInterface.php b/vendor/chillerlan/php-settings-container/src/SettingsContainerInterface.php index 59cef6232..ddacccd29 100644 --- a/vendor/chillerlan/php-settings-container/src/SettingsContainerInterface.php +++ b/vendor/chillerlan/php-settings-container/src/SettingsContainerInterface.php @@ -2,9 +2,7 @@ /** * Interface SettingsContainerInterface * - * @filesource SettingsContainerInterface.php * @created 28.08.2018 - * @package chillerlan\Settings * @author Smiley <[email protected]> * @copyright 2018 Smiley * @license MIT @@ -22,9 +20,7 @@ interface SettingsContainerInterface extends JsonSerializable{ /** * Retrieve the value of $property * - * @param string $property - * - * @return mixed + * @return mixed|null */ public function __get(string $property); @@ -33,69 +29,43 @@ interface SettingsContainerInterface extends JsonSerializable{ * * @param string $property * @param mixed $value - * - * @return void */ public function __set(string $property, $value):void; /** * Checks if $property is set (aka. not null), excluding private properties - * - * @param string $property - * - * @return bool */ public function __isset(string $property):bool; /** * Unsets $property while avoiding private and non-existing properties - * - * @param string $property - * - * @return void */ public function __unset(string $property):void; /** * @see SettingsContainerInterface::toJSON() - * - * @return string */ public function __toString():string; /** * Returns an array representation of the settings object - * - * @return array */ public function toArray():array; /** * Sets properties from a given iterable - * - * @param iterable $properties - * - * @return \chillerlan\Settings\SettingsContainerInterface */ public function fromIterable(iterable $properties):SettingsContainerInterface; /** * Returns a JSON representation of the settings object * @see \json_encode() - * - * @param int|null $jsonOptions - * - * @return string */ public function toJSON(int $jsonOptions = null):string; /** * Sets properties from a given JSON string * - * @param string $json - * - * @return \chillerlan\Settings\SettingsContainerInterface - * * @throws \Exception * @throws \JsonException */ |