From 55097c47c5534d4453f7494f8a1542f7beb4d588 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 14 Mar 2024 10:13:22 +0000 Subject: Revert "composer update and use the fixed streams php-jcs library until the floats issue will be fixed upstream. see here for reference https://codeberg.org/streams/streams/issues/151" This reverts commit 6bf61dfa6b585db01b607a79bd64ec9c583a9c10. --- .../php-qrcode/src/Data/MaskPatternTester.php | 18 ++--- .../php-qrcode/src/Data/QRDataInterface.php | 10 +-- vendor/chillerlan/php-qrcode/src/Data/QRMatrix.php | 77 ++++++---------------- .../php-qrcode/src/Helpers/Polynomial.php | 4 +- .../chillerlan/php-qrcode/src/Output/QRMarkup.php | 8 +-- .../php-qrcode/src/Output/QROutputAbstract.php | 3 +- .../php-qrcode/src/Output/QROutputInterface.php | 45 ++++++------- vendor/chillerlan/php-qrcode/src/QRCode.php | 8 +-- .../chillerlan/php-qrcode/src/QROptionsTrait.php | 4 +- 9 files changed, 66 insertions(+), 111 deletions(-) (limited to 'vendor/chillerlan/php-qrcode/src') diff --git a/vendor/chillerlan/php-qrcode/src/Data/MaskPatternTester.php b/vendor/chillerlan/php-qrcode/src/Data/MaskPatternTester.php index 959892b9b..7874cb53d 100644 --- a/vendor/chillerlan/php-qrcode/src/Data/MaskPatternTester.php +++ b/vendor/chillerlan/php-qrcode/src/Data/MaskPatternTester.php @@ -130,7 +130,7 @@ final class MaskPatternTester{ } if( - $val === $row[$x + 1] + $val === $m[$y][$x + 1] && $val === $m[$y + 1][$x] && $val === $m[$y + 1][$x + 1] ){ @@ -154,12 +154,12 @@ final class MaskPatternTester{ if( $x + 6 < $size && $val - && !$row[$x + 1] - && $row[$x + 2] - && $row[$x + 3] - && $row[$x + 4] - && !$row[$x + 5] - && $row[$x + 6] + && !$m[$y][$x + 1] + && $m[$y][$x + 2] + && $m[$y][$x + 3] + && $m[$y][$x + 4] + && !$m[$y][$x + 5] + && $m[$y][$x + 6] ){ $penalties++; } @@ -189,8 +189,8 @@ final class MaskPatternTester{ protected function testLevel4(array $m, int $size):float{ $count = 0; - foreach($m as $row){ - foreach($row as $val){ + foreach($m as $y => $row){ + foreach($row as $x => $val){ if($val){ $count++; } diff --git a/vendor/chillerlan/php-qrcode/src/Data/QRDataInterface.php b/vendor/chillerlan/php-qrcode/src/Data/QRDataInterface.php index c6cd92372..93ad6221d 100644 --- a/vendor/chillerlan/php-qrcode/src/Data/QRDataInterface.php +++ b/vendor/chillerlan/php-qrcode/src/Data/QRDataInterface.php @@ -21,7 +21,7 @@ interface QRDataInterface{ /** * @var int[] */ - public const CHAR_MAP_NUMBER = [ + const CHAR_MAP_NUMBER = [ '0' => 0, '1' => 1, '2' => 2, '3' => 3, '4' => 4, '5' => 5, '6' => 6, '7' => 7, '8' => 8, '9' => 9, ]; @@ -30,7 +30,7 @@ interface QRDataInterface{ * * @var int[] */ - public const CHAR_MAP_ALPHANUM = [ + const CHAR_MAP_ALPHANUM = [ '0' => 0, '1' => 1, '2' => 2, '3' => 3, '4' => 4, '5' => 5, '6' => 6, '7' => 7, '8' => 8, '9' => 9, 'A' => 10, 'B' => 11, 'C' => 12, 'D' => 13, 'E' => 14, 'F' => 15, 'G' => 16, 'H' => 17, 'I' => 18, 'J' => 19, 'K' => 20, 'L' => 21, 'M' => 22, 'N' => 23, @@ -46,7 +46,7 @@ interface QRDataInterface{ * * @var int [][][] */ - public const MAX_LENGTH =[ + const MAX_LENGTH =[ // v => [NUMERIC => [L, M, Q, H ], ALPHANUM => [L, M, Q, H], BINARY => [L, M, Q, H ], KANJI => [L, M, Q, H ]] // modules 1 => [[ 41, 34, 27, 17], [ 25, 20, 16, 10], [ 17, 14, 11, 7], [ 10, 8, 7, 4]], // 21 2 => [[ 77, 63, 48, 34], [ 47, 38, 29, 20], [ 32, 26, 20, 14], [ 20, 16, 12, 8]], // 25 @@ -95,7 +95,7 @@ interface QRDataInterface{ * * @var int [][] */ - public const MAX_BITS = [ + const MAX_BITS = [ // version => [L, M, Q, H ] 1 => [ 152, 128, 104, 72], 2 => [ 272, 224, 176, 128], @@ -144,7 +144,7 @@ interface QRDataInterface{ * * @var int [][][] */ - public const RSBLOCKS = [ + const RSBLOCKS = [ 1 => [[ 1, 0, 26, 19], [ 1, 0, 26, 16], [ 1, 0, 26, 13], [ 1, 0, 26, 9]], 2 => [[ 1, 0, 44, 34], [ 1, 0, 44, 28], [ 1, 0, 44, 22], [ 1, 0, 44, 16]], 3 => [[ 1, 0, 70, 55], [ 1, 0, 70, 44], [ 2, 0, 35, 17], [ 2, 0, 35, 13]], diff --git a/vendor/chillerlan/php-qrcode/src/Data/QRMatrix.php b/vendor/chillerlan/php-qrcode/src/Data/QRMatrix.php index 9212a609f..05c8b9069 100755 --- a/vendor/chillerlan/php-qrcode/src/Data/QRMatrix.php +++ b/vendor/chillerlan/php-qrcode/src/Data/QRMatrix.php @@ -25,71 +25,32 @@ use function array_fill, array_key_exists, array_push, array_unshift, count, flo */ final class QRMatrix{ - /* - * special values - */ - - /** @var int */ - public const M_NULL = 0x00; - /** @var int */ - public const M_LOGO = 0x14; - /** @var int */ - public const M_LOGO_DARK = self::M_LOGO << 8; - - /* - * light values - */ - - /** @var int */ - public const M_DATA = 0x04; - /** @var int */ - public const M_FINDER = 0x06; - /** @var int */ - public const M_SEPARATOR = 0x08; - /** @var int */ - public const M_ALIGNMENT = 0x0a; /** @var int */ - public const M_TIMING = 0x0c; + public const M_NULL = 0x00; /** @var int */ - public const M_FORMAT = 0x0e; + public const M_DARKMODULE = 0x02; /** @var int */ - public const M_VERSION = 0x10; + public const M_DATA = 0x04; /** @var int */ - public const M_QUIETZONE = 0x12; - - /* - * dark values - */ - - /** @var int */ - public const M_DARKMODULE = self::M_DARKMODULE_LIGHT << 8; - /** @var int */ - public const M_DATA_DARK = self::M_DATA << 8; - /** @var int */ - public const M_FINDER_DARK = self::M_FINDER << 8; + public const M_FINDER = 0x06; /** @var int */ - public const M_ALIGNMENT_DARK = self::M_ALIGNMENT << 8; + public const M_SEPARATOR = 0x08; /** @var int */ - public const M_TIMING_DARK = self::M_TIMING << 8; + public const M_ALIGNMENT = 0x0a; /** @var int */ - public const M_FORMAT_DARK = self::M_FORMAT << 8; + public const M_TIMING = 0x0c; /** @var int */ - public const M_VERSION_DARK = self::M_VERSION << 8; + public const M_FORMAT = 0x0e; /** @var int */ - public const M_FINDER_DOT = self::M_FINDER_DOT_LIGHT << 8; - - /* - * values used for reversed reflectance - */ - + public const M_VERSION = 0x10; /** @var int */ - public const M_DARKMODULE_LIGHT = 0x02; + public const M_QUIETZONE = 0x12; /** @var int */ - public const M_FINDER_DOT_LIGHT = 0x16; + public const M_LOGO = 0x14; /** @var int */ - public const M_SEPARATOR_DARK = self::M_SEPARATOR << 8; + public const M_FINDER_DOT = 0x16; /** @var int */ - public const M_QUIETZONE_DARK = self::M_QUIETZONE << 8; + public const M_TEST = 0xff; /** * ISO/IEC 18004:2000 Annex E, Table E.1 - Row/column coordinates of center module of Alignment Patterns @@ -389,7 +350,7 @@ final class QRMatrix{ * Sets the "dark module", that is always on the same position 1x1px away from the bottom left finder */ public function setDarkModule():QRMatrix{ - $this->set(8, 4 * $this->version + 9, true, $this::M_DARKMODULE_LIGHT); + $this->set(8, 4 * $this->version + 9, true, $this::M_DARKMODULE); return $this; } @@ -403,8 +364,8 @@ final class QRMatrix{ $pos = [ [0, 0], // top left - [$this->moduleCount - 7, 0], // top right - [0, $this->moduleCount - 7], // bottom left + [$this->moduleCount - 7, 0], // bottom left + [0, $this->moduleCount - 7], // top right ]; foreach($pos as $c){ @@ -420,7 +381,7 @@ final class QRMatrix{ } // 3*3 dot else{ - $this->set($c[0] + $y, $c[1] + $x, true, $this::M_FINDER_DOT_LIGHT); + $this->set($c[0] + $y, $c[1] + $x, true, $this::M_FINDER_DOT); } } } @@ -663,8 +624,8 @@ final class QRMatrix{ $startY = ($startY !== null ? $startY : ($length - $height) / 2) + $qz; // clear the space - for($y = 0; $y < $this->moduleCount; $y++){ - for($x = 0; $x < $this->moduleCount; $x++){ + foreach($this->matrix as $y => $row){ + foreach($row as $x => $val){ // out of bounds, skip if($x < $start || $y < $start ||$x >= $end || $y >= $end){ continue; diff --git a/vendor/chillerlan/php-qrcode/src/Helpers/Polynomial.php b/vendor/chillerlan/php-qrcode/src/Helpers/Polynomial.php index 1385422fd..c42e0831c 100644 --- a/vendor/chillerlan/php-qrcode/src/Helpers/Polynomial.php +++ b/vendor/chillerlan/php-qrcode/src/Helpers/Polynomial.php @@ -157,7 +157,7 @@ final class Polynomial{ throw new QRCodeException(sprintf('log(%s)', $n)); } - return self::table[$n][1]; + return Polynomial::table[$n][1]; } /** @@ -172,7 +172,7 @@ final class Polynomial{ $n -= 255; } - return self::table[$n][0]; + return Polynomial::table[$n][0]; } } diff --git a/vendor/chillerlan/php-qrcode/src/Output/QRMarkup.php b/vendor/chillerlan/php-qrcode/src/Output/QRMarkup.php index 53120ec6f..06d6e88cb 100644 --- a/vendor/chillerlan/php-qrcode/src/Output/QRMarkup.php +++ b/vendor/chillerlan/php-qrcode/src/Output/QRMarkup.php @@ -74,11 +74,9 @@ class QRMarkup extends QROutputAbstract{ $html .= ''.$this->options->eol; if($file !== null){ - /** @noinspection HtmlRequiredLangAttribute */ - return sprintf( - 'QR Code%s', - $this->options->eol.$html - ); + return ''. + 'QR Code'. + ''.$this->options->eol.$html.''; } return $html; diff --git a/vendor/chillerlan/php-qrcode/src/Output/QROutputAbstract.php b/vendor/chillerlan/php-qrcode/src/Output/QROutputAbstract.php index 6165e1cc7..d4ed3d0c9 100644 --- a/vendor/chillerlan/php-qrcode/src/Output/QROutputAbstract.php +++ b/vendor/chillerlan/php-qrcode/src/Output/QROutputAbstract.php @@ -12,8 +12,7 @@ namespace chillerlan\QRCode\Output; -use chillerlan\QRCode\QRCode; -use chillerlan\QRCode\Data\QRMatrix; +use chillerlan\QRCode\{Data\QRMatrix, QRCode}; use chillerlan\Settings\SettingsContainerInterface; use function call_user_func_array, dirname, file_put_contents, get_called_class, in_array, is_writable, sprintf; diff --git a/vendor/chillerlan/php-qrcode/src/Output/QROutputInterface.php b/vendor/chillerlan/php-qrcode/src/Output/QROutputInterface.php index b492c27a1..b07b8e7a5 100644 --- a/vendor/chillerlan/php-qrcode/src/Output/QROutputInterface.php +++ b/vendor/chillerlan/php-qrcode/src/Output/QROutputInterface.php @@ -19,32 +19,29 @@ use chillerlan\QRCode\Data\QRMatrix; */ interface QROutputInterface{ - public const DEFAULT_MODULE_VALUES = [ + const DEFAULT_MODULE_VALUES = [ // light - QRMatrix::M_NULL => false, - QRMatrix::M_DARKMODULE_LIGHT => false, - QRMatrix::M_DATA => false, - QRMatrix::M_FINDER => false, - QRMatrix::M_SEPARATOR => false, - QRMatrix::M_ALIGNMENT => false, - QRMatrix::M_TIMING => false, - QRMatrix::M_FORMAT => false, - QRMatrix::M_VERSION => false, - QRMatrix::M_QUIETZONE => false, - QRMatrix::M_LOGO => false, - QRMatrix::M_FINDER_DOT_LIGHT => false, + QRMatrix::M_NULL => false, // 0 + QRMatrix::M_DATA => false, // 4 + QRMatrix::M_FINDER => false, // 6 + QRMatrix::M_SEPARATOR => false, // 8 + QRMatrix::M_ALIGNMENT => false, // 10 + QRMatrix::M_TIMING => false, // 12 + QRMatrix::M_FORMAT => false, // 14 + QRMatrix::M_VERSION => false, // 16 + QRMatrix::M_QUIETZONE => false, // 18 + QRMatrix::M_LOGO => false, // 20 + QRMatrix::M_TEST => false, // 255 // dark - QRMatrix::M_DARKMODULE => true, - QRMatrix::M_DATA_DARK => true, - QRMatrix::M_FINDER_DARK => true, - QRMatrix::M_SEPARATOR_DARK => true, - QRMatrix::M_ALIGNMENT_DARK => true, - QRMatrix::M_TIMING_DARK => true, - QRMatrix::M_FORMAT_DARK => true, - QRMatrix::M_VERSION_DARK => true, - QRMatrix::M_QUIETZONE_DARK => true, - QRMatrix::M_LOGO_DARK => true, - QRMatrix::M_FINDER_DOT => true, + QRMatrix::M_DARKMODULE << 8 => true, // 512 + QRMatrix::M_DATA << 8 => true, // 1024 + QRMatrix::M_FINDER << 8 => true, // 1536 + QRMatrix::M_ALIGNMENT << 8 => true, // 2560 + QRMatrix::M_TIMING << 8 => true, // 3072 + QRMatrix::M_FORMAT << 8 => true, // 3584 + QRMatrix::M_VERSION << 8 => true, // 4096 + QRMatrix::M_FINDER_DOT << 8 => true, // 5632 + QRMatrix::M_TEST << 8 => true, // 65280 ]; /** diff --git a/vendor/chillerlan/php-qrcode/src/QRCode.php b/vendor/chillerlan/php-qrcode/src/QRCode.php index c45b8b573..908030feb 100755 --- a/vendor/chillerlan/php-qrcode/src/QRCode.php +++ b/vendor/chillerlan/php-qrcode/src/QRCode.php @@ -117,23 +117,23 @@ class QRCode{ * @var string[][] */ public const OUTPUT_MODES = [ - QRMarkup::class => [ + QRMarkup::class => [ self::OUTPUT_MARKUP_SVG, self::OUTPUT_MARKUP_HTML, ], - QRImage::class => [ + QRImage::class => [ self::OUTPUT_IMAGE_PNG, self::OUTPUT_IMAGE_GIF, self::OUTPUT_IMAGE_JPG, ], - QRString::class => [ + QRString::class => [ self::OUTPUT_STRING_JSON, self::OUTPUT_STRING_TEXT, ], QRImagick::class => [ self::OUTPUT_IMAGICK, ], - QRFpdf::class => [ + QRFpdf::class => [ self::OUTPUT_FPDF ] ]; diff --git a/vendor/chillerlan/php-qrcode/src/QROptionsTrait.php b/vendor/chillerlan/php-qrcode/src/QROptionsTrait.php index 13dfba136..74c384b13 100644 --- a/vendor/chillerlan/php-qrcode/src/QROptionsTrait.php +++ b/vendor/chillerlan/php-qrcode/src/QROptionsTrait.php @@ -140,12 +140,12 @@ trait QROptionsTrait{ /** * string substitute for dark */ - protected string $textDark = '██'; + protected string $textDark = '🔴'; /** * string substitute for light */ - protected string $textLight = '░░'; + protected string $textLight = '⭕'; /** * markup substitute for dark (CSS value) -- cgit v1.2.3