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

Commit

Permalink
Merge branch 'master' of github.com:zendframework/zf2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maks3w
Maks3w committed Jan 11, 2013
74 parents bc81e38 + 8b02a8b + 5f2adec + 7674ec8 + 2200ed2 + f033c86 + d43a2da + 4434323 + 88b21e1 + b02b602 + b692de7 + 7f833d2 + 2eaf4da + a7848de + 5bd9f85 + d7a26e8 + 173f53d + bd77e8e + 45f017e + 118612c + 3a09f79 + 47d92bc + dbf56ad + a753b61 + 6467186 + 5ac4124 + 2bf68ca + e7cd709 + 7a552db + f112e0c + cec42fc + 066eb37 + 3569d8b + 00def10 + ecae47b + 0e552a5 + 4f854c2 + 2b17650 + c1c0447 + 73b1f80 + dd4a335 + a40eb42 + 9262db1 + bdbd950 + 6d50117 + 10b08a7 + f692a0d + ebe63d3 + 528260b + 5f04a7f + c0dcd12 + 224f280 + 8785f25 + 866539b + d711927 + e280213 + 002f0d4 + 5ffcbbe + 8937705 + 5803840 + 3d7cd9a + 6b14f0e + 24bd169 + 0eba870 + 4e4acfe + 9e243bd + e156354 + 2a84563 + 3f1f758 + 4e425f4 + 7030f97 + ea08a0f + 213ebd9 + 5d80740 commit 8f989d6
Show file tree
Hide file tree
Showing 156 changed files with 342 additions and 316 deletions.
6 changes: 3 additions & 3 deletions src/AbstractValidator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down Expand Up @@ -171,7 +171,7 @@ public function getMessages()
* Invoke as command
*
* @param mixed $value
* @return boolean
* @return bool
*/
public function __invoke($value)
{
Expand Down Expand Up @@ -499,7 +499,7 @@ public static function getDefaultTranslator()
/**
* Is there a default translation object set?
*
* @return boolean
* @return bool
*/
public static function hasDefaultTranslator()
{
Expand Down
8 changes: 4 additions & 4 deletions src/Barcode.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down Expand Up @@ -121,8 +121,8 @@ public function getChecksum()
/**
* Sets if checksum should be validated, if no value is given the actual setting is returned
*
* @param boolean $checksum
* @return boolean
* @param bool $checksum
* @return bool
*/
public function useChecksum($checksum = null)
{
Expand All @@ -135,7 +135,7 @@ public function useChecksum($checksum = null)
* Returns true if and only if $value contains a valid barcode
*
* @param string $value
* @return boolean
* @return bool
*/
public function isValid($value)
{
Expand Down
22 changes: 11 additions & 11 deletions src/Barcode/AbstractAdapter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down Expand Up @@ -31,7 +31,7 @@ abstract class AbstractAdapter implements AdapterInterface
* Checks the length of a barcode
*
* @param string $value The barcode to check for proper length
* @return boolean
* @return bool
*/
public function hasValidLength($value)
{
Expand Down Expand Up @@ -71,7 +71,7 @@ public function hasValidLength($value)
* Checks for allowed characters within the barcode
*
* @param string $value The barcode to check for allowed characters
* @return boolean
* @return bool
*/
public function hasValidCharacters($value)
{
Expand Down Expand Up @@ -102,7 +102,7 @@ public function hasValidCharacters($value)
* Validates the checksum
*
* @param string $value The barcode to check the checksum for
* @return boolean
* @return bool
*/
public function hasValidChecksum($value)
{
Expand Down Expand Up @@ -160,16 +160,16 @@ protected function setChecksum($checksum)
/**
* Sets the checksum validation, if no value is given, the actual setting is returned
*
* @param boolean $check
* @return AbstractAdapter|boolean
* @param bool $check
* @return AbstractAdapter|bool
*/
public function useChecksum($check = null)
{
if ($check === null) {
return $this->options['useChecksum'];
}

$this->options['useChecksum'] = (boolean) $check;
$this->options['useChecksum'] = (bool) $check;
return $this;
}

Expand Down Expand Up @@ -202,7 +202,7 @@ protected function setCharacters($characters)
* GTIN implementation factor 3
*
* @param string $value The barcode to validate
* @return boolean
* @return bool
*/
protected function gtin($value)
{
Expand Down Expand Up @@ -232,7 +232,7 @@ protected function gtin($value)
* IDENTCODE implementation factors 9 and 4
*
* @param string $value The barcode to validate
* @return boolean
* @return bool
*/
protected function identcode($value)
{
Expand Down Expand Up @@ -262,7 +262,7 @@ protected function identcode($value)
* CODE25 implementation factor 3
*
* @param string $value The barcode to validate
* @return boolean
* @return bool
*/
protected function code25($value)
{
Expand Down Expand Up @@ -292,7 +292,7 @@ protected function code25($value)
* POSTNET implementation
*
* @param string $value The barcode to validate
* @return boolean
* @return bool
*/
protected function postnet($value)
{
Expand Down
14 changes: 7 additions & 7 deletions src/Barcode/AdapterInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand All @@ -20,23 +20,23 @@ interface AdapterInterface
* Checks the length of a barcode
*
* @param string $value The barcode to check for proper length
* @return boolean
* @return bool
*/
public function hasValidLength($value);

/**
* Checks for allowed characters within the barcode
*
* @param string $value The barcode to check for allowed characters
* @return boolean
* @return bool
*/
public function hasValidCharacters($value);

/**
* Validates the checksum
*
* @param string $value The barcode to check the checksum for
* @return boolean
* @return bool
*/
public function hasValidChecksum($value);

Expand All @@ -57,15 +57,15 @@ public function getCharacters();
/**
* Returns if barcode uses a checksum
*
* @return boolean
* @return bool
*/
public function getChecksum();

/**
* Sets the checksum validation, if no value is given, the actual setting is returned
*
* @param boolean $check
* @return AbstractAdapter|boolean
* @param bool $check
* @return AbstractAdapter|bool
*/
public function useChecksum($check = null);
}
2 changes: 1 addition & 1 deletion src/Barcode/Codabar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
10 changes: 5 additions & 5 deletions src/Barcode/Code128.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down Expand Up @@ -76,7 +76,7 @@ public function __construct()
* Checks for allowed characters within the barcode
*
* @param string $value The barcode to check for allowed characters
* @return boolean
* @return bool
*/
public function hasValidCharacters($value)
{
Expand Down Expand Up @@ -164,7 +164,7 @@ public function hasValidCharacters($value)
* Validates the checksum ()
*
* @param string $value The barcode to validate
* @return boolean
* @return bool
*/
protected function code128($value)
{
Expand Down Expand Up @@ -406,8 +406,8 @@ protected function chr128($value, $set)
return -1;
}
} else {
if ($ord <= 106) {
return ($ord + 32);
if ($value <= 106) {
return ($value + 32);
} else {
return -1;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Code25.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Code25interleaved.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Barcode/Code39.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down Expand Up @@ -44,7 +44,7 @@ public function __construct()
* Validates the checksum (Modulo 43)
*
* @param string $value The barcode to validate
* @return boolean
* @return bool
*/
protected function code39($value)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Code39ext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Barcode/Code93.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down Expand Up @@ -45,7 +45,7 @@ public function __construct()
* Validates the checksum (Modulo CK)
*
* @param string $value The barcode to validate
* @return boolean
* @return bool
*/
protected function code93($value)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Code93ext.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Ean12.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Ean13.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Ean14.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Ean18.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Ean2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Barcode/Ean5.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand Down
4 changes: 2 additions & 2 deletions src/Barcode/Ean8.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* 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_Validator
*/
Expand All @@ -30,7 +30,7 @@ public function __construct()
* Overrides parent checkLength
*
* @param string $value Value
* @return boolean
* @return bool
*/
public function hasValidLength($value)
{
Expand Down
Loading

0 comments on commit 8f989d6

Please sign in to comment.