1
0
mirror of https://tt-rss.org/git/tt-rss.git synced 2024-06-29 12:20:51 +02:00
ttrss/vendor/chillerlan/php-settings-container
Chih-Hsuan Yen 4b61618920
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] 68bc5019c8 (diff-359c7f7a6d32d9935951e1b0742eb116fb654f4a932c8d40328bb5dcab2fa111L162)
[2] https://github.com/chillerlan/php-qrcode/issues/97
2022-07-12 22:23:48 +03:00
..
.github Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
.phan Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
docs Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
examples Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
src Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
tests Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
.gitignore Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
.scrutinizer.yml Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
composer.json Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
LICENSE
phpdoc.xml Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
phpunit.xml Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00
README.md Update php-qrcode and php-settings-container for PHP 8.1 2022-07-12 22:23:48 +03:00

chillerlan/php-settings-container

A container class for immutable settings objects. Not a DI container. PHP 7.4+

  • SettingsContainerInterface provides immutable properties with magic getter & setter and some fancy - decouple configuration logic from your application!

PHP Version Support version license Coverage Scrunitizer Packagist downloads Continuous Integration

Documentation

Installation

requires composer

composer.json (note: replace dev-main with a version constraint, e.g. ^2.1 - see releases for valid versions)

{
	"require": {
		"php": "^7.4",
		"chillerlan/php-settings-container": "dev-main"
	}
}

Profit!

Usage

The SettingsContainerInterface (wrapped inSettingsContainerAbstract ) provides plug-in functionality for immutable object properties and adds some fancy, like loading/saving JSON, arrays etc. It takes an iterable as the only constructor argument and calls a method with the trait's name on invocation (MyTrait::MyTrait()) for each used trait.

Simple usage

class MyContainer extends SettingsContainerAbstract{
	protected $foo;
	protected $bar;
}

Typed properties in PHP 7.4+:

class MyContainer extends SettingsContainerAbstract{
	protected string $foo;
	protected string $bar;
}
// use it just like a \stdClass
$container = new MyContainer;
$container->foo = 'what';
$container->bar = 'foo';

// which is equivalent to 
$container = new MyContainer(['bar' => 'foo', 'foo' => 'what']);
// ...or try
$container->fromJSON('{"foo": "what", "bar": "foo"}');


// fetch all properties as array
$container->toArray(); // -> ['foo' => 'what', 'bar' => 'foo']
// or JSON
$container->toJSON(); // -> {"foo": "what", "bar": "foo"}
// JSON via JsonSerializable
$json = json_encode($container); // -> {"foo": "what", "bar": "foo"}

//non-existing properties will be ignored:
$container->nope = 'what';

var_dump($container->nope); // -> null

Advanced usage

trait SomeOptions{
	protected $foo;
	protected $what;
	
	// 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);
	}
	
	// this method will be called from __set() when property $what is set
	protected function set_what(string $value){
		$this->what = md5($value);
	}
}

trait MoreOptions{
	protected $bar = 'whatever'; // provide default values
}
$commonOptions = [
	// SomeOptions
	'foo' => 'whatever', 
	// MoreOptions
	'bar' => 'nothing',
];

// now plug the several library options together to a single object 
$container = new class ($commonOptions) extends SettingsContainerAbstract{
	use SomeOptions, MoreOptions;
};

var_dump($container->foo); // -> WHATEVER (constructor ran strtoupper on the value)
var_dump($container->bar); // -> nothing

$container->what = 'some value';
var_dump($container->what); // -> md5 hash of "some value"

API

SettingsContainerAbstract

method return info
__construct(iterable $properties = null) - calls construct() internally after the properties have been set
(protected) construct() void calls a method with trait name as replacement constructor for each used trait
__get(string $property) mixed calls $this->{'get_'.$property}() if such a method exists
__set(string $property, $value) void calls $this->{'set_'.$property}($value) if such a method exists
__isset(string $property) bool
__unset(string $property) void
__toString() string a JSON string
toArray() array
fromIterable(iterable $properties) SettingsContainerInterface
toJSON(int $jsonOptions = null) string accepts JSON options constants
fromJSON(string $json) SettingsContainerInterface
jsonSerialize() mixed implements the JsonSerializable interface

Disclaimer

This might be either an utterly genius or completely stupid idea - you decide. However, i like it and it works. Also, this is not a dependency injection container. Stop using DI containers FFS.