From 4b6161892000cb2b8392dce92a9cf2cabdf2d20e Mon Sep 17 00:00:00 2001
From: Chih-Hsuan Yen <yan12125@gmail.com>
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
---
 .../chillerlan/php-qrcode/tests/QRTestAbstract.php | 72 ----------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 vendor/chillerlan/php-qrcode/tests/QRTestAbstract.php

(limited to 'vendor/chillerlan/php-qrcode/tests/QRTestAbstract.php')

diff --git a/vendor/chillerlan/php-qrcode/tests/QRTestAbstract.php b/vendor/chillerlan/php-qrcode/tests/QRTestAbstract.php
deleted file mode 100644
index 7b9eb8049..000000000
--- a/vendor/chillerlan/php-qrcode/tests/QRTestAbstract.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * Class QRTestAbstract
- *
- * @filesource   QRTestAbstract.php
- * @created      17.11.2017
- * @package      chillerlan\QRCodeTest
- * @author       Smiley <smiley@chillerlan.net>
- * @copyright    2017 Smiley
- * @license      MIT
- */
-
-namespace chillerlan\QRCodeTest;
-
-use PHPUnit\Framework\TestCase;
-use ReflectionClass, ReflectionMethod, ReflectionProperty;
-
-abstract class QRTestAbstract extends TestCase{
-
-	/**
-	 * @var \ReflectionClass
-	 */
-	protected $reflection;
-
-	/**
-	 * @var string
-	 */
-	protected $FQCN;
-
-	protected function setUp():void{
-		$this->reflection = new ReflectionClass($this->FQCN);
-	}
-
-	/**
-	 * @param string $method
-	 *
-	 * @return \ReflectionMethod
-	 */
-	protected function getMethod(string $method):ReflectionMethod {
-		$method = $this->reflection->getMethod($method);
-		$method->setAccessible(true);
-
-		return $method;
-	}
-
-	/**
-	 * @param string $property
-	 *
-	 * @return \ReflectionProperty
-	 */
-	protected function getProperty(string $property):ReflectionProperty{
-		$property = $this->reflection->getProperty($property);
-		$property->setAccessible(true);
-
-		return $property;
-	}
-
-	/**
-	 * @param        $object
-	 * @param string $property
-	 * @param        $value
-	 *
-	 * @return void
-	 */
-	protected function setProperty($object, string $property, $value){
-		$property = $this->getProperty($property);
-		$property->setAccessible(true);
-		$property->setValue($object, $value);
-	}
-
-
-}
-- 
cgit v1.2.3-54-g00ecf