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' into rfc/escaper
Browse files Browse the repository at this point in the history
  • Loading branch information
@padraic
padraic committed Jun 23, 2012
2 parents b6cd0c9 + dd4a335 commit bdbd950
Show file tree
Hide file tree
Showing 157 changed files with 17,690 additions and 1,299 deletions.
22 changes: 11 additions & 11 deletions src/AbstractValidator.php
View file
Expand Up @@ -18,9 +18,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator;

use Traversable,
Expand All @@ -29,15 +26,12 @@
Zend\Validator\Exception\InvalidArgumentException;

/**
* @uses \Zend\Registry
* @uses \Zend\Validator\Exception
* @uses \Zend\Validator\Validator
* @category Zend
* @package Zend_Validate
* @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 AbstractValidator implements Validator
abstract class AbstractValidator implements ValidatorInterface
{
/**
* The value to be validated
Expand Down Expand Up @@ -74,9 +68,9 @@ abstract class AbstractValidator implements Validator
* - nothing f.e. Validator()
* - one or multiple scalar values f.e. Validator($first, $second, $third)
* - an array f.e. Validator(array($first => 'first', $second => 'second', $third => 'third'))
* - an instance of Zend_Config f.e. Validator($config_instance)
* - an instance of Traversable f.e. Validator($config_instance)
*
* @param mixed $options
* @param array|Traversable $options
*/
public function __construct($options = null)
{
Expand Down Expand Up @@ -316,6 +310,8 @@ protected function createMessage($messageKey, $value)
} else {
$value = $value->__toString();
}
} else if (is_array($value)) {
$value = '[' . implode(', ', $value) . ']';
} else {
$value = (string)$value;
}
Expand All @@ -327,10 +323,14 @@ protected function createMessage($messageKey, $value)
$message = str_replace('%value%', (string) $value, $message);
foreach ($this->abstractOptions['messageVariables'] as $ident => $property) {
if (is_array($property)) {
$message = str_replace("%$ident%", (string) $this->{key($property)}[current($property)], $message);
$value = $this->{key($property)}[current($property)];
if (is_array($value)) {
$value = '[' . implode(', ', $value) . ']';
}
} else {
$message = str_replace("%$ident%", (string) $this->$property, $message);
$value = $this->$property;
}
$message = str_replace("%$ident%", (string)$value, $message);
}

$length = self::getMessageLength();
Expand Down
8 changes: 1 addition & 7 deletions src/Alnum.php
View file
Expand Up @@ -18,14 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator;

/**
* @uses \Zend\Filter\Alnum
* @uses \Zend\Validator\AbstractValidator
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down Expand Up @@ -67,8 +62,7 @@ class Alnum extends AbstractValidator
/**
* Sets default option values for this instance
*
* @param boolean|\Zend\Config\Config $allowWhiteSpace
* @return void
* @param array|\Traversable $options
*/
public function __construct($options = array())
{
Expand Down
5 changes: 1 addition & 4 deletions src/Alpha.php
View file
Expand Up @@ -18,9 +18,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator;

use Zend\Filter\Alpha as AlphaFilter;
Expand Down Expand Up @@ -65,7 +62,7 @@ class Alpha extends AbstractValidator
/**
* Sets default option values for this instance
*
* @param boolean|\Zend\Config\Config $allowWhiteSpace
* @param boolean|\Traversable $allowWhiteSpace
* @return void
*/
public function __construct($allowWhiteSpace = false)
Expand Down
21 changes: 7 additions & 14 deletions src/Barcode.php
View file
Expand Up @@ -18,15 +18,11 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator;

use Traversable;

/**
* @uses \Zend\Loader
* @uses \Zend\Validator\AbstractValidator
* @uses \Zend\Validator\Exception
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down Expand Up @@ -69,7 +65,7 @@ class Barcode extends AbstractValidator
*/
public function __construct($options = null)
{
if (!is_array($options) && !($options instanceof \Zend\Config\Config)) {
if (!is_array($options) && !($options instanceof Traversable)) {
$options = array('adapter' => $options);
}

Expand All @@ -87,7 +83,7 @@ public function __construct($options = null)
*/
public function getAdapter()
{
if (!($this->options['adapter'] instanceof Barcode\Adapter)) {
if (!($this->options['adapter'] instanceof Barcode\AdapterInterface)) {
$this->setAdapter('Ean13');
}

Expand All @@ -107,9 +103,6 @@ public function setAdapter($adapter, $options = null)
if (is_string($adapter)) {
$adapter = ucfirst(strtolower($adapter));
$adapter = 'Zend\Validator\Barcode\\' . $adapter;
if (\Zend\Loader::isReadable('Zend/Validator/Barcode/' . $adapter . '.php')) {
$adapter = 'Zend\Validator\Barcode\\' . $adapter;
}

if (!class_exists($adapter)) {
throw new Exception\InvalidArgumentException('Barcode adapter matching "' . $adapter . '" not found');
Expand All @@ -118,9 +111,9 @@ public function setAdapter($adapter, $options = null)
$this->options['adapter'] = new $adapter($options);
}

if (!$this->options['adapter'] instanceof Barcode\Adapter) {
if (!$this->options['adapter'] instanceof Barcode\AdapterInterface) {
throw new Exception\InvalidArgumentException(
"Adapter " . $adapter . " does not implement Zend\Validate\Barcode\Adapter"
"Adapter " . $adapter . " does not implement Zend\Validate\Barcode\AdapterInterface"
);
}

Expand Down Expand Up @@ -149,7 +142,7 @@ public function useChecksum($checksum = null)
}

/**
* Defined by Zend\Validator\Validator
* Defined by Zend\Validator\ValidatorInterface
*
* Returns true if and only if $value contains a valid barcode
*
Expand Down
6 changes: 1 addition & 5 deletions src/Barcode/AbstractAdapter.php
View file
Expand Up @@ -18,19 +18,15 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\Adapter
* @category Zend
* @package Zend_Validate
* @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 AbstractAdapter implements Adapter
abstract class AbstractAdapter implements AdapterInterface
{
/**
* Allowed options for this adapter
Expand Down
5 changes: 1 addition & 4 deletions src/Barcode/Adapter.php → src/Barcode/AdapterInterface.php
View file
Expand Up @@ -18,9 +18,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
Expand All @@ -29,7 +26,7 @@
* @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 Adapter
interface AdapterInterface
{
/**
* Checks the length of a barcode
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Codabar.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Code128.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Code25.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Code25interleaved.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Code39.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Code39ext.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Code93.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Code93ext.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Ean12.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Ean13.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Ean14.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Ean18.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down
4 changes: 0 additions & 4 deletions src/Barcode/Ean2.php
View file
Expand Up @@ -18,13 +18,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/

/**
* @namespace
*/
namespace Zend\Validator\Barcode;

/**
* @uses \Zend\Validator\Barcode\AbstractAdapter
* @category Zend
* @package Zend_Validate
* @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
Expand Down

0 comments on commit bdbd950

Please sign in to comment.