diff --git a/resources/functionMap.php b/resources/functionMap.php
index d5b4e6a7ea..53e751348b 100644
--- a/resources/functionMap.php
+++ b/resources/functionMap.php
@@ -13497,88 +13497,108 @@
 'Yaf_Application::getModules' => ['array'],
 'Yaf_Application::run' => ['void'],
 'Yaf_Application::setAppDirectory' => ['Yaf_Application', 'directory'=>'string'],
-'Yaf_Config_Abstract::get' => ['mixed', 'name'=>'string', 'value'=>'mixed'],
+'Yaf_Config_Abstract::__get' => ['mixed', 'name'=>'string'],
+'Yaf_Config_Abstract::__isset' => ['bool', 'name'=>'string'],
+'Yaf_Config_Abstract::count' => ['0|positive-int'],
+'Yaf_Config_Abstract::current' => ['mixed'],
+'Yaf_Config_Abstract::get' => ['mixed', 'name'=>'?string'],
+'Yaf_Config_Abstract::key' => ['int|string|null|bool'],
+'Yaf_Config_Abstract::next' => ['void'],
+'Yaf_Config_Abstract::offsetExists' => ['bool', 'name'=>'mixed'],
+'Yaf_Config_Abstract::offsetGet' => ['mixed', 'name'=>'mixed'],
+'Yaf_Config_Abstract::offsetSet' => ['void', 'name'=>'mixed', 'value'=>'mixed'],
+'Yaf_Config_Abstract::offsetUnset' => ['void', 'name'=>'mixed'],
 'Yaf_Config_Abstract::readonly' => ['bool'],
-'Yaf_Config_Abstract::set' => ['Yaf_Config_Abstract'],
+'Yaf_Config_Abstract::rewind' => ['void'],
+'Yaf_Config_Abstract::set' => ['bool', 'name' => 'string', 'value' => 'mixed'],
 'Yaf_Config_Abstract::toArray' => ['array'],
-'Yaf_Config_Ini::__construct' => ['void', 'config_file'=>'string', 'section='=>'string'],
-'Yaf_Config_Ini::__get' => ['void', 'name='=>'string'],
-'Yaf_Config_Ini::__isset' => ['void', 'name'=>'string'],
-'Yaf_Config_Ini::__set' => ['void', 'name'=>'string', 'value'=>'mixed'],
+'Yaf_Config_Abstract::valid' => ['bool'],
+'Yaf_Config_Ini::__construct' => ['void', 'config_file'=>'array<string,mixed>|string', 'section='=>'?string'],
+'Yaf_Config_Ini::__isset' => ['bool', 'name'=>'string'],
+'Yaf_Config_Ini::__set' => ['void', 'name'=>'mixed', 'value'=>'mixed'],
 'Yaf_Config_Ini::count' => ['0|positive-int'],
-'Yaf_Config_Ini::current' => ['void'],
-'Yaf_Config_Ini::get' => ['mixed', 'name='=>'mixed'],
-'Yaf_Config_Ini::key' => ['void'],
+'Yaf_Config_Ini::current' => ['mixed'],
+'Yaf_Config_Ini::get' => ['mixed', 'name='=>'?string'],
+'Yaf_Config_Ini::key' => ['int|string|null|bool'],
 'Yaf_Config_Ini::next' => ['void'],
-'Yaf_Config_Ini::offsetExists' => ['void', 'name'=>'string'],
-'Yaf_Config_Ini::offsetGet' => ['void', 'name'=>'string'],
-'Yaf_Config_Ini::offsetSet' => ['void', 'name'=>'string', 'value'=>'string'],
-'Yaf_Config_Ini::offsetUnset' => ['void', 'name'=>'string'],
-'Yaf_Config_Ini::readonly' => ['void'],
+'Yaf_Config_Ini::offsetExists' => ['bool', 'name'=>'mixed'],
+'Yaf_Config_Ini::offsetGet' => ['mixed', 'name'=>'mixed'],
+'Yaf_Config_Ini::offsetSet' => ['void', 'name'=>'mixed', 'value'=>'mixed'],
+'Yaf_Config_Ini::offsetUnset' => ['void', 'name'=>'mixed'],
+'Yaf_Config_Ini::readonly' => ['bool'],
 'Yaf_Config_Ini::rewind' => ['void'],
-'Yaf_Config_Ini::set' => ['Yaf_Config_Abstract', 'name'=>'string', 'value'=>'mixed'],
+'Yaf_Config_Ini::set' => ['bool', 'name'=>'string', 'value'=>'mixed'],
 'Yaf_Config_Ini::toArray' => ['array'],
-'Yaf_Config_Ini::valid' => ['void'],
-'Yaf_Config_Simple::__construct' => ['void', 'config_file'=>'string', 'section='=>'string'],
+'Yaf_Config_Ini::valid' => ['bool'],
+'Yaf_Config_Simple::__construct' => ['void', 'config_file'=>'array<string,mixed>|string', 'section='=>'string'],
 'Yaf_Config_Simple::__get' => ['void', 'name='=>'string'],
-'Yaf_Config_Simple::__isset' => ['void', 'name'=>'string'],
-'Yaf_Config_Simple::__set' => ['void', 'name'=>'string', 'value'=>'string'],
+'Yaf_Config_Simple::__isset' => ['bool', 'name'=>'string'],
+'Yaf_Config_Simple::__set' => ['void', 'name'=>'string', 'value'=>'mixed'],
 'Yaf_Config_Simple::count' => ['0|positive-int'],
-'Yaf_Config_Simple::current' => ['void'],
-'Yaf_Config_Simple::get' => ['mixed', 'name='=>'mixed'],
-'Yaf_Config_Simple::key' => ['void'],
+'Yaf_Config_Simple::current' => ['mixed'],
+'Yaf_Config_Simple::get' => ['mixed', 'name='=>'?string'],
+'Yaf_Config_Simple::key' => ['int|string|null|bool'],
 'Yaf_Config_Simple::next' => ['void'],
-'Yaf_Config_Simple::offsetExists' => ['void', 'name'=>'string'],
-'Yaf_Config_Simple::offsetGet' => ['void', 'name'=>'string'],
-'Yaf_Config_Simple::offsetSet' => ['void', 'name'=>'string', 'value'=>'string'],
-'Yaf_Config_Simple::offsetUnset' => ['void', 'name'=>'string'],
-'Yaf_Config_Simple::readonly' => ['void'],
+'Yaf_Config_Simple::offsetExists' => ['bool', 'name'=>'mixed'],
+'Yaf_Config_Simple::offsetGet' => ['mixed', 'name'=>'mixed'],
+'Yaf_Config_Simple::offsetSet' => ['void', 'name'=>'mixed', 'value'=>'mixed'],
+'Yaf_Config_Simple::offsetUnset' => ['void', 'name'=>'mixed'],
+'Yaf_Config_Simple::readonly' => ['bool'],
 'Yaf_Config_Simple::rewind' => ['void'],
-'Yaf_Config_Simple::set' => ['Yaf_Config_Abstract', 'name'=>'string', 'value'=>'mixed'],
+'Yaf_Config_Simple::set' => ['bool', 'name'=>'string', 'value'=>'mixed'],
 'Yaf_Config_Simple::toArray' => ['array'],
-'Yaf_Config_Simple::valid' => ['void'],
+'Yaf_Config_Simple::valid' => ['bool'],
 'Yaf_Controller_Abstract::__clone' => ['void'],
 'Yaf_Controller_Abstract::__construct' => ['void'],
-'Yaf_Controller_Abstract::display' => ['bool', 'tpl'=>'string', 'parameters='=>'array'],
-'Yaf_Controller_Abstract::forward' => ['void', 'action'=>'string', 'parameters='=>'array'],
-'Yaf_Controller_Abstract::forward\'1' => ['void', 'controller'=>'string', 'action'=>'string', 'parameters='=>'array'],
-'Yaf_Controller_Abstract::forward\'2' => ['void', 'module'=>'string', 'controller'=>'string', 'action'=>'string', 'parameters='=>'array'],
-'Yaf_Controller_Abstract::getInvokeArg' => ['void', 'name'=>'string'],
-'Yaf_Controller_Abstract::getInvokeArgs' => ['void'],
-'Yaf_Controller_Abstract::getModuleName' => ['string'],
-'Yaf_Controller_Abstract::getRequest' => ['Yaf_Request_Abstract'],
-'Yaf_Controller_Abstract::getResponse' => ['Yaf_Response_Abstract'],
-'Yaf_Controller_Abstract::getView' => ['Yaf_View_Interface'],
-'Yaf_Controller_Abstract::getViewpath' => ['void'],
+'Yaf_Controller_Abstract::display' => ['?bool', 'tpl'=>'string', 'parameters='=>'?array'],
+'Yaf_Controller_Abstract::forward' => ['?bool', 'action'=>'string'],
+'Yaf_Controller_Abstract::forward\'1' => ['?bool', 'controller'=>'string', 'action'=>'string'],
+'Yaf_Controller_Abstract::forward\'2' => ['?bool', 'action'=>'string', 'invoke_args'=>'array'],
+'Yaf_Controller_Abstract::forward\'3' => ['?bool', 'module'=>'string', 'controller'=>'string', 'action'=>'string'],
+'Yaf_Controller_Abstract::forward\'4' => ['?bool', 'controller'=>'string', 'action'=>'string', 'invoke_args'=>'array'],
+'Yaf_Controller_Abstract::forward\'5' => ['?bool', 'module'=>'string', 'controller'=>'string', 'action'=>'string', 'invoke_args'=>'array'],
+'Yaf_Controller_Abstract::getInvokeArg' => ['?string', 'name'=>'string'],
+'Yaf_Controller_Abstract::getInvokeArgs' => ['?array'],
+'Yaf_Controller_Abstract::getModuleName' => ['?string'],
+'Yaf_Controller_Abstract::getName' => ['?string'],
+'Yaf_Controller_Abstract::getRequest' => ['?Yaf_Request_Abstract'],
+'Yaf_Controller_Abstract::getResponse' => ['?Yaf_Response_Abstract'],
+'Yaf_Controller_Abstract::getView' => ['?Yaf_View_Interface'],
+'Yaf_Controller_Abstract::getViewpath' => ['?string'],
 'Yaf_Controller_Abstract::init' => ['void'],
-'Yaf_Controller_Abstract::initView' => ['void', 'options='=>'array'],
-'Yaf_Controller_Abstract::redirect' => ['bool', 'url'=>'string'],
-'Yaf_Controller_Abstract::render' => ['string', 'tpl'=>'string', 'parameters='=>'array'],
-'Yaf_Controller_Abstract::setViewpath' => ['void', 'view_directory'=>'string'],
+'Yaf_Controller_Abstract::initView' => ['?Yaf_View_Interface', 'options='=>'?array'],
+'Yaf_Controller_Abstract::redirect' => ['?bool', 'url'=>'string'],
+'Yaf_Controller_Abstract::render' => ['string|null|bool', 'tpl'=>'string', 'parameters='=>'?array'],
+'Yaf_Controller_Abstract::setViewpath' => ['?bool', 'view_directory'=>'string'],
 'Yaf_Dispatcher::__clone' => ['void'],
 'Yaf_Dispatcher::__construct' => ['void'],
 'Yaf_Dispatcher::__sleep' => ['list<string>'],
 'Yaf_Dispatcher::__wakeup' => ['void'],
-'Yaf_Dispatcher::autoRender' => ['Yaf_Dispatcher', 'flag='=>'bool'],
-'Yaf_Dispatcher::catchException' => ['Yaf_Dispatcher', 'flag='=>'bool'],
-'Yaf_Dispatcher::disableView' => ['bool'],
-'Yaf_Dispatcher::dispatch' => ['Yaf_Response_Abstract', 'request'=>'Yaf_Request_Abstract'],
-'Yaf_Dispatcher::enableView' => ['Yaf_Dispatcher'],
-'Yaf_Dispatcher::flushInstantly' => ['Yaf_Dispatcher', 'flag='=>'bool'],
-'Yaf_Dispatcher::getApplication' => ['Yaf_Application'],
-'Yaf_Dispatcher::getInstance' => ['Yaf_Dispatcher'],
-'Yaf_Dispatcher::getRequest' => ['Yaf_Request_Abstract'],
-'Yaf_Dispatcher::getRouter' => ['Yaf_Router'],
-'Yaf_Dispatcher::initView' => ['Yaf_View_Interface', 'templates_dir'=>'string', 'options='=>'array'],
-'Yaf_Dispatcher::registerPlugin' => ['Yaf_Dispatcher', 'plugin'=>'Yaf_Plugin_Abstract'],
-'Yaf_Dispatcher::returnResponse' => ['Yaf_Dispatcher', 'flag'=>'bool'],
-'Yaf_Dispatcher::setDefaultAction' => ['Yaf_Dispatcher', 'action'=>'string'],
-'Yaf_Dispatcher::setDefaultController' => ['Yaf_Dispatcher', 'controller'=>'string'],
-'Yaf_Dispatcher::setDefaultModule' => ['Yaf_Dispatcher', 'module'=>'string'],
-'Yaf_Dispatcher::setErrorHandler' => ['Yaf_Dispatcher', 'callback'=>'call', 'error_types'=>'int'],
-'Yaf_Dispatcher::setRequest' => ['Yaf_Dispatcher', 'request'=>'Yaf_Request_Abstract'],
-'Yaf_Dispatcher::setView' => ['Yaf_Dispatcher', 'view'=>'Yaf_View_Interface'],
-'Yaf_Dispatcher::throwException' => ['Yaf_Dispatcher', 'flag='=>'bool'],
+'Yaf_Dispatcher::autoRender' => ['Yaf_Dispatcher|false|null', 'flag='=>'?bool'],
+'Yaf_Dispatcher::catchException' => ['Yaf_Dispatcher|false|null', 'flag='=>'?bool'],
+'Yaf_Dispatcher::disableView' => ['?Yaf_Dispatcher'],
+'Yaf_Dispatcher::dispatch' => ['Yaf_Response_Abstract|false|null', 'request'=>'Yaf_Request_Abstract'],
+'Yaf_Dispatcher::enableView' => ['?Yaf_Dispatcher'],
+'Yaf_Dispatcher::flushInstantly' => ['Yaf_Dispatcher|false|null', 'flag='=>'?bool'],
+'Yaf_Dispatcher::getApplication' => ['?Yaf_Application'],
+'Yaf_Dispatcher::getDefaultAction' => ['?string'],
+'Yaf_Dispatcher::getDefaultController' => ['?string'],
+'Yaf_Dispatcher::getDefaultModule' => ['?string'],
+'Yaf_Dispatcher::getInstance' => ['?Yaf_Dispatcher'],
+'Yaf_Dispatcher::getRequest' => ['?Yaf_Request_Abstract'],
+'Yaf_Dispatcher::getResponse' => ['?Yaf_Response_Abstract'],
+'Yaf_Dispatcher::getRouter' => ['?Yaf_Router'],
+'Yaf_Dispatcher::initView' => ['Yaf_View_Interface|null|false', 'templates_dir'=>'string', 'options='=>'?array'],
+'Yaf_Dispatcher::registerPlugin' => ['Yaf_Dispatcher|false|null', 'plugin'=>'Yaf_Plugin_Abstract'],
+'Yaf_Dispatcher::returnResponse' => ['Yaf_Dispatcher|false|null', 'flag='=>'bool'],
+'Yaf_Dispatcher::setDefaultAction' => ['Yaf_Dispatcher|false|null', 'action'=>'string'],
+'Yaf_Dispatcher::setDefaultController' => ['Yaf_Dispatcher|false|null', 'controller'=>'string'],
+'Yaf_Dispatcher::setDefaultModule' => ['Yaf_Dispatcher|false|null', 'module'=>'string'],
+'Yaf_Dispatcher::setErrorHandler' => ['Yaf_Dispatcher|false|null', 'callback'=>'mixed', 'error_types'=>'int'],
+'Yaf_Dispatcher::setRequest' => ['?Yaf_Dispatcher', 'request'=>'Yaf_Request_Abstract'],
+'Yaf_Dispatcher::setResponse' => ['?Yaf_Dispatcher', 'response'=>'Yaf_Response_Abstract'],
+'Yaf_Dispatcher::setView' => ['?Yaf_Dispatcher', 'view'=>'Yaf_View_Interface'],
+'Yaf_Dispatcher::throwException' => ['Yaf_Dispatcher|false|null', 'flag='=>'?bool'],
 'Yaf_Exception::__construct' => ['void'],
 'Yaf_Exception::getPrevious' => ['void'],
 'Yaf_Loader::__clone' => ['void'],
@@ -13607,149 +13627,163 @@
 'Yaf_Registry::get' => ['mixed', 'name'=>'string'],
 'Yaf_Registry::has' => ['bool', 'name'=>'string'],
 'Yaf_Registry::set' => ['bool', 'name'=>'string', 'value'=>'string'],
-'Yaf_Request_Abstract::getActionName' => ['void'],
-'Yaf_Request_Abstract::getBaseUri' => ['void'],
-'Yaf_Request_Abstract::getControllerName' => ['void'],
-'Yaf_Request_Abstract::getEnv' => ['void', 'name'=>'string', 'default='=>'string'],
-'Yaf_Request_Abstract::getException' => ['void'],
-'Yaf_Request_Abstract::getLanguage' => ['void'],
-'Yaf_Request_Abstract::getMethod' => ['void'],
-'Yaf_Request_Abstract::getModuleName' => ['void'],
-'Yaf_Request_Abstract::getParam' => ['void', 'name'=>'string', 'default='=>'string'],
-'Yaf_Request_Abstract::getParams' => ['void'],
-'Yaf_Request_Abstract::getRequestUri' => ['void'],
-'Yaf_Request_Abstract::getServer' => ['void', 'name'=>'string', 'default='=>'string'],
-'Yaf_Request_Abstract::isCli' => ['void'],
-'Yaf_Request_Abstract::isDispatched' => ['void'],
-'Yaf_Request_Abstract::isGet' => ['void'],
-'Yaf_Request_Abstract::isHead' => ['void'],
-'Yaf_Request_Abstract::isOptions' => ['void'],
-'Yaf_Request_Abstract::isPost' => ['void'],
-'Yaf_Request_Abstract::isPut' => ['void'],
-'Yaf_Request_Abstract::isRouted' => ['void'],
-'Yaf_Request_Abstract::isXmlHttpRequest' => ['void'],
-'Yaf_Request_Abstract::setActionName' => ['void', 'action'=>'string'],
-'Yaf_Request_Abstract::setBaseUri' => ['bool', 'uir'=>'string'],
-'Yaf_Request_Abstract::setControllerName' => ['void', 'controller'=>'string'],
-'Yaf_Request_Abstract::setDispatched' => ['void'],
-'Yaf_Request_Abstract::setModuleName' => ['void', 'module'=>'string'],
-'Yaf_Request_Abstract::setParam' => ['void', 'name'=>'string', 'value='=>'string'],
-'Yaf_Request_Abstract::setRequestUri' => ['void', 'uir'=>'string'],
-'Yaf_Request_Abstract::setRouted' => ['void', 'flag='=>'string'],
+'Yaf_Request_Abstract::get' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Abstract::getActionName' => ['?string'],
+'Yaf_Request_Abstract::getBaseUri' => ['?string'],
+'Yaf_Request_Abstract::getCookie' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Abstract::getControllerName' => ['?string'],
+'Yaf_Request_Abstract::getEnv' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Abstract::getException' => ['?Exception'],
+'Yaf_Request_Abstract::getFiles' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Abstract::getLanguage' => ['?string'],
+'Yaf_Request_Abstract::getMethod' => ['?string'],
+'Yaf_Request_Abstract::getModuleName' => ['?string'],
+'Yaf_Request_Abstract::getParam' => ['mixed', 'name'=>'string', 'default='=>'mixed'],
+'Yaf_Request_Abstract::getParams' => ['?array'],
+'Yaf_Request_Abstract::getPost' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Abstract::getQuery' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Abstract::getRaw' => ['?string'],
+'Yaf_Request_Abstract::getRequest' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Abstract::getRequestUri' => ['?string'],
+'Yaf_Request_Abstract::getServer' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Abstract::cleanParams' => ['?Yaf_Request_Abstract'],
+'Yaf_Request_Abstract::isCli' => ['bool'],
+'Yaf_Request_Abstract::isDelete' => ['bool'],
+'Yaf_Request_Abstract::isDispatched' => ['bool'],
+'Yaf_Request_Abstract::isGet' => ['bool'],
+'Yaf_Request_Abstract::isHead' => ['bool'],
+'Yaf_Request_Abstract::isOptions' => ['bool'],
+'Yaf_Request_Abstract::isPatch' => ['bool'],
+'Yaf_Request_Abstract::isPost' => ['bool'],
+'Yaf_Request_Abstract::isPut' => ['bool'],
+'Yaf_Request_Abstract::isRouted' => ['bool'],
+'Yaf_Request_Abstract::isXmlHttpRequest' => ['bool'],
+'Yaf_Request_Abstract::setActionName' => ['?Yaf_Request_Abstract', 'action'=>'string', 'format_name='=>'bool|true'],
+'Yaf_Request_Abstract::setBaseUri' => ['Yaf_Request_Abstract|false', 'uir'=>'string'],
+'Yaf_Request_Abstract::setControllerName' => ['?Yaf_Request_Abstract', 'controller'=>'string', 'format_name='=>'bool|true'],
+'Yaf_Request_Abstract::setDispatched' => ['?Yaf_Request_Abstract', 'flag='=>'bool|true'],
+'Yaf_Request_Abstract::setModuleName' => ['?Yaf_Request_Abstract', 'module'=>'string', 'format_name='=>'bool|true'],
+'Yaf_Request_Abstract::setParam' => ['Yaf_Request_Abstract|false|null', 'name'=>'mixed', 'value='=>'?mixed'],
+'Yaf_Request_Abstract::setRequestUri' => ['?Yaf_Request_Abstract', 'uir'=>'string'],
+'Yaf_Request_Abstract::setRouted' => ['?Yaf_Request_Abstract', 'flag='=>'bool|true'],
 'Yaf_Request_Http::__clone' => ['void'],
-'Yaf_Request_Http::__construct' => ['void'],
-'Yaf_Request_Http::get' => ['mixed', 'name'=>'string', 'default='=>'string'],
-'Yaf_Request_Http::getActionName' => ['string'],
-'Yaf_Request_Http::getBaseUri' => ['string'],
-'Yaf_Request_Http::getControllerName' => ['string'],
-'Yaf_Request_Http::getCookie' => ['mixed', 'name'=>'string', 'default='=>'string'],
-'Yaf_Request_Http::getEnv' => ['mixed', 'name='=>'string', 'default='=>'mixed'],
-'Yaf_Request_Http::getException' => ['Yaf_Exception'],
-'Yaf_Request_Http::getFiles' => ['void'],
-'Yaf_Request_Http::getLanguage' => ['string'],
-'Yaf_Request_Http::getMethod' => ['string'],
-'Yaf_Request_Http::getModuleName' => ['string'],
+'Yaf_Request_Http::__construct' => ['void', 'requestUri='=>'?string', 'baseUri='=>'?string'],
+'Yaf_Request_Http::get' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Http::getActionName' => ['?string'],
+'Yaf_Request_Http::getBaseUri' => ['?string'],
+'Yaf_Request_Http::getCookie' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Http::getControllerName' => ['?string'],
+'Yaf_Request_Http::getEnv' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Http::getException' => ['?Exception'],
+'Yaf_Request_Http::getFiles' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Http::getLanguage' => ['?string'],
+'Yaf_Request_Http::getMethod' => ['?string'],
+'Yaf_Request_Http::getModuleName' => ['?string'],
 'Yaf_Request_Http::getParam' => ['mixed', 'name'=>'string', 'default='=>'mixed'],
-'Yaf_Request_Http::getParams' => ['array'],
-'Yaf_Request_Http::getPost' => ['mixed', 'name'=>'string', 'default='=>'string'],
-'Yaf_Request_Http::getQuery' => ['mixed', 'name'=>'string', 'default='=>'string'],
-'Yaf_Request_Http::getRaw' => ['mixed'],
-'Yaf_Request_Http::getRequest' => ['void'],
-'Yaf_Request_Http::getRequestUri' => ['string'],
-'Yaf_Request_Http::getServer' => ['mixed', 'name='=>'string', 'default='=>'mixed'],
+'Yaf_Request_Http::getParams' => ['?array'],
+'Yaf_Request_Http::getPost' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Http::getQuery' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Http::getRaw' => ['?string'],
+'Yaf_Request_Http::getRequest' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Http::getRequestUri' => ['?string'],
+'Yaf_Request_Http::getServer' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Http::cleanParams' => ['?Yaf_Request_Http'],
 'Yaf_Request_Http::isCli' => ['bool'],
+'Yaf_Request_Http::isDelete' => ['bool'],
 'Yaf_Request_Http::isDispatched' => ['bool'],
 'Yaf_Request_Http::isGet' => ['bool'],
 'Yaf_Request_Http::isHead' => ['bool'],
 'Yaf_Request_Http::isOptions' => ['bool'],
+'Yaf_Request_Http::isPatch' => ['bool'],
 'Yaf_Request_Http::isPost' => ['bool'],
 'Yaf_Request_Http::isPut' => ['bool'],
 'Yaf_Request_Http::isRouted' => ['bool'],
 'Yaf_Request_Http::isXmlHttpRequest' => ['bool'],
-'Yaf_Request_Http::setActionName' => ['Yaf_Request_Abstract|bool', 'action'=>'string'],
-'Yaf_Request_Http::setBaseUri' => ['bool', 'uri'=>'string'],
-'Yaf_Request_Http::setControllerName' => ['Yaf_Request_Abstract|bool', 'controller'=>'string'],
-'Yaf_Request_Http::setDispatched' => ['bool'],
-'Yaf_Request_Http::setModuleName' => ['Yaf_Request_Abstract|bool', 'module'=>'string'],
-'Yaf_Request_Http::setParam' => ['Yaf_Request_Abstract|bool', 'name'=>'array|string', 'value='=>'string'],
-'Yaf_Request_Http::setRequestUri' => ['', 'uri'=>'string'],
-'Yaf_Request_Http::setRouted' => ['Yaf_Request_Abstract|bool'],
-'Yaf_Request_Simple::__clone' => ['void'],
-'Yaf_Request_Simple::__construct' => ['void'],
-'Yaf_Request_Simple::get' => ['void'],
-'Yaf_Request_Simple::getActionName' => ['string'],
-'Yaf_Request_Simple::getBaseUri' => ['string'],
-'Yaf_Request_Simple::getControllerName' => ['string'],
-'Yaf_Request_Simple::getCookie' => ['void'],
-'Yaf_Request_Simple::getEnv' => ['mixed', 'name='=>'string', 'default='=>'mixed'],
-'Yaf_Request_Simple::getException' => ['Yaf_Exception'],
-'Yaf_Request_Simple::getFiles' => ['void'],
-'Yaf_Request_Simple::getLanguage' => ['string'],
-'Yaf_Request_Simple::getMethod' => ['string'],
-'Yaf_Request_Simple::getModuleName' => ['string'],
+'Yaf_Request_Http::setActionName' => ['?Yaf_Request_Http', 'action'=>'string', 'format_name='=>'bool|true'],
+'Yaf_Request_Http::setBaseUri' => ['Yaf_Request_Http|false', 'uir'=>'string'],
+'Yaf_Request_Http::setControllerName' => ['?Yaf_Request_Http', 'controller'=>'string', 'format_name='=>'bool|true'],
+'Yaf_Request_Http::setDispatched' => ['?Yaf_Request_Http', 'flag='=>'bool|true'],
+'Yaf_Request_Http::setModuleName' => ['?Yaf_Request_Http', 'module'=>'string', 'format_name='=>'bool|true'],
+'Yaf_Request_Http::setParam' => ['Yaf_Request_Http|false|null', 'name'=>'mixed', 'value='=>'?mixed'],
+'Yaf_Request_Http::setRequestUri' => ['?Yaf_Request_Http', 'uir'=>'string'],
+'Yaf_Request_Http::setRouted' => ['?Yaf_Request_Http', 'flag='=>'bool|true'],
+'Yaf_Request_Simple::__construct' => ['void', 'method='=>'?string', 'module='=>'?string', 'controller='=>'?string', 'action='=>'?string', 'params='=>'?array'],
+'Yaf_Request_Simple::get' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Simple::getActionName' => ['?string'],
+'Yaf_Request_Simple::getBaseUri' => ['?string'],
+'Yaf_Request_Simple::getCookie' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Simple::getControllerName' => ['?string'],
+'Yaf_Request_Simple::getEnv' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Simple::getException' => ['?Exception'],
+'Yaf_Request_Simple::getFiles' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Simple::getLanguage' => ['?string'],
+'Yaf_Request_Simple::getMethod' => ['?string'],
+'Yaf_Request_Simple::getModuleName' => ['?string'],
 'Yaf_Request_Simple::getParam' => ['mixed', 'name'=>'string', 'default='=>'mixed'],
-'Yaf_Request_Simple::getParams' => ['array'],
-'Yaf_Request_Simple::getPost' => ['void'],
-'Yaf_Request_Simple::getQuery' => ['void'],
-'Yaf_Request_Simple::getRequest' => ['void'],
-'Yaf_Request_Simple::getRequestUri' => ['string'],
-'Yaf_Request_Simple::getServer' => ['mixed', 'name='=>'string', 'default='=>'mixed'],
+'Yaf_Request_Simple::getParams' => ['?array'],
+'Yaf_Request_Simple::getPost' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Simple::getQuery' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Simple::getRaw' => ['?string'],
+'Yaf_Request_Simple::getRequest' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Simple::getRequestUri' => ['?string'],
+'Yaf_Request_Simple::getServer' => ['mixed', 'name='=>'?string', 'default='=>'?mixed'],
+'Yaf_Request_Simple::cleanParams' => ['?Yaf_Request_Simple'],
 'Yaf_Request_Simple::isCli' => ['bool'],
+'Yaf_Request_Simple::isDelete' => ['bool'],
 'Yaf_Request_Simple::isDispatched' => ['bool'],
 'Yaf_Request_Simple::isGet' => ['bool'],
 'Yaf_Request_Simple::isHead' => ['bool'],
 'Yaf_Request_Simple::isOptions' => ['bool'],
+'Yaf_Request_Simple::isPatch' => ['bool'],
 'Yaf_Request_Simple::isPost' => ['bool'],
 'Yaf_Request_Simple::isPut' => ['bool'],
 'Yaf_Request_Simple::isRouted' => ['bool'],
-'Yaf_Request_Simple::isXmlHttpRequest' => ['void'],
-'Yaf_Request_Simple::setActionName' => ['Yaf_Request_Abstract|bool', 'action'=>'string'],
-'Yaf_Request_Simple::setBaseUri' => ['bool', 'uri'=>'string'],
-'Yaf_Request_Simple::setControllerName' => ['Yaf_Request_Abstract|bool', 'controller'=>'string'],
-'Yaf_Request_Simple::setDispatched' => ['bool'],
-'Yaf_Request_Simple::setModuleName' => ['Yaf_Request_Abstract|bool', 'module'=>'string'],
-'Yaf_Request_Simple::setParam' => ['Yaf_Request_Abstract|bool', 'name'=>'array|string', 'value='=>'string'],
-'Yaf_Request_Simple::setRequestUri' => ['', 'uri'=>'string'],
-'Yaf_Request_Simple::setRouted' => ['Yaf_Request_Abstract|bool'],
+'Yaf_Request_Simple::isXmlHttpRequest' => ['bool'],
+'Yaf_Request_Simple::setActionName' => ['?Yaf_Request_Simple', 'action'=>'string', 'format_name='=>'bool|true'],
+'Yaf_Request_Simple::setBaseUri' => ['Yaf_Request_Simple|false', 'uir'=>'string'],
+'Yaf_Request_Simple::setControllerName' => ['?Yaf_Request_Simple', 'controller'=>'string', 'format_name='=>'bool|true'],
+'Yaf_Request_Simple::setDispatched' => ['?Yaf_Request_Simple', 'flag='=>'bool|true'],
+'Yaf_Request_Simple::setModuleName' => ['?Yaf_Request_Simple', 'module'=>'string', 'format_name='=>'bool|true'],
+'Yaf_Request_Simple::setParam' => ['Yaf_Request_Simple|bool|null', 'name'=>'mixed', 'value='=>'?mixed'],
+'Yaf_Request_Simple::setRequestUri' => ['?Yaf_Request_Simple', 'uir'=>'string'],
+'Yaf_Request_Simple::setRouted' => ['?Yaf_Request_Simple', 'flag='=>'bool|true'],
 'Yaf_Response_Abstract::__clone' => ['void'],
 'Yaf_Response_Abstract::__construct' => ['void'],
 'Yaf_Response_Abstract::__destruct' => ['void'],
 'Yaf_Response_Abstract::__toString' => ['string'],
-'Yaf_Response_Abstract::appendBody' => ['bool', 'content'=>'string', 'key='=>'string'],
-'Yaf_Response_Abstract::clearBody' => ['bool', 'key='=>'string'],
-'Yaf_Response_Abstract::clearHeaders' => ['void'],
-'Yaf_Response_Abstract::getBody' => ['mixed', 'key='=>'string'],
-'Yaf_Response_Abstract::getHeader' => ['void'],
-'Yaf_Response_Abstract::prependBody' => ['bool', 'content'=>'string', 'key='=>'string'],
-'Yaf_Response_Abstract::response' => ['void'],
-'Yaf_Response_Abstract::setAllHeaders' => ['void'],
-'Yaf_Response_Abstract::setBody' => ['bool', 'content'=>'string', 'key='=>'string'],
-'Yaf_Response_Abstract::setHeader' => ['void'],
-'Yaf_Response_Abstract::setRedirect' => ['void'],
-'Yaf_Response_Cli::__clone' => [''],
+'Yaf_Response_Abstract::appendBody' => ['Yaf_Response_Abstract|false|null', 'body'=>'string', 'name='=>'?string'],
+'Yaf_Response_Abstract::clearBody' => ['?Yaf_Response_Abstract', 'name='=>'?string'],
+'Yaf_Response_Abstract::getBody' => ['mixed', 'name='=>'string'],
+'Yaf_Response_Abstract::prependBody' => ['Yaf_Response_Abstract|false|null', 'body'=>'string', 'name='=>'?string'],
+'Yaf_Response_Abstract::response' => ['bool'],
+'Yaf_Response_Abstract::setBody' => ['Yaf_Response_Abstract|false|null', 'body'=>'string', 'name='=>'?string'],
+'Yaf_Response_Abstract::setRedirect' => ['?bool', 'url'=>'string'],
+'Yaf_Response_Cli::__clone' => ['void'],
 'Yaf_Response_Cli::__construct' => ['void'],
-'Yaf_Response_Cli::__destruct' => [''],
+'Yaf_Response_Cli::__destruct' => ['void'],
 'Yaf_Response_Cli::__toString' => ['string'],
-'Yaf_Response_Cli::appendBody' => ['bool', 'content'=>'string', 'key='=>'string'],
-'Yaf_Response_Cli::clearBody' => ['bool', 'key='=>'string'],
-'Yaf_Response_Cli::getBody' => ['mixed', 'key='=>'null|string'],
-'Yaf_Response_Cli::prependBody' => ['bool', 'content'=>'string', 'key='=>'string'],
-'Yaf_Response_Cli::setBody' => ['bool', 'content'=>'string', 'key='=>'string'],
-'Yaf_Response_Http::__clone' => [''],
+'Yaf_Response_Cli::appendBody' => ['Yaf_Response_Cli|false|null', 'body'=>'string', 'name='=>'?string'],
+'Yaf_Response_Cli::clearBody' => ['?Yaf_Response_Cli', 'name='=>'?string'],
+'Yaf_Response_Cli::getBody' => ['mixed', 'name='=>'string'],
+'Yaf_Response_Cli::prependBody' => ['Yaf_Response_Cli|false|null', 'body'=>'string', 'name='=>'?string'],
+'Yaf_Response_Cli::response' => ['bool'],
+'Yaf_Response_Cli::setBody' => ['Yaf_Response_Cli|false|null', 'body'=>'string', 'name='=>'?string'],
+'Yaf_Response_Cli::setRedirect' => ['?bool', 'url'=>'string'],'Yaf_Response_Http::__clone' => [''],
+'Yaf_Response_Http::__clone' => ['void'],
 'Yaf_Response_Http::__construct' => ['void'],
-'Yaf_Response_Http::__destruct' => [''],
+'Yaf_Response_Http::__destruct' => ['void'],
 'Yaf_Response_Http::__toString' => ['string'],
-'Yaf_Response_Http::appendBody' => ['bool', 'content'=>'string', 'key='=>'string'],
-'Yaf_Response_Http::clearBody' => ['bool', 'key='=>'string'],
-'Yaf_Response_Http::clearHeaders' => ['Yaf_Response_Abstract|false', 'name='=>'string'],
-'Yaf_Response_Http::getBody' => ['mixed', 'key='=>'null|string'],
+'Yaf_Response_Http::appendBody' => ['Yaf_Response_Http|false|null', 'body'=>'string', 'name='=>'?string'],
+'Yaf_Response_Http::clearHeaders' => ['Yaf_Response_Http|false|null'],
+'Yaf_Response_Http::clearBody' => ['?Yaf_Response_Http', 'name='=>'?string'],
+'Yaf_Response_Http::getBody' => ['mixed', 'name='=>'string'],
 'Yaf_Response_Http::getHeader' => ['mixed', 'name='=>'string'],
-'Yaf_Response_Http::prependBody' => ['bool', 'content'=>'string', 'key='=>'string'],
-'Yaf_Response_Http::response' => ['bool'],
+'Yaf_Response_Http::prependBody' => ['Yaf_Response_Http|false|null', 'body'=>'string', 'name='=>'?string'],
+'Yaf_Response_Http::response' => ['?bool'],
 'Yaf_Response_Http::setAllHeaders' => ['bool', 'headers'=>'array'],
-'Yaf_Response_Http::setBody' => ['bool', 'content'=>'string', 'key='=>'string'],
-'Yaf_Response_Http::setHeader' => ['bool', 'name'=>'string', 'value'=>'string', 'replace='=>'bool|false', 'response_code='=>'int'],
-'Yaf_Response_Http::setRedirect' => ['bool', 'url'=>'string'],
+'Yaf_Response_Http::setBody' => ['Yaf_Response_Http|false|null', 'body'=>'string', 'name='=>'?string'],
+'Yaf_Response_Http::setHeader' => ['?bool', 'name'=>'string', 'value'=>'string', 'replace='=>'bool|false', 'response_code='=>'int'],
+'Yaf_Response_Http::setRedirect' => ['?bool', 'url'=>'string'],
 'Yaf_Route_Interface::__construct' => ['void'],
 'Yaf_Route_Interface::assemble' => ['string', 'info'=>'array', 'query='=>'array'],
 'Yaf_Route_Interface::route' => ['bool', 'request'=>'Yaf_Request_Abstract'],
@@ -13812,23 +13846,24 @@
 'Yaf_Session::set' => ['Yaf_Session|bool', 'name'=>'string', 'value'=>'mixed'],
 'Yaf_Session::start' => ['void'],
 'Yaf_Session::valid' => ['void'],
-'Yaf_View_Interface::assign' => ['bool', 'name'=>'string', 'value='=>'string'],
-'Yaf_View_Interface::display' => ['bool', 'tpl'=>'string', 'tpl_vars='=>'array'],
-'Yaf_View_Interface::getScriptPath' => ['void'],
-'Yaf_View_Interface::render' => ['string', 'tpl'=>'string', 'tpl_vars='=>'array'],
-'Yaf_View_Interface::setScriptPath' => ['void', 'template_dir'=>'string'],
-'Yaf_View_Simple::__construct' => ['void', 'tempalte_dir'=>'string', 'options='=>'array'],
-'Yaf_View_Simple::__get' => ['void', 'name='=>'string'],
-'Yaf_View_Simple::__isset' => ['void', 'name'=>'string'],
+'Yaf_View_Interface::assign' => ['Yaf_View_Interface|bool', 'name'=>'string', 'value='=>'?mixed'],
+'Yaf_View_Interface::display' => ['Yaf_View_Interface|bool', 'tpl'=>'string', 'tpl_vars='=>'?array'],
+'Yaf_View_Interface::getScriptPath' => ['string'],
+'Yaf_View_Interface::render' => ['string|bool', 'tpl'=>'string', 'tpl_vars='=>'?array'],
+'Yaf_View_Interface::setScriptPath' => ['bool', 'template_dir'=>'string'],
+'Yaf_View_Simple::__construct' => ['void', 'tempalte_dir'=>'string', 'options='=>'?array'],
+'Yaf_View_Simple::__get' => ['mixed', 'name='=>'?string'],
+'Yaf_View_Simple::__isset' => ['bool', 'name'=>'string'],
 'Yaf_View_Simple::__set' => ['void', 'name'=>'string', 'value'=>'mixed'],
-'Yaf_View_Simple::assign' => ['bool', 'name'=>'string', 'value='=>'mixed'],
-'Yaf_View_Simple::assignRef' => ['bool', 'name'=>'string', '&rw_value'=>'mixed'],
-'Yaf_View_Simple::clear' => ['bool', 'name='=>'string'],
-'Yaf_View_Simple::display' => ['bool', 'tpl'=>'string', 'tpl_vars='=>'array'],
-'Yaf_View_Simple::eval' => ['string', 'tpl_content'=>'string', 'tpl_vars='=>'array'],
-'Yaf_View_Simple::getScriptPath' => ['string'],
-'Yaf_View_Simple::render' => ['string', 'tpl'=>'string', 'tpl_vars='=>'array'],
-'Yaf_View_Simple::setScriptPath' => ['bool', 'template_dir'=>'string'],
+'Yaf_View_Simple::assign' => ['Yaf_View_Simple|false|null', 'name='=>'?mixed', 'default='=>'?mixed'],
+'Yaf_View_Simple::assignRef' => ['?Yaf_View_Simple', 'name'=>'string', '&value'=>'mixed'],
+'Yaf_View_Simple::clear' => ['?Yaf_View_Simple', 'name='=>'string'],
+'Yaf_View_Simple::display' => ['?bool', 'tpl'=>'string', 'tpl_vars='=>'?array'],
+'Yaf_View_Simple::eval' => ['string|null|false', 'tpl_str'=>'string', 'vars='=>'?array'],
+'Yaf_View_Simple::get' => ['mixed', 'name='=>'?string'],
+'Yaf_View_Simple::getScriptPath' => ['?string'],
+'Yaf_View_Simple::render' => ['string|null|false', 'tpl'=>'string', 'tpl_vars='=>'?array'],
+'Yaf_View_Simple::setScriptPath' => ['Yaf_View_Simple|false|null', 'template_dir'=>'string'],
 'yaml_emit' => ['string', 'data'=>'mixed', 'encoding='=>'int', 'linebreak='=>'int'],
 'yaml_emit_file' => ['bool', 'filename'=>'string', 'data'=>'mixed', 'encoding='=>'int', 'linebreak='=>'int'],
 'yaml_parse' => ['mixed', 'input'=>'string', 'pos='=>'int', '&w_ndocs='=>'int', 'callbacks='=>'array'],