Skip to content

Commit 3e007cb

Browse files
author
Martin Brecht-Precht
committed
Updated dependencies.
Added the company root namespace. Updated readme.
1 parent f851cb5 commit 3e007cb

20 files changed

+71
-69
lines changed

README.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ To use the QR Code Suite [`qrencode`](https://wiki.ubuntuusers.de/qrencode/) and
1919
```{json}
2020
{
2121
"require": {
22-
"markenwerk/qr-code-suite": "~3.0"
22+
"markenwerk/qr-code-suite": "~4.0"
2323
}
2424
}
2525
```
@@ -35,8 +35,8 @@ require_once('path/to/vendor/autoload.php');
3535
### Encoding data as QR code block data
3636

3737
```{php}
38-
use CommonException\IoException;
39-
use QrCodeSuite\QrEncode;
38+
use Markenwerk\CommonException\IoException;
39+
use Markenwerk\QrCodeSuite\QrEncode;
4040
4141
// Encode the data as QR code block data
4242
try {
@@ -57,10 +57,10 @@ try {
5757
### Render encoded QR code block data as image
5858

5959
```{php}
60-
use CommonException\IoException;
61-
use QrCodeSuite\QrRender;
62-
use QrCodeSuite\QrRender\Color\RgbColor;
63-
use QrCodeSuite\QrRender\Color\CmykColor;
60+
use Markenwerk\CommonException\IoException;
61+
use Markenwerk\QrCodeSuite\QrRender;
62+
use Markenwerk\QrCodeSuite\QrRender\Color\RgbColor;
63+
use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
6464
6565
// Render the encoded QR code block data as RGB PNG
6666
// Width and height should measure about 800 pixels

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
],
2525
"autoload": {
2626
"psr-4": {
27-
"QrCodeSuite\\": "src/"
27+
"Markenwerk\\QrCodeSuite\\": "src/"
2828
}
2929
},
3030
"require": {
3131
"php": ">=5.3",
3232
"ext-gd": "*",
3333
"ext-imagick": "*",
34-
"markenwerk/common-exceptions": "~2.0"
34+
"markenwerk/common-exceptions": "~3.0"
3535
},
3636
"require-dev": {
3737
"phpunit/phpunit": "~4.8",

src/QrEncode/Exception/QrEncoderException.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace QrCodeSuite\QrEncode\Exception;
3+
namespace Markenwerk\QrCodeSuite\QrEncode\Exception;
44

55
/**
66
* Class QrEncoderException
77
*
8-
* @package QrCodeSuite\QrEncode\Exception
8+
* @package Markenwerk\QrCodeSuite\QrEncode\Exception
99
*/
1010
class QrEncoderException extends \Exception
1111
{

src/QrEncode/QrCode/QrCode.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace QrCodeSuite\QrEncode\QrCode;
3+
namespace Markenwerk\QrCodeSuite\QrEncode\QrCode;
44

55
/**
66
* Class QrCode
77
*
8-
* @package QrCodeSuite\QrEncode
8+
* @package Markenwerk\QrCodeSuite\QrEncode
99
*/
1010
class QrCode
1111
{

src/QrEncode/QrCode/QrCodePoint.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace QrCodeSuite\QrEncode\QrCode;
3+
namespace Markenwerk\QrCodeSuite\QrEncode\QrCode;
44

55
/**
66
* Class QrCodePoint
77
*
8-
* @package QrCodeSuite\QrEncode
8+
* @package Markenwerk\QrCodeSuite\QrEncode
99
*/
1010
class QrCodePoint
1111
{

src/QrEncode/QrCode/QrCodePointRow.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace QrCodeSuite\QrEncode\QrCode;
3+
namespace Markenwerk\QrCodeSuite\QrEncode\QrCode;
44

55
/**
66
* Class QrCodePointRow
77
*
8-
* @package QrCodeSuite\QrEncode
8+
* @package Markenwerk\QrCodeSuite\QrEncode
99
*/
1010
class QrCodePointRow
1111
{

src/QrEncode/QrEncoder.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?php
22

3-
namespace QrCodeSuite\QrEncode;
3+
namespace Markenwerk\QrCodeSuite\QrEncode;
44

5-
use CommonException\IoException;
6-
use QrCodeSuite\QrEncode\Exception\QrEncoderException;
7-
use QrCodeSuite\QrEncode\QrCode\QrCode;
8-
use QrCodeSuite\QrEncode\QrCode\QrCodePointRow;
9-
use QrCodeSuite\QrEncode\QrCode\QrCodePoint;
5+
use Markenwerk\CommonException\IoException;
6+
use Markenwerk\QrCodeSuite\QrEncode\Exception\QrEncoderException;
7+
use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
8+
use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCodePointRow;
9+
use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCodePoint;
1010

1111
/**
1212
* Class QrEncoder
1313
*
14-
* @package QrCodeSuite\QrEncode
14+
* @package Markenwerk\QrCodeSuite\QrEncode
1515
*/
1616
class QrEncoder
1717
{

src/QrRender/Base/QrCodeRendererInterface.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender\Base;
3+
namespace Markenwerk\QrCodeSuite\QrRender\Base;
44

5-
use QrCodeSuite\QrEncode\QrCode\QrCode;
5+
use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
66

77
/**
88
* Interface QrCodeRendererInterface
99
*
10-
* @package QrCodeSuite\QrRender\Base
10+
* @package Markenwerk\QrCodeSuite\QrRender\Base
1111
*/
1212
interface QrCodeRendererInterface
1313
{

src/QrRender/Color/CmykColor.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender\Color;
3+
namespace Markenwerk\QrCodeSuite\QrRender\Color;
44

55
/**
66
* Class CmykColor
77
*
8-
* @package QrCodeSuite\QrRender\Color
8+
* @package Markenwerk\QrCodeSuite\QrRender\Color
99
*/
1010
class CmykColor
1111
{
@@ -150,6 +150,7 @@ public function getEpsNotation()
150150

151151
/**
152152
* @param int $int
153+
* @return string
153154
*/
154155
private function colorChannelValueToOct($int)
155156
{
@@ -158,6 +159,7 @@ private function colorChannelValueToOct($int)
158159

159160
/**
160161
* @param int $int
162+
* @return string
161163
*/
162164
private function colorChannelValueToFloat($int)
163165
{

src/QrRender/Color/RgbColor.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender\Color;
3+
namespace Markenwerk\QrCodeSuite\QrRender\Color;
44

55
/**
66
* Class RgbColor
77
*
8-
* @package QrCodeSuite\QrRender\Color
8+
* @package Markenwerk\QrCodeSuite\QrRender\Color
99
*/
1010
class RgbColor
1111
{

src/QrRender/PathFinder/Path.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender\PathFinder;
3+
namespace Markenwerk\QrCodeSuite\QrRender\PathFinder;
44

55
/**
66
* Class Path
77
*
8-
* @package QrCodeSuite\QrRender\PathFinder
8+
* @package Markenwerk\QrCodeSuite\QrRender\PathFinder
99
*/
1010
class Path
1111
{

src/QrRender/PathFinder/PathPoint.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender\PathFinder;
3+
namespace Markenwerk\QrCodeSuite\QrRender\PathFinder;
44

55
/**
66
* Class PathPoint
77
*
8-
* @package QrCodeSuite\QrRender\PathFinder
8+
* @package Markenwerk\QrCodeSuite\QrRender\PathFinder
99
*/
1010
class PathPoint
1111
{

src/QrRender/PathFinder/QrCodePathFinder.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender\PathFinder;
3+
namespace Markenwerk\QrCodeSuite\QrRender\PathFinder;
44

5-
use QrCodeSuite\QrEncode\QrCode\QrCode;
5+
use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
66

77
/**
88
* Class QrCodePathFinder
99
*
10-
* @package QrCodeSuite\QrRender\PathFinder
10+
* @package Markenwerk\QrCodeSuite\QrRender\PathFinder
1111
*/
1212
class QrCodePathFinder
1313
{

src/QrRender/QrCodeRendererEps.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender;
3+
namespace Markenwerk\QrCodeSuite\QrRender;
44

5-
use CommonException\IoException;
6-
use QrCodeSuite\QrEncode\QrCode\QrCode;
7-
use QrCodeSuite\QrRender\Color\CmykColor;
8-
use QrCodeSuite\QrRender\PathFinder\PathPoint;
9-
use QrCodeSuite\QrRender\PathFinder\QrCodePathFinder;
5+
use Markenwerk\CommonException\IoException;
6+
use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
7+
use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
8+
use Markenwerk\QrCodeSuite\QrRender\PathFinder\PathPoint;
9+
use Markenwerk\QrCodeSuite\QrRender\PathFinder\QrCodePathFinder;
1010

1111
/**
1212
* Class QrCodeRendererEps
1313
*
14-
* @package QrCodeSuite\QrRender
14+
* @package Markenwerk\QrCodeSuite\QrRender
1515
*/
1616
class QrCodeRendererEps implements Base\QrCodeRendererInterface
1717
{

src/QrRender/QrCodeRendererPng.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender;
3+
namespace Markenwerk\QrCodeSuite\QrRender;
44

5-
use CommonException\IoException;
6-
use QrCodeSuite\QrEncode\QrCode\QrCode;
7-
use QrCodeSuite\QrRender\Color\RgbColor;
5+
use Markenwerk\CommonException\IoException;
6+
use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
7+
use Markenwerk\QrCodeSuite\QrRender\Color\RgbColor;
88

99
/**
1010
* Class QrCodeRendererPng
1111
*
12-
* @package QrCodeSuite\QrRender
12+
* @package Markenwerk\QrCodeSuite\QrRender
1313
*/
1414
class QrCodeRendererPng implements Base\QrCodeRendererInterface
1515
{

src/QrRender/QrCodeRendererTiff.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender;
3+
namespace Markenwerk\QrCodeSuite\QrRender;
44

5-
use CommonException\IoException;
6-
use QrCodeSuite\QrEncode\QrCode\QrCode;
7-
use QrCodeSuite\QrRender\Color\CmykColor;
5+
use Markenwerk\CommonException\IoException;
6+
use Markenwerk\QrCodeSuite\QrEncode\QrCode\QrCode;
7+
use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
88

99
/**
1010
* Class QrCodeRendererTiff
1111
*
12-
* @package QrCodeSuite\QrRender
12+
* @package Markenwerk\QrCodeSuite\QrRender
1313
*/
1414
class QrCodeRendererTiff implements Base\QrCodeRendererInterface
1515
{

test/QrEncode/QrEncoderTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?php
22

3-
namespace QrCodeSuite\QrEncode;
3+
namespace Markenwerk\QrCodeSuite\QrEncode;
44

55
/**
66
* Class QrEncoderTest
77
*
8-
* @package QrCodeSuite\QrEncode
8+
* @package Markenwerk\QrCodeSuite\QrEncode
99
*/
1010
class QrEncoderTest extends \PHPUnit_Framework_TestCase
1111
{

test/QrRender/QrCodeRendererEpsTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender;
3+
namespace Markenwerk\QrCodeSuite\QrRender;
44

5-
use QrCodeSuite\QrEncode\QrEncoder;
6-
use QrCodeSuite\QrRender\Color\CmykColor;
5+
use Markenwerk\QrCodeSuite\QrEncode\QrEncoder;
6+
use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
77

88
/**
99
* Class QrCodeRendererEpsTest
1010
*
11-
* @package QrCodeSuite\QrRender
11+
* @package Markenwerk\QrCodeSuite\QrRender
1212
*/
1313
class QrCodeRendererEpsTest extends \PHPUnit_Framework_TestCase
1414
{

test/QrRender/QrCodeRendererPngTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender;
3+
namespace Markenwerk\QrCodeSuite\QrRender;
44

5-
use QrCodeSuite\QrEncode\QrEncoder;
6-
use QrCodeSuite\QrRender\Color\RgbColor;
5+
use Markenwerk\QrCodeSuite\QrEncode\QrEncoder;
6+
use Markenwerk\QrCodeSuite\QrRender\Color\RgbColor;
77

88
/**
99
* Class QrCodeRendererPngTest
1010
*
11-
* @package QrCodeSuite\QrRender
11+
* @package Markenwerk\QrCodeSuite\QrRender
1212
*/
1313
class QrCodeRendererPngTest extends \PHPUnit_Framework_TestCase
1414
{

test/QrRender/QrCodeRendererTiffTest.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<?php
22

3-
namespace QrCodeSuite\QrRender;
3+
namespace Markenwerk\QrCodeSuite\QrRender;
44

5-
use QrCodeSuite\QrEncode\QrEncoder;
6-
use QrCodeSuite\QrRender\Color\CmykColor;
5+
use Markenwerk\QrCodeSuite\QrEncode\QrEncoder;
6+
use Markenwerk\QrCodeSuite\QrRender\Color\CmykColor;
77

88
/**
99
* Class QrCodeRendererTiffTest
1010
*
11-
* @package QrCodeSuite\QrRender
11+
* @package Markenwerk\QrCodeSuite\QrRender
1212
*/
1313
class QrCodeRendererTiffTest extends \PHPUnit_Framework_TestCase
1414
{

0 commit comments

Comments
 (0)