Merge branch 'feature/3495' into develop

Close zendframework/zendframework#3495
zendframework · Jan 21, 2013 · 0da8a0e · 0da8a0e
2 parents 8db3bda + 6bd21e4
commit 0da8a0e
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -29,7 +29,8 @@
         "zendframework/zend-i18n": "Zend\\I18n component",
         "zendframework/zend-servicemanager": "Zend\\ServiceManager component",
         "zendframework/zend-uri": "Zend\\Uri component for UriNormalize filter",
-        "zendframework/zend-validator": "Zend\\Validator component"
+        "zendframework/zend-validator": "Zend\\Validator component",
+        "zendframework/zend-stdlib": "Zend\\Stdlib component"
     },
     "extra": {
         "branch-alias": {

diff --git a/src/AbstractFilter.php b/src/AbstractFilter.php
@@ -11,7 +11,7 @@
 namespace Zend\Filter;
 
 use Traversable;
-use Zend\Stdlib\ErrorHandler;
+use Zend\Stdlib\StringUtils;
 
 /**
  * @category   Zend
@@ -26,27 +26,13 @@ abstract class AbstractFilter implements FilterInterface
      */
     protected $options = array();
 
-    /**
-     * Is PCRE is compiled with UTF-8 and Unicode support
-     *
-     * @var bool
-     **/
-    protected static $hasPcreUnicodeSupport = null;
-
     /**
      * @return bool
+     * @deprecated Since 2.1.0
      */
     public static function hasPcreUnicodeSupport()
     {
-        if (static::$hasPcreUnicodeSupport === null) {
-            static::$hasPcreUnicodeSupport = false;
-            ErrorHandler::start();
-            if (defined('PREG_BAD_UTF8_OFFSET_ERROR') && preg_match('/\pL/u', 'a') == 1) {
-                static::$hasPcreUnicodeSupport = true;
-            }
-            ErrorHandler::stop();
-        }
-        return static::$hasPcreUnicodeSupport;
+        return StringUtils::hasPcreUnicodeSupport();
     }
 
     /**

diff --git a/src/Digits.php b/src/Digits.php
@@ -10,6 +10,8 @@
 
 namespace Zend\Filter;
 
+use Zend\Stdlib\StringUtils;
+
 /**
  * @category   Zend
  * @package    Zend_Filter
@@ -26,7 +28,7 @@ class Digits extends AbstractFilter
      */
     public function filter($value)
     {
-        if (!static::hasPcreUnicodeSupport()) {
+        if (!StringUtils::hasPcreUnicodeSupport()) {
             // POSIX named classes are not supported, use alternative 0-9 match
             $pattern = '/[^0-9]/';
         } elseif (extension_loaded('mbstring')) {

diff --git a/src/Word/CamelCaseToSeparator.php b/src/Word/CamelCaseToSeparator.php
@@ -10,6 +10,8 @@
 
 namespace Zend\Filter\Word;
 
+use Zend\Stdlib\StringUtils;
+
 /**
  * @category   Zend
  * @package    Zend_Filter
@@ -24,7 +26,7 @@ class CamelCaseToSeparator extends AbstractSeparator
      */
     public function filter($value)
     {
-        if (self::hasPcreUnicodeSupport()) {
+        if (StringUtils::hasPcreUnicodeSupport()) {
             $pattern     = array('#(?<=(?:\p{Lu}))(\p{Lu}\p{Ll})#', '#(?<=(?:\p{Ll}|\p{Nd}))(\p{Lu})#');
             $replacement = array($this->separator . '\1', $this->separator . '\1');
         } else {

diff --git a/src/Word/SeparatorToCamelCase.php b/src/Word/SeparatorToCamelCase.php
@@ -10,6 +10,8 @@
 
 namespace Zend\Filter\Word;
 
+use Zend\Stdlib\StringUtils;
+
 /**
  * @category   Zend
  * @package    Zend_Filter
@@ -27,7 +29,7 @@ public function filter($value)
         // a unicode safe way of converting characters to \x00\x00 notation
         $pregQuotedSeparator = preg_quote($this->separator, '#');
 
-        if (self::hasPcreUnicodeSupport()) {
+        if (StringUtils::hasPcreUnicodeSupport()) {
             $patterns = array(
                 '#(' . $pregQuotedSeparator.')(\p{L}{1})#u',
                 '#(^\p{Ll}{1})#u',