Fix more errors reported by phpstan.

src/Auth/Storage/SessionStorage.php

@@ -34,7 +34,7 @@ class SessionStorage implements StorageInterface
      * Stores user record array if fetched from session or false if session
      * does not have user record.
      *
-     * @var \ArrayAccess|array|bool
+     * @var \ArrayAccess|array|false
      */
     protected $_user;
 

src/Auth/Storage/StorageInterface.php

@@ -23,7 +23,7 @@ interface StorageInterface
     /**
      * Read user record.
      *
-     * @return array|null
+     * @return \ArrayAccess|array|null
      */
     public function read();
 

src/Database/Type/DateTimeType.php

@@ -148,7 +148,7 @@ public function toPHP($value, Driver $driver)
      * Convert request data into a datetime object.
      *
      * @param mixed $value Request data
-     * @return \DateTimeInterface
+     * @return \DateTimeInterface|null
      */
     public function marshal($value)
     {

src/Filesystem/Folder.php

@@ -172,7 +172,7 @@ public function pwd()
     public function cd($path)
     {
         $path = $this->realpath($path);
-        if (is_dir($path)) {
+        if ($path !== false && is_dir($path)) {
             return $this->path = $path;
         }
 

src/Http/ServerRequest.php

@@ -56,7 +56,7 @@ class ServerRequest implements ArrayAccess, ServerRequestInterface
      * In PUT/PATCH/DELETE requests this property will contain the form-urlencoded
      * data.
      *
-     * @var array
+     * @var null|array|object
      * @deprecated 3.4.0 This public property will be removed in 4.0.0. Use getData() instead.
      */
     public $data = [];

src/ORM/Association/Loader/SelectLoader.php

@@ -116,7 +116,7 @@ public function __construct(array $options)
      * iterator. The options accepted by this method are the same as `Association::eagerLoader()`
      *
      * @param array $options Same options as `Association::eagerLoader()`
-     * @return callable
+     * @return \Closure
      */
     public function buildEagerLoader(array $options)
     {
@@ -294,13 +294,14 @@ protected function _addFilteringJoin($query, $key, $subquery)
         }
         $subquery->select($filter, true);
 
+        $conditions = null;
         if (is_array($key)) {
             $conditions = $this->_createTupleCondition($query, $key, $filter, '=');
         } else {
             $filter = current($filter);
         }
 
-        $conditions = isset($conditions) ? $conditions : $query->newExpr([$key => $filter]);
+        $conditions = $conditions ?: $query->newExpr([$key => $filter]);
 
         return $query->innerJoin(
             [$aliasedTable => $subquery],

src/ORM/Locator/TableLocator.php

@@ -227,7 +227,7 @@ public function get($alias, array $options = [])
      *
      * @param string $alias The alias name you want to get.
      * @param array $options Table options array.
-     * @return string
+     * @return string|false
      */
     protected function _getClassName($alias, array $options = [])
     {

src/Utility/Inflector.php

@@ -417,7 +417,7 @@ class Inflector
      * @param string $type Inflection type
      * @param string $key Original value
      * @param string|bool $value Inflected value
-     * @return string|bool Inflected value on cache hit or false on cache miss.
+     * @return string|false Inflected value on cache hit or false on cache miss.
      */
     protected static function _cache($type, $key, $value = false)
     {

src/View/Helper/TimeHelper.php

@@ -363,7 +363,7 @@ public function format($date, $format = null, $invalid = false, $timezone = null
      * @param string|null $format Intl compatible format string.
      * @param bool|string $invalid Default value to display on invalid dates
      * @param string|\DateTimeZone|null $timezone User's timezone string or DateTimeZone object
-     * @return string Formatted and translated date string
+     * @return string|false Formatted and translated date string or value for `$invalid` on failure.
      * @throws \Exception When the date cannot be parsed
      * @see \Cake\I18n\Time::i18nFormat()
      */

src/View/Helper/UrlHelper.php

@@ -52,6 +52,7 @@ public function build($url = null, $options = false)
         }
         $options += $defaults;
 
+        /** @var string $url */
         $url = Router::url($url, $options['fullBase']);
         if ($options['escape']) {
             $url = h($url);

src/View/ViewBuilder.php

@@ -48,14 +48,14 @@ class ViewBuilder implements JsonSerializable, Serializable
     /**
      * The plugin name to use.
      *
-     * @var string
+     * @var string|null|false
      */
     protected $_plugin;
 
     /**
      * The theme name to use.
      *
-     * @var string
+     * @var string|null|false
      */
     protected $_theme;