Merge branch 'log_interface' of https://github.com/sasezaki/zf2

zendframework · May 26, 2012 · dcc1eaf · dcc1eaf
2 parents 6f4b805 + 38cf485
commit dcc1eaf
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 132 deletions.
diff --git a/src/LoggableInterface.php b/src/LoggableInterface.php
diff --git a/src/Logger.php b/src/Logger.php
@@ -35,7 +35,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Logger implements LoggableInterface, Pluggable
+class Logger implements LoggerInterface, Pluggable
 {
     /**
      * @const int defined from the BSD Syslog message severities

diff --git a/src/LoggerAware.php b/src/LoggerAware.php
diff --git a/src/LoggerAwareInterface.php b/src/LoggerAwareInterface.php
@@ -23,7 +23,7 @@
  */
 namespace Zend\Log;
 
-use Zend\Log\Logger;
+use Zend\Log\LoggerInterface;
 
 /**
  * Logger aware interface
@@ -35,5 +35,5 @@
  */
 interface LoggerAwareInterface
 {
-    public function setLogger(Logger $logger);
+    public function setLogger(LoggerInterface $logger);
 }
diff --git a/src/Loggable.php → src/LoggerInterface.php b/src/Loggable.php → src/LoggerInterface.php
@@ -29,7 +29,7 @@
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-interface Loggable
+interface LoggerInterface
 {
     /**
      * @param string $message