Merge remote-tracking branch 'origin/master'

# Conflicts:
#	QrEncode/Exception/QrEncoderException.php
#	QrRender/Exception/IoException.php
#	QrRender/QrCodeRendererPng.php
#	QrRender/QrCodeRendererTiff.php
#	README.md
#	composer.json
#	src/QrEncode/QrCode/QrCode.php
#	src/QrEncode/QrCode/QrCodePoint.php
#	src/QrEncode/QrCode/QrCodePointRow.php
#	src/QrEncode/QrEncoder.php
#	src/QrRender/Base/QrCodeRendererInterface.php
#	src/QrRender/PathFinder/Path.php
#	src/QrRender/PathFinder/PathPoint.php
#	src/QrRender/PathFinder/QrCodePathFinder.php
#	src/QrRender/QrCodeRendererEps.php

Author: Martin Brecht-Precht

.codeclimate.yml

@@ -25,4 +25,4 @@ ratings:
   - "**.rb"
 exclude_paths:
 - test/
-- vendor/
+- vendor/

.gitignore

@@ -1,2 +1,3 @@
 /vendor
-composer.lock
+composer.lock
+vagrantfile

.sensiolabs.yml

@@ -0,0 +1,3 @@
+rules:
+    php.duplicated_code:
+        enabled: false

.travis.yml

@@ -0,0 +1,37 @@
+language: php
+
+branches:
+  only:
+    - master
+
+php:
+  - '5.3'
+  - '5.4'
+  - '5.5'
+  - '7.0'
+  - hhvm
+
+matrix:
+  allow_failures:
+    - php: hhvm
+    - php: '5.3'
+
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y qrencode
+  - pear config-set preferred_state beta
+  - printf "\n" | pecl install imagick
+  - echo "extension=imagick.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
+  - php -m
+
+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=fa42f567b7666793956a507e50d3a8b9bb833a9a1183cb543bedd2ea5cafb8be ./vendor/bin/test-reporter; fi;'

CONTRIBUTING.md

@@ -68,9 +68,36 @@ Any bugfix that doesn’t include a test proving the existence of the bug being
 
 We’ve found that test-first development really helps make features better architected and identifies potential edge cases earlier instead of later. Writing tests before the implementation is strongly encouraged.
 
+Sometimes testing is hard because it is not possible to create an environment on the developers machine to fulfill the softwares requirements in the middleware setup. For example installing imagick on Mac OS X could be a task straight out of hell. In this case it is useful to provide a out-of-the-box running machine setup like [docker](https://www.docker.com/) ot [vagrant](https://www.vagrantup.com/) and run tests on the virtual machine via the commandline interface.
+
+## Contributing requirements
+
+For development purposes there is a [vagrant](https://www.vagrantup.com/) setup included in the repo to fulfill the server side requirements easily. 
+
+### Installation and testing example (Mac OS X)
+
+#### Installation of vagrant
+
+Get your vagrant version from [https://www.vagrantup.com/downloads.html](https://www.vagrantup.com/downloads.html) and run the installer. 
+
+#### Starting the virtual machine and connect via SSH
+
+```
+cd php-qr-code-suite
+vagrant up
+vagrant ssh
+```
+
+#### Running the tests via command line interface
+
+```
+cd /var/www/php-qr-code-suite
+phpunit --bootstrap vendor/autoload.php --configuration phpunit.xml.dist
+```
+
 ## Full example
 
-Here’s an example workflow for `php-qr-code-suite` hosted on Github, which is currently in version 2.0.x. Your username is `yourname` and you’re submitting a basic bugfix. 
+Here’s an example workflow for `php-qr-code-suite` hosted on Github, which is currently in version 3.0.8. Your username is `yourname` and you’re submitting a basic bugfix. 
 
 ### Preparing your Fork
 
@@ -85,7 +112,7 @@ git clone git@github.com:yourname/php-qr-code-suite
 
 ```
 cd php-qr-code-suite
-git checkout -b foo-the-bars 2.0
+git checkout -b fix-issue-269 3.0.8
 ```
 
 ### Making your Changes

phpunit.xml.dist

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit colors="true" bootstrap="vendor/autoload.php">
+	<testsuites>
+		<testsuite name="QR Code Suite Testsuite">
+			<directory>test</directory>
+		</testsuite>
+	</testsuites>
+	<filter>
+		<whitelist>
+			<directory suffix=".php">./src</directory>
+			<exclude>
+				<directory>./vendor</directory>
+				<directory>./test</directory>
+			</exclude>
+		</whitelist>
+	</filter>
+</phpunit>

src/QrEncode/Exception/QrEncoderException.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace Markenwerk\QrCodeSuite\QrEncode\Exception;
+
+/**
+ * Class QrEncoderException
+ *
+ * @package Markenwerk\QrCodeSuite\QrEncode\Exception
+ */
+class QrEncoderException extends \Exception
+{
+
+}

QrEncode/QrCode/QrCode.php renamed to src/QrEncode/QrCode/QrCode.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace Markenwerk\QrCodeSuite\QrRender;
+
+/**
+ * Class AbstractPixelRenderer
+ *
+ * @package Markenwerk\QrCodeSuite\QrRender
+ */
+abstract class AbstractPixelRenderer
+{
+
+	/**
+	 * @var int
+	 */
+	private $approximateSize = 1000;
+
+	/**
+	 * @var int
+	 */
+	private $width;
+
+	/**
+	 * @var int
+	 */
+	private $height;
+
+	/**
+	 * @return int
+	 */
+	public function getApproximateSize()
+	{
+		return $this->approximateSize;
+	}
+
+	/**
+	 * @param int $approximateSize
+	 * @return $this
+	 */
+	public function setApproximateSize($approximateSize)
+	{
+		if (!is_int($approximateSize) || $approximateSize < 0 || $approximateSize > 5000) {
+			throw new \InvalidArgumentException('Approximate size has to be a positive integer less than 5000');
+		}
+		$this->approximateSize = $approximateSize;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getWidth()
+	{
+		return $this->width;
+	}
+
+	/**
+	 * @param int $width
+	 * @return $this
+	 */
+	protected function setWidth($width)
+	{
+		$this->width = $width;
+		return $this;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getHeight()
+	{
+		return $this->height;
+	}
+
+	/**
+	 * @param int $height
+	 * @return $this
+	 */
+	protected function setHeight($height)
+	{
+		$this->height = $height;
+		return $this;
+	}
+
+}