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

Commit

Permalink
Merged from zf2/master
Browse files Browse the repository at this point in the history
  • Loading branch information
@ezimuel
ezimuel committed Mar 27, 2012
32 parents 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 + 5651d65 + a3fbf6b + 2a0a9d7 + e987caa + 339c91f + 105863b + d697919 commit ff0efd2
Show file tree
Hide file tree
Showing 70 changed files with 150 additions and 150 deletions.
16 changes: 8 additions & 8 deletions src/Barcode.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -27,14 +27,14 @@
Zend,
Zend\Loader\Broker,
Zend\Loader\ShortNameLocator,
Zend\Stdlib\IteratorToArray;
Zend\Stdlib\ArrayUtils;

/**
* Class for generate Barcode
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Barcode
Expand Down Expand Up @@ -130,7 +130,7 @@ public static function factory($barcode,
* barcode name and separate config object.
*/
if ($barcode instanceof Traversable) {
$barcode = IteratorToArray::convert($barcode);
$barcode = ArrayUtils::iteratorToArray($barcode);
if (isset($barcode['rendererParams'])) {
$rendererConfig = $barcode['rendererParams'];
}
Expand Down Expand Up @@ -181,7 +181,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
* barcode name and separate configuration.
*/
if ($barcode instanceof Traversable) {
$barcode = IteratorToArray::convert($barcode);
$barcode = ArrayUtils::iteratorToArray($barcode);
if (isset($barcode['barcodeParams']) && is_array($barcode['barcodeParams'])) {
$barcodeConfig = $barcode['barcodeParams'];
}
Expand All @@ -192,7 +192,7 @@ public static function makeBarcode($barcode, $barcodeConfig = array())
}
}
if ($barcodeConfig instanceof Traversable) {
$barcodeConfig = IteratorToArray::convert($barcodeConfig);
$barcodeConfig = ArrayUtils::iteratorToArray($barcodeConfig);
}

/*
Expand Down Expand Up @@ -234,7 +234,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
* barcode name and separate config object.
*/
if ($renderer instanceof Traversable) {
$renderer = IteratorToArray::convert($renderer);
$renderer = ArrayUtils::iteratorToArray($renderer);
if (isset($renderer['rendererParams'])) {
$rendererConfig = $renderer['rendererParams'];
}
Expand All @@ -243,7 +243,7 @@ public static function makeRenderer($renderer = 'image', $rendererConfig = array
}
}
if ($rendererConfig instanceof Traversable) {
$rendererConfig = IteratorToArray::convert($rendererConfig);
$rendererConfig = ArrayUtils::iteratorToArray($rendererConfig);
}

/*
Expand Down
4 changes: 2 additions & 2 deletions src/Exception.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
* @uses Zend\Exception
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Exception
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/InvalidArgumentException.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id$
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand All @@ -31,7 +31,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class InvalidArgumentException
Expand Down
4 changes: 2 additions & 2 deletions src/Exception/RendererCreationException.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id$
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand All @@ -31,7 +31,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class RendererCreationException
Expand Down
4 changes: 2 additions & 2 deletions src/Object.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Object
Expand Down
8 changes: 4 additions & 4 deletions src/Object/AbstractObject.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -28,14 +28,14 @@
Zend\Barcode,
Zend\Barcode\Object\Exception,
Zend\Validator\Barcode as BarcodeValidator,
Zend\Stdlib\IteratorToArray;
Zend\Stdlib\ArrayUtils;

/**
* Class for generate Barcode
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class AbstractObject implements Barcode\Object
Expand Down Expand Up @@ -225,7 +225,7 @@ public function __construct($options = null)
$this->getDefaultOptions();
$this->font = Barcode\Barcode::getBarcodeFont();
if ($options instanceof Traversable) {
$options = IteratorToArray::convert($options);
$options = ArrayUtils::iteratorToArray($options);
}
if (is_array($options)) {
$this->setOptions($options);
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Codabar.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Codabar extends AbstractObject
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Code128.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Code25.php 20096 2010-01-06 02:05:09Z bkarwin $
*/
Expand All @@ -30,7 +30,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Code128 extends AbstractObject
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Code25.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Code25 extends AbstractObject
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Code25interleaved.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Code25interleaved extends Code25
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Code39.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Code39 extends AbstractObject
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Ean13.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Ean13 extends AbstractObject
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Ean2.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Ean2 extends Ean5
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Ean5.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Ean5 extends Ean13
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Ean8.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -32,7 +32,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Ean8 extends Ean13
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Error.php
View file
Expand Up @@ -15,7 +15,7 @@
* @category Zend
* @package Zend_Barcode
* @subpackage Object
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -29,7 +29,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class Error extends AbstractObject
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Exception.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

Expand All @@ -30,7 +30,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Exception extends BarcodeException
Expand Down
4 changes: 2 additions & 2 deletions src/Object/Exception/BarcodeValidationException.php
View file
Expand Up @@ -14,7 +14,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id$
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
Expand All @@ -31,7 +31,7 @@
*
* @category Zend
* @package Zend_Barcode
* @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com)
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
class BarcodeValidationException
Expand Down

0 comments on commit ff0efd2

Please sign in to comment.