diff --git a/cake/basics.php b/cake/basics.php
index 251983926..2dc63ae7c 100644
--- a/cake/basics.php
+++ b/cake/basics.php
@@ -799,7 +799,7 @@
  * @param array $array Array to sort
  * @param string $sortby Sort by this key
  * @param string $order  Sort order asc/desc (ascending or descending).
- * @param int $type Type of sorting to perform
+ * @param integer $type Type of sorting to perform
  * @return mixed Sorted array
  */
 		function sortByKey(&$array, $sortby, $order = 'asc', $type = SORT_NUMERIC) {
@@ -1273,7 +1273,7 @@
  *
  * @param string $singular Singular text to translate
  * @param string $plural Plural text
- * @param int $count Count
+ * @param integer $count Count
  * @param bool $return true to return, false to echo
  * @return mixed plural form of translated string if $return is false string will be echoed
  */
@@ -1317,7 +1317,7 @@
  * @param string $domain Domain
  * @param string $singular Singular string to translate
  * @param string $plural Plural
- * @param int $count Count
+ * @param integer $count Count
  * @param bool $return true to return, false to echo
  * @return plural form of translated string if $return is false string will be echoed
  */
@@ -1350,7 +1350,7 @@
  *
  * @param string $domain Domain
  * @param string $msg Message to translate
- * @param int $category Category
+ * @param integer $category Category
  * @param bool $return true to return, false to echo
  * @return translated string if $return is false string will be echoed
  */
@@ -1386,8 +1386,8 @@
  * @param string $domain Domain
  * @param string $singular Singular string to translate
  * @param string $plural Plural
- * @param int $count Count
- * @param int $category Category
+ * @param integer $count Count
+ * @param integer $category Category
  * @param bool $return true to return, false to echo
  * @return plural form of translated string if $return is false string will be echoed
  */
@@ -1416,7 +1416,7 @@
  * LC_ALL       6
  *
  * @param string $msg String to translate
- * @param int $category Category
+ * @param integer $category Category
  * @param string $return true to return, false to echo
  * @return translated string if $return is false string will be echoed
  */
diff --git a/cake/console/libs/acl.php b/cake/console/libs/acl.php
index f269f8b58..1c662a56d 100644
--- a/cake/console/libs/acl.php
+++ b/cake/console/libs/acl.php
@@ -452,7 +452,7 @@ class AclShell extends Shell {
  * Checks that given node exists
  *
  * @param string $type Node type (ARO/ACO)
- * @param int $id Node id
+ * @param integer $id Node id
  * @return boolean Success
  * @access public
  */
diff --git a/cake/console/libs/shell.php b/cake/console/libs/shell.php
index 54e8e3c09..20ae11b3e 100644
--- a/cake/console/libs/shell.php
+++ b/cake/console/libs/shell.php
@@ -395,7 +395,7 @@ class Shell extends Object {
 /**
  * Will check the number args matches otherwise throw an error
  *
- * @param int $expectedNum Expected number of paramters
+ * @param integer $expectedNum Expected number of paramters
  * @param string $command Command
  * @access protected
  */
diff --git a/cake/console/libs/tasks/extract.php b/cake/console/libs/tasks/extract.php
index 8562f66e0..17e97d397 100644
--- a/cake/console/libs/tasks/extract.php
+++ b/cake/console/libs/tasks/extract.php
@@ -328,7 +328,7 @@ class ExtractTask extends Shell{
  * Will parse __d(), __dc(), __n(), __dn(), __dcn()
  *
  * @param string $functionName Function name that indicates translatable string (e.g: '__')
- * @param int $shift Number of parameters to shift to find translateable string
+ * @param integer $shift Number of parameters to shift to find translateable string
  * @param bool $plural Set to true if function supports plural format, false otherwise
  * @access public
  */
@@ -478,7 +478,7 @@ class ExtractTask extends Shell{
  * @param string $file Filename
  * @param string $input What to store
  * @param array $fileList File list
- * @param int $get Set to 1 to get files to store, false to set
+ * @param integer $get Set to 1 to get files to store, false to set
  * @return mixed If $get == 1, files to store, otherwise void
  * @access private
  */
@@ -633,9 +633,9 @@ class ExtractTask extends Shell{
  * Indicate an invalid marker on a processed file
  *
  * @param string $file File where invalid marker resides
- * @param int $line Line number
+ * @param integer $line Line number
  * @param string $marker Marker found
- * @param int $count Count
+ * @param integer $count Count
  * @access private
  */
 	function __markerError($file, $line, $marker, $count) {
diff --git a/cake/libs/cache/apc.php b/cake/libs/cache/apc.php
index 1f104187f..13073cebd 100644
--- a/cake/libs/cache/apc.php
+++ b/cake/libs/cache/apc.php
@@ -52,7 +52,7 @@ class APCEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param int $duration How long to cache the data, in seconds
+ * @param integer $duration How long to cache the data, in seconds
  * @return boolean True if the data was succesfully cached, false on failure
  * @access public
  */
diff --git a/cake/libs/cache/memcache.php b/cake/libs/cache/memcache.php
index c93bff641..d35eadddc 100644
--- a/cake/libs/cache/memcache.php
+++ b/cake/libs/cache/memcache.php
@@ -93,7 +93,7 @@ class MemcacheEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param int $duration How long to cache the data, in seconds
+ * @param integer $duration How long to cache the data, in seconds
  * @return boolean True if the data was succesfully cached, false on failure
  * @access public
  */
@@ -133,7 +133,7 @@ class MemcacheEngine extends CacheEngine {
  * Connects to a server in connection pool
  *
  * @param string $host host ip address or name
- * @param int $port Server port
+ * @param integer $port Server port
  * @return boolean True if memcache server was connected
  * @access public
  */
diff --git a/cake/libs/cache/model.php b/cake/libs/cache/model.php
index dee074c5c..f2f2f2c62 100644
--- a/cake/libs/cache/model.php
+++ b/cake/libs/cache/model.php
@@ -81,7 +81,7 @@ class ModelEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $data Data to be cached
- * @param int $duration How long to cache the data, in seconds
+ * @param integer $duration How long to cache the data, in seconds
  * @return boolean True if the data was succesfully cached, false on failure
  * @access public
  */
diff --git a/cake/libs/cache/xcache.php b/cake/libs/cache/xcache.php
index 6f1766286..b0c9f4e80 100644
--- a/cake/libs/cache/xcache.php
+++ b/cake/libs/cache/xcache.php
@@ -63,7 +63,7 @@ class XcacheEngine extends CacheEngine {
  *
  * @param string $key Identifier for the data
  * @param mixed $value Data to be cached
- * @param int $duration How long to cache the data, in seconds
+ * @param integer $duration How long to cache the data, in seconds
  * @return boolean True if the data was succesfully cached, false on failure
  * @access public
  */
diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php
index dc77191e3..5ada141ad 100644
--- a/cake/libs/controller/components/acl.php
+++ b/cake/libs/controller/components/acl.php
@@ -343,7 +343,7 @@ class DB_ACL extends AclBase {
  * @param string $aro ARO
  * @param string $aco ACO
  * @param string $actions Action (defaults to *)
- * @param int $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
+ * @param integer $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
  * @return boolean Success
  * @access public
  */
diff --git a/cake/libs/controller/controller.php b/cake/libs/controller/controller.php
index 489211074..d6f77b473 100644
--- a/cake/libs/controller/controller.php
+++ b/cake/libs/controller/controller.php
@@ -411,7 +411,7 @@ class Controller extends Object {
  *
  * @param mixed $url A string or array-based URL pointing to another location
  *                   within the app, or an absolute URL
- * @param int $status Optional HTTP status code
+ * @param integer $status Optional HTTP status code
  * @param bool $exit If true, exit() will be called after the redirect
  * @access public
  */
@@ -706,7 +706,7 @@ class Controller extends Object {
  *
  * @param string $message Message to display to the user
  * @param string $url Relative URL to redirect to after the time expires
- * @param int $time Time to show the message
+ * @param integer $time Time to show the message
  * @access public
  */
 	function flash($message, $url, $pause = 1) {
diff --git a/cake/libs/debugger.php b/cake/libs/debugger.php
index 1c242b33e..df106ec6b 100644
--- a/cake/libs/debugger.php
+++ b/cake/libs/debugger.php
@@ -92,10 +92,10 @@ class Debugger extends Object {
 /**
  * Overrides PHP's default error handling
  *
- * @param int $code Code of error
+ * @param integer $code Code of error
  * @param string $description Error description
  * @param string $file File on which error occurred
- * @param int $line Line that triggered the error
+ * @param integer $line Line that triggered the error
  * @param array $context Context
  * @return boolean true if error was handled
  * @access public
@@ -298,8 +298,8 @@ class Debugger extends Object {
  * Grabs an excerpt from a file and highlights a given line of code
  *
  * @param string $file Absolute path to a PHP file
- * @param int $line Line number to highlight
- * @param int $context Number of lines of context to extract above and below $line
+ * @param integer $line Line number to highlight
+ * @param integer $context Number of lines of context to extract above and below $line
  * @return array Set of lines highlighted
  * @access protected
  */
diff --git a/cake/libs/file.php b/cake/libs/file.php
index 326f6d348..2fd6eeca9 100644
--- a/cake/libs/file.php
+++ b/cake/libs/file.php
@@ -82,7 +82,7 @@ class File extends Object {
  *
  * @param string $path Path to file
  * @param bool $create Create file if it does not exist (if true)
- * @param int $mode Mode to apply to the folder holding the file
+ * @param integer $mode Mode to apply to the folder holding the file
  * @access private
  */
 	function __construct($path, $create = false, $mode = 0755) {
@@ -185,7 +185,7 @@ class File extends Object {
  * Sets or gets the offset for the currently opened file.
  *
  * @param mixed $offset The $offset in bytes to seek. If set to false then the current offset is returned.
- * @param int $seek PHP Constant SEEK_SET | SEEK_CUR | SEEK_END determining what the $offset is relative to
+ * @param integer $seek PHP Constant SEEK_SET | SEEK_CUR | SEEK_END determining what the $offset is relative to
  * @return mixed True on success, false on failure (set mode), false on failure or integer offset on success (get mode)
  * @access public
  */
diff --git a/cake/libs/flay.php b/cake/libs/flay.php
index 16ca0d36f..549eb7353 100644
--- a/cake/libs/flay.php
+++ b/cake/libs/flay.php
@@ -198,7 +198,7 @@ class Flay extends Object{
  *
  * @param array $words			Words to look for and markup
  * @param string $string		String to look in
- * @param int $max_snippets	Max number of snippets to extract
+ * @param integer $max_snippets	Max number of snippets to extract
  * @return string String with words marked
  * @see colorMark
  * @access public
@@ -265,7 +265,7 @@ class Flay extends Object{
  * Return a fragment of a text, up to $length characters long, with an ellipsis after it.
  *
  * @param string $text		Text to be truncated.
- * @param int $length	Max length of text.
+ * @param integer $length	Max length of text.
  * @param string $ellipsis	Sign to print after truncated text.
  * @return string Fragment
  * @access public
diff --git a/cake/libs/folder.php b/cake/libs/folder.php
index 6bc8ec102..f8b9fc799 100644
--- a/cake/libs/folder.php
+++ b/cake/libs/folder.php
@@ -364,7 +364,7 @@ class Folder extends Object{
  * Change the mode on a directory structure recursively.
  *
  * @param string $pathname The directory structure to create
- * @param int $mode octal value 0755
+ * @param integer $mode octal value 0755
  * @param bool $recursive chmod recursively
  * @param array $exceptions array of files, directories to skip
  * @return boolean Returns TRUE on success, FALSE on failure
@@ -464,7 +464,7 @@ class Folder extends Object{
  * Create a directory structure recursively.
  *
  * @param string $pathname The directory structure to create
- * @param int $mode octal value 0755
+ * @param integer $mode octal value 0755
  * @return boolean Returns TRUE on success, FALSE on failure
  * @access public
  */
diff --git a/cake/libs/i18n.php b/cake/libs/i18n.php
index 86fb0f1ee..62353ba87 100644
--- a/cake/libs/i18n.php
+++ b/cake/libs/i18n.php
@@ -97,7 +97,7 @@ class I18n extends Object {
  * @param string $plural Plural string (if any)
  * @param string $domain Domain
  * @param string $category Category
- * @param int $count Count
+ * @param integer $count Count
  * @param string $directory Directory that contains the file that is requesting translation
  * @return string translated strings.
  * @access public
diff --git a/cake/libs/model/behaviors/tree.php b/cake/libs/model/behaviors/tree.php
index 71e1ab0c2..43d40afda 100644
--- a/cake/libs/model/behaviors/tree.php
+++ b/cake/libs/model/behaviors/tree.php
@@ -219,9 +219,9 @@ class TreeBehavior extends ModelBehavior {
  * @param bool $direct whether to return only the direct, or all, children
  * @param mixed $fields Either a single string of a field name, or an array of field names
  * @param string $order SQL ORDER BY conditions (e.g. "price DESC" or "name ASC") defaults to the tree order
- * @param int $limit SQL LIMIT clause, for calculating items per page.
- * @param int $page Page number, for accessing paged data
- * @param int $recursive The number of levels deep to fetch associated records
+ * @param integer $limit SQL LIMIT clause, for calculating items per page.
+ * @param integer $page Page number, for accessing paged data
+ * @param integer $recursive The number of levels deep to fetch associated records
  * @return array Array of child nodes
  * @access public
  */
@@ -257,7 +257,7 @@ class TreeBehavior extends ModelBehavior {
  * @param string $keyPath A string path to the key, i.e. "{n}.Post.id"
  * @param string $valuePath A string path to the value, i.e. "{n}.Post.title"
  * @param string $spacer The character or characters which will be repeated
- * @param int $recursive The number of levels deep to fetch associated records
+ * @param integer $recursive The number of levels deep to fetch associated records
  * @return array An associative array of records, where the id is the key, and the display field is the value
  * @access public
  */
@@ -303,7 +303,7 @@ class TreeBehavior extends ModelBehavior {
  *
  * @param AppModel $model
  * @param mixed $id The ID of the record to read
- * @param int $recursive The number of levels deep to fetch associated records
+ * @param integer $recursive The number of levels deep to fetch associated records
  * @return array Array of data for the parent node
  * @access public
  */
@@ -329,7 +329,7 @@ class TreeBehavior extends ModelBehavior {
  * @param AppModel $model
  * @param mixed $id The ID of the record to read
  * @param mixed $fields Either a single string of a field name, or an array of field names
- * @param int $recursive The number of levels deep to fetch associated records
+ * @param integer $recursive The number of levels deep to fetch associated records
  * @return array Array of nodes from top most parent to current node
  * @access public
  */
@@ -703,7 +703,7 @@ class TreeBehavior extends ModelBehavior {
  * Handles table sync operations, Taking account of the behavior scope.
  *
  * @param AppModel $model
- * @param int $shift
+ * @param integer $shift
  * @param string $direction
  * @param array $conditions
  * @param string $field
diff --git a/cake/libs/model/datasources/dbo/dbo_adodb.php b/cake/libs/model/datasources/dbo/dbo_adodb.php
index 2db4518a8..86f2a9bb9 100644
--- a/cake/libs/model/datasources/dbo/dbo_adodb.php
+++ b/cake/libs/model/datasources/dbo/dbo_adodb.php
@@ -267,8 +267,8 @@ class DboAdodb extends DboSource {
 /**
  * Returns a LIMIT statement in the correct format for the particular database.
  *
- * @param int $limit Limit of results returned
- * @param int $offset Offset from which to start results
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
  * @return string SQL limit/offset statement
  * @todo Please change output string to whatever select your database accepts. adodb doesn't allow us to get the correct limit string out of it.
  */
diff --git a/cake/libs/model/datasources/dbo/dbo_db2.php b/cake/libs/model/datasources/dbo/dbo_db2.php
index 6932f3e57..f20c10640 100644
--- a/cake/libs/model/datasources/dbo/dbo_db2.php
+++ b/cake/libs/model/datasources/dbo/dbo_db2.php
@@ -426,8 +426,8 @@ class DboDb2 extends DboSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param int $limit Limit of results returned
- * @param int $offset Offset from which to start results
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	function limit($limit, $offset = null) {
diff --git a/cake/libs/model/datasources/dbo/dbo_firebird.php b/cake/libs/model/datasources/dbo/dbo_firebird.php
index 6c2c2c8ca..e3dd8c955 100644
--- a/cake/libs/model/datasources/dbo/dbo_firebird.php
+++ b/cake/libs/model/datasources/dbo/dbo_firebird.php
@@ -364,8 +364,8 @@ class DboFirebird extends DboSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param int $limit Limit of results returned
- * @param int $offset Offset from which to start results
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	function limit($limit, $offset = null) {
diff --git a/cake/libs/model/datasources/dbo/dbo_mssql.php b/cake/libs/model/datasources/dbo/dbo_mssql.php
index 82dd0e6f5..9f77fa807 100644
--- a/cake/libs/model/datasources/dbo/dbo_mssql.php
+++ b/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -402,8 +402,8 @@ class DboMssql extends DboSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param int $limit Limit of results returned
- * @param int $offset Offset from which to start results
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	function limit($limit, $offset = null) {
diff --git a/cake/libs/model/datasources/dbo/dbo_oracle.php b/cake/libs/model/datasources/dbo/dbo_oracle.php
index 0a95ebb2a..49d94bf68 100644
--- a/cake/libs/model/datasources/dbo/dbo_oracle.php
+++ b/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -250,8 +250,8 @@ class DboOracle extends DboSource {
 /**
  * Modify a SQL query to limit (and offset) the result set
  *
- * @param int $limit Maximum number of rows to return
- * @param int $offset Row to begin returning
+ * @param integer $limit Maximum number of rows to return
+ * @param integer $offset Row to begin returning
  * @return modified SQL Query
  * @access public
  */
diff --git a/cake/libs/model/datasources/dbo/dbo_postgres.php b/cake/libs/model/datasources/dbo/dbo_postgres.php
index 9f4b6053a..9b8164399 100644
--- a/cake/libs/model/datasources/dbo/dbo_postgres.php
+++ b/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -407,8 +407,8 @@ class DboPostgres extends DboSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param int $limit Limit of results returned
- * @param int $offset Offset from which to start results
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	function limit($limit, $offset = null) {
diff --git a/cake/libs/model/datasources/dbo/dbo_sqlite.php b/cake/libs/model/datasources/dbo/dbo_sqlite.php
index 9e110e3e3..5a121ca01 100644
--- a/cake/libs/model/datasources/dbo/dbo_sqlite.php
+++ b/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -374,8 +374,8 @@ class DboSqlite extends DboSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param int $limit Limit of results returned
- * @param int $offset Offset from which to start results
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	function limit ($limit, $offset = null) {
diff --git a/cake/libs/model/datasources/dbo_source.php b/cake/libs/model/datasources/dbo_source.php
index ff99a52a2..68f5797d8 100644
--- a/cake/libs/model/datasources/dbo_source.php
+++ b/cake/libs/model/datasources/dbo_source.php
@@ -519,7 +519,7 @@ class DboSource extends DataSource {
  *
  * @param Model $model
  * @param array $queryData
- * @param int $recursive Number of levels of association
+ * @param integer $recursive Number of levels of association
  * @return unknown
  */
 	function read(&$model, $queryData = array(), $recursive = null) {
@@ -661,7 +661,7 @@ class DboSource extends DataSource {
  * @param unknown_type $queryData
  * @param unknown_type $external
  * @param unknown_type $resultSet
- * @param int $recursive Number of levels of association
+ * @param integer $recursive Number of levels of association
  * @param array $stack
  */
 	function queryAssociation(&$model, &$linkModel, $type, $association, $assocData, &$queryData, $external = false, &$resultSet, $recursive, $stack) {
@@ -1664,8 +1664,8 @@ class DboSource extends DataSource {
 /**
  * Returns a limit statement in the correct format for the particular database.
  *
- * @param int $limit Limit of results returned
- * @param int $offset Offset from which to start results
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
  * @return string SQL limit/offset statement
  */
 	function limit($limit, $offset = null) {
diff --git a/cake/libs/model/model.php b/cake/libs/model/model.php
index 8f9a664ce..64d3c8710 100644
--- a/cake/libs/model/model.php
+++ b/cake/libs/model/model.php
@@ -333,7 +333,7 @@ class Model extends Overloadable {
 /**
  * Constructor. Binds the Model's database table to the object.
  *
- * @param int $id
+ * @param integer $id
  * @param string $table Name of database table to use.
  * @param DataSource $ds DataSource connection object.
  */
@@ -1423,7 +1423,7 @@ class Model extends Overloadable {
  * @param array $conditions SQL conditions array
  * @param mixed $fields Either a single string of a field name, or an array of field names
  * @param string $order SQL ORDER BY conditions (e.g. "price DESC" or "name ASC")
- * @param int $recursive The number of levels deep to fetch associated records
+ * @param integer $recursive The number of levels deep to fetch associated records
  * @return array Array of records
  */
 	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
@@ -1522,9 +1522,9 @@ class Model extends Overloadable {
  * @param mixed $conditions SQL conditions as a string or as an array('field' =>'value',...)
  * @param mixed $fields Either a single string of a field name, or an array of field names
  * @param string $order SQL ORDER BY conditions (e.g. "price DESC" or "name ASC")
- * @param int $limit SQL LIMIT clause, for calculating items per page.
- * @param int $page Page number, for accessing paged data
- * @param int $recursive The number of levels deep to fetch associated records
+ * @param integer $limit SQL LIMIT clause, for calculating items per page.
+ * @param integer $page Page number, for accessing paged data
+ * @param integer $recursive The number of levels deep to fetch associated records
  * @return array Array of records
  */
 	function findAll($conditions = null, $fields = null, $order = null, $limit = null, $page = 1, $recursive = null) {
@@ -1606,7 +1606,7 @@ class Model extends Overloadable {
  * Returns number of rows matching given SQL condition.
  *
  * @param array $conditions SQL conditions array for findAll
- * @param int $recursize The number of levels deep to fetch associated records
+ * @param integer $recursize The number of levels deep to fetch associated records
  * @return int Number of matching rows
  * @see Model::find
  */
@@ -1895,7 +1895,7 @@ class Model extends Overloadable {
  *
  * @param mixed $conditions SQL conditions as a string or as an array('field' =>'value',...)
  * @param string $order SQL ORDER BY conditions (e.g. "price DESC" or "name ASC")
- * @param int $limit SQL LIMIT clause, for calculating items per page
+ * @param integer $limit SQL LIMIT clause, for calculating items per page
  * @param string $keyPath A string path to the key, i.e. "{n}.Post.id"
  * @param string $valuePath A string path to the value, i.e. "{n}.Post.title"
  * @param string $groupPath A string path to a value to group the elements by, i.e. "{n}.Post.category_id"
diff --git a/cake/libs/object.php b/cake/libs/object.php
index 2e1f447b4..237b8dbca 100644
--- a/cake/libs/object.php
+++ b/cake/libs/object.php
@@ -115,7 +115,7 @@ class Object {
  * API for logging events.
  *
  * @param string $msg Log message
- * @param int $type Error type constant. Defined in app/config/core.php.
+ * @param integer $type Error type constant. Defined in app/config/core.php.
  * @access public
  */
 	function log($msg, $type = LOG_ERROR) {
diff --git a/cake/libs/session.php b/cake/libs/session.php
index 4690ba4bb..06db413f5 100644
--- a/cake/libs/session.php
+++ b/cake/libs/session.php
@@ -235,7 +235,7 @@ class CakeSession extends Object {
 /**
  * Return error description for given error number.
  *
- * @param int $errorNumber Error to set
+ * @param integer $errorNumber Error to set
  * @return string Error as string
  * @access private
  */
@@ -576,7 +576,7 @@ class CakeSession extends Object {
 /**
  * Helper method to set an internal error message.
  *
- * @param int $errorNumber Number of the error
+ * @param integer $errorNumber Number of the error
  * @param string $errorMessage Description of the error
  * @access private
  */
@@ -678,7 +678,7 @@ class CakeSession extends Object {
 /**
  * Method called on the destruction of a database session.
  *
- * @param int $key Key that uniquely identifies session in database
+ * @param integer $key Key that uniquely identifies session in database
  * @return boolean Success
  * @access private
  */
@@ -691,7 +691,7 @@ class CakeSession extends Object {
 /**
  * Helper function called on gc for database sessions.
  *
- * @param int $expires Timestamp (defaults to current time)
+ * @param integer $expires Timestamp (defaults to current time)
  * @return boolean Success
  * @access private
  */
diff --git a/cake/libs/socket.php b/cake/libs/socket.php
index 35dfd3bf8..ec96b0c17 100644
--- a/cake/libs/socket.php
+++ b/cake/libs/socket.php
@@ -185,7 +185,7 @@ class CakeSocket extends Object {
 /**
  * Set the last error.
  *
- * @param int $errNum Error code
+ * @param integer $errNum Error code
  * @param string $errStr Error string
  * @access public
  */
@@ -213,7 +213,7 @@ class CakeSocket extends Object {
  * Read data from the socket. Returns false if no data is available or no connection could be
  * established.
  *
- * @param int $length Optional buffer length to read; defaults to 1024
+ * @param integer $length Optional buffer length to read; defaults to 1024
  * @return mixed Socket data
  * @access public
  */
diff --git a/cake/libs/string.php b/cake/libs/string.php
index d590420d3..bda87238d 100644
--- a/cake/libs/string.php
+++ b/cake/libs/string.php
@@ -196,7 +196,7 @@ class String extends Object {
  *
  * @param multi-byte string $haystack
  * @param multi-byte string $needle
- * @param int $offset
+ * @param integer $offset
  * @return int|boolean
  * @access public
  * @static
@@ -235,7 +235,7 @@ class String extends Object {
  *
  * @param multi-byte string $haystack
  * @param multi-byte string $needle
- * @param int $offset
+ * @param integer $offset
  * @return int|boolean
  * @access public
  * @static
@@ -669,7 +669,7 @@ class String extends Object {
 /**
  * Find the related code folding values for $char
  *
- * @param int $char decimal value of character
+ * @param integer $char decimal value of character
  * @param string $type
  * @return array
  * @access private
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
index ebf1ab199..76e7f6574 100644
--- a/cake/libs/validation.php
+++ b/cake/libs/validation.php
@@ -143,8 +143,8 @@ class Validation extends Object {
  * Returns true is string matches value min, max, or between min and max,
  *
  * @param string $check Value to check for length
- * @param int $min Minimum value in range (inclusive)
- * @param int $max Maximum value in range (inclusive)
+ * @param integer $min Minimum value in range (inclusive)
+ * @param integer $max Maximum value in range (inclusive)
  * @return boolean Success
  * @access public
  */
@@ -270,7 +270,7 @@ class Validation extends Object {
  * @param string $operator Can be either a word or operand
  * 								is greater >, is less <, greater or equal >=
  * 								less or equal <=, is less <, equal to ==, not equal !=
- * @param int $check2 only needed if $check1 is a string
+ * @param integer $check2 only needed if $check1 is a string
  * @return bool
  * @access public
  */
@@ -403,8 +403,8 @@ class Validation extends Object {
  * Checks that a value is a valid decimal. If $places is null, the $check is allowed to be a scientific float
  * If no decimal point is found a false will be returned. Both the sign and exponent are optional.
  *
- * @param int $check The value the test for decimal
- * @param int $places if set $check value must have exactly $places after the decimal point
+ * @param integer $check The value the test for decimal
+ * @param integer $places if set $check value must have exactly $places after the decimal point
  * @param string $regex If a custom regular expression is used this is the only validation that will occur.
  * @return boolean Success
  * @access public
@@ -507,7 +507,7 @@ class Validation extends Object {
  * Checks whether the length of a string is greater or equal to a minimal length.
  *
  * @param string $check The string to test
- * @param int $min The minimal string length
+ * @param integer $min The minimal string length
  * @return boolean Success
  * @access public
  */
@@ -519,7 +519,7 @@ class Validation extends Object {
  * Checks whether the length of a string is smaller or equal to a maximal length..
  *
  * @param string $check The string to test
- * @param int $max The maximal string length
+ * @param integer $max The maximal string length
  * @return boolean Success
  * @access public
  */
@@ -565,8 +565,8 @@ class Validation extends Object {
  * Validate that a number is in specified range.
  *
  * @param string $check Value to check
- * @param int $lower Lower limit
- * @param int $upper Upper limit
+ * @param integer $lower Lower limit
+ * @param integer $upper Upper limit
  * @access public
  * @todo Implement
  */
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
index 9105ed1df..a9c0635bd 100644
--- a/cake/libs/view/helpers/form.php
+++ b/cake/libs/view/helpers/form.php
@@ -1064,8 +1064,8 @@ class FormHelper extends AppHelper {
  * Returns a SELECT element for years
  *
  * @param string $fieldName Prefix name for the SELECT element
- * @param int $minYear First year in sequence
- * @param int $maxYear Last year in sequence
+ * @param integer $minYear First year in sequence
+ * @param integer $maxYear Last year in sequence
  * @param string $selected Option which is selected.
  * @param array $attributes Attribute array for the select elements.
  * @param bool $showEmpty Show/hide the empty select option
diff --git a/cake/libs/view/helpers/number.php b/cake/libs/view/helpers/number.php
index d02ee6f5a..5ef702aeb 100644
--- a/cake/libs/view/helpers/number.php
+++ b/cake/libs/view/helpers/number.php
@@ -52,7 +52,7 @@ class NumberHelper extends AppHelper {
 /**
  * Returns a formatted-for-humans file size.
  *
- * @param int $length Size in bytes
+ * @param integer $length Size in bytes
  * @return string Human readable size
  * @static
  */
@@ -78,7 +78,7 @@ class NumberHelper extends AppHelper {
  * Formats a number into a percentage string.
  *
  * @param float $number A floating point number
- * @param int $precision The precision of the returned number
+ * @param integer $precision The precision of the returned number
  * @return string Percentage string
  * @static
  */
@@ -89,7 +89,7 @@ class NumberHelper extends AppHelper {
  * Formats a number into a currnecy format.
  *
  * @param float $number A floating point number
- * @param int $options if int then places, if string then before, if (,.-) then use it
+ * @param integer $options if int then places, if string then before, if (,.-) then use it
  * 							or array with places and before keys
  * @return string formatted number
  * @static
@@ -151,7 +151,7 @@ class NumberHelper extends AppHelper {
  * Formats a number into a currency format.
  *
  * @param float $number A floating point number
- * @param int $precision The precision of the returned number
+ * @param integer $precision The precision of the returned number
  * @return string Percentage string
  * @static
  */
diff --git a/cake/libs/view/helpers/text.php b/cake/libs/view/helpers/text.php
index c82fc58b7..d4df3f49f 100644
--- a/cake/libs/view/helpers/text.php
+++ b/cake/libs/view/helpers/text.php
@@ -149,7 +149,7 @@ class TextHelper extends AppHelper {
  * with the ending if the text is longer than length.
  *
  * @param string  $text	String to truncate.
- * @param int $length Length of returned string, including ellipsis.
+ * @param integer $length Length of returned string, including ellipsis.
  * @param string  $ending Ending to be appended to the trimmed string.
  * @param bool $exact If false, $text will not be cut mid-word
  * @return string Trimmed string.
@@ -186,7 +186,7 @@ class TextHelper extends AppHelper {
  *
  * @param string $text String to search the phrase in
  * @param string $phrase Phrase that will be searched for
- * @param int $radius The amount of characters that will be returned on each side of the founded phrase
+ * @param integer $radius The amount of characters that will be returned on each side of the founded phrase
  * @param string $ending Ending that will be appended
  * @return string Modified string
  * @access public
diff --git a/cake/libs/view/helpers/time.php b/cake/libs/view/helpers/time.php
index ec0c87f0e..237876364 100644
--- a/cake/libs/view/helpers/time.php
+++ b/cake/libs/view/helpers/time.php
@@ -40,7 +40,7 @@ class TimeHelper extends AppHelper {
  * Returns given string trimmed to given length, adding an ending (default: "..") if necessary.
  *
  * @param string $string String to trim
- * @param int $length Length of returned string, excluding ellipsis
+ * @param integer $length Length of returned string, excluding ellipsis
  * @param string $ending Ending to be appended after trimmed string
  * @return string Trimmed string
  */
diff --git a/cake/libs/view/view.php b/cake/libs/view/view.php
index 697996e0d..73f0d8118 100644
--- a/cake/libs/view/view.php
+++ b/cake/libs/view/view.php
@@ -591,7 +591,7 @@ class View extends Object {
 /**
  * Displays an error page to the user. Uses layouts/error.ctp to render the page.
  *
- * @param int $code HTTP Error code (for instance: 404)
+ * @param integer $code HTTP Error code (for instance: 404)
  * @param string $name Name of the error (for instance: Not Found)
  * @param string $message Error message as a web page
  */
diff --git a/cake/libs/xml.php b/cake/libs/xml.php
index 1e7d99efe..2d1460e38 100644
--- a/cake/libs/xml.php
+++ b/cake/libs/xml.php
@@ -648,8 +648,8 @@ class XML extends XMLNode {
  * If debug mode is on, this method echoes an error message.
  *
  * @param string $msg Error message
- * @param int $code Error code
- * @param int $line Line in file
+ * @param integer $code Error code
+ * @param integer $line Line in file
  * @access public
  */
 	function error($msg, $code = 0, $line = 0) {
@@ -660,7 +660,7 @@ class XML extends XMLNode {
 /**
  * Returns a string with a textual description of the error code, or FALSE if no description was found.
  *
- * @param int $code Error code
+ * @param integer $code Error code
  * @return string Error message
  * @access public
  */