summaryrefslogtreecommitdiff
path: root/vendor/chillerlan/php-settings-container/src
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/chillerlan/php-settings-container/src
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/chillerlan/php-settings-container/src')
-rw-r--r--vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php45
-rw-r--r--vendor/chillerlan/php-settings-container/src/SettingsContainerInterface.php32
2 files changed, 18 insertions, 59 deletions
diff --git a/vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php b/vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php
index 1ccc1a0e2..f643f73d0 100644
--- a/vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php
+++ b/vendor/chillerlan/php-settings-container/src/SettingsContainerAbstract.php
@@ -2,9 +2,7 @@
/**
* Class SettingsContainerAbstract
*
- * @filesource SettingsContainerAbstract.php
* @created 28.08.2018
- * @package chillerlan\Settings
* @author Smiley <[email protected]>
* @copyright 2018 Smiley
* @license MIT
@@ -12,16 +10,15 @@
namespace chillerlan\Settings;
-use Exception, ReflectionClass, ReflectionProperty;
+use ReflectionClass, ReflectionProperty;
-use function call_user_func, call_user_func_array, get_object_vars, json_decode, json_encode, method_exists, property_exists;
+use function get_object_vars, json_decode, json_encode, method_exists, property_exists;
+use const JSON_THROW_ON_ERROR;
abstract class SettingsContainerAbstract implements SettingsContainerInterface{
/**
* SettingsContainerAbstract constructor.
- *
- * @param iterable|null $properties
*/
public function __construct(iterable $properties = null){
@@ -35,8 +32,6 @@ abstract class SettingsContainerAbstract implements SettingsContainerInterface{
/**
* calls a method with trait name as replacement constructor for each used trait
* (remember pre-php5 classname constructors? yeah, basically this.)
- *
- * @return void
*/
protected function construct():void{
$traits = (new ReflectionClass($this))->getTraits();
@@ -45,7 +40,7 @@ abstract class SettingsContainerAbstract implements SettingsContainerInterface{
$method = $trait->getShortName();
if(method_exists($this, $method)){
- call_user_func([$this, $method]);
+ $this->{$method}();
}
}
@@ -56,16 +51,17 @@ abstract class SettingsContainerAbstract implements SettingsContainerInterface{
*/
public function __get(string $property){
- if(property_exists($this, $property) && !$this->isPrivate($property)){
+ if(!property_exists($this, $property) || $this->isPrivate($property)){
+ return null;
+ }
- if(method_exists($this, 'get_'.$property)){
- return call_user_func([$this, 'get_'.$property]);
- }
+ $method = 'get_'.$property;
- return $this->{$property};
+ if(method_exists($this, $method)){
+ return $this->{$method}();
}
- return null;
+ return $this->{$property};
}
/**
@@ -77,8 +73,10 @@ abstract class SettingsContainerAbstract implements SettingsContainerInterface{
return;
}
- if(method_exists($this, 'set_'.$property)){
- call_user_func_array([$this, 'set_'.$property], [$value]);
+ $method = 'set_'.$property;
+
+ if(method_exists($this, $method)){
+ $this->{$method}($value);
return;
}
@@ -95,10 +93,6 @@ abstract class SettingsContainerAbstract implements SettingsContainerInterface{
/**
* @internal Checks if a property is private
- *
- * @param string $property
- *
- * @return bool
*/
protected function isPrivate(string $property):bool{
return (new ReflectionProperty($this, $property))->isPrivate();
@@ -152,12 +146,7 @@ abstract class SettingsContainerAbstract implements SettingsContainerInterface{
* @inheritdoc
*/
public function fromJSON(string $json):SettingsContainerInterface{
-
- $data = json_decode($json, true); // as of PHP 7.3: JSON_THROW_ON_ERROR
-
- if($data === false || $data === null){
- throw new Exception('error while decoding JSON');
- }
+ $data = json_decode($json, true, 512, JSON_THROW_ON_ERROR);
return $this->fromIterable($data);
}
@@ -165,7 +154,7 @@ abstract class SettingsContainerAbstract implements SettingsContainerInterface{
/**
* @inheritdoc
*/
- public function jsonSerialize(){
+ public function jsonSerialize():array{
return $this->toArray();
}
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
*/