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/Logger.php

@@ -496,7 +496,7 @@ public function debug($message, $extra = array())
     public static function registerErrorHandler(Logger $logger)
     {
         // Only register once per instance
-        if (self::$registeredErrorHandler) {
+        if (static::$registeredErrorHandler) {
             return false;
         }
 
@@ -536,7 +536,7 @@ public static function registerErrorHandler(Logger $logger)
                 ));
             }
         });
-        self::$registeredErrorHandler = true;
+        static::$registeredErrorHandler = true;
         return true;
     }
 
@@ -547,7 +547,7 @@ public static function registerErrorHandler(Logger $logger)
     public static function unregisterErrorHandler()
     {
         restore_error_handler();
-        self::$registeredErrorHandler = false;
+        static::$registeredErrorHandler = false;
     }
 
     /**
@@ -561,7 +561,7 @@ public static function unregisterErrorHandler()
     public static function registerExceptionHandler(Logger $logger)
     {
         // Only register once per instance
-        if (self::$registeredExceptionHandler) {
+        if (static::$registeredExceptionHandler) {
             return false;
         }
 
@@ -580,7 +580,7 @@ public static function registerExceptionHandler(Logger $logger)
             }
             $logger->log(Logger::ERR, $exception->getMessage(), $extra);
         });
-        self::$registeredExceptionHandler = true;
+        static::$registeredExceptionHandler = true;
         return true;
     }
 
@@ -590,6 +590,6 @@ public static function registerExceptionHandler(Logger $logger)
     public static function unregisterExceptionHandler()
     {
         restore_exception_handler();
-        self::$registeredExceptionHandler = false;
+        static::$registeredExceptionHandler = false;
     }
 }

src/Writer/Syslog.php

@@ -149,8 +149,8 @@ protected function initializeValidFacilities()
      */
     protected function initializeSyslog()
     {
-        self::$lastApplication = $this->appName;
-        self::$lastFacility    = $this->facility;
+        static::$lastApplication = $this->appName;
+        static::$lastFacility    = $this->facility;
         openlog($this->appName, LOG_PID, $this->facility);
     }
 
@@ -231,8 +231,8 @@ protected function doWrite(array $event)
             $priority = $this->defaultPriority;
         }
 
-        if ($this->appName !== self::$lastApplication
-            || $this->facility !== self::$lastFacility
+        if ($this->appName !== static::$lastApplication
+            || $this->facility !== static::$lastFacility
         ) {
             $this->initializeSyslog();
         }

test/Writer/AbstractTest.php

@@ -30,16 +30,6 @@ protected function setUp()
         $this->_writer = new ConcreteWriter();
     }
 
-    /**
-     * @group ZF-6085
-     */
-    public function testSetFormatter()
-    {
-        $this->_writer->setFormatter(new SimpleFormatter());
-        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException');
-        $this->_writer->setFormatter(new \StdClass());
-    }
-
     public function testSetSimpleFormatterByName()
     {
         $instance = $this->_writer->setFormatter('simple');

test/Writer/DbTest.php

@@ -197,15 +197,6 @@ public function testShutdownRemovesReferenceToDatabaseInstance()
         $this->writer->write(array('message' => 'this should fail'));
     }
 
-    /**
-     * @group ZF-10089
-     */
-    public function testThrowStrictSetFormatter()
-    {
-        $this->setExpectedException('Zend\Log\Exception\InvalidArgumentException');
-        $this->writer->setFormatter(new \StdClass());
-    }
-
     public function testWriteDateTimeAsTimestamp()
     {
         $date = new DateTime();