Merge branch 'master' into php-7.4

# Conflicts:
#	.github/workflows/tests.yml
#	src/Data/Kanji.php
#	src/Data/QRDataAbstract.php
#	src/Data/QRDataInterface.php
#	src/Output/QRImage.php
#	src/Output/QRImagick.php
#	src/Output/QRMarkup.php
#	src/Output/QROutputAbstract.php
#	src/Output/QROutputInterface.php
#	src/Output/QRString.php
#	src/QRCode.php
#	src/QROptionsTrait.php
This commit is contained in:
codemasher
2020-02-19 18:21:34 +01:00
16 changed files with 126 additions and 55 deletions
+2 -2
View File
@@ -166,12 +166,12 @@ interface QRDataInterface{
];
/**
*
* Sets the data string (internally called by the constructor)
*/
public function setData(string $data):QRDataInterface;
/**
*
* returns a fresh matrix object with the data written for the given $maskPattern
*/
public function initMatrix(int $maskPattern, bool $test = null):QRMatrix;