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

Commit

Permalink
Merge branch 'hotfix/2878'
Browse files Browse the repository at this point in the history 
Close zendframework/zendframework#2878
  • Loading branch information
@weierophinney
weierophinney committed Nov 16, 2012
67 parents 4434323 + d43a2da + 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 + 488666e commit f033c86
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
14 changes: 7 additions & 7 deletions src/AbstractValidator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -480,7 +480,7 @@ public static function setDefaultTranslator(
Translator $translator = null, $textDomain = null
)
{
self::$defaultTranslator = $translator;
static::$defaultTranslator = $translator;
if (null !== $textDomain) {
self::setDefaultTranslatorTextDomain($textDomain);
}
Expand All @@ -493,7 +493,7 @@ public static function setDefaultTranslator(
*/
public static function getDefaultTranslator()
{
return self::$defaultTranslator;
return static::$defaultTranslator;
}

/**
Expand All @@ -503,7 +503,7 @@ public static function getDefaultTranslator()
*/
public static function hasDefaultTranslator()
{
return (bool) self::$defaultTranslator;
return (bool) static::$defaultTranslator;
}

/**
Expand All @@ -514,7 +514,7 @@ public static function hasDefaultTranslator()
*/
public static function setDefaultTranslatorTextDomain($textDomain = 'default')
{
self::$defaultTranslatorTextDomain = $textDomain;
static::$defaultTranslatorTextDomain = $textDomain;
}

/**
Expand All @@ -524,7 +524,7 @@ public static function setDefaultTranslatorTextDomain($textDomain = 'default')
*/
public static function getDefaultTranslatorTextDomain()
{
return self::$defaultTranslatorTextDomain;
return static::$defaultTranslatorTextDomain;
}

/**
Expand Down Expand Up @@ -556,7 +556,7 @@ public function isTranslatorEnabled()
*/
public static function getMessageLength()
{
return self::$messageLength;
return static::$messageLength;
}

/**
Expand All @@ -566,7 +566,7 @@ public static function getMessageLength()
*/
public static function setMessageLength($length = -1)
{
self::$messageLength = $length;
static::$messageLength = $length;
}

/**
Expand Down
6 changes: 3 additions & 3 deletions src/Digits.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ public function isValid($value)
return false;
}

if (null === self::$filter) {
self::$filter = new DigitsFilter();
if (null === static::$filter) {
static::$filter = new DigitsFilter();
}

if ($this->getValue() !== self::$filter->filter($this->getValue())) {
if ($this->getValue() !== static::$filter->filter($this->getValue())) {
$this->error(self::NOT_DIGITS);
return false;
}
Expand Down
8 changes: 4 additions & 4 deletions src/Iban.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ public function setCountryCode($countryCode = null)
if ($countryCode !== null) {
$countryCode = (string) $countryCode;

if (!isset(self::$ibanRegex[$countryCode])) {
if (!isset(static::$ibanRegex[$countryCode])) {
throw new Exception\InvalidArgumentException(
"Country code '{$countryCode}' invalid by ISO 3166-1 or not supported"
);
Expand Down Expand Up @@ -234,19 +234,19 @@ public function isValid($value)
$countryCode = substr($value, 0, 2);
}

if (!array_key_exists($countryCode, self::$ibanRegex)) {
if (!array_key_exists($countryCode, static::$ibanRegex)) {
$this->setValue($countryCode);
$this->error(self::NOTSUPPORTED);
return false;
}

if (!$this->allowNonSepa && !in_array($countryCode, self::$sepaCountries)) {
if (!$this->allowNonSepa && !in_array($countryCode, static::$sepaCountries)) {
$this->setValue($countryCode);
$this->error(self::SEPANOTSUPPORTED);
return false;
}

if (!preg_match('/^' . self::$ibanRegex[$countryCode] . '$/', $value)) {
if (!preg_match('/^' . static::$ibanRegex[$countryCode] . '$/', $value)) {
$this->error(self::FALSEFORMAT);
return false;
}
Expand Down
6 changes: 3 additions & 3 deletions src/StaticValidator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static function setPluginManager(ValidatorPluginManager $plugins = null)
if ($plugins instanceof ValidatorPluginManager) {
$plugins->setShareByDefault(false);
}
self::$plugins = $plugins;
static::$plugins = $plugins;
}

/**
Expand All @@ -43,10 +43,10 @@ public static function setPluginManager(ValidatorPluginManager $plugins = null)
*/
public static function getPluginManager()
{
if (null === self::$plugins) {
if (null === static::$plugins) {
static::setPluginManager(new ValidatorPluginManager());
}
return self::$plugins;
return static::$plugins;
}

/**
Expand Down

0 comments on commit f033c86

Please sign in to comment.