Fix some more doc blocks and smells. Enable further clickability in IDE.

src/Auth/DigestAuthenticate.php

@@ -132,7 +132,7 @@ public function getUser(ServerRequest $request)
      * Gets the digest headers from the request/environment.
      *
      * @param \Cake\Http\ServerRequest $request Request object.
-     * @return array Array of digest information.
+     * @return array|bool Array of digest information.
      */
     protected function _getDigest(ServerRequest $request)
     {

src/Auth/Storage/MemoryStorage.php

@@ -30,7 +30,7 @@ class MemoryStorage implements StorageInterface
     /**
      * Redirect url.
      *
-     * @var string
+     * @var string|null
      */
     protected $_redirectUrl;
 

src/Cache/Cache.php

@@ -102,7 +102,7 @@ class Cache
     /**
      * Cache Registry used for creating and using cache adapters.
      *
-     * @var \Cake\Cache\CacheRegistry
+     * @var \Cake\Core\ObjectRegistry
      */
     protected static $_registry;
 

src/Cache/Engine/FileEngine.php

@@ -36,7 +36,7 @@ class FileEngine extends CacheEngine
     /**
      * Instance of SplFileObject class
      *
-     * @var \SplFileObject
+     * @var \SplFileObject|null
      */
     protected $_File = null;
 

src/Cache/Engine/WincacheEngine.php

@@ -204,7 +204,7 @@ public function groups()
      */
     public function clearGroup($group)
     {
-        $success = null;
+        $success = false;
         wincache_ucache_inc($this->_config['prefix'] . $group, 1, $success);
 
         return $success;

src/Collection/Iterator/MapReduce.php

@@ -52,7 +52,7 @@ class MapReduce implements IteratorAggregate
     /**
      * Holds the original data that needs to be processed
      *
-     * @var \Traversable
+     * @var \Traversable|null
      */
     protected $_data;
 
@@ -74,7 +74,7 @@ class MapReduce implements IteratorAggregate
     /**
      * Count of elements emitted during the Reduce phase
      *
-     * @var string
+     * @var int
      */
     protected $_counter = 0;
 

src/Console/ConsoleInputSubcommand.php

@@ -102,7 +102,7 @@ public function help($width = 0)
     /**
      * Get the usage value for this option
      *
-     * @return mixed Either false or a ConsoleOptionParser
+     * @return \Cake\Console\ConsoleOptionParser|bool Either false or a ConsoleOptionParser
      */
     public function parser()
     {

src/Console/ConsoleOptionParser.php

@@ -100,7 +100,7 @@ class ConsoleOptionParser
     /**
      * Map of short -> long options, generated when using addOption()
      *
-     * @var string
+     * @var array
      */
     protected $_shortOptions = [];
 
@@ -501,7 +501,7 @@ public function addArgument($name, array $params = [])
             if ($a->isEqualTo($arg)) {
                 return $this;
             }
-            if ($options['required'] && !$a->isRequired()) {
+            if (!empty($options['required']) && !$a->isRequired()) {
                 throw new LogicException('A required argument cannot follow an optional one');
             }
         }

src/Console/ConsoleOutput.php

@@ -119,9 +119,9 @@ class ConsoleOutput
     ];
 
     /**
-     * formatting options for colored output
+     * Formatting options for colored output.
      *
-     * @var string
+     * @var array
      */
     protected static $_options = [
         'bold' => 1,

src/Console/HelpFormatter.php

@@ -210,6 +210,6 @@ public function xml($string = true)
             $argument->xml($arguments);
         }
 
-        return $string ? $xml->asXml() : $xml;
+        return $string ? $xml->asXML() : $xml;
     }
 }

src/Console/Shell.php

@@ -129,7 +129,7 @@ class Shell
     /**
      * Contains tasks to load and instantiate
      *
-     * @var array
+     * @var array|bool
      * @link http://book.cakephp.org/3.0/en/console-and-shells.html#Shell::$tasks
      */
     public $tasks = [];

src/Controller/Component/AuthComponent.php

@@ -192,7 +192,7 @@ class AuthComponent extends Component
     /**
      * Storage object.
      *
-     * @var \Cake\Auth\Storage\StorageInterface
+     * @var \Cake\Auth\Storage\StorageInterface|null
      */
     protected $_storage;
 

src/Controller/Component/CookieComponent.php

@@ -85,7 +85,7 @@ class CookieComponent extends Component
      *
      * Accessed in the controller using $this->Cookie->read('Name.key');
      *
-     * @var string
+     * @var array
      */
     protected $_values = [];
 
@@ -104,7 +104,7 @@ class CookieComponent extends Component
      * A reference to the Controller's Cake\Network\Response object.
      * Currently unused.
      *
-     * @var \Cake\Network\Response
+     * @var \Cake\Network\Response|null
      * @deprecated 3.4.0 Will be removed in 4.0.0
      */
     protected $_response = null;

src/Controller/Component/SecurityComponent.php

@@ -637,7 +637,7 @@ protected function _matchExistingFields($dataFields, &$expectedFields, $intKeyMe
      *
      * @param array $expectedFields Expected fields
      * @param string $missingMessage Message template
-     * @return string Error message about expected fields
+     * @return string|null Error message about expected fields
      */
     protected function _debugExpectedFields($expectedFields = [], $missingMessage = '')
     {

src/Database/Connection.php

@@ -88,9 +88,9 @@ class Connection implements ConnectionInterface
     /**
      * The schema collection object
      *
-     * @var \Cake\Database\Schema\Collection
+     * @var \Cake\Database\Schema\Collection|null
      */
-    protected $_schemaCollection;
+    protected $_schemaCollection = null;
 
     /**
      * Constructor.
@@ -612,7 +612,7 @@ public function rollbackSavepoint($name)
      */
     public function disableForeignKeys()
     {
-        $this->execute($this->_driver->disableForeignKeySql())->closeCursor();
+        $this->execute($this->_driver->disableForeignKeySQL())->closeCursor();
     }
 
     /**
@@ -622,7 +622,7 @@ public function disableForeignKeys()
      */
     public function enableForeignKeys()
     {
-        $this->execute($this->_driver->enableForeignKeySql())->closeCursor();
+        $this->execute($this->_driver->enableForeignKeySQL())->closeCursor();
     }
 
     /**

src/Database/Dialect/SqlserverDialectTrait.php

@@ -298,7 +298,7 @@ protected function _transformFunctionExpression(FunctionExpression $expression)
      * Used by Cake\Schema package to reflect schema and
      * generate schema.
      *
-     * @return \Cake\Database\Schema\MysqlSchema
+     * @return \Cake\Database\Schema\SqlserverSchema
      */
     public function schemaDialect()
     {

src/Database/Driver.php

@@ -86,7 +86,7 @@ abstract public function disconnect();
      * If first argument is passed,
      *
      * @param null|\PDO $connection The connection object
-     * @return void
+     * @return \Cake\Database\Connection
      */
     abstract public function connection($connection = null);
 
@@ -258,7 +258,7 @@ public function schemaValue($value)
             is_numeric($value) && strpos($value, ',') === false &&
             $value[0] !== '0' && strpos($value, 'e') === false)
         ) {
-            return $value;
+            return (string)$value;
         }
 
         return $this->_connection->quote($value, PDO::PARAM_STR);

src/Database/Driver/PDODriverTrait.php

@@ -27,9 +27,9 @@ trait PDODriverTrait
     /**
      * Instance of PDO.
      *
-     * @var \PDO
+     * @var \PDO|null
      */
-    protected $_connection;
+    protected $_connection = null;
 
     /**
      * Establishes a connection to the database server
@@ -79,7 +79,7 @@ public function disconnect()
     }
 
     /**
-     * Check whether or not the driver is connected.
+     * Checks whether or not the driver is connected.
      *
      * @return bool
      */
@@ -94,9 +94,8 @@ public function isConnected()
                 $connected = false;
             }
         }
-        $this->connected = !empty($connected);
 
-        return $this->connected;
+        return (bool)$connected;
     }
 
     /**

src/Database/Expression/Comparison.php

@@ -42,7 +42,7 @@ class Comparison implements ExpressionInterface, FieldInterface
     /**
      * The type to be used for casting the value to a database representation
      *
-     * @var string
+     * @var string|array
      */
     protected $_type;
 

src/Database/Expression/ValuesExpression.php

@@ -60,7 +60,7 @@ class ValuesExpression implements ExpressionInterface
      * Whether or not values have been casted to expressions
      * already.
      *
-     * @var string
+     * @var bool
      */
     protected $_castedExpressions = false;
 

src/Database/Log/LoggedQuery.php

@@ -33,14 +33,14 @@ class LoggedQuery
     /**
      * Number of milliseconds this query took to complete
      *
-     * @var float
+     * @var int
      */
     public $took = 0;
 
     /**
      * Associative array with the params bound to the query string
      *
-     * @var string
+     * @var array
      */
     public $params = [];
 
@@ -54,7 +54,7 @@ class LoggedQuery
     /**
      * The exception that was thrown by the execution of this query
      *
-     * @var \Exception
+     * @var \Exception|null
      */
     public $error;
 

src/Database/Log/LoggingStatement.php

@@ -28,7 +28,7 @@ class LoggingStatement extends StatementDecorator
     /**
      * Logger instance responsible for actually doing the logging task
      *
-     * @var \Cake\Database\Log\QueryLogger
+     * @var \Cake\Database\Log\QueryLogger|null
      */
     protected $_logger;
 
@@ -110,7 +110,7 @@ public function bindValue($column, $value, $type = 'string')
      * it returns the currently setup logger instance
      *
      * @param object|null $instance Logger object instance.
-     * @return object Logger instance
+     * @return object|null Logger instance
      */
     public function logger($instance = null)
     {

src/Database/Query.php

@@ -1618,7 +1618,7 @@ public function func()
      * iterated without having to call execute() manually, thus making it look like
      * a result set instead of the query itself.
      *
-     * @return \Iterator
+     * @return \Cake\Database\StatementInterface|null
      */
     public function getIterator()
     {

src/Database/Schema/TableSchema.php

@@ -399,7 +399,7 @@ public function columnType($name, $type = null)
      * based upon.
      *
      * @param string $column The column name to get the base type from
-     * @return string The base type name
+     * @return string|null The base type name
      */
     public function baseColumnType($column)
     {

src/Database/Statement/BufferedStatement.php

@@ -46,6 +46,7 @@ class BufferedStatement extends StatementDecorator
 
     /**
      * Current record pointer
+     *
      * @var int
      */
     protected $_counter = 0;

src/Database/Statement/StatementDecorator.php

@@ -37,7 +37,7 @@ class StatementDecorator implements StatementInterface, Countable, IteratorAggre
      * Statement instance implementation, such as PDOStatement
      * or any other custom implementation.
      *
-     * @var mixed
+     * @var \Cake\Database\StatementInterface
      */
     protected $_statement;
 

src/Database/Type.php

@@ -269,7 +269,7 @@ public static function boolval($value)
      * Will convert values into strings
      *
      * @param mixed $value The value to convert to a string.
-     * @return bool
+     * @return string
      * @deprecated 3.1.8 This method is now unused.
      */
     public static function strval($value)

src/Database/Type/DecimalType.php

@@ -72,7 +72,7 @@ public function toDatabase($value, Driver $driver)
      *
      * @param null|string|resource $value The value to convert.
      * @param \Cake\Database\Driver $driver The driver instance to convert with.
-     * @return float
+     * @return float|null
      * @throws \Cake\Core\Exception\Exception
      */
     public function toPHP($value, Driver $driver)