From aac41883d0575913c6c4a8c18f15f1bf3ac8bfad Mon Sep 17 00:00:00 2001 From: codemasher Date: Tue, 13 Mar 2018 18:24:12 +0100 Subject: [PATCH] :octocat: simplified mask pattern tester call --- src/Data/MaskPatternTester.php | 6 +----- src/QRCode.php | 6 +----- tests/Data/MaskPatternTesterTest.php | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/Data/MaskPatternTester.php b/src/Data/MaskPatternTester.php index fa39bd3d2..998597e53 100644 --- a/src/Data/MaskPatternTester.php +++ b/src/Data/MaskPatternTester.php @@ -37,14 +37,10 @@ class MaskPatternTester{ * @see \chillerlan\QRCode\QRCode::getBestMaskPattern() * * @param \chillerlan\QRCode\Data\QRMatrix $matrix - * - * @return \chillerlan\QRCode\Data\MaskPatternTester */ - public function setMatrix(QRMatrix $matrix):MaskPatternTester{ + public function __construct(QRMatrix $matrix){ $this->matrix = $matrix; $this->moduleCount = $this->matrix->size(); - - return $this; } /** diff --git a/src/QRCode.php b/src/QRCode.php index 8ff98684c..c2d0cbe6c 100755 --- a/src/QRCode.php +++ b/src/QRCode.php @@ -197,16 +197,12 @@ class QRCode{ protected function getBestMaskPattern():int{ $penalties = []; - $tester = new MaskPatternTester; - for($testPattern = 0; $testPattern < 8; $testPattern++){ $matrix = $this ->dataInterface ->initMatrix($testPattern, true); - $tester->setMatrix($matrix); - - $penalties[$testPattern] = $tester->testPattern(); + $penalties[$testPattern] = (new MaskPatternTester($matrix))->testPattern(); } return array_search(min($penalties), $penalties, true); diff --git a/tests/Data/MaskPatternTesterTest.php b/tests/Data/MaskPatternTesterTest.php index 930bd6b1d..1adfebdb6 100644 --- a/tests/Data/MaskPatternTesterTest.php +++ b/tests/Data/MaskPatternTesterTest.php @@ -25,7 +25,7 @@ class MaskPatternTesterTest extends QRTestAbstract{ public function testMaskpattern(){ $matrix = (new Byte(new QROptions(['version' => 10]), 'test'))->initMatrix(0, true); - $this->assertSame(6178, (new MaskPatternTester)->setMatrix($matrix)->testPattern()); + $this->assertSame(6178, (new MaskPatternTester($matrix))->testPattern()); }