From f0dcceb37c4d904d4165397c0367debfa7a20a08 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 27 Mar 2014 13:00:59 +0100
Subject: [PATCH] ensure Dispatchers logger gets set when requested.

fixes #2894
---
 framework/log/Dispatcher.php | 47 +++++++++++++++++++++++++++++-------
 framework/web/User.php       |  4 +--
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/framework/log/Dispatcher.php b/framework/log/Dispatcher.php
index 7a090b9743..f1329245a4 100644
--- a/framework/log/Dispatcher.php
+++ b/framework/log/Dispatcher.php
@@ -50,6 +50,12 @@ use yii\base\Component;
  * Yii::$app->log->targets['file']->enabled = false;
  * ~~~
  *
+ * @property integer $flushInterval How many messages should be logged before they are sent to targets. This
+ * method returns the value of [[Logger::flushInterval]].
+ * @property Logger $logger The logger. If not set, [[\Yii::getLogger()]] will be used.
+ * @property integer $traceLevel How many application call stacks should be logged together with each message.
+ * This method returns the value of [[Logger::traceLevel]]. Defaults to 0.
+ *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
@@ -61,9 +67,10 @@ class Dispatcher extends Component
      */
     public $targets = [];
     /**
-     * @var Logger the logger. If not set, [[\Yii::getLogger()]] will be used.
+     * @var Logger the logger.
      */
-    public $logger;
+    private $_logger;
+
 
     /**
      * Initializes the logger by registering [[flush()]] as a shutdown function.
@@ -78,10 +85,32 @@ class Dispatcher extends Component
             }
         }
 
-        if ($this->logger === null) {
-            $this->logger = Yii::getLogger();
+        // connect logger and dispatcher
+        $this->getLogger();
+    }
+
+    /**
+     * Gets the connected logger.
+     * If not set, [[\Yii::getLogger()]] will be used.
+     * @property Logger the logger. If not set, [[\Yii::getLogger()]] will be used.
+     * @return Logger the logger.
+     */
+    public function getLogger()
+    {
+        if ($this->_logger === null) {
+            $this->_logger = Yii::getLogger();
+            $this->_logger->dispatcher = $this;
         }
-        $this->logger->dispatcher = $this;
+        return $this->_logger;
+    }
+
+    /**
+     * Sets the connected logger.
+     * @param Logger $value the logger.
+     */
+    public function setLogger($value)
+    {
+        $this->_logger = $value;
     }
 
     /**
@@ -90,7 +119,7 @@ class Dispatcher extends Component
      */
     public function getTraceLevel()
     {
-        return $this->logger->traceLevel;
+        return $this->getLogger()->traceLevel;
     }
 
     /**
@@ -101,7 +130,7 @@ class Dispatcher extends Component
      */
     public function setTraceLevel($value)
     {
-        $this->logger->traceLevel = $value;
+        $this->getLogger()->traceLevel = $value;
     }
 
     /**
@@ -110,7 +139,7 @@ class Dispatcher extends Component
      */
     public function getFlushInterval()
     {
-        return $this->logger->flushInterval;
+        return $this->getLogger()->flushInterval;
     }
 
     /**
@@ -123,7 +152,7 @@ class Dispatcher extends Component
      */
     public function setFlushInterval($value)
     {
-        $this->logger->flushInterval = $value;
+        $this->getLogger()->flushInterval = $value;
     }
 
     /**
diff --git a/framework/web/User.php b/framework/web/User.php
index 2d41474025..4df817cfc1 100644
--- a/framework/web/User.php
+++ b/framework/web/User.php
@@ -46,8 +46,8 @@ use yii\base\InvalidConfigException;
  *
  * @property string|integer $id The unique identifier for the user. If null, it means the user is a guest.
  * This property is read-only.
- * @property IdentityInterface $identity The identity object associated with the currently logged-in user.
- * Null is returned if the user is not logged in (not authenticated).
+ * @property IdentityInterface|null $identity The identity object associated with the currently logged-in
+ * user. `null` is returned if the user is not logged in (not authenticated).
  * @property boolean $isGuest Whether the current user is a guest. This property is read-only.
  * @property string $returnUrl The URL that the user should be redirected to after login. Note that the type
  * of this property differs in getter and setter. See [[getReturnUrl()]] and [[setReturnUrl()]] for details.