Merge branch 'develop' of git://github.com/zendframework/zf2 into hot…

…fix/cache-empty-namespace

src/AbstractValidator.php

@@ -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);
         }
@@ -493,7 +493,7 @@ public static function setDefaultTranslator(
      */
     public static function getDefaultTranslator()
     {
-        return self::$defaultTranslator;
+        return static::$defaultTranslator;
     }
 
     /**
@@ -503,7 +503,7 @@ public static function getDefaultTranslator()
      */
     public static function hasDefaultTranslator()
     {
-        return (bool) self::$defaultTranslator;
+        return (bool) static::$defaultTranslator;
     }
 
     /**
@@ -514,7 +514,7 @@ public static function hasDefaultTranslator()
      */
     public static function setDefaultTranslatorTextDomain($textDomain = 'default')
     {
-        self::$defaultTranslatorTextDomain = $textDomain;
+        static::$defaultTranslatorTextDomain = $textDomain;
     }
 
     /**
@@ -524,7 +524,7 @@ public static function setDefaultTranslatorTextDomain($textDomain = 'default')
      */
     public static function getDefaultTranslatorTextDomain()
     {
-        return self::$defaultTranslatorTextDomain;
+        return static::$defaultTranslatorTextDomain;
     }
 
     /**
@@ -556,7 +556,7 @@ public function isTranslatorEnabled()
      */
     public static function getMessageLength()
     {
-        return self::$messageLength;
+        return static::$messageLength;
     }
 
     /**
@@ -566,7 +566,7 @@ public static function getMessageLength()
      */
     public static function setMessageLength($length = -1)
     {
-        self::$messageLength = $length;
+        static::$messageLength = $length;
     }
 
     /**

src/Barcode/Code128.php

@@ -406,8 +406,8 @@ protected function chr128($value, $set)
                 return -1;
             }
         } else {
-            if ($ord <= 106) {
-                return ($ord + 32);
+            if ($value <= 106) {
+                return ($value + 32);
             } else {
                 return -1;
             }

src/Csrf.php

@@ -248,7 +248,7 @@ public function getSessionName()
      */
     public function setTimeout($ttl)
     {
-        $this->timeout = ($ttl !== null) ? (int)$ttl : null;
+        $this->timeout = ($ttl !== null) ? (int) $ttl : null;
         return $this;
     }
 

src/Db/AbstractDb.php

@@ -214,7 +214,7 @@ public function getField()
      */
     public function setField($field)
     {
-        $this->field = (string)$field;
+        $this->field = (string) $field;
         return $this;
     }
 
@@ -236,7 +236,7 @@ public function getTable()
      */
     public function setTable($table)
     {
-        $this->table = (string)$table;
+        $this->table = (string) $table;
         return $this;
     }
 

src/Digits.php

@@ -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;
         }