Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Quoc Vu committed May 9, 2013
143 parents a6b0c4e + 28d72f0 + 48c143c + acee230 + 9a49788 + efd47ef + 8dad02c + 9be7abf + bf9e60b + a03898c + 025fb19 + 6551ff4 + e5066db + 30065eb + cd23bdb + f518ed9 + 54153cf + e4984e8 + cc9c920 + b3042ce + e57fd9d + d07707d + 60d87e0 + dea915e + 4f2f391 + e61f957 + a301eb4 + 86ee99c + 4f18442 + 0560233 + 803be33 + b3b44b2 + 747588e + ff0efd2 + 5651d65 + a3fbf6b + 2a0a9d7 + e987caa + f6cf6f8 + a97175a + 18ecd64 + f00b78e + 18be569 + af6e96a + a62b890 + 369a5ce + 2f4d803 + 045137d + 2fdcee4 + 147c99e + d95685a + 9fceeb6 + 4682ed8 + 58e6c7d + f9a818b + b470c79 + ce259b2 + 47e8c8b + 62bd37a + f6216bb + 01cd418 + 1d5008a + f7d1866 + 339c91f + 105863b + d697919 + a07d04f + ab69e95 + a01fec1 + 79aa858 + e6c1f7b + caa3725 + 42e5478 + 2d5d2cd + 80ddcc5 + e2d6bae + 4d230a7 + eb81fcd + d11d08b + 260e6bd + 7ad155b + 5fc070f + c78a364 + 4941bab + c4245dd + b4f05cd + a274d7e + 9ddc5d3 + b327453 + 4fb6bdc + 589d10e + 1190c26 + 7a8c4e6 + 34dd90e + 181ab3e + 67215df + 3722470 + 760ae55 + 71ba5e4 + 5d9546f + 644a1db + 1008053 + c0d0bfc + ab83210 + 88be4ef + e672b58 + c5c6433 + 0e69738 + 5fee79a + edb69b7 + affa8ee + b842366 + 8bcb41c + 2d61aeb + 3e577bd + 2912cc2 + 480b09d + 9ef4bbd + a9fbb32 + a3442c5 + 3ba9ec5 + 249bcf9 + 17f4e58 + f5df8ff + 09c6fb7 + 244cca2 + e70f1f7 + c0ba5d9 + af32048 + e486343 + 2925378 + 7987d36 + f33a6b9 + ccec312 + c6e5159 + 5686261 + 032f44f + c050df1 + c5316e9 + e3aa8e4 + c5faeb8 + 8cb76ea + d3e8682 commit ebc5f97
Show file tree
Hide file tree
Showing 77 changed files with 368 additions and 538 deletions.
4 changes: 2 additions & 2 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.4-dev",
"dev-develop": "2.5-dev"
"dev-master": "2.2-dev",
"dev-develop": "2.3-dev"
}
},
"autoload-dev": {
Expand Down
13 changes: 4 additions & 9 deletions src/Barcode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,19 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Barcode
*/

namespace Zend\Barcode;

use Traversable;
use Zend;
use Zend\Stdlib\ArrayUtils;

/**
* Class for generate Barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Barcode
abstract class Barcode
{
/**
* Default barcode TTF font name
Expand Down Expand Up @@ -96,7 +91,7 @@ public static function getRendererPluginManager()
* @param mixed $renderer String name of renderer class
* @param mixed $barcodeConfig OPTIONAL; an array or Traversable object with barcode parameters.
* @param mixed $rendererConfig OPTIONAL; an array or Traversable object with renderer parameters.
* @param boolean $automaticRenderError OPTIONAL; set the automatic rendering of exception
* @param bool $automaticRenderError OPTIONAL; set the automatic rendering of exception
* @return Barcode
* @throws Exception\ExceptionInterface
*/
Expand Down Expand Up @@ -133,7 +128,7 @@ public static function factory($barcode,
$renderer = static::makeRenderer($renderer, $rendererConfig);
} catch (Exception\ExceptionInterface $e) {
if ($automaticRenderError && !($e instanceof Exception\RendererCreationException)) {
$barcode = static::makeBarcode('error', array( 'text' => $e->getMessage() ));
$barcode = static::makeBarcode('error', array('text' => $e->getMessage()));
$renderer = static::makeRenderer($renderer, array());
} else {
throw $e;
Expand Down
7 changes: 1 addition & 6 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Barcode
*/

namespace Zend\Barcode\Exception;

/**
* Exception for Zend_Barcode component.
*
* @category Zend
* @package Zend_Barcode
* @subpackage Exception
*/
interface ExceptionInterface
{
Expand Down
6 changes: 1 addition & 5 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Barcode
*/

namespace Zend\Barcode\Exception;

/**
* Exception for Zend_Barcode component.
*
* @category Zend
* @package Zend_Barcode
*/
class InvalidArgumentException
extends \InvalidArgumentException
Expand Down
6 changes: 1 addition & 5 deletions src/Exception/OutOfRangeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Barcode
*/

namespace Zend\Barcode\Exception;

/**
* Exception for Zend_Barcode component.
*
* @category Zend
* @package Zend_Barcode
*/
class OutOfRangeException extends \OutOfRangeException implements ExceptionInterface
{
Expand Down
6 changes: 1 addition & 5 deletions src/Exception/RendererCreationException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Barcode
*/

namespace Zend\Barcode\Exception;

/**
* Exception for Zend_Barcode component.
*
* @category Zend
* @package Zend_Barcode
*/
class RendererCreationException
extends \InvalidArgumentException
Expand Down
6 changes: 1 addition & 5 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Barcode
*/

namespace Zend\Barcode\Exception;

/**
* Exception for Zend_Barcode component.
*
* @category Zend
* @package Zend_Barcode
*/
class RuntimeException extends \RuntimeException implements ExceptionInterface
{
Expand Down
6 changes: 1 addition & 5 deletions src/Exception/UnexpectedValueException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,14 @@
* Zend Framework (http://framework.zend.com/)
*
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @package Zend_Barcode
*/

namespace Zend\Barcode\Exception;

/**
* Exception for Zend_Barcode component.
*
* @category Zend
* @package Zend_Barcode
*/
class UnexpectedValueException extends \UnexpectedValueException implements
ExceptionInterface
Expand Down
Loading

0 comments on commit ebc5f97

Please sign in to comment.