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/src/Helpers/BitBuffer.php | 40 +++++++++++++++------- .../php-qrcode/src/Helpers/Polynomial.php | 28 ++++++--------- 2 files changed, 38 insertions(+), 30 deletions(-) (limited to 'vendor/chillerlan/php-qrcode/src/Helpers') diff --git a/vendor/chillerlan/php-qrcode/src/Helpers/BitBuffer.php b/vendor/chillerlan/php-qrcode/src/Helpers/BitBuffer.php index 0b4ff6a77..de47f20f4 100644 --- a/vendor/chillerlan/php-qrcode/src/Helpers/BitBuffer.php +++ b/vendor/chillerlan/php-qrcode/src/Helpers/BitBuffer.php @@ -14,20 +14,25 @@ namespace chillerlan\QRCode\Helpers; use function count, floor; -class BitBuffer{ +/** + * Holds the raw binary data + */ +final class BitBuffer{ /** - * @var int[] + * The buffer content + * + * @var int[] */ - public $buffer = []; + protected array $buffer = []; /** - * @var int + * Length of the content (bits) */ - public $length = 0; + protected int $length = 0; /** - * @return \chillerlan\QRCode\Helpers\BitBuffer + * clears the buffer */ public function clear():BitBuffer{ $this->buffer = []; @@ -37,10 +42,7 @@ class BitBuffer{ } /** - * @param int $num - * @param int $length - * - * @return \chillerlan\QRCode\Helpers\BitBuffer + * appends a sequence of bits */ public function put(int $num, int $length):BitBuffer{ @@ -52,9 +54,7 @@ class BitBuffer{ } /** - * @param bool $bit - * - * @return \chillerlan\QRCode\Helpers\BitBuffer + * appends a single bit */ public function putBit(bool $bit):BitBuffer{ $bufIndex = floor($this->length / 8); @@ -72,4 +72,18 @@ class BitBuffer{ return $this; } + /** + * returns the current buffer length + */ + public function getLength():int{ + return $this->length; + } + + /** + * returns the buffer content + */ + public function getBuffer():array{ + return $this->buffer; + } + } diff --git a/vendor/chillerlan/php-qrcode/src/Helpers/Polynomial.php b/vendor/chillerlan/php-qrcode/src/Helpers/Polynomial.php index abe11d0cc..c42e0831c 100644 --- a/vendor/chillerlan/php-qrcode/src/Helpers/Polynomial.php +++ b/vendor/chillerlan/php-qrcode/src/Helpers/Polynomial.php @@ -17,12 +17,14 @@ use chillerlan\QRCode\QRCodeException; use function array_fill, count, sprintf; /** - * @link http://www.thonky.com/qr-code-tutorial/error-correction-coding + * Polynomial long division helpers + * + * @see http://www.thonky.com/qr-code-tutorial/error-correction-coding */ -class Polynomial{ +final class Polynomial{ /** - * @link http://www.thonky.com/qr-code-tutorial/log-antilog-table + * @see http://www.thonky.com/qr-code-tutorial/log-antilog-table */ protected const table = [ [ 1, 0], [ 2, 0], [ 4, 1], [ 8, 25], [ 16, 2], [ 32, 50], [ 64, 26], [128, 198], @@ -60,29 +62,26 @@ class Polynomial{ ]; /** - * @var array + * @var int[] */ - protected $num = []; + protected array $num = []; /** * Polynomial constructor. - * - * @param array|null $num - * @param int|null $shift */ public function __construct(array $num = null, int $shift = null){ $this->setNum($num ?? [1], $shift); } /** - * @return array + * */ public function getNum():array{ return $this->num; } /** - * @param array $num + * @param int[] $num * @param int|null $shift * * @return \chillerlan\QRCode\Helpers\Polynomial @@ -105,7 +104,7 @@ class Polynomial{ } /** - * @param array $e + * @param int[] $e * * @return \chillerlan\QRCode\Helpers\Polynomial */ @@ -127,7 +126,7 @@ class Polynomial{ } /** - * @param array $e + * @param int[] $e * * @return \chillerlan\QRCode\Helpers\Polynomial */ @@ -150,9 +149,6 @@ class Polynomial{ } /** - * @param int $n - * - * @return int * @throws \chillerlan\QRCode\QRCodeException */ public function glog(int $n):int{ @@ -165,9 +161,7 @@ class Polynomial{ } /** - * @param int $n * - * @return int */ public function gexp(int $n):int{ -- cgit v1.2.3-54-g00ecf