Thanks to visit codestin.com
Credit goes to github.com

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

Commit ce7ad56

Browse files
weierophinneyweierophinney
committed
Merge branch 'hotfix/2878' into develop
Conflicts: library/Zend/File/Transfer/Adapter/AbstractAdapter.php library/Zend/File/Transfer/Adapter/Http.php tests/ZendTest/Log/Writer/AbstractTest.php tests/ZendTest/Log/Writer/DbTest.php
74 parents 07e1aab + 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 + 886d9b6 + 7893e57 + 5a59fe0 + e156354 + 2a84563 + 3f1f758 + 4e425f4 + 7030f97 + ea08a0f + 3e0fb0f + 7fc2802 + 24afec9 + 488666e commit ce7ad56

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎src/AbstractValidator.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ public static function setDefaultTranslator(
480480
Translator $translator = null, $textDomain = null
481481
)
482482
{
483-
self::$defaultTranslator = $translator;
483+
static::$defaultTranslator = $translator;
484484
if (null !== $textDomain) {
485485
self::setDefaultTranslatorTextDomain($textDomain);
486486
}
@@ -493,7 +493,7 @@ public static function setDefaultTranslator(
493493
*/
494494
public static function getDefaultTranslator()
495495
{
496-
return self::$defaultTranslator;
496+
return static::$defaultTranslator;
497497
}
498498

499499
/**
@@ -503,7 +503,7 @@ public static function getDefaultTranslator()
503503
*/
504504
public static function hasDefaultTranslator()
505505
{
506-
return (bool) self::$defaultTranslator;
506+
return (bool) static::$defaultTranslator;
507507
}
508508

509509
/**
@@ -514,7 +514,7 @@ public static function hasDefaultTranslator()
514514
*/
515515
public static function setDefaultTranslatorTextDomain($textDomain = 'default')
516516
{
517-
self::$defaultTranslatorTextDomain = $textDomain;
517+
static::$defaultTranslatorTextDomain = $textDomain;
518518
}
519519

520520
/**
@@ -524,7 +524,7 @@ public static function setDefaultTranslatorTextDomain($textDomain = 'default')
524524
*/
525525
public static function getDefaultTranslatorTextDomain()
526526
{
527-
return self::$defaultTranslatorTextDomain;
527+
return static::$defaultTranslatorTextDomain;
528528
}
529529

530530
/**
@@ -556,7 +556,7 @@ public function isTranslatorEnabled()
556556
*/
557557
public static function getMessageLength()
558558
{
559-
return self::$messageLength;
559+
return static::$messageLength;
560560
}
561561

562562
/**
@@ -566,7 +566,7 @@ public static function getMessageLength()
566566
*/
567567
public static function setMessageLength($length = -1)
568568
{
569-
self::$messageLength = $length;
569+
static::$messageLength = $length;
570570
}
571571

572572
/**

‎src/Digits.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,11 @@ public function isValid($value)
6060
return false;
6161
}
6262

63-
if (null === self::$filter) {
64-
self::$filter = new DigitsFilter();
63+
if (null === static::$filter) {
64+
static::$filter = new DigitsFilter();
6565
}
6666

67-
if ($this->getValue() !== self::$filter->filter($this->getValue())) {
67+
if ($this->getValue() !== static::$filter->filter($this->getValue())) {
6868
$this->error(self::NOT_DIGITS);
6969
return false;
7070
}

‎src/Iban.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ public function setCountryCode($countryCode = null)
180180
if ($countryCode !== null) {
181181
$countryCode = (string) $countryCode;
182182

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

237-
if (!array_key_exists($countryCode, self::$ibanRegex)) {
237+
if (!array_key_exists($countryCode, static::$ibanRegex)) {
238238
$this->setValue($countryCode);
239239
$this->error(self::NOTSUPPORTED);
240240
return false;
241241
}
242242

243-
if (!$this->allowNonSepa && !in_array($countryCode, self::$sepaCountries)) {
243+
if (!$this->allowNonSepa && !in_array($countryCode, static::$sepaCountries)) {
244244
$this->setValue($countryCode);
245245
$this->error(self::SEPANOTSUPPORTED);
246246
return false;
247247
}
248248

249-
if (!preg_match('/^' . self::$ibanRegex[$countryCode] . '$/', $value)) {
249+
if (!preg_match('/^' . static::$ibanRegex[$countryCode] . '$/', $value)) {
250250
$this->error(self::FALSEFORMAT);
251251
return false;
252252
}

‎src/StaticValidator.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static function setPluginManager(ValidatorPluginManager $plugins = null)
3333
if ($plugins instanceof ValidatorPluginManager) {
3434
$plugins->setShareByDefault(false);
3535
}
36-
self::$plugins = $plugins;
36+
static::$plugins = $plugins;
3737
}
3838

3939
/**
@@ -43,10 +43,10 @@ public static function setPluginManager(ValidatorPluginManager $plugins = null)
4343
*/
4444
public static function getPluginManager()
4545
{
46-
if (null === self::$plugins) {
46+
if (null === static::$plugins) {
4747
static::setPluginManager(new ValidatorPluginManager());
4848
}
49-
return self::$plugins;
49+
return static::$plugins;
5050
}
5151

5252
/**

0 commit comments

Comments
 (0)