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

Commit

Permalink
Merge branch 'master' of git://github.com/zendframework/zf2
Browse files Browse the repository at this point in the history 
Fixed files permissions
  • Loading branch information
Grzegorz Drozd committed Feb 28, 2013
132 parents c88fa2f + 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 + ab83210 + 88be4ef + e672b58 + c5c6433 + a6b0c4e + 28d72f0 + 48c143c + acee230 + 9a49788 + efd47ef + 8dad02c + 9be7abf + bf9e60b + a03898c + 025fb19 + 6551ff4 + e5066db + 30065eb + cd23bdb + f518ed9 + 54153cf + e4984e8 + cc9c920 + b3042ce + 7ad155b + 5fc070f + c78a364 + 4941bab + c4245dd + b4f05cd + a274d7e + 9ddc5d3 + b327453 + 4fb6bdc + 589d10e + 1190c26 + 7a8c4e6 + 34dd90e + 181ab3e + 67215df + 3722470 + 760ae55 + 71ba5e4 + 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 commit c5faeb8
Show file tree
Hide file tree
Showing 47 changed files with 19 additions and 188 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.1-dev",
"dev-develop": "2.2-dev"
}
},
"autoload-dev": {
Expand Down
6 changes: 1 addition & 5 deletions src/Barcode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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;
Expand All @@ -15,11 +14,8 @@

/**
* Class for generate Barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Barcode
abstract class Barcode
{
/**
* Default barcode TTF font name
Expand Down
5 changes: 0 additions & 5 deletions src/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
4 changes: 0 additions & 4 deletions src/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
4 changes: 0 additions & 4 deletions src/Exception/OutOfRangeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
4 changes: 0 additions & 4 deletions src/Exception/RendererCreationException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
4 changes: 0 additions & 4 deletions src/Exception/RuntimeException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
4 changes: 0 additions & 4 deletions src/Exception/UnexpectedValueException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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
4 changes: 0 additions & 4 deletions src/Object/AbstractObject.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;
Expand All @@ -17,9 +16,6 @@

/**
* Class for generate Barcode
*
* @category Zend
* @package Zend_Barcode
*/
abstract class AbstractObject implements ObjectInterface
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Codabar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;

/**
* Class for generate Codabar barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Codabar extends AbstractObject
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Code128.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;

/**
* Class for generate Code128 barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Code128 extends AbstractObject
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Code25.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;

/**
* Class for generate Interleaved 2 of 5 barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Code25 extends AbstractObject
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Code25interleaved.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;

/**
* Class for generate Interleaved 2 of 5 barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Code25interleaved extends Code25
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Code39.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;

/**
* Class for generate Code39 barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Code39 extends AbstractObject
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Ean13.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;

/**
* Class for generate Ean13 barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Ean13 extends AbstractObject
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Ean2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;

/**
* Class for generate Ean2 barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Ean2 extends Ean5
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Ean5.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;

/**
* Class for generate Ean5 barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Ean5 extends Ean13
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Ean8.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;
Expand All @@ -14,9 +13,6 @@

/**
* Class for generate Ean8 barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Ean8 extends Ean13
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Error.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object;

/**
* Class for generate Barcode
*
* @category Zend
* @package Zend_Barcode
*/
class Error extends AbstractObject
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Exception/BarcodeValidationException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object\Exception;

/**
* Exception for Zend_Barcode component.
*
* @category Zend
* @package Zend_Barcode
*/
class BarcodeValidationException extends InvalidArgumentException
{
Expand Down
5 changes: 0 additions & 5 deletions src/Object/Exception/ExceptionInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object\Exception;
Expand All @@ -14,10 +13,6 @@

/**
* Base exception interface for barcode objects
*
* @category Zend
* @package Zend_Barcode
* @subpackage Object_Exception
*/
interface ExceptionInterface extends Exception
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Exception/ExtensionNotLoadedException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,12 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object\Exception;

/**
* Exception for Zend_Barcode component.
*
* @category Zend
* @package Zend_Barcode
*/
class ExtensionNotLoadedException extends RuntimeException
{
Expand Down
4 changes: 0 additions & 4 deletions src/Object/Exception/InvalidArgumentException.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* @link http://github.com/zendframework/zf2 for the canonical source repository
* @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\Object\Exception;
Expand All @@ -14,9 +13,6 @@

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

0 comments on commit c5faeb8

Please # to comment.