Feature/rewrite

.gitattributes

@@ -0,0 +1,6 @@
+/test export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore

.gitignore

@@ -1,9 +1,2 @@
-composer.lock
-vendor
-nbproject
-.idea
-.buildpath
-.project
-.DS_Store
-.*.sw*
-.*.un~
+/composer.lock
+/vendor

.travis.yml

@@ -1,14 +1,41 @@
+sudo: false
+
 language: php
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - hhvm
+
+cache:
+  directories:
+    - $HOME/.composer/cache
+    - $HOME/.local
+    - vendor
+
+matrix:
+  fast_finish: true
+  include:
+    - php: 7.1
+      env:
+        - EXECUTE_CS_CHECK=true
+        - EXECUTE_TEST_COVERALLS=true
+        - PATH="$HOME/.local/bin:$PATH"
+    - php: nightly
+  allow_failures:
+    - php: nightly
+
+before_install:
+  - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
+  - composer self-update
+  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls:2.0.0 ; fi
 
 install:
   - travis_retry composer install --no-interaction
   - composer info -i
 
-script: vendor/bin/phpunit --bootstrap tests/bootstrap.php --configuration tests/phpunit.xml tests
+script:
+  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then vendor/bin/phpunit --coverage-clover clover.xml ; fi
+  - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then vendor/bin/phpunit ; fi
+  - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then vendor/bin/phpcs ; fi
+
+after_script:
+  - if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then vendor/bin/coveralls ; fi
+
+notifications:
+  email: true

CHANGELOG.md

@@ -0,0 +1,37 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, in reverse chronological order by release.
+
+## 2.0.0 - 2018-04-25
+
+### Added
+
+- [#25](https://github.com/Bacon/BaconQrCode/pull/25) allows for setting a more compact text output
+
+- CHANGELOG.md added (how meta)
+
+- Allows more complex shapes for modules
+
+- Allows setting a gradient for the foreground
+
+- Allows transparent backgrounds and alpha channel on all colors
+
+### Changed
+
+- Minimum PHP version changed to 7.1
+
+- Imagick renderer now allows setting different output formats
+
+- New optimized SVG renderer
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Legacy ZF module support removed
+
+### Fixed
+
+- Non-release files are excluded from composer packages

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Ben 'DASPRiD' Scholzen
+Copyright (c) 2017, Ben Scholzen 'DASPRiD'
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -1,10 +1,13 @@
-QR Code generator
-=================
+# QR Code generator
 
-Master: [![Build Status](https://api.travis-ci.org/Bacon/BaconQrCode.png?branch=master)](http://travis-ci.org/Bacon/BaconQrCode)
+[![Build Status](https://api.travis-ci.org/Bacon/BaconQrCode.png?branch=master)](http://travis-ci.org/Bacon/BaconQrCode)
+[![Coverage Status](https://coveralls.io/repos/github/Bacon/BaconQrCode/badge.svg?branch=master)](https://coveralls.io/github/Bacon/BaconQrCode?branch=master)
+[![Latest Stable Version](https://poser.pugx.org/bacon/bacon-qr-code/v/stable)](https://packagist.org/packages/bacon/bacon-qr-code)
+[![Total Downloads](https://poser.pugx.org/bacon/bacon-qr-code/downloads)](https://packagist.org/packages/bacon/bacon-qr-code)
+[![License](https://poser.pugx.org/bacon/bacon-qr-code/license)](https://packagist.org/packages/bacon/bacon-qr-code)
 
-Introduction
-------------
+
+## Introduction
 BaconQrCode is a port of QR code portion of the ZXing library. It currently
 only features the encoder part, but could later receive the decoder part as
 well.
@@ -13,12 +16,24 @@ As the Reed Solomon codec implementation of the ZXing library performs quite
 slow in PHP, it was exchanged with the implementation by Phil Karn.
 
 
-Example usage
--------------
+## Example usage
 ```php
-$renderer = new \BaconQrCode\Renderer\Image\Png();
-$renderer->setHeight(256);
-$renderer->setWidth(256);
-$writer = new \BaconQrCode\Writer($renderer);
+use BaconQrCode\Renderer\ImageRenderer;
+use BaconQrCode\Renderer\Image\ImagickImageBackEnd;
+use BaconQrCode\Renderer\RendererStyle\RendererStyle;
+use BaconQrCode\Writer;
+
+$renderer = new ImageRenderer(
+    new RendererStyle(400),
+    new ImagickImageBackEnd()
+);
+$writer = new Writer($renderer);
 $writer->writeFile('Hello World!', 'qrcode.png');
 ```
+
+## Available image renderer back ends
+BaconQrCode comes with multiple back ends for rendering images. Currently included are the following:
+
+- `ImagickImageBackEnd`: renders raster images using the Imagick library
+- `SvgImageBackEnd`: renders SVG files using XMLWriter
+- `EpsImageBackEnd`: renders EPS files

composer.json

@@ -4,11 +4,12 @@
     "license" : "BSD-2-Clause",
     "homepage": "https://github.com/Bacon/BaconQrCode",
     "require": {
-        "php": "^5.4|^7.0",
-        "ext-iconv": "*"
+        "php": "^7.1",
+        "ext-iconv": "*",
+        "dasprid/enum": "^1.0"
     },
     "suggest": {
-        "ext-gd": "to generate QR code images"
+        "ext-imagick": "to generate QR code images"
     },
     "authors": [
         {
@@ -19,11 +20,13 @@
         }
     ],
     "autoload": {
-        "psr-0": {
-            "BaconQrCode": "src/"
+        "psr-4": {
+            "BaconQrCode\\": "src/"
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8"
+        "phpunit/phpunit": "^6.4",
+        "squizlabs/php_codesniffer": "^3.1",
+        "phly/keep-a-changelog": "^1.4"
     }
 }

phpcs.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<ruleset name="BaconQrCode standard">
+    <description>BaconQrCode standard</description>
+
+    <!-- display progress -->
+    <arg value="p"/>
+    <arg name="colors"/>
+    <arg name="parallel" value="75"/>
+
+    <!-- inherit rules from: -->
+    <rule ref="PSR2"/>
+    <rule ref="Squiz.Strings.DoubleQuoteUsage"/>
+    <rule ref="Generic.PHP.DisallowShortOpenTag"/>
+    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
+    <rule ref="Generic.Formatting.SpaceAfterNot"/>
+    <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+        <properties>
+            <property name="ignoreNewlines" value="true"/>
+        </properties>
+    </rule>
+    <rule ref="Squiz.WhiteSpace.SuperfluousWhitespace">
+        <properties>
+            <property name="ignoreBlankLines" value="false"/>
+        </properties>
+    </rule>
+
+    <!-- Paths to check -->
+    <file>src</file>
+    <file>test</file>
+</ruleset>

phpunit.xml.dist

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true">
+    <testsuites>
+        <testsuite name="BaconQrCode Tests">
+            <directory>./test</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>