Merge remote-tracking branch 'upstream/master'

zendframework · Mar 13, 2013 · 239c0d0 · 239c0d0
commit 239c0d0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/Logger.php b/src/Logger.php
@@ -237,7 +237,8 @@ public function addWriter($writer, $priority = 1, array $options = null)
             $writer = $this->writerPlugin($writer, $options);
         } elseif (!$writer instanceof Writer\WriterInterface) {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Writer must implement Zend\Log\Writer; received "%s"',
+                'Writer must implement %s\Writer\WriterInterface; received "%s"',
+                __NAMESPACE__,
                 is_object($writer) ? get_class($writer) : gettype($writer)
             ));
         }

diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
@@ -131,7 +131,7 @@ public function addFilter($filter, array $options = null)
 
         if (!$filter instanceof Filter\FilterInterface) {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Writer must implement %s\Filter\FilterInterface; received "%s"',
+                'Filter must implement %s\Filter\FilterInterface; received "%s"',
                 __NAMESPACE__,
                 is_object($filter) ? get_class($filter) : gettype($filter)
             ));

diff --git a/src/Writer/ChromePhp/ChromePhpBridge.php b/src/Writer/ChromePhp/ChromePhpBridge.php
@@ -50,7 +50,7 @@ public function info($line)
      */
     public function trace($line)
     {
-        ChromePhp::error($line);
+        ChromePhp::log($line);
     }
 
     /**