Updated dependencies.

Added the company root namespace. Updated readme.
chroma-x · Jul 11, 2016 · 3e007cb · 3e007cb
1 parent f851cb5
commit 3e007cb
Show file tree

Hide file tree

Showing 20 changed files with 71 additions and 69 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ To use the QR Code Suite [`qrencode`](https://wiki.ubuntuusers.de/qrencode/) and
 ```{json}
 {
    	"require": {
-        "markenwerk/qr-code-suite": "~3.0"
+        "markenwerk/qr-code-suite": "~4.0"
     }
 }
 ```
@@ -35,8 +35,8 @@ require_once('path/to/vendor/autoload.php');
 ### Encoding data as QR code block data
 
 ```{php}
-use CommonException\IoException;
-use QrCodeSuite\QrEncode;
+use Markenwerk\CommonException\IoException;
+use Markenwerk\QrCodeSuite\QrEncode;
 
 // Encode the data as QR code block data
 try {
@@ -57,10 +57,10 @@ try {
 ### Render encoded QR code block data as image
 
 ```{php}
-use CommonException\IoException;
-use QrCodeSuite\QrRender;
-use QrCodeSuite\QrRender\Color\RgbColor;
-use QrCodeSuite\QrRender\Color\CmykColor;
+use Markenwerk\CommonException\IoException;
+use Markenwerk\QrCodeSuite\QrRender;
+use Markenwerk\QrCodeSuite\QrRender\Color\RgbColor;
+use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
 
 // Render the encoded QR code block data as RGB PNG
 // Width and height should measure about 800 pixels

diff --git a/composer.json b/composer.json
@@ -24,14 +24,14 @@
   ],
   "autoload": {
     "psr-4": {
-      "QrCodeSuite\\": "src/"
+      "Markenwerk\\QrCodeSuite\\": "src/"
     }
   },
   "require": {
     "php": ">=5.3",
     "ext-gd": "*",
     "ext-imagick": "*",
-    "markenwerk/common-exceptions": "~2.0"
+    "markenwerk/common-exceptions": "~3.0"
   },
   "require-dev": {
     "phpunit/phpunit": "~4.8",

diff --git a/src/QrEncode/Exception/QrEncoderException.php b/src/QrEncode/Exception/QrEncoderException.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrEncode\Exception;
+namespace Markenwerk\QrCodeSuite\QrEncode\Exception;
 
 /**
  * Class QrEncoderException
  *
- * @package QrCodeSuite\QrEncode\Exception
+ * @package Markenwerk\QrCodeSuite\QrEncode\Exception
  */
 class QrEncoderException extends \Exception
 {

diff --git a/src/QrEncode/QrCode/QrCode.php b/src/QrEncode/QrCode/QrCode.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrEncode\QrCode;
+namespace Markenwerk\QrCodeSuite\QrEncode\QrCode;
 
 /**
  * Class QrCode
  *
- * @package QrCodeSuite\QrEncode
+ * @package Markenwerk\QrCodeSuite\QrEncode
  */
 class QrCode
 {

diff --git a/src/QrEncode/QrCode/QrCodePoint.php b/src/QrEncode/QrCode/QrCodePoint.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrEncode\QrCode;
+namespace Markenwerk\QrCodeSuite\QrEncode\QrCode;
 
 /**
  * Class QrCodePoint
  *
- * @package QrCodeSuite\QrEncode
+ * @package Markenwerk\QrCodeSuite\QrEncode
  */
 class QrCodePoint
 {

diff --git a/src/QrEncode/QrCode/QrCodePointRow.php b/src/QrEncode/QrCode/QrCodePointRow.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrEncode\QrCode;
+namespace Markenwerk\QrCodeSuite\QrEncode\QrCode;
 
 /**
  * Class QrCodePointRow
  *
- * @package QrCodeSuite\QrEncode
+ * @package Markenwerk\QrCodeSuite\QrEncode
  */
 class QrCodePointRow
 {

diff --git a/src/QrEncode/QrEncoder.php b/src/QrEncode/QrEncoder.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace QrCodeSuite\QrEncode;
+namespace Markenwerk\QrCodeSuite\QrEncode;
 
-use CommonException\IoException;
-use QrCodeSuite\QrEncode\Exception\QrEncoderException;
-use QrCodeSuite\QrEncode\QrCode\QrCode;
-use QrCodeSuite\QrEncode\QrCode\QrCodePointRow;
-use QrCodeSuite\QrEncode\QrCode\QrCodePoint;
+use Markenwerk\CommonException\IoException;
+use Markenwerk\QrCodeSuite\QrEncode\Exception\QrEncoderException;
+use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
+use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCodePointRow;
+use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCodePoint;
 
 /**
  * Class QrEncoder
  *
- * @package QrCodeSuite\QrEncode
+ * @package Markenwerk\QrCodeSuite\QrEncode
  */
 class QrEncoder
 {

diff --git a/src/QrRender/Base/QrCodeRendererInterface.php b/src/QrRender/Base/QrCodeRendererInterface.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace QrCodeSuite\QrRender\Base;
+namespace Markenwerk\QrCodeSuite\QrRender\Base;
 
-use QrCodeSuite\QrEncode\QrCode\QrCode;
+use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
 
 /**
  * Interface QrCodeRendererInterface
  *
- * @package QrCodeSuite\QrRender\Base
+ * @package Markenwerk\QrCodeSuite\QrRender\Base
  */
 interface QrCodeRendererInterface
 {

diff --git a/src/QrRender/Color/CmykColor.php b/src/QrRender/Color/CmykColor.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrRender\Color;
+namespace Markenwerk\QrCodeSuite\QrRender\Color;
 
 /**
  * Class CmykColor
  *
- * @package QrCodeSuite\QrRender\Color
+ * @package Markenwerk\QrCodeSuite\QrRender\Color
  */
 class CmykColor
 {
@@ -150,6 +150,7 @@ public function getEpsNotation()
 
 	/**
 	 * @param int $int
+	 * @return string
 	 */
 	private function colorChannelValueToOct($int)
 	{
@@ -158,6 +159,7 @@ private function colorChannelValueToOct($int)
 
 	/**
 	 * @param int $int
+	 * @return string
 	 */
 	private function colorChannelValueToFloat($int)
 	{

diff --git a/src/QrRender/Color/RgbColor.php b/src/QrRender/Color/RgbColor.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrRender\Color;
+namespace Markenwerk\QrCodeSuite\QrRender\Color;
 
 /**
  * Class RgbColor
  *
- * @package QrCodeSuite\QrRender\Color
+ * @package Markenwerk\QrCodeSuite\QrRender\Color
  */
 class RgbColor
 {

diff --git a/src/QrRender/PathFinder/Path.php b/src/QrRender/PathFinder/Path.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrRender\PathFinder;
+namespace Markenwerk\QrCodeSuite\QrRender\PathFinder;
 
 /**
  * Class Path
  *
- * @package QrCodeSuite\QrRender\PathFinder
+ * @package Markenwerk\QrCodeSuite\QrRender\PathFinder
  */
 class Path
 {

diff --git a/src/QrRender/PathFinder/PathPoint.php b/src/QrRender/PathFinder/PathPoint.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrRender\PathFinder;
+namespace Markenwerk\QrCodeSuite\QrRender\PathFinder;
 
 /**
  * Class PathPoint
  *
- * @package QrCodeSuite\QrRender\PathFinder
+ * @package Markenwerk\QrCodeSuite\QrRender\PathFinder
  */
 class PathPoint
 {

diff --git a/src/QrRender/PathFinder/QrCodePathFinder.php b/src/QrRender/PathFinder/QrCodePathFinder.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace QrCodeSuite\QrRender\PathFinder;
+namespace Markenwerk\QrCodeSuite\QrRender\PathFinder;
 
-use QrCodeSuite\QrEncode\QrCode\QrCode;
+use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
 
 /**
  * Class QrCodePathFinder
  *
- * @package QrCodeSuite\QrRender\PathFinder
+ * @package Markenwerk\QrCodeSuite\QrRender\PathFinder
  */
 class QrCodePathFinder
 {

diff --git a/src/QrRender/QrCodeRendererEps.php b/src/QrRender/QrCodeRendererEps.php
@@ -1,17 +1,17 @@
 <?php
 
-namespace QrCodeSuite\QrRender;
+namespace Markenwerk\QrCodeSuite\QrRender;
 
-use CommonException\IoException;
-use QrCodeSuite\QrEncode\QrCode\QrCode;
-use QrCodeSuite\QrRender\Color\CmykColor;
-use QrCodeSuite\QrRender\PathFinder\PathPoint;
-use QrCodeSuite\QrRender\PathFinder\QrCodePathFinder;
+use Markenwerk\CommonException\IoException;
+use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
+use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
+use Markenwerk\QrCodeSuite\QrRender\PathFinder\PathPoint;
+use Markenwerk\QrCodeSuite\QrRender\PathFinder\QrCodePathFinder;
 
 /**
  * Class QrCodeRendererEps
  *
- * @package QrCodeSuite\QrRender
+ * @package Markenwerk\QrCodeSuite\QrRender
  */
 class QrCodeRendererEps implements Base\QrCodeRendererInterface
 {

diff --git a/src/QrRender/QrCodeRendererPng.php b/src/QrRender/QrCodeRendererPng.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace QrCodeSuite\QrRender;
+namespace Markenwerk\QrCodeSuite\QrRender;
 
-use CommonException\IoException;
-use QrCodeSuite\QrEncode\QrCode\QrCode;
-use QrCodeSuite\QrRender\Color\RgbColor;
+use Markenwerk\CommonException\IoException;
+use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
+use Markenwerk\QrCodeSuite\QrRender\Color\RgbColor;
 
 /**
  * Class QrCodeRendererPng
  *
- * @package QrCodeSuite\QrRender
+ * @package Markenwerk\QrCodeSuite\QrRender
  */
 class QrCodeRendererPng implements Base\QrCodeRendererInterface
 {

diff --git a/src/QrRender/QrCodeRendererTiff.php b/src/QrRender/QrCodeRendererTiff.php
@@ -1,15 +1,15 @@
 <?php
 
-namespace QrCodeSuite\QrRender;
+namespace Markenwerk\QrCodeSuite\QrRender;
 
-use CommonException\IoException;
-use QrCodeSuite\QrEncode\QrCode\QrCode;
-use QrCodeSuite\QrRender\Color\CmykColor;
+use Markenwerk\CommonException\IoException;
+use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
+use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
 
 /**
  * Class QrCodeRendererTiff
  *
- * @package QrCodeSuite\QrRender
+ * @package Markenwerk\QrCodeSuite\QrRender
  */
 class QrCodeRendererTiff implements Base\QrCodeRendererInterface
 {

diff --git a/test/QrEncode/QrEncoderTest.php b/test/QrEncode/QrEncoderTest.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrEncode;
+namespace Markenwerk\QrCodeSuite\QrEncode;
 
 /**
  * Class QrEncoderTest
  *
- * @package QrCodeSuite\QrEncode
+ * @package Markenwerk\QrCodeSuite\QrEncode
  */
 class QrEncoderTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/test/QrRender/QrCodeRendererEpsTest.php b/test/QrRender/QrCodeRendererEpsTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace QrCodeSuite\QrRender;
+namespace Markenwerk\QrCodeSuite\QrRender;
 
-use QrCodeSuite\QrEncode\QrEncoder;
-use QrCodeSuite\QrRender\Color\CmykColor;
+use Markenwerk\QrCodeSuite\QrEncode\QrEncoder;
+use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
 
 /**
  * Class QrCodeRendererEpsTest
  *
- * @package QrCodeSuite\QrRender
+ * @package Markenwerk\QrCodeSuite\QrRender
  */
 class QrCodeRendererEpsTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/test/QrRender/QrCodeRendererPngTest.php b/test/QrRender/QrCodeRendererPngTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace QrCodeSuite\QrRender;
+namespace Markenwerk\QrCodeSuite\QrRender;
 
-use QrCodeSuite\QrEncode\QrEncoder;
-use QrCodeSuite\QrRender\Color\RgbColor;
+use Markenwerk\QrCodeSuite\QrEncode\QrEncoder;
+use Markenwerk\QrCodeSuite\QrRender\Color\RgbColor;
 
 /**
  * Class QrCodeRendererPngTest
  *
- * @package QrCodeSuite\QrRender
+ * @package Markenwerk\QrCodeSuite\QrRender
  */
 class QrCodeRendererPngTest extends \PHPUnit_Framework_TestCase
 {

diff --git a/test/QrRender/QrCodeRendererTiffTest.php b/test/QrRender/QrCodeRendererTiffTest.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace QrCodeSuite\QrRender;
+namespace Markenwerk\QrCodeSuite\QrRender;
 
-use QrCodeSuite\QrEncode\QrEncoder;
-use QrCodeSuite\QrRender\Color\CmykColor;
+use Markenwerk\QrCodeSuite\QrEncode\QrEncoder;
+use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
 
 /**
  * Class QrCodeRendererTiffTest
  *
- * @package QrCodeSuite\QrRender
+ * @package Markenwerk\QrCodeSuite\QrRender
  */
 class QrCodeRendererTiffTest extends \PHPUnit_Framework_TestCase
 {