Merge pull request zendframework/zendframework#7213 from chadicus/master

Error in FirePhp log writer

src/Writer/FirePhp.php

@@ -14,7 +14,6 @@
 use Zend\Log\Exception;
 use Zend\Log\Formatter\FirePhp as FirePhpFormatter;
 use Zend\Log\Logger;
-use FirePhp\FirePhpInterface;
 
 class FirePhp extends AbstractWriter
 {
@@ -42,7 +41,7 @@ public function __construct($instance = null)
             $instance = isset($instance['instance']) ? $instance['instance'] : null;
         }
 
-        if ($instance instanceof FirePhpInterface) {
+        if ($instance !== null && !($instance instanceof FirePhp\FirePhpInterface)) {
             throw new Exception\InvalidArgumentException('You must pass a valid FirePhp\FirePhpInterface');
         }
 

test/Writer/FirePhpTest.php

@@ -89,4 +89,15 @@ public function testConstructWithOptions()
         $this->assertCount(1, $filters);
         $this->assertEquals($filter, $filters[0]);
     }
+
+    /**
+     * Verify behavior of __construct when 'instance' is not an FirePhpInterface
+     *
+     * @expectedException Zend\Log\Exception\InvalidArgumentException
+     * @expectedExceptionMessage You must pass a valid FirePhp\FirePhpInterface
+     */
+    public function testConstructWithInvalidInstance()
+    {
+        new FirePhp(new \StdClass());
+    }
 }