Fix doc blocks and isAutoLayoutEnabled() method.

cakephp · Sep 23, 2018 · 6407b26 · 6407b26
1 parent 4feee54
commit 6407b26
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/View/ViewBuilder.php b/src/View/ViewBuilder.php
@@ -34,14 +34,14 @@ class ViewBuilder implements JsonSerializable, Serializable
     /**
      * The subdirectory to the template.
      *
-     * @var string
+     * @var string|null
      */
     protected $_templatePath;
 
     /**
      * The template file to render.
      *
-     * @var string
+     * @var string|null
      */
     protected $_template;
 
@@ -62,28 +62,28 @@ class ViewBuilder implements JsonSerializable, Serializable
     /**
      * The layout name to render.
      *
-     * @var string
+     * @var string|null|false
      */
     protected $_layout;
 
     /**
      * Whether or not autoLayout should be enabled.
      *
-     * @var bool
+     * @var bool|null
      */
     protected $_autoLayout;
 
     /**
      * The layout path to build the view with.
      *
-     * @var string
+     * @var string|null
      */
     protected $_layoutPath;
 
     /**
      * The view variables to use
      *
-     * @var string
+     * @var string|null
      */
     protected $_name;
 
@@ -92,7 +92,7 @@ class ViewBuilder implements JsonSerializable, Serializable
      * Can either use plugin notation, a short name
      * or a fully namespaced classname.
      *
-     * @var string
+     * @var string|null
      */
     protected $_className;
 
@@ -216,7 +216,7 @@ public function enableAutoLayout($enable = true)
      */
     public function isAutoLayoutEnabled()
     {
-        return $this->_autoLayout;
+        return $this->_autoLayout !== null ? $this->_autoLayout : true;
     }
 
     /**