Changed the root namespace and the vendor prefix.

Martin Brecht-Precht · Martin Brecht-Precht · commit b08ca7b9a4a4 · 2021-01-18T17:33:53.000+01:00
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Martin Brecht-Precht, Markenwerk GmbH
+Copyright (c) 2016 Martin Brecht-Precht, Chroma Experience GmbH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/QrEncode/Exception/QrEncoderException.php b/QrEncode/Exception/QrEncoderException.php
@@ -1,13 +1,15 @@
 <?php
 
-namespace QrCodeSuite\QrEncode\Exception;
+namespace ChromaX\QrCodeSuite\QrEncode\Exception;
+
+use Exception;
 
 /**
  * Class QrEncoderException
  *
- * @package QrCodeSuite\QrEncode\Exception
+ * @package ChromaX\QrCodeSuite\QrEncode\Exception
  */
-class QrEncoderException extends \Exception
+class QrEncoderException extends Exception
 {
 
 }
diff --git a/QrEncode/QrCode/QrCode.php b/QrEncode/QrCode/QrCode.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrEncode\QrCode;
+namespace ChromaX\QrCodeSuite\QrEncode\QrCode;
 
 /**
  * Class QrCode
  *
- * @package QrCodeSuite\QrEncode
+ * @package ChromaX\QrCodeSuite\QrEncode
  */
 class QrCode
 {
diff --git a/QrEncode/QrCode/QrCodePoint.php b/QrEncode/QrCode/QrCodePoint.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrEncode\QrCode;
+namespace ChromaX\QrCodeSuite\QrEncode\QrCode;
 
 /**
  * Class QrCodePoint
  *
- * @package QrCodeSuite\QrEncode
+ * @package ChromaX\QrCodeSuite\QrEncode
  */
 class QrCodePoint
 {
diff --git a/QrEncode/QrCode/QrCodePointRow.php b/QrEncode/QrCode/QrCodePointRow.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrEncode\QrCode;
+namespace ChromaX\QrCodeSuite\QrEncode\QrCode;
 
 /**
  * Class QrCodePointRow
  *
- * @package QrCodeSuite\QrEncode
+ * @package ChromaX\QrCodeSuite\QrEncode
  */
 class QrCodePointRow
 {
diff --git a/QrEncode/QrEncoder.php b/QrEncode/QrEncoder.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace QrCodeSuite\QrEncode;
+namespace ChromaX\QrCodeSuite\QrEncode;
 
-use QrCodeSuite\QrEncode\Exception\QrEncoderException;
-use QrCodeSuite\QrEncode\QrCode\QrCode;
-use QrCodeSuite\QrEncode\QrCode\QrCodePointRow;
-use QrCodeSuite\QrEncode\QrCode\QrCodePoint;
+use ChromaX\QrCodeSuite\QrEncode\Exception\QrEncoderException;
+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCode;
+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCodePointRow;
+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCodePoint;
 
 /**
  * Class QrEncoder
  *
- * @package QrCodeSuite\QrEncode
+ * @package ChromaX\QrCodeSuite\QrEncode
  */
 class QrEncoder
 {
@@ -85,7 +85,7 @@ public function encodeQrCode($contents)
 	{
 		$chars = str_split($contents);
 		foreach ($chars as $char) {
-			if (0 == ord($char)) {
+			if (0 === ord($char)) {
 				throw new QrEncoderException('Encoding null character failed');
 			}
 		}
diff --git a/QrRender/Base/QrCodeRendererInterface.php b/QrRender/Base/QrCodeRendererInterface.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace QrCodeSuite\QrRender\Base;
+namespace ChromaX\QrCodeSuite\QrRender\Base;
 
-use QrCodeSuite\QrEncode\QrCode\QrCode;
+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCode;
 
 /**
  * Interface QrCodeRendererInterface
  *
- * @package QrCodeSuite\QrRender\Base
+ * @package ChromaX\QrCodeSuite\QrRender\Base
  */
 interface QrCodeRendererInterface
 {
diff --git a/QrRender/Exception/IoException.php b/QrRender/Exception/IoException.php
@@ -1,13 +1,15 @@
 <?php
 
-namespace QrCodeSuite\QrRender\Exception;
+namespace ChromaX\QrCodeSuite\QrRender\Exception;
+
+use Exception;
 
 /**
  * Class IoException
  *
- * @package QrCodeSuite\QrRender\Exception
+ * @package ChromaX\QrCodeSuite\QrRender\Exception
  */
-class IoException extends \Exception
+class IoException extends Exception
 {
 
 }
diff --git a/QrRender/PathFinder/Path.php b/QrRender/PathFinder/Path.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrRender\PathFinder;
+namespace ChromaX\QrCodeSuite\QrRender\PathFinder;
 
 /**
  * Class Path
  *
- * @package QrCodeSuite\QrRender\PathFinder
+ * @package ChromaX\QrCodeSuite\QrRender\PathFinder
  */
 class Path
 {
diff --git a/QrRender/PathFinder/PathPoint.php b/QrRender/PathFinder/PathPoint.php
@@ -1,11 +1,11 @@
 <?php
 
-namespace QrCodeSuite\QrRender\PathFinder;
+namespace ChromaX\QrCodeSuite\QrRender\PathFinder;
 
 /**
  * Class PathPoint
  *
- * @package QrCodeSuite\QrRender\PathFinder
+ * @package ChromaX\QrCodeSuite\QrRender\PathFinder
  */
 class PathPoint
 {
diff --git a/QrRender/PathFinder/QrCodePathFinder.php b/QrRender/PathFinder/QrCodePathFinder.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace QrCodeSuite\QrRender\PathFinder;
+namespace ChromaX\QrCodeSuite\QrRender\PathFinder;
 
-use QrCodeSuite\QrEncode\QrCode\QrCode;
+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCode;
 
 /**
  * Class QrCodePathFinder
  *
- * @package QrCodeSuite\QrRender\PathFinder
+ * @package ChromaX\QrCodeSuite\QrRender\PathFinder
  */
 class QrCodePathFinder
 {
@@ -53,12 +53,14 @@ private function findPaths()
 	{
 		for ($y = 1; $y <= $this->qrCode->getHeight(); $y++) {
 			$qrCodePointRow = $this->qrCode->getRow($y);
-			for ($x = 1; $x <= $this->qrCode->getWidth(); $x++) {
-				if (!isset($this->visited[$y][$x])) {
-					$qrCodePoint = $qrCodePointRow->getPoint($x);
-					if ($this->isCorner($x, $y)) {
-						$this->paths[] = $this->traceComposite($x, $y, $qrCodePoint->isActive());
-						$this->visited[$y][$x] = true;
+			if ($qrCodePointRow !== null) {
+				for ($x = 1; $x <= $this->qrCode->getWidth(); $x++) {
+					if (!isset($this->visited[$y][$x])) {
+						$qrCodePoint = $qrCodePointRow->getPoint($x);
+						if ($qrCodePoint !== null && $this->isCorner($x, $y)) {
+							$this->paths[] = $this->traceComposite($x, $y, $qrCodePoint->isActive());
+							$this->visited[$y][$x] = true;
+						}
 					}
 				}
 			}
@@ -72,10 +74,15 @@ private function findPaths()
 	 */
 	private function isCorner($xPosition, $yPosition)
 	{
-		$currentPoint = $this->qrCode->getRow($yPosition)->getPoint($xPosition);
-		$neighbourPoint = $this->qrCode->getRow($yPosition - 1)->getPoint($xPosition - 1);
-		if ($neighbourPoint == $this->qrCode->getRow($yPosition)->getPoint($xPosition - 1) && $neighbourPoint == $this->qrCode->getRow($yPosition - 1)->getPoint($xPosition)) {
-			if ($neighbourPoint != $currentPoint) {
+		$qrCodePointRow = $this->qrCode->getRow($yPosition);
+		$previouseQrCodePointRow = $this->qrCode->getRow($yPosition - 1);
+		if ($qrCodePointRow === null || $previouseQrCodePointRow === null) {
+			return false;
+		}
+		$currentPoint = $qrCodePointRow->getPoint($xPosition);
+		$neighbourPoint = $previouseQrCodePointRow->getPoint($xPosition - 1);
+		if ($neighbourPoint === $qrCodePointRow->getPoint($xPosition - 1) && $neighbourPoint === $previouseQrCodePointRow->getPoint($xPosition)) {
+			if ($neighbourPoint !== $currentPoint) {
 				return true;
 			}
 		}
@@ -86,7 +93,7 @@ private function isCorner($xPosition, $yPosition)
 	 * @param int $startXPosition
 	 * @param int $startYPosition
 	 * @param bool $active
-	 * @return array
+	 * @return Path
 	 */
 	private function traceComposite($startXPosition, $startYPosition, $active)
 	{
@@ -105,55 +112,55 @@ private function traceComposite($startXPosition, $startYPosition, $active)
 				case self::DIRECTION_RIGHT:
 					$current = $this->qrCode->getRow($yPosition)->getPoint($xPosition);
 					$other = $this->qrCode->getRow($yPosition - 1)->getPoint($xPosition);
-					if ($current != $other) {
+					if ($current !== $other) {
 						$switched = $other;
 						$xPosition++;
 					} else {
 						$path->addPoint($this->getPoint($xPosition, $yPosition));
-						$direction = ($switched == $other) ? self::DIRECTION_DOWN : self::DIRECTION_UP;
+						$direction = ($switched === $other) ? self::DIRECTION_DOWN : self::DIRECTION_UP;
 					}
 					break;
 				case self::DIRECTION_UP:
 					$current = $this->qrCode->getRow($yPosition - 1)->getPoint($xPosition);
 					$other = $this->qrCode->getRow($yPosition - 1)->getPoint($xPosition - 1);
-					if ($current != $other) {
+					if ($current !== $other) {
 						$switched = $other;
 						$yPosition--;
 					} else {
 						$path->addPoint($this->getPoint($xPosition, $yPosition));
-						$direction = ($switched == $other) ? self::DIRECTION_RIGHT : self::DIRECTION_LEFT;
-						if ($direction == self::DIRECTION_RIGHT && $this->isCorner($xPosition, $yPosition)) {
+						$direction = ($switched === $other) ? self::DIRECTION_RIGHT : self::DIRECTION_LEFT;
+						if ($direction === self::DIRECTION_RIGHT && $this->isCorner($xPosition, $yPosition)) {
 							$this->visited[$yPosition][$xPosition] = true;
 						}
 					}
 					break;
 				case self::DIRECTION_LEFT:
 					$current = $this->qrCode->getRow($yPosition - 1)->getPoint($xPosition - 1);
 					$other = $this->qrCode->getRow($yPosition)->getPoint($xPosition - 1);
-					if ($current != $other) {
+					if ($current !== $other) {
 						$switched = $other;
 						$xPosition--;
 					} else {
 						$path->addPoint($this->getPoint($xPosition, $yPosition));
-						$direction = ($switched == $other) ? self::DIRECTION_UP : self::DIRECTION_DOWN;
-						if ($direction == self::DIRECTION_DOWN && $this->isCorner($xPosition, $yPosition)) {
+						$direction = ($switched === $other) ? self::DIRECTION_UP : self::DIRECTION_DOWN;
+						if ($direction === self::DIRECTION_DOWN && $this->isCorner($xPosition, $yPosition)) {
 							$this->visited[$yPosition][$xPosition] = true;
 						}
 					}
 					break;
 				case self::DIRECTION_DOWN:
 					$current = $this->qrCode->getRow($yPosition)->getPoint($xPosition - 1);
 					$other = $this->qrCode->getRow($yPosition)->getPoint($xPosition);
-					if ($current != $other) {
+					if ($current !== $other) {
 						$switched = $other;
 						$yPosition++;
 					} else {
 						$path->addPoint($this->getPoint($xPosition, $yPosition));
-						$direction = ($switched == $other) ? self::DIRECTION_LEFT : self::DIRECTION_RIGHT;
+						$direction = ($switched === $other) ? self::DIRECTION_LEFT : self::DIRECTION_RIGHT;
 					}
 					break;
 			}
-		} while (!($xPosition == $startXPosition && $yPosition == $startYPosition));
+		} while (!($xPosition === $startXPosition && $yPosition === $startYPosition));
 
 		return $path;
 
diff --git a/QrRender/QrCodeRendererEps.php b/QrRender/QrCodeRendererEps.php
@@ -1,16 +1,16 @@
 <?php
 
-namespace QrCodeSuite\QrRender;
+namespace ChromaX\QrCodeSuite\QrRender;
 
-use QrCodeSuite\QrEncode\QrCode\QrCode;
-use QrCodeSuite\QrRender\Exception\IoException;
-use QrCodeSuite\QrRender\PathFinder\PathPoint;
-use QrCodeSuite\QrRender\PathFinder\QrCodePathFinder;
+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCode;
+use ChromaX\QrCodeSuite\QrRender\Exception\IoException;
+use ChromaX\QrCodeSuite\QrRender\PathFinder\PathPoint;
+use ChromaX\QrCodeSuite\QrRender\PathFinder\QrCodePathFinder;
 
 /**
  * Class QrCodeRendererEps
  *
- * @package QrCodeSuite\QrRender
+ * @package ChromaX\QrCodeSuite\QrRender
  */
 class QrCodeRendererEps implements Base\QrCodeRendererInterface
 {
@@ -48,7 +48,7 @@ public function render(QrCode $qrCode, $filename)
 		$epsSource[] = '%!PS-Adobe-2.0 EPSF-2.0';
 		$epsSource[] = '%%BoundingBox: 0 0 ' . ceil($epsWidth) . ' ' . ceil($epsHeight) . '';
 		$epsSource[] = '%%HiResBoundingBox: 0 0 ' . $epsWidth . ' ' . $epsHeight . '';
-		$epsSource[] = '%%Creator: tk | markenwerk';
+		$epsSource[] = '%%Creator: tk | chroma-x';
 		$epsSource[] = '%%CreationDate: ' . time();
 		$epsSource[] = '%%DocumentData: Clean7Bit';
 		$epsSource[] = '%%LanguageLevel: 2';
@@ -61,7 +61,7 @@ public function render(QrCode $qrCode, $filename)
 
 		foreach ($paths as $path) {
 			for ($i = 0; $i < $path->countPoints(); $i++) {
-				if ($i == 0) {
+				if ($i === 0) {
 					$epsSource[] = $this->convertPoint($path->getFirstPoint()) . ' m';
 				} else {
 					$epsSource[] = $this->convertPoint($path->getPoint($i)) . ' l';
diff --git a/QrRender/QrCodeRendererPng.php b/QrRender/QrCodeRendererPng.php
diff --git a/QrRender/QrCodeRendererTiff.php b/QrRender/QrCodeRendererTiff.php
diff --git a/README.md b/README.md
diff --git a/composer.json b/composer.json

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,15 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace QrCodeSuite\QrEncode\Exception;`
	`3`	`+namespace ChromaX\QrCodeSuite\QrEncode\Exception;`
	`4`	`+`
	`5`	`+use Exception;`
`4`	`6`
`5`	`7`	`/**`
`6`	`8`	`* Class QrEncoderException`
`7`	`9`	`*`
`8`		`- * @package QrCodeSuite\QrEncode\Exception`
	`10`	`+ * @package ChromaX\QrCodeSuite\QrEncode\Exception`
`9`	`11`	`*/`
`10`		`-class QrEncoderException extends \Exception`
	`12`	`+class QrEncoderException extends Exception`
`11`	`13`	`{`
`12`	`14`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace QrCodeSuite\QrEncode\QrCode;`
	`3`	`+namespace ChromaX\QrCodeSuite\QrEncode\QrCode;`
`4`	`4`
`5`	`5`	`/**`
`6`	`6`	`* Class QrCode`
`7`	`7`	`*`
`8`		`- * @package QrCodeSuite\QrEncode`
	`8`	`+ * @package ChromaX\QrCodeSuite\QrEncode`
`9`	`9`	`*/`
`10`	`10`	`class QrCode`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace QrCodeSuite\QrEncode;`
	`3`	`+namespace ChromaX\QrCodeSuite\QrEncode;`
`4`	`4`
`5`		`-use QrCodeSuite\QrEncode\Exception\QrEncoderException;`
`6`		`-use QrCodeSuite\QrEncode\QrCode\QrCode;`
`7`		`-use QrCodeSuite\QrEncode\QrCode\QrCodePointRow;`
`8`		`-use QrCodeSuite\QrEncode\QrCode\QrCodePoint;`
	`5`	`+use ChromaX\QrCodeSuite\QrEncode\Exception\QrEncoderException;`
	`6`	`+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCode;`
	`7`	`+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCodePointRow;`
	`8`	`+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCodePoint;`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`* Class QrEncoder`
`12`	`12`	`*`
`13`		`- * @package QrCodeSuite\QrEncode`
	`13`	`+ * @package ChromaX\QrCodeSuite\QrEncode`
`14`	`14`	`*/`
`15`	`15`	`class QrEncoder`
`16`	`16`	`{`
`@@ -85,7 +85,7 @@ public function encodeQrCode($contents)`
`85`	`85`	`{`
`86`	`86`	`$chars = str_split($contents);`
`87`	`87`	`foreach ($chars as $char) {`
`88`		`- if (0 == ord($char)) {`
	`88`	`+ if (0 === ord($char)) {`
`89`	`89`	`throw new QrEncoderException('Encoding null character failed');`
`90`	`90`	`}`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace QrCodeSuite\QrRender\Base;`
	`3`	`+namespace ChromaX\QrCodeSuite\QrRender\Base;`
`4`	`4`
`5`		`-use QrCodeSuite\QrEncode\QrCode\QrCode;`
	`5`	`+use ChromaX\QrCodeSuite\QrEncode\QrCode\QrCode;`
`6`	`6`
`7`	`7`	`/**`
`8`	`8`	`* Interface QrCodeRendererInterface`
`9`	`9`	`*`
`10`		`- * @package QrCodeSuite\QrRender\Base`
	`10`	`+ * @package ChromaX\QrCodeSuite\QrRender\Base`
`11`	`11`	`*/`
`12`	`12`	`interface QrCodeRendererInterface`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,15 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace QrCodeSuite\QrRender\Exception;`
	`3`	`+namespace ChromaX\QrCodeSuite\QrRender\Exception;`
	`4`	`+`
	`5`	`+use Exception;`
`4`	`6`
`5`	`7`	`/**`
`6`	`8`	`* Class IoException`
`7`	`9`	`*`
`8`		`- * @package QrCodeSuite\QrRender\Exception`
	`10`	`+ * @package ChromaX\QrCodeSuite\QrRender\Exception`
`9`	`11`	`*/`
`10`		`-class IoException extends \Exception`
	`12`	`+class IoException extends Exception`
`11`	`13`	`{`
`12`	`14`
`13`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`		`-namespace QrCodeSuite\QrRender\PathFinder;`
	`3`	`+namespace ChromaX\QrCodeSuite\QrRender\PathFinder;`
`4`	`4`
`5`	`5`	`/**`
`6`	`6`	`* Class Path`
`7`	`7`	`*`
`8`		`- * @package QrCodeSuite\QrRender\PathFinder`
	`8`	`+ * @package ChromaX\QrCodeSuite\QrRender\PathFinder`
`9`	`9`	`*/`
`10`	`10`	`class Path`
`11`	`11`	`{`