Updated the SharedSecretQrCodeProvider and the related test cases.

Author: Martin Brecht-Precht

.travis.yml

@@ -19,10 +19,19 @@ php:
   - '7.0'
   - hhvm
 
-install:
-  - composer install
-
 matrix:
   allow_failures:
     - php: hhvm
     - php: '5.3'
+
+install:
+  - composer install
+
+before_script:
+  - mkdir -p build/logs
+
+script:
+  - phpunit --coverage-clover build/logs/clover.xml
+
+after_success:
+  - sh -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" -a "$TRAVIS_PHP_VERSION" != "5.3" ]; then CODECLIMATE_REPO_TOKEN=cd6415fc98a44d7ef506fda4cb158ddff4443ec69ace7414a890f15805159f5b ./vendor/bin/test-reporter; fi;'

README.md

@@ -1,6 +1,7 @@
 # PHP Oath Server Suite
 
 [![Build Status](https://travis-ci.org/markenwerk/php-oath-server-suite.svg?branch=master)](https://travis-ci.org/markenwerk/php-oath-server-suite)
+[![Test Coverage](https://codeclimate.com/github/markenwerk/php-oath-server-suite/badges/coverage.svg)](https://codeclimate.com/github/markenwerk/php-oath-server-suite/coverage)
 [![Code Climate](https://codeclimate.com/github/markenwerk/php-oath-server-suite/badges/gpa.svg)](https://codeclimate.com/github/markenwerk/php-oath-server-suite)
 [![Latest Stable Version](https://poser.pugx.org/markenwerk/oath-server-suite/v/stable)](https://packagist.org/packages/markenwerk/oath-server-suite)
 [![Total Downloads](https://poser.pugx.org/markenwerk/oath-server-suite/downloads)](https://packagist.org/packages/markenwerk/oath-server-suite)

composer.json

@@ -28,11 +28,12 @@
   "require": {
     "php": ">=5.3",
     "lib-curl": "*",
-    "markenwerk/qr-code-suite": "~3.0",
+    "markenwerk/qr-code-suite": "dev-master",
     "enygma/yubikey": "~3.0",
     "skleeschulte/base32": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "~4.8"
+    "phpunit/phpunit": "~4.8",
+    "codeclimate/php-test-reporter": "dev-master"
   }
 }

src/SecretSharing/SharedSecretQrCodeProvider/SharedSecretQrCodeProvider.php

@@ -35,6 +35,11 @@ class SharedSecretQrCodeProvider
 	 */
 	private $qrEncoder;
 
+	/**
+	 * @var QrCodeRendererPng
+	 */
+	private $qrRenderer;
+
 	/**
 	 * @var string
 	 */
@@ -68,8 +73,8 @@ public function provideQrCode($path)
 	{
 		$this->qrCodeContents = $this->contentEncoder->encode($this->keyName, $this->secret);
 		$this->qrCode = $this->qrEncoder->encodeQrCode($this->qrCodeContents);
-		$qrRenderer = new QrCodeRendererPng();
-		$qrRenderer->render($this->qrCode, $path);
+		$this->qrRenderer = new QrCodeRendererPng();
+		$this->qrRenderer->render($this->qrCode, $path);
 		return $this;
 	}
 
@@ -81,6 +86,14 @@ public function getQrEncoder()
 		return $this->qrEncoder;
 	}
 
+	/**
+	 * @return QrCodeRendererPng
+	 */
+	public function getQrRenderer()
+	{
+		return $this->qrRenderer;
+	}
+
 	/**
 	 * @return string
 	 */

test/SecretSharing/SharedSecretQrCodeProvider/SharedSecretQrCodeProviderTest.php

@@ -7,7 +7,6 @@
 use OathServerSuite\SecretSharing\SharedSecretUrlEncoder\TotpBase32SharedSecretUrlEncoder;
 use OathServerSuite\SecretSharing\SharedSecretUrlEncoder\TotpSharedSecretUrlEncoder;
 use QrCodeSuite\QrEncode\QrEncoder;
-use QrCodeSuite\QrRender\QrCodeRendererPng;
 
 /**
  * Class SharedSecretQrCodeProviderTest
@@ -37,12 +36,9 @@ public function testHotpBase32ProvideQrCode()
 		$this->assertFileExists($qrCodeOutputPath);
 
 		// Test QR code output file mesaurement
-		$blockSize = ceil(1000 / ($sharedSecretQrCodeProvider->getQrCode()->getWidth() + 2 * QrCodeRendererPng::MARGIN));
-		$symbolWidth = ($sharedSecretQrCodeProvider->getQrCode()->getWidth() + 2 * QrCodeRendererPng::MARGIN) * $blockSize;
-		$symbolHeight = ($sharedSecretQrCodeProvider->getQrCode()->getHeight() + 2 * QrCodeRendererPng::MARGIN) * $blockSize;
 		$imageSize = getimagesize($qrCodeOutputPath);
-		$this->assertEquals($symbolWidth, $imageSize[0]);
-		$this->assertEquals($symbolHeight, $imageSize[1]);
+		$this->assertEquals($sharedSecretQrCodeProvider->getQrRenderer()->getWidth(), $imageSize[0]);
+		$this->assertEquals($sharedSecretQrCodeProvider->getQrRenderer()->getHeight(), $imageSize[1]);
 
 		// Remove test QR code output file
 		unlink($qrCodeOutputPath);
@@ -65,12 +61,9 @@ public function testTotpBase32ProvideQrCode()
 		$this->assertFileExists($qrCodeOutputPath);
 
 		// Test QR code output file mesaurement
-		$blockSize = ceil(1000 / ($sharedSecretQrCodeProvider->getQrCode()->getWidth() + 2 * QrCodeRendererPng::MARGIN));
-		$symbolWidth = ($sharedSecretQrCodeProvider->getQrCode()->getWidth() + 2 * QrCodeRendererPng::MARGIN) * $blockSize;
-		$symbolHeight = ($sharedSecretQrCodeProvider->getQrCode()->getHeight() + 2 * QrCodeRendererPng::MARGIN) * $blockSize;
 		$imageSize = getimagesize($qrCodeOutputPath);
-		$this->assertEquals($symbolWidth, $imageSize[0]);
-		$this->assertEquals($symbolHeight, $imageSize[1]);
+		$this->assertEquals($sharedSecretQrCodeProvider->getQrRenderer()->getWidth(), $imageSize[0]);
+		$this->assertEquals($sharedSecretQrCodeProvider->getQrRenderer()->getHeight(), $imageSize[1]);
 
 		// Remove test QR code output file
 		unlink($qrCodeOutputPath);
@@ -93,12 +86,9 @@ public function testHotpProvideQrCode()
 		$this->assertFileExists($qrCodeOutputPath);
 
 		// Test QR code output file mesaurement
-		$blockSize = ceil(1000 / ($sharedSecretQrCodeProvider->getQrCode()->getWidth() + 2 * QrCodeRendererPng::MARGIN));
-		$symbolWidth = ($sharedSecretQrCodeProvider->getQrCode()->getWidth() + 2 * QrCodeRendererPng::MARGIN) * $blockSize;
-		$symbolHeight = ($sharedSecretQrCodeProvider->getQrCode()->getHeight() + 2 * QrCodeRendererPng::MARGIN) * $blockSize;
 		$imageSize = getimagesize($qrCodeOutputPath);
-		$this->assertEquals($symbolWidth, $imageSize[0]);
-		$this->assertEquals($symbolHeight, $imageSize[1]);
+		$this->assertEquals($sharedSecretQrCodeProvider->getQrRenderer()->getWidth(), $imageSize[0]);
+		$this->assertEquals($sharedSecretQrCodeProvider->getQrRenderer()->getHeight(), $imageSize[1]);
 
 		// Remove test QR code output file
 		unlink($qrCodeOutputPath);
@@ -121,12 +111,9 @@ public function testTotpProvideQrCode()
 		$this->assertFileExists($qrCodeOutputPath);
 
 		// Test QR code output file mesaurement
-		$blockSize = ceil(1000 / ($sharedSecretQrCodeProvider->getQrCode()->getWidth() + 2 * QrCodeRendererPng::MARGIN));
-		$symbolWidth = ($sharedSecretQrCodeProvider->getQrCode()->getWidth() + 2 * QrCodeRendererPng::MARGIN) * $blockSize;
-		$symbolHeight = ($sharedSecretQrCodeProvider->getQrCode()->getHeight() + 2 * QrCodeRendererPng::MARGIN) * $blockSize;
 		$imageSize = getimagesize($qrCodeOutputPath);
-		$this->assertEquals($symbolWidth, $imageSize[0]);
-		$this->assertEquals($symbolHeight, $imageSize[1]);
+		$this->assertEquals($sharedSecretQrCodeProvider->getQrRenderer()->getWidth(), $imageSize[0]);
+		$this->assertEquals($sharedSecretQrCodeProvider->getQrRenderer()->getHeight(), $imageSize[1]);
 
 		// Remove test QR code output file
 		unlink($qrCodeOutputPath);