From 4b6161892000cb2b8392dce92a9cf2cabdf2d20e Mon Sep 17 00:00:00 2001 From: Chih-Hsuan Yen Date: Sat, 2 Jul 2022 22:01:51 +0800 Subject: 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 --- .../php-qrcode/tests/Helpers/BitBufferTest.php | 29 +++++++++++----------- .../php-qrcode/tests/Helpers/PolynomialTest.php | 22 ++++++++-------- 2 files changed, 26 insertions(+), 25 deletions(-) (limited to 'vendor/chillerlan/php-qrcode/tests/Helpers') diff --git a/vendor/chillerlan/php-qrcode/tests/Helpers/BitBufferTest.php b/vendor/chillerlan/php-qrcode/tests/Helpers/BitBufferTest.php index 25d1c3504..e9479a5c6 100644 --- a/vendor/chillerlan/php-qrcode/tests/Helpers/BitBufferTest.php +++ b/vendor/chillerlan/php-qrcode/tests/Helpers/BitBufferTest.php @@ -12,21 +12,22 @@ namespace chillerlan\QRCodeTest\Helpers; -use chillerlan\QRCode\{QRCode, Helpers\BitBuffer}; -use chillerlan\QRCodeTest\QRTestAbstract; +use chillerlan\QRCode\QRCode; +use chillerlan\QRCode\Helpers\BitBuffer; +use PHPUnit\Framework\TestCase; -class BitBufferTest extends QRTestAbstract{ +/** + * BitBuffer coverage test + */ +final class BitBufferTest extends TestCase{ - /** - * @var \chillerlan\QRCode\Helpers\BitBuffer - */ - protected $bitBuffer; + protected BitBuffer $bitBuffer; protected function setUp():void{ $this->bitBuffer = new BitBuffer; } - public function bitProvider(){ + public function bitProvider():array{ return [ 'number' => [QRCode::DATA_NUMBER, 16], 'alphanum' => [QRCode::DATA_ALPHANUM, 32], @@ -38,16 +39,16 @@ class BitBufferTest extends QRTestAbstract{ /** * @dataProvider bitProvider */ - public function testPut($data, $value){ + public function testPut(int $data, int $value):void{ $this->bitBuffer->put($data, 4); - $this->assertSame($value, $this->bitBuffer->buffer[0]); - $this->assertSame(4, $this->bitBuffer->length); + $this::assertSame($value, $this->bitBuffer->getBuffer()[0]); + $this::assertSame(4, $this->bitBuffer->getLength()); } - public function testClear(){ + public function testClear():void{ $this->bitBuffer->clear(); - $this->assertSame([], $this->bitBuffer->buffer); - $this->assertSame(0, $this->bitBuffer->length); + $this::assertSame([], $this->bitBuffer->getBuffer()); + $this::assertSame(0, $this->bitBuffer->getLength()); } } diff --git a/vendor/chillerlan/php-qrcode/tests/Helpers/PolynomialTest.php b/vendor/chillerlan/php-qrcode/tests/Helpers/PolynomialTest.php index 7f6da303c..b0f3f4aa7 100644 --- a/vendor/chillerlan/php-qrcode/tests/Helpers/PolynomialTest.php +++ b/vendor/chillerlan/php-qrcode/tests/Helpers/PolynomialTest.php @@ -14,26 +14,26 @@ namespace chillerlan\QRCodeTest\Helpers; use chillerlan\QRCode\Helpers\Polynomial; use chillerlan\QRCode\QRCodeException; -use chillerlan\QRCodeTest\QRTestAbstract; +use PHPUnit\Framework\TestCase; -class PolynomialTest extends QRTestAbstract{ +/** + * Polynomial coverage test + */ +final class PolynomialTest extends TestCase{ - /** - * @var \chillerlan\QRCode\Helpers\Polynomial - */ - protected $polynomial; + protected Polynomial $polynomial; protected function setUp():void{ $this->polynomial = new Polynomial; } - public function testGexp(){ - $this->assertSame(142, $this->polynomial->gexp(-1)); - $this->assertSame(133, $this->polynomial->gexp(128)); - $this->assertSame(2, $this->polynomial->gexp(256)); + public function testGexp():void{ + $this::assertSame(142, $this->polynomial->gexp(-1)); + $this::assertSame(133, $this->polynomial->gexp(128)); + $this::assertSame(2, $this->polynomial->gexp(256)); } - public function testGlogException(){ + public function testGlogException():void{ $this->expectException(QRCodeException::class); $this->expectExceptionMessage('log(0)'); -- cgit v1.2.3