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' into ValidatorMessages
Browse files Browse the repository at this point in the history
  • Loading branch information
Matej Szendi committed Nov 4, 2013
153 parents a92be28 + 5d9546f + 644a1db + 1008053 + c0d0bfc + ab83210 + 88be4ef + e672b58 + c5c6433 + 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 + 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 + ebc5f97 + 2d33c4d + 4aebbda + a47e3ed + ddb35c9 + 8a05e9b + fee3d00 + 89b4efe + aabf76f commit d2e2f88
Show file tree
Hide file tree
Showing 32 changed files with 2 additions and 117 deletions.
2 changes: 0 additions & 2 deletions src/Object/Code128.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,6 @@ protected function convertToBarcodeChars($string)
}

$currentCharset = null;
$sum = 0;
$fak = 0;
$result = array();

for ($pos = 0; $pos < strlen($string); $pos++) {
Expand Down
8 changes: 2 additions & 6 deletions test/FactoryTest.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 ZendTest\Barcode;
Expand All @@ -18,9 +17,6 @@
use ZendPdf as Pdf;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class FactoryTest extends \PHPUnit_Framework_TestCase
Expand Down Expand Up @@ -247,7 +243,7 @@ public function testBarcodeObjectFactoryWithNamespaceButWithoutExtendingObjectAb
$barcode = Barcode\Barcode::makeBarcode('barcodeNamespaceWithoutExtendingObjectAbstract');
}

public function testBarcodeObjectFactoryWithUnexistantBarcode()
public function testBarcodeObjectFactoryWithUnexistentBarcode()
{
$this->setExpectedException('Zend\ServiceManager\Exception\ServiceNotFoundException');
$barcode = Barcode\Barcode::makeBarcode('zf123', array());
Expand Down Expand Up @@ -329,7 +325,7 @@ public function testBarcodeFactoryWithNamespaceButWithoutExtendingRendererAbstra
$renderer = Barcode\Barcode::makeRenderer('rendererNamespaceWithoutExtendingRendererAbstract');
}

public function testBarcodeRendererFactoryWithUnexistantRenderer()
public function testBarcodeRendererFactoryWithUnexistentRenderer()
{
$this->setExpectedException('\Zend\ServiceManager\Exception\ServiceNotFoundException');
$renderer = Barcode\Barcode::makeRenderer('zend', array());
Expand Down
4 changes: 0 additions & 4 deletions test/Object/CodabarTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class CodabarTest extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/Code128Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Code128Test extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/Code25Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Code25Test extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/Code25interleavedTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Code25interleavedTest extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/Code39Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Code39Test extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/Ean13Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Ean13Test extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/Ean2Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Ean2Test extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/Ean5Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Ean5Test extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/Ean8Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode\Object\Ean8;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Ean8Test extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/ErrorTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class ErrorTest extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/IdentcodeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class IdentcodeTest extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/Itf14Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Itf14Test extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/LeitcodeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class LeitcodeTest extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/PlanetTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class PlanetTest extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/PostnetTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class PostnetTest extends TestCommon
Expand Down
4 changes: 0 additions & 4 deletions test/Object/RoyalmailTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,13 @@
* @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 ZendTest\Barcode\Object;

use Zend\Barcode;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class RoyalmailTest extends TestCommon
Expand Down
1 change: 0 additions & 1 deletion test/Object/TestAsset/BarcodeNamespace.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 ZendTest\Barcode\Object\TestAsset;
Expand Down
1 change: 0 additions & 1 deletion test/Object/TestAsset/BarcodeNamespaceWithoutExtendingObjectAbstract.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 ZendTest\Barcode\Object\TestAsset;
Expand Down
4 changes: 0 additions & 4 deletions test/Object/TestAsset/BarcodeTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@
* @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 ZendTest\Barcode\Object\TestAsset;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class BarcodeTest extends \Zend\Barcode\Object\AbstractObject
Expand Down
4 changes: 0 additions & 4 deletions test/Object/TestAsset/Code128Test.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,11 @@
* @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 ZendTest\Barcode\Object\TestAsset;

/**
* @category Zend
* @package Zend_Barcode
* @subpackage UnitTests
* @group Zend_Barcode
*/
class Code128Test extends \Zend\Barcode\Object\Code128
Expand Down
1 change: 0 additions & 1 deletion test/Object/TestAsset/Error.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 ZendTest\Barcode\Object\TestAsset;
Expand Down
Loading

0 comments on commit d2e2f88

Please sign in to comment.