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
101 lines
2.7 KiB
PHP
101 lines
2.7 KiB
PHP
<?php
|
|
/**
|
|
* Class QRImageWithText
|
|
*
|
|
* example for additional text
|
|
*
|
|
* @link https://github.com/chillerlan/php-qrcode/issues/35
|
|
*
|
|
* @filesource QRImageWithText.php
|
|
* @created 22.06.2019
|
|
* @package chillerlan\QRCodeExamples
|
|
* @author smiley <smiley@chillerlan.net>
|
|
* @copyright 2019 smiley
|
|
* @license MIT
|
|
*
|
|
* @noinspection PhpComposerExtensionStubsInspection
|
|
*/
|
|
|
|
namespace chillerlan\QRCodeExamples;
|
|
|
|
use chillerlan\QRCode\Output\QRImage;
|
|
|
|
use function base64_encode, imagechar, imagecolorallocate, imagecolortransparent, imagecopymerge, imagecreatetruecolor,
|
|
imagedestroy, imagefilledrectangle, imagefontwidth, in_array, round, str_split, strlen;
|
|
|
|
class QRImageWithText extends QRImage{
|
|
|
|
/**
|
|
* @param string|null $file
|
|
* @param string|null $text
|
|
*
|
|
* @return string
|
|
*/
|
|
public function dump(string $file = null, string $text = null):string{
|
|
// set returnResource to true to skip further processing for now
|
|
$this->options->returnResource = true;
|
|
|
|
// there's no need to save the result of dump() into $this->image here
|
|
parent::dump($file);
|
|
|
|
// render text output if a string is given
|
|
if($text !== null){
|
|
$this->addText($text);
|
|
}
|
|
|
|
$imageData = $this->dumpImage();
|
|
|
|
if($file !== null){
|
|
$this->saveToFile($imageData, $file);
|
|
}
|
|
|
|
if($this->options->imageBase64){
|
|
$imageData = 'data:image/'.$this->options->outputType.';base64,'.base64_encode($imageData);
|
|
}
|
|
|
|
return $imageData;
|
|
}
|
|
|
|
/**
|
|
* @param string $text
|
|
*/
|
|
protected function addText(string $text):void{
|
|
// save the qrcode image
|
|
$qrcode = $this->image;
|
|
|
|
// options things
|
|
$textSize = 3; // see imagefontheight() and imagefontwidth()
|
|
$textBG = [200, 200, 200];
|
|
$textColor = [50, 50, 50];
|
|
|
|
$bgWidth = $this->length;
|
|
$bgHeight = $bgWidth + 20; // 20px extra space
|
|
|
|
// create a new image with additional space
|
|
$this->image = imagecreatetruecolor($bgWidth, $bgHeight);
|
|
$background = imagecolorallocate($this->image, ...$textBG);
|
|
|
|
// allow transparency
|
|
if($this->options->imageTransparent && in_array($this->options->outputType, $this::TRANSPARENCY_TYPES, true)){
|
|
imagecolortransparent($this->image, $background);
|
|
}
|
|
|
|
// fill the background
|
|
imagefilledrectangle($this->image, 0, 0, $bgWidth, $bgHeight, $background);
|
|
|
|
// copy over the qrcode
|
|
imagecopymerge($this->image, $qrcode, 0, 0, 0, 0, $this->length, $this->length, 100);
|
|
imagedestroy($qrcode);
|
|
|
|
$fontColor = imagecolorallocate($this->image, ...$textColor);
|
|
$w = imagefontwidth($textSize);
|
|
$x = round(($bgWidth - strlen($text) * $w) / 2);
|
|
|
|
// loop through the string and draw the letters
|
|
foreach(str_split($text) as $i => $chr){
|
|
imagechar($this->image, $textSize, (int)($i * $w + $x), $this->length, $chr, $fontColor);
|
|
}
|
|
}
|
|
|
|
}
|