Skip to content

Commit 0010382

Browse files
codemashercodemasher
committed
🔧 fixes for #45 
1 parent 39ba997 commit 0010382

File tree

4 files changed

+80
-75
lines changed

4 files changed

+80
-75
lines changed

‎src/Data/MaskPatternTester.php

+49-66
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function testPattern(){
6060
$penalty = 0;
6161

6262
for($level = 1; $level <= 4; $level++){
63-
$penalty += call_user_func([$this, 'testLevel'.$level]);
63+
$penalty += call_user_func_array([$this, 'testLevel'.$level], [$this->matrix->matrix(true)]);
6464
}
6565

6666
return (int)$penalty;
@@ -69,12 +69,12 @@ public function testPattern(){
6969
/**
7070
* Checks for each group of five or more same-colored modules in a row (or column)
7171
*
72-
* @return float
72+
* @return int
7373
*/
74-
protected function testLevel1(){
74+
protected function testLevel1(array $m){
7575
$penalty = 0;
7676

77-
foreach($this->matrix->matrix() as $y => $row){
77+
foreach($m as $y => $row){
7878
foreach($row as $x => $val){
7979
$count = 0;
8080

@@ -86,11 +86,11 @@ protected function testLevel1(){
8686

8787
for($rx = -1; $rx <= 1; $rx++){
8888

89-
if(($ry === 0 && $rx === 0) || ($x + $rx < 0 || $this->moduleCount <= $x + $rx)){
89+
if(($ry === 0 && $rx === 0) || (($x + $rx) < 0 || $this->moduleCount <= ($x + $rx))){
9090
continue;
9191
}
9292

93-
if($this->matrix->check($x + $rx, $y + $ry) === ($val >> 8 > 0)){
93+
if($m[$y + $ry][$x + $rx] === $val){
9494
$count++;
9595
}
9696

@@ -110,107 +110,90 @@ protected function testLevel1(){
110110
/**
111111
* Checks for each 2x2 area of same-colored modules in the matrix
112112
*
113-
* @return float
113+
* @return int
114114
*/
115-
protected function testLevel2(){
115+
protected function testLevel2(array $m){
116116
$penalty = 0;
117117

118-
foreach($this->matrix->matrix() as $y => $row){
118+
foreach($m as $y => $row){
119119

120-
if($y > $this->moduleCount - 2){
120+
if($y > ($this->moduleCount - 2)){
121121
break;
122122
}
123123

124124
foreach($row as $x => $val){
125125

126-
if($x > $this->moduleCount - 2){
126+
if($x > ($this->moduleCount - 2)){
127127
break;
128128
}
129129

130-
$count = 0;
131-
132-
if($val >> 8 > 0){
133-
$count++;
134-
}
135-
136-
if($this->matrix->check($y, $x + 1)){
137-
$count++;
138-
}
139-
140-
if($this->matrix->check($y + 1, $x)){
141-
$count++;
142-
}
143-
144-
if($this->matrix->check($y + 1, $x + 1)){
145-
$count++;
130+
if(
131+
$val === $m[$y][$x + 1]
132+
&& $val === $m[$y + 1][$x]
133+
&& $val === $m[$y + 1][$x + 1]
134+
){
135+
$penalty++;
146136
}
147-
148-
if($count === 0 || $count === 4){
149-
$penalty += 3;
150-
}
151-
152137
}
153138
}
154139

155-
return $penalty;
140+
return 3 * $penalty;
156141
}
157142

158143
/**
159-
* Checks if there are patterns that look similar to the finder patterns
144+
* Checks if there are patterns that look similar to the finder patterns (1:1:3:1:1 ratio)
160145
*
161-
* @return float
146+
* @return int
162147
*/
163-
protected function testLevel3(){
164-
$penalty = 0;
148+
protected function testLevel3(array $m){
149+
$penalties = 0;
165150

166-
foreach($this->matrix->matrix() as $y => $row){
151+
foreach($m as $y => $row){
167152
foreach($row as $x => $val){
168153

169-
if($x <= $this->moduleCount - 7){
170-
if(
171-
$this->matrix->check($x , $y)
172-
&& !$this->matrix->check($x + 1, $y)
173-
&& $this->matrix->check($x + 2, $y)
174-
&& $this->matrix->check($x + 3, $y)
175-
&& $this->matrix->check($x + 4, $y)
176-
&& !$this->matrix->check($x + 5, $y)
177-
&& $this->matrix->check($x + 6, $y)
178-
){
179-
$penalty += 40;
180-
}
154+
if(
155+
($x + 6) < $this->moduleCount
156+
&& $val
157+
&& !$m[$y][$x + 1]
158+
&& $m[$y][$x + 2]
159+
&& $m[$y][$x + 3]
160+
&& $m[$y][$x + 4]
161+
&& !$m[$y][$x + 5]
162+
&& $m[$y][$x + 6]
163+
){
164+
$penalties++;
181165
}
182166

183-
if($y <= $this->moduleCount - 7){
184-
if(
185-
$this->matrix->check($x, $y)
186-
&& !$this->matrix->check($x, $y + 1)
187-
&& $this->matrix->check($x, $y + 2)
188-
&& $this->matrix->check($x, $y + 3)
189-
&& $this->matrix->check($x, $y + 4)
190-
&& !$this->matrix->check($x, $y + 5)
191-
&& $this->matrix->check($x, $y + 6)
192-
){
193-
$penalty += 40;
194-
}
167+
if(
168+
($y + 6) < $this->moduleCount
169+
&& $val
170+
&& !$m[$y + 1][$x]
171+
&& $m[$y + 2][$x]
172+
&& $m[$y + 3][$x]
173+
&& $m[$y + 4][$x]
174+
&& !$m[$y + 5][$x]
175+
&& $m[$y + 6][$x]
176+
){
177+
$penalties++;
195178
}
196179

197180
}
198181
}
199182

200-
return $penalty;
183+
return $penalties * 40;
201184
}
202185

203186
/**
204187
* Checks if more than half of the modules are dark or light, with a larger penalty for a larger difference
205188
*
206189
* @return float
207190
*/
208-
protected function testLevel4() {
191+
protected function testLevel4(array $m) {
209192
$count = 0;
210193

211-
foreach($this->matrix->matrix() as $y => $row){
194+
foreach($m as $y => $row){
212195
foreach($row as $x => $val){
213-
if($val >> 8 > 0){
196+
if($val){
214197
$count++;
215198
}
216199
}

‎src/Data/QRMatrix.php

+28-6
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,29 @@ public function __construct($version, $eclevel){
146146
}
147147

148148
/**
149-
* @return array
149+
* Returns the data matrix, returns a pure boolean representation if $boolean is set to true
150+
*
151+
* @param bool $boolean
152+
*
153+
* @return int[][]|bool[][]
150154
*/
151-
public function matrix() {
152-
return $this->matrix;
155+
public function matrix($boolean = false){
156+
157+
if(!$boolean){
158+
return $this->matrix;
159+
}
160+
161+
$matrix = [];
162+
163+
foreach($this->matrix as $y => $row){
164+
$matrix[$y] = [];
165+
166+
foreach($row as $x => $val){
167+
$matrix[$y][$x] = ($val >> 8) > 0;
168+
}
169+
}
170+
171+
return $matrix;
153172
}
154173

155174
/**
@@ -536,6 +555,9 @@ public function mapData(array $data, $maskPattern){
536555
/**
537556
* ISO/IEC 18004:2000 Section 8.8.1
538557
*
558+
* Note that some versions of the QR code standard have had errors in the section about mask patterns.
559+
* The information below has been corrected. (https://www.thonky.com/qr-code-tutorial/mask-patterns)
560+
*
539561
* @see \chillerlan\QRCode\QRMatrix::mapData()
540562
*
541563
* @internal
@@ -553,10 +575,10 @@ protected function getMask($maskPattern){
553575

554576
return [
555577
0b000 => function($x, $y){ return ($x + $y) % 2; },
556-
0b001 => function($x, $y){ return $x % 2; },
557-
0b010 => function($x, $y){ return $y % 3; },
578+
0b001 => function($x, $y){ return $y % 2; },
579+
0b010 => function($x, $y){ return $x % 3; },
558580
0b011 => function($x, $y){ return ($x + $y) % 3; },
559-
0b100 => function($x, $y){ return ((int)($x / 2) + (int)($y / 3)) % 2; },
581+
0b100 => function($x, $y){ return ((int)($y / 2) + (int)($x / 3)) % 2; },
560582
0b101 => function($x, $y){ return (($x * $y) % 2) + (($x * $y) % 3); },
561583
0b110 => function($x, $y){ return ((($x * $y) % 2) + (($x * $y) % 3)) % 2; },
562584
0b111 => function($x, $y){ return ((($x * $y) % 3) + (($x + $y) % 2)) % 2; },

‎tests/Data/MaskPatternTesterTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ class MaskPatternTesterTest extends QRTestAbstract{
2323

2424
// coverage
2525
public function testMaskpattern(){
26-
$matrix = (new Byte(new QROptions(['version' => 10]), 'test'))->initMatrix(0, true);
26+
$matrix = (new Byte(new QROptions(['version' => 10]), 'test'))->initMatrix(3, true);
2727

28-
$this->assertSame(6178, (new MaskPatternTester)->setMatrix($matrix)->testPattern());
28+
$this->assertSame(4243, (new MaskPatternTester)->setMatrix($matrix)->testPattern());
2929
}
3030

3131

‎tests/QRCodeTest.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public function testCustomOutput(){
109109
'outputInterface' => MyCustomOutput::class,
110110
]);
111111

112-
$expected = '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011111110101011110100001011110011111110000000010000010011111001010011111001010000010000000010111010111000001101011000001010111010000000010111010111010110000011010110010111010000000010111010100110101100000110101010111010000000010000010001101011000001101011010000010000000011111110101010101010101010101011111110000000000000000001010011111001010011000000000000000011110010101111010000101111010100111010000000001110001001011110100001011110110010010000000001100010011111001010011111001011110010000000011010000101000001101011000001011001010000000001101011010010110000011010110100000100000000000001001001110101100000110101101011100000000011100010100101011000001101011001100000000000000001000101100101001111100101111101010000000000111011111010111101000010111101100000000000001111000010000101111010000101101001110000000000100011110001111100101001111101000110000000010001001001101100000110101100110100010000000011100111001001101011000001101111011000000000010110101000000011010110000011011101100000000001111011110000110101100000110100001000000000010111100001111110010100111110100110100000000011001011111100001011110100001011010110000000000100101001101000010111101000000100110000000001011011100010100111110010100110011100000000010010101010011010110000011010000010010000000000111011101100000110101100001111110000000000000000000111011000001101011001000110110000000011111110000110000011010110011010111110000000010000010010010011111001010011000111100000000010111010010111010000101111011111101100000000010111010101011110100001011111100010010000000010111010111111001010011111011101010100000000010000010111000001101011000011001101000000000011111110111010110000011010110111100110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000';
112+
$expected = '000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000011111110111010000101111010000011111110000000010000010111000001101011000001010000010000000010111010101101011000001101011010111010000000010111010110100111110010100111010111010000000010111010000001101011000001101010111010000000010000010100111110010100111110010000010000000011111110101010101010101010101011111110000000000000000010010100111110010100000000000000000011001110000101111010000101111001011110000000000000000111010000101111010000111100010000000001011010100111110010100111110011001010000000010000101111101011000001101011110011110000000000011010100011000001101011000101110100000000011001100001001101011000001101010011010000000010110111110000001101011000001100110100000000010000100100010100111110010100001100100000000011111110111101111010000101111010100110000000011010000111010000101111010000111100100000000010101111111111110010100111110011001000000000010110001110101011000001101011110011010000000001001111100011000001101011000101110010000000011000100110001101011000001101010011100000000001000011001000001101011000001100110000000000011101001011010100111110010100001100000000000010111010001101111010000101111010100110000000011100000001010000101111010000111100000000000000001110110111110010100111110011001000000000000011001011101011000001101011110011100000000011111110101011000001101011001111110110000000000000000110001101011000001101000111100000000011111110001000001101011000011010110000000000010000010101010100111110010101000100100000000010111010111101111010000101111111100110000000010111010011010000101111010001101100010000000010111010000111110010100111100101101100000000010000010101101011000001101001100111100000000011111110101011000001101011000110010110000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000';
113113

114114
$this->assertSame($expected, $this->reflection->newInstanceArgs([$options])->render('test'));
115115
}

0 commit comments

Comments
 (0)