💄

Author: codemasher

tests/Helpers/BitBufferTest.php

@@ -28,10 +28,10 @@ protected function setUp(){
 
 	public function bitProvider(){
 		return [
-			[QRCode::DATA_NUMBER, 16],
-			[QRCode::DATA_ALPHANUM, 32],
-			[QRCode::DATA_BYTE, 64],
-			[QRCode::DATA_KANJI, 128],
+			'number'   => [QRCode::DATA_NUMBER, 16],
+			'alphanum' => [QRCode::DATA_ALPHANUM, 32],
+			'byte'     => [QRCode::DATA_BYTE, 64],
+			'kanji'    => [QRCode::DATA_KANJI, 128],
 		];
 	}
 

tests/Output/QRMarkupTest.php

@@ -20,8 +20,8 @@ class QRMarkupTest extends QROutputTestAbstract{
 
 	public function types(){
 		return [
-			[QRCode::OUTPUT_MARKUP_HTML],
-			[QRCode::OUTPUT_MARKUP_SVG],
+			'html' => [QRCode::OUTPUT_MARKUP_HTML],
+			'svg'  => [QRCode::OUTPUT_MARKUP_SVG],
 		];
 	}
 

tests/Output/QRStringTest.php

@@ -20,8 +20,8 @@ class QRStringTest extends QROutputTestAbstract{
 
 	public function types(){
 		return [
-			[QRCode::OUTPUT_STRING_JSON],
-			[QRCode::OUTPUT_STRING_TEXT],
+			'json' => [QRCode::OUTPUT_STRING_JSON],
+			'text' => [QRCode::OUTPUT_STRING_TEXT],
 		];
 	}
 

tests/QRCodeTest.php

@@ -70,14 +70,6 @@ public function testRenderImage($type, $expected){
 		$this->assertContains($expected, $this->qrcode->render('test'));
 	}
 
-	/**
-	 * @expectedException \chillerlan\QRCode\QRCodeException
-	 * @expectedExceptionMessage Invalid error correct level: 42
-	 */
-	public function testSetOptionsException(){
-		new QROptions(['eccLevel' => 42]);
-	}
-
 	/**
 	 * @expectedException \chillerlan\QRCode\Output\QRCodeOutputException
 	 * @expectedExceptionMessage invalid output type

tests/QROptionsTest.php

@@ -26,14 +26,15 @@ public function testVersionClamp(){
 		$this->assertSame(40, (new QROptions(['version' => 42]))->version);
 		$this->assertSame(1, (new QROptions(['version' => -42]))->version);
 		$this->assertSame(21, (new QROptions(['version' => 21]))->version);
-		$this->assertSame(QRCode::VERSION_AUTO, (new QROptions(['version' => QRCode::VERSION_AUTO]))->version); // -1
+		$this->assertSame(QRCode::VERSION_AUTO, (new QROptions)->version); // QRCode::VERSION_AUTO = -1, default
 	}
 
 	public function testVersionMinMaxClamp(){
 		// normal clamp
 		$o = new QROptions(['versionMin' => 5, 'versionMax' => 10]);
 		$this->assertSame(5, $o->versionMin);
 		$this->assertSame(10, $o->versionMax);
+
 		// exceeding values
 		$o = new QROptions(['versionMin' => -42, 'versionMax' => 42]);
 		$this->assertSame(1, $o->versionMin);
@@ -50,14 +51,9 @@ public function testVersionMinMaxClamp(){
 	}
 
 	public function testMaskPatternClamp(){
-		$o = new QROptions(['maskPattern' => 42]);
-		$this->assertSame(7, $o->maskPattern);
-
-		$o = new QROptions(['maskPattern' => -42]);
-		$this->assertSame(0, $o->maskPattern);
-
-		$o = new QROptions(['maskPattern' => QRCode::MASK_PATTERN_AUTO]); // -1
-		$this->assertSame(QRCode::MASK_PATTERN_AUTO, $o->maskPattern);
+		$this->assertSame(7, (new QROptions(['maskPattern' => 42]))->maskPattern);
+		$this->assertSame(0, (new QROptions(['maskPattern' => -42]))->maskPattern);
+		$this->assertSame(QRCode::MASK_PATTERN_AUTO, (new QROptions)->maskPattern); // QRCode::MASK_PATTERN_AUTO = -1, default
 	}
 
 	/**