Merge branch 'master' of https://github.com/zendframework/zf2 into zf…

…-3371
zendframework · Jan 30, 2013 · 1100f88 · 1100f88
commit 1100f88
Show file tree

Hide file tree

Showing 117 changed files with 1,835 additions and 1,641 deletions.
diff --git a/src/AbstractValidator.php b/src/AbstractValidator.php
@@ -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_Validator
  */
 
 namespace Zend\Validator;
@@ -16,10 +15,6 @@
 use Zend\Stdlib\ArrayUtils;
 use Zend\Validator\Exception\InvalidArgumentException;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 abstract class AbstractValidator implements
     TranslatorAwareInterface,
     ValidatorInterface
@@ -303,7 +298,7 @@ protected function createMessage($messageKey, $value)
         ) {
             $value = get_class($value) . ' object';
         } elseif (is_array($value)) {
-            $value = '[' . implode(', ', $value) . ']';
+            $value = var_export($value, 1);
         } else {
             $value = (string) $value;
         }

diff --git a/src/Barcode.php b/src/Barcode.php
@@ -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_Validator
  */
 
 namespace Zend\Validator;
 
 use Traversable;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Barcode extends AbstractValidator
 {
     const INVALID        = 'barcodeInvalid';

diff --git a/src/Barcode/AbstractAdapter.php b/src/Barcode/AbstractAdapter.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 abstract class AbstractAdapter implements AdapterInterface
 {
     /**

diff --git a/src/Barcode/AdapterInterface.php b/src/Barcode/AdapterInterface.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 interface AdapterInterface
 {
     /**

diff --git a/src/Barcode/Codabar.php b/src/Barcode/Codabar.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Codabar extends AbstractAdapter
 {
     /**

diff --git a/src/Barcode/Code128.php b/src/Barcode/Code128.php
@@ -5,17 +5,23 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
+use Zend\Validator\Exception;
+use Zend\Stdlib\StringUtils;
+use Zend\Stdlib\StringWrapper\StringWrapperInterface;
+
 class Code128 extends AbstractAdapter
 {
+    /**
+     * The used string wrapper used for basic UTF-8 string functions
+     *
+     * @var SrtringWrapperInterface
+     */
+    protected $utf8StringWrapper;
+
     /**
      * Constructor for this barcode adapter
      */
@@ -72,6 +78,29 @@ public function __construct()
 
     }
 
+    public function setUtf8StringWrapper(StringWrapperInterface $utf8StringWrapper)
+    {
+        if (!$utf8StringWrapper->isSupported('UTF-8')) {
+            throw new Exception\InvalidArgumentException(
+                "The string wrapper needs to support UTF-8 character encoding"
+            );
+        }
+        $this->utf8StringWrapper = $utf8StringWrapper;
+    }
+
+    /**
+     * Get the string wrapper supporting UTF-8 character encoding
+     *
+     * @return StringWrapperInterface
+     */
+    public function getUtf8StringWrapper()
+    {
+        if (!$this->utf8StringWrapper) {
+            $this->utf8StringWrapper = StringUtils::getWrapper('UTF-8');
+        }
+        return $this->utf8StringWrapper;
+    }
+
     /**
      * Checks for allowed characters within the barcode
      *
@@ -84,16 +113,19 @@ public function hasValidCharacters($value)
             return false;
         }
 
+        // get used string wrapper for UTF-8 character encoding
+        $strWrapper = $this->getUtf8StringWrapper();
+
         // detect starting charset
         $set        = $this->getCodingSet($value);
         $read       = $set;
         if ($set != '') {
-            $value = iconv_substr($value, 1, iconv_strlen($value, 'UTF-8'), 'UTF-8');
+            $value = $strWrapper->substr($value, 1, null);
         }
 
         // process barcode
         while ($value != '') {
-            $char = iconv_substr($value, 0, 1, 'UTF-8');
+            $char = $strWrapper->substr($value, 0, 1);
 
             switch ($char) {
                 // Function definition
@@ -149,11 +181,11 @@ public function hasValidCharacters($value)
                     break;
             }
 
-            $value = iconv_substr($value, 1);
+            $value = $strWrapper->substr($value, 1, null);
             $read  = $set;
         }
 
-        if (($value != '') && (iconv_strlen($value, 'UTF-8') != 1)) {
+        if (($value != '') && ($strWrapper->strlen($value) != 1)) {
             return false;
         }
 
@@ -173,7 +205,8 @@ protected function code128($value)
         $set        = $this->getCodingSet($value);
         $read       = $set;
         $usecheck   = $this->useChecksum(null);
-        $char       = iconv_substr($value, 0, 1, 'UTF-8');
+        $strWrapper = $this->getUtf8StringWrapper();
+        $char       = $strWrapper->substr($value, 0, 1);
         if ($char == '‡') {
             $sum = 103;
         } elseif ($char == 'ˆ') {
@@ -185,11 +218,11 @@ protected function code128($value)
             return false;
         }
 
-        $value = iconv_substr($value, 1, iconv_strlen($value, 'UTF-8'), 'UTF-8');
-        while (iconv_strpos($value, 'Š') || ($value != '')) {
-            $char = iconv_substr($value, 0, 1, 'UTF-8');
+        $value = $strWrapper->substr($value, 1, null);
+        while ($strWrapper->strpos($value, 'Š') || ($value != '')) {
+            $char = $strWrapper->substr($value, 0, 1);
             if ($read == 'C') {
-                $char = iconv_substr($value, 0, 2, 'UTF-8');
+                $char = $strWrapper->substr($value, 0, 2);
             }
 
             switch ($char) {
@@ -246,22 +279,22 @@ protected function code128($value)
                     break;
             }
 
-            $value = iconv_substr($value, 1, iconv_strlen($value, 'UTF-8'), 'UTF-8');
+            $value = $strWrapper->substr($value, 1);
             ++$pos;
-            if ((iconv_strpos($value, 'Š', 0, 'UTF-8') == 1) && (iconv_strlen($value, 'UTF-8') == 2)) {
+            if (($strWrapper->strpos($value, 'Š') == 1) && ($strWrapper->strlen($value) == 2)) {
                 // break by stop and checksum char
                 break;
             }
             $read  = $set;
         }
 
-        if ((iconv_strpos($value, 'Š', 0, 'UTF-8') != 1) || (iconv_strlen($value, 'UTF-8') != 2)) {
+        if (($strWrapper->strpos($value, 'Š') != 1) || ($strWrapper->strlen($value) != 2)) {
             // return false if checksum is not readable and true if no startvalue is detected
             return (!$usecheck);
         }
 
         $mod = $sum % 103;
-        if (iconv_substr($value, 0, 1, 'UTF-8') == $this->chr128($mod, $set)) {
+        if ($strWrapper->substr($value, 0, 1) == $this->chr128($mod, $set)) {
             return true;
         }
 
@@ -276,7 +309,7 @@ protected function code128($value)
      */
     protected function getCodingSet($value)
     {
-        $value = iconv_substr($value, 0, 1, 'UTF-8');
+        $value = $this->getUtf8StringWrapper()->substr($value, 0, 1);
         switch ($value) {
             case '‡' :
                 return 'A';

diff --git a/src/Barcode/Code25.php b/src/Barcode/Code25.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Code25 extends AbstractAdapter
 {
     /**

diff --git a/src/Barcode/Code25interleaved.php b/src/Barcode/Code25interleaved.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Code25interleaved extends AbstractAdapter
 {
     /**

diff --git a/src/Barcode/Code39.php b/src/Barcode/Code39.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Code39 extends AbstractAdapter
 {
     /**

diff --git a/src/Barcode/Code39ext.php b/src/Barcode/Code39ext.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Code39ext extends AbstractAdapter
 {
     /**

diff --git a/src/Barcode/Code93.php b/src/Barcode/Code93.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Code93 extends AbstractAdapter
 {
     /**

diff --git a/src/Barcode/Code93ext.php b/src/Barcode/Code93ext.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Code93ext extends AbstractAdapter
 {
     /**

diff --git a/src/Barcode/Ean12.php b/src/Barcode/Ean12.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Ean12 extends AbstractAdapter
 {
     /**

diff --git a/src/Barcode/Ean13.php b/src/Barcode/Ean13.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Ean13 extends AbstractAdapter
 {
     /**

diff --git a/src/Barcode/Ean14.php b/src/Barcode/Ean14.php
@@ -5,15 +5,10 @@
  * @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_Validator
  */
 
 namespace Zend\Validator\Barcode;
 
-/**
- * @category   Zend
- * @package    Zend_Validator
- */
 class Ean14 extends AbstractAdapter
 {
     /**