4b61618920
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
79 lines
1.7 KiB
PHP
79 lines
1.7 KiB
PHP
<?php
|
|
/**
|
|
*
|
|
* @filesource svg.php
|
|
* @created 21.12.2017
|
|
* @author Smiley <smiley@chillerlan.net>
|
|
* @copyright 2017 Smiley
|
|
* @license MIT
|
|
*/
|
|
|
|
namespace chillerlan\QRCodeExamples;
|
|
|
|
use chillerlan\QRCode\{QRCode, QROptions};
|
|
|
|
require_once __DIR__.'/../vendor/autoload.php';
|
|
|
|
$data = 'https://www.youtube.com/watch?v=DLzxrzFCyOs&t=43s';
|
|
$gzip = true;
|
|
|
|
$options = new QROptions([
|
|
'version' => 7,
|
|
'outputType' => QRCode::OUTPUT_MARKUP_SVG,
|
|
'imageBase64' => false,
|
|
'eccLevel' => QRCode::ECC_L,
|
|
'svgViewBoxSize' => 530,
|
|
'addQuietzone' => true,
|
|
'cssClass' => 'my-css-class',
|
|
'svgOpacity' => 1.0,
|
|
'svgDefs' => '
|
|
<linearGradient id="g2">
|
|
<stop offset="0%" stop-color="#39F" />
|
|
<stop offset="100%" stop-color="#F3F" />
|
|
</linearGradient>
|
|
<linearGradient id="g1">
|
|
<stop offset="0%" stop-color="#F3F" />
|
|
<stop offset="100%" stop-color="#39F" />
|
|
</linearGradient>
|
|
<style>rect{shape-rendering:crispEdges}</style>',
|
|
'moduleValues' => [
|
|
// finder
|
|
1536 => 'url(#g1)', // dark (true)
|
|
6 => '#fff', // light (false)
|
|
// alignment
|
|
2560 => 'url(#g1)',
|
|
10 => '#fff',
|
|
// timing
|
|
3072 => 'url(#g1)',
|
|
12 => '#fff',
|
|
// format
|
|
3584 => 'url(#g1)',
|
|
14 => '#fff',
|
|
// version
|
|
4096 => 'url(#g1)',
|
|
16 => '#fff',
|
|
// data
|
|
1024 => 'url(#g2)',
|
|
4 => '#fff',
|
|
// darkmodule
|
|
512 => 'url(#g1)',
|
|
// separator
|
|
8 => '#fff',
|
|
// quietzone
|
|
18 => '#fff',
|
|
],
|
|
]);
|
|
|
|
$qrcode = (new QRCode($options))->render($data);
|
|
|
|
header('Content-type: image/svg+xml');
|
|
|
|
if($gzip === true){
|
|
header('Vary: Accept-Encoding');
|
|
header('Content-Encoding: gzip');
|
|
$qrcode = gzencode($qrcode ,9);
|
|
}
|
|
echo $qrcode;
|
|
|
|
|