codemasher 7 лет назад
Родитель
Сommit
2f6d079c69
2 измененных файлов с 7 добавлено и 7 удалено
  1. 4 4
      src/Data/QRDataInterface.php
  2. 3 3
      src/Data/QRMatrix.php

+ 4 - 4
src/Data/QRDataInterface.php

@@ -20,8 +20,8 @@ interface QRDataInterface{
 	/**
 	/**
 	 * @link http://www.qrcode.com/en/about/version.html
 	 * @link http://www.qrcode.com/en/about/version.html
 	 */
 	 */
-	const MAX_LENGTH =[ 1 => // start at 1
-	//  [NUMERIC => [L, M, Q, H ], ALPHANUM => [L, M, Q, H], BINARY => [L, M, Q, H  ], KANJI => [L, M, Q, H   ]]  // modules
+	const MAX_LENGTH =[ null, // start at 1
+	//	[NUMERIC => [L, M, Q, H ], ALPHANUM => [L, M, Q, H], BINARY => [L, M, Q, H  ], KANJI => [L, M, Q, H   ]]  // modules
 		[[  41,   34,   27,   17], [  25,   20,   16,   10], [  17,   14,   11,    7], [  10,    8,    7,    4]], //  21
 		[[  41,   34,   27,   17], [  25,   20,   16,   10], [  17,   14,   11,    7], [  10,    8,    7,    4]], //  21
 		[[  77,   63,   48,   34], [  47,   38,   29,   20], [  32,   26,   20,   14], [  20,   16,   12,    8]], //  25
 		[[  77,   63,   48,   34], [  47,   38,   29,   20], [  32,   26,   20,   14], [  20,   16,   12,    8]], //  25
 		[[ 127,  101,   77,   58], [  77,   61,   47,   35], [  53,   42,   32,   24], [  32,   26,   20,   15]], //  29
 		[[ 127,  101,   77,   58], [  77,   61,   47,   35], [  53,   42,   32,   24], [  32,   26,   20,   15]], //  29
@@ -64,7 +64,7 @@ interface QRDataInterface{
 		[[7089, 5596, 3993, 3057], [4296, 3391, 2420, 1852], [2953, 2331, 1663, 1273], [1817, 1435, 1024,  784]], // 177
 		[[7089, 5596, 3993, 3057], [4296, 3391, 2420, 1852], [2953, 2331, 1663, 1273], [1817, 1435, 1024,  784]], // 177
 	];
 	];
 
 
-	const MAX_BITS = [ 1 => // start at 1
+	const MAX_BITS = [ null, // start at 1
 		// MAX_BITS => [L, M, Q, H ]
 		// MAX_BITS => [L, M, Q, H ]
 		[  152,   128,   104,    72],
 		[  152,   128,   104,    72],
 		[  272,   224,   176,   128],
 		[  272,   224,   176,   128],
@@ -111,7 +111,7 @@ interface QRDataInterface{
 	/**
 	/**
 	 * @link http://www.thonky.com/qr-code-tutorial/error-correction-table
 	 * @link http://www.thonky.com/qr-code-tutorial/error-correction-table
 	 */
 	 */
-	const RSBLOCKS = [ 1 => // start at 1
+	const RSBLOCKS = [ null, // start at 1
 		[[ 1,  0,  26,  19], [ 1,  0, 26, 16], [ 1,  0, 26, 13], [ 1,  0, 26,  9]], //  1
 		[[ 1,  0,  26,  19], [ 1,  0, 26, 16], [ 1,  0, 26, 13], [ 1,  0, 26,  9]], //  1
 		[[ 1,  0,  44,  34], [ 1,  0, 44, 28], [ 1,  0, 44, 22], [ 1,  0, 44, 16]], //
 		[[ 1,  0,  44,  34], [ 1,  0, 44, 28], [ 1,  0, 44, 22], [ 1,  0, 44, 16]], //
 		[[ 1,  0,  70,  55], [ 1,  0, 70, 44], [ 2,  0, 35, 17], [ 2,  0, 35, 13]], //
 		[[ 1,  0,  70,  55], [ 1,  0, 70, 44], [ 2,  0, 35, 17], [ 2,  0, 35, 13]], //

+ 3 - 3
src/Data/QRMatrix.php

@@ -36,7 +36,7 @@ class QRMatrix{
 	/**
 	/**
 	 * @link http://www.thonky.com/qr-code-tutorial/alignment-pattern-locations
 	 * @link http://www.thonky.com/qr-code-tutorial/alignment-pattern-locations
 	 */
 	 */
-	const alignmentPattern = [ 1 => // start at 1
+	const alignmentPattern = [ null, // start at 1
 		[],
 		[],
 		[6, 18],
 		[6, 18],
 		[6, 22],
 		[6, 22],
@@ -82,8 +82,8 @@ class QRMatrix{
 	/**
 	/**
 	 * @link http://www.thonky.com/qr-code-tutorial/format-version-tables
 	 * @link http://www.thonky.com/qr-code-tutorial/format-version-tables
 	 */
 	 */
-	const versionPattern = [ 7  => // no version pattern for QR Codes < 7
-		0x07c94, 0x085bc, 0x09a99, 0x0a4d3, // 7-10
+	const versionPattern = [ // no version pattern for QR Codes < 7
+		null   , null   , null   , null   , null   , null   , 0x07c94, 0x085bc, 0x09a99, 0x0a4d3,
 		0x0bbf6, 0x0c762, 0x0d847, 0x0e60d, 0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6,
 		0x0bbf6, 0x0c762, 0x0d847, 0x0e60d, 0x0f928, 0x10b78, 0x1145d, 0x12a17, 0x13532, 0x149a6,
 		0x15683, 0x168c9, 0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75,
 		0x15683, 0x168c9, 0x177ec, 0x18ec4, 0x191e1, 0x1afab, 0x1b08e, 0x1cc1a, 0x1d33f, 0x1ed75,
 		0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64, 0x27541, 0x28c69,
 		0x1f250, 0x209d5, 0x216f0, 0x228ba, 0x2379f, 0x24b0b, 0x2542e, 0x26a64, 0x27541, 0x28c69,