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

Commit

Permalink
Merge branch 'hotfix/ZF-11878' of https://github.com/thomasweidner/zf2 …
Browse files Browse the repository at this point in the history 
…into hotfix/zf-11878
  • Loading branch information
@weierophinney
weierophinney committed Nov 11, 2011
54 parents 6c3cd60 + ef1c96f + a259e6a + 1e034f5 + c54ce3b + 424e491 + c77add4 + 73ab6b0 + b7af510 + de52bea + a34a04c + ac8cce1 + b770346 + 6744f59 + d9d953e + bde13ca + 9fb0d4b + 8d10fba + fbd8f3f + 40cb888 + 3c17fc2 + 8ea395e + df65e36 + ebc923d + 384df88 + 60fb990 + 158f7a3 + 614a3dd + 201952b + 542d5b2 + 3d0c414 + eb59e8e + 9201686 + c18a81f + db481a0 + 70c6ab9 + 291f5db + f3c7d4b + 94f014f + bd0bd85 + 5a9d140 + b699281 + c75dc15 + d827092 + 2da11be + 80b065f + 8bda3ed + 2aa543c + 6bcd384 + f140509 + b6685fb + 028dec7 + 1f3e385 + d76b397 commit 7d18607
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
16 changes: 8 additions & 8 deletions src/Alnum.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,15 +64,15 @@ class Alnum extends AbstractFilter
* @param boolean $allowWhiteSpace
* @return void
*/
public function __construct($options = null)
public function __construct($options = false)
{
if ($options instanceof Config) {
$options = $options->toArray();
} elseif (!is_array($options)) {
$options = func_get_args();
$temp = array();
if (!empty($options)) {
$temp['allowwhitespace'] = array_shift($options);
$temp['allowWhiteSpace'] = array_shift($options);
}

if (!empty($options)) {
Expand All @@ -86,8 +86,8 @@ public function __construct($options = null)
self::$unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
}

if (array_key_exists('allowwhitespace', $options)) {
$this->setAllowWhiteSpace($options['allowwhitespace']);
if (array_key_exists('allowWhiteSpace', $options)) {
$this->setAllowWhiteSpace($options['allowWhiteSpace']);
}

if (!array_key_exists('locale', $options)) {
Expand Down Expand Up @@ -156,14 +156,14 @@ public function filter($value)
if (!self::$unicodeEnabled) {
// POSIX named classes are not supported, use alternative a-zA-Z0-9 match
$pattern = '/[^a-zA-Z0-9' . $whiteSpace . ']/';
} elseif (((string) $this->locale == 'ja')
|| ((string) $this->locale == 'ko')
} elseif (((string) $this->locale == 'ja')
|| ((string) $this->locale == 'ko')
|| ((string) $this->locale == 'zh')
) {
// The Alphabet means english alphabet.
// Use english alphabeth
$pattern = '/[^a-zA-Z0-9' . $whiteSpace . ']/u';
} else {
// The Alphabet means each language's alphabet.
// Use native language alphabeth
$pattern = '/[^\p{L}\p{N}' . $whiteSpace . ']/u';
}

Expand Down
14 changes: 7 additions & 7 deletions src/Alpha.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public function __construct($options = false)
$options = func_get_args();
$temp = array();
if (!empty($options)) {
$temp['allowwhitespace'] = array_shift($options);
$temp['allowWhiteSpace'] = array_shift($options);
}

if (!empty($options)) {
Expand All @@ -86,8 +86,8 @@ public function __construct($options = false)
self::$unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
}

if (array_key_exists('allowwhitespace', $options)) {
$this->setAllowWhiteSpace($options['allowwhitespace']);
if (array_key_exists('allowWhiteSpace', $options)) {
$this->setAllowWhiteSpace($options['allowWhiteSpace']);
}

if (!array_key_exists('locale', $options)) {
Expand Down Expand Up @@ -156,14 +156,14 @@ public function filter($value)
if (!self::$unicodeEnabled) {
// POSIX named classes are not supported, use alternative a-zA-Z match
$pattern = '/[^a-zA-Z' . $whiteSpace . ']/';
} elseif (((string) $this->locale == 'ja')
|| ((string) $this->locale == 'ko')
} elseif (((string) $this->locale == 'ja')
|| ((string) $this->locale == 'ko')
|| ((string) $this->locale == 'zh')
) {
// The Alphabet means english alphabet.
// Use english alphabeth
$pattern = '/[^a-zA-Z' . $whiteSpace . ']/u';
} else {
// The Alphabet means each language's alphabet.
// Use native language alphabeth
$pattern = '/[^\p{L}' . $whiteSpace . ']/u';
}

Expand Down
6 changes: 3 additions & 3 deletions test/AlnumTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
namespace ZendTest\Filter;

use Zend\Filter\Alnum as AlnumFilter,
Zend\Locale\Locale,
Zend\Locale\Locale as ZendLocale,
Zend\Registry;

/**
Expand Down Expand Up @@ -75,7 +75,7 @@ public function setUp()
self::$_unicodeEnabled = (@preg_match('/\pL/u', 'a')) ? true : false;
}
if (null === self::$_meansEnglishAlphabet) {
$this->_locale = new Locale('auto');
$this->_locale = new ZendLocale('auto');
self::$_meansEnglishAlphabet = in_array($this->_locale->getLanguage(),
array('ja')
);
Expand Down Expand Up @@ -189,7 +189,7 @@ public function testAllowWhiteSpace()
*/
public function testRegistryLocale()
{
$locale = new Locale('ja');
$locale = new ZendLocale('ja');
\Zend\Registry::set('Zend_Locale', $locale);

if (!self::$_unicodeEnabled) {
Expand Down

0 comments on commit 7d18607

Please sign in to comment.