Merge branch 'master' into 3.next

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;
 
@@ -283,7 +283,7 @@ class ViewBuilder implements JsonSerializable, Serializable
      * Returns if CakePHP's conventional mode of applying layout files is enabled.
      * Disabled means that layouts will not be automatically applied to rendered views.
      *
-     * @return bool
+     * @return bool|null
      */
     public function isAutoLayoutEnabled()
     {
@@ -637,7 +637,7 @@ class ViewBuilder implements JsonSerializable, Serializable
     /**
      * Gets the view classname.
      *
-     * @return string
+     * @return string|null
      */
     public function getClassName()
     {