@@ -79,9 +79,6 @@ public static function debugMatrix(QRMatrix $matrix):void{
79
79
QRMatrix::M_LOGO => QRString::ansi8 ('░░ ' , 105 ),
80
80
// empty
81
81
QRMatrix::M_NULL => QRString::ansi8 ('░░ ' , 231 ),
82
- // data
83
- QRMatrix::M_TEST_DARK => QRString::ansi8 ('██ ' , 127 ),
84
- QRMatrix::M_TEST => QRString::ansi8 ('░░ ' , 127 ),
85
82
];
86
83
87
84
$ out = (new QRString ($ opt , $ matrix ))->dump ();
@@ -147,20 +144,20 @@ public function testMaskPattern():void{
147
144
* Tests the set(), get() and check() methods
148
145
*/
149
146
public function testGetSetCheck ():void {
150
- $ this ->matrix ->set (10 , 10 , true , QRMatrix::M_TEST );
151
- $ this ::assertSame (QRMatrix::M_TEST_DARK , $ this ->matrix ->get (10 , 10 ));
147
+ $ this ->matrix ->set (10 , 10 , true , QRMatrix::M_LOGO );
148
+ $ this ::assertSame (QRMatrix::M_LOGO_DARK , $ this ->matrix ->get (10 , 10 ));
152
149
$ this ::assertTrue ($ this ->matrix ->check (10 , 10 ));
153
150
154
- $ this ->matrix ->set (20 , 20 , false , QRMatrix::M_TEST );
155
- $ this ::assertSame (QRMatrix::M_TEST , $ this ->matrix ->get (20 , 20 ));
151
+ $ this ->matrix ->set (20 , 20 , false , QRMatrix::M_LOGO );
152
+ $ this ::assertSame (QRMatrix::M_LOGO , $ this ->matrix ->get (20 , 20 ));
156
153
$ this ::assertFalse ($ this ->matrix ->check (20 , 20 ));
157
154
158
155
// get proper results when using a *_DARK constant
159
- $ this ->matrix ->set (30 , 30 , true , QRMatrix::M_TEST_DARK );
160
- $ this ::assertSame (QRMatrix::M_TEST_DARK , $ this ->matrix ->get (30 , 30 ));
156
+ $ this ->matrix ->set (30 , 30 , true , QRMatrix::M_LOGO_DARK );
157
+ $ this ::assertSame (QRMatrix::M_LOGO_DARK , $ this ->matrix ->get (30 , 30 ));
161
158
162
- $ this ->matrix ->set (40 , 40 , false , QRMatrix::M_TEST_DARK );
163
- $ this ::assertSame (QRMatrix::M_TEST , $ this ->matrix ->get (40 , 40 ));
159
+ $ this ->matrix ->set (40 , 40 , false , QRMatrix::M_LOGO_DARK );
160
+ $ this ::assertSame (QRMatrix::M_LOGO , $ this ->matrix ->get (40 , 40 ));
164
161
165
162
// out of range
166
163
$ this ::assertFalse ($ this ->matrix ->check (-1 , -1 ));
@@ -331,8 +328,8 @@ public function testSetQuietZone(QRMatrix $matrix):void{
331
328
$ size = $ matrix ->getSize ();
332
329
$ quietZoneSize = 5 ;
333
330
334
- $ matrix ->set (0 , 0 , true , QRMatrix::M_TEST );
335
- $ matrix ->set (($ size - 1 ), ($ size - 1 ), true , QRMatrix::M_TEST );
331
+ $ matrix ->set (0 , 0 , true , QRMatrix::M_LOGO );
332
+ $ matrix ->set (($ size - 1 ), ($ size - 1 ), true , QRMatrix::M_LOGO );
336
333
337
334
$ matrix ->setQuietZone ($ quietZoneSize );
338
335
@@ -350,8 +347,8 @@ public function testSetQuietZone(QRMatrix $matrix):void{
350
347
351
348
$ s = ($ size - 1 - $ quietZoneSize );
352
349
353
- $ this ::assertSame (QRMatrix::M_TEST_DARK , $ matrix ->get ($ quietZoneSize , $ quietZoneSize ));
354
- $ this ::assertSame (QRMatrix::M_TEST_DARK , $ matrix ->get ($ s , $ s ));
350
+ $ this ::assertSame (QRMatrix::M_LOGO_DARK , $ matrix ->get ($ quietZoneSize , $ quietZoneSize ));
351
+ $ this ::assertSame (QRMatrix::M_LOGO_DARK , $ matrix ->get ($ s , $ s ));
355
352
}
356
353
357
354
/**
@@ -522,20 +519,20 @@ public function testSetLogoSpaceMaxSizeException():void{
522
519
* Tests flipping the value of a module
523
520
*/
524
521
public function testFlip ():void {
525
- $ this ->matrix ->set (20 , 20 , true , QRMatrix::M_TEST );
522
+ $ this ->matrix ->set (20 , 20 , true , QRMatrix::M_LOGO );
526
523
527
524
// cover checkType()
528
- $ this ::assertTrue ($ this ->matrix ->checkType (20 , 20 , QRMatrix::M_TEST ));
525
+ $ this ::assertTrue ($ this ->matrix ->checkType (20 , 20 , QRMatrix::M_LOGO ));
529
526
// verify the current state (dark)
530
- $ this ::assertSame (QRMatrix::M_TEST_DARK , $ this ->matrix ->get (20 , 20 ));
527
+ $ this ::assertSame (QRMatrix::M_LOGO_DARK , $ this ->matrix ->get (20 , 20 ));
531
528
// flip
532
529
$ this ->matrix ->flip (20 , 20 );
533
530
// verify flip
534
- $ this ::assertSame (QRMatrix::M_TEST , $ this ->matrix ->get (20 , 20 ));
531
+ $ this ::assertSame (QRMatrix::M_LOGO , $ this ->matrix ->get (20 , 20 ));
535
532
// flip again
536
533
$ this ->matrix ->flip (20 , 20 );
537
534
// verify flip
538
- $ this ::assertSame (QRMatrix::M_TEST_DARK , $ this ->matrix ->get (20 , 20 ));
535
+ $ this ::assertSame (QRMatrix::M_LOGO_DARK , $ this ->matrix ->get (20 , 20 ));
539
536
}
540
537
541
538
/**
0 commit comments