From aa0bf9a3c79886aa5e97dcface4700dda0e6d2d2 Mon Sep 17 00:00:00 2001
From: Evgeniy Tkachenko <et.coder@gmail.com>
Date: Wed, 23 Mar 2016 16:37:42 +0300
Subject: [PATCH] phpDoc: Added null to Controller::$layout

---
 framework/base/Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/framework/base/Controller.php b/framework/base/Controller.php
index 8852d8a467..a90150d058 100644
--- a/framework/base/Controller.php
+++ b/framework/base/Controller.php
@@ -50,7 +50,7 @@ class Controller extends Component implements ViewContextInterface
      */
     public $defaultAction = 'index';
     /**
-     * @var string|boolean the name of the layout to be applied to this controller's views.
+     * @var null|string|boolean the name of the layout to be applied to this controller's views.
      * This property mainly affects the behavior of [[render()]].
      * Defaults to null, meaning the actual layout value should inherit that from [[module]]'s layout value.
      * If false, no layout will be applied.