Merge branch 'feature/4742' into develop

Close #4742
zendframework · Jun 28, 2013 · 843ddf6 · 843ddf6
2 parents c48de35 + cca992e
commit 843ddf6
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/library/Zend/Log/LoggerAwareInterface.php b/library/Zend/Log/LoggerAwareInterface.php
@@ -16,5 +16,19 @@
  */
 interface LoggerAwareInterface
 {
+    /**
+     * Set logger instance
+     *
+     * @param LoggerInterface
+     * @return void
+     */
     public function setLogger(LoggerInterface $logger);
+
+    /**
+     * Get logger instance. Currently commented out as this would possibly break
+     * existing implementations.
+     *
+     * @return null|LoggerInterface
+     */
+    // public function getLogger();
 }
diff --git a/library/Zend/Log/LoggerAwareTrait.php b/library/Zend/Log/LoggerAwareTrait.php
@@ -30,4 +30,14 @@ public function setLogger(LoggerInterface $logger)
 
         return $this;
     }
+
+    /**
+     * Get logger object
+     *
+     * @return null|LoggerInterface
+     */
+    public function getLogger()
+    {
+        return $this->logger;
+    }
 }