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 b634f09

Browse files
marc-mabemarc-mabe
committed
Merge branch 'develop' of git://github.com/zendframework/zf2 into hotfix/cache-empty-namespace
71 parents 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 + f6dc9f4 + 7674ec8 + 2200ed2 + f033c86 + 4434323 + 4e4acfe + 9e243bd + e156354 + 2a84563 + 3f1f758 + 4e425f4 + 7030f97 + ea08a0f + 213ebd9 commit b634f09

54 files changed

Lines changed: 1604 additions & 2278 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎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/Barcode/Code128.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,8 @@ protected function chr128($value, $set)
406406
return -1;
407407
}
408408
} else {
409-
if ($ord <= 106) {
410-
return ($ord + 32);
409+
if ($value <= 106) {
410+
return ($value + 32);
411411
} else {
412412
return -1;
413413
}

‎src/Csrf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ public function getSessionName()
248248
*/
249249
public function setTimeout($ttl)
250250
{
251-
$this->timeout = ($ttl !== null) ? (int)$ttl : null;
251+
$this->timeout = ($ttl !== null) ? (int) $ttl : null;
252252
return $this;
253253
}
254254

‎src/Db/AbstractDb.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public function getField()
214214
*/
215215
public function setField($field)
216216
{
217-
$this->field = (string)$field;
217+
$this->field = (string) $field;
218218
return $this;
219219
}
220220

@@ -236,7 +236,7 @@ public function getTable()
236236
*/
237237
public function setTable($table)
238238
{
239-
$this->table = (string)$table;
239+
$this->table = (string) $table;
240240
return $this;
241241
}
242242

‎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/File/Count.php‎

Lines changed: 0 additions & 252 deletions
This file was deleted.

0 commit comments

Comments
 (0)