Merge pull request #11194 from lustyrain/2.x

fixed basic.php miss PHPDocs

lib/Cake/basics.php

@@ -196,7 +196,7 @@ if (!function_exists('h')) {
  *    implement a `__toString` method. Otherwise the class name will be used.
  * @param bool $double Encode existing html entities
  * @param string $charset Character set to use when escaping. Defaults to config value in 'App.encoding' or 'UTF-8'
- * @return string Wrapped text
+ * @return string|array|object Wrapped text, Wrapped Array or Wrapped Object
  * @link https://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#h
  */
 	function h($text, $double = true, $charset = null) {