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

src/Decode.php

@@ -76,15 +76,15 @@ public static function splitMime($body, $boundary)
      */
     public static function splitMessageStruct($message, $boundary, $EOL = Mime::LINEEND)
     {
-        $parts = self::splitMime($message, $boundary);
+        $parts = static::splitMime($message, $boundary);
         if (count($parts) <= 0) {
             return null;
         }
         $result = array();
         $headers = null; // "Declare" variable before the first usage "for reading"
         $body    = null; // "Declare" variable before the first usage "for reading"
         foreach ($parts as $part) {
-            self::splitMessage($part, $headers, $body, $EOL);
+            static::splitMessage($part, $headers, $body, $EOL);
             $result[] = array('header' => $headers,
                               'body'   => $body    );
         }
@@ -155,7 +155,7 @@ public static function splitMessage($message, &$headers, &$body, $EOL = Mime::LI
      */
     public static function splitContentType($type, $wantedPart = null)
     {
-        return self::splitHeaderField($type, $wantedPart, 'type');
+        return static::splitHeaderField($type, $wantedPart, 'type');
     }
 
     /**

src/Mime.php

@@ -99,7 +99,7 @@ class Mime
      */
     public static function isPrintable($str)
     {
-        return (strcspn($str, self::$qpKeysString) == strlen($str));
+        return (strcspn($str, static::$qpKeysString) == strlen($str));
     }
 
     /**
@@ -154,7 +154,7 @@ public static function encodeQuotedPrintable($str,
     private static function _encodeQuotedPrintable($str)
     {
         $str = str_replace('=', '=3D', $str);
-        $str = str_replace(self::$qpKeys, self::$qpReplaceValues, $str);
+        $str = str_replace(static::$qpKeys, static::$qpReplaceValues, $str);
         $str = rtrim($str);
         return $str;
     }
@@ -191,7 +191,7 @@ public static function encodeQuotedPrintableHeader($str, $charset,
         $tmp = "";
         while (strlen($str) > 0) {
             $currentLine = max(count($lines)-1, 0);
-            $token       = self::getNextQuotedPrintableToken($str);
+            $token       = static::getNextQuotedPrintableToken($str);
             $str         = substr($str, strlen($token));
 
             $tmp .= $token;
@@ -253,7 +253,7 @@ public static function encodeBase64Header($str,
         $suffix = '?=';
         $remainingLength = $lineLength - strlen($prefix) - strlen($suffix);
 
-        $encodedValue = self::encodeBase64($str, $remainingLength, $lineEnd);
+        $encodedValue = static::encodeBase64($str, $remainingLength, $lineEnd);
         $encodedValue = str_replace($lineEnd, $suffix . $lineEnd . ' ' . $prefix, $encodedValue);
         $encodedValue = $prefix . $encodedValue . $suffix;
         return $encodedValue;
@@ -285,7 +285,7 @@ public function __construct($boundary = null)
     {
         // This string needs to be somewhat unique
         if ($boundary === null) {
-            $this->boundary = '=_' . md5(microtime(1) . self::$makeUnique++);
+            $this->boundary = '=_' . md5(microtime(1) . static::$makeUnique++);
         } else {
             $this->boundary = $boundary;
         }
@@ -303,10 +303,10 @@ public static function encode($str, $encoding, $EOL = self::LINEEND)
     {
         switch ($encoding) {
             case self::ENCODING_BASE64:
-                return self::encodeBase64($str, self::LINELENGTH, $EOL);
+                return static::encodeBase64($str, self::LINELENGTH, $EOL);
 
             case self::ENCODING_QUOTEDPRINTABLE:
-                return self::encodeQuotedPrintable($str, self::LINELENGTH, $EOL);
+                return static::encodeQuotedPrintable($str, self::LINELENGTH, $EOL);
 
             default:
                 /**