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

vendor/chillerlan/php-qrcode/tests/Data/AlphaNumTest.php

@@ -12,13 +12,19 @@
 
 namespace chillerlan\QRCodeTest\Data;
 
-use chillerlan\QRCode\Data\{AlphaNum, QRCodeDataException};
+use chillerlan\QRCode\Data\{AlphaNum, QRCodeDataException, QRDataInterface};
+use chillerlan\QRCode\QROptions;
 
-class AlphaNumTest extends DatainterfaceTestAbstract{
+/**
+ * Tests the AlphaNum class
+ */
+final class AlphaNumTest extends DatainterfaceTestAbstract{
 
-	protected $FQCN = AlphaNum::class;
-	protected $testdata  = '0 $%*+-./:';
-	protected $expected  = [
+	/** @internal */
+	protected string $testdata  = '0 $%*+-./:';
+
+	/** @internal */
+	protected array  $expected  = [
 		32, 80, 36, 212, 252, 15, 175, 251,
 		176, 236, 17, 236, 17, 236, 17, 236,
 		17, 236, 17, 236, 17, 236, 17, 236,
@@ -34,7 +40,18 @@ class AlphaNumTest extends DatainterfaceTestAbstract{
 		92, 112, 20, 198, 27
 	];
 
-	public function testGetCharCodeException(){
+	/**
+	 * @inheritDoc
+	 * @internal
+	 */
+	protected function getDataInterfaceInstance(QROptions $options):QRDataInterface{
+		return new AlphaNum($options);
+	}
+
+	/**
+	 * Tests if an exception is thrown when an invalid character is encountered
+	 */
+	public function testGetCharCodeException():void{
 		$this->expectException(QRCodeDataException::class);
 		$this->expectExceptionMessage('illegal char: "#" [35]');
 

vendor/chillerlan/php-qrcode/tests/Data/ByteTest.php

@@ -13,12 +13,19 @@
 namespace chillerlan\QRCodeTest\Data;
 
 use chillerlan\QRCode\Data\Byte;
+use chillerlan\QRCode\Data\QRDataInterface;
+use chillerlan\QRCode\QROptions;
 
-class ByteTest extends DatainterfaceTestAbstract{
+/**
+ * Tests the Byte class
+ */
+final class ByteTest extends DatainterfaceTestAbstract{
 
-	protected $FQCN = Byte::class;
-	protected $testdata = '[¯\_(ツ)_/¯]';
-	protected $expected = [
+	/** @internal */
+	protected string $testdata = '[¯\_(ツ)_/¯]';
+
+	/** @internal */
+	protected array  $expected = [
 		64, 245, 188, 42, 245, 197, 242, 142,
 		56, 56, 66, 149, 242, 252, 42, 245,
 		208, 236, 17, 236, 17, 236, 17, 236,
@@ -34,5 +41,12 @@ class ByteTest extends DatainterfaceTestAbstract{
 		21, 47, 250, 101
 	];
 
+	/**
+	 * @inheritDoc
+	 * @internal
+	 */
+	protected function getDataInterfaceInstance(QROptions $options):QRDataInterface{
+		return new Byte($options);
+	}
 
 }

vendor/chillerlan/php-qrcode/tests/Data/DatainterfaceTestAbstract.php

@@ -12,54 +12,116 @@
 
 namespace chillerlan\QRCodeTest\Data;
 
+use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
+use PHPUnit\Framework\TestCase;
 use chillerlan\QRCode\Data\{QRCodeDataException, QRDataInterface, QRMatrix};
-use chillerlan\QRCodeTest\QRTestAbstract;
+use ReflectionClass;
 
-abstract class DatainterfaceTestAbstract extends QRTestAbstract{
+use function str_repeat;
+
+/**
+ * The data interface test abstract
+ */
+abstract class DatainterfaceTestAbstract extends TestCase{
+
+	/** @internal */
+	protected ReflectionClass $reflection;
+	/** @internal */
+	protected QRDataInterface $dataInterface;
+	/** @internal */
+	protected string $testdata;
+	/** @internal */
+	protected array  $expected;
 
 	/**
-	 * @var \chillerlan\QRCode\Data\QRDataAbstract
+	 * @internal
 	 */
-	protected $dataInterface;
-
-	protected $testdata;
-	protected $expected;
-
 	protected function setUp():void{
-		parent::setUp();
-
-		$this->dataInterface = $this->reflection->newInstanceArgs([new QROptions(['version' => 4])]);
+		$this->dataInterface = $this->getDataInterfaceInstance(new QROptions(['version' => 4]));
+		$this->reflection    = new ReflectionClass($this->dataInterface);
 	}
 
-	public function testInstance(){
-		$this->dataInterface = $this->reflection->newInstanceArgs([new QROptions, $this->testdata]);
+	/**
+	 * Returns a data interface instance
+	 *
+	 * @internal
+	 */
+	abstract protected function getDataInterfaceInstance(QROptions $options):QRDataInterface;
 
-		$this->assertInstanceOf(QRDataInterface::class, $this->dataInterface);
+	/**
+	 * Verifies the data interface instance
+	 */
+	public function testInstance():void{
+		$this::assertInstanceOf(QRDataInterface::class, $this->dataInterface);
 	}
 
-	public function testSetData(){
+	/**
+	 * Tests ecc masking and verifies against a sample
+	 */
+	public function testMaskEcc():void{
 		$this->dataInterface->setData($this->testdata);
 
-		$this->assertSame($this->expected, $this->getProperty('matrixdata')->getValue($this->dataInterface));
+		$maskECC = $this->reflection->getMethod('maskECC');
+		$maskECC->setAccessible(true);
+
+		$this::assertSame($this->expected, $maskECC->invoke($this->dataInterface));
 	}
 
-	public function testInitMatrix(){
-		$m = $this->dataInterface->setData($this->testdata)->initMatrix(0);
-
-		$this->assertInstanceOf(QRMatrix::class, $m);
+	/**
+	 * @see testInitMatrix()
+	 * @internal
+	 * @return int[][]
+	 */
+	public function MaskPatternProvider():array{
+		return [[0], [1], [2], [3], [4], [5], [6], [7]];
 	}
 
-	public function testGetMinimumVersion(){
-		$this->assertSame(1, $this->getMethod('getMinimumVersion')->invoke($this->dataInterface));
+	/**
+	 * Tests initializing the data matrix
+	 *
+	 * @dataProvider MaskPatternProvider
+	 */
+	public function testInitMatrix(int $maskPattern):void{
+		$this->dataInterface->setData($this->testdata);
+
+		$matrix = $this->dataInterface->initMatrix($maskPattern);
+
+		$this::assertInstanceOf(QRMatrix::class, $matrix);
+		$this::assertSame($maskPattern, $matrix->maskPattern());
 	}
 
-	public function testGetMinimumVersionException(){
+	/**
+	 * Tests getting the minimum QR version for the given data
+	 */
+	public function testGetMinimumVersion():void{
+		$this->dataInterface->setData($this->testdata);
+
+		$getMinimumVersion = $this->reflection->getMethod('getMinimumVersion');
+		$getMinimumVersion->setAccessible(true);
+
+		$this::assertSame(1, $getMinimumVersion->invoke($this->dataInterface));
+	}
+
+	/**
+	 * Tests if an exception is thrown when the data exceeds the maximum version while auto detecting
+	 */
+	public function testGetMinimumVersionException():void{
 		$this->expectException(QRCodeDataException::class);
 		$this->expectExceptionMessage('data exceeds');
 
-		$this->getProperty('strlen')->setValue($this->dataInterface, 13370);
-		$this->getMethod('getMinimumVersion')->invoke($this->dataInterface);
+		$this->dataInterface = $this->getDataInterfaceInstance(new QROptions(['version' => QRCode::VERSION_AUTO]));
+		$this->dataInterface->setData(str_repeat($this->testdata, 1337));
+	}
+
+	/**
+	 * Tests if an exception is thrown on data overflow
+	 */
+	public function testCodeLengthOverflowException():void{
+		$this->expectException(QRCodeDataException::class);
+		$this->expectExceptionMessage('code length overflow');
+
+		$this->dataInterface->setData(str_repeat($this->testdata, 1337));
 	}
 
 }

vendor/chillerlan/php-qrcode/tests/Data/KanjiTest.php

@@ -12,13 +12,19 @@
 
 namespace chillerlan\QRCodeTest\Data;
 
-use chillerlan\QRCode\Data\{Kanji, QRCodeDataException};
+use chillerlan\QRCode\QROptions;
+use chillerlan\QRCode\Data\{Kanji, QRCodeDataException, QRDataInterface};
 
-class KanjiTest extends DatainterfaceTestAbstract{
+/**
+ * Tests the Kanji class
+ */
+final class KanjiTest extends DatainterfaceTestAbstract{
 
-	protected $FQCN = Kanji::class;
-	protected $testdata = '茗荷茗荷茗荷茗荷茗荷';
-	protected $expected = [
+	/** @internal */
+	protected string $testdata = '茗荷茗荷茗荷茗荷茗荷';
+
+	/** @internal */
+	protected array  $expected = [
 		128, 173, 85, 26, 95, 85, 70, 151,
 		213, 81, 165, 245, 84, 105, 125, 85,
 		26, 92, 0, 236, 17, 236, 17, 236,
@@ -34,17 +40,32 @@ class KanjiTest extends DatainterfaceTestAbstract{
 		96, 113, 54, 191
 	];
 
-	public function testIllegalCharException1(){
+	/**
+	 * @inheritDoc
+	 * @internal
+	 */
+	protected function getDataInterfaceInstance(QROptions $options):QRDataInterface{
+		return new Kanji($options);
+	}
+
+	/**
+	 * Tests if an exception is thrown when an invalid character is encountered
+	 */
+	public function testIllegalCharException1():void{
 		$this->expectException(QRCodeDataException::class);
 		$this->expectExceptionMessage('illegal char at 1 [16191]');
 
 		$this->dataInterface->setData('ÃÃ');
 	}
 
-	public function testIllegalCharException2(){
+	/**
+	 * Tests if an exception is thrown when an invalid character is encountered
+	 */
+	public function testIllegalCharException2():void{
 		$this->expectException(QRCodeDataException::class);
 		$this->expectExceptionMessage('illegal char at 1');
 
 		$this->dataInterface->setData('Ã');
 	}
+
 }

vendor/chillerlan/php-qrcode/tests/Data/MaskPatternTesterTest.php

@@ -12,18 +12,31 @@
 
 namespace chillerlan\QRCodeTest\Data;
 
-use chillerlan\QRCode\{QROptions, Data\Byte, Data\MaskPatternTester};
-use chillerlan\QRCodeTest\QRTestAbstract;
+use chillerlan\QRCode\QROptions;
+use chillerlan\QRCode\Data\{Byte, MaskPatternTester};
+use PHPUnit\Framework\TestCase;
 
-class MaskPatternTesterTest extends QRTestAbstract{
+/**
+ * MaskPatternTester coverage test
+ */
+final class MaskPatternTesterTest extends TestCase{
 
-	protected $FQCN = MaskPatternTester::class;
+	/**
+	 * Tests getting the best mask pattern
+	 */
+	public function testMaskpattern():void{
+		$dataInterface = new Byte(new QROptions(['version' => 10]), 'test');
 
-	// coverage
-	public function testMaskpattern(){
-		$matrix = (new Byte(new QROptions(['version' => 10]), 'test'))->initMatrix(3, true);
+		$this::assertSame(3, (new MaskPatternTester($dataInterface))->getBestMaskPattern());
+	}
 
-		$this->assertSame(4243, (new MaskPatternTester($matrix))->testPattern());
+	/**
+	 * Tests getting the penalty value for a given mask pattern
+	 */
+	public function testMaskpatternID():void{
+		$dataInterface = new Byte(new QROptions(['version' => 10]), 'test');
+
+		$this::assertSame(4243, (new MaskPatternTester($dataInterface))->testPattern(3));
 	}
 
 }

vendor/chillerlan/php-qrcode/tests/Data/NumberTest.php

@@ -12,13 +12,19 @@
 
 namespace chillerlan\QRCodeTest\Data;
 
-use chillerlan\QRCode\Data\{Number, QRCodeDataException};
+use chillerlan\QRCode\QROptions;
+use chillerlan\QRCode\Data\{Number, QRCodeDataException, QRDataInterface};
 
-class NumberTest extends DatainterfaceTestAbstract{
+/**
+ * Tests the Number class
+ */
+final class NumberTest extends DatainterfaceTestAbstract{
 
-	protected $FQCN = Number::class;
-	protected $testdata  = '0123456789';
-	protected $expected = [
+	/** @internal */
+	protected string $testdata  = '0123456789';
+
+	/** @internal */
+	protected array $expected = [
 		16, 40, 12, 86, 106, 105, 0, 236,
 		17, 236, 17, 236, 17, 236, 17, 236,
 		17, 236, 17, 236, 17, 236, 17, 236,
@@ -34,7 +40,18 @@ class NumberTest extends DatainterfaceTestAbstract{
 		89, 63, 168, 151
 	];
 
-	public function testGetCharCodeException(){
+	/**
+	 * @inheritDoc
+	 * @internal
+	 */
+	protected function getDataInterfaceInstance(QROptions $options):QRDataInterface{
+		return new Number($options);
+	}
+
+	/**
+	 * Tests if an exception is thrown when an invalid character is encountered
+	 */
+	public function testGetCharCodeException():void{
 		$this->expectException(QRCodeDataException::class);
 		$this->expectExceptionMessage('illegal char: "#" [35]');
 

vendor/chillerlan/php-qrcode/tests/Data/QRMatrixTest.php

@@ -15,177 +15,294 @@ namespace chillerlan\QRCodeTest\Data;
 use chillerlan\QRCode\QRCode;
 use chillerlan\QRCode\QROptions;
 use chillerlan\QRCode\Data\{QRCodeDataException, QRMatrix};
-use chillerlan\QRCodeTest\QRTestAbstract;
+use PHPUnit\Framework\TestCase;
 use ReflectionClass;
 
-class QRMatrixTest extends QRTestAbstract{
+/**
+ * Tests the QRMatix class
+ */
+final class QRMatrixTest extends TestCase{
 
-	protected $FQCN = QRMatrix::class;
-
-	protected $version = 7;
+	/** @internal */
+	protected const version = 40;
+	/** @internal */
+	protected QRMatrix $matrix;
 
 	/**
-	 * @var \chillerlan\QRCode\Data\QRMatrix
+	 * invokes a QRMatrix object
+	 *
+	 * @internal
 	 */
-	protected $matrix;
-
 	protected function setUp():void{
-		parent::setUp();
-
-		$this->matrix = $this->reflection->newInstanceArgs([$this->version, QRCode::ECC_L]);
+		$this->matrix = $this->getMatrix($this::version);
 	}
 
-	public function testInvalidVersionException(){
+	/**
+	 * shortcut
+	 *
+	 * @internal
+	 */
+	protected function getMatrix(int $version):QRMatrix{
+		return  new QRMatrix($version, QRCode::ECC_L);
+	}
+
+	/**
+	 * Validates the QRMatrix instance
+	 */
+	public function testInstance():void{
+		$this::assertInstanceOf(QRMatrix::class, $this->matrix);
+	}
+
+	/**
+	 * Tests if an exception is thrown when an invalid QR version was given
+	 */
+	public function testInvalidVersionException():void{
 		$this->expectException(QRCodeDataException::class);
 		$this->expectExceptionMessage('invalid QR Code version');
 
-		$this->reflection->newInstanceArgs([42, 0]);
+		$this->matrix = new QRMatrix(42, 0);
 	}
 
-	public function testInvalidEccException(){
+	/**
+	 * Tests if an exception is thrown when an invalid ECC level was given
+	 */
+	public function testInvalidEccException():void{
 		$this->expectException(QRCodeDataException::class);
 		$this->expectExceptionMessage('invalid ecc level');
 
-		$this->reflection->newInstanceArgs([1, 42]);
+		$this->matrix = new QRMatrix(1, 42);
 	}
 
-	public function testInstance(){
-		$this->assertInstanceOf($this->FQCN, $this->matrix);
+	/**
+	 * Tests if size() returns the actual matrix size/count
+	 */
+	public function testSize():void{
+		$this::assertCount($this->matrix->size(), $this->matrix->matrix());
 	}
 
-	public function testSize(){
-		$this->assertCount($this->matrix->size(), $this->matrix->matrix());
+	/**
+	 * Tests if version() returns the current (given) version
+	 */
+	public function testVersion():void{
+		$this::assertSame($this::version, $this->matrix->version());
 	}
 
-	public function testVersion(){
-		$this->assertSame($this->version, $this->matrix->version());
+	/**
+	 * Tests if eccLevel() returns the current (given) ECC level
+	 */
+	public function testECC():void{
+		$this::assertSame(QRCode::ECC_L, $this->matrix->eccLevel());
 	}
 
-	public function testECC(){
-		$this->assertSame(QRCode::ECC_L, $this->matrix->eccLevel());
+	/**
+	 * Tests if maskPattern() returns the current (or default) mask pattern
+	 */
+	public function testMaskPattern():void{
+		$this::assertSame(-1, $this->matrix->maskPattern()); // default
+
+		// @todo: actual mask pattern after mapData()
 	}
 
-	public function testMaskPattern(){
-		$this->assertSame(-1, $this->matrix->maskPattern());
-	}
-
-	public function testGetSetCheck(){
+	/**
+	 * Tests the set(), get() and check() methods
+	 */
+	public function testGetSetCheck():void{
 		$this->matrix->set(10, 10, true, QRMatrix::M_TEST);
-		$this->assertSame(65280, $this->matrix->get(10, 10));
-		$this->assertTrue($this->matrix->check(10, 10));
+		$this::assertSame(65280, $this->matrix->get(10, 10));
+		$this::assertTrue($this->matrix->check(10, 10));
 
 		$this->matrix->set(20, 20, false, QRMatrix::M_TEST);
-		$this->assertSame(255, $this->matrix->get(20, 20));
-		$this->assertFalse($this->matrix->check(20, 20));
+		$this::assertSame(255, $this->matrix->get(20, 20));
+		$this::assertFalse($this->matrix->check(20, 20));
 	}
 
-	public function testSetDarkModule(){
-		$this->matrix->setDarkModule();
+	/**
+	 * Version data provider for several pattern tests
+	 *
+	 * @return int[][]
+	 * @internal
+	 */
+	public function versionProvider():array{
+		$versions = [];
 
-		$this->assertSame(QRMatrix::M_DARKMODULE << 8, $this->matrix->get(8, $this->matrix->size() - 8));
+		for($i = 1; $i <= 40; $i++){
+			$versions[] = [$i];
+		}
+
+		return $versions;
 	}
 
-	public function testSetFinderPattern(){
-		$this->matrix->setFinderPattern();
+	/**
+	 * Tests setting the dark module and verifies its position
+	 *
+	 * @dataProvider versionProvider
+	 */
+	public function testSetDarkModule(int $version):void{
+		$matrix = $this->getMatrix($version)->setDarkModule();
 
-		$this->assertSame(QRMatrix::M_FINDER << 8, $this->matrix->get(0, 0));
-		$this->assertSame(QRMatrix::M_FINDER << 8, $this->matrix->get(0, $this->matrix->size() - 1));
-		$this->assertSame(QRMatrix::M_FINDER << 8, $this->matrix->get($this->matrix->size() - 1, 0));
+		$this::assertSame(QRMatrix::M_DARKMODULE << 8, $matrix->get(8, $matrix->size() - 8));
 	}
 
-	public function testSetSeparators(){
-		$this->matrix->setSeparators();
+	/**
+	 * Tests setting the finder patterns and verifies their positions
+	 *
+	 * @dataProvider versionProvider
+	 */
+	public function testSetFinderPattern(int $version):void{
+		$matrix = $this->getMatrix($version)->setFinderPattern();
 
-		$this->assertSame(QRMatrix::M_SEPARATOR, $this->matrix->get(7, 0));
-		$this->assertSame(QRMatrix::M_SEPARATOR, $this->matrix->get(0, 7));
-		$this->assertSame(QRMatrix::M_SEPARATOR, $this->matrix->get(0, $this->matrix->size() - 8));
-		$this->assertSame(QRMatrix::M_SEPARATOR, $this->matrix->get($this->matrix->size() - 8, 0));
+		$this::assertSame(QRMatrix::M_FINDER << 8, $matrix->get(0, 0));
+		$this::assertSame(QRMatrix::M_FINDER << 8, $matrix->get(0, $matrix->size() - 1));
+		$this::assertSame(QRMatrix::M_FINDER << 8, $matrix->get($matrix->size() - 1, 0));
 	}
 
-	public function testSetAlignmentPattern(){
-		$this->matrix
+	/**
+	 * Tests the separator patterns and verifies their positions
+	 *
+	 * @dataProvider versionProvider
+	 */
+	public function testSetSeparators(int $version):void{
+		$matrix = $this->getMatrix($version)->setSeparators();
+
+		$this::assertSame(QRMatrix::M_SEPARATOR, $matrix->get(7, 0));
+		$this::assertSame(QRMatrix::M_SEPARATOR, $matrix->get(0, 7));
+		$this::assertSame(QRMatrix::M_SEPARATOR, $matrix->get(0, $matrix->size() - 8));
+		$this::assertSame(QRMatrix::M_SEPARATOR, $matrix->get($matrix->size() - 8, 0));
+	}
+
+	/**
+	 * Tests the alignment patterns and verifies their positions - version 1 (no pattern) skipped
+	 *
+	 * @dataProvider versionProvider
+	 */
+	public function testSetAlignmentPattern(int $version):void{
+
+		if($version === 1){
+			$this->markTestSkipped('N/A');
+
+			/** @noinspection PhpUnreachableStatementInspection */
+			return;
+		}
+
+		$matrix = $this
+			->getMatrix($version)
 			->setFinderPattern()
 			->setAlignmentPattern()
 		;
 
-		$alignmentPattern = (new ReflectionClass(QRMatrix::class))->getConstant('alignmentPattern')[$this->version];
+		$alignmentPattern = (new ReflectionClass(QRMatrix::class))->getConstant('alignmentPattern')[$version];
 
 		foreach($alignmentPattern as $py){
 			foreach($alignmentPattern as $px){
 
-				if($this->matrix->get($px, $py) === QRMatrix::M_FINDER << 8){
-					$this->assertSame(QRMatrix::M_FINDER << 8, $this->matrix->get($px, $py), 'skipped finder pattern');
+				if($matrix->get($px, $py) === QRMatrix::M_FINDER << 8){
+					$this::assertSame(QRMatrix::M_FINDER << 8, $matrix->get($px, $py), 'skipped finder pattern');
 					continue;
 				}
 
-				$this->assertSame(QRMatrix::M_ALIGNMENT << 8, $this->matrix->get($px, $py));
+				$this::assertSame(QRMatrix::M_ALIGNMENT << 8, $matrix->get($px, $py));
 			}
 		}
 
 	}
 
-	public function testSetTimingPattern(){
-		$this->matrix
+	/**
+	 * Tests the timing patterns and verifies their positions
+	 *
+	 * @dataProvider versionProvider
+	 */
+	public function testSetTimingPattern(int $version):void{
+
+		$matrix = $this
+			->getMatrix($version)
 			->setAlignmentPattern()
 			->setTimingPattern()
 		;
 
-		$size = $this->matrix->size();
+		$size = $matrix->size();
 
 		for($i = 7; $i < $size - 7; $i++){
 			if($i % 2 === 0){
-				$p1 = $this->matrix->get(6, $i);
+				$p1 = $matrix->get(6, $i);
 
 				if($p1 === QRMatrix::M_ALIGNMENT << 8){
-					$this->assertSame(QRMatrix::M_ALIGNMENT << 8, $p1, 'skipped alignment pattern');
+					$this::assertSame(QRMatrix::M_ALIGNMENT << 8, $p1, 'skipped alignment pattern');
 					continue;
 				}
 
-				$this->assertSame(QRMatrix::M_TIMING << 8, $p1);
-				$this->assertSame(QRMatrix::M_TIMING << 8, $this->matrix->get($i, 6));
+				$this::assertSame(QRMatrix::M_TIMING << 8, $p1);
+				$this::assertSame(QRMatrix::M_TIMING << 8, $matrix->get($i, 6));
 			}
 		}
 	}
 
-	public function testSetVersionNumber(){
-		$this->matrix->setVersionNumber(true);
+	/**
+	 * Tests the version patterns and verifies their positions - version < 7 skipped
+	 *
+	 * @dataProvider versionProvider
+	 */
+	public function testSetVersionNumber(int $version):void{
 
-		$this->assertSame(QRMatrix::M_VERSION, $this->matrix->get($this->matrix->size() - 9, 0));
-		$this->assertSame(QRMatrix::M_VERSION, $this->matrix->get($this->matrix->size() - 11, 5));
-		$this->assertSame(QRMatrix::M_VERSION, $this->matrix->get(0, $this->matrix->size() - 9));
-		$this->assertSame(QRMatrix::M_VERSION, $this->matrix->get(5, $this->matrix->size() - 11));
+		if($version < 7){
+			$this->markTestSkipped('N/A');
+
+			/** @noinspection PhpUnreachableStatementInspection */
+			return;
+		}
+
+		$matrix = $this->getMatrix($version)->setVersionNumber(true);
+
+		$this::assertSame(QRMatrix::M_VERSION, $matrix->get($matrix->size() - 9, 0));
+		$this::assertSame(QRMatrix::M_VERSION, $matrix->get($matrix->size() - 11, 5));
+		$this::assertSame(QRMatrix::M_VERSION, $matrix->get(0, $matrix->size() - 9));
+		$this::assertSame(QRMatrix::M_VERSION, $matrix->get(5, $matrix->size() - 11));
 	}
 
-	public function testSetFormatInfo(){
-		$this->matrix->setFormatInfo(0, true);
+	/**
+	 * Tests the format patterns and verifies their positions
+	 *
+	 * @dataProvider versionProvider
+	 */
+	public function testSetFormatInfo(int $version):void{
+		$matrix = $this->getMatrix($version)->setFormatInfo(0, true);
 
-		$this->assertSame(QRMatrix::M_FORMAT, $this->matrix->get(8, 0));
-		$this->assertSame(QRMatrix::M_FORMAT, $this->matrix->get(0, 8));
-		$this->assertSame(QRMatrix::M_FORMAT, $this->matrix->get($this->matrix->size() - 1, 8));
-		$this->assertSame(QRMatrix::M_FORMAT, $this->matrix->get($this->matrix->size() - 8, 8));
+		$this::assertSame(QRMatrix::M_FORMAT, $matrix->get(8, 0));
+		$this::assertSame(QRMatrix::M_FORMAT, $matrix->get(0, 8));
+		$this::assertSame(QRMatrix::M_FORMAT, $matrix->get($matrix->size() - 1, 8));
+		$this::assertSame(QRMatrix::M_FORMAT, $matrix->get($matrix->size() - 8, 8));
 	}
 
-	public function testSetQuietZone(){
-		$size = $this->matrix->size();
+	/**
+	 * Tests the quiet zone pattern and verifies its position
+	 *
+	 * @dataProvider versionProvider
+	 */
+	public function testSetQuietZone(int $version):void{
+		$matrix = $this->getMatrix($version);
+
+		$size = $matrix->size();
 		$q    = 5;
 
-		$this->matrix->set(0, 0, true, QRMatrix::M_TEST);
-		$this->matrix->set($size - 1, $size - 1, true, QRMatrix::M_TEST);
+		$matrix->set(0, 0, true, QRMatrix::M_TEST);
+		$matrix->set($size - 1, $size - 1, true, QRMatrix::M_TEST);
 
-		$this->matrix->setQuietZone($q);
+		$matrix->setQuietZone($q);
 
-		$this->assertCount($size + 2 * $q, $this->matrix->matrix());
-		$this->assertCount($size + 2 * $q, $this->matrix->matrix()[$size - 1]);
+		$this::assertCount($size + 2 * $q, $matrix->matrix());
+		$this::assertCount($size + 2 * $q, $matrix->matrix()[$size - 1]);
 
-		$size = $this->matrix->size();
-		$this->assertSame(QRMatrix::M_QUIETZONE, $this->matrix->get(0, 0));
-		$this->assertSame(QRMatrix::M_QUIETZONE, $this->matrix->get($size - 1, $size - 1));
+		$size = $matrix->size();
+		$this::assertSame(QRMatrix::M_QUIETZONE, $matrix->get(0, 0));
+		$this::assertSame(QRMatrix::M_QUIETZONE, $matrix->get($size - 1, $size - 1));
 
-		$this->assertSame(QRMatrix::M_TEST << 8, $this->matrix->get($q, $q));
-		$this->assertSame(QRMatrix::M_TEST << 8, $this->matrix->get($size - 1 - $q, $size - 1 - $q));
+		$this::assertSame(QRMatrix::M_TEST << 8, $matrix->get($q, $q));
+		$this::assertSame(QRMatrix::M_TEST << 8, $matrix->get($size - 1 - $q, $size - 1 - $q));
 	}
 
-	public function testSetQuietZoneException(){
+	/**
+	 * Tests if an exception is thrown in an attempt to create it before data was written
+	 */
+	public function testSetQuietZoneException():void{
 		$this->expectException(QRCodeDataException::class);
 		$this->expectExceptionMessage('use only after writing data');