diff --git a/typo3/class.browse_links.php b/typo3/class.browse_links.php
index 7d9b2cc4f3e87d677ec956de198338f4468e3649..7cf02b2dfc2c51eee2d1065e73a605ba9400c2a3 100644
--- a/typo3/class.browse_links.php
+++ b/typo3/class.browse_links.php
@@ -84,8 +84,8 @@ class localPageTree extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
 	/**
 	 * Returns TRUE if a doktype can be linked.
 	 *
-	 * @param integer $doktype Doktype value to test
-	 * @param integer $uid uid to test.
+	 * @param int $doktype Doktype value to test
+	 * @param int $uid uid to test.
 	 * @return boolean
 	 */
 	public function ext_isLinkable($doktype, $uid) {
@@ -139,8 +139,8 @@ class TBE_PageTree extends localPageTree {
 	/**
 	 * Returns TRUE if a doktype can be linked (which is always the case here).
 	 *
-	 * @param integer $doktype Doktype value to test
-	 * @param integer $uid uid to test.
+	 * @param int $doktype Doktype value to test
+	 * @param int $uid uid to test.
 	 * @return boolean
 	 */
 	public function ext_isLinkable($doktype, $uid) {
diff --git a/typo3/db_new.php b/typo3/db_new.php
index 5fd6649cb4a8f854efaf6cb4e4445a8030fd7661..3b2b3d6c989a718c48c1896bf7881ed100c41bca 100644
--- a/typo3/db_new.php
+++ b/typo3/db_new.php
@@ -44,7 +44,7 @@ class newRecordLocalPageTree extends \TYPO3\CMS\Backend\Tree\View\PageTreeView {
 	 * Determines whether to expand a branch or not.
 	 * Here the branch is expanded if the current id matches the global id for the listing/new
 	 *
-	 * @param integer $id The ID (page id) of the element
+	 * @param int $id The ID (page id) of the element
 	 * @return boolean Returns TRUE if the IDs matches
 	 */
 	public function expandNext($id) {
diff --git a/typo3/move_el.php b/typo3/move_el.php
index df0960a4d4aed1c2f7608e7f9ad342e4934d61bd..3b268f1d6fbb52824399d037b45abc0b6f2f904e 100644
--- a/typo3/move_el.php
+++ b/typo3/move_el.php
@@ -62,8 +62,8 @@ class ext_posMap_pages extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 	/**
 	 * Creates the onclick event for the insert-icons.
 	 *
-	 * @param integer $pid The pid.
-	 * @param integer $newPagePID New page id.
+	 * @param int $pid The pid.
+	 * @param int $newPagePID New page id.
 	 * @return string Onclick attribute content
 	 */
 	public function onClickEvent($pid, $newPagePID) {
@@ -87,7 +87,7 @@ class ext_posMap_pages extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 	 *
 	 * @param string $t_code Title string
 	 * @param array $dat Information array with record array inside.
-	 * @param integer $id The current id.
+	 * @param int $id The current id.
 	 * @return string The title string.
 	 */
 	public function boldTitle($t_code, $dat, $id) {
diff --git a/typo3/sysext/about/Classes/ViewHelpers/SkinImageViewHelper.php b/typo3/sysext/about/Classes/ViewHelpers/SkinImageViewHelper.php
index 5a0d297114548638a115ca65084f141ae50c91c6..2bd25131ee3011d93c3c916308453a82407fd6f7 100644
--- a/typo3/sysext/about/Classes/ViewHelpers/SkinImageViewHelper.php
+++ b/typo3/sysext/about/Classes/ViewHelpers/SkinImageViewHelper.php
@@ -30,10 +30,10 @@ class SkinImageViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\ImageViewHelper {
 	 * @param string $src
 	 * @param string $width width of the image. This can be a numeric value representing the fixed width of the image in pixels. But you can also perform simple calculations by adding "m" or "c" to the value. See imgResource.width for possible options.
 	 * @param string $height height of the image. This can be a numeric value representing the fixed height of the image in pixels. But you can also perform simple calculations by adding "m" or "c" to the value. See imgResource.width for possible options.
-	 * @param integer $minWidth minimum width of the image
-	 * @param integer $minHeight minimum height of the image
-	 * @param integer $maxWidth maximum width of the image
-	 * @param integer $maxHeight maximum height of the image
+	 * @param int $minWidth minimum width of the image
+	 * @param int $minHeight minimum height of the image
+	 * @param int $maxWidth maximum width of the image
+	 * @param int $maxHeight maximum height of the image
 	 * @return string rendered tag.
 	 */
 	public function render($src, $width = NULL, $height = NULL, $minWidth = NULL, $minHeight = NULL, $maxWidth = NULL, $maxHeight = NULL) {
diff --git a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
index 4269b66d856d2250eb0005ac4f179baa68c440ea..c13c937ae619f89d20c2b786bd10fb1af6137032 100644
--- a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
+++ b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
@@ -144,7 +144,7 @@ class ClickMenu {
 	 * Make 1st level clickmenu:
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @return string HTML content
 	 */
 	public function printDBClickMenu($table, $uid) {
@@ -321,7 +321,7 @@ class ClickMenu {
 	 * Make 2nd level clickmenu (only for DBmenus)
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @return string HTML content
 	 */
 	public function printNewDBLevel($table, $uid) {
@@ -391,7 +391,7 @@ class ClickMenu {
 	 *
 	 * @param array $menuItems Array for manipulation.
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @return array Processed $menuItems array
 	 */
 	public function processingByExtClassArray($menuItems, $table, $uid) {
@@ -423,7 +423,7 @@ class ClickMenu {
 	 * Adding CM element for Clipboard "copy" and "cut"
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @param string $type Type: "copy" or "cut
 	 * @return array Item array, element in $menuItems
 	 * @internal
@@ -444,7 +444,7 @@ class ClickMenu {
 	 * NOTICE: $table and $uid should follow the special syntax for paste, see clipboard-class :: pasteUrl();
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record. NOTICE: Special syntax!
+	 * @param int $uid UID for the current record. NOTICE: Special syntax!
 	 * @param string $type Type: "into" or "after
 	 * @param array $elInfo Contains instructions about whether to copy or cut an element.
 	 * @return array Item array, element in $menuItems
@@ -467,7 +467,7 @@ class ClickMenu {
 	 * Adding CM element for Info
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @return array Item array, element in $menuItems
 	 * @internal
 	 */
@@ -479,7 +479,7 @@ class ClickMenu {
 	 * Adding CM element for History
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @return array Item array, element in $menuItems
 	 * @internal
 	 */
@@ -492,7 +492,7 @@ class ClickMenu {
 	 * Adding CM element for Permission setting
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @param array $rec The "pages" record with "perms_*" fields inside.
 	 * @return array Item array, element in $menuItems
 	 * @internal
@@ -509,7 +509,7 @@ class ClickMenu {
 	 * Adding CM element for DBlist
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @param array $rec Record of the element (needs "pid" field if not pages-record)
 	 * @return array Item array, element in $menuItems
 	 * @internal
@@ -526,7 +526,7 @@ class ClickMenu {
 	 * Adding CM element for Moving wizard
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @param array $rec Record. Needed for tt-content elements which will have the sys_language_uid sent
 	 * @return array Item array, element in $menuItems
 	 * @internal
@@ -541,7 +541,7 @@ class ClickMenu {
 	 * Adding CM element for Create new wizard (either db_new.php or sysext/cms/layout/db_new_content_el.php or custom wizard)
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @param array $rec Record.
 	 * @return array Item array, element in $menuItems
 	 * @internal
@@ -559,7 +559,7 @@ class ClickMenu {
 	 * Adding CM element for Editing of the access related fields of a table (disable, starttime, endtime, fe_groups)
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @return array Item array, element in $menuItems
 	 * @internal
 	 */
@@ -572,7 +572,7 @@ class ClickMenu {
 	/**
 	 * Adding CM element for edit page properties
 	 *
-	 * @param integer $uid page uid to edit (PID)
+	 * @param int $uid page uid to edit (PID)
 	 * @return array Item array, element in $menuItems
 	 * @internal
 	 */
@@ -585,7 +585,7 @@ class ClickMenu {
 	 * Adding CM element for regular editing of the element!
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @return array Item array, element in $menuItems
 	 * @internal
 	 */
@@ -616,7 +616,7 @@ class ClickMenu {
 	 * Adding CM element for regular Create new element
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @return array Item array, element in $menuItems
 	 * @internal
 	 */
@@ -631,7 +631,7 @@ class ClickMenu {
 	 * Adding CM element for Delete
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID for the current record.
+	 * @param int $uid UID for the current record.
 	 * @param array $elInfo Label for including in the confirmation message, EXT:lang/locallang_core.xlf:mess.delete
 	 * @return array Item array, element in $menuItems
 	 * @internal
@@ -651,7 +651,7 @@ class ClickMenu {
 	/**
 	 * Adding CM element for View Page
 	 *
-	 * @param integer $id Page uid (PID)
+	 * @param int $id Page uid (PID)
 	 * @param string $anchor Anchor, if any
 	 * @return array Item array, element in $menuItems
 	 * @internal
@@ -663,7 +663,7 @@ class ClickMenu {
 	/**
 	 * Adding element for setting temporary mount point.
 	 *
-	 * @param integer $page_id Page uid (PID)
+	 * @param int $page_id Page uid (PID)
 	 * @return array Item array, element in $menuItems
 	 * @internal
 	 */
@@ -985,8 +985,8 @@ class ClickMenu {
 	 * Make 1st level clickmenu:
 	 *
 	 * @param string $table The absolute path
-	 * @param integer $srcId UID for the current record.
-	 * @param integer $dstId Destination ID
+	 * @param int $srcId UID for the current record.
+	 * @param int $dstId Destination ID
 	 * @return string HTML content
 	 */
 	public function printDragDropClickMenu($table, $srcId, $dstId) {
@@ -1031,8 +1031,8 @@ class ClickMenu {
 	/**
 	 * Adding CM element for Copying/Moving a Page Into/After from a drag & drop action
 	 *
-	 * @param integer $srcUid source UID code for the record to modify
-	 * @param integer $dstUid destination UID code for the record to modify
+	 * @param int $srcUid source UID code for the record to modify
+	 * @param int $dstUid destination UID code for the record to modify
 	 * @param string $action Action code: either "move" or "copy
 	 * @param string $into Parameter code: either "into" or "after
 	 * @return array Item array, element in $menuItems
diff --git a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
index f53cabdee97137d1e28ad030aba1bbf2e668a2b0..fcbcb76041e138b2c1143d41800c6889aaf90472 100644
--- a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
+++ b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
@@ -506,7 +506,7 @@ class Clipboard {
 	 * Returns the select-url for database elements
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Uid of record
+	 * @param int $uid Uid of record
 	 * @param bool $copy If set, copymode will be enabled
 	 * @param bool $deselect If set, the link will deselect, otherwise select.
 	 * @param array $baseArray The base array of GET vars to be sent in addition. Notice that current GET vars WILL automatically be included.
@@ -798,7 +798,7 @@ class Clipboard {
 	 * If the pad is "normal", the mode value is returned if the element existed. Thus you'll know if the item was copy or cut moded...
 	 *
 	 * @param string $table Table name, (_FILE for files...)
-	 * @param integer $uid Element uid (path for files)
+	 * @param int $uid Element uid (path for files)
 	 * @return string
 	 */
 	public function isSelected($table, $uid) {
@@ -812,7 +812,7 @@ class Clipboard {
 	 * Makes sense only for DB records - not files!
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Element uid
+	 * @param int $uid Element uid
 	 * @return array Element record with extra field _RECORD_TITLE set to the title of the record
 	 */
 	public function getSelectedRecord($table = '', $uid = '') {
diff --git a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
index 0769d67ed75e4fe84e09b92e08ea4311f00bc318..54d26d1ea331d1c4df9d35989e908a58364632d9 100644
--- a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
+++ b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
@@ -32,7 +32,7 @@ class TranslationConfigurationProvider {
 	 * \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon(<flags-xx>) to get an HTML
 	 * which will represent the flag of this language.
 	 *
-	 * @param integer $page_id Page id (only used to get TSconfig configuration setting flag and label for default language)
+	 * @param int $page_id Page id (only used to get TSconfig configuration setting flag and label for default language)
 	 * @param string $backPath Backpath for flags
 	 * @return array Array with languages (title, uid, flagIcon)
 	 */
@@ -78,8 +78,8 @@ class TranslationConfigurationProvider {
 	 * Will overlay workspace version of record too!
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
-	 * @param integer $sys_language_uid Language uid. If zero, then all languages are selected.
+	 * @param int $uid Record uid
+	 * @param int $sys_language_uid Language uid. If zero, then all languages are selected.
 	 * @param array $row The record to be translated
 	 * @param array $selFieldList Select fields for the query which fetches the translations of the current record
 	 * @return array Array with information. Errors will return string with message.
diff --git a/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php b/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php
index 33d698c09a80d5cacd200f4abc4ba3261f52bc95..0f96c80280d16b2f4b5dcfed0b7cd1f2e3f528d6 100644
--- a/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php
+++ b/typo3/sysext/backend/Classes/Configuration/TsConfigParser.php
@@ -33,7 +33,7 @@ class TsConfigParser extends \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser
 	 *
 	 * @param string $TStext The TSConfig being parsed
 	 * @param string $type The type of TSConfig (either "userTS" or "PAGES")
-	 * @param integer $id The uid of the page being handled
+	 * @param int $id The uid of the page being handled
 	 * @param array $rootLine The rootline of the page being handled
 	 * @return array Array containing the parsed TSConfig and a flag whether the content was retrieved from cache
 	 */
diff --git a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index 07379c69a2c5e6b51d9a0be33d83eb8f345e46ba..a03780dcc802a9ef5cd4992ecc0a60252722f337 100644
--- a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -165,7 +165,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
 	 * Gets the page id by a record.
 	 *
 	 * @param string $table Name of the table
-	 * @param integer $id Id of the accordant record
+	 * @param int $id Id of the accordant record
 	 * @param bool $ignoreTable Whether to ignore the page, if TRUE a positive
 	 * @return integer Id of the page the record is persisted on
 	 */
@@ -187,7 +187,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
 	 * Determine if record of table 'pages' with the given $pid is currently created in TCEforms.
 	 * This information is required for conditions in BE for PIDupinRootline.
 	 *
-	 * @param integer $pid The pid the check for as parent page
+	 * @param int $pid The pid the check for as parent page
 	 * @return boolean TRUE if the is currently a new page record being edited with $pid as uid of the parent page
 	 */
 	protected function isNewPageWithPageId($pageId) {
diff --git a/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php b/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php
index 232e2d4c0a39c83cf90bb2ba65d1eeb72174dd7c..df87a880fa8f34ea5256481a4287d66a53e05bae 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php
@@ -145,7 +145,7 @@ abstract class AbstractContextMenuDataProvider {
 	 *
 	 * @param array $actions
 	 * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
-	 * @param integer $level
+	 * @param int $level
 	 * @return \TYPO3\CMS\Backend\ContextMenu\ContextMenuActionCollection
 	 */
 	protected function getNextContextMenuLevel(array $actions, \TYPO3\CMS\Backend\Tree\TreeNode $node, $level = 0) {
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
index 5fba97342e2379e13d617b455de0d68549667aa6..949c66219b2cdc2232a3dec5866d64b95538c601 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
@@ -466,7 +466,7 @@ class ElementInformationController {
 	 * Returns the rendered record actions
 	 *
 	 * @param string $table
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return string
 	 */
 	protected function getRecordActions($table, $uid) {
diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index 50441d73a9e12cc83d1bee440900ca77d332eed7..97261b82f676dd91c9b149fec56dba348eaef5e7 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -1018,8 +1018,8 @@ class EditDocumentController {
 	 * Displays only languages which are available for the current page.
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Uid for which to create a new language
-	 * @param integer $pid Pid of the record
+	 * @param int $uid Uid for which to create a new language
+	 * @param int $pid Pid of the record
 	 * @return string <select> HTML element (if there were items for the box anyways...)
 	 */
 	public function languageSwitch($table, $uid, $pid = NULL) {
@@ -1114,7 +1114,7 @@ class EditDocumentController {
 	/**
 	 * Returns sys_language records available for record translations on given page.
 	 *
-	 * @param integer $id Page id: If zero, the query will select all sys_language records from root level which are NOT hidden. If set to another value, the query will select all sys_language records that has a pages_language_overlay record on that page (and is not hidden, unless you are admin user)
+	 * @param int $id Page id: If zero, the query will select all sys_language records from root level which are NOT hidden. If set to another value, the query will select all sys_language records that has a pages_language_overlay record on that page (and is not hidden, unless you are admin user)
 	 * @return array Language records including faked record for default language
 	 */
 	public function getLanguages($id) {
@@ -1200,7 +1200,7 @@ class EditDocumentController {
 	 * Get record for editing.
 	 *
 	 * @param string $table Table name
-	 * @param integer $theUid Record UID
+	 * @param int $theUid Record UID
 	 * @return array Returns record to edit, FALSE if none
 	 */
 	public function getRecordForEdit($table, $theUid) {
@@ -1280,7 +1280,7 @@ class EditDocumentController {
 	/**
 	 * Handling the closing of a document
 	 *
-	 * @param integer $code Close code: 0/1 will redirect to $this->retUrl, 3 will clear the docHandler (thus closing all documents) and otehr values will call setDocument with ->retUrl
+	 * @param int $code Close code: 0/1 will redirect to $this->retUrl, 3 will clear the docHandler (thus closing all documents) and otehr values will call setDocument with ->retUrl
 	 * @return void
 	 */
 	public function closeDocument($code = 0) {
diff --git a/typo3/sysext/backend/Classes/Controller/NewRecordController.php b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
index 3672dff4f13832583d4ef0e42ce04bd6d0a5b409..a369eaa09ce0c25110eb9fca51800c61f1f30bba 100644
--- a/typo3/sysext/backend/Classes/Controller/NewRecordController.php
+++ b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
@@ -577,7 +577,7 @@ class NewRecordController {
 	 *
 	 * @param string $linkText Link text
 	 * @param string $table Table name (in which to create new record)
-	 * @param integer $pid PID value for the "&edit['.$table.']['.$pid.']=new" command (positive/negative)
+	 * @param int $pid PID value for the "&edit['.$table.']['.$pid.']=new" command (positive/negative)
 	 * @param bool $addContentTable If $addContentTable is set, then a new tt_content record is created together with pages
 	 * @return string The link.
 	 */
diff --git a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
index 43a64d9e2aec7a6b164d159d82457d3eb434c66e..2d6c0183627d02d393c54925eb4590f80f24d209 100644
--- a/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageLayoutController.php
@@ -1140,7 +1140,7 @@ class PageLayoutController {
 	/**
 	 * Returns a SQL query for selecting sys_language records.
 	 *
-	 * @param integer $id Page id: If zero, the query will select all sys_language records from root level which are NOT hidden. If set to another value, the query will select all sys_language records that has a pages_language_overlay record on that page (and is not hidden, unless you are admin user)
+	 * @param int $id Page id: If zero, the query will select all sys_language records from root level which are NOT hidden. If set to another value, the query will select all sys_language records that has a pages_language_overlay record on that page (and is not hidden, unless you are admin user)
 	 * @return string Return query string.
 	 */
 	public function exec_languageQuery($id) {
diff --git a/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php b/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
index ca652f7206f588aba527be4af32082aa88468571..4436b9d3ec1b45cab22d1f18e8d4bb0af34bf5f4 100644
--- a/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
@@ -320,7 +320,7 @@ class PageTreeNavigationController {
 	/**
 	 * Setting temporary page id as DB mount
 	 *
-	 * @param integer $pageId The page id to set as DB mount
+	 * @param int $pageId The page id to set as DB mount
 	 * @return void
 	 */
 	public function settingTemporaryMountPoint($pageId) {
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
index dbee101362200884ad5056df552f7c5fec953c70..bceaef1de9e9135a404ad284bf4fc1eb310757d6 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
@@ -381,8 +381,8 @@ class ColorpickerController {
 	 * This method handles the correct imageResource no matter what format
 	 *
 	 * @param pointer $im Valid ImageResource returned by \TYPO3\CMS\Core\Imaging\GraphicalFunctions::imageCreateFromFile
-	 * @param integer $x X-Coordinate of the pixel that should be checked
-	 * @param integer $y Y-Coordinate of the pixel that should be checked
+	 * @param int $x X-Coordinate of the pixel that should be checked
+	 * @param int $y Y-Coordinate of the pixel that should be checked
 	 * @return string HEX RGB value for color
 	 * @see colorImage()
 	 */
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php b/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
index bf31df37cf30458e85ea4b8d4e78a7c083ce0647..f997444a90f510c2b106f2d748a674b0436d1cfb 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
@@ -869,7 +869,7 @@ class FormsController {
 	 * Checks access for element
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
+	 * @param int $uid Record uid
 	 * @return boolean
 	 * @todo: Refactor to remove duplicate code (see TableController, RteController)
 	 */
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php b/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
index 21d5726c1b000ecc9251e33d24f7a6dc80547d1e..c43434ec0a6768bc22c119dfc8e08aa742315248 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
@@ -254,7 +254,7 @@ class RteController {
 	 * Checks access for element
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
+	 * @param int $uid Record uid
 	 * @return boolean
 	 * @todo: Refactor to remove duplicate code (see FormsController, TableController)
 	 */
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
index 694f954f4e0977c5e37efa70de58a0e8daccfdd8..f3ae3884c124f214addd196297ee2ada959b01f0 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
@@ -544,7 +544,7 @@ class TableController {
 	 * Converts the input configuration code string into an array
 	 *
 	 * @param string $cfgStr Configuration code
-	 * @param integer $cols Default number of columns
+	 * @param int $cols Default number of columns
 	 * @return array Configuration array
 	 * @see cfgArray2CfgString()
 	 */
@@ -578,7 +578,7 @@ class TableController {
 	 * Checks access for element
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
+	 * @param int $uid Record uid
 	 * @return boolean
 	 * @todo: Refactor to remove duplicate code (see FormsController, RteController)
 	 */
diff --git a/typo3/sysext/backend/Classes/Form/DataPreprocessor.php b/typo3/sysext/backend/Classes/Form/DataPreprocessor.php
index 1064f0de6cec40831ac0c764f40091d005cb3ba4..58727d5654da387043acd331ada9599db588548a 100644
--- a/typo3/sysext/backend/Classes/Form/DataPreprocessor.php
+++ b/typo3/sysext/backend/Classes/Form/DataPreprocessor.php
@@ -182,7 +182,7 @@ class DataPreprocessor {
 	 *
 	 * @param string $table The table name
 	 * @param string $id The uid value of the record (integer). Can also be a string (NEW-something) if the record is a NEW record.
-	 * @param integer $pid The pid integer. For existing records this is of course the row's "pid" field. For new records it can be either a page id (positive) or a pointer to another record from the SAME table (negative) after which the record should be inserted (or on same page)
+	 * @param int $pid The pid integer. For existing records this is of course the row's "pid" field. For new records it can be either a page id (positive) or a pointer to another record from the SAME table (negative) after which the record should be inserted (or on same page)
 	 * @param array $row The row of the current record. If NEW record, then it may be loaded with default values (by eg. fetchRecord()).
 	 * @return void
 	 * @see fetchRecord()
@@ -224,10 +224,10 @@ class DataPreprocessor {
 	 *
 	 * @param string $table The table name
 	 * @param string $id The uid value of the record (integer). Can also be a string (NEW-something) if the record is a NEW record.
-	 * @param integer $pid The pid integer. For existing records this is of course the row's "pid" field. For new records it can be either a page id (positive) or a pointer to another record from the SAME table (negative) after which the record should be inserted (or on same page)
+	 * @param int $pid The pid integer. For existing records this is of course the row's "pid" field. For new records it can be either a page id (positive) or a pointer to another record from the SAME table (negative) after which the record should be inserted (or on same page)
 	 * @param array $row The row of the current record. If NEW record, then it may be loaded with default values (by eg. fetchRecord()).
 	 * @param array $TSconfig Tsconfig array
-	 * @param integer $tscPID PAGE TSconfig pid
+	 * @param int $tscPID PAGE TSconfig pid
 	 * @return array Processed record data
 	 * @see renderRecord()
 	 */
@@ -458,9 +458,9 @@ class DataPreprocessor {
 	 *
 	 * @param array $totalRecordContent The array of values which has been processed according to their type (eg. "group" or "select")
 	 * @param array $types_fieldConfig The "types" configuration for the current display of fields.
-	 * @param integer $tscPID PAGE TSconfig PID
+	 * @param int $tscPID PAGE TSconfig PID
 	 * @param string $table Table name
-	 * @param integer $pid PID value
+	 * @param int $pid PID value
 	 * @return array The processed version of $totalRecordContent
 	 * @access private
 	 */
@@ -877,8 +877,8 @@ class DataPreprocessor {
 	 * Sets the lock for a record from table/id, IF $this->lockRecords is set!
 	 *
 	 * @param string $table The table name
-	 * @param integer $id The id of the record
-	 * @param integer $pid The pid of the record
+	 * @param int $id The id of the record
+	 * @param int $pid The pid of the record
 	 * @return void
 	 */
 	public function lockRecord($table, $id, $pid = 0) {
@@ -891,7 +891,7 @@ class DataPreprocessor {
 	 * Dummy function, can be used to "register" records. Used by eg. the "show_item" script.
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Record id
+	 * @param int $id Record id
 	 * @param string $field Field name
 	 * @param string $content Field content.
 	 * @return void
diff --git a/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php b/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php
index fd7f37d8dd8801bda83b9a106ec8e48736f3b784..0b2934d184e876f2e46e2223f7758a4d061315f4 100644
--- a/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php
@@ -118,9 +118,9 @@ class CheckboxElement extends AbstractFormElement {
 	 * Creates checkbox parameters
 	 *
 	 * @param string $itemName Form element name
-	 * @param integer $formElementValue The value of the checkbox (representing checkboxes with the bits)
-	 * @param integer $checkbox Checkbox # (0-9?)
-	 * @param integer $checkboxesCount Total number of checkboxes in the array.
+	 * @param int $formElementValue The value of the checkbox (representing checkboxes with the bits)
+	 * @param int $checkbox Checkbox # (0-9?)
+	 * @param int $checkboxesCount Total number of checkboxes in the array.
 	 * @param string $additionalJavaScript Additional JavaScript for the onclick handler.
 	 * @return string The onclick attribute + possibly the checked-option set.
 	 */
diff --git a/typo3/sysext/backend/Classes/Form/Element/FlexElement.php b/typo3/sysext/backend/Classes/Form/Element/FlexElement.php
index 8fe4518484808a11ad27cbedec6fa61e6a789281..54b9a49a6daf67e250a1f95c1daee7be71d78efe 100644
--- a/typo3/sysext/backend/Classes/Form/Element/FlexElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/FlexElement.php
@@ -212,7 +212,7 @@ class FlexElement extends AbstractFormElement {
 	 * @param array $row The particular record from $table in which the field $field is found
 	 * @param array $PA Array of standard information for rendering of a form field in TCEforms, see other rendering functions too
 	 * @param string $formPrefix Form field prefix, eg. "[data][sDEF][lDEF][...][...]
-	 * @param integer $level Indicates nesting level for the function call
+	 * @param int $level Indicates nesting level for the function call
 	 * @param string $idPrefix Prefix for ID-values
 	 * @param bool $toggleClosed Defines whether the next flexform level is open or closed. Comes from _TOGGLE pseudo field in FlexForm xml.
 	 * @return string HTMl code for form.
diff --git a/typo3/sysext/backend/Classes/Form/Element/InlineElement.php b/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
index d2ed108d17bcf14f10e644e3c190f99427d4f4c9..24f428ebb78cd27c644bd3581ab55e8e75342504 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
@@ -1535,7 +1535,7 @@ class InlineElement {
 	/**
 	 * Gets the related records of the embedding item, this could be 1:n, m:n.
 	 *
-	 * @param integer $pid The pid of the parent record
+	 * @param int $pid The pid of the parent record
 	 * @param string $table The table name of the record
 	 * @param string $itemList The list of related child records
 	 * @return array The records related to the parent item
@@ -1708,7 +1708,7 @@ class InlineElement {
 	 * The pid to be used can be defined by a Page TSconfig.
 	 *
 	 * @param string $table The table name
-	 * @param integer $parentPid The pid of the parent record
+	 * @param int $parentPid The pid of the parent record
 	 * @return integer The corrected pid to be used for a new record
 	 */
 	protected function getNewRecordPid($table, $parentPid = NULL) {
@@ -1727,7 +1727,7 @@ class InlineElement {
 	 * \TYPO3\CMS\Backend\Form\DataPreprocessor is used for "upgrading" the
 	 * values, especially the relations.
 	 *
-	 * @param integer $pid The pid of the page the record should be stored (only relevant for NEW records)
+	 * @param int $pid The pid of the page the record should be stored (only relevant for NEW records)
 	 * @param string $table The table to fetch data from (= foreign_table)
 	 * @param string $uid The uid of the record to fetch, or the pid if a new record should be created
 	 * @param string $cmd The command to perform, empty or 'new'
@@ -1759,7 +1759,7 @@ class InlineElement {
 	/**
 	 * Wrapper. Calls getRecord in case of a new record should be created.
 	 *
-	 * @param integer $pid The pid of the page the record should be stored (only relevant for NEW records)
+	 * @param int $pid The pid of the page the record should be stored (only relevant for NEW records)
 	 * @param string $table The table to fetch data from (= foreign_table)
 	 * @return array A record row from the database post-processed by \TYPO3\CMS\Backend\Form\DataPreprocessor
 	 */
@@ -1887,7 +1887,7 @@ class InlineElement {
 	 * If the $level value is negative, this function works top-down,
 	 * if the $level value is positive, this function works bottom-up.
 	 *
-	 * @param integer $level Which level to return
+	 * @param int $level Which level to return
 	 * @return array The item of the stack at the requested level
 	 */
 	public function getStructureLevel($level) {
@@ -1903,7 +1903,7 @@ class InlineElement {
 	/**
 	 * Calculates structure level.
 	 *
-	 * @param integer $level Which level to return
+	 * @param int $level Which level to return
 	 * @return boolean|integer
 	 */
 	protected function calculateStructureLevel($level) {
@@ -1924,7 +1924,7 @@ class InlineElement {
 	 * Get the identifiers of a given depth of level, from the top of the stack to the bottom.
 	 * An identifier looks like "<table>-<uid>-<field>".
 	 *
-	 * @param integer $structureDepth How much levels to output, beginning from the top of the stack
+	 * @param int $structureDepth How much levels to output, beginning from the top of the stack
 	 * @return string The path of identifiers
 	 */
 	public function getStructurePath($structureDepth = -1) {
@@ -2442,7 +2442,7 @@ class InlineElement {
 	 * Checks if a uid of a child table is in the inline view settings.
 	 *
 	 * @param string $table Name of the child table
-	 * @param integer $uid uid of the the child record
+	 * @param int $uid uid of the the child record
 	 * @return boolean TRUE=expand, FALSE=collapse
 	 */
 	public function getExpandedCollapsedState($table, $uid) {
diff --git a/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php b/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
index 5be0d9af284eb2fcd31e40734b64df60479d3a10..2a3e09c118b5639574b15c98befe64a6a2babb52 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
@@ -138,7 +138,7 @@ class SuggestDefaultReceiver {
 	 * this function itself
 	 *
 	 * @param array $params
-	 * @param integer $ref The parent object
+	 * @param int $ref The parent object
 	 * @return array Array of rows or FALSE if nothing found
 	 */
 	public function queryTable(&$params, $recursionCounter = 0) {
@@ -241,8 +241,8 @@ class SuggestDefaultReceiver {
 	/**
 	 * Selects all subpages of one page, optionally only upto a certain level
 	 *
-	 * @param integer $uid The uid of the page
-	 * @param integer $depth The depth to select upto. Defaults to 99
+	 * @param int $uid The uid of the page
+	 * @param int $depth The depth to select upto. Defaults to 99
 	 * @return array of page IDs
 	 */
 	protected function getAllSubpagesOfPage($uid, $depth = 99) {
@@ -289,7 +289,7 @@ class SuggestDefaultReceiver {
 	 * Selects whether the logged in Backend User is allowed to read a specific record
 	 *
 	 * @param array $row
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return boolean
 	 */
 	protected function checkRecordAccess($row, $uid) {
diff --git a/typo3/sysext/backend/Classes/Form/Element/TextElement.php b/typo3/sysext/backend/Classes/Form/Element/TextElement.php
index 4ea867dcf84e13c36679f7696715e2c432993fe0..fc9b63cfb3d288d902c56598aad95301ff4869e7 100644
--- a/typo3/sysext/backend/Classes/Form/Element/TextElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/TextElement.php
@@ -211,7 +211,7 @@ class TextElement extends AbstractFormElement {
 	/**
 	 * Returns parameters to set with for a textarea field
 	 *
-	 * @param integer $size The abstract width (1-48)
+	 * @param int $size The abstract width (1-48)
 	 * @param string $wrap Empty or "off" (text wrapping in the field or not)
 	 * @return string The "cols" attribute string (or style from formWidth())
 	 * @see formWidth()
diff --git a/typo3/sysext/backend/Classes/Form/ElementConditionMatcher.php b/typo3/sysext/backend/Classes/Form/ElementConditionMatcher.php
index 276503833c9dc1bc5356ac88d126b5844ad67860..5a9e4eeb2220d647f02443c62b4714d2d631d5de 100644
--- a/typo3/sysext/backend/Classes/Form/ElementConditionMatcher.php
+++ b/typo3/sysext/backend/Classes/Form/ElementConditionMatcher.php
@@ -43,7 +43,7 @@ class ElementConditionMatcher {
 	 * @param string $displayCondition
 	 * @param array $record
 	 * @param string $flexformValueKey
-	 * @param integer $recursionLevel Internal level of recursion
+	 * @param int $recursionLevel Internal level of recursion
 	 * @return boolean TRUE if condition evaluates successfully
 	 */
 	public function match($displayCondition, array $record = array(), $flexformValueKey = '', $recursionLevel = 0) {
diff --git a/typo3/sysext/backend/Classes/Form/FormDataTraverser.php b/typo3/sysext/backend/Classes/Form/FormDataTraverser.php
index bfa360e0c31cf5ac5ed3394a4d790f1a26e8db07..8456ffbfe400343aba7c5c919fd8aa7107237f9f 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataTraverser.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataTraverser.php
@@ -269,7 +269,7 @@ class FormDataTraverser {
 	 *
 	 * @param array $selectItemArray The select item array generated by \TYPO3\CMS\Backend\Form\FormEngine->getSelectItems.
 	 * @param string $value The currently selected value(s) as comma separated list.
-	 * @param integer|NULL $maxItems Optional value, if set processing is skipped and an empty array will be returned when the number of selected values is larger than the provided value.
+	 * @param int|NULL $maxItems Optional value, if set processing is skipped and an empty array will be returned when the number of selected values is larger than the provided value.
 	 * @param bool $returnLabels If TRUE the select labels will be returned instead of the values.
 	 * @return array
 	 */
@@ -344,7 +344,7 @@ class FormDataTraverser {
 	 *
 	 * The table name is read from the currentTable class variable.
 	 *
-	 * @param integer $uid The UID of the record that should be fetched.
+	 * @param int $uid The UID of the record that should be fetched.
 	 * @return array|boolean FALSE if the record can not be accessed, otherwise the data of the requested record.
 	 */
 	protected function getRecordRow($uid) {
diff --git a/typo3/sysext/backend/Classes/Form/FormEngine.php b/typo3/sysext/backend/Classes/Form/FormEngine.php
index e987df58ef66780be9aa267a252b5d3396268668..1a083c077fc8103774e1dcdbcddabe8de71a2537 100644
--- a/typo3/sysext/backend/Classes/Form/FormEngine.php
+++ b/typo3/sysext/backend/Classes/Form/FormEngine.php
@@ -758,7 +758,7 @@ class FormEngine {
 	 *
 	 * @param string $table The table name
 	 * @param array $row The record from the table for which to render a field.
-	 * @param integer $depth Depth level
+	 * @param int $depth Depth level
 	 * @param array $overruleTypesArray Overrule types array. Can be used to override the showitem etc. configuration for the TCA types of the table. Can contain all settings which are possible in the TCA 'types' section. See e.g. $TCA['tt_content']['types'].
 	 * @return string HTML output
 	 * @see getSoloField()
@@ -1041,7 +1041,7 @@ class FormEngine {
 	 * @param string $altName Alternative field name label to show.
 	 * @param bool $palette Set this if the field is on a palette (in top frame), otherwise not. (if set, field will render as a hidden field).
 	 * @param string $extra The "extra" options from "Part 4" of the field configurations found in the "types" "showitem" list. Typically parsed by $this->getSpecConfFromString() in order to get the options as an associative array.
-	 * @param integer $pal The palette pointer.
+	 * @param int $pal The palette pointer.
 	 * @return mixed String (normal) or array (palettes)
 	 */
 	public function getSingleField($table, $field, $row, $altName = '', $palette = FALSE, $extra = '', $pal = 0) {
@@ -2513,7 +2513,7 @@ class FormEngine {
 	 *
 	 * @param string $str The icon HTML to wrap
 	 * @param string $table Table name (eg. "pages" or "tt_content") OR the absolute path to the file
-	 * @param integer $uid The uid of the record OR if file, just blank value.
+	 * @param int $uid The uid of the record OR if file, just blank value.
 	 * @return string HTML
 	 */
 	public function getClickMenu($str, $table, $uid = 0) {
@@ -2953,7 +2953,7 @@ class FormEngine {
 	 * @param string $header The string to wrap in an A-tag
 	 * @param string $table The table name for which to open the palette.
 	 * @param array $row The palette pointer.
-	 * @param integer $palette The record array
+	 * @param int $palette The record array
 	 * @param mixed $retFunc Not used
 	 * @return array
 	 */
@@ -3022,7 +3022,7 @@ class FormEngine {
 	/**
 	 * Returns parameters to set the width for a <input>/<textarea>-element
 	 *
-	 * @param integer $size The abstract size value (1-48)
+	 * @param int $size The abstract size value (1-48)
 	 * @param bool $textarea If this is for a text area.
 	 * @return string Either a "style" attribute string or "cols"/"size" attribute string.
 	 */
@@ -3039,7 +3039,7 @@ class FormEngine {
 	/**
 	 * Returns parameters to set the width for a <input>/<textarea>-element
 	 *
-	 * @param integer $size The abstract size value (1-48)
+	 * @param int $size The abstract size value (1-48)
 	 * @param bool $textarea If set, calculates sizes for a text area.
 	 * @return array An array containing style, class, and width attributes.
 	 */
@@ -3127,7 +3127,7 @@ class FormEngine {
 	 *
 	 * @param array $parts Parts for the tab menu, fed to template::getDynTabMenu()
 	 * @param string $idString ID string for the tab menu
-	 * @param integer $dividersToTabsBehaviour If set to '1' empty tabs will be removed, If set to '2' empty tabs will be disabled
+	 * @param int $dividersToTabsBehaviour If set to '1' empty tabs will be removed, If set to '2' empty tabs will be disabled
 	 * @return string HTML for the menu
 	 */
 	public function getDynTabMenu($parts, $idString, $dividersToTabsBehaviour = 1) {
@@ -3705,7 +3705,7 @@ class FormEngine {
 	 * Wraps an element in the $out_array with the template row for a "section" ($this->sectionWrap)
 	 *
 	 * @param array $out_array The array with form elements stored in (passed by reference and changed!)
-	 * @param integer $out_pointer The pointer to the entry in the $out_array  (passed by reference and incremented!)
+	 * @param int $out_pointer The pointer to the entry in the $out_array  (passed by reference and incremented!)
 	 * @return void
 	 */
 	public function wrapBorder(&$out_array, &$out_pointer) {
@@ -4243,7 +4243,7 @@ class FormEngine {
 	 * Gets default record. Maybe not used anymore. FE-editor?
 	 *
 	 * @param string $table Database Tablename
-	 * @param integer $pid PID value (positive / negative)
+	 * @param int $pid PID value (positive / negative)
 	 * @return array|NULL "default" row.
 	 * @deprecated since 6.3 - will be removed two versions later; not used anymore in Core
 	 */
@@ -4354,7 +4354,7 @@ class FormEngine {
 	 * Returns TRUE, if the palette, $palette, is collapsed (not shown, but found in top-frame) for the table.
 	 *
 	 * @param string $table The table name
-	 * @param integer $palette The palette pointer/number
+	 * @param int $palette The palette pointer/number
 	 * @return boolean
 	 */
 	public function isPalettesCollapsed($table, $palette) {
diff --git a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
index d920db18a6a283d5e29963fe61d50035781c32f3..252f79703e00913b532c8f9c86fa998ee475a280 100644
--- a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
+++ b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
@@ -224,9 +224,9 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
 	 * Generates a list of Page-uid's from $id. List does not include $id itself
 	 * The only pages excluded from the list are deleted pages.
 	 *
-	 * @param integer $id Start page id
-	 * @param integer $depth Depth to traverse down the page tree.
-	 * @param integer $begin Is an optional integer that determines at which level in the tree to start collecting uid's. Zero means 'start right away', 1 = 'next level and out'
+	 * @param int $id Start page id
+	 * @param int $depth Depth to traverse down the page tree.
+	 * @param int $begin Is an optional integer that determines at which level in the tree to start collecting uid's. Zero means 'start right away', 1 = 'next level and out'
 	 * @param string $perms_clause Perms clause
 	 * @return string Returns the list with a comma in the end (if any pages selected!)
 	 */
@@ -256,7 +256,7 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
 	/**
 	 * Returns the number of cached pages for a page id.
 	 *
-	 * @param integer $pageId The page id.
+	 * @param int $pageId The page id.
 	 * @return integer The number of pages for this page in the table "cache_pages
 	 */
 	public function extGetNumberOfCachedPages($pageId) {
diff --git a/typo3/sysext/backend/Classes/History/RecordHistory.php b/typo3/sysext/backend/Classes/History/RecordHistory.php
index 28263ee60b5fe61ccd49d9f214268422b73d75ef..2fc3f79d7d71811da818be8b1280086dd4e85626 100644
--- a/typo3/sysext/backend/Classes/History/RecordHistory.php
+++ b/typo3/sysext/backend/Classes/History/RecordHistory.php
@@ -160,7 +160,7 @@ class RecordHistory {
 	/**
 	 * Toggles highlight state of record
 	 *
-	 * @param integer $uid Uid of sys_history entry
+	 * @param int $uid Uid of sys_history entry
 	 * @return void
 	 */
 	public function toggleHighlight($uid) {
@@ -514,7 +514,7 @@ class RecordHistory {
 	 *
 	 * @param array $entry sys_history entry record.
 	 * @param string $table The table name
-	 * @param integer $rollbackUid If set to UID of record, display rollback links
+	 * @param int $rollbackUid If set to UID of record, display rollback links
 	 * @return string HTML table
 	 * @access private
 	 */
@@ -652,7 +652,7 @@ class RecordHistory {
 	 * Gets history and delete/insert data from sys_log and sys_history
 	 *
 	 * @param string $table DB table name
-	 * @param integer $uid UID of record
+	 * @param int $uid UID of record
 	 * @return array history data of the record
 	 */
 	public function getHistoryData($table, $uid) {
@@ -748,7 +748,7 @@ class RecordHistory {
 	 *
 	 * @param string $key Parameter which is set to rollbackFields
 	 * @param string $alt Optional, alternative label and title tag of image
-	 * @param integer $type Optional, type of rollback: 0 - ALL; 1 - element; 2 - field
+	 * @param int $type Optional, type of rollback: 0 - ALL; 1 - element; 2 - field
 	 * @return string HTML output
 	 */
 	public function createRollbackLink($key, $alt = '', $type = 0) {
@@ -800,7 +800,7 @@ class RecordHistory {
 	 * Convert input element reference to workspace version if any.
 	 *
 	 * @param string $table Table of input element
-	 * @param integer $uid UID of record
+	 * @param int $uid UID of record
 	 * @return integer converted UID of record
 	 */
 	public function resolveElement($table, $uid) {
@@ -831,7 +831,7 @@ class RecordHistory {
 	 * Determines whether user has access to a page.
 	 *
 	 * @param string $table
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return boolean
 	 */
 	protected function hasPageAccess($table, $uid) {
@@ -867,7 +867,7 @@ class RecordHistory {
 	 * Gets a database record.
 	 *
 	 * @param string $table
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return array|NULL
 	 */
 	protected function getRecord($table, $uid) {
diff --git a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
index b763c9348efb4fd66aef7edd3d280f86216ed59d..1a4d8e41fc808e1dfb1f81266becf92aee1c97f3 100644
--- a/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
@@ -181,11 +181,11 @@ abstract class AbstractRecordList {
 	 * Returns a table-row with the content from the fields in the input data array.
 	 * OBS: $this->fieldArray MUST be set! (represents the list of fields to display)
 	 *
-	 * @param integer $h Is an integer >=0 and denotes how tall a element is. Set to '0' makes a halv line, -1 = full line, set to 1 makes a 'join' and above makes 'line'
+	 * @param int $h Is an integer >=0 and denotes how tall a element is. Set to '0' makes a halv line, -1 = full line, set to 1 makes a 'join' and above makes 'line'
 	 * @param string $icon Is the <img>+<a> of the record. If not supplied the first 'join'-icon will be a 'line' instead
 	 * @param array $data Is the dataarray, record with the fields. Notice: These fields are (currently) NOT htmlspecialchar'ed before being wrapped in <td>-tags
 	 * @param string $tdParams Is insert in the <td>-tags. Must carry a ' ' as first character
-	 * @param integer OBSOLETE - NOT USED ANYMORE. $lMargin is the leftMargin (integer)
+	 * @param int OBSOLETE - NOT USED ANYMORE. $lMargin is the leftMargin (integer)
 	 * @param string $altLine Is the HTML <img>-tag for an alternative 'gfx/ol/line.gif'-icon (used in the top)
 	 * @return string HTML content for the table row
 	 */
@@ -313,7 +313,7 @@ abstract class AbstractRecordList {
 	 * Creates the button with link to either forward or reverse
 	 *
 	 * @param string $type Type: "fwd" or "rwd
-	 * @param integer $pointer Pointer
+	 * @param int $pointer Pointer
 	 * @param string $table Table name
 	 * @return string
 	 * @access private
@@ -396,7 +396,7 @@ abstract class AbstractRecordList {
 	/**
 	 * Return the icon for the language
 	 *
-	 * @param integer $sys_language_uid Sys language uid
+	 * @param int $sys_language_uid Sys language uid
 	 * @param bool $addAsAdditionalText If set to true, only the flag is returned
 	 * @return string Language icon
 	 */
diff --git a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
index e3ecc03daed0d6e557f44bff649f7ca1685e93be..4fdfda01b6d14ab7bc62b8987c41a49d7520cb77 100644
--- a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
@@ -76,7 +76,7 @@ class ElementBrowserRecordList extends \TYPO3\CMS\Recordlist\RecordList\Database
 	 * Returns the title (based on $code) of a record (from table $table) with the proper link around (that is for "pages"-records a link to the level of that record...)
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID (not used here)
+	 * @param int $uid UID (not used here)
 	 * @param string $code Title string
 	 * @param array $row Records array (from table name)
 	 * @return string
diff --git a/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php b/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php
index ead759dfac130eed30c1a22eb4c52450418eb6ef..5c958b86c8294dc5f25e637ab1408926f1097933 100644
--- a/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php
+++ b/typo3/sysext/backend/Classes/RecordList/RecordListGetTableHookInterface.php
@@ -24,7 +24,7 @@ interface RecordListGetTableHookInterface
 	 * modifies the DB list query
 	 *
 	 * @param string $table The current database table
-	 * @param integer $pageId The record's page ID
+	 * @param int $pageId The record's page ID
 	 * @param string $additionalWhereClause An additional WHERE clause
 	 * @param string $selectedFieldsList Comma separated list of selected fields
 	 * @param \TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList $parentObject Parent localRecordList object
diff --git a/typo3/sysext/backend/Classes/Rte/AbstractRte.php b/typo3/sysext/backend/Classes/Rte/AbstractRte.php
index 233aad103c2f4e6ca9591f12df02ea9cdb31f0b8..c7969631223d5bea0256f1ba616341141bff3aec 100644
--- a/typo3/sysext/backend/Classes/Rte/AbstractRte.php
+++ b/typo3/sysext/backend/Classes/Rte/AbstractRte.php
@@ -69,7 +69,7 @@ class AbstractRte {
 	 * @param array $thisConfig Configuration for RTEs; A mix between TSconfig and otherwise. Contains configuration for display, which buttons are enabled, additional transformation information etc.
 	 * @param string $RTEtypeVal Record "type" field value.
 	 * @param string $RTErelPath Relative path for images/links in RTE; this is used when the RTE edits content from static files where the path of such media has to be transformed forth and back!
-	 * @param integer $thePidValue PID value of record (true parent page id)
+	 * @param int $thePidValue PID value of record (true parent page id)
 	 * @return string HTML code for RTE!
 	 */
 	public function drawRTE(&$pObj, $table, $field, $row, $PA, $specConf, $thisConfig, $RTEtypeVal, $RTErelPath, $thePidValue) {
@@ -97,7 +97,7 @@ class AbstractRte {
 	 * @param array $specConf "special" configuration - what is found at position 4 in the types configuration of a field from record, parsed into an array.
 	 * @param array $thisConfig Configuration for RTEs; A mix between TSconfig and otherwise. Contains configuration for display, which buttons are enabled, additional transformation information etc.
 	 * @param string $RTErelPath Relative path for images/links in RTE; this is used when the RTE edits content from static files where the path of such media has to be transformed forth and back!
-	 * @param integer $pid PID value of record (true parent page id)
+	 * @param int $pid PID value of record (true parent page id)
 	 * @return string Transformed content
 	 */
 	public function transformContent($dirRTE, $value, $table, $field, $row, $specConf, $thisConfig, $RTErelPath, $pid) {
diff --git a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
index 59ff5dff973cad0aaefdf81e6122d8e0f05543f8..dd019ef4dda597cb3875ea7e87015f39642e85ff 100644
--- a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
+++ b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
@@ -124,7 +124,7 @@ class LiveSearch {
 	/**
 	 * Retrieve the page record from given $id.
 	 *
-	 * @param integer $id
+	 * @param int $id
 	 * @return array
 	 */
 	protected function findPageById($id) {
@@ -264,7 +264,7 @@ class LiveSearch {
 	 * which offers a tooltip with the original title when moving mouse over it.
 	 *
 	 * @param string $title The title string to be cropped
-	 * @param integer $titleLength Crop title after this length - if not set, BE_USER->uc['titleLen'] is used
+	 * @param int $titleLength Crop title after this length - if not set, BE_USER->uc['titleLen'] is used
 	 * @return string The processed title string, wrapped in <span title="...">|</span> if cropped
 	 */
 	public function getRecordTitlePrep($title, $titleLength = 0) {
@@ -391,7 +391,7 @@ class LiveSearch {
 	/**
 	 * Setter for limit value.
 	 *
-	 * @param integer $limitCount
+	 * @param int $limitCount
 	 * @return void
 	 */
 	public function setLimitCount($limitCount) {
@@ -404,7 +404,7 @@ class LiveSearch {
 	/**
 	 * Setter for start count value.
 	 *
-	 * @param integer $startCount
+	 * @param int $startCount
 	 * @return void
 	 */
 	public function setStartCount($startCount) {
@@ -426,8 +426,8 @@ class LiveSearch {
 	 * Creates an instance of \TYPO3\CMS\Backend\Tree\View\PageTreeView which will select a
 	 * page tree to $depth and return the object. In that object we will find the ids of the tree.
 	 *
-	 * @param integer $id Page id.
-	 * @param integer $depth Depth to go down.
+	 * @param int $id Page id.
+	 * @param int $depth Depth to go down.
 	 * @return string Comma separated list of uids
 	 */
 	protected function getAvailablePageIds($id, $depth) {
diff --git a/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php b/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php
index 1979ef94cb502042f4575b7d010883aff700ff56..b6a2c3d9a5426d9956abed1653fb9663bba2cdfe 100644
--- a/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php
+++ b/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php
@@ -261,7 +261,7 @@ class SpriteGenerator {
 	/**
 	 * Setter to adjust how much space is between to icons in the sprite
 	 *
-	 * @param integer $value
+	 * @param int $value
 	 * @return SpriteGenerator An instance of $this, to enable "chaining".
 	 */
 	public function setIconSpace($value) {
diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index 41d52b75fd48e6a1ff422962c3623b62e49e2b28..cc26bbdfd855caa727af364a3f956337ee153baf 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -446,7 +446,7 @@ function jumpToUrl(URL) {
 	 *
 	 * @param string $str String to be wrapped in link, typ. image tag.
 	 * @param string $table Table name/File path. If the icon is for a database record, enter the tablename from $GLOBALS['TCA']. If a file then enter the absolute filepath
-	 * @param integer $uid If icon is for database record this is the UID for the record from $table
+	 * @param int $uid If icon is for database record this is the UID for the record from $table
 	 * @param bool $listFr Tells the top frame script that the link is coming from a "list" frame which means a frame from within the backend content frame.
 	 * @param string $addParams Additional GET parameters for the link to alt_clickmenu.php
 	 * @param string $enDisItems Enable / Disable click menu items. Example: "+new,view" will display ONLY these two items (and any spacers in between), "new,view" will display all BUT these two items.
@@ -465,7 +465,7 @@ function jumpToUrl(URL) {
 	 * $id must be a page-uid
 	 * If the BE_USER has access to Web>List then a link to that module is shown as well (with return-url)
 	 *
-	 * @param integer $id The page id
+	 * @param int $id The page id
 	 * @param string $backPath The current "BACK_PATH" (the back relative to the typo3/ directory)
 	 * @param string $addParams Additional parameters for the image tag(s)
 	 * @return string HTML string with linked icon(s)
@@ -632,7 +632,7 @@ function jumpToUrl(URL) {
 	 * For client browsers with no CSS support the cols/size attribute is returned.
 	 * For CSS compliant browsers (recommended) a ' style="width: ...px;"' is returned.
 	 *
-	 * @param integer $size A relative number which multiplied with approx. 10 will lead to the width in pixels
+	 * @param int $size A relative number which multiplied with approx. 10 will lead to the width in pixels
 	 * @param bool $textarea A flag you can set for textareas - DEPRECATED as there is no difference any more between the two
 	 * @param string $styleOverride A string which will be returned as attribute-value for style="" instead of the calculated width (if CSS is enabled)
 	 * @return string Tag attributes for an <input> tag (regarding width)
@@ -648,7 +648,7 @@ function jumpToUrl(URL) {
 	 * or
 	 * <textarea rows="10" wrap="virtual" '.$GLOBALS["TBE_TEMPLATE"]->formWidthText(48, "", "virtual").'>
 	 *
-	 * @param integer $size A relative number which multiplied with approx. 10 will lead to the width in pixels
+	 * @param int $size A relative number which multiplied with approx. 10 will lead to the width in pixels
 	 * @param string $styleOverride A string which will be returned as attribute-value for style="" instead of the calculated width (if CSS is enabled)
 	 * @param string $wrap Pass on the wrap-attribute value you use in your <textarea>! This will be used to make sure that some browsers will detect wrapping alright.
 	 * @return string Tag attributes for an <input> tag (regarding width)
@@ -686,8 +686,8 @@ function jumpToUrl(URL) {
 	 * Returns a formatted string of $tstamp
 	 * Uses $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'] and $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] to format date and time
 	 *
-	 * @param integer $tstamp UNIX timestamp, seconds since 1970
-	 * @param integer $type How much data to show: $type = 1: hhmm, $type = 10:	ddmmmyy
+	 * @param int $tstamp UNIX timestamp, seconds since 1970
+	 * @param int $type How much data to show: $type = 1: hhmm, $type = 10:	ddmmmyy
 	 * @return string Formatted timestamp
 	 * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8, use the corresponding methods in BackendUtility
 	 */
@@ -920,7 +920,7 @@ function jumpToUrl(URL) {
 	 * @param string $text The HTML-content
 	 * @param bool $nostrtoupper	A flag that will prevent the header from being converted to uppercase
 	 * @param bool $sH Defines the type of header (if set, "<h3>" rather than the default "h4")
-	 * @param integer $type The number of an icon to show with the header (see the icon-function). -1,1,2,3
+	 * @param int $type The number of an icon to show with the header (see the icon-function). -1,1,2,3
 	 * @param bool $allowHTMLinHeader If set, HTML tags are allowed in $label (otherwise this value is by default htmlspecialchars()'ed)
 	 * @return string HTML content
 	 * @see icons(), sectionHeader()
@@ -946,7 +946,7 @@ function jumpToUrl(URL) {
 	 * Inserts a divider image
 	 * Ends a section (if open) before inserting the image
 	 *
-	 * @param integer $dist The margin-top/-bottom of the <hr> ruler.
+	 * @param int $dist The margin-top/-bottom of the <hr> ruler.
 	 * @return string HTML content
 	 */
 	public function divider($dist) {
@@ -962,7 +962,7 @@ function jumpToUrl(URL) {
 	/**
 	 * Returns a blank <div>-section with a height
 	 *
-	 * @param integer $dist Padding-top for the div-section (should be margin-top but konqueror (3.1) doesn't like it :-(
+	 * @param int $dist Padding-top for the div-section (should be margin-top but konqueror (3.1) doesn't like it :-(
 	 * @return string HTML content
 	 */
 	public function spacer($dist) {
@@ -1222,7 +1222,7 @@ function jumpToUrl(URL) {
 	 * 2:	Warning (Yellow triangle)
 	 * 3:	Fatal error (Red stop sign)
 	 *
-	 * @param integer $type See description
+	 * @param int $type See description
 	 * @param string $styleAttribValue Value for style attribute
 	 * @return string HTML image tag (if applicable)
 	 */
@@ -1551,12 +1551,12 @@ function jumpToUrl(URL) {
 	 *
 	 * @param array $menuItems Numeric array where each entry is an array in itself with associative keys: "label" contains the label for the TAB, "content" contains the HTML content that goes into the div-layer of the tabs content. "description" contains description text to be shown in the layer. "linkTitle" is short text for the title attribute of the tab-menu link (mouse-over text of tab). "stateIcon" indicates a standard status icon (see ->icon(), values: -1, 1, 2, 3). "icon" is an image tag placed before the text.
 	 * @param string $identString Identification string. This should be unique for every instance of a dynamic menu!
-	 * @param integer $toggle If "1", then enabling one tab does not hide the others - they simply toggles each sheet on/off. This makes most sense together with the $foldout option. If "-1" then it acts normally where only one tab can be active at a time BUT you can click a tab and it will close so you have no active tabs.
+	 * @param int $toggle If "1", then enabling one tab does not hide the others - they simply toggles each sheet on/off. This makes most sense together with the $foldout option. If "-1" then it acts normally where only one tab can be active at a time BUT you can click a tab and it will close so you have no active tabs.
 	 * @param bool $foldout If set, the tabs are rendered as headers instead over each sheet. Effectively this means there is no tab menu, but rather a foldout/foldin menu. Make sure to set $toggle as well for this option.
 	 * @param bool $noWrap Deprecated - delivered by CSS
 	 * @param bool $fullWidth If set, the tabs will span the full width of their position
-	 * @param integer $defaultTabIndex Default tab to open (for toggle <=0). Value corresponds to integer-array index + 1 (index zero is "1", index "1" is 2 etc.). A value of zero (or something non-existing) will result in no default tab open.
-	 * @param integer $dividers2tabs If set to '1' empty tabs will be remove, If set to '2' empty tabs will be disabled
+	 * @param int $defaultTabIndex Default tab to open (for toggle <=0). Value corresponds to integer-array index + 1 (index zero is "1", index "1" is 2 etc.). A value of zero (or something non-existing) will result in no default tab open.
+	 * @param int $dividers2tabs If set to '1' empty tabs will be remove, If set to '2' empty tabs will be disabled
 	 * @return string JavaScript section for the HTML header.
 	 */
 	public function getDynTabMenu($menuItems, $identString, $toggle = 0, $foldout = FALSE, $noWrap = TRUE, $fullWidth = FALSE, $defaultTabIndex = 1, $dividers2tabs = 2) {
@@ -1670,7 +1670,7 @@ function jumpToUrl(URL) {
 	 * Creates the version selector for the page id inputted.
 	 * Requires the core version management extension, "version" to be loaded.
 	 *
-	 * @param integer $id Page id to create selector for.
+	 * @param int $id Page id to create selector for.
 	 * @param bool $noAction If set, there will be no button for swapping page.
 	 * @return string
 	 */
diff --git a/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php b/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
index 5e54cbbe2e426bdde4cef977290924ec8a0cab8f..8ec948ec5583454e5ea43944a0e89f8705d9e9fd 100644
--- a/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
@@ -336,7 +336,7 @@ class ShortcutToolbarItem implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookI
 	/**
 	 * Gets shortcuts for a specific group
 	 *
-	 * @param integer $groupId Group Id
+	 * @param int $groupId Group Id
 	 * @return array Array of shortcuts that matched the group
 	 */
 	protected function getShortcutsByGroup($groupId) {
@@ -352,7 +352,7 @@ class ShortcutToolbarItem implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookI
 	/**
 	 * Gets a shortcut by its uid
 	 *
-	 * @param integer $shortcutId Shortcut id to get the complete shortcut for
+	 * @param int $shortcutId Shortcut id to get the complete shortcut for
 	 * @return mixed An array containing the shortcut's data on success or FALSE on failure
 	 */
 	protected function getShortcutById($shortcutId) {
@@ -563,7 +563,7 @@ class ShortcutToolbarItem implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookI
 	/**
 	 * Gets the label for a shortcut group
 	 *
-	 * @param integer $groupId A shortcut group id
+	 * @param int $groupId A shortcut group id
 	 * @return string The shortcut group label, can be an empty string if no group was found for the id
 	 */
 	protected function getShortcutGroupLabel($groupId) {
diff --git a/typo3/sysext/backend/Classes/Tree/AbstractExtJsTree.php b/typo3/sysext/backend/Classes/Tree/AbstractExtJsTree.php
index 3f1e2df2f3715de56e41678641fb01abb22a05b8..1482006c27f36efa8ce064989e5dc0643e7c556f 100644
--- a/typo3/sysext/backend/Classes/Tree/AbstractExtJsTree.php
+++ b/typo3/sysext/backend/Classes/Tree/AbstractExtJsTree.php
@@ -45,7 +45,7 @@ abstract class AbstractExtJsTree extends \TYPO3\CMS\Backend\Tree\AbstractTree {
 	/**
 	 * Fetches the next tree level
 	 *
-	 * @param integer $nodeId
+	 * @param int $nodeId
 	 * @param stdClass $nodeData
 	 * @return array
 	 */
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php b/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php
index f613d254a73073b775eeddb53b9504affe3117a6..61778c038770b4c82604580d16e427af7962020a 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/CollectionProcessorInterface.php
@@ -25,8 +25,8 @@ interface CollectionProcessorInterface
 	 *
 	 * @abstract
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
-	 * @param integer $mountPoint
-	 * @param integer $level
+	 * @param int $mountPoint
+	 * @param int $level
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
 	 * @return void
 	 */
@@ -38,7 +38,7 @@ interface CollectionProcessorInterface
 	 * @abstract
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
 	 * @param string $searchFilter
-	 * @param integer $mountPoint
+	 * @param int $mountPoint
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
 	 * @return void
 	 */
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
index 8e857ba9b27cc2df41cacba33c2438eb18d988f2..b96da001ead22faf8c2ca566c089f728aa515f8c 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
@@ -89,7 +89,7 @@ class Commands {
 	 * Restore the page
 	 *
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
-	 * @param integer $targetId
+	 * @param int $targetId
 	 * @return void
 	 */
 	static public function restoreNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node, $targetId) {
@@ -122,7 +122,7 @@ class Commands {
 	 * Node: Use a negative target id to specify a sibling target else the parent is used
 	 *
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $sourceNode
-	 * @param integer $targetId
+	 * @param int $targetId
 	 * @return integer
 	 */
 	static public function copyNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $sourceNode, $targetId) {
@@ -137,7 +137,7 @@ class Commands {
 	 * Node: Use a negative target id to specify a sibling target else the parent is used
 	 *
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $sourceNode
-	 * @param integer $targetId
+	 * @param int $targetId
 	 * @return void
 	 */
 	static public function moveNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $sourceNode, $targetId) {
@@ -149,8 +149,8 @@ class Commands {
 	 * Creates a page of the given doktype and returns the id of the created page
 	 *
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $parentNode
-	 * @param integer $targetId
-	 * @param integer $pageType
+	 * @param int $targetId
+	 * @param int $pageType
 	 * @return integer
 	 */
 	static public function createNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $parentNode, $targetId, $pageType) {
@@ -219,7 +219,7 @@ class Commands {
 	/**
 	 * Returns a node from the given node id
 	 *
-	 * @param integer $nodeId
+	 * @param int $nodeId
 	 * @param bool $unsetMovePointers
 	 * @return \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode
 	 */
@@ -231,7 +231,7 @@ class Commands {
 	/**
 	 * Returns the mount point path for a temporary mount or the given id
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return string
 	 */
 	static public function getMountPointPath($uid = -1) {
@@ -261,7 +261,7 @@ class Commands {
 	/**
 	 * Returns a node record from a given id
 	 *
-	 * @param integer $nodeId
+	 * @param int $nodeId
 	 * @param bool $unsetMovePointers
 	 * @return array
 	 */
@@ -273,7 +273,7 @@ class Commands {
 	/**
 	 * Returns the first configured domain name for a page
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return string
 	 */
 	static public function getDomainName($uid) {
@@ -286,7 +286,7 @@ class Commands {
 	 * Creates a node with the given record information
 	 *
 	 * @param array $record
-	 * @param integer $mountPoint
+	 * @param int $mountPoint
 	 * @return \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode
 	 */
 	static public function getNewNode($record, $mountPoint = 0) {
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
index 1c4cd284aeb185679f651fc423e972722c2a6ba2..70964ca14be7cf056f9e9dbcb0d9527da2208194 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
@@ -62,7 +62,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 	/**
 	 * Constructor
 	 *
-	 * @param integer $nodeLimit (optional)
+	 * @param int $nodeLimit (optional)
 	 */
 	public function __construct($nodeLimit = NULL) {
 		if ($nodeLimit === NULL) {
@@ -102,8 +102,8 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 	 * Fetches the sub-nodes of the given node
 	 *
 	 * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
-	 * @param integer $mountPoint
-	 * @param integer $level internally used variable as a recursion limiter
+	 * @param int $mountPoint
+	 * @param int $level internally used variable as a recursion limiter
 	 * @return \TYPO3\CMS\Backend\Tree\TreeNodeCollection
 	 */
 	public function getNodes(\TYPO3\CMS\Backend\Tree\TreeNode $node, $mountPoint = 0, $level = 0) {
@@ -176,7 +176,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 	/**
 	 * Wrapper method for \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordWSOL
 	 *
-	 * @param integer $uid The page id
+	 * @param int $uid The page id
 	 * @param bool $unsetMovePointers Whether to unset move pointers
 	 * @return array
 	 */
@@ -189,7 +189,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 	 *
 	 * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
 	 * @param string $searchFilter
-	 * @param integer $mountPoint
+	 * @param int $mountPoint
 	 * @return \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection the filtered nodes
 	 */
 	public function getFilteredNodes(\TYPO3\CMS\Backend\Tree\TreeNode $node, $searchFilter, $mountPoint = 0) {
@@ -408,7 +408,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 	/**
 	 * Returns the where clause for fetching pages
 	 *
-	 * @param integer $id
+	 * @param int $id
 	 * @param string $searchFilter
 	 * @return string
 	 */
@@ -452,7 +452,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 	/**
 	 * Returns all sub-pages of a given id
 	 *
-	 * @param integer $id
+	 * @param int $id
 	 * @param string $searchFilter
 	 * @return array
 	 */
@@ -464,7 +464,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 	/**
 	 * Returns TRUE if the node has child's
 	 *
-	 * @param integer $id
+	 * @param int $id
 	 * @return boolean
 	 */
 	protected function hasNodeSubPages($id) {
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
index 19f0c10291c1cf251b3ea5600d2a2e75e9ae985e..1406d6b0d9978cd1425572c011eeaab1c15c7998 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
@@ -102,7 +102,7 @@ class ExtdirectTreeCommands {
 	 * Restore the page
 	 *
 	 * @param stdClass $nodeData
-	 * @param integer $destination
+	 * @param int $destination
 	 * @return array
 	 */
 	public function restoreNode($nodeData, $destination) {
@@ -169,7 +169,7 @@ class ExtdirectTreeCommands {
 	 * Moves the source node directly as the first child of the destination node
 	 *
 	 * @param stdClass $nodeData
-	 * @param integer $destination
+	 * @param int $destination
 	 * @return array
 	 */
 	public function moveNodeToFirstChildOfDestination($nodeData, $destination) {
@@ -193,7 +193,7 @@ class ExtdirectTreeCommands {
 	 * Moves the source node directly after the destination node
 	 *
 	 * @param stdClass $nodeData
-	 * @param integer $destination
+	 * @param int $destination
 	 * @return void
 	 */
 	public function moveNodeAfterDestination($nodeData, $destination) {
@@ -218,7 +218,7 @@ class ExtdirectTreeCommands {
 	 * returns the created node.
 	 *
 	 * @param stdClass $nodeData
-	 * @param integer $destination
+	 * @param int $destination
 	 * @return array
 	 */
 	public function copyNodeToFirstChildOfDestination($nodeData, $destination) {
@@ -245,7 +245,7 @@ class ExtdirectTreeCommands {
 	 * created node.
 	 *
 	 * @param stdClass $nodeData
-	 * @param integer $destination
+	 * @param int $destination
 	 * @return array
 	 */
 	public function copyNodeAfterDestination($nodeData, $destination) {
@@ -271,7 +271,7 @@ class ExtdirectTreeCommands {
 	 * Inserts a new node as the first child node of the destination node and returns the created node.
 	 *
 	 * @param stdClass $parentNodeData
-	 * @param integer $pageType
+	 * @param int $pageType
 	 * @return array
 	 */
 	public function insertNodeToFirstChildOfDestination($parentNodeData, $pageType) {
@@ -293,8 +293,8 @@ class ExtdirectTreeCommands {
 	 * Inserts a new node directly after the destination node and returns the created node.
 	 *
 	 * @param stdClass $parentNodeData
-	 * @param integer $destination
-	 * @param integer $pageType
+	 * @param int $destination
+	 * @param int $pageType
 	 * @return array
 	 */
 	public function insertNodeAfterDestination($parentNodeData, $destination, $pageType) {
@@ -333,7 +333,7 @@ class ExtdirectTreeCommands {
 	 *
 	 * @static
 	 * @param string $stateId
-	 * @param integer $nodeId
+	 * @param int $nodeId
 	 * @return array
 	 */
 	static public function addRootlineOfNodeToStateHash($stateId, $nodeId) {
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
index 81c54c18ca5c2125225c9f781514d08a0edb7e6a..0c013d8b573df5ec4d4fabab3780ca9dde8b350d 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeDataProvider.php
@@ -56,7 +56,7 @@ class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractExtJsTre
 	/**
 	 * Fetches the next tree level
 	 *
-	 * @param integer $nodeId
+	 * @param int $nodeId
 	 * @param stdClass $nodeData
 	 * @return array
 	 */
@@ -75,7 +75,7 @@ class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractExtJsTre
 	/**
 	 * Returns a tree that only contains elements that match the given search string
 	 *
-	 * @param integer $nodeId
+	 * @param int $nodeId
 	 * @param stdClass $nodeData
 	 * @param string $searchFilter
 	 * @return array
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
index 7f63dac5edd425dc9a906ff5f5e45c0c81ec80a7..54bc14579f2ddfc1f1f591070d44a3b351fd058a 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
@@ -87,7 +87,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
 	/**
 	 * Set's the original id of the element
 	 *
-	 * @param integer $workspaceId
+	 * @param int $workspaceId
 	 * @return void
 	 */
 	public function setWorkspaceId($workspaceId) {
@@ -106,7 +106,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
 	/**
 	 * Sets the mount point id
 	 *
-	 * @param integer $mountPoint
+	 * @param int $mountPoint
 	 * @return void
 	 */
 	public function setMountPoint($mountPoint) {
diff --git a/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php b/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
index 4cc5eb78e2020a8aa0f093fa8907771eb0f81469..966cd0e4b87d2045331f7e6b59e22195cbb92f4f 100644
--- a/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
+++ b/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
@@ -48,8 +48,8 @@ class SortedTreeNodeCollection extends \TYPO3\CMS\Backend\Tree\TreeNodeCollectio
 	 * Binary search that returns the offset of a given node
 	 *
 	 * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
-	 * @param integer $start
-	 * @param integer $end
+	 * @param int $start
+	 * @param int $end
 	 * @return integer
 	 */
 	protected function binarySearch(\TYPO3\CMS\Backend\Tree\TreeNode $node, $start, $end) {
diff --git a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
index a5d8b5d34310d51a7db7c960a5d834af9414974d..1b627f1fc0f9bd9b7c1cffe3087ee9b1f3118b65 100644
--- a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
@@ -487,9 +487,9 @@ abstract class AbstractTreeView {
 	 * Generate the plus/minus icon for the browsable tree.
 	 *
 	 * @param array $row Record for the entry
-	 * @param integer $a The current entry number
-	 * @param integer $c The total number of entries. If equal to $a, a "bottom" element is returned.
-	 * @param integer $nextCount The number of sub-elements to the current element.
+	 * @param int $a The current entry number
+	 * @param int $c The total number of entries. If equal to $a, a "bottom" element is returned.
+	 * @param int $nextCount The number of sub-elements to the current element.
 	 * @param bool $exp The element was expanded to render subelements if this flag is set.
 	 * @return string Image tag with the plus/minus icon.
 	 * @access private
@@ -534,7 +534,7 @@ abstract class AbstractTreeView {
 	 *
 	 * @param string $title Title string
 	 * @param string $row Item record
-	 * @param integer $bank Bank pointer (which mount point number)
+	 * @param int $bank Bank pointer (which mount point number)
 	 * @return string
 	 * @access private
 	 */
@@ -591,7 +591,7 @@ abstract class AbstractTreeView {
 	 * data in $this->stored[][] and ->expandAll flag.
 	 * Extending parent function
 	 *
-	 * @param integer $id Record id/key
+	 * @param int $id Record id/key
 	 * @return boolean
 	 * @access private
 	 * @see \TYPO3\CMS\Backend\Tree\View\PageTreeView::expandNext()
@@ -679,7 +679,7 @@ abstract class AbstractTreeView {
 	 * Do NOT htmlspecialchar the string from this function - has already been done.
 	 *
 	 * @param array $row The input row array (where the key "title" is used for the title)
-	 * @param integer $titleLen Title length (30)
+	 * @param int $titleLen Title length (30)
 	 * @return string The title.
 	 */
 	public function getTitleStr($row, $titleLen = 30) {
@@ -734,8 +734,8 @@ abstract class AbstractTreeView {
 	/**
 	 * Fetches the data for the tree
 	 *
-	 * @param integer $uid item id for which to select subitems (parent id)
-	 * @param integer $depth Max depth (recursivity limit)
+	 * @param int $uid item id for which to select subitems (parent id)
+	 * @param int $depth Max depth (recursivity limit)
 	 * @param string $depthData HTML-code prefix for recursive calls.
 	 * @param string $blankLineCode ? (internal)
 	 * @param string $subCSSclass CSS class to use for <td> sub-elements
@@ -823,7 +823,7 @@ abstract class AbstractTreeView {
 	/**
 	 * Returns the number of records having the parent id, $uid
 	 *
-	 * @param integer $uid Id to count subitems for
+	 * @param int $uid Id to count subitems for
 	 * @return integer
 	 * @access private
 	 */
@@ -839,7 +839,7 @@ abstract class AbstractTreeView {
 	/**
 	 * Returns root record for uid (<=0)
 	 *
-	 * @param integer $uid uid, <= 0 (normally, this does not matter)
+	 * @param int $uid uid, <= 0 (normally, this does not matter)
 	 * @return array Array with title/uid keys with values of $this->title/0 (zero)
 	 */
 	public function getRootRecord($uid) {
@@ -851,7 +851,7 @@ abstract class AbstractTreeView {
 	 * For tables: Looks up the record in the database.
 	 * For arrays: Returns the fake record for uid id.
 	 *
-	 * @param integer $uid UID to look up
+	 * @param int $uid UID to look up
 	 * @return array The record
 	 */
 	public function getRecord($uid) {
@@ -867,7 +867,7 @@ abstract class AbstractTreeView {
 	 * For tables: This will make a database query to select all children to "parent"
 	 * For arrays: This will return key to the ->dataLookup array
 	 *
-	 * @param integer $parentId parent item id
+	 * @param int $parentId parent item id
 	 * @param string $subCSSclass Class for sub-elements.
 	 * @return mixed Data handle (Tables: An sql-resource, arrays: A parentId integer. -1 is returned if there were NO subLevel.)
 	 * @access private
@@ -969,7 +969,7 @@ abstract class AbstractTreeView {
 	 *
 	 * @param array $dataArr The input array, see examples below in this script.
 	 * @param bool $traverse Internal, for recursion.
-	 * @param integer $pid Internal, for recursion.
+	 * @param int $pid Internal, for recursion.
 	 * @return void
 	 */
 	public function setDataFromArray(&$dataArr, $traverse = FALSE, $pid = 0) {
diff --git a/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php b/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
index 1270afc7b7ae63155ecd20af0cfb139560cb09d1..8e3a4e0c6e2093af65d7c0db50d9f028892e4a19 100644
--- a/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/BrowseTreeView.php
@@ -94,7 +94,7 @@ class BrowseTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 	 * Do NOT htmlspecialchar the string from this function - has already been done.
 	 *
 	 * @param array $row The input row array (where the key "title" is used for the title)
-	 * @param integer $titleLen Title length (30)
+	 * @param int $titleLen Title length (30)
 	 * @return string The title.
 	 */
 	public function getTitleStr($row, $titleLen = 30) {
diff --git a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
index ff0b8bd899d3e2a2a27ba567be5715083f9773cd..d9398613deab1d2737dbabe023c871cc8ac94fdc 100644
--- a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
@@ -68,9 +68,9 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 	 * Generate the plus/minus icon for the browsable tree.
 	 *
 	 * @param \TYPO3\CMS\Core\Resource\Folder $folderObject Entry folder object
-	 * @param integer $subFolderCounter The current entry number
-	 * @param integer $totalSubFolders The total number of entries. If equal to $a, a "bottom" element is returned.
-	 * @param integer $nextCount The number of sub-elements to the current element.
+	 * @param int $subFolderCounter The current entry number
+	 * @param int $totalSubFolders The total number of entries. If equal to $a, a "bottom" element is returned.
+	 * @param int $nextCount The number of sub-elements to the current element.
 	 * @param bool $isExpanded The element was expanded to render subelements if this flag is set.
 	 * @return string Image tag with the plus/minus icon.
 	 * @internal
@@ -150,7 +150,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 	 *
 	 * @param string $title Title string
 	 * @param \TYPO3\CMS\Core\Resource\Folder	$folderObject the folder record
-	 * @param integer $bank Bank pointer (which mount point number)
+	 * @param int $bank Bank pointer (which mount point number)
 	 * @return string
 	 * @internal
 	 */
@@ -190,7 +190,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 	 * '_title' is used for setting an alternative title for folders.
 	 *
 	 * @param array $row The input row array (where the key "_title" is used for the title)
-	 * @param integer $titleLen Title length (30)
+	 * @param int $titleLen Title length (30)
 	 * @return string The title
 	 */
 	public function getTitleStr($row, $titleLen = 30) {
@@ -318,7 +318,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 	 * Fetches the data for the tree
 	 *
 	 * @param \TYPO3\CMS\Core\Resource\Folder $folderObject the folderobject
-	 * @param integer $depth Max depth (recursivity limit)
+	 * @param int $depth Max depth (recursivity limit)
 	 * @param string $type HTML-code prefix for recursive calls.
 	 * @return integer The count of items on the level
 	 * @see getBrowsableTree()
diff --git a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
index 80c12e816c5ed66f76d6ab1141eb9b9dc351c8d6..305597e0bf3101f4a59cb9dac730f7345b8b6d28 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
@@ -127,7 +127,7 @@ class PagePositionMap {
 	/**
 	 * Creates a "position tree" based on the page tree.
 	 *
-	 * @param integer $id Current page id
+	 * @param int $id Current page id
 	 * @param array $pageinfo Current page record.
 	 * @param string $perms_clause Page selection permission clause.
 	 * @param string $R_URI Current REQUEST_URI
@@ -243,7 +243,7 @@ class PagePositionMap {
 	 *
 	 * @param string $t_code Title string
 	 * @param array $dat Infomation array with record array inside.
-	 * @param integer $id The current id.
+	 * @param int $id The current id.
 	 * @return string The title string.
 	 */
 	public function boldTitle($t_code, $dat, $id) {
@@ -259,8 +259,8 @@ class PagePositionMap {
 	 * TSconfig mod.web_list.newPageWiz.overrideWithExtension may contain an extension which provides a module
 	 * to be used instead of the normal create new page wizard.
 	 *
-	 * @param integer $pid The pid.
-	 * @param integer $newPagePID New page id.
+	 * @param int $pid The pid.
+	 * @param int $newPagePID New page id.
 	 * @return string Onclick attribute content
 	 */
 	public function onClickEvent($pid, $newPagePID) {
@@ -299,7 +299,7 @@ class PagePositionMap {
 	 * Checks if the user has permission to created pages inside of the $pid page.
 	 * Uses caching so only one regular lookup is made - hence you can call the function multiple times without worrying about performance.
 	 *
-	 * @param integer $pid Page id for which to test.
+	 * @param int $pid Page id for which to test.
 	 * @return boolean
 	 */
 	public function checkNewPageInPid($pid) {
@@ -313,7 +313,7 @@ class PagePositionMap {
 	/**
 	 * Returns module configuration for a pid.
 	 *
-	 * @param integer $pid Page id for which to get the module configuration.
+	 * @param int $pid Page id for which to get the module configuration.
 	 * @return array The properties of teh module configuration for the page id.
 	 * @see onClickEvent()
 	 */
@@ -353,8 +353,8 @@ class PagePositionMap {
 	/**
 	 * Creates HTML for inserting/moving content elements.
 	 *
-	 * @param integer $pid page id onto which to insert content element.
-	 * @param integer $moveUid Move-uid (tt_content element uid?)
+	 * @param int $pid page id onto which to insert content element.
+	 * @param int $moveUid Move-uid (tt_content element uid?)
 	 * @param string $colPosList List of columns to show
 	 * @param bool $showHidden If not set, then hidden/starttime/endtime records are filtered out.
 	 * @param string $R_URI Request URI
@@ -386,7 +386,7 @@ class PagePositionMap {
 	 *
 	 * @param array $lines Array with arrays of lines for each column
 	 * @param array $colPosArray Column position array
-	 * @param integer $pid The id of the page
+	 * @param int $pid The id of the page
 	 * @return string HTML
 	 */
 	public function printRecordMap($lines, $colPosArray, $pid = 0) {
@@ -482,9 +482,9 @@ class PagePositionMap {
 	 * @param mixed $row Element row. If this is an array the link will cause an insert after this content element, otherwise
 	 * the link will insert at the first position in the column
 	 * @param string $vv Column position value.
-	 * @param integer $kk Column key.
-	 * @param integer $moveUid Move uid
-	 * @param integer $pid PID value.
+	 * @param int $kk Column key.
+	 * @param int $moveUid Move uid
+	 * @param int $pid PID value.
 	 * @return string
 	 */
 	public function insertPositionIcon($row, $vv, $kk, $moveUid, $pid) {
@@ -505,9 +505,9 @@ class PagePositionMap {
 	 * @param mixed $row The record. If this is not an array with the record data the insert will be for the first position
 	 * in the column
 	 * @param string $vv Column position value.
-	 * @param integer $moveUid Move uid
-	 * @param integer $pid PID value.
-	 * @param integer $sys_lang System language (not used currently)
+	 * @param int $moveUid Move uid
+	 * @param int $pid PID value.
+	 * @param int $sys_lang System language (not used currently)
 	 * @return string
 	 */
 	public function onClickInsertRecord($row, $vv, $moveUid, $pid, $sys_lang = 0) {
diff --git a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
index 00deb3766d93ded97203bdf035b3cbea21055f00..1d98acfd5b99655070e5f42064a28f61806d64f5 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
@@ -70,7 +70,7 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 	/**
 	 * Returns TRUE/FALSE if the next level for $id should be expanded - and all levels should, so we always return 1.
 	 *
-	 * @param integer $id ID (uid) to test for (see extending classes where this is checked against session data)
+	 * @param int $id ID (uid) to test for (see extending classes where this is checked against session data)
 	 * @return boolean
 	 */
 	public function expandNext($id) {
@@ -82,9 +82,9 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 	 * In this case, there is no plus-minus icon displayed.
 	 *
 	 * @param array $row Record for the entry
-	 * @param integer $a The current entry number
-	 * @param integer $c The total number of entries. If equal to $a, a 'bottom' element is returned.
-	 * @param integer $nextCount The number of sub-elements to the current element.
+	 * @param int $a The current entry number
+	 * @param int $c The total number of entries. If equal to $a, a 'bottom' element is returned.
+	 * @param int $nextCount The number of sub-elements to the current element.
 	 * @param bool $exp The element was expanded to render subelements if this flag is set.
 	 * @return string Image tag with the plus/minus icon.
 	 * @access private
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index ad2eaa8d8b8df65ec9c4290cdd45e878a187b3bc..cc95fa61cfad2a097e4bdd37bcb90fe1eaad8f06 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -73,7 +73,7 @@ class BackendUtility {
 	 * $table must be found in $GLOBALS['TCA']
 	 *
 	 * @param string $table Table name present in $GLOBALS['TCA']
-	 * @param integer $uid UID of record
+	 * @param int $uid UID of record
 	 * @param string $fields List of fields to select
 	 * @param string $where Additional WHERE clause, eg. " AND blablabla = 0
 	 * @param bool $useDeleteClause Use the deleteClause to check if a record is deleted (default TRUE)
@@ -97,7 +97,7 @@ class BackendUtility {
 	 * Like getRecord(), but overlays workspace version if any.
 	 *
 	 * @param string $table Table name present in $GLOBALS['TCA']
-	 * @param integer $uid UID of record
+	 * @param int $uid UID of record
 	 * @param string $fields List of fields to select
 	 * @param string $where Additional WHERE clause, eg. " AND blablabla = 0
 	 * @param bool $useDeleteClause Use the deleteClause to check if a record is deleted (default TRUE)
@@ -264,8 +264,8 @@ class BackendUtility {
 	 * Fetches the localization for a given record.
 	 *
 	 * @param string $table Table name present in $GLOBALS['TCA']
-	 * @param integer $uid The uid of the record
-	 * @param integer $language The uid of the language record in sys_language
+	 * @param int $uid The uid of the record
+	 * @param int $language The uid of the language record in sys_language
 	 * @param string $andWhereClause Optional additional WHERE clause (default: '')
 	 * @return mixed Multidimensional array with selected records; if none exist, FALSE is returned
 	 */
@@ -288,7 +288,7 @@ class BackendUtility {
 	 * By default deleted pages are filtered.
 	 * This RootLine will follow the tree all the way to the root. This is opposite to another kind of root line known from the frontend where the rootline stops when a root-template is found.
 	 *
-	 * @param integer $uid Page id for which to create the root line.
+	 * @param int $uid Page id for which to create the root line.
 	 * @param string $clause Clause can be used to select other criteria. It would typically be where-clauses that stops the process if we meet a page, the user has no reading access to.
 	 * @param bool $workspaceOL If TRUE, version overlay is applied. This must be requested specifically because it is usually only wanted when the rootline is used for visual output while for permission checking you want the raw thing!
 	 * @return array Root line array, all the way to the page tree root (or as far as $clause allows!)
@@ -344,7 +344,7 @@ class BackendUtility {
 	/**
 	 * Gets the cached page record for the rootline
 	 *
-	 * @param integer $uid Page id for which to create the root line.
+	 * @param int $uid Page id for which to create the root line.
 	 * @param string $clause Clause can be used to select other criteria. It would typically be where-clauses that stops the process if we meet a page, the user has no reading access to.
 	 * @param bool $workspaceOL If TRUE, version overlay is applied. This must be requested specifically because it is usually only wanted when the rootline is used for visual output while for permission checking you want the raw thing!
 	 * @return array Cached page record for the rootline
@@ -381,7 +381,7 @@ class BackendUtility {
 	/**
 	 * Opens the page tree to the specified page id
 	 *
-	 * @param integer $pid Page id.
+	 * @param int $pid Page id.
 	 * @param bool $clearExpansion If set, then other open branches are closed.
 	 * @return void
 	 */
@@ -417,10 +417,10 @@ class BackendUtility {
 	 * Each part of the path will be limited to $titleLimit characters
 	 * Deleted pages are filtered out.
 	 *
-	 * @param integer $uid Page uid for which to create record path
+	 * @param int $uid Page uid for which to create record path
 	 * @param string $clause Clause is additional where clauses, eg.
-	 * @param integer $titleLimit Title limit
-	 * @param integer $fullTitleLimit Title limit of Full title (typ. set to 1000 or so)
+	 * @param int $titleLimit Title limit
+	 * @param int $fullTitleLimit Title limit of Full title (typ. set to 1000 or so)
 	 * @return mixed Path of record (string) OR array with short/long title if $fullTitleLimit is set.
 	 */
 	static public function getRecordPath($uid, $clause, $titleLimit, $fullTitleLimit = 0) {
@@ -671,7 +671,7 @@ class BackendUtility {
 	 * If $id is zero a pseudo root-page with "_thePath" set is returned IF the current BE_USER is admin.
 	 * In any case ->isInWebMount must return TRUE for the user (regardless of $perms_clause)
 	 *
-	 * @param integer $id Page uid for which to check read-access
+	 * @param int $id Page uid for which to check read-access
 	 * @param string $perms_clause This is typically a value generated with $GLOBALS['BE_USER']->getPagePermsClause(1);
 	 * @return array Returns page record if OK, otherwise FALSE.
 	 */
@@ -878,7 +878,7 @@ class BackendUtility {
 	 * @param string $table The table name
 	 * @param string $fieldName Optional fieldname passed to hook object
 	 * @param bool $WSOL Boolean; If set, workspace overlay is applied to records. This is correct behaviour for all presentation and export, but NOT if you want a TRUE reflection of how things are in the live workspace.
-	 * @param integer $newRecordPidValue SPECIAL CASES: Use this, if the DataStructure may come from a parent record and the INPUT row doesn't have a uid yet (hence, the pid cannot be looked up). Then it is necessary to supply a PID value to search recursively in for the DS (used from TCEmain)
+	 * @param int $newRecordPidValue SPECIAL CASES: Use this, if the DataStructure may come from a parent record and the INPUT row doesn't have a uid yet (hence, the pid cannot be looked up). Then it is necessary to supply a PID value to search recursively in for the DS (used from TCEmain)
 	 * @return mixed If array, the data structure was found and returned as an array. Otherwise (string) it is an error message.
 	 * @see \TYPO3\CMS\Backend\Form\FormEngine::getSingleField_typeFlex()
 	 */
@@ -1114,7 +1114,7 @@ class BackendUtility {
 	 * IDENTICAL to the function by same name found in \TYPO3\CMS\Frontend\Page\PageRepository
 	 *
 	 * @param string $hash The hash-string which was used to store the data value
-	 * @param integer $expTime Variable is not used in the function
+	 * @param int $expTime Variable is not used in the function
 	 * @return mixed The "data" from the cache
 	 */
 	static public function getHash($hash, $expTime = 0) {
@@ -1368,7 +1368,7 @@ class BackendUtility {
 	/**
 	 * Returns the difference in days between input $tstamp and $EXEC_TIME
 	 *
-	 * @param integer $tstamp Time stamp, seconds
+	 * @param int $tstamp Time stamp, seconds
 	 * @return integer
 	 */
 	static public function daysUntil($tstamp) {
@@ -1379,7 +1379,7 @@ class BackendUtility {
 	/**
 	 * Returns $tstamp formatted as "ddmmyy" (According to $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'])
 	 *
-	 * @param integer $tstamp Time stamp, seconds
+	 * @param int $tstamp Time stamp, seconds
 	 * @return string Formatted time
 	 */
 	static public function date($tstamp) {
@@ -1389,7 +1389,7 @@ class BackendUtility {
 	/**
 	 * Returns $tstamp formatted as "ddmmyy hhmm" (According to $GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] AND $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'])
 	 *
-	 * @param integer $value Time stamp, seconds
+	 * @param int $value Time stamp, seconds
 	 * @return string Formatted time
 	 */
 	static public function datetime($value) {
@@ -1400,7 +1400,7 @@ class BackendUtility {
 	 * Returns $value (in seconds) formatted as hh:mm:ss
 	 * For instance $value = 3600 + 60*2 + 3 should return "01:02:03"
 	 *
-	 * @param integer $value Time stamp, seconds
+	 * @param int $value Time stamp, seconds
 	 * @param bool $withSeconds Output hh:mm:ss. If FALSE: hh:mm
 	 * @return string Formatted time
 	 */
@@ -1418,7 +1418,7 @@ class BackendUtility {
 	/**
 	 * Returns the "age" in minutes / hours / days / years of the number of $seconds inputted.
 	 *
-	 * @param integer $seconds Seconds could be the difference of a certain timestamp and time()
+	 * @param int $seconds Seconds could be the difference of a certain timestamp and time()
 	 * @param string $labels Labels should be something like ' min| hrs| days| yrs| min| hour| day| year'. This value is typically delivered by this function call: $GLOBALS["LANG"]->sL("LLL:EXT:lang/locallang_core.xlf:labels.minutesHoursDaysYears")
 	 * @return string Formatted time
 	 */
@@ -1446,8 +1446,8 @@ class BackendUtility {
 	 * Returns a formatted timestamp if $tstamp is set.
 	 * The date/datetime will be followed by the age in parenthesis.
 	 *
-	 * @param integer $tstamp Time stamp, seconds
-	 * @param integer $prefix 1/-1 depending on polarity of age.
+	 * @param int $tstamp Time stamp, seconds
+	 * @param int $prefix 1/-1 depending on polarity of age.
 	 * @param string $date $date=="date" will yield "dd:mm:yy" formatting, otherwise "dd:mm:yy hh:mm
 	 * @return string
 	 */
@@ -1518,7 +1518,7 @@ class BackendUtility {
 	 * @param string $uploaddir Optional: $uploaddir is the directory relative to PATH_site where the image files from the $field value is found (Is by default set to the entry in $GLOBALS['TCA'] for that field! so you don't have to!)
 	 * @param bool $abs If set, uploaddir is NOT prepended with "../
 	 * @param string $tparams Optional: $tparams is additional attributes for the image tags
-	 * @param integer $size Optional: $size is [w]x[h] of the thumbnail. 56 is default.
+	 * @param int $size Optional: $size is [w]x[h] of the thumbnail. 56 is default.
 	 * @param bool $linkInfoPopup Whether to wrap with a link opening the info popup
 	 * @return string Thumbnail image tag.
 	 */
@@ -1628,7 +1628,7 @@ class BackendUtility {
 	 * @param string $thumbScript Must point to "thumbs.php" relative to the script position
 	 * @param string $theFile Must be the proper reference to the file that thumbs.php should show
 	 * @param string $tparams The additional attributes for the image tag
-	 * @param integer $size The size of the thumbnail send along to "thumbs.php
+	 * @param int $size The size of the thumbnail send along to "thumbs.php
 	 * @return string Image tag
 	 */
 	static public function getThumbNail($thumbScript, $theFile, $tparams = '', $size = '') {
@@ -1811,7 +1811,7 @@ class BackendUtility {
 	/**
 	 * Return the label of a field by additionally checking TsConfig values
 	 *
-	 * @param integer $pageId Page id
+	 * @param int $pageId Page id
 	 * @param string $table Table name
 	 * @param string $column Field Name
 	 * @param string $key item value
@@ -1988,7 +1988,7 @@ class BackendUtility {
 	 * which offers a tooltip with the original title when moving mouse over it.
 	 *
 	 * @param string $title The title string to be cropped
-	 * @param integer $titleLength Crop title after this length - if not set, BE_USER->uc['titleLen'] is used
+	 * @param int $titleLength Crop title after this length - if not set, BE_USER->uc['titleLen'] is used
 	 * @return string The processed title string, wrapped in <span title="...">|</span> if cropped
 	 */
 	static public function getRecordTitlePrep($title, $titleLength = 0) {
@@ -2028,10 +2028,10 @@ class BackendUtility {
 	 * @param string $table Table name, present in TCA
 	 * @param string $col Field name, present in TCA
 	 * @param string $value The value of that field from a selected record
-	 * @param integer $fixed_lgd_chars The max amount of characters the value may occupy
+	 * @param int $fixed_lgd_chars The max amount of characters the value may occupy
 	 * @param bool $defaultPassthrough Flag means that values for columns that has no conversion will just be pass through directly (otherwise cropped to 200 chars or returned as "N/A")
 	 * @param bool $noRecordLookup If set, no records will be looked up, UIDs are just shown.
-	 * @param integer $uid Uid of the current record
+	 * @param int $uid Uid of the current record
 	 * @param bool $forceResult If BackendUtility::getRecordTitle is used to process the value, this parameter is forwarded.
 	 * @return string
 	 */
@@ -2262,8 +2262,8 @@ class BackendUtility {
 	 * @param string $table Table name, present in TCA
 	 * @param string $fN Field name
 	 * @param string $fV Field value
-	 * @param integer $fixed_lgd_chars The max amount of characters the value may occupy
-	 * @param integer $uid Uid of the current record
+	 * @param int $fixed_lgd_chars The max amount of characters the value may occupy
+	 * @param int $uid Uid of the current record
 	 * @param bool $forceResult If BackendUtility::getRecordTitle is used to process the value, this parameter is forwarded.
 	 * @return string
 	 * @see getProcessedValue()
@@ -2589,7 +2589,7 @@ class BackendUtility {
 	 * It will detect the correct domain name if needed and provide the link with the right back path.
 	 * Also it will re-use any window already open.
 	 *
-	 * @param integer $pageUid Page UID
+	 * @param int $pageUid Page UID
 	 * @param string $backPath Must point back to TYPO3_mainDir (where the site is assumed to be one level above)
 	 * @param array $rootLine If root line is supplied the function will look for the first found domain record and use that URL instead (if found)
 	 * @param string $anchorSection Optional anchor to the URL
@@ -2629,7 +2629,7 @@ class BackendUtility {
 	/**
 	 * Creates the view-on-click preview URL without any alternative URL.
 	 *
-	 * @param integer $pageUid Page UID
+	 * @param int $pageUid Page UID
 	 * @param array $rootLine If rootline is supplied, the function will look for the first found domain record and use that URL instead
 	 * @param string $anchorSection Optional anchor to the URL
 	 * @param string $additionalGetVars Additional GET variables.
@@ -2684,7 +2684,7 @@ class BackendUtility {
 	 * Builds the frontend view domain for a given page ID with a given root
 	 * line.
 	 *
-	 * @param integer $pageId The page ID to use, must be > 0
+	 * @param int $pageId The page ID to use, must be > 0
 	 * @param array $rootLine The root line structure to use
 	 * @return string The full domain including the protocol http:// or https://, but without the trailing '/'
 	 * @author Michael Klapper <michael.klapper@aoemedia.de>
@@ -2734,7 +2734,7 @@ class BackendUtility {
 	 * Returns the merged User/Page TSconfig for page id, $id.
 	 * Please read details about module programming elsewhere!
 	 *
-	 * @param integer $id Page uid
+	 * @param int $id Page uid
 	 * @param string $TSref An object string which determines the path of the TSconfig to return.
 	 * @return array
 	 */
@@ -2835,7 +2835,7 @@ class BackendUtility {
 	 * @param mixed $mainParams $id is the "&id=" parameter value to be sent to the module, but it can be also a parameter array which will be passed instead of the &id=...
 	 * @param string $elementName The form elements name, probably something like "SET[...]
 	 * @param string $currentValue The value to be selected currently.
-	 * @param integer $size Relative size of input field, max is 48
+	 * @param int $size Relative size of input field, max is 48
 	 * @param string $script The script to send the &id to, if empty it's automatically found
 	 * @param string $addParams Additional parameters to pass to the script.
 	 * @return string HTML code for input text field.
@@ -3123,8 +3123,8 @@ class BackendUtility {
 	 * If $table and $uid is not set, then all locking for the current BE_USER is removed!
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
-	 * @param integer $pid Record pid
+	 * @param int $uid Record uid
+	 * @param int $pid Record pid
 	 * @return void
 	 * @internal
 	 */
@@ -3153,7 +3153,7 @@ class BackendUtility {
 	 * Notice: Locking is not strictly carried out since locking is abandoned when other backend scripts are activated - which means that a user CAN have a record "open" without having it locked. So this just serves as a warning that counts well in 90% of the cases, which should be sufficient.
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
+	 * @param int $uid Record uid
 	 * @return array
 	 * @internal
 	 * @see class.db_layout.inc, alt_db_navframe.php, alt_doc.php, db_layout.php
@@ -3358,8 +3358,8 @@ class BackendUtility {
 	 * Therefore, you should always use BackendUtility::fixVersioningPid($table,$row); on the data you input before calling this function!
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
-	 * @param integer $pid Record pid, could be negative then pointing to a record from same table whose pid to find and return.
+	 * @param int $uid Record uid
+	 * @param int $pid Record pid, could be negative then pointing to a record from same table whose pid to find and return.
 	 * @return integer
 	 * @internal
 	 * @see \TYPO3\CMS\Core\DataHandling\DataHandler::copyRecord(), getTSCpid()
@@ -3400,8 +3400,8 @@ class BackendUtility {
 	 * Return $uid if $table is pages and $uid is integer - otherwise the $pid
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
-	 * @param integer $pid Record pid
+	 * @param int $uid Record uid
+	 * @param int $pid Record pid
 	 * @return integer
 	 * @internal
 	 * @see \TYPO3\CMS\Backend\Form\FormEngine::getTSCpid()
@@ -3415,8 +3415,8 @@ class BackendUtility {
 	 * Returns the REAL pid of the record, if possible. If both $uid and $pid is strings, then pid=-1 is returned as an error indication.
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
-	 * @param integer $pid Record pid
+	 * @param int $uid Record uid
+	 * @param int $pid Record pid
 	 * @return array Array of two integers; first is the REAL PID of a record and if its a new record negative values are resolved to the true PID, second value is the PID value for TSconfig (uid if table is pages, otherwise the pid)
 	 * @internal
 	 * @see \TYPO3\CMS\Core\DataHandling\DataHandler::setHistory(), \TYPO3\CMS\Core\DataHandling\DataHandler::process_datamap()
@@ -3656,9 +3656,9 @@ class BackendUtility {
 	 * Select all versions of a record, ordered by version id (DESC)
 	 *
 	 * @param string $table Table name to select from
-	 * @param integer $uid Record uid for which to find versions.
+	 * @param int $uid Record uid for which to find versions.
 	 * @param string $fields Field list to select
-	 * @param integer $workspace Workspace ID, if zero all versions regardless of workspace is found.
+	 * @param int $workspace Workspace ID, if zero all versions regardless of workspace is found.
 	 * @param bool $includeDeletedRecords If set, deleted-flagged versions are included! (Only for clean-up script!)
 	 * @param array $row The current record
 	 * @return array Array of versions of table/uid
@@ -3758,7 +3758,7 @@ class BackendUtility {
 	 *
 	 * @param string $table Table name
 	 * @param array $row Record array passed by reference. As minimum, the "uid" and  "pid" fields must exist! Fake fields cannot exist since the fields in the array is used as field names in the SQL look up. It would be nice to have fields like "t3ver_state" and "t3ver_mode_id" as well to avoid a new lookup inside movePlhOL().
-	 * @param integer $wsid Workspace ID, if not specified will use $GLOBALS['BE_USER']->workspace
+	 * @param int $wsid Workspace ID, if not specified will use $GLOBALS['BE_USER']->workspace
 	 * @param bool $unsetMovePointers If TRUE the function does not return a "pointer" row for moved records in a workspace
 	 * @return void (Passed by ref).
 	 * @see fixVersioningPid()
@@ -3861,9 +3861,9 @@ class BackendUtility {
 	/**
 	 * Select the workspace version of a record, if exists
 	 *
-	 * @param integer $workspace Workspace ID
+	 * @param int $workspace Workspace ID
 	 * @param string $table Table name to select from
-	 * @param integer $uid Record uid for which to find workspace version.
+	 * @param int $uid Record uid for which to find workspace version.
 	 * @param string $fields Field list to select
 	 * @return array If found, return record, otherwise FALSE
 	 */
@@ -3884,7 +3884,7 @@ class BackendUtility {
 	 * Returns live version of record
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record UID of draft, offline version
+	 * @param int $uid Record UID of draft, offline version
 	 * @param string $fields Field list, default is *
 	 * @return array If found, the record, otherwise nothing.
 	 */
@@ -3899,7 +3899,7 @@ class BackendUtility {
 	 * Gets the id of the live version of a record.
 	 *
 	 * @param string $table Name of the table
-	 * @param integer $uid Uid of the offline/draft record
+	 * @param int $uid Uid of the offline/draft record
 	 * @return integer The id of the live version of the record (or NULL if nothing was found)
 	 */
 	static public function getLiveVersionIdOfRecord($table, $uid) {
@@ -3931,7 +3931,7 @@ class BackendUtility {
 	 * Get additional where clause to select records of a specific workspace (includes live as well).
 	 *
 	 * @param string $table Table name
-	 * @param integer $workspaceId Workspace ID
+	 * @param int $workspaceId Workspace ID
 	 * @return string Workspace where clause
 	 */
 	static public function getWorkspaceWhereClause($table, $workspaceId = NULL) {
@@ -3950,8 +3950,8 @@ class BackendUtility {
 	/**
 	 * Count number of versions on a page
 	 *
-	 * @param integer $workspace Workspace ID
-	 * @param integer $pageId Page ID
+	 * @param int $workspace Workspace ID
+	 * @param int $pageId Page ID
 	 * @return array Overview of records
 	 */
 	static public function countVersionsOfRecordsOnPage($workspace, $pageId) {
@@ -3988,7 +3988,7 @@ class BackendUtility {
 	 * Performs mapping of new uids to new versions UID in case of import inside a workspace.
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid (of live record placeholder)
+	 * @param int $uid Record uid (of live record placeholder)
 	 * @return integer Uid of offline version if any, otherwise live uid.
 	 */
 	static public function wsMapId($table, $uid) {
@@ -4003,7 +4003,7 @@ class BackendUtility {
 	 * Returns move placeholder of online (live) version
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record UID of online version
+	 * @param int $uid Record UID of online version
 	 * @param string $fields Field list, default is *
 	 * @return array If found, the record, otherwise nothing.
 	 */
diff --git a/typo3/sysext/backend/Classes/Utility/IconUtility.php b/typo3/sysext/backend/Classes/Utility/IconUtility.php
index 6e632fbfa0ab258efde4397580f84907eefa395b..0eeb57420c06b5742bb54740113736e42734ff40 100644
--- a/typo3/sysext/backend/Classes/Utility/IconUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/IconUtility.php
@@ -293,7 +293,7 @@ class IconUtility {
 	 * @param string $backPath Current backpath to PATH_typo3 folder
 	 * @param string $src Icon file name relative to PATH_typo3 folder
 	 * @param string $wHattribs Default width/height, defined like 'width="12" height="14"'
-	 * @param integer $outputMode Mode: 0 (zero) is default and returns src/width/height. 1 returns value of src+backpath, 2 returns value of w/h.
+	 * @param int $outputMode Mode: 0 (zero) is default and returns src/width/height. 1 returns value of src+backpath, 2 returns value of w/h.
 	 * @return string Returns ' src="[backPath][src]" [wHattribs]'
 	 * @see skinImgFile()
 	 */
@@ -371,7 +371,7 @@ class IconUtility {
 	 *
 	 * @param string $iconfile Original unprocessed Icon file, relative path to PATH_typo3
 	 * @param string $mode Mode string, eg. "deleted" or "futuretiming" determining how the icon will look
-	 * @param integer $user The number of the fe_group record uid if applicable
+	 * @param int $user The number of the fe_group record uid if applicable
 	 * @param bool $protectSection Flag determines if the protected-section icon should be applied.
 	 * @param string $absFile Absolute path to file from which to create the icon.
 	 * @param string $iconFileName_stateTagged The filename that this icon should have had, basically [icon base name]_[flags].[extension] - used for part of temporary filename
@@ -493,14 +493,14 @@ class IconUtility {
 	 *
 	 * @param resource $destinationImage Destination image
 	 * @param resource $sourceImage Source image
-	 * @param integer $destinationX Destination x-coordinate
-	 * @param integer $destinationY Destination y-coordinate
-	 * @param integer $sourceX Source x-coordinate
-	 * @param integer $sourceY Source y-coordinate
-	 * @param integer $destinationWidth Destination width
-	 * @param integer $destinationHeight Destination height
-	 * @param integer $sourceWidth Source width
-	 * @param integer $sourceHeight Source height
+	 * @param int $destinationX Destination x-coordinate
+	 * @param int $destinationY Destination y-coordinate
+	 * @param int $sourceX Source x-coordinate
+	 * @param int $sourceY Source y-coordinate
+	 * @param int $destinationWidth Destination width
+	 * @param int $destinationHeight Destination height
+	 * @param int $sourceWidth Source width
+	 * @param int $sourceHeight Source height
 	 * @return void
 	 * @access private
 	 * @see \TYPO3\CMS\Core\Imaging\GraphicalFunctions::imagecopyresized()
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderCollection.php b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderCollection.php
index 2913fe28bad289c0b2c96d480afe8f150664fb6a..f4ee209fd6c9937a0c800b110738843603b494d5 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderCollection.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderCollection.php
@@ -92,7 +92,7 @@ class DataProviderCollection implements \TYPO3\CMS\Core\SingletonInterface {
 	 * the accordant backend layout.
 	 *
 	 * @param string $combinedIdentifier
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return NULL|BackendLayout
 	 */
 	public function getBackendLayout($combinedIdentifier, $pageId) {
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php
index 59c6c2624c031d5bc4b9188400102f0383f80114..8fbe30bc7536996e81f9cea06f9d697c715cc9c5 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php
@@ -54,7 +54,7 @@ class DataProviderContext implements \TYPO3\CMS\Core\SingletonInterface {
 	}
 
 	/**
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return DataProviderContext
 	 */
 	public function setPageId($pageId) {
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderInterface.php b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderInterface.php
index f087db52e149a8132d3e908a78e93e061e1fceef..05015e27ce965ecaaba5afecd43aab43e7d9188f 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderInterface.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderInterface.php
@@ -35,7 +35,7 @@ interface DataProviderInterface {
 	 * Gets a backend layout by (regular) identifier.
 	 *
 	 * @param string $identifier
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return NULL|BackendLayout
 	 */
 	public function getBackendLayout($identifier, $pageId);
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php b/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
index f51207bae6349f14de9d15adf6f3a6ff739ca9f4..431f47fce4267fddd67e304be054f81425034790 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
@@ -50,7 +50,7 @@ class DefaultDataProvider implements DataProviderInterface {
 	 * Gets a backend layout by (regular) identifier.
 	 *
 	 * @param string $identifier
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return NULL|BackendLayout
 	 */
 	public function getBackendLayout($identifier, $pageId) {
@@ -120,7 +120,7 @@ class DefaultDataProvider implements DataProviderInterface {
 	 *
 	 * @param string $fieldName the name of the field the layouts are provided for (either backend_layout or backend_layout_next_level)
 	 * @param array $pageTsConfig PageTSconfig of the given page
-	 * @param integer $pageUid the ID of the page wea re getting the layouts for
+	 * @param int $pageUid the ID of the page wea re getting the layouts for
 	 * @return array $layouts A collection of layout data of the registered provider
 	 */
 	protected function getLayoutData($fieldName, array $pageTsConfig, $pageUid) {
diff --git a/typo3/sysext/backend/Classes/View/BackendLayoutView.php b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
index 5587ebe2e0e03f24fa9d434275ea49b2e60ab24d..70c62ae348c57ea3ae79a62b380045ea24851fcc 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
@@ -164,7 +164,7 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Returns the backend layout which should be used for this page.
 	 *
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return boolean|string Identifier of the backend layout to be used, or FALSE if none
 	 */
 	public function getSelectedCombinedIdentifier($pageId) {
@@ -238,7 +238,7 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Adds items to a colpos list
 	 *
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @param array $items
 	 * @return array
 	 */
@@ -253,7 +253,7 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Gets the list of available columns for a given page id
 	 *
-	 * @param integer $id
+	 * @param int $id
 	 * @return array $tcaItems
 	 */
 	public function getColPosListItemsParsed($id) {
@@ -279,7 +279,7 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Gets the selected backend layout
 	 *
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return array|NULL $backendLayout
 	 */
 	public function getSelectedBackendLayout($pageId) {
@@ -376,7 +376,7 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Gets a page record.
 	 *
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return NULL|array
 	 */
 	protected function getPage($pageId) {
@@ -392,7 +392,7 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Gets the page root-line.
 	 *
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return array
 	 */
 	protected function getRootLine($pageId) {
diff --git a/typo3/sysext/backend/Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php b/typo3/sysext/backend/Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php
index 742d7e799b541165a9b57ae9df559b0e724df4be..93c49c7f3c18017fa5f8bde135cc19d62287bc06 100644
--- a/typo3/sysext/backend/Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php
+++ b/typo3/sysext/backend/Classes/View/PageLayout/Extdirect/ExtdirectPageCommands.php
@@ -29,9 +29,9 @@ class ExtdirectPageCommands {
 	 *
 	 * Function is called from the Page module javascript.
 	 *
-	 * @param integer $sourceElement  Id attribute of content element which must be moved
+	 * @param int $sourceElement  Id attribute of content element which must be moved
 	 * @param string $destinationColumn Column to move the content element to
-	 * @param integer $destinationElement Id attribute of the element it was dropped on
+	 * @param int $destinationElement Id attribute of the element it was dropped on
 	 * @return array
 	 */
 	public function moveContentElement($sourceElement, $destinationColumn, $destinationElement) {
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index 416c0c4b7e4464af71af63cff2edafcd8d885b81..1c583443608724fe260e63ea745c6aa67ce1540c 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -187,7 +187,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * Adds the code of a single table
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Current page id
+	 * @param int $id Current page id
 	 * @return string HTML for listing.
 	 */
 	public function getTable($table, $id) {
@@ -211,7 +211,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	/**
 	 * Renders an external table from page id
 	 *
-	 * @param integer $id Page id
+	 * @param int $id Page id
 	 * @param string $table Name of the table
 	 * @return string HTML for the listing
 	 */
@@ -235,7 +235,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * Renders records from the pages table from page id
 	 * (Used to get information about the page tree content by "Web>Info"!)
 	 *
-	 * @param integer $id Page id
+	 * @param int $id Page id
 	 * @return string HTML for the listing
 	 */
 	public function getTable_pages($id) {
@@ -381,7 +381,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	/**
 	 * Returns the backend layout which should be used for this page.
 	 *
-	 * @param integer $id Uid of the current page
+	 * @param int $id Uid of the current page
 	 * @return boolean|string Identifier of the backend layout to be used, or FALSE if none
 	 * @deprecated since TYPO3 CMS 6.2, will be removed two versions later
 	 */
@@ -393,7 +393,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	/**
 	 * Renders Content Elements from the tt_content table from page id
 	 *
-	 * @param integer $id Page id
+	 * @param int $id Page id
 	 * @return string HTML for the listing
 	 */
 	public function getTable_tt_content($id) {
@@ -930,7 +930,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * Creates a standard list of elements from a table.
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Page id.
+	 * @param int $id Page id.
 	 * @param string $fList Comma list of fields to display
 	 * @param bool $icon If TRUE, icon is shown
 	 * @param string $addWhere Additional WHERE-clauses.
@@ -1099,7 +1099,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * This is required for correct workspace overlays.
 	 *
 	 * @param string $table UNUSED (will always be queried from tt_content)
-	 * @param integer $id Page Id to be used (not used at all, but part of the API, see $this->pidSelect)
+	 * @param int $id Page Id to be used (not used at all, but part of the API, see $this->pidSelect)
 	 * @param array $columns colPos values to be considered to be shown
 	 * @param string $additionalWhereClause Additional where clause for database select
 	 * @return array Associative array for each column (colPos)
@@ -1130,10 +1130,10 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * Adds pages-rows to an array, selecting recursively in the page tree.
 	 *
 	 * @param array $theRows Array which will accumulate page rows
-	 * @param integer $pid Pid to select from
+	 * @param int $pid Pid to select from
 	 * @param string $qWhere Query-where clause
 	 * @param string $treeIcons Prefixed icon code.
-	 * @param integer $depth Depth (decreasing)
+	 * @param int $depth Depth (decreasing)
 	 * @return array $theRows, but with added rows.
 	 */
 	public function pages_getTree($theRows, $pid, $qWhere, $treeIcons, $depth) {
@@ -1305,7 +1305,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * Draw the header for a single tt_content element
 	 *
 	 * @param array $row Record array
-	 * @param integer $space Amount of pixel space above the header. UNUSED
+	 * @param int $space Amount of pixel space above the header. UNUSED
 	 * @param bool $disableMoveAndNewButtons If set the buttons for creating new elements and moving up and down are not shown.
 	 * @param bool $langMode If set, we are in language mode and flags will be shown for languages
 	 * @param bool $dragDropEnabled If set the move button must be hidden
@@ -1625,8 +1625,8 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * for translations and original but this may be a conceptual error (?)
 	 *
 	 * @param array $defLanguageCount Numeric array with uids of tt_content elements in the default language
-	 * @param integer $id Page pid
-	 * @param integer $lP Sys language UID
+	 * @param int $id Page pid
+	 * @param int $lP Sys language UID
 	 * @return array Modified $defLanguageCount
 	 */
 	public function getNonTranslatedTTcontentUids($defLanguageCount, $id, $lP) {
@@ -1652,7 +1652,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * Creates button which is used to create copies of records..
 	 *
 	 * @param array $defLanguageCount Numeric array with uids of tt_content elements in the default language
-	 * @param integer $lP Sys language UID
+	 * @param int $lP Sys language UID
 	 * @return string "Copy languages" button, if available.
 	 */
 	public function newLanguageButton($defLanguageCount, $lP) {
@@ -1676,9 +1676,9 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	/**
 	 * Creates onclick-attribute content for a new content element
 	 *
-	 * @param integer $id Page id where to create the element.
-	 * @param integer $colPos Preset: Column position value
-	 * @param integer $sys_language Preset: Sys langauge value
+	 * @param int $id Page id where to create the element.
+	 * @param int $colPos Preset: Column position value
+	 * @param int $sys_language Preset: Sys langauge value
 	 * @return string String for onclick attribute.
 	 * @see getTable_tt_content()
 	 */
@@ -1740,7 +1740,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * Displays only languages which are not yet present for the current page and
 	 * that are not disabled with page TS.
 	 *
-	 * @param integer $id Page id for which to create a new language (pages_language_overlay record)
+	 * @param int $id Page id for which to create a new language (pages_language_overlay record)
 	 * @return string <select> HTML element (if there were items for the box anyways...)
 	 * @see getTable_tt_content()
 	 */
@@ -1897,7 +1897,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * Counts and returns the number of records on the page with $pid
 	 *
 	 * @param string $table Table name
-	 * @param integer $pid Page id
+	 * @param int $pid Page id
 	 * @return integer Number of records.
 	 */
 	public function numberOfRecords($table, $pid) {
@@ -1983,7 +1983,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * long strings that will be broken).
 	 *
 	 * @param string $content Content to word-wrap.
-	 * @param integer $max Max number of chars in a word before it will be wrapped.
+	 * @param int $max Max number of chars in a word before it will be wrapped.
 	 * @param string $char Character to insert when wrapping.
 	 * @return string Processed output.
 	 * @deprecated since 6.2 - will be removed two versions later; use CSS instead (word-break: break-all;)
@@ -2113,7 +2113,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	 * Only tables which has records on the page will be included.
 	 * Notice: The function also fills in the internal variable $this->activeTables with icon/titles.
 	 *
-	 * @param integer $id Page id from which we are listing records (the function will look up if there are records on the page)
+	 * @param int $id Page id from which we are listing records (the function will look up if there are records on the page)
 	 * @return string HTML output.
 	 */
 	public function getTableMenu($id) {
diff --git a/typo3/sysext/backend/Classes/View/PageTreeView.php b/typo3/sysext/backend/Classes/View/PageTreeView.php
index 61fc1d78c83e38907cc63350786633b4c9b8d621..0e744fb5cab8281bca3061b6f9f629d516efc641 100644
--- a/typo3/sysext/backend/Classes/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/View/PageTreeView.php
@@ -118,7 +118,7 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
 	 *
 	 * @param string $title Title string
 	 * @param string $row Item record
-	 * @param integer $bank Bank pointer (which mount point number)
+	 * @param int $bank Bank pointer (which mount point number)
 	 * @return string
 	 * @access private
 	 */
@@ -243,9 +243,9 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
 	 * Generate the plus/minus icon for the browsable tree.
 	 *
 	 * @param array $row Record for the entry
-	 * @param integer $a The current entry number
-	 * @param integer $c The total number of entries. If equal to $a, a "bottom" element is returned.
-	 * @param integer $nextCount The number of sub-elements to the current element.
+	 * @param int $a The current entry number
+	 * @param int $c The total number of entries. If equal to $a, a "bottom" element is returned.
+	 * @param int $nextCount The number of sub-elements to the current element.
 	 * @param bool $exp The element was expanded to render subelements if this flag is set.
 	 * @return string Image tag with the plus/minus icon.
 	 * @access private
@@ -340,8 +340,8 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
 	/**
 	 * Fetches the data for the tree
 	 *
-	 * @param integer $uid Item id for which to select subitems (parent id)
-	 * @param integer $depth Max depth (recursivity limit)
+	 * @param int $uid Item id for which to select subitems (parent id)
+	 * @param int $depth Max depth (recursivity limit)
 	 * @param string $blankLineCode ? (internal)
 	 * @param string $subCSSclass
 	 * @return integer The count of items on the level
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
index 2f5f993b727717d374dd3ca3fc2795c5630e4d7e..ecef4c70cbd4ca06d7eca4f860adfc408f86bcc9 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
@@ -141,7 +141,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set number of log rows to show
 	 *
-	 * @param integer $number
+	 * @param int $number
 	 * @return void
 	 */
 	public function setNumber($number) {
@@ -179,7 +179,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set time frame
 	 *
-	 * @param integer $timeFrame
+	 * @param int $timeFrame
 	 * @return void
 	 */
 	public function setTimeFrame($timeFrame) {
@@ -198,7 +198,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set action
 	 *
-	 * @param integer $action
+	 * @param int $action
 	 * @return void
 	 */
 	public function setAction($action) {
@@ -274,7 +274,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set calculated start timestamp from query constraints
 	 *
-	 * @param integer $timestamp
+	 * @param int $timestamp
 	 * @return void
 	 */
 	public function setStartTimestamp($timestamp) {
@@ -293,7 +293,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set calculated end timestamp from query constraints
 	 *
-	 * @param integer $timestamp
+	 * @param int $timestamp
 	 * @return void
 	 */
 	public function setEndTimestamp($timestamp) {
@@ -331,7 +331,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set page id
 	 *
-	 * @param integer $id
+	 * @param int $id
 	 * @return void
 	 */
 	public function setPageId($id) {
@@ -350,7 +350,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set page level depth
 	 *
-	 * @param integer $depth
+	 * @param int $depth
 	 * @return void
 	 */
 	public function setDepth($depth) {
diff --git a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
index 93ca17b68989c48bf0593a05860a484b9392f634..5ff7e9baba2a965d877f0736ec5b2d1aba98b2e5 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
@@ -142,7 +142,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set pid
 	 *
-	 * @param integer $pid
+	 * @param int $pid
 	 * @return void
 	 */
 	public function setPid($pid) {
@@ -161,7 +161,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set backend user uid
 	 *
-	 * @param integer $beUserUid
+	 * @param int $beUserUid
 	 * @return void
 	 */
 	public function setBackendUserUid($beUserUid) {
@@ -180,7 +180,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set action
 	 *
-	 * @param integer $action
+	 * @param int $action
 	 * @return void
 	 */
 	public function setAction($action) {
@@ -199,7 +199,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set record uid
 	 *
-	 * @param integer $recordUid
+	 * @param int $recordUid
 	 * @return void
 	 */
 	public function setRecordUid($recordUid) {
@@ -237,7 +237,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set record pid
 	 *
-	 * @param integer $recordPid
+	 * @param int $recordPid
 	 * @return void
 	 */
 	public function setRecordPid($recordPid) {
@@ -256,7 +256,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set error
 	 *
-	 * @param integer $error
+	 * @param int $error
 	 * @return void
 	 */
 	public function setError($error) {
@@ -294,7 +294,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set tstamp
 	 *
-	 * @param integer $tstamp
+	 * @param int $tstamp
 	 * @return void
 	 */
 	public function setTstamp($tstamp) {
@@ -313,7 +313,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set type
 	 *
-	 * @param integer $type
+	 * @param int $type
 	 * @return void
 	 */
 	public function setType($type) {
@@ -332,7 +332,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set details number
 	 *
-	 * @param integer $detailsNumber
+	 * @param int $detailsNumber
 	 * @return void
 	 */
 	public function setDetailsNumber($detailsNumber) {
@@ -396,7 +396,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set event pid
 	 *
-	 * @param integer $eventPid
+	 * @param int $eventPid
 	 * @return void
 	 */
 	public function setEventPid($eventPid) {
@@ -415,7 +415,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Set workspace uid
 	 *
-	 * @param integer $workspaceUid
+	 * @param int $workspaceUid
 	 * @return void
 	 */
 	public function setWorkspaceUid($workspaceUid) {
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php
index dba8a920344b16f1bfd999fe4a4b066bc210a8c2..cefe9cc44586548c855e48ad4382f49712bce8d8 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/Be/PagePathViewHelper.php
@@ -24,8 +24,8 @@ class PagePathViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackend
 	/**
 	 * Resolve page id to page path string (with automatic cropping to maximum given length).
 	 *
-	 * @param integer $pid Pid of the page
-	 * @param integer $titleLimit Limit of the page title
+	 * @param int $pid Pid of the page
+	 * @param int $titleLimit Limit of the page title
 	 * @return string Page path string
 	 */
 	public function render($pid, $titleLimit = 20) {
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
index 056cac7ff4f4aa971d7da7cc121c33be300297ab..e543f06b4bff9811319af886dd0ad78effd0be64 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/ErrorIconViewHelper.php
@@ -25,7 +25,7 @@ class ErrorIconViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBacken
 	 * Renders an error icon link as known from the TYPO3 backend.
 	 * Error codes 2 and three are mapped to "error" and 1 is mapped to "warning".
 	 *
-	 * @param integer $errorNumber The error number (0 ... 3)
+	 * @param int $errorNumber The error number (0 ... 3)
 	 * @return string the rendered error icon link
 	 */
 	public function render($errorNumber = 0) {
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php
index e0a8fe7663bfaf31113d4fe5aaa277e711c8247e..7a82c97353ce08510fec435393f765061f71260e 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/HistoryEntryViewHelper.php
@@ -31,7 +31,7 @@ class HistoryEntryViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractVi
 	/**
 	 * Get system history record
 	 *
-	 * @param integer $uid Uid of the log entry
+	 * @param int $uid Uid of the log entry
 	 * @return string Formatted history entry if one exists, else empty string
 	 */
 	public function render($uid) {
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php
index b60217d5e9ee71bcd5dcff11b0d8e1517b0da75d..8168819b3e27b6581f5d2c459218ba59a16b22ef 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/UsernameViewHelper.php
@@ -30,7 +30,7 @@ class UsernameViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHe
 	/**
 	 * Resolve user name from backend user id.
 	 *
-	 * @param integer $uid Uid of the user
+	 * @param int $uid Uid of the user
 	 * @return string Username or an empty string if there is no user with that UID
 	 */
 	public function render($uid) {
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php
index 98202e073249685c85de1e5149d8f0f0318306d8..e6e4aebe7d686bf2707b9d20f070282bf818b875 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/WorkspaceTitleViewHelper.php
@@ -30,7 +30,7 @@ class WorkspaceTitleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abstract
 	/**
 	 * Resolve workspace title from UID.
 	 *
-	 * @param integer $uid UID of the workspace
+	 * @param int $uid UID of the workspace
 	 * @return string username or UID
 	 */
 	public function render($uid) {
diff --git a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
index ebd702f37295707667e08d3cae36f73d41a25140..4f9a815ef18b78ec5c64f09702bb7d87435b4aa8 100644
--- a/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
+++ b/typo3/sysext/beuser/Classes/Controller/BackendUserController.php
@@ -153,7 +153,7 @@ class BackendUserController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionCont
 	/**
 	 * Attaches one backend user to the compare list
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return void
 	 */
 	public function addToCompareListAction($uid) {
@@ -165,7 +165,7 @@ class BackendUserController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionCont
 	/**
 	 * Removes given backend user to the compare list
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return void
 	 */
 	public function removeFromCompareListAction($uid) {
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
index 367973ba98cd76f01fa59701935215da5a50c1f1..43279b1de77268701c6b710be33a9c8dcdedd479 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
@@ -90,7 +90,7 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $userType
+	 * @param int $userType
 	 * @return void
 	 */
 	public function setUserType($userType) {
@@ -105,7 +105,7 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $status
+	 * @param int $status
 	 * @return void
 	 */
 	public function setStatus($status) {
@@ -120,7 +120,7 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $logins
+	 * @param int $logins
 	 * @return void
 	 */
 	public function setLogins($logins) {
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php b/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
index 643ab3e9cdcd3755d69ffd512b7be97970718f79..e6014c2a7f73665b26b1c2aa39a51c03c2f8dbab 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/ModuleData.php
@@ -61,7 +61,7 @@ class ModuleData {
 	 * Adds one backend user (by uid) to the compare user list
 	 * Cannot be ObjectStorage, must be array
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return void
 	 */
 	public function attachUidCompareUser($uid) {
@@ -71,7 +71,7 @@ class ModuleData {
 	/**
 	 * Strip one backend user from the compare user list
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return void
 	 */
 	public function detachUidCompareUser($uid) {
diff --git a/typo3/sysext/cms/layout/db_layout.php b/typo3/sysext/cms/layout/db_layout.php
index 25478a1077a516cce6d55c2c2ff2272c9a398ec1..079b7dea53637432051c6206b539497bf8d9a952 100644
--- a/typo3/sysext/cms/layout/db_layout.php
+++ b/typo3/sysext/cms/layout/db_layout.php
@@ -76,9 +76,9 @@ class ext_posMap extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 	 *
 	 * @param array $row The record.
 	 * @param string $vv Column position value.
-	 * @param integer $moveUid Move uid
-	 * @param integer $pid PID value.
-	 * @param integer $sys_lang System language
+	 * @param int $moveUid Move uid
+	 * @param int $pid PID value.
+	 * @param int $sys_lang System language
 	 * @return string
 	 */
 	public function onClickInsertRecord($row, $vv, $moveUid, $pid, $sys_lang = 0) {
diff --git a/typo3/sysext/cms/layout/db_new_content_el.php b/typo3/sysext/cms/layout/db_new_content_el.php
index fa83c95a72ad76e338918ce2fa451ae8bae6bb35..74c39eab6fdb2d2801a1988c4e7fd58fa8852a50 100644
--- a/typo3/sysext/cms/layout/db_new_content_el.php
+++ b/typo3/sysext/cms/layout/db_new_content_el.php
@@ -59,9 +59,9 @@ class ext_posMap extends \TYPO3\CMS\Backend\Tree\View\PagePositionMap {
 	 *
 	 * @param array $row The record.
 	 * @param string $vv Column position value.
-	 * @param integer $moveUid Move uid
-	 * @param integer $pid PID value.
-	 * @param integer $sys_lang System language
+	 * @param int $moveUid Move uid
+	 * @param int $pid PID value.
+	 * @param int $sys_lang System language
 	 * @return string
 	 */
 	public function onClickInsertRecord($row, $vv, $moveUid, $pid, $sys_lang = 0) {
diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
index aa51fcbea6b096fdc5bbd22a403bf1f71eb9df60..4b5673bf22a34270119ecbf9f199a3d2f00c7e56 100644
--- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
@@ -1002,7 +1002,7 @@ abstract class AbstractUserAuthentication {
 	 * Determine whether there's an according session record to a given session_id
 	 * in the database. Don't care if session record is still valid or not.
 	 *
-	 * @param integer $id Claimed Session ID
+	 * @param int $id Claimed Session ID
 	 * @return boolean Returns TRUE if a corresponding session was found in the database
 	 */
 	public function isExistingSessionRecord($id) {
@@ -1128,7 +1128,7 @@ abstract class AbstractUserAuthentication {
 	 * Returns the IP address to lock to.
 	 * The IP address may be partial based on $parts.
 	 *
-	 * @param integer $parts 1-4: Indicates how many parts of the IP address to return. 4 means all, 1 means only first number.
+	 * @param int $parts 1-4: Indicates how many parts of the IP address to return. 4 means all, 1 means only first number.
 	 * @return string (Partial) IP address for REMOTE_ADDR
 	 * @access private
 	 */
@@ -1445,15 +1445,15 @@ abstract class AbstractUserAuthentication {
 	/**
 	 * DUMMY: Writes to log database table (in some extension classes)
 	 *
-	 * @param integer $type denotes which module that has submitted the entry. This is the current list:  1=tce_db; 2=tce_file; 3=system (eg. sys_history save); 4=modules; 254=Personal settings changed; 255=login / out action: 1=login, 2=logout, 3=failed login (+ errorcode 3), 4=failure_warning_email sent
-	 * @param integer $action denotes which specific operation that wrote the entry (eg. 'delete', 'upload', 'update' and so on...). Specific for each $type. Also used to trigger update of the interface. (see the log-module for the meaning of each number !!)
-	 * @param integer $error flag. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
-	 * @param integer $details_nr The message number. Specific for each $type and $action. in the future this will make it possible to translate errormessages to other languages
+	 * @param int $type denotes which module that has submitted the entry. This is the current list:  1=tce_db; 2=tce_file; 3=system (eg. sys_history save); 4=modules; 254=Personal settings changed; 255=login / out action: 1=login, 2=logout, 3=failed login (+ errorcode 3), 4=failure_warning_email sent
+	 * @param int $action denotes which specific operation that wrote the entry (eg. 'delete', 'upload', 'update' and so on...). Specific for each $type. Also used to trigger update of the interface. (see the log-module for the meaning of each number !!)
+	 * @param int $error flag. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
+	 * @param int $details_nr The message number. Specific for each $type and $action. in the future this will make it possible to translate errormessages to other languages
 	 * @param string $details Default text that follows the message
 	 * @param array $data Data that follows the log. Might be used to carry special information. If an array the first 5 entries (0-4) will be sprintf'ed the details-text...
 	 * @param string $tablename Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
-	 * @param integer $recuid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
-	 * @param integer $recpid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
+	 * @param int $recuid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
+	 * @param int $recpid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
 	 * @return void
 	 */
 	public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename, $recuid, $recpid) {
@@ -1464,8 +1464,8 @@ abstract class AbstractUserAuthentication {
 	 * DUMMY: Check login failures (in some extension classes)
 	 *
 	 * @param string $email Email address
-	 * @param integer $secondsBack Number of sections back in time to check. This is a kind of limit for how many failures an hour for instance
-	 * @param integer $maxFailures Max allowed failures before a warning mail is sent
+	 * @param int $secondsBack Number of sections back in time to check. This is a kind of limit for how many failures an hour for instance
+	 * @param int $maxFailures Max allowed failures before a warning mail is sent
 	 * @return void
 	 * @ignore
 	 */
@@ -1481,7 +1481,7 @@ abstract class AbstractUserAuthentication {
 	 * a session id and the fields from the session table of course.
 	 * Will check the users for disabled, start/endtime, etc. ($this->user_where_clause())
 	 *
-	 * @param integer $uid The UID of the backend user to set in ->user
+	 * @param int $uid The UID of the backend user to set in ->user
 	 * @return void
 	 * @internal
 	 * @see SC_mod_tools_be_user_index::compareUsers(), SC_mod_user_setup_index::simulateUser(), freesite_admin::startCreate()
@@ -1505,7 +1505,7 @@ abstract class AbstractUserAuthentication {
 	/**
 	 * Fetching raw user record with uid=$uid
 	 *
-	 * @param integer $uid The UID of the backend user to set in ->user
+	 * @param int $uid The UID of the backend user to set in ->user
 	 * @return array user record or FALSE
 	 * @internal
 	 */
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index 8444d958a7e1f06e5122d9ce64ec80dc0c05fbcd..03df1a6abab99ecaa39ae1bb9f13048afde11a56 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -344,7 +344,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * $groupId must be set. $this->groupList must contain groups
 	 * Will return TRUE also if the user is a member of a group through subgroups.
 	 *
-	 * @param integer $groupId Group ID to look for in $this->groupList
+	 * @param int $groupId Group ID to look for in $this->groupList
 	 * @return boolean
 	 */
 	public function isMemberOfGroup($groupId) {
@@ -367,7 +367,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * 8- New pages: Create new pages under the page.
 	 *
 	 * @param array $row Is the pagerow for which the permissions is checked
-	 * @param integer $perms Is the binary representation of the permission we are going to check. Every bit in this number represents a permission that must be set. See function explanation.
+	 * @param int $perms Is the binary representation of the permission we are going to check. Every bit in this number represents a permission that must be set. See function explanation.
 	 * @return boolean
 	 */
 	public function doesUserHaveAccess($row, $perms) {
@@ -385,7 +385,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * (fx. by setting TYPO3_CONF_VARS['BE']['lockBeUserToDBmounts']=0) then it returns "1" right away
 	 * Otherwise the function will return the uid of the webmount which was first found in the rootline of the input page $id
 	 *
-	 * @param integer $id Page ID to check
+	 * @param int $id Page ID to check
 	 * @param string $readPerms Content of "->getPagePermsClause(1)" (read-permissions). If not set, they will be internally calculated (but if you have the correct value right away you can save that database lookup!)
 	 * @param bool|int $exitOnError If set, then the function will exit with an error message.
 	 * @throws \RuntimeException
@@ -475,7 +475,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * The 95% use of this function is "->getPagePermsClause(1)" which will
 	 * return WHERE clauses for *selecting* pages in backend listings - in other words this will check read permissions.
 	 *
-	 * @param integer $perms Permission mask to use, see function description
+	 * @param int $perms Permission mask to use, see function description
 	 * @return string Part of where clause. Prefix " AND " to this.
 	 */
 	public function getPagePermsClause($perms) {
@@ -671,7 +671,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	/**
 	 * Checking if a language value (-1, 0 and >0 for sys_language records) is allowed to be edited by the user.
 	 *
-	 * @param integer $langValue Language value to evaluate
+	 * @param int $langValue Language value to evaluate
 	 * @return boolean Returns TRUE if the language value is allowed, otherwise FALSE.
 	 */
 	public function checkLanguageAccess($langValue) {
@@ -833,7 +833,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * Checks a type of permission against the compiled permission integer,
 	 * $compiledPermissions, and in relation to table, $tableName
 	 *
-	 * @param integer $compiledPermissions Could typically be the "compiled permissions" integer returned by ->calcPerms
+	 * @param int $compiledPermissions Could typically be the "compiled permissions" integer returned by ->calcPerms
 	 * @param string $tableName Is the tablename to check: If "pages" table then edit,new,delete and editcontent permissions can be checked. Other tables will be checked for "editcontent" only (and $type will be ignored)
 	 * @param string $actionType For $tableName='pages' this can be 'edit' (2), 'new' (8 or 16), 'delete' (4), 'editcontent' (16). For all other tables this is ignored. (16 is used)
 	 * @return boolean
@@ -970,7 +970,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * of versioning because the element was within a versionized branch
 	 * but NOT ok in terms of the state the root point had!
 	 *
-	 * @param integer $pid PID value to check for. OBSOLETE!
+	 * @param int $pid PID value to check for. OBSOLETE!
 	 * @param string $table Table name
 	 * @return mixed Returns FALSE if a live record cannot be created and must be versionized in order to do so. 2 means a) Workspace is "Live" or workspace allows "live edit" of records from non-versionized tables (and the $table is not versionizable). 1 and -1 means the pid is inside a versionized branch where -1 means that the branch-point did NOT allow a new record according to its state.
 	 */
@@ -993,7 +993,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	/**
 	 * Evaluates if a record from $table can be created in $pid
 	 *
-	 * @param integer $pid Page id. This value must be the _ORIG_uid if available: So when you have pages versionized as "page" or "element" you must supply the id of the page version in the workspace!
+	 * @param int $pid Page id. This value must be the _ORIG_uid if available: So when you have pages versionized as "page" or "element" you must supply the id of the page version in the workspace!
 	 * @param string $table Table name
 	 * @return boolean TRUE if OK.
 	 */
@@ -1015,8 +1015,8 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * Evaluates if auto creation of a version of a record is allowed.
 	 *
 	 * @param string $table Table of the record
-	 * @param integer $id UID of record
-	 * @param integer $recpid PID of record
+	 * @param int $id UID of record
+	 * @param int $recpid PID of record
 	 * @return boolean TRUE if ok.
 	 */
 	public function workspaceAllowAutoCreation($table, $id, $recpid) {
@@ -1042,7 +1042,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * Admins are always allowed.
 	 * An option for custom workspaces allows members to also edit when the stage is "Review"
 	 *
-	 * @param integer $stage Stage id from an element: -1,0 = editing, 1 = reviewer, >1 = owner
+	 * @param int $stage Stage id from an element: -1,0 = editing, 1 = reviewer, >1 = owner
 	 * @return boolean TRUE if user is allowed access
 	 */
 	public function workspaceCheckStageForCurrent($stage) {
@@ -1106,7 +1106,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * For custom workspaces it depends on whether the user is owner OR like with
 	 * draft workspace if the user has access to Live workspace.
 	 *
-	 * @param integer $wsid Workspace UID; 0,1+
+	 * @param int $wsid Workspace UID; 0,1+
 	 * @return boolean Returns TRUE if the user has access to publish content from the workspace ID given.
 	 */
 	public function workspacePublishAccess($wsid) {
@@ -1223,7 +1223,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * 8 - frontend editing
 	 * 128 - other (not used yet)
 	 *
-	 * @param integer $bitmask Bitmask
+	 * @param int $bitmask Bitmask
 	 * @return boolean TRUE if the confirmation should be shown
 	 */
 	public function jsConfirmation($bitmask) {
@@ -2015,7 +2015,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	/**
 	 * Setting workspace ID
 	 *
-	 * @param integer $workspaceId ID of workspace to set for backend user. If not valid the default workspace for BE user is found and set.
+	 * @param int $workspaceId ID of workspace to set for backend user. If not valid the default workspace for BE user is found and set.
 	 * @return void
 	 */
 	public function setWorkspace($workspaceId) {
@@ -2036,7 +2036,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	/**
 	 * Sets a temporary workspace in the context of the current backend user.
 	 *
-	 * @param integer $workspaceId
+	 * @param int $workspaceId
 	 * @return boolean
 	 */
 	public function setTemporaryWorkspace($workspaceId) {
@@ -2105,18 +2105,18 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * Writes an entry in the logfile/table
 	 * Documentation in "TYPO3 Core API"
 	 *
-	 * @param integer $type Denotes which module that has submitted the entry. See "TYPO3 Core API". Use "4" for extensions.
-	 * @param integer $action Denotes which specific operation that wrote the entry. Use "0" when no sub-categorizing applies
-	 * @param integer $error Flag. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
-	 * @param integer $details_nr The message number. Specific for each $type and $action. This will make it possible to translate errormessages to other languages
+	 * @param int $type Denotes which module that has submitted the entry. See "TYPO3 Core API". Use "4" for extensions.
+	 * @param int $action Denotes which specific operation that wrote the entry. Use "0" when no sub-categorizing applies
+	 * @param int $error Flag. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
+	 * @param int $details_nr The message number. Specific for each $type and $action. This will make it possible to translate errormessages to other languages
 	 * @param string $details Default text that follows the message (in english!). Possibly translated by identification through type/action/details_nr
 	 * @param array $data Data that follows the log. Might be used to carry special information. If an array the first 5 entries (0-4) will be sprintf'ed with the details-text
 	 * @param string $tablename Table name. Special field used by tce_main.php.
 	 * @param int|string $recuid Record UID. Special field used by tce_main.php.
 	 * @param int|string $recpid Record PID. Special field used by tce_main.php. OBSOLETE
-	 * @param integer $event_pid The page_uid (pid) where the event occurred. Used to select log-content for specific pages.
+	 * @param int $event_pid The page_uid (pid) where the event occurred. Used to select log-content for specific pages.
 	 * @param string $NEWid Special field used by tce_main.php. NEWid string of newly created records.
-	 * @param integer $userId Alternative Backend User ID (used for logging login actions where this is not yet known).
+	 * @param int $userId Alternative Backend User ID (used for logging login actions where this is not yet known).
 	 * @return integer Log entry ID.
 	 */
 	public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename = '', $recuid = '', $recpid = '', $event_pid = -1, $NEWid = '', $userId = 0) {
@@ -2149,7 +2149,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 *
 	 * @param string $message Log message
 	 * @param string $extKey Option extension key / module name
-	 * @param integer $error Error level. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
+	 * @param int $error Error level. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
 	 * @return integer Log entry UID
 	 */
 	public function simplelog($message, $extKey = '', $error = 0) {
@@ -2163,8 +2163,8 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
 	 * If so, an email with a warning is sent to $email.
 	 *
 	 * @param string $email Email address
-	 * @param integer $secondsBack Number of sections back in time to check. This is a kind of limit for how many failures an hour for instance.
-	 * @param integer $max Max allowed failures before a warning mail is sent
+	 * @param int $secondsBack Number of sections back in time to check. This is a kind of limit for how many failures an hour for instance.
+	 * @param int $max Max allowed failures before a warning mail is sent
 	 * @return void
 	 * @access private
 	 */
diff --git a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
index b647ff4d6a6d6df63f87aaaf8a66ef95c649eaba..00277d5ae881a855b196579527dbcf2e5ec6cc01 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
@@ -94,7 +94,7 @@ abstract class AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\BackendI
 	/**
 	 * Sets the default lifetime for this cache backend
 	 *
-	 * @param integer $defaultLifetime Default lifetime of this cache backend in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $defaultLifetime Default lifetime of this cache backend in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \InvalidArgumentException
 	 * @api
@@ -110,7 +110,7 @@ abstract class AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\BackendI
 	 * Calculates the expiry time by the given lifetime. If no lifetime is
 	 * specified, the default lifetime is used.
 	 *
-	 * @param integer $lifetime The lifetime in seconds
+	 * @param int $lifetime The lifetime in seconds
 	 * @return \DateTime The expiry time
 	 */
 	protected function calculateExpiryTime($lifetime = NULL) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php b/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
index 00093ba33cd7c7662a68a43aba10a7a936602884..323c2ef9357552abbc37a1d9e7420e64fae0c994 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
@@ -123,7 +123,7 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if $data is not a string
diff --git a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
index 78cef404a4620d711378b8c9b1070b30b468672b..cdc5921dc174933d6b3da827cf5aa75e5a42df61 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
@@ -36,7 +36,7 @@ interface BackendInterface
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry. If the backend does not support tags, this option can be ignored.
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the data is not a string
diff --git a/typo3/sysext/core/Classes/Cache/Backend/EarlyClassLoaderBackend.php b/typo3/sysext/core/Classes/Cache/Backend/EarlyClassLoaderBackend.php
index b7d31666a283b207281d946e1daece61adb2bc8f..99c1d7c06bf87b9d010cbcb8c5468af32e62f8d0 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/EarlyClassLoaderBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/EarlyClassLoaderBackend.php
@@ -40,7 +40,7 @@ class EarlyClassLoaderBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBack
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry. If the backend does not support tags, this option can be ignored.
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the data is not a string
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
index e2a3a30f36bb78b084602f7bedebf0940ee6591f..e6b8d4f976deff76e4f203ccf6a31143221154ef 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
@@ -125,7 +125,7 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
 	 * @return void
 	 * @throws \RuntimeException
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the directory does not exist or is not writable or exceeds the maximum allowed path length, or if no cache frontend has been set.
diff --git a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
index bf701bea2cd90e86e4b9a7605f060a33a3f16f44..e6a381f2700d16d9e8c900b586b4f22abe87d240 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
@@ -170,7 +170,7 @@ class MemcachedBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend imp
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
 	 * @throws \InvalidArgumentException if the identifier is not valid or the final memcached key is longer than 250 characters
diff --git a/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php b/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
index 42761b22d7708941991fe76acf722fee4129bae1..0151ccc9ceb70a3606e641814eefbb13638afa61 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
@@ -30,7 +30,7 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
 	 * @param string $entryIdentifier ignored
 	 * @param string $data ignored
 	 * @param array $tags ignored
-	 * @param integer $lifetime ignored
+	 * @param int $lifetime ignored
 	 * @return void
 	 * @api
 	 */
diff --git a/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php b/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
index 7237bf2b177e450316af88dbe4d60dd721523f5d..353cb455dc003f97d57e5462c6af99e0e5165cc3 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
@@ -95,7 +95,7 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
 	 * @throws \InvalidArgumentException if the identifier is not valid
diff --git a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
index 4784a3e0b59c95c6bddc2b709b4ca60ff081c8c4..2e3eb42c88d8e47529d0ae99a2a85b20acf419c9 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
@@ -171,7 +171,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
 	/**
 	 * Setter for server port
 	 *
-	 * @param integer $port Port
+	 * @param int $port Port
 	 * @return void
 	 * @api
 	 */
@@ -182,7 +182,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
 	/**
 	 * Setter for database number
 	 *
-	 * @param integer $database Database
+	 * @param int $database Database
 	 * @return void
 	 * @throws \InvalidArgumentException if database number is not valid
 	 * @api
@@ -228,7 +228,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
 	 * If compression is enabled and this is not set,
 	 * gzcompress default level will be used.
 	 *
-	 * @param integer $compressionLevel -1 to 9: Compression level
+	 * @param int $compressionLevel -1 to 9: Compression level
 	 * @return void
 	 * @throws \InvalidArgumentException if compressionLevel parameter is not within allowed bounds
 	 * @api
@@ -253,7 +253,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
 	 * @param string $entryIdentifier Identifier for this specific cache entry
 	 * @param string $data Data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, default lifetime is used. "0" means unlimited lifetime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, default lifetime is used. "0" means unlimited lifetime.
 	 * @return void
 	 * @throws \InvalidArgumentException if identifier is not valid
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if data is not a string
diff --git a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
index d7203b33fe0a613720c137db647733e2781a3a9a..c3e127089cf4aa2b78668ab124154a4c7296bfff 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
@@ -217,7 +217,7 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited lifetime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if the directory does not exist or is not writable or exceeds the maximum allowed path length, or if no cache frontend has been set.
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the data to bes stored is not a string.
diff --git a/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php b/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
index 6fa94b75ff61841c0ce5afef9bd4a9b9e0c6780d..692e294d73fdd8b68f2dc97a3474b444c94f2388 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
@@ -39,7 +39,7 @@ class TransientMemoryBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBacke
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException
diff --git a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
index 23c539dca0a99ec6a94513c6aa3dd08afc89e730..06cdc557405c4f9ba088e8428b1a03d348446319 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
@@ -116,7 +116,7 @@ class Typo3DatabaseBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set.
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the data to be stored is not a string.
@@ -327,7 +327,7 @@ class Typo3DatabaseBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend
 	 * If compression is enabled and this is not set,
 	 * gzcompress default level will be used
 	 *
-	 * @param integer -1 to 9: Compression level
+	 * @param int -1 to 9: Compression level
 	 */
 	public function setCompressionLevel($compressionLevel) {
 		if ($compressionLevel >= -1 && $compressionLevel <= 9) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php b/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
index 08f5bbc651a2db2774d90a20d8e4fc9de407d1d6..914ef4475efc19f2d948c968542135045feb824c 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
@@ -64,7 +64,7 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set
 	 * @throws \InvalidArgumentException if the identifier is not valid
diff --git a/typo3/sysext/core/Classes/Cache/Backend/XcacheBackend.php b/typo3/sysext/core/Classes/Cache/Backend/XcacheBackend.php
index 133b4ef72c692138713434bacc862f3b8aa523ba..c9a22df0d96147d351bd1f84e78bf02f61969e28 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/XcacheBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/XcacheBackend.php
@@ -70,7 +70,7 @@ class XcacheBackend extends AbstractBackend implements TaggableBackendInterface
 	 * @param string $entryIdentifier An identifier for this specific cache entry
 	 * @param string $data The data to be stored
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \TYPO3\CMS\Core\Cache\Exception if no cache frontend has been set
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if $data is not a string
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php b/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
index bcb7a5a63e11babfc4c5c19af959ce65038eadec..1fcdba7cac02c6fe43043a936e7cab81fcc11d94 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
@@ -58,7 +58,7 @@ interface FrontendInterface
 	 * @param string $entryIdentifier Something which identifies the data - depends on concrete cache
 	 * @param mixed $data The data to cache - also depends on the concrete cache implementation
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @api
 	 */
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
index e19c1b3bd09db6b6e94a33138d9a0ebede272cd3..fd25aed8c6da3eac4a7d4e765e53c6be20f034f5 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/PhpFrontend.php
@@ -39,7 +39,7 @@ class PhpFrontend extends \TYPO3\CMS\Core\Cache\Frontend\StringFrontend {
 	 * @param string $entryIdentifier An identifier used for this cache entry, for example the class name
 	 * @param string $sourceCode PHP source code
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \InvalidArgumentException If $entryIdentifier or $tags is invalid
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException If $sourceCode is not a string
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php
index adbd3c9a0e4f061e8faeb928fb8666f8c30b8f2b..b4bedeb17caf3a6680d964b7b75b617780b128d2 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/StringFrontend.php
@@ -29,7 +29,7 @@ class StringFrontend extends \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend {
 	 * @param string $entryIdentifier An identifier used for this cache entry
 	 * @param string $string The variable to cache
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \InvalidArgumentException if the identifier or tag is not valid
 	 * @throws \TYPO3\CMS\Core\Cache\Exception\InvalidDataException if the variable to cache is not of type string
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
index 3e8ca043f85bc9120c4cbe52217aa60d86c64e7f..0047ee16cbfa36b9c90a7b9eebefa53a89b8a30d 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
@@ -48,7 +48,7 @@ class VariableFrontend extends \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend {
 	 * @param string $entryIdentifier An identifier used for this cache entry
 	 * @param mixed $variable The variable to cache
 	 * @param array $tags Tags to associate with this cache entry
-	 * @param integer $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
+	 * @param int $lifetime Lifetime of this cache entry in seconds. If NULL is specified, the default lifetime is used. "0" means unlimited liftime.
 	 * @return void
 	 * @throws \InvalidArgumentException if the identifier or tag is not valid
 	 * @api
diff --git a/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php b/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
index 44037720f5b6afb7a1170ed85fd6718208b51feb..9a9529494c2a3db4c943d56719a865b7a019fb31 100644
--- a/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
+++ b/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
@@ -81,7 +81,7 @@ class CategoryCollection extends \TYPO3\CMS\Core\Collection\AbstractRecordCollec
 	 * identifier (what ever static data is defined) is loaded.
 	 * Entries can be load on first access.
 	 *
-	 * @param integer $id Id of database record to be loaded
+	 * @param int $id Id of database record to be loaded
 	 * @param bool $fillItems Populates the entries directly on load, might be bad for memory on large collections
 	 * @param string $tableName Name of table from which entries should be loaded
 	 * @param string $fieldName Name of the categories relation field
diff --git a/typo3/sysext/core/Classes/Charset/CharsetConverter.php b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
index 13500df6bea32fa999f6e7961b0233ecf2856b8d..a304e1b192145f92eaa5fc4d80cea44b392a9fa4 100644
--- a/typo3/sysext/core/Classes/Charset/CharsetConverter.php
+++ b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
@@ -1016,7 +1016,7 @@ class CharsetConverter {
 	 * 5 |   26 | 111110vv 10vvvvvv 10vvvvvv 10vvvvvv 10vvvvvv
 	 * 6 |   31 | 1111110v 10vvvvvv 10vvvvvv 10vvvvvv 10vvvvvv 10vvvvvv
 	 *
-	 * @param integer $cbyte UNICODE integer
+	 * @param int $cbyte UNICODE integer
 	 * @return string UTF-8 multibyte character string
 	 * @see utf8CharToUnumber()
 	 */
@@ -1526,8 +1526,8 @@ class CharsetConverter {
 	 *
 	 * @param string $charset The character set
 	 * @param string $string Character string
-	 * @param integer $start Start position (character position)
-	 * @param integer $len Length (in characters)
+	 * @param int $start Start position (character position)
+	 * @param int $len Length (in characters)
 	 * @return string The substring
 	 * @see substr(), mb_substr()
 	 */
@@ -1606,7 +1606,7 @@ class CharsetConverter {
 	 *
 	 * @param string $charset The character set
 	 * @param string $string String to be cropped
-	 * @param integer $len Crop length (in characters)
+	 * @param int $len Crop length (in characters)
 	 * @param string $crop Crop signifier
 	 * @return string The shortened string
 	 * @see mb_strlen(), mb_substr()
@@ -1629,7 +1629,7 @@ class CharsetConverter {
 	 *
 	 * @param string $charset The character set
 	 * @param string $string Character string
-	 * @param integer $len Length (in characters)
+	 * @param int $len Length (in characters)
 	 * @param string $crop Crop signifier
 	 * @return string The shortened string
 	 * @see substr(), mb_strimwidth()
@@ -1677,7 +1677,7 @@ class CharsetConverter {
 	 *
 	 * @param string $charset The character set
 	 * @param string $string Character string
-	 * @param integer $len The byte length
+	 * @param int $len The byte length
 	 * @return string The shortened string
 	 * @see mb_strcut()
 	 */
@@ -1879,8 +1879,8 @@ class CharsetConverter {
 	 * Unit-tested by Kasper and works 100% like substr() / mb_substr() for full range of $start/$len
 	 *
 	 * @param string $str UTF-8 string
-	 * @param integer $start Start position (character position)
-	 * @param integer $len Length (in characters)
+	 * @param int $start Start position (character position)
+	 * @param int $len Length (in characters)
 	 * @return string The substring
 	 * @see substr()
 	 */
@@ -1939,7 +1939,7 @@ class CharsetConverter {
 	 * Truncates a string in UTF-8 short at a given byte length.
 	 *
 	 * @param string $str UTF-8 multibyte character string
-	 * @param integer $len The byte length
+	 * @param int $len The byte length
 	 * @return string The shortened string
 	 * @see mb_strcut()
 	 */
@@ -1970,7 +1970,7 @@ class CharsetConverter {
 	 *
 	 * @param string $haystack UTF-8 string to search in
 	 * @param string $needle UTF-8 string to search for
-	 * @param integer $offset Positition to start the search
+	 * @param int $offset Positition to start the search
 	 * @return integer The character position
 	 * @see strpos()
 	 */
@@ -2020,7 +2020,7 @@ class CharsetConverter {
 	 * Unit tested by Kasper.
 	 *
 	 * @param string $str UTF-8 string
-	 * @param integer $pos Character position (negative values start from the end)
+	 * @param int $pos Character position (negative values start from the end)
 	 * @return integer Byte position
 	 */
 	public function utf8_char2byte_pos($str, $pos) {
@@ -2066,7 +2066,7 @@ class CharsetConverter {
 	 * Unit tested by Kasper.
 	 *
 	 * @param string $str UTF-8 string
-	 * @param integer $pos Byte position
+	 * @param int $pos Byte position
 	 * @return integer Character position
 	 */
 	public function utf8_byte2char_pos($str, $pos) {
@@ -2151,7 +2151,7 @@ class CharsetConverter {
 	 * Cuts a string in the EUC charset family short at a given byte length.
 	 *
 	 * @param string $str EUC multibyte character string
-	 * @param integer $len The byte length
+	 * @param int $len The byte length
 	 * @param string $charset The charset
 	 * @return string The shortened string
 	 * @see mb_strcut()
@@ -2186,9 +2186,9 @@ class CharsetConverter {
 	 * Returns a part of a string in the EUC charset family.
 	 *
 	 * @param string $str EUC multibyte character string
-	 * @param integer $start Start position (character position)
+	 * @param int $start Start position (character position)
 	 * @param string $charset The charset
-	 * @param integer $len Length (in characters)
+	 * @param int $len Length (in characters)
 	 * @return string the substring
 	 */
 	public function euc_substr($str, $start, $charset, $len = NULL) {
@@ -2242,7 +2242,7 @@ class CharsetConverter {
 	 * Translates a character position into an 'absolute' byte position.
 	 *
 	 * @param string $str EUC multibyte character string
-	 * @param integer $pos Character position (negative values start from the end)
+	 * @param int $pos Character position (negative values start from the end)
 	 * @param string $charset The charset
 	 * @return integer Byte position
 	 */
diff --git a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
index 554d9507088ab89722ec0e1f8fdee0e01700fb57..70c34399e54f37534a84fa1634a5cd701c762235 100644
--- a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
+++ b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
@@ -266,8 +266,8 @@ abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\Re
 	 * the item at $currentPosition will be moved to
 	 * $newPosition. Omiting $newPosition will move to top.
 	 *
-	 * @param integer $currentPosition
-	 * @param integer $newPosition
+	 * @param int $currentPosition
+	 * @param int $newPosition
 	 * @return void
 	 */
 	public function moveItemAt($currentPosition, $newPosition = 0) {
@@ -287,7 +287,7 @@ abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\Re
 	/**
 	 * Sets the identifier of the collection
 	 *
-	 * @param integer $id
+	 * @param int $id
 	 * @return void
 	 */
 	public function setIdentifier($id) {
@@ -301,7 +301,7 @@ abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\Re
 	 * identifier (what ever static data is defined) is loaded.
 	 * Entries can be load on first access.
 	 *
-	 * @param integer $id Id of database record to be loaded
+	 * @param int $id Id of database record to be loaded
 	 * @param bool $fillItems Populates the entries directly on load, might be bad for memory on large collections
 	 * @return \TYPO3\CMS\Core\Collection\CollectionInterface
 	 */
diff --git a/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
index 89640110e37815954f7f25884ba4e32094d651cb..4bf3b63c13b1973b159acce5dbefaea06e4222d0 100644
--- a/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
@@ -38,7 +38,7 @@ interface PersistableCollectionInterface {
 	/**
 	 * Sets the identifier of the collection
 	 *
-	 * @param integer|string $id
+	 * @param int|string $id
 	 * @return void
 	 */
 	public function setIdentifier($id);
@@ -50,7 +50,7 @@ interface PersistableCollectionInterface {
 	 * identifier (what ever static data is defined) is loaded.
 	 * Entries can be load on first access.
 	 *
-	 * @param integer|string $id
+	 * @param int|string $id
 	 * @param bool $fillItems Populates the entries directly on load, might be bad for memory on large collections
 	 * @return \TYPO3\CMS\Core\Collection\CollectionInterface
 	 */
diff --git a/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php b/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php
index 4152f6ce193b349e9d8b39ecbb44d8a0f2a452be..34f6d231fafbd94f85d0edbdf04be550e9f29bc9 100644
--- a/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php
+++ b/typo3/sysext/core/Classes/Collection/RecordCollectionRepository.php
@@ -41,7 +41,7 @@ class RecordCollectionRepository {
 	/**
 	 * Finds a record collection by uid.
 	 *
-	 * @param integer $uid The uid to be looked up
+	 * @param int $uid The uid to be looked up
 	 * @return NULL|\TYPO3\CMS\Core\Collection\AbstractRecordCollection
 	 */
 	public function findByUid($uid) {
@@ -106,7 +106,7 @@ class RecordCollectionRepository {
 	/**
 	 * Deletes a record collection by uid.
 	 *
-	 * @param integer $uid uid to be deleted
+	 * @param int $uid uid to be deleted
 	 * @return void
 	 */
 	public function deleteByUid($uid) {
diff --git a/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php
index a71e5572c43ee91088704f605eb8d9b779509e2c..283786ec6ac57a5e9c73d814d07f047252210c92 100644
--- a/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/SortableCollectionInterface.php
@@ -44,8 +44,8 @@ interface SortableCollectionInterface
 	 * The item at $currentPosition will be moved to
 	 * $newPosition. Omiting $newPosition will move to top.
 	 *
-	 * @param integer $currentPosition
-	 * @param integer $newPosition
+	 * @param int $currentPosition
+	 * @param int $newPosition
 	 * @return void
 	 */
 	public function moveItemAt($currentPosition, $newPosition = 0);
diff --git a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
index 8bd4e240495f89836348efec6138125102c65f20..2074aa4fe1939a98a8ab2f7a743588b719d82604 100644
--- a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
+++ b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
@@ -59,7 +59,7 @@ abstract class AbstractConditionMatcher {
 	/**
 	 * Sets the id of the page to evaluate conditions for.
 	 *
-	 * @param integer $pageId Id of the page (must be positive)
+	 * @param int $pageId Id of the page (must be positive)
 	 * @return void
 	 */
 	public function setPageId($pageId) {
diff --git a/typo3/sysext/core/Classes/Controller/CommandLineController.php b/typo3/sysext/core/Classes/Controller/CommandLineController.php
index 849835399195caf48cfef7c822d895a8dd1f1fee..5470a5218aae0856914cb2b27ff5a84ebceea586 100644
--- a/typo3/sysext/core/Classes/Controller/CommandLineController.php
+++ b/typo3/sysext/core/Classes/Controller/CommandLineController.php
@@ -101,7 +101,7 @@ class CommandLineController {
 	 * Return argument value
 	 *
 	 * @param string $option Option string, eg. "-s
-	 * @param integer $idx Value index, default is 0 (zero) = the first one...
+	 * @param int $idx Value index, default is 0 (zero) = the first one...
 	 * @return boolean TRUE if option found
 	 */
 	public function cli_argValue($option, $idx = 0) {
@@ -279,7 +279,7 @@ class CommandLineController {
 	 * Indentation function for 75 char wide lines.
 	 *
 	 * @param string $str String to break and indent.
-	 * @param integer $indent Number of space chars to indent.
+	 * @param int $indent Number of space chars to indent.
 	 * @return string Result
 	 */
 	public function cli_indent($str, $indent) {
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index 6e9debe016400b58b96da4eac2261f542ac85d71..0cbee4bfee7100c9035109d570377505781f342f 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -1208,7 +1208,7 @@ class DataHandler {
 	 * Fix shadowing of data in case we are editing a offline version of a live "New" placeholder record:
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Record uid
+	 * @param int $id Record uid
 	 * @return void
 	 */
 	public function placeholderShadowing($table, $id) {
@@ -1257,12 +1257,12 @@ class DataHandler {
 	 * $this->exclude_array is used to filter fields if needed.
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Record ID
+	 * @param int $id Record ID
 	 * @param array $fieldArray Default values, Preset $fieldArray with 'pid' maybe (pid and uid will be not be overridden anyway)
 	 * @param array $incomingFieldArray Is which fields/values you want to set. There are processed and put into $fieldArray if OK
-	 * @param integer $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted.
+	 * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted.
 	 * @param string $status Is 'new' or 'update'
-	 * @param integer $tscPID TSconfig PID
+	 * @param int $tscPID TSconfig PID
 	 * @return array Field Array
 	 */
 	public function fillInFieldArray($table, $id, $fieldArray, $incomingFieldArray, $realPid, $status, $tscPID) {
@@ -1468,8 +1468,8 @@ class DataHandler {
 	 * @param string $value Value to be evaluated. Notice, this is the INPUT value from the form. The original value (from any existing record) must be manually looked up inside the function if needed - or taken from $currentRecord array.
 	 * @param string $id The record-uid, mainly - but not exclusively - used for logging
 	 * @param string $status 'update' or 'new' flag
-	 * @param integer $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
-	 * @param integer $tscPID tscPID
+	 * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
+	 * @param int $tscPID tscPID
 	 * @return array Returns the evaluated $value as key "value" in this array. Can be checked with isset($res['value']) ...
 	 */
 	public function checkValue($table, $field, $value, $id, $status, $realPid, $tscPID) {
@@ -1515,10 +1515,10 @@ class DataHandler {
 	 * @param string $value The value to set.
 	 * @param array $tcaFieldConf Field configuration from $GLOBALS['TCA']
 	 * @param string $table Table name
-	 * @param integer $id Return UID
+	 * @param int $id Return UID
 	 * @param [type] $curValue
 	 * @param [type] $status
-	 * @param integer $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
+	 * @param int $realPid The real PID value of the record. For updates, this is just the pid of the record. For new records this is the PID of the page where it is inserted. If $realPid is -1 it means that a new version of the record is being inserted.
 	 * @param [type] $recFID
 	 * @param string $field Field name. Must NOT be set if the call is for a flexform field (since flexforms are not allowed within flexforms).
 	 * @param [type] $uploadedFiles
@@ -1844,7 +1844,7 @@ class DataHandler {
 	 * @param array $uploadedFileArray Array of uploaded files, if any
 	 * @param string $status Status ("update" or ?)
 	 * @param string $table tablename of record
-	 * @param integer $id UID of record
+	 * @param int $id UID of record
 	 * @param string $recFID Field identifier ([table:uid:field:....more for flexforms?]
 	 * @return array Modified value array
 	 * @see checkValue_group_select()
@@ -2317,8 +2317,8 @@ class DataHandler {
 	 * @param string $table Table name
 	 * @param string $field Field name for which $value must be unique
 	 * @param string $value Value string.
-	 * @param integer $id UID to filter out in the lookup (the record itself...)
-	 * @param integer $newPid If set, the value will be unique for this PID
+	 * @param int $id UID to filter out in the lookup (the record itself...)
+	 * @param int $newPid If set, the value will be unique for this PID
 	 * @return string Modified value (if not-unique). Will be the value appended with a number (until 100, then the function just breaks).
 	 */
 	public function getUnique($table, $field, $value, $id, $newPid = 0) {
@@ -2358,10 +2358,10 @@ class DataHandler {
 	 * excluding the given uid
 	 *
 	 * @param string $tableName Table name
-	 * @param integer $uid UID to filter out in the lookup (the record itself...)
+	 * @param int $uid UID to filter out in the lookup (the record itself...)
 	 * @param string $fieldName Field name for which $value must be unique
 	 * @param string $value Value string.
-	 * @param integer $pageId If set, the value will be unique for this PID
+	 * @param int $pageId If set, the value will be unique for this PID
 	 * @return array
 	 */
 	public function getRecordsWithSameValue($tableName, $uid, $fieldName, $value, $pageId = 0) {
@@ -2557,7 +2557,7 @@ class DataHandler {
 	 *
 	 * @param array $valueArray Current value array
 	 * @param array $tcaFieldConf TCA field config
-	 * @param integer $id Record id, used for look-up of MM relations (local_uid)
+	 * @param int $id Record id, used for look-up of MM relations (local_uid)
 	 * @param string $status Status string ('update' or 'new')
 	 * @param string $type The type, either 'select', 'group' or 'inline'
 	 * @param string $currentTable Table name, needs to be passed to \TYPO3\CMS\Core\Database\RelationHandler
@@ -2772,7 +2772,7 @@ class DataHandler {
 	 *
 	 * @param array $valueArray Current value array
 	 * @param array $tcaFieldConf TCA field config
-	 * @param integer $id Record id
+	 * @param int $id Record id
 	 * @param string $status Status string ('update' or 'new')
 	 * @param string $table Table name, needs to be passed to \TYPO3\CMS\Core\Database\RelationHandler
 	 * @param string $field The current field the values are modified for
@@ -2978,12 +2978,12 @@ class DataHandler {
 	 * Copying a single record
 	 *
 	 * @param string $table Element table
-	 * @param integer $uid Element UID
-	 * @param integer $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
+	 * @param int $uid Element UID
+	 * @param int $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
 	 * @param bool $first Is a flag set, if the record copied is NOT a 'slave' to another record copied. That is, if this record was asked to be copied in the cmd-array
 	 * @param array $overrideValues Associative array with field/value pairs to override directly. Notice; Fields must exist in the table record and NOT be among excluded fields!
 	 * @param string $excludeFields Commalist of fields to exclude from the copy process (might get default values)
-	 * @param integer $language Language ID (from sys_language table)
+	 * @param int $language Language ID (from sys_language table)
 	 * @return integer ID of new record, if any
 	 */
 	public function copyRecord($table, $uid, $destPid, $first = 0, $overrideValues = array(), $excludeFields = '', $language = 0) {
@@ -3095,8 +3095,8 @@ class DataHandler {
 	 * Copying pages
 	 * Main function for copying pages.
 	 *
-	 * @param integer $uid Page UID to copy
-	 * @param integer $destPid Destination PID: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
+	 * @param int $uid Page UID to copy
+	 * @param int $destPid Destination PID: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
 	 * @return void
 	 */
 	public function copyPages($uid, $destPid) {
@@ -3143,8 +3143,8 @@ class DataHandler {
 	/**
 	 * Copying a single page ($uid) to $destPid and all tables in the array copyTablesArray.
 	 *
-	 * @param integer $uid Page uid
-	 * @param integer $destPid Destination PID: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
+	 * @param int $uid Page uid
+	 * @param int $destPid Destination PID: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
 	 * @param array $copyTablesArray Table on pages to copy along with the page.
 	 * @param bool $first Is a flag set, if the record copied is NOT a 'slave' to another record copied. That is, if this record was asked to be copied in the cmd-array
 	 * @return integer The id of the new page, if applicable.
@@ -3179,8 +3179,8 @@ class DataHandler {
 	 * NOTICE: DOES NOT CHECK PERMISSIONS to create! And since page permissions are just passed through and not changed to the user who executes the copy we cannot enforce permissions without getting an incomplete copy - unless we change permissions of course.
 	 *
 	 * @param string $table Element table
-	 * @param integer $uid Element UID
-	 * @param integer $pid Element PID (real PID, not checked)
+	 * @param int $uid Element UID
+	 * @param int $pid Element PID (real PID, not checked)
 	 * @param array $overrideArray Override array - must NOT contain any fields not in the table!
 	 * @return array $workspaceOptions Options to be forwarded if actions happen on a workspace currently
 	 * @return integer Returns the new ID of the record (if applicable)
@@ -3244,7 +3244,7 @@ class DataHandler {
 	 *
 	 * @param string $table Table name
 	 * @param array $fieldArray Field array to insert as a record
-	 * @param integer $realPid The value of PID field.  -1 is indication that we are creating a new version!
+	 * @param int $realPid The value of PID field.  -1 is indication that we are creating a new version!
 	 * @return integer Returns the new ID of the record (if applicable)
 	 */
 	public function insertNewCopyVersion($table, $fieldArray, $realPid) {
@@ -3287,13 +3287,13 @@ class DataHandler {
 	 * Processing/Preparing content for copyRecord() function
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
+	 * @param int $uid Record uid
 	 * @param string $field Field name being processed
 	 * @param string $value Input value to be processed.
 	 * @param array $row Record array
 	 * @param array $conf TCA field configuration
-	 * @param integer $realDestPid Real page id (pid) the record is copied to
-	 * @param integer $language Language ID (from sys_language table) used in the duplicated record
+	 * @param int $realDestPid Real page id (pid) the record is copied to
+	 * @param int $language Language ID (from sys_language table) used in the duplicated record
 	 * @return array $workspaceOptions Options to be forwarded if actions happen on a workspace currently
 	 * @access private
 	 * @see copyRecord()
@@ -3460,7 +3460,7 @@ class DataHandler {
 	 * For DB references: Nothing done.
 	 *
 	 * @param array $conf TCE field config
-	 * @param integer $uid Record UID
+	 * @param int $uid Record UID
 	 * @param string $value Field value (eg. list of files)
 	 * @return string The (possibly modified) value
 	 * @see copyRecord(), copyRecord_flexFormCallBack()
@@ -3507,7 +3507,7 @@ class DataHandler {
 	 * Reason for copying RTEmagic files: a) if you remove an RTEmagic image from a record it will remove the file - any other record using it will have a lost reference! b) RTEmagic images keeps an original and a copy. The copy always is re-calculated to have the correct physical measures as the HTML tag inserting it defines. This is calculated from the original. Two records using the same image could have difference HTML-width/heights for the image and the copy could only comply with one of them. If you don't want a 1-1 relation you should NOT use RTEmagic files but just insert it as a normal file reference to a file inside fileadmin/ folder
 	 *
 	 * @param string $table Table name
-	 * @param integer $theNewSQLID Record UID
+	 * @param int $theNewSQLID Record UID
 	 * @return void
 	 */
 	public function copyRecord_fixRTEmagicImages($table, $theNewSQLID) {
@@ -3629,8 +3629,8 @@ class DataHandler {
 	 * Moving single records
 	 *
 	 * @param string $table Table name to move
-	 * @param integer $uid Record uid to move
-	 * @param integer $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
+	 * @param int $uid Record uid to move
+	 * @param int $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
 	 * @return void
 	 */
 	public function moveRecord($table, $uid, $destPid) {
@@ -3703,8 +3703,8 @@ class DataHandler {
 	 * USE ONLY INTERNALLY
 	 *
 	 * @param string $table Table name to move
-	 * @param integer $uid Record uid to move
-	 * @param integer $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
+	 * @param int $uid Record uid to move
+	 * @param int $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
 	 * @return void
 	 * @see moveRecord()
 	 */
@@ -3951,8 +3951,8 @@ class DataHandler {
 	 * In reality it only works if transOrigPointerTable is not set. For "pages" the implementation is hardcoded
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid (to be localized)
-	 * @param integer $language Language ID (from sys_language table)
+	 * @param int $uid Record uid (to be localized)
+	 * @param int $language Language ID (from sys_language table)
 	 * @return mixed The uid (integer) of the new translated record or FALSE (boolean) if something went wrong
 	 */
 	public function localize($table, $uid, $language) {
@@ -4059,7 +4059,7 @@ class DataHandler {
 	 * Performs localization or synchronization of child records.
 	 *
 	 * @param string $table The table of the localized parent record
-	 * @param integer $id The uid of the localized parent record
+	 * @param int $id The uid of the localized parent record
 	 * @param string $command Defines the type 'localize' or 'synchronize' (string) or a single uid to be localized (integer)
 	 * @return void
 	 */
@@ -4166,7 +4166,7 @@ class DataHandler {
 	 * Delete a single record
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Record UID
+	 * @param int $id Record UID
 	 * @return void
 	 */
 	public function deleteAction($table, $id) {
@@ -4193,7 +4193,7 @@ class DataHandler {
 	 * Delete element from any table
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record UID
+	 * @param int $uid Record UID
 	 * @param bool $noRecordCheck Flag: If $noRecordCheck is set, then the function does not check permission to delete record
 	 * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
 	 * @return void
@@ -4211,7 +4211,7 @@ class DataHandler {
 	 * Delete versions for element from any table
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record UID
+	 * @param int $uid Record UID
 	 * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
 	 * @return void
 	 */
@@ -4234,7 +4234,7 @@ class DataHandler {
 	 * Undelete a single record
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record UID
+	 * @param int $uid Record UID
 	 * @return void
 	 */
 	public function undeleteRecord($table, $uid) {
@@ -4250,7 +4250,7 @@ class DataHandler {
 	 * If both $noRecordCheck and $forceHardDelete are set it could even delete a "deleted"-flagged record!
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record UID
+	 * @param int $uid Record UID
 	 * @param bool $noRecordCheck Flag: If $noRecordCheck is set, then the function does not check permission to delete record
 	 * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
 	 * @param bool $undeleteRecord If TRUE, the "deleted" flag is set to 0 again and thus, the item is undeleted.
@@ -4384,7 +4384,7 @@ class DataHandler {
 	/**
 	 * Used to delete page because it will check for branch below pages and unallowed tables on the page as well.
 	 *
-	 * @param integer $uid Page id
+	 * @param int $uid Page id
 	 * @param bool $force If TRUE, pages are not checked for permission.
 	 * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
 	 * @return void
@@ -4411,7 +4411,7 @@ class DataHandler {
 	/**
 	 * Delete a page and all records on it.
 	 *
-	 * @param integer $uid Page id
+	 * @param int $uid Page id
 	 * @param bool $forceHardDelete If TRUE, the "deleted" flag is ignored if applicable for record and the record is deleted COMPLETELY!
 	 * @return void
 	 * @access private
@@ -4481,7 +4481,7 @@ class DataHandler {
 	/**
 	 * Used to evaluate if a page can be deleted
 	 *
-	 * @param integer $uid Page id
+	 * @param int $uid Page id
 	 * @return mixed If array: List of page uids to traverse and delete (means OK), if string: error code.
 	 */
 	public function canDeletePage($uid) {
@@ -4533,7 +4533,7 @@ class DataHandler {
 	 * Returns TRUE if record CANNOT be deleted, otherwise FALSE. Used to check before the versioning API allows a record to be marked for deletion.
 	 *
 	 * @param string $table Record Table
-	 * @param integer $id Record UID
+	 * @param int $id Record UID
 	 * @return string Returns a string IF there is an error (error string explaining). FALSE means record can be deleted
 	 */
 	public function cannotDeleteRecord($table, $id) {
@@ -4549,7 +4549,7 @@ class DataHandler {
 	 * Determines whether a record can be undeleted.
 	 *
 	 * @param string $table Table name of the record
-	 * @param integer $uid uid of the record
+	 * @param int $uid uid of the record
 	 * @return boolean Whether the record can be undeleted
 	 */
 	public function isRecordUndeletable($table, $uid) {
@@ -4683,7 +4683,7 @@ class DataHandler {
 	 * (Requires support in the table)
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Record uid to versionize
+	 * @param int $id Record uid to versionize
 	 * @param string $label Version label
 	 * @param bool $delete If TRUE, the version is created to delete the record.
 	 * @return integer Returns the id of the new version (if any)
@@ -4773,8 +4773,8 @@ class DataHandler {
 	 * Swaps MM-relations for current/swap record, see version_swap()
 	 *
 	 * @param string $table Table for the two input records
-	 * @param integer $id Current record (about to go offline)
-	 * @param integer $swapWith Swap record (about to go online)
+	 * @param int $id Current record (about to go offline)
+	 * @param int $swapWith Swap record (about to go online)
 	 * @return void
 	 * @see version_swap()
 	 */
@@ -4853,8 +4853,8 @@ class DataHandler {
 	 * It must be done in three steps with an intermediate "fake" uid. The UID can be something else than -$id (fx. 9999999+$id if you dare... :-)- as long as it is unique.
 	 *
 	 * @param string $table Table for the two input records
-	 * @param integer $id Current record (about to go offline)
-	 * @param integer $swapWith Swap record (about to go online)
+	 * @param int $id Current record (about to go offline)
+	 * @param int $swapWith Swap record (about to go online)
 	 * @return void
 	 * @see version_remapMMForVersionSwap()
 	 */
@@ -4987,7 +4987,7 @@ class DataHandler {
 	 *
 	 * @param array $conf TCA field config
 	 * @param string $value Field value
-	 * @param integer $MM_localUid UID of local record (for MM relations - might need to change if support for FlexForms should be done!)
+	 * @param int $MM_localUid UID of local record (for MM relations - might need to change if support for FlexForms should be done!)
 	 * @param string $table Table name
 	 * @return array Returns array of items ready to implode for field content.
 	 * @see remapListedDBRecords()
@@ -5056,7 +5056,7 @@ class DataHandler {
 	 *
 	 * @param array $conf TCA field config
 	 * @param string $value Field value
-	 * @param integer $uid The uid of the ORIGINAL record
+	 * @param int $uid The uid of the ORIGINAL record
 	 * @param string $table Table name
 	 * @return void
 	 */
@@ -5283,7 +5283,7 @@ class DataHandler {
 	 * Adds an instruction to the remap action stack (used with IRRE).
 	 *
 	 * @param string $table The affected table
-	 * @param integer $id The affected ID
+	 * @param int $id The affected ID
 	 * @param array $callback The callback information (object and method)
 	 * @param array $arguments The arguments to be used with the callback
 	 * @return void
@@ -5303,7 +5303,7 @@ class DataHandler {
 	 * Adds a table-id-pair to the reference index remapping stack.
 	 *
 	 * @param string $table
-	 * @param integer $id
+	 * @param int $id
 	 * @return void
 	 */
 	public function addRemapStackRefIndex($table, $id) {
@@ -5317,7 +5317,7 @@ class DataHandler {
 	 * The $incomingFieldArray is updated by reference!
 	 *
 	 * @param string $table Table name of the parent record
-	 * @param integer $id Uid of the parent record
+	 * @param int $id Uid of the parent record
 	 * @param array $incomingFieldArray Reference to the incominfFieldArray of process_datamap
 	 * @param array $registerDBList Reference to the $registerDBList array that was created/updated by versionizing calls to TCEmain in process_datamap.
 	 * @return void
@@ -5370,7 +5370,7 @@ class DataHandler {
 	 * Checking if a record with uid $id from $table is in the BE_USERS webmounts which is required for editing etc.
 	 *
 	 * @param string $table Table name
-	 * @param integer $id UID of record
+	 * @param int $id UID of record
 	 * @return boolean Returns TRUE if OK. Cached results.
 	 */
 	public function isRecordInWebMount($table, $id) {
@@ -5384,7 +5384,7 @@ class DataHandler {
 	/**
 	 * Checks if the input page ID is in the BE_USER webmounts
 	 *
-	 * @param integer $pid Page ID to check
+	 * @param int $pid Page ID to check
 	 * @return boolean TRUE if OK. Cached results.
 	 */
 	public function isInWebMount($pid) {
@@ -5398,7 +5398,7 @@ class DataHandler {
 	 * Checks if user may update a record with uid=$id from $table
 	 *
 	 * @param string $table Record table
-	 * @param integer $id Record UID
+	 * @param int $id Record UID
 	 * @param array $data Record data
 	 * @param array $hookObjectsArr Hook objects
 	 * @return boolean Returns TRUE if the user may update the record given by $table and $id
@@ -5472,7 +5472,7 @@ class DataHandler {
 	/**
 	 * Checks if a table is allowed on a certain page id according to allowed tables set for the page "doktype" and its [ctrl][rootLevel]-settings if any.
 	 *
-	 * @param integer $page_uid Page id for which to check, including 0 (zero) if checking for page tree root.
+	 * @param int $page_uid Page id for which to check, including 0 (zero) if checking for page tree root.
 	 * @param string $checkTable Table name to check
 	 * @return bool TRUE if OK
 	 */
@@ -5571,8 +5571,8 @@ class DataHandler {
 	/**
 	 * Looks up a page based on permissions.
 	 *
-	 * @param integer $id Page id
-	 * @param integer $perms Permission integer
+	 * @param int $id Page id
+	 * @param int $perms Permission integer
 	 * @return boolean|\mysqli_result|object MySQLi result object / DBAL object (from exec_SELECTquery())
 	 * @access private
 	 * @see doesRecordExist()
@@ -5589,8 +5589,8 @@ class DataHandler {
 	 * if $recurse is set, then the function will follow subpages. This MUST be set, if we need the idlist for deleting pages or else we get an incomplete list
 	 *
 	 * @param string $inList List of page uids, this is added to and outputted in the end
-	 * @param integer $pid Page ID to select subpages from.
-	 * @param integer $perms Perms integer to check each page record for.
+	 * @param int $pid Page ID to select subpages from.
+	 * @param int $perms Perms integer to check each page record for.
 	 * @param bool $recurse Recursion flag: If set, it will go out through the branch.
 	 * @return string List of integers in branch
 	 */
@@ -5646,8 +5646,8 @@ class DataHandler {
 	 * Checks if piage $id is a uid in the rootline from page id, $dest
 	 * Used when moving a page
 	 *
-	 * @param integer $dest Destination Page ID to test
-	 * @param integer $id Page ID to test for presence inside Destination
+	 * @param int $dest Destination Page ID to test
+	 * @param int $id Page ID to test for presence inside Destination
 	 * @return boolean Returns FALSE if ID is inside destination (including equal to)
 	 */
 	public function destNotInsideSelf($dest, $id) {
@@ -5698,8 +5698,8 @@ class DataHandler {
 	/**
 	 * Checks if there are records on a page from tables that are not allowed
 	 *
-	 * @param integer $page_uid Page ID
-	 * @param integer $doktype Page doktype
+	 * @param int $page_uid Page ID
+	 * @param int $doktype Page doktype
 	 * @return array Returns a list of the tables that are 'present' on the page but not allowed with the page_uid/doktype
 	 */
 	public function doesPageHaveUnallowedTables($page_uid, $doktype) {
@@ -5737,7 +5737,7 @@ class DataHandler {
 	 * Returns the value of the $field from page $id
 	 * NOTICE; the function caches the result for faster delivery next time. You can use this function repeatedly without performanceloss since it doesn't look up the same record twice!
 	 *
-	 * @param integer $id Page uid
+	 * @param int $id Page uid
 	 * @param string $field Field name for which to return value
 	 * @return string Value of the field. Result is cached in $this->pageCache[$id][$field] and returned from there next time!
 	 */
@@ -5757,7 +5757,7 @@ class DataHandler {
 	 * NOTICE: No check for deleted or access!
 	 *
 	 * @param string $table Table name
-	 * @param integer $id UID of the record from $table
+	 * @param int $id UID of the record from $table
 	 * @param string $fieldList Field list for the SELECT query, eg. "*" or "uid,pid,...
 	 * @return NULL|array Returns the selected record on success, otherwise NULL.
 	 */
@@ -5782,7 +5782,7 @@ class DataHandler {
 	 * Used for loggin
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Uid of record
+	 * @param int $id Uid of record
 	 * @param bool $noWSOL If set, no workspace overlay is performed
 	 * @return array Properties of record
 	 */
@@ -5817,8 +5817,8 @@ class DataHandler {
 
 	/**
 	 * @param string $table
-	 * @param integer $uid
-	 * @param integer $pid
+	 * @param int $uid
+	 * @param int $pid
 	 * @return integer
 	 */
 	public function eventPid($table, $uid, $pid) {
@@ -5835,7 +5835,7 @@ class DataHandler {
 	 * Does not check permissions but expects them to be verified on beforehand
 	 *
 	 * @param string $table Record table name
-	 * @param integer $id Record uid
+	 * @param int $id Record uid
 	 * @param array $fieldArray Array of field=>value pairs to insert. FIELDS MUST MATCH the database FIELDS. No check is done.
 	 * @return void
 	 */
@@ -5880,7 +5880,7 @@ class DataHandler {
 	 * @param string $id "NEW...." uid string
 	 * @param array $fieldArray Array of field=>value pairs to insert. FIELDS MUST MATCH the database FIELDS. No check is done. "pid" must point to the destination of the record!
 	 * @param bool $newVersion Set to TRUE if new version is created.
-	 * @param integer $suggestedUid Suggested UID value for the inserted record. See the array $this->suggestedInsertUids; Admin-only feature
+	 * @param int $suggestedUid Suggested UID value for the inserted record. See the array $this->suggestedInsertUids; Admin-only feature
 	 * @param bool $dontSetNewIdIndex If TRUE, the ->substNEWwithIDs array is not updated. Only useful in very rare circumstances!
 	 * @return integer Returns ID on success.
 	 */
@@ -5943,7 +5943,7 @@ class DataHandler {
 	 * Checking stored record to see if the written values are properly updated.
 	 *
 	 * @param string $table Record table name
-	 * @param integer $id Record uid
+	 * @param int $id Record uid
 	 * @param array $fieldArray Array of field=>value pairs to insert/update
 	 * @param string $action Action, for logging only.
 	 * @return array Selected row
@@ -5978,8 +5978,8 @@ class DataHandler {
 	 * Setting sys_history record, based on content previously set in $this->historyRecords[$table . ':' . $id] (by compareFieldArrayWithCurrentAndUnset())
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Record ID
-	 * @param integer $logId Log entry ID, important for linking between log and history views
+	 * @param int $id Record ID
+	 * @param int $logId Log entry ID, important for linking between log and history views
 	 * @return void
 	 */
 	public function setHistory($table, $id, $logId) {
@@ -6000,7 +6000,7 @@ class DataHandler {
 	 * Should be called any almost any update to a record which could affect references inside the record.
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Record UID
+	 * @param int $id Record UID
 	 * @return void
 	 */
 	public function updateRefIndex($table, $id) {
@@ -6022,8 +6022,8 @@ class DataHandler {
 	 * Using when new records are created and existing records are moved around.
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Uid of record to find sorting number for. May be zero in case of new.
-	 * @param integer $pid Positioning PID, either >=0 (pointing to page in which case we find sorting number for first record in page) or <0 (pointing to record in which case to find next sorting number after this record)
+	 * @param int $uid Uid of record to find sorting number for. May be zero in case of new.
+	 * @param int $pid Positioning PID, either >=0 (pointing to page in which case we find sorting number for first record in page) or <0 (pointing to record in which case to find next sorting number after this record)
 	 * @return mixed Returns integer if PID is >=0, otherwise an array with PID and sorting number. Possibly FALSE in case of error.
 	 */
 	public function getSortNumber($table, $uid, $pid) {
@@ -6109,9 +6109,9 @@ class DataHandler {
 	 * Used internally by getSortNumber()
 	 *
 	 * @param string $table Table name
-	 * @param integer $pid Pid in which to resort records.
+	 * @param int $pid Pid in which to resort records.
 	 * @param string $sortRow Sorting row
-	 * @param integer $return_SortNumber_After_This_Uid Uid of record from $table in this $pid and for which the return value will be set to a free sorting number after that record. This is used to return a sortingValue if the list is resorted because of inserting records inside the list and not in the top
+	 * @param int $return_SortNumber_After_This_Uid Uid of record from $table in this $pid and for which the return value will be set to a free sorting number after that record. This is used to return a sortingValue if the list is resorted because of inserting records inside the list and not in the top
 	 * @return integer If $return_SortNumber_After_This_Uid is set, will contain usable sorting number after that record if found (otherwise 0)
 	 * @access private
 	 * @see getSortNumber()
@@ -6146,9 +6146,9 @@ class DataHandler {
 	 * Used when new localized records are created so that localized records are sorted in the same order as the default language records
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Uid of default language record
-	 * @param integer $pid Pid of default language record
-	 * @param integer $language Language of localization
+	 * @param int $uid Uid of default language record
+	 * @param int $pid Pid of default language record
+	 * @param int $language Language of localization
 	 * @return integer uid of record after which the localized record should be inserted
 	 */
 	protected function getPreviousLocalizedRecordUid($table, $uid, $pid, $language) {
@@ -6281,7 +6281,7 @@ class DataHandler {
 	 * Used for existing records being updated
 	 *
 	 * @param string $table Record table name
-	 * @param integer $id Record uid
+	 * @param int $id Record uid
 	 * @param array $fieldArray Array of field=>value pairs intended to be inserted into the database. All keys with values matching exactly the current value will be unset!
 	 * @return array Returns $fieldArray. If the returned array is empty, then the record should not be updated!
 	 */
@@ -6450,7 +6450,7 @@ class DataHandler {
 	/**
 	 * Return TSconfig for a page id
 	 *
-	 * @param integer $tscPID Page id (PID) from which to get configuration.
+	 * @param int $tscPID Page id (PID) from which to get configuration.
 	 * @return array TSconfig array, if any
 	 */
 	public function getTCEMAIN_TSconfig($tscPID) {
@@ -6479,7 +6479,7 @@ class DataHandler {
 	 * Returns the pid of a record from $table with $uid
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
+	 * @param int $uid Record uid
 	 * @return integer PID value (unless the record did not exist in which case FALSE)
 	 */
 	public function getPID($table, $uid) {
@@ -6520,9 +6520,9 @@ class DataHandler {
 	 * Selecting ONLY pages which the user has read-access to!
 	 *
 	 * @param array $CPtable Accumulation of page uid=>pid pairs in branch of $pid
-	 * @param integer $pid Page ID for which to find subpages
-	 * @param integer $counter Number of levels to go down.
-	 * @param integer $rootID ID of root point for new copied branch: The idea seems to be that a copy is not made of the already new page!
+	 * @param int $pid Page ID for which to find subpages
+	 * @param int $counter Number of levels to go down.
+	 * @param int $rootID ID of root point for new copied branch: The idea seems to be that a copy is not made of the already new page!
 	 * @return array Return array.
 	 */
 	public function int_pageTreeInfo($CPtable, $pid, $counter, $rootID) {
@@ -6556,7 +6556,7 @@ class DataHandler {
 	 * Checks if any uniqueInPid eval input fields are in the record and if so, they are re-written to be correct.
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record UID
+	 * @param int $uid Record UID
 	 * @return void
 	 */
 	public function fixUniqueInPid($table, $uid) {
@@ -6586,8 +6586,8 @@ class DataHandler {
 	 * This function is also called with new elements. But then $update must be set to zero and $newData containing the data array. In that case data in the incoming array is NOT overridden. (250202)
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record UID
-	 * @param integer $prevUid UID of previous record
+	 * @param int $uid Record UID
+	 * @param int $prevUid UID of previous record
 	 * @param bool $update If set, updates the record
 	 * @param array $newData Input array. If fields are already specified AND $update is not set, values are not set in output array.
 	 * @return array Output array (For when the copying operation needs to get the information instead of updating the info)
@@ -6663,10 +6663,10 @@ class DataHandler {
 	 * Get modified header for a copied record
 	 *
 	 * @param string $table Table name
-	 * @param integer $pid PID value in which other records to test might be
+	 * @param int $pid PID value in which other records to test might be
 	 * @param string $field Field name to get header value for.
 	 * @param string $value Current field value
-	 * @param integer $count Counter (number of recursions)
+	 * @param int $count Counter (number of recursions)
 	 * @param string $prevTitle Previous title we checked for (in previous recursion)
 	 * @return string The field value, possibly appended with a "copy label
 	 */
@@ -6708,7 +6708,7 @@ class DataHandler {
 	 * Get the final pid based on $table and $pid ($destPid type... pos/neg)
 	 *
 	 * @param string $table Table name
-	 * @param integer $pid "Destination pid" : If the value is >= 0 it's just returned directly (through (int)though) but if the value is <0 then the method looks up the record with the uid equal to abs($pid) (positive number) and returns the PID of that record! The idea is that negative numbers point to the record AFTER WHICH the position is supposed to be!
+	 * @param int $pid "Destination pid" : If the value is >= 0 it's just returned directly (through (int)though) but if the value is <0 then the method looks up the record with the uid equal to abs($pid) (positive number) and returns the PID of that record! The idea is that negative numbers point to the record AFTER WHICH the position is supposed to be!
 	 * @return integer
 	 */
 	public function resolvePid($table, $pid) {
@@ -6795,7 +6795,7 @@ class DataHandler {
 	 * Determine if a record was copied or if a record is the result of a copy action.
 	 *
 	 * @param string $table The tablename of the record
-	 * @param integer $uid The uid of the record
+	 * @param int $uid The uid of the record
 	 * @return boolean Returns TRUE if the record is copied or is the result of a copy action
 	 */
 	public function isRecordCopied($table, $uid) {
@@ -6820,7 +6820,7 @@ class DataHandler {
 	 * Else just clear the cache for the parent page of the record.
 	 *
 	 * @param string $table Table name of record that was just updated.
-	 * @param integer $uid UID of updated / inserted record
+	 * @param int $uid UID of updated / inserted record
 	 * @return void
 	 * @internal This method is not meant to be called directly but only from the core itself or from hooks
 	 */
@@ -6837,7 +6837,7 @@ class DataHandler {
 	 * Else just clear the cache for the parent page of the record.
 	 *
 	 * @param string $table Table name of record that was just updated.
-	 * @param integer $uid UID of updated / inserted record
+	 * @param int $uid UID of updated / inserted record
 	 * @return void
 	 * @deprecated since 6.2 will be removed 2 versions later. Use ->clear_cacheCmd instead. Alternatively you can call ->registerPageCacheClearing from a hook to not immediatly clear the cache but register clearing after DataHandler operation finishes.
 	 */
@@ -7091,14 +7091,14 @@ class DataHandler {
 	 * Logging actions from TCEmain
 	 *
 	 * @param string $table Table name the log entry is concerned with. Blank if NA
-	 * @param integer $recuid Record UID. Zero if NA
-	 * @param integer $action Action number: 0=No category, 1=new record, 2=update record, 3= delete record, 4= move record, 5= Check/evaluate
-	 * @param integer $recpid Normally 0 (zero). If set, it indicates that this log-entry is used to notify the backend of a record which is moved to another location
-	 * @param integer $error The severity: 0 = message, 1 = error, 2 = System Error, 3 = security notice (admin)
+	 * @param int $recuid Record UID. Zero if NA
+	 * @param int $action Action number: 0=No category, 1=new record, 2=update record, 3= delete record, 4= move record, 5= Check/evaluate
+	 * @param int $recpid Normally 0 (zero). If set, it indicates that this log-entry is used to notify the backend of a record which is moved to another location
+	 * @param int $error The severity: 0 = message, 1 = error, 2 = System Error, 3 = security notice (admin)
 	 * @param string $details Default error message in english
-	 * @param integer $details_nr This number is unique for every combination of $type and $action. This is the error-message number, which can later be used to translate error messages. 0 if not categorized, -1 if temporary
+	 * @param int $details_nr This number is unique for every combination of $type and $action. This is the error-message number, which can later be used to translate error messages. 0 if not categorized, -1 if temporary
 	 * @param array $data Array with special information that may go into $details by '%s' marks / sprintf() when the log is shown
-	 * @param integer $event_pid The page_uid (pid) where the event occurred. Used to select log-content for specific pages.
+	 * @param int $event_pid The page_uid (pid) where the event occurred. Used to select log-content for specific pages.
 	 * @param string $NEWid NEW id for new records
 	 * @return integer Log entry UID (0 if no log entry was written or logging is disabled)
 	 */
@@ -7125,7 +7125,7 @@ class DataHandler {
 	 * Simple logging function meant to be used when logging messages is not yet fixed.
 	 *
 	 * @param string $message Message string
-	 * @param integer $error Error code, see log()
+	 * @param int $error Error code, see log()
 	 * @return integer Log entry UID
 	 * @see log()
 	 */
@@ -7138,9 +7138,9 @@ class DataHandler {
 	 *
 	 * @param string $message Message string
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
-	 * @param integer $pid Record PID (from page tree). Will be turned into an event_pid internally in function: Meaning that the PID for a page will be its own UID, not its page tree PID.
-	 * @param integer $error Error code, see log()
+	 * @param int $uid Record uid
+	 * @param int $pid Record PID (from page tree). Will be turned into an event_pid internally in function: Meaning that the PID for a page will be its own UID, not its page tree PID.
+	 * @param int $error Error code, see log()
 	 * @return integer Log entry UID
 	 * @see log()
 	 */
@@ -7218,7 +7218,7 @@ class DataHandler {
 	 * Gets the automatically versionized id of a record.
 	 *
 	 * @param string $table Name of the table
-	 * @param integer $id Uid of the record
+	 * @param int $id Uid of the record
 	 * @return integer
 	 */
 	public function getAutoVersionId($table, $id) {
@@ -7233,7 +7233,7 @@ class DataHandler {
 	 * Overlays the automatically versionized id of a record.
 	 *
 	 * @param string $table Name of the table
-	 * @param integer $id Uid of the record
+	 * @param int $id Uid of the record
 	 * @return integer
 	 */
 	protected function overlayAutoVersionId($table, $id) {
@@ -7303,7 +7303,7 @@ class DataHandler {
 	 * Determines nested element calls.
 	 *
 	 * @param string $table Name of the table
-	 * @param integer $id Uid of the record
+	 * @param int $id Uid of the record
 	 * @param string $identifier Name of the action to be checked
 	 * @return boolean
 	 */
@@ -7317,7 +7317,7 @@ class DataHandler {
 	 * This is used to track nested calls (e.g. for following m:n relations).
 	 *
 	 * @param string $table Name of the table
-	 * @param integer $id Uid of the record
+	 * @param int $id Uid of the record
 	 * @param string $identifier Name of the action to be tracked
 	 * @return void
 	 */
@@ -7340,7 +7340,7 @@ class DataHandler {
 	 * Determines whether an element was registered to be deleted in the registry.
 	 *
 	 * @param string $table Name of the table
-	 * @param integer $id Uid of the record
+	 * @param int $id Uid of the record
 	 * @return boolean
 	 * @see registerElementsToBeDeleted
 	 * @see resetElementsToBeDeleted
diff --git a/typo3/sysext/core/Classes/Database/DatabaseConnection.php b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
index 1e7b4e132a642d22bb1bbe44aeb33ea96a43a262..184482eb498a7f392e8c465d1fd4049e730dd0e7 100644
--- a/typo3/sysext/core/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
@@ -1098,7 +1098,7 @@ class DatabaseConnection {
 	 * Move internal result pointer
 	 *
 	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-	 * @param integer $seek Seek result number.
+	 * @param int $seek Seek result number.
 	 * @return boolean Returns TRUE on success or FALSE on failure.
 	 */
 	public function sql_data_seek($res, $seek) {
@@ -1114,7 +1114,7 @@ class DatabaseConnection {
 	 * mysql_field_type() wrapper function
 	 *
 	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-	 * @param integer $pointer Field index.
+	 * @param int $pointer Field index.
 	 * @return string Returns the name of the specified field index, or FALSE on error
 	 */
 	public function sql_field_type($res, $pointer) {
@@ -1437,7 +1437,7 @@ class DatabaseConnection {
 	/**
 	 * Set database port
 	 *
-	 * @param integer $port
+	 * @param int $port
 	 */
 	public function setDatabasePort($port = 3306) {
 		$this->disconnectIfConnected();
@@ -1829,7 +1829,7 @@ class DatabaseConnection {
 	 *
 	 * @param string $query SQL query
 	 * @param string $from_table Table(s) from which to select. This is what comes right after "FROM ...". Required value.
-	 * @param integer $row_count Number of resulting rows
+	 * @param int $row_count Number of resulting rows
 	 * @return boolean TRUE if explain was run, FALSE otherwise
 	 */
 	protected function explain($query, $from_table, $row_count) {
diff --git a/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php b/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
index 2d64ccf73ec312ede853e1f344fb37b4ad7fc753..d1395e8b2f7087140cec95524c2f98fef910de94 100644
--- a/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/PostProcessQueryHookInterface.php
@@ -28,7 +28,7 @@ interface PostProcessQueryHookInterface {
 	 * @param string $where_clause Where clause
 	 * @param string $groupBy Group by statement
 	 * @param string $orderBy Order by statement
-	 * @param integer $limit Database return limit
+	 * @param int $limit Database return limit
 	 * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
 	 * @return void
 	 */
diff --git a/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php b/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
index b19664203b4d9da809cfd0353c841909727dc930..6b68d7187116d4df1ec9000bdb7c1ca212fc57d0 100644
--- a/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
+++ b/typo3/sysext/core/Classes/Database/PreProcessQueryHookInterface.php
@@ -28,7 +28,7 @@ interface PreProcessQueryHookInterface {
 	 * @param string $where_clause Where clause
 	 * @param string $groupBy Group by statement
 	 * @param string $orderBy Order by statement
-	 * @param integer $limit Database return limit
+	 * @param int $limit Database return limit
 	 * @param \TYPO3\CMS\Core\Database\DatabaseConnection $parentObject
 	 * @return void
 	 */
diff --git a/typo3/sysext/core/Classes/Database/PreparedStatement.php b/typo3/sysext/core/Classes/Database/PreparedStatement.php
index f6c3b0a6c487016a830e0f830394d2012db0e587..5ee70f55cc2d7cdda66db1d19cc989193311c2e7 100644
--- a/typo3/sysext/core/Classes/Database/PreparedStatement.php
+++ b/typo3/sysext/core/Classes/Database/PreparedStatement.php
@@ -217,7 +217,7 @@ class PreparedStatement {
 	 *
 	 * @param mixed $parameter Parameter identifier. For a prepared statement using named placeholders, this will be a parameter name of the form :name. For a prepared statement using question mark placeholders, this will be the 1-indexed position of the parameter.
 	 * @param mixed $value The value to bind to the parameter.
-	 * @param integer $data_type Explicit data type for the parameter using the \TYPO3\CMS\Core\Database\PreparedStatement::PARAM_* constants. If not given, the PHP type of the value will be used instead (int, string, boolean).
+	 * @param int $data_type Explicit data type for the parameter using the \TYPO3\CMS\Core\Database\PreparedStatement::PARAM_* constants. If not given, the PHP type of the value will be used instead (int, string, boolean).
 	 * @return \TYPO3\CMS\Core\Database\PreparedStatement The current prepared statement to allow method chaining
 	 * @api
 	 */
@@ -392,7 +392,7 @@ class PreparedStatement {
 	/**
 	 * Fetches a row from a result set associated with a \TYPO3\CMS\Core\Database\PreparedStatement object.
 	 *
-	 * @param integer $fetch_style Controls how the next row will be returned to the caller. This value must be one of the \TYPO3\CMS\Core\Database\PreparedStatement::FETCH_* constants. If omitted, default fetch mode for this prepared query will be used.
+	 * @param int $fetch_style Controls how the next row will be returned to the caller. This value must be one of the \TYPO3\CMS\Core\Database\PreparedStatement::FETCH_* constants. If omitted, default fetch mode for this prepared query will be used.
 	 * @return array Array of rows or FALSE if there are no more rows.
 	 * @api
 	 */
@@ -443,7 +443,7 @@ class PreparedStatement {
 	/**
 	 * Moves internal result pointer.
 	 *
-	 * @param integer $rowNumber Where to place the result pointer (0 = start)
+	 * @param int $rowNumber Where to place the result pointer (0 = start)
 	 * @return boolean Returns TRUE on success or FALSE on failure.
 	 * @api
 	 */
@@ -459,7 +459,7 @@ class PreparedStatement {
 	/**
 	 * Returns an array containing all of the result set rows.
 	 *
-	 * @param integer $fetch_style Controls the contents of the returned array as documented in {@link \TYPO3\CMS\Core\Database\PreparedStatement::fetch()}.
+	 * @param int $fetch_style Controls the contents of the returned array as documented in {@link \TYPO3\CMS\Core\Database\PreparedStatement::fetch()}.
 	 * @return array Array of rows.
 	 * @api
 	 */
@@ -522,7 +522,7 @@ class PreparedStatement {
 	/**
 	 * Sets the default fetch mode for this prepared query.
 	 *
-	 * @param integer $mode One of the \TYPO3\CMS\Core\Database\PreparedStatement::FETCH_* constants
+	 * @param int $mode One of the \TYPO3\CMS\Core\Database\PreparedStatement::FETCH_* constants
 	 * @return void
 	 * @api
 	 */
diff --git a/typo3/sysext/core/Classes/Database/QueryView.php b/typo3/sysext/core/Classes/Database/QueryView.php
index 4f585509c31371b8fd3c5c9632c7512d4e37b631..3069a536600c51eee1d2e567c9acbe5aff7c89e0 100644
--- a/typo3/sysext/core/Classes/Database/QueryView.php
+++ b/typo3/sysext/core/Classes/Database/QueryView.php
@@ -128,7 +128,7 @@ class QueryView {
 	 * [Describe function...]
 	 *
 	 * @param array $storeQueryConfigs
-	 * @param integer $index
+	 * @param int $index
 	 * @return array
 	 */
 	public function addToStoreQueryConfigs($storeQueryConfigs, $index) {
@@ -143,7 +143,7 @@ class QueryView {
 	/**
 	 * [Describe function...]
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return integer
 	 */
 	public function saveQueryInAction($uid) {
@@ -186,7 +186,7 @@ class QueryView {
 	 * [Describe function...]
 	 *
 	 * @param array $storeQueryConfigs
-	 * @param integer $storeIndex
+	 * @param int $storeIndex
 	 * @param array $writeArray
 	 * @return array
 	 */
@@ -673,9 +673,9 @@ class QueryView {
 	/**
 	 * [Describe function...]
 	 *
-	 * @param integer $id
-	 * @param integer $depth
-	 * @param integer $begin
+	 * @param int $id
+	 * @param int $depth
+	 * @param int $begin
 	 * @param string $perms_clause
 	 * @return string
 	 */
diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
index 90c04168143f3302ee33af1da5d97a83ca8c0ddf..107c7f60729216671044caf2819fbc4baeb0b541 100644
--- a/typo3/sysext/core/Classes/Database/ReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -95,7 +95,7 @@ class ReferenceIndex {
 	 * NOTICE: Currently, references updated for a deleted-flagged record will not include those from within flexform fields in some cases where the data structure is defined by another record since the resolving process ignores deleted records! This will also result in bad cleaning up in tcemain I think... Anyway, thats the story of flexforms; as long as the DS can change, lots of references can get lost in no time.
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID of record
+	 * @param int $uid UID of record
 	 * @param bool $testOnly If set, nothing will be written to the index but the result value will still report statistics on what is added, deleted and kept. Can be used for mere analysis.
 	 * @return array Array with statistics about how many index records were added, deleted and not altered plus the complete reference set for the record.
 	 */
@@ -156,7 +156,7 @@ class ReferenceIndex {
 	 * If the result is used to update the sys_refindex table then ->WSOL must NOT be TRUE (no workspace overlay anywhere!)
 	 *
 	 * @param string $table Table name from $GLOBALS['TCA']
-	 * @param integer $uid Record UID
+	 * @param int $uid Record UID
 	 * @return array Index Rows
 	 */
 	public function generateRefIndexData($table, $uid) {
@@ -227,14 +227,14 @@ class ReferenceIndex {
 	 * The "hash" field is a fingerprint value across this table.
 	 *
 	 * @param string $table Tablename of source record (where reference is located)
-	 * @param integer $uid UID of source record (where reference is located)
+	 * @param int $uid UID of source record (where reference is located)
 	 * @param string $field Fieldname of source record (where reference is located)
 	 * @param string $flexpointer Pointer to location inside flexform structure where reference is located in [field]
-	 * @param integer $deleted Whether record is deleted-flagged or not
+	 * @param int $deleted Whether record is deleted-flagged or not
 	 * @param string $ref_table For database references; the tablename the reference points to. Special keyword "_FILE" indicates that "ref_string" is a file reference either absolute or relative to PATH_site. Special keyword "_STRING" indicates some special usage (typ. softreference) where "ref_string" is used for the value.
-	 * @param integer $ref_uid For database references; The UID of the record (zero "ref_table" is "_FILE" or "_STRING")
+	 * @param int $ref_uid For database references; The UID of the record (zero "ref_table" is "_FILE" or "_STRING")
 	 * @param string $ref_string For "_FILE" or "_STRING" references: The filepath (relative to PATH_site or absolute) or other string.
-	 * @param integer $sort The sorting order of references if many (the "group" or "select" TCA types). -1 if no sorting order is specified.
+	 * @param int $sort The sorting order of references if many (the "group" or "select" TCA types). -1 if no sorting order is specified.
 	 * @param string $softref_key If the reference is a soft reference, this is the soft reference parser key. Otherwise empty.
 	 * @param string $softref_id Soft reference ID for key. Might be useful for replace operations.
 	 * @return array Array record to insert into table.
@@ -260,10 +260,10 @@ class ReferenceIndex {
 	 * Enter database references to ->relations array
 	 *
 	 * @param string $table Tablename of source record (where reference is located)
-	 * @param integer $uid UID of source record (where reference is located)
+	 * @param int $uid UID of source record (where reference is located)
 	 * @param string $fieldname Fieldname of source record (where reference is located)
 	 * @param string $flexpointer Pointer to location inside flexform structure where reference is located in [field]
-	 * @param integer $deleted Whether record is deleted-flagged or not
+	 * @param int $deleted Whether record is deleted-flagged or not
 	 * @param array $items Data array with databaes relations (table/id)
 	 * @return void
 	 */
@@ -277,10 +277,10 @@ class ReferenceIndex {
 	 * Enter file references to ->relations array
 	 *
 	 * @param string $table Tablename of source record (where reference is located)
-	 * @param integer $uid UID of source record (where reference is located)
+	 * @param int $uid UID of source record (where reference is located)
 	 * @param string $fieldname Fieldname of source record (where reference is located)
 	 * @param string $flexpointer Pointer to location inside flexform structure where reference is located in [field]
-	 * @param integer $deleted Whether record is deleted-flagged or not
+	 * @param int $deleted Whether record is deleted-flagged or not
 	 * @param array $items Data array with file relations
 	 * @return 	void
 	 */
@@ -298,10 +298,10 @@ class ReferenceIndex {
 	 * Enter softref references to ->relations array
 	 *
 	 * @param string $table Tablename of source record (where reference is located)
-	 * @param integer $uid UID of source record (where reference is located)
+	 * @param int $uid UID of source record (where reference is located)
 	 * @param string $fieldname Fieldname of source record (where reference is located)
 	 * @param string $flexpointer Pointer to location inside flexform struc
-	 * @param integer $deleted
+	 * @param int $deleted
 	 * @param array $keys Data array with soft reference keys
 	 * @return void
 	 */
@@ -514,7 +514,7 @@ class ReferenceIndex {
 	 *
 	 * @param string $value Field value
 	 * @param array $conf Field configuration array of type "TCA/columns
-	 * @param integer $uid Field uid
+	 * @param int $uid Field uid
 	 * @return bool|array If field type is OK it will return an array with the files inside. Else FALSE
 	 */
 	public function getRelations_procFiles($value, $conf, $uid) {
@@ -574,7 +574,7 @@ class ReferenceIndex {
 	 *
 	 * @param string $value Field value
 	 * @param array $conf Field configuration array of type "TCA/columns
-	 * @param integer $uid Field uid
+	 * @param int $uid Field uid
 	 * @param string $table Table name
 	 * @param string $field Field name
 	 * @return array If field type is OK it will return an array with the database relations. Else FALSE
diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index c9eba1abcb057e08c5293c831e661d5b676c1410..1362926c8345e5b614b70727996e63b0888c086b 100644
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -248,7 +248,7 @@ class RelationHandler {
 	 * @param string $itemlist List of group/select items
 	 * @param string $tablelist Comma list of tables, first table takes priority if no table is set for an entry in the list.
 	 * @param string $MMtable Name of a MM table.
-	 * @param integer $MMuid Local UID for MM lookup
+	 * @param int $MMuid Local UID for MM lookup
 	 * @param string $currentTable Current table name
 	 * @param array $conf TCA configuration for current field
 	 * @return void
@@ -486,7 +486,7 @@ class RelationHandler {
 	 * You can call this function after start if you supply no list to start()
 	 *
 	 * @param string $tableName MM Tablename
-	 * @param integer $uid Local UID
+	 * @param int $uid Local UID
 	 * @return void
 	 */
 	public function readMM($tableName, $uid) {
@@ -547,7 +547,7 @@ class RelationHandler {
 	 * Writes the internal itemArray to MM table:
 	 *
 	 * @param string $MM_tableName MM table name
-	 * @param integer $uid Local UID
+	 * @param int $uid Local UID
 	 * @param bool $prependTableName If set, then table names will always be written.
 	 * @return void
 	 */
@@ -698,8 +698,8 @@ class RelationHandler {
 	 * Does NOT update the reference index for you, must be called subsequently to do that!
 	 *
 	 * @param string $MM_tableName MM table name
-	 * @param integer $uid Local, current UID
-	 * @param integer $newUid Local, new UID
+	 * @param int $uid Local, current UID
+	 * @param int $newUid Local, new UID
 	 * @param bool $prependTableName If set, then table names will always be written.
 	 * @return void
 	 */
@@ -738,7 +738,7 @@ class RelationHandler {
 	 * Reads items from a foreign_table, that has a foreign_field (uid of the parent record) and
 	 * stores the parts in the internal array itemArray and tableArray.
 	 *
-	 * @param integer $uid The uid of the parent record (this value is also on the foreign_table in the foreign_field)
+	 * @param int $uid The uid of the parent record (this value is also on the foreign_table in the foreign_field)
 	 * @param array $conf TCA configuration for current field
 	 * @return void
 	 */
@@ -824,8 +824,8 @@ class RelationHandler {
 	 * Write the sorting values to a foreign_table, that has a foreign_field (uid of the parent record)
 	 *
 	 * @param array $conf TCA configuration for current field
-	 * @param integer $parentUid The uid of the parent record
-	 * @param integer $updateToUid If this is larger than zero it will be used as foreign UID instead of the given $parentUid (on Copy)
+	 * @param int $parentUid The uid of the parent record
+	 * @param int $updateToUid If this is larger than zero it will be used as foreign UID instead of the given $parentUid (on Copy)
 	 * @param bool $skipSorting Do not update the sorting columns, this could happen for imported values
 	 * @return void
 	 */
@@ -1064,7 +1064,7 @@ class RelationHandler {
 	 * (copied from TCEmain)
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Record UID
+	 * @param int $id Record UID
 	 * @return array Information concerning modifications delivered by \TYPO3\CMS\Core\Database\ReferenceIndex::updateRefIndexTable()
 	 */
 	public function updateRefIndex($table, $id) {
diff --git a/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php b/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
index 132f348a425f77afeb5d5b0c0b6485f82f8783a4..a485e407a7501b3f5468b50fb919d871d9d82522 100644
--- a/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
@@ -96,7 +96,7 @@ class SoftReferenceIndex {
 	 *
 	 * @param string $table Database table name
 	 * @param string $field Field name for which processing occurs
-	 * @param integer $uid UID of the record
+	 * @param int $uid UID of the record
 	 * @param string $content The content/value of the field
 	 * @param string $spKey The softlink parser key. This is only interesting if more than one parser is grouped in the same class. That is the case with this parser.
 	 * @param array $spParams Parameters of the softlink parser. Basically this is the content inside optional []-brackets after the softref keys. Parameters are exploded by ";
@@ -667,7 +667,7 @@ class SoftReferenceIndex {
 	 * @param array $tLP TypoLink properties
 	 * @param array $elements Array of elements to be modified with substitution / information entries.
 	 * @param string $content The content to process.
-	 * @param integer $idx Index value of the found element - user to make unique but stable tokenID
+	 * @param int $idx Index value of the found element - user to make unique but stable tokenID
 	 * @return string The input content, possibly containing tokens now according to the added substitution entries in $elements
 	 * @see getTypoLinkParts()
 	 */
@@ -804,7 +804,7 @@ class SoftReferenceIndex {
 	/**
 	 * Look up and return page uid for alias
 	 *
-	 * @param integer $link_param Page alias string value
+	 * @param int $link_param Page alias string value
 	 * @return integer Page uid corresponding to alias value.
 	 */
 	public function getPageIdFromAlias($link_param) {
diff --git a/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php b/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
index 50a121038becea14132fabc24699e97832d8ae56..020b4ffad59a7535c7a38e44c1a0eec46e406c35 100644
--- a/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
+++ b/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
@@ -129,7 +129,7 @@ class JavaScriptEncoder implements \TYPO3\CMS\Core\SingletonInterface {
 	 * If the character is an alphanumeric character with ordinal value below 255,
 	 * then this method will return NULL.
 	 *
-	 * @param integer $ordinalValue Ordinal value of the character
+	 * @param int $ordinalValue Ordinal value of the character
 	 * @return string hexadecimal ordinal value of non-alphanumeric characters or NULL otherwise.
 	 */
 	protected function getHexForNonAlphanumeric($ordinalValue) {
diff --git a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
index 777db8fb825eb91f74a8a627d67af4421c463294..8311e757282c35abeb74321781eb6fbea1ce51d9 100644
--- a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
+++ b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
@@ -219,7 +219,7 @@ class FrontendEditingController {
 	 * Hides a specific record.
 	 *
 	 * @param string $table The table name for the record to hide.
-	 * @param integer $uid The UID for the record to hide.
+	 * @param int $uid The UID for the record to hide.
 	 * @return void
 	 */
 	public function doHide($table, $uid) {
@@ -237,7 +237,7 @@ class FrontendEditingController {
 	 * Unhides (shows) a specific record.
 	 *
 	 * @param string $table The table name for the record to unhide.
-	 * @param integer $uid The UID for the record to unhide.
+	 * @param int $uid The UID for the record to unhide.
 	 * @return void
 	 */
 	public function doUnhide($table, $uid) {
@@ -255,7 +255,7 @@ class FrontendEditingController {
 	 * Moves a record up.
 	 *
 	 * @param string $table The table name for the record to move.
-	 * @param integer $uid The UID for the record to hide.
+	 * @param int $uid The UID for the record to hide.
 	 * @return void
 	 */
 	public function doUp($table, $uid) {
@@ -266,7 +266,7 @@ class FrontendEditingController {
 	 * Moves a record down.
 	 *
 	 * @param string $table The table name for the record to move.
-	 * @param integer $uid The UID for the record to move.
+	 * @param int $uid The UID for the record to move.
 	 * @return void
 	 */
 	public function doDown($table, $uid) {
@@ -277,7 +277,7 @@ class FrontendEditingController {
 	 * Moves a record after a given element. Used for drag.
 	 *
 	 * @param string $table The table name for the record to move.
-	 * @param integer $uid The UID for the record to move.
+	 * @param int $uid The UID for the record to move.
 	 * @return void
 	 */
 	public function doMoveAfter($table, $uid) {
@@ -289,9 +289,9 @@ class FrontendEditingController {
 	 * Moves a record
 	 *
 	 * @param string $table The table name for the record to move.
-	 * @param integer $uid The UID for the record to move.
+	 * @param int $uid The UID for the record to move.
 	 * @param string $direction The direction to move, either 'up' or 'down'.
-	 * @param integer $afterUID The UID of record to move after. This is specified for dragging only.
+	 * @param int $afterUID The UID of record to move after. This is specified for dragging only.
 	 * @return void
 	 */
 	protected function move($table, $uid, $direction = '', $afterUID = 0) {
@@ -354,7 +354,7 @@ class FrontendEditingController {
 	 * Deletes a specific record.
 	 *
 	 * @param string $table The table name for the record to delete.
-	 * @param integer $uid The UID for the record to delete.
+	 * @param int $uid The UID for the record to delete.
 	 * @return void
 	 */
 	public function doDelete($table, $uid) {
@@ -370,7 +370,7 @@ class FrontendEditingController {
 	 * Saves a record based on its data array.
 	 *
 	 * @param string $table The table name for the record to save.
-	 * @param integer $uid The UID for the record to save.
+	 * @param int $uid The UID for the record to save.
 	 * @return void
 	 */
 	public function doSave($table, $uid) {
@@ -392,7 +392,7 @@ class FrontendEditingController {
 	 * Saves a record based on its data array and closes it.
 	 *
 	 * @param string $table The table name for the record to save.
-	 * @param integer $uid The UID for the record to save.
+	 * @param int $uid The UID for the record to save.
 	 * @return void
 	 * @note 	This method is only a wrapper for doSave() but is needed so
 	 */
@@ -405,7 +405,7 @@ class FrontendEditingController {
 	 * element rendering will take care of everything.
 	 *
 	 * @param string $table The table name for the record to close.
-	 * @param integer $uid The UID for the record to close.
+	 * @param int $uid The UID for the record to close.
 	 * @return void
 	 */
 	public function doClose($table, $uid) {
@@ -492,7 +492,7 @@ class FrontendEditingController {
 	 *
 	 * @param string $table The name of the table.
 	 * @param array $conf The configuration array.
-	 * @param integer $pid The PID where editing will occur.
+	 * @param int $pid The PID where editing will occur.
 	 * @param string $allow Comma-separated list of actions that are allowed in general.
 	 * @return array
 	 */
diff --git a/typo3/sysext/core/Classes/Html/HtmlParser.php b/typo3/sysext/core/Classes/Html/HtmlParser.php
index 62175a49451021d39ced0d56b2d1d2d4bcf2f974..8d96ff280affe7ec427b9e45324d5bab7a21e4ab 100644
--- a/typo3/sysext/core/Classes/Html/HtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/HtmlParser.php
@@ -381,7 +381,7 @@ class HtmlParser {
 	 * @param object $procObj Object where call back methods are.
 	 * @param string $callBackContent Name of call back method for content; "function callBackContent($str,$level)
 	 * @param string $callBackTags Name of call back method for tags; "function callBackTags($tags,$level)
-	 * @param integer $level Indent level
+	 * @param int $level Indent level
 	 * @return string Processed content
 	 * @see splitIntoBlock()
 	 */
@@ -686,7 +686,7 @@ class HtmlParser {
 	 * @param string $content Is the HTML-content being processed. This is also the result being returned.
 	 * @param array $tags Is an array where each key is a tagname in lowercase. Only tags present as keys in this array are preserved. The value of the key can be an array with a vast number of options to configure.
 	 * @param string $keepAll Boolean/'protect', if set, then all tags are kept regardless of tags present as keys in $tags-array. If 'protect' then the preserved tags have their <> converted to &lt; and &gt;
-	 * @param integer $hSC Values -1,0,1,2: Set to zero= disabled, set to 1 then the content BETWEEN tags is htmlspecialchar()'ed, set to -1 its the opposite and set to 2 the content will be HSC'ed BUT with preservation for real entities (eg. "&amp;" or "&#234;")
+	 * @param int $hSC Values -1,0,1,2: Set to zero= disabled, set to 1 then the content BETWEEN tags is htmlspecialchar()'ed, set to -1 its the opposite and set to 2 the content will be HSC'ed BUT with preservation for real entities (eg. "&amp;" or "&#234;")
 	 * @param array $addConfig Configuration array send along as $conf to the internal functions ->processContent() and ->processTag()
 	 * @return string Processed HTML content
 	 */
@@ -1255,7 +1255,7 @@ class HtmlParser {
 	 * Indents input content with $number instances of $indentChar
 	 *
 	 * @param string $content Content string, multiple lines.
-	 * @param integer $number Number of indents
+	 * @param int $number Number of indents
 	 * @param string $indentChar Indent character/string
 	 * @return strin Indented code (typ. HTML)
 	 */
@@ -1478,7 +1478,7 @@ class HtmlParser {
 	 * Processing content between tags for HTML_cleaner
 	 *
 	 * @param string $value The value
-	 * @param integer $dir Direction, either -1 or +1. 0 (zero) means no change to input value.
+	 * @param int $dir Direction, either -1 or +1. 0 (zero) means no change to input value.
 	 * @param mixed $conf Not used, ignore.
 	 * @return string The processed value.
 	 * @access private
diff --git a/typo3/sysext/core/Classes/Html/RteHtmlParser.php b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
index 3a921593e659b41386a3db4b37a086000e6333d6..da95fab75ae0cf5f78e76b8ab1fde3ca9450508a 100644
--- a/typo3/sysext/core/Classes/Html/RteHtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/RteHtmlParser.php
@@ -101,7 +101,7 @@ class RteHtmlParser extends \TYPO3\CMS\Core\Html\HtmlParser {
 	 * Initialize, setting element reference and record PID
 	 *
 	 * @param string $elRef Element reference, eg "tt_content:bodytext
-	 * @param integer $recPid PID of the record (page id)
+	 * @param int $recPid PID of the record (page id)
 	 * @return void
 	 */
 	public function init($elRef = '', $recPid = 0) {
@@ -1275,7 +1275,7 @@ class RteHtmlParser extends \TYPO3\CMS\Core\Html\HtmlParser {
 	 * This function processes content to go into the database.
 	 *
 	 * @param string $value Value to process.
-	 * @param integer $count Recursion brake. Decremented on each recursion down to zero. Default is 5 (which equals the allowed nesting levels of p/div tags).
+	 * @param int $count Recursion brake. Decremented on each recursion down to zero. Default is 5 (which equals the allowed nesting levels of p/div tags).
 	 * @param bool $returnArray If TRUE, an array with the lines is returned, otherwise a string of the processed input value.
 	 * @return string Processed input value.
 	 * @see setDivTags()
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index 52a0bb9fed767bafbe6805c6c84ba06af4b01f70..d86e4b14830d97f80c4aeee71bc17e8ccea99859 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -549,14 +549,14 @@ class GraphicalFunctions {
 	 *
 	 * @param resource $dstImg Destination image
 	 * @param resource $srcImg Source image
-	 * @param integer $dstX Destination x-coordinate
-	 * @param integer $dstY Destination y-coordinate
-	 * @param integer $srcX Source x-coordinate
-	 * @param integer $srcY Source y-coordinate
-	 * @param integer $dstWidth Destination width
-	 * @param integer $dstHeight Destination height
-	 * @param integer $srcWidth Source width
-	 * @param integer $srcHeight Source height
+	 * @param int $dstX Destination x-coordinate
+	 * @param int $dstY Destination y-coordinate
+	 * @param int $srcX Source x-coordinate
+	 * @param int $srcY Source y-coordinate
+	 * @param int $dstWidth Destination width
+	 * @param int $dstHeight Destination height
+	 * @param int $srcWidth Source width
+	 * @param int $srcHeight Source height
 	 * @return void
 	 * @access private
 	 * @see \TYPO3\CMS\Backend\Utility\IconUtility::imagecopyresized()
@@ -856,17 +856,17 @@ class GraphicalFunctions {
 	 * See
 	 *
 	 * @param pointer $im (See argument for PHP function imageTTFtext())
-	 * @param integer $fontSize (See argument for PHP function imageTTFtext())
-	 * @param integer $angle (See argument for PHP function imageTTFtext())
-	 * @param integer $x (See argument for PHP function imageTTFtext())
-	 * @param integer $y (See argument for PHP function imageTTFtext())
-	 * @param integer $Fcolor (See argument for PHP function imageTTFtext())
+	 * @param int $fontSize (See argument for PHP function imageTTFtext())
+	 * @param int $angle (See argument for PHP function imageTTFtext())
+	 * @param int $x (See argument for PHP function imageTTFtext())
+	 * @param int $y (See argument for PHP function imageTTFtext())
+	 * @param int $Fcolor (See argument for PHP function imageTTFtext())
 	 * @param string $fontFile (See argument for PHP function imageTTFtext())
 	 * @param string $text (See argument for PHP function imageTTFtext()). UTF-8 string, possibly with entities in.
-	 * @param integer $spacing The spacing of letters in pixels
-	 * @param integer $wordSpacing The spacing of words in pixels
+	 * @param int $spacing The spacing of letters in pixels
+	 * @param int $wordSpacing The spacing of words in pixels
 	 * @param array $splitRenderingConf Array
-	 * @param integer $sF Scale factor
+	 * @param int $sF Scale factor
 	 * @return void
 	 * @access private
 	 */
@@ -936,12 +936,12 @@ class GraphicalFunctions {
 	/**
 	 * Wrapper for ImageTTFBBox
 	 *
-	 * @param integer $fontSize (See argument for PHP function ImageTTFBBox())
-	 * @param integer $angle (See argument for PHP function ImageTTFBBox())
+	 * @param int $fontSize (See argument for PHP function ImageTTFBBox())
+	 * @param int $angle (See argument for PHP function ImageTTFBBox())
 	 * @param string $fontFile (See argument for PHP function ImageTTFBBox())
 	 * @param string $string (See argument for PHP function ImageTTFBBox())
 	 * @param array $splitRendering Split-rendering configuration
-	 * @param integer $sF Scale factor
+	 * @param int $sF Scale factor
 	 * @return array Information array.
 	 */
 	public function ImageTTFBBoxWrapper($fontSize, $angle, $fontFile, $string, $splitRendering, $sF = 1) {
@@ -984,15 +984,15 @@ class GraphicalFunctions {
 	 * Wrapper for ImageTTFText
 	 *
 	 * @param pointer $im (See argument for PHP function imageTTFtext())
-	 * @param integer $fontSize (See argument for PHP function imageTTFtext())
-	 * @param integer $angle (See argument for PHP function imageTTFtext())
-	 * @param integer $x (See argument for PHP function imageTTFtext())
-	 * @param integer $y (See argument for PHP function imageTTFtext())
-	 * @param integer $color (See argument for PHP function imageTTFtext())
+	 * @param int $fontSize (See argument for PHP function imageTTFtext())
+	 * @param int $angle (See argument for PHP function imageTTFtext())
+	 * @param int $x (See argument for PHP function imageTTFtext())
+	 * @param int $y (See argument for PHP function imageTTFtext())
+	 * @param int $color (See argument for PHP function imageTTFtext())
 	 * @param string $fontFile (See argument for PHP function imageTTFtext())
 	 * @param string $string (See argument for PHP function imageTTFtext()). UTF-8 string, possibly with entities in.
 	 * @param array $splitRendering Split-rendering configuration
-	 * @param integer $sF Scale factor
+	 * @param int $sF Scale factor
 	 * @return void
 	 */
 	public function ImageTTFTextWrapper($im, $fontSize, $angle, $x, $y, $color, $fontFile, $string, $splitRendering, $sF = 1) {
@@ -1034,7 +1034,7 @@ class GraphicalFunctions {
 	 *
 	 * @param string $string UTF-8 string
 	 * @param array $splitRendering Split-rendering configuration from GIFBUILDER TEXT object.
-	 * @param integer $fontSize Current fontsize
+	 * @param int $fontSize Current fontsize
 	 * @param string $fontFile Current font file
 	 * @return array Array with input string splitted according to configuration
 	 */
@@ -1170,7 +1170,7 @@ class GraphicalFunctions {
 	 * Calculates the spacing and wordSpacing values
 	 *
 	 * @param array $conf TypoScript array for the TEXT GIFBUILDER object
-	 * @param integer $scaleFactor TypoScript value from eg $conf['niceText.']['scaleFactor']
+	 * @param int $scaleFactor TypoScript value from eg $conf['niceText.']['scaleFactor']
 	 * @return array Array with two keys [0]/[1] being array($spacing,$wordSpacing)
 	 * @access private
 	 * @see calcBBox()
@@ -1205,16 +1205,16 @@ class GraphicalFunctions {
 	 * Renders a regular text and takes care of a possible line break automatically.
 	 *
 	 * @param pointer $im (See argument for PHP function imageTTFtext())
-	 * @param integer $fontSize (See argument for PHP function imageTTFtext())
-	 * @param integer $angle (See argument for PHP function imageTTFtext())
-	 * @param integer $x (See argument for PHP function imageTTFtext())
-	 * @param integer $y (See argument for PHP function imageTTFtext())
-	 * @param integer $color (See argument for PHP function imageTTFtext())
+	 * @param int $fontSize (See argument for PHP function imageTTFtext())
+	 * @param int $angle (See argument for PHP function imageTTFtext())
+	 * @param int $x (See argument for PHP function imageTTFtext())
+	 * @param int $y (See argument for PHP function imageTTFtext())
+	 * @param int $color (See argument for PHP function imageTTFtext())
 	 * @param string $fontFile (See argument for PHP function imageTTFtext())
 	 * @param string $string (See argument for PHP function imageTTFtext()). UTF-8 string, possibly with entities in.
 	 * @param array $splitRendering Split-rendering configuration
 	 * @param array $conf The configuration
-	 * @param integer $sF Scale factor
+	 * @param int $sF Scale factor
 	 * @return void
 	 */
 	protected function renderTTFText(&$im, $fontSize, $angle, $x, $y, $color, $fontFile, $string, $splitRendering, $conf, $sF = 1) {
@@ -1270,7 +1270,7 @@ class GraphicalFunctions {
 	 *
 	 * @param string $text
 	 * @param array $conf
-	 * @param integer
+	 * @param int
 	 */
 	protected function getRenderedTextWidth($text, $conf) {
 		$bounds = $this->ImageTTFBBoxWrapper($conf['fontSize'], $conf['angle'], $conf['fontFile'], $this->recodeString($text), $conf['splitRendering.']);
@@ -1343,8 +1343,8 @@ class GraphicalFunctions {
 	 *
 	 * access private
 	 *
-	 * @param integer $distance Distance
-	 * @param integer $iterations Iterations.
+	 * @param int $distance Distance
+	 * @param int $iterations Iterations.
 	 * @return array
 	 * @see makeOutline()
 	 */
@@ -1796,7 +1796,7 @@ class GraphicalFunctions {
 	/**
 	 * Apply auto-levels to input image pointer
 	 *
-	 * @param integer $im GDlib Image Pointer
+	 * @param int $im GDlib Image Pointer
 	 * @return void
 	 */
 	public function autolevels(&$im) {
@@ -1824,9 +1824,9 @@ class GraphicalFunctions {
 	/**
 	 * Apply output levels to input image pointer (decreasing contrast)
 	 *
-	 * @param integer $im GDlib Image Pointer
-	 * @param integer $low The "low" value (close to 0)
-	 * @param integer $high The "high" value (close to 255)
+	 * @param int $im GDlib Image Pointer
+	 * @param int $low The "low" value (close to 0)
+	 * @param int $high The "high" value (close to 255)
 	 * @param bool $swap If swap, then low and high are swapped. (Useful for negated masks...)
 	 * @return void
 	 */
@@ -1854,9 +1854,9 @@ class GraphicalFunctions {
 	/**
 	 * Apply input levels to input image pointer (increasing contrast)
 	 *
-	 * @param integer $im GDlib Image Pointer
-	 * @param integer $low The "low" value (close to 0)
-	 * @param integer $high The "high" value (close to 255)
+	 * @param int $im GDlib Image Pointer
+	 * @param int $low The "low" value (close to 0)
+	 * @param int $high The "high" value (close to 255)
 	 * @param bool $swap @deprecated since 6.2, unused and obsolete parameter, was used for older image magick versions
 	 * @return void
 	 */
@@ -1880,7 +1880,7 @@ class GraphicalFunctions {
 	 * Reduce colors in image using IM and create a palette based image if possible (<=256 colors)
 	 *
 	 * @param string $file Image file to reduce
-	 * @param integer $cols Number of colors to reduce the image to.
+	 * @param int $cols Number of colors to reduce the image to.
 	 * @return string Reduced file
 	 */
 	public function IMreduceColors($file, $cols) {
@@ -1926,7 +1926,7 @@ class GraphicalFunctions {
 	 * Returns the IM command for sharpening with ImageMagick 5 (when $this->V5_EFFECTS is set).
 	 * Uses $this->im5fx_sharpenSteps for translation of the factor to an actual command.
 	 *
-	 * @param integer $factor The sharpening factor, 0-100 (effectively in 10 steps)
+	 * @param int $factor The sharpening factor, 0-100 (effectively in 10 steps)
 	 * @return string The sharpening command, eg. " -sharpen 3x4
 	 * @see makeText(), IMparams(), v5_blur()
 	 */
@@ -1944,7 +1944,7 @@ class GraphicalFunctions {
 	 * Returns the IM command for blurring with ImageMagick 5 (when $this->V5_EFFECTS is set).
 	 * Uses $this->im5fx_blurSteps for translation of the factor to an actual command.
 	 *
-	 * @param integer $factor The blurring factor, 0-100 (effectively in 10 steps)
+	 * @param int $factor The blurring factor, 0-100 (effectively in 10 steps)
 	 * @return string The blurring command, eg. " -blur 3x4
 	 * @see makeText(), IMparams(), v5_sharpen()
 	 */
@@ -2324,8 +2324,8 @@ class GraphicalFunctions {
 	 * Get numbers for scaling the image based on input
 	 *
 	 * @param array $info Current image information: Width, Height etc.
-	 * @param integer $w "required" width
-	 * @param integer $h "required" height
+	 * @param int $w "required" width
+	 * @param int $h "required" height
 	 * @param array $options Options: Keys are like "maxW", "maxH", "minW", "minH
 	 * @return array
 	 * @access private
@@ -2538,7 +2538,7 @@ class GraphicalFunctions {
 	 * @param string $input The relative (to PATH_site) image filepath, input file (read from)
 	 * @param string $output The relative (to PATH_site) image filepath, output filename (written to)
 	 * @param string $params ImageMagick parameters
-	 * @param integer $frame Optional, refers to which frame-number to select in the image. '' or 0
+	 * @param int $frame Optional, refers to which frame-number to select in the image. '' or 0
 	 * @return string The result of a call to PHP function "exec()
 	 */
 	public function imageMagickExec($input, $output, $params, $frame = 0) {
@@ -2673,8 +2673,8 @@ class GraphicalFunctions {
 	 * For example: If the number of pixels exceeds $this->pixelLimitGif (normally 10000) then it will be a "jpg" string in return.
 	 *
 	 * @param string $type The file extension, lowercase.
-	 * @param integer $w The width of the output image.
-	 * @param integer $h The height of the output image.
+	 * @param int $w The width of the output image.
+	 * @param int $h The height of the output image.
 	 * @return string The filename, either "jpg" or "gif"/"png" (whatever $this->gifExtension is set to.)
 	 */
 	public function gif_or_jpg($type, $w, $h) {
@@ -2760,7 +2760,7 @@ class GraphicalFunctions {
 	 *
 	 * @param pointer $destImg The GDlib image resource pointer
 	 * @param string $theImage The filename to write to
-	 * @param integer $quality The image quality (for JPEGs)
+	 * @param int $quality The image quality (for JPEGs)
 	 * @return boolean The output of either imageGif, imagePng or imageJpeg based on the filename to write
 	 * @see maskImageOntoImage(), scale(), output()
 	 */
diff --git a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
index dd87c8f081fcee992bd118643502b8e3357ddb5e..67701195f36c7454ec320a7a654dc1d4ac1d451f 100644
--- a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
+++ b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
@@ -112,7 +112,7 @@ class DatabaseIntegrityCheck {
 	 * Generates a list of Page-uid's that corresponds to the tables in the tree.
 	 * This list should ideally include all records in the pages-table.
 	 *
-	 * @param integer $theID a pid (page-record id) from which to start making the tree
+	 * @param int $theID a pid (page-record id) from which to start making the tree
 	 * @param string $depthData HTML-code (image-tags) used when this function calls itself recursively.
 	 * @param bool $versions Internal variable, don't set from outside!
 	 * @return void
@@ -180,7 +180,7 @@ class DatabaseIntegrityCheck {
 	}
 
 	/**
-	 * @param integer $theID a pid (page-record id) from which to start making the tree
+	 * @param int $theID a pid (page-record id) from which to start making the tree
 	 * @param string $depthData HTML-code used when this function calls itself recursively.
 	 * @param string $table Table to get the records from
 	 * @param bool $versions Internal variable, don't set from outside!
@@ -278,7 +278,7 @@ class DatabaseIntegrityCheck {
 	 * If there is a disabled column for the record that will be set as well.
 	 *
 	 * @param string $table Database tablename
-	 * @param integer $uid The uid of the record which will have the PID value set to 0 (zero)
+	 * @param int $uid The uid of the record which will have the PID value set to 0 (zero)
 	 * @return boolean TRUE if done.
 	 */
 	public function fixLostRecord($table, $uid) {
@@ -586,7 +586,7 @@ class DatabaseIntegrityCheck {
 	 * Finding all references to record based on table/uid
 	 *
 	 * @param string $searchTable Table name
-	 * @param integer $id Uid of database record
+	 * @param int $id Uid of database record
 	 * @return array Array with other arrays containing information about where references was found
 	 */
 	public function whereIsRecordReferenced($searchTable, $id) {
diff --git a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
index ee0a24655e66240bb8a43fdb3c1e3d913f85195f..ba825bebd7ccbbbd7c8f73762116975e883e1138 100644
--- a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
+++ b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
@@ -67,7 +67,7 @@ class LocalizationFactory implements \TYPO3\CMS\Core\SingletonInterface {
 	 * @param string $fileReference Input is a file-reference (see \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName). That file is expected to be a supported locallang file format
 	 * @param string $languageKey Language key
 	 * @param string $charset Character set (option); if not set, determined by the language key
-	 * @param integer $errorMode Error mode (when file could not be found): 0 - syslog entry, 1 - do nothing, 2 - throw an exception$
+	 * @param int $errorMode Error mode (when file could not be found): 0 - syslog entry, 1 - do nothing, 2 - throw an exception$
 	 * @param bool $isLocalizationOverride TRUE if $fileReference is a localization override
 	 * @return array|boolean
 	 */
@@ -119,7 +119,7 @@ class LocalizationFactory implements \TYPO3\CMS\Core\SingletonInterface {
 	 * @param string $fileReference
 	 * @param string $languageKey
 	 * @param string $charset
-	 * @param integer $errorMode
+	 * @param int $errorMode
 	 * @param array $LOCAL_LANG
 	 * @return void
 	 */
diff --git a/typo3/sysext/core/Classes/Locking/Locker.php b/typo3/sysext/core/Classes/Locking/Locker.php
index 1b573dcfe302fb77ade20c0469e1e9d9e7cb90cf..fb47b3da17b9e8ef5b375e28f1865e54fdb893e2 100644
--- a/typo3/sysext/core/Classes/Locking/Locker.php
+++ b/typo3/sysext/core/Classes/Locking/Locker.php
@@ -459,7 +459,7 @@ class Locker {
 	 * Example: 25-02-08 17:58 - cms: Locking [simple::0aeafd2a67a6bb8b9543fb9ea25ecbe2]: Acquired
 	 *
 	 * @param string $message The message to be logged
-	 * @param integer $severity Severity - 0 is info (default), 1 is notice, 2 is warning, 3 is error, 4 is fatal error
+	 * @param int $severity Severity - 0 is info (default), 1 is notice, 2 is warning, 3 is error, 4 is fatal error
 	 * @return void
 	 */
 	public function sysLog($message, $severity = 0) {
diff --git a/typo3/sysext/core/Classes/Log/LogLevel.php b/typo3/sysext/core/Classes/Log/LogLevel.php
index 52736299a2f44f3e29a92072bce831a028690cef..64878eee8edc1af76180e696d5aecda19c7683a0 100644
--- a/typo3/sysext/core/Classes/Log/LogLevel.php
+++ b/typo3/sysext/core/Classes/Log/LogLevel.php
@@ -105,7 +105,7 @@ class LogLevel {
 	/**
 	 * Resolves the name of a log level.
 	 *
-	 * @param integer $level Log level.
+	 * @param int $level Log level.
 	 * @return string Log level name.
 	 */
 	static public function getName($level) {
@@ -117,7 +117,7 @@ class LogLevel {
 	 * Checks a level for validity,
 	 * whether it is an integer and in the range of 0-7.
 	 *
-	 * @param integer $level log level to validate
+	 * @param int $level log level to validate
 	 * @return boolean TRUE if the given log level is valid, FALSE otherwise
 	 */
 	static public function isValidLevel($level) {
@@ -127,7 +127,7 @@ class LogLevel {
 	/**
 	 * Validates a log level.
 	 *
-	 * @param integer $level log level to validate
+	 * @param int $level log level to validate
 	 * @return void
 	 * @throws \Psr\Log\InvalidArgumentException if the given log level is invalid
 	 */
diff --git a/typo3/sysext/core/Classes/Log/LogRecord.php b/typo3/sysext/core/Classes/Log/LogRecord.php
index 4018f885f028b439ec50d5659f585de8cb9df947..9b6f296091a26e0c93697be25272d8a0c2c9f615 100644
--- a/typo3/sysext/core/Classes/Log/LogRecord.php
+++ b/typo3/sysext/core/Classes/Log/LogRecord.php
@@ -92,7 +92,7 @@ class LogRecord implements \ArrayAccess {
 	 * Constructor.
 	 *
 	 * @param string $component Affected component
-	 * @param integer $level Severity level (see \TYPO3\CMS\Core\Log\Level)
+	 * @param int $level Severity level (see \TYPO3\CMS\Core\Log\Level)
 	 * @param string $message Log message
 	 * @param array $data Additional data
 	 */
@@ -148,7 +148,7 @@ class LogRecord implements \ArrayAccess {
 	/**
 	 * Sets the severity level
 	 *
-	 * @param integer $level Severity level
+	 * @param int $level Severity level
 	 * @return \TYPO3\CMS\Core\Log\LogRecord
 	 * @throws \RangeException if the given log level is invalid
 	 * @see \TYPO3\CMS\Core\Log\Level
diff --git a/typo3/sysext/core/Classes/Log/Logger.php b/typo3/sysext/core/Classes/Log/Logger.php
index 74774dca8bfe4c9c882f26d60acf0fd5b572203b..6f76d41763a79030813ca40d9e9961259bbe4561 100644
--- a/typo3/sysext/core/Classes/Log/Logger.php
+++ b/typo3/sysext/core/Classes/Log/Logger.php
@@ -67,7 +67,7 @@ class Logger implements \Psr\Log\LoggerInterface {
 	/**
 	 * Sets the minimum log level for which log records are written.
 	 *
-	 * @param integer $level Minimum log level
+	 * @param int $level Minimum log level
 	 * @return \TYPO3\CMS\Core\Log\Logger $this
 	 */
 	protected function setMinimumLogLevel($level) {
@@ -97,7 +97,7 @@ class Logger implements \Psr\Log\LoggerInterface {
 	/**
 	 * Adds a writer to this logger
 	 *
-	 * @param integer $minimumLevel
+	 * @param int $minimumLevel
 	 * @param \TYPO3\CMS\Core\Log\Writer\WriterInterface $writer Writer object
 	 * @return \TYPO3\CMS\Core\Log\Logger $this
 	 */
@@ -129,7 +129,7 @@ class Logger implements \Psr\Log\LoggerInterface {
 	/**
 	 * Adds a processor to the logger.
 	 *
-	 * @param integer $minimumLevel
+	 * @param int $minimumLevel
 	 * @param \TYPO3\CMS\Core\Log\Processor\ProcessorInterface $processor The processor to add.
 	 * @return void
 	 */
@@ -160,7 +160,7 @@ class Logger implements \Psr\Log\LoggerInterface {
 	/**
 	 * Adds a log record.
 	 *
-	 * @param integer|string $level Log level. Value according to \TYPO3\CMS\Core\Log\LogLevel. Alternatively accepts a string.
+	 * @param int|string $level Log level. Value according to \TYPO3\CMS\Core\Log\LogLevel. Alternatively accepts a string.
 	 * @param string $message Log message.
 	 * @param array $data Additional data to log
 	 * @return mixed
diff --git a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
index 491c5c9729289c6b1059c6eba82c65b46e0641ec..56658d7abbac129d1911de1e3cbd6483608cdce9 100644
--- a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
@@ -84,7 +84,7 @@ class SyslogWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
 	/**
 	 * Sets the facility to use when logging to syslog.
 	 *
-	 * @param integer $facility Facility to use when logging.
+	 * @param int $facility Facility to use when logging.
 	 * @return void
 	 */
 	public function setFacility($facility) {
diff --git a/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php b/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
index a906f32effb82fc1d548d4da29f0467c02280282..99ef89d8e4ebaa2514349a74968d1d249ece8cb1 100644
--- a/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
+++ b/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
@@ -371,7 +371,7 @@ class Rfc822AddressesParser {
 	 *
 	 * @access private
 	 * @param string $string The string to check.
-	 * @param integer &$num	The number of occurrences.
+	 * @param int &$num	The number of occurrences.
 	 * @param string $char   The character to count.
 	 * @return integer The number of occurrences of $char in $string, adjusted for backslashes.
 	 */
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
index 34ccd8f5d31e16045f3134b920108c0be36ed256..34065cc7ecd1014acd289ea211eb1a630a1acaf6 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
@@ -97,7 +97,7 @@ abstract class AbstractMessage {
 	/**
 	 * Sets the message' severity
 	 *
-	 * @param integer $severity The severity, must be one of AbstractMessage::INFO or similar constants
+	 * @param int $severity The severity, must be one of AbstractMessage::INFO or similar constants
 	 * @return void
 	 */
 	public function setSeverity($severity = self::OK) {
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
index be76064734acf73728860c33524749de789f1371..a136663ae2509d550f8fb7b64a60ea28dbb72fc7 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractStandaloneMessage.php
@@ -46,7 +46,7 @@ abstract class AbstractStandaloneMessage extends \TYPO3\CMS\Core\Messaging\Abstr
 	 *
 	 * @param string $message Message
 	 * @param string $title Title
-	 * @param integer $severity Severity, see class constants of AbstractMessage
+	 * @param int $severity Severity, see class constants of AbstractMessage
 	 */
 	public function __construct($message = '', $title = '', $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR) {
 		if (!empty($message)) {
diff --git a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
index 553cb119b9a0a663c4dea748e5c2ca42ac706e33..ecf15633afc92869faeb715750179ec6934e9715 100644
--- a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
@@ -26,7 +26,7 @@ class ErrorpageMessage extends \TYPO3\CMS\Core\Messaging\AbstractStandaloneMessa
 	 *
 	 * @param string $message The error message
 	 * @param string $title Title of the message, can be empty
-	 * @param integer $severity Optional severity, must be either of AbstractMessage::INFO or related constants
+	 * @param int $severity Optional severity, must be either of AbstractMessage::INFO or related constants
 	 */
 	public function __construct($message = '', $title = '', $severity = \TYPO3\CMS\Core\Messaging\AbstractMessage::ERROR) {
 		$this->setHtmlTemplate(TYPO3_mainDir . 'sysext/t3skin/templates/errorpage-message.html');
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessage.php b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
index 403eea00fcd2175375684cb5a21f325f8a537215..1b0437e3197b2110da7be8df92da5b60d853ec59 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
@@ -43,7 +43,7 @@ class FlashMessage extends \TYPO3\CMS\Core\Messaging\AbstractMessage {
 	 *
 	 * @param string $message The message.
 	 * @param string $title Optional message title.
-	 * @param integer $severity Optional severity, must be either of one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
+	 * @param int $severity Optional severity, must be either of one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
 	 * @param bool $storeInSession Optional, defines whether the message should be stored in the session or only for one request (default)
 	 * @return void
 	 */
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index 92b281f67481afc7e7e7a2e1492b81c7fe04e102..d2e55656ef57e1b51e75488486412f163e383426 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -1840,7 +1840,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	 * @param string $fileRef Input is a file-reference (see GeneralUtility::getFileAbsFileName). That file is expected to be a 'locallang.xml' file containing a valid XML TYPO3 language structure.
 	 * @param string $selectionPrefix Prefix to select the correct labels (default: '')
 	 * @param string $stripFromSelectionName Sub-prefix to be removed from label names in the result (default: '')
-	 * @param integer $errorMode Error mode (when file could not be found): 0 - syslog entry, 1 - do nothing, 2 - throw an exception
+	 * @param int $errorMode Error mode (when file could not be found): 0 - syslog entry, 1 - do nothing, 2 - throw an exception
 	 * @return void
 	 */
 	public function addInlineLanguageLabelFile($fileRef, $selectionPrefix = '', $stripFromSelectionName = '', $errorMode = 0) {
@@ -1927,7 +1927,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Render the section (Header or Footer)
 	 *
-	 * @param integer $part Section which should be rendered: self::PART_COMPLETE, self::PART_HEADER or self::PART_FOOTER
+	 * @param int $part Section which should be rendered: self::PART_COMPLETE, self::PART_HEADER or self::PART_FOOTER
 	 * @return string Content of rendered section
 	 */
 	public function render($part = self::PART_COMPLETE) {
@@ -2126,7 +2126,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Reads the template file and returns the requested part as string
 	 *
-	 * @param integer $part
+	 * @param int $part
 	 * @return string
 	 */
 	protected function getTemplateForPart($part) {
@@ -2554,7 +2554,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	 * @param string $fileRef
 	 * @param string $selectionPrefix
 	 * @param string $stripFromSelectionName
-	 * @param integer $errorMode
+	 * @param int $errorMode
 	 * @return void
 	 * @throws \RuntimeException
 	 */
@@ -2590,7 +2590,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	 * Reads a locallang file.
 	 *
 	 * @param string $fileRef Reference to a relative filename to include.
-	 * @param integer $errorMode Error mode (when file could not be found): 0 - syslog entry, 1 - do nothing, 2 - throw an exception
+	 * @param int $errorMode Error mode (when file could not be found): 0 - syslog entry, 1 - do nothing, 2 - throw an exception
 	 * @return array Returns the $LOCAL_LANG array found in the file. If no array found, returns empty array.
 	 */
 	protected function readLLfile($fileRef, $errorMode = 0) {
diff --git a/typo3/sysext/core/Classes/Resource/AbstractRepository.php b/typo3/sysext/core/Classes/Resource/AbstractRepository.php
index a7cb03bcfac8f1a308e1085be43005d3dfa85d90..05dbca041dbf3c3cbae5f67336a182c8d7e2c14a 100644
--- a/typo3/sysext/core/Classes/Resource/AbstractRepository.php
+++ b/typo3/sysext/core/Classes/Resource/AbstractRepository.php
@@ -166,7 +166,7 @@ abstract class AbstractRepository implements \TYPO3\CMS\Extbase\Persistence\Repo
 	/**
 	 * Finds an object matching the given identifier.
 	 *
-	 * @param integer $uid The identifier of the object to find
+	 * @param int $uid The identifier of the object to find
 	 *
 	 * @throws \RuntimeException
 	 * @throws \InvalidArgumentException
diff --git a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
index c7762f14e56ba8705105a0ce7df232fc6927df03..e0d06c2bc8be491c7f0b87bfd5a45d07950d77a2 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
@@ -86,7 +86,7 @@ abstract class AbstractDriver implements DriverInterface {
 	/**
 	 * Sets the storage uid the driver belongs to
 	 *
-	 * @param integer $storageUid
+	 * @param int $storageUid
 	 * @return void
 	 */
 	public function setStorageUid($storageUid) {
@@ -106,7 +106,7 @@ abstract class AbstractDriver implements DriverInterface {
 	/**
 	 * Returns TRUE if this driver has the given capability.
 	 *
-	 * @param integer $capability A capability, as defined in a CAPABILITY_* constant
+	 * @param int $capability A capability, as defined in a CAPABILITY_* constant
 	 * @return boolean
 	 */
 	public function hasCapability($capability) {
diff --git a/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php b/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
index e9ade97fd47883fdf0a8f294980da20d46ff23f3..7d861862c2366d622a3ca14dc43d55902bc57a22 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
@@ -30,7 +30,7 @@ interface DriverInterface {
 	/**
 	 * Sets the storage uid the driver belongs to
 	 *
-	 * @param integer $storageUid
+	 * @param int $storageUid
 	 * @return void
 	 */
 	public function setStorageUid($storageUid);
@@ -56,7 +56,7 @@ interface DriverInterface {
 	 * configuration into the actual capabilities of the driver
 	 * and returns the result.
 	 *
-	 * @param integer $capabilities
+	 * @param int $capabilities
 	 *
 	 * @return integer
 	 */
@@ -65,7 +65,7 @@ interface DriverInterface {
 	/**
 	 * Returns TRUE if this driver has the given capability.
 	 *
-	 * @param integer $capability A capability, as defined in a CAPABILITY_* constant
+	 * @param int $capability A capability, as defined in a CAPABILITY_* constant
 	 * @return boolean
 	 */
 	public function hasCapability($capability);
@@ -406,8 +406,8 @@ interface DriverInterface {
 	 * Returns a list of files inside the specified path
 	 *
 	 * @param string $folderIdentifier
-	 * @param integer $start
-	 * @param integer $numberOfItems
+	 * @param int $start
+	 * @param int $numberOfItems
 	 * @param bool $recursive
 	 * @param array $filenameFilterCallbacks callbacks for filtering the items
 	 *
@@ -419,8 +419,8 @@ interface DriverInterface {
 	 * Returns a list of folders inside the specified path
 	 *
 	 * @param string $folderIdentifier
-	 * @param integer $start
-	 * @param integer $numberOfItems
+	 * @param int $start
+	 * @param int $numberOfItems
 	 * @param bool $recursive
 	 * @param array $folderNameFilterCallbacks callbacks for filtering the items
 	 *
diff --git a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
index d44d68a0e0f598ad946af64ea76163d0379ab5e5..edba6b812853cbc4cb3090367e22b686786e2141 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
@@ -80,7 +80,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
 	 * configuration into the actual capabilities of the driver
 	 * and returns the result.
 	 *
-	 * @param integer $capabilities
+	 * @param int $capabilities
 	 *
 	 * @return integer
 	 */
@@ -330,8 +330,8 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
 	 * Generic wrapper for extracting a list of items from a path.
 	 *
 	 * @param string $folderIdentifier
-	 * @param integer $start The position to start the listing; if not set, start from the beginning
-	 * @param integer $numberOfItems The number of items to list; if set to zero, all items are returned
+	 * @param int $start The position to start the listing; if not set, start from the beginning
+	 * @param int $numberOfItems The number of items to list; if set to zero, all items are returned
 	 * @param array $filterMethods The filter methods used to filter the directory items
 	 * @param bool $includeFiles
 	 * @param bool $includeDirs
@@ -430,8 +430,8 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
 	 * Returns a list of files inside the specified path
 	 *
 	 * @param string $folderIdentifier
-	 * @param integer $start
-	 * @param integer $numberOfItems
+	 * @param int $start
+	 * @param int $numberOfItems
 	 * @param bool $recursive
 	 * @param array $filenameFilterCallbacks The method callbacks to use for filtering the items
 	 *
@@ -445,8 +445,8 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
 	 * Returns a list of folders inside the specified path
 	 *
 	 * @param string $folderIdentifier
-	 * @param integer $start
-	 * @param integer $numberOfItems
+	 * @param int $start
+	 * @param int $numberOfItems
 	 * @param bool $recursive
 	 * @param array $folderNameFilterCallbacks The method callbacks to use for filtering the items
 	 *
diff --git a/typo3/sysext/core/Classes/Resource/FileCollectionRepository.php b/typo3/sysext/core/Classes/Resource/FileCollectionRepository.php
index 968c4cd235b20b99cba3b531c55007b8d127096e..f7934260a0231e37f05fda6d7dcebe2e85eadb83 100644
--- a/typo3/sysext/core/Classes/Resource/FileCollectionRepository.php
+++ b/typo3/sysext/core/Classes/Resource/FileCollectionRepository.php
@@ -37,7 +37,7 @@ class FileCollectionRepository extends \TYPO3\CMS\Core\Collection\RecordCollecti
 	/**
 	 * Finds a record collection by uid.
 	 *
-	 * @param integer $uid The uid to be looked up
+	 * @param int $uid The uid to be looked up
 	 * @return NULL|Collection\AbstractFileCollection
 	 * @throws ResourceDoesNotExistException
 	 */
diff --git a/typo3/sysext/core/Classes/Resource/FileRepository.php b/typo3/sysext/core/Classes/Resource/FileRepository.php
index 780ec8a319e6b84c5bcb1965b5bc850a5e450c92..6946e84a58b39ff8984c897519e4226027575c33 100644
--- a/typo3/sysext/core/Classes/Resource/FileRepository.php
+++ b/typo3/sysext/core/Classes/Resource/FileRepository.php
@@ -157,9 +157,9 @@ class FileRepository extends AbstractRepository {
 	/**
 	 * Find FileReference objects by relation to other records
 	 *
-	 * @param integer $tableName Table name of the related record
-	 * @param integer $fieldName Field name of the related record
-	 * @param integer $uid The UID of the related record (needs to be the localized uid, as translated IRRE elements relate to them)
+	 * @param int $tableName Table name of the related record
+	 * @param int $fieldName Field name of the related record
+	 * @param int $uid The UID of the related record (needs to be the localized uid, as translated IRRE elements relate to them)
 	 * @return array An array of objects, empty if no objects found
 	 * @throws \InvalidArgumentException
 	 * @api
@@ -216,7 +216,7 @@ class FileRepository extends AbstractRepository {
 	/**
 	 * Find FileReference objects by uid
 	 *
-	 * @param integer $uid The UID of the sys_file_reference record
+	 * @param int $uid The UID of the sys_file_reference record
 	 * @return FileReference|boolean
 	 * @throws \InvalidArgumentException
 	 * @api
diff --git a/typo3/sysext/core/Classes/Resource/Folder.php b/typo3/sysext/core/Classes/Resource/Folder.php
index e81b6303d7d279360b76fa57d16e919d7e4c3bf9..6b091424328b5b6bc7b5271a66300996b841d61b 100644
--- a/typo3/sysext/core/Classes/Resource/Folder.php
+++ b/typo3/sysext/core/Classes/Resource/Folder.php
@@ -165,9 +165,9 @@ class Folder implements FolderInterface {
 	 *
 	 * For performance reasons the returned items can also be limited to a given range
 	 *
-	 * @param integer $start The item to start at
-	 * @param integer $numberOfItems The number of items to return
-	 * @param integer $filterMode The filter mode to use for the file list.
+	 * @param int $start The item to start at
+	 * @param int $numberOfItems The number of items to return
+	 * @param int $filterMode The filter mode to use for the file list.
 	 * @param bool $recursive
 	 * @return \TYPO3\CMS\Core\Resource\File[]
 	 */
@@ -221,9 +221,9 @@ class Folder implements FolderInterface {
 	/**
 	 * Returns a list of subfolders
 	 *
-	 * @param integer $start The item to start at
-	 * @param integer $numberOfItems The number of items to return
-	 * @param integer $filterMode The filter mode to use for the file list.
+	 * @param int $start The item to start at
+	 * @param int $numberOfItems The number of items to return
+	 * @param int $filterMode The filter mode to use for the file list.
 	 * @return Folder[]
 	 */
 	public function getSubfolders($start = 0, $numberOfItems = 0, $filterMode = self::FILTER_MODE_USE_OWN_AND_STORAGE_FILTERS) {
@@ -374,7 +374,7 @@ class Folder implements FolderInterface {
 	/**
 	 * Prepares the filters in this folder's storage according to a set filter mode.
 	 *
-	 * @param integer $filterMode The filter mode to use; one of the FILTER_MODE_* constants
+	 * @param int $filterMode The filter mode to use; one of the FILTER_MODE_* constants
 	 * @return array The backed up filters as an array (NULL if filters were not backed up) and whether to use filters or not (boolean)
 	 */
 	protected function prepareFiltersInStorage($filterMode) {
diff --git a/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php b/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
index 84a7933670fce5af7261fad4f2f2726f5603158b..c1e59bc791e58ca98fe1429142a7090f3f107bd2 100644
--- a/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
+++ b/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
@@ -70,9 +70,9 @@ class InaccessibleFolder extends Folder {
 	 *
 	 * For performance reasons the returned items can also be limited to a given range
 	 *
-	 * @param integer $start The item to start at
-	 * @param integer $numberOfItems The number of items to return
-	 * @param integer $filterMode The filter mode to use for the file list.
+	 * @param int $start The item to start at
+	 * @param int $numberOfItems The number of items to return
+	 * @param int $filterMode The filter mode to use for the file list.
 	 * @param bool $recursive
 	 * @return \TYPO3\CMS\Core\Resource\File[]
 	 */
@@ -108,9 +108,9 @@ class InaccessibleFolder extends Folder {
 	/**
 	 * Returns a list of subfolders
 	 *
-	 * @param integer $start The item to start at
-	 * @param integer $numberOfItems The number of items to return
-	 * @param integer $filterMode The filter mode to use for the file list.
+	 * @param int $start The item to start at
+	 * @param int $numberOfItems The number of items to return
+	 * @param int $filterMode The filter mode to use for the file list.
 	 * @return Folder[]
 	 */
 	public function getSubfolders($start = 0, $numberOfItems = 0, $filterMode = self::FILTER_MODE_USE_OWN_AND_STORAGE_FILTERS) {
diff --git a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
index 4d90b3cf2c0e01cd7d9beabac237d1fc84a3e3fa..3efd1b91698c447c3399e4de05aac046f46f297f 100644
--- a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
+++ b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
@@ -115,7 +115,7 @@ class FileIndexRepository implements SingletonInterface {
 	/**
 	 * Retrieves Index record for a given $storageUid and $identifier
 	 *
-	 * @param integer $storageUid
+	 * @param int $storageUid
 	 * @param string $identifierHash
 	 * @return array|boolean
 	 *
@@ -258,7 +258,7 @@ class FileIndexRepository implements SingletonInterface {
 	 * Finds the files needed for second indexer step
 	 *
 	 * @param \TYPO3\CMS\Core\Resource\ResourceStorage $storage
-	 * @param integer $limit
+	 * @param int $limit
 	 * @return array
 	 */
 	public function findInStorageWithIndexOutstanding(\TYPO3\CMS\Core\Resource\ResourceStorage $storage, $limit = -1) {
@@ -293,7 +293,7 @@ class FileIndexRepository implements SingletonInterface {
 	/**
 	 * Updates the timestamp when the file indexer extracted metadata
 	 *
-	 * @param integer $fileUid
+	 * @param int $fileUid
 	 * @return void
 	 */
 	public function updateIndexingTime($fileUid) {
@@ -303,7 +303,7 @@ class FileIndexRepository implements SingletonInterface {
 	/**
 	 * Marks given file as missing in sys_file
 	 *
-	 * @param integer $fileUid
+	 * @param int $fileUid
 	 * @return void
 	 */
 	public function markFileAsMissing($fileUid) {
@@ -333,7 +333,7 @@ class FileIndexRepository implements SingletonInterface {
 	/**
 	 * Remove a sys_file record from the database
 	 *
-	 * @param integer $fileUid
+	 * @param int $fileUid
 	 * @return void
 	 */
 	public function remove($fileUid) {
@@ -384,7 +384,7 @@ class FileIndexRepository implements SingletonInterface {
 	/**
 	 * Signal that is called after an IndexRecord is deleted
 	 *
-	 * @param integer $fileUid
+	 * @param int $fileUid
 	 * @signal
 	 */
 	protected function emitRecordDeletedSignal($fileUid) {
diff --git a/typo3/sysext/core/Classes/Resource/Index/Indexer.php b/typo3/sysext/core/Classes/Resource/Index/Indexer.php
index 2898c6649f2bb31ed82382655584fa1efd1858c3..28c7248fb7a4f2af7b13fa20877b59d53b4649de 100644
--- a/typo3/sysext/core/Classes/Resource/Index/Indexer.php
+++ b/typo3/sysext/core/Classes/Resource/Index/Indexer.php
@@ -88,7 +88,7 @@ class Indexer {
 	}
 
 	/**
-	 * @param integer $maximumFileCount
+	 * @param int $maximumFileCount
 	 * @return void
 	 */
 	public function runMetaDataExtraction($maximumFileCount = -1) {
diff --git a/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php b/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
index 02652b9ac2add162ff68208e74ec76230e5da079..ee47696c41f740e6050d2064c601d92828598ccd 100644
--- a/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
+++ b/typo3/sysext/core/Classes/Resource/Index/MetaDataRepository.php
@@ -142,7 +142,7 @@ class MetaDataRepository implements SingletonInterface {
 	/**
 	 * Remove all metadata records for a certain file from the database
 	 *
-	 * @param integer $fileUid
+	 * @param int $fileUid
 	 * @return void
 	 */
 	public function removeByFileUid($fileUid) {
@@ -203,7 +203,7 @@ class MetaDataRepository implements SingletonInterface {
 	/**
 	 * Signal that is called after an IndexRecord is deleted
 	 *
-	 * @param integer $fileUid
+	 * @param int $fileUid
 	 * @signal
 	 */
 	protected function emitRecordDeletedSignal($fileUid) {
diff --git a/typo3/sysext/core/Classes/Resource/ResourceFactory.php b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
index 9bd8acd2f0d05ee2bf796599bb3922940acaff73..1d3f43a66f18694c51ab1b0f70fc108bc17dbfe1 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceFactory.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
@@ -118,7 +118,7 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
 	 * Creates an instance of the storage from given UID. The $recordData can
 	 * be supplied to increase performance.
 	 *
-	 * @param integer $uid The uid of the storage to instantiate.
+	 * @param int $uid The uid of the storage to instantiate.
 	 * @param array $recordData The record row from database.
 	 * @param string $fileIdentifier Identifier for a file. Used for auto-detection of a storage, but only if $uid === 0 (Local default storage) is used
 	 *
@@ -256,7 +256,7 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
 	/**
 	 * Creates an instance of the collection from given UID. The $recordData can be supplied to increase performance.
 	 *
-	 * @param integer $uid The uid of the collection to instantiate.
+	 * @param int $uid The uid of the collection to instantiate.
 	 * @param array $recordData The record row from database.
 	 *
 	 * @throws \InvalidArgumentException
@@ -337,7 +337,7 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
 	 * Creates an instance of the file given UID. The $fileData can be supplied
 	 * to increase performance.
 	 *
-	 * @param integer $uid The uid of the file to instantiate.
+	 * @param int $uid The uid of the file to instantiate.
 	 * @param array $fileData The record row from database.
 	 *
 	 * @throws \InvalidArgumentException
@@ -558,7 +558,7 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
 	 * Creates an instance of a FileReference object. The $fileReferenceData can
 	 * be supplied to increase performance.
 	 *
-	 * @param integer $uid The uid of the file usage (sys_file_reference) to instantiate.
+	 * @param int $uid The uid of the file usage (sys_file_reference) to instantiate.
 	 * @param array $fileReferenceData The record row from database.
 	 * @param bool $raw Whether to get raw results without performing overlays
 	 *
diff --git a/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php b/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
index 57067245e38c9fee85bc5908b3f971b7fd7e6684..8dcfe63d8b2332186ceb364b0bdb820a8520ad6e 100644
--- a/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
@@ -102,7 +102,7 @@ class UserFileMountService {
 	 * a "flat" option list
 	 *
 	 * @param \TYPO3\CMS\Core\Resource\Folder $parentFolder
-	 * @param integer $level a limiter
+	 * @param int $level a limiter
 	 * @return \TYPO3\CMS\Core\Resource\Folder[]
 	 */
 	protected function getSubfoldersForOptionList(\TYPO3\CMS\Core\Resource\Folder $parentFolder, $level = 0) {
diff --git a/typo3/sysext/core/Classes/Resource/StorageRepository.php b/typo3/sysext/core/Classes/Resource/StorageRepository.php
index 1ace30aa7767b95785229a63602d474762da216b..7fd4c9f95cd51d293aafbc0d56a163e9ae382726 100644
--- a/typo3/sysext/core/Classes/Resource/StorageRepository.php
+++ b/typo3/sysext/core/Classes/Resource/StorageRepository.php
@@ -66,7 +66,7 @@ class StorageRepository extends AbstractRepository {
 	}
 
 	/**
-	 * @param integer $uid
+	 * @param int $uid
 	 *
 	 * @return null|ResourceStorage
 	 */
diff --git a/typo3/sysext/core/Classes/Service/AbstractService.php b/typo3/sysext/core/Classes/Service/AbstractService.php
index 52ae4d4e76c01a6597cd3716badeeb49770f7dce..c8a2817c46335b41dbff634aad01ad97c9044208 100644
--- a/typo3/sysext/core/Classes/Service/AbstractService.php
+++ b/typo3/sysext/core/Classes/Service/AbstractService.php
@@ -142,7 +142,7 @@ abstract class AbstractService {
 	 * Logs debug messages to \TYPO3\CMS\Core\Utility\GeneralUtility::devLog()
 	 *
 	 * @param string $msg Debug message
-	 * @param integer $severity Severity: 0 is info, 1 is notice, 2 is warning, 3 is fatal error, -1 is "OK" message
+	 * @param int $severity Severity: 0 is info, 1 is notice, 2 is warning, 3 is fatal error, -1 is "OK" message
 	 * @param array|boolean $dataVar dditional data you want to pass to the logger.
 	 * @return void
 	 */
@@ -155,7 +155,7 @@ abstract class AbstractService {
 	/**
 	 * Puts an error on the error stack. Calling without parameter adds a general error.
 	 *
-	 * @param integer $errNum Error number (see T3_ERR_SV_* constants)
+	 * @param int $errNum Error number (see T3_ERR_SV_* constants)
 	 * @param string $errMsg Error message
 	 * @return void
 	 */
@@ -299,7 +299,7 @@ abstract class AbstractService {
 	 * Read content from a file a file.
 	 *
 	 * @param string $absFile File name to read from.
-	 * @param integer $length Maximum length to read. If empty the whole file will be read.
+	 * @param int $length Maximum length to read. If empty the whole file will be read.
 	 * @return string|boolean $content or FALSE
 	 */
 	public function readFile($absFile, $length = 0) {
diff --git a/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php b/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
index a12f6a0ecf0b84d7010d4a6123fca097a3779e37..a9ababe9deb8b716fe846b692ae2ed3672fb2833 100644
--- a/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
+++ b/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
@@ -77,7 +77,7 @@ class NullTimeTracker {
 	 * does nothing
 	 *
 	 * @param string $content The message string
-	 * @param integer $num Message type: 0: information, 1: message, 2: warning, 3: error
+	 * @param int $num Message type: 0: information, 1: message, 2: warning, 3: error
 	 * @return void
 	 */
 	public function setTSlogMessage($content, $num = 0) {
diff --git a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
index 8a6637b11830f79a915e1392ea2f81654f2b1149..46e6e052779a22828c62c7c1a062cccbc5990cce 100644
--- a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
+++ b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
@@ -174,7 +174,7 @@ class TimeTracker {
 	 * Logs the TypoScript entry
 	 *
 	 * @param string $content The message string
-	 * @param integer $num Message type: 0: information, 1: message, 2: warning, 3: error
+	 * @param int $num Message type: 0: information, 1: message, 2: warning, 3: error
 	 * @return void
 	 * @see \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::CONTENT()
 	 */
@@ -478,7 +478,7 @@ class TimeTracker {
 	 * Helper function for internal data manipulation
 	 *
 	 * @param array $arr Array (passed by reference) and modified
-	 * @param integer $pointer Pointer value
+	 * @param int $pointer Pointer value
 	 * @param string $uniqueId Unique ID string
 	 * @return void
 	 * @access private
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
index c56b8a1c81fa88b0b3705f1271c5a44e32dd8afe..d1c12c97bccba242b859da5a0f9a451179a0361a 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
@@ -109,7 +109,7 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
 	/**
 	 * Sets the levelMaximum
 	 *
-	 * @param integer $levelMaximum
+	 * @param int $levelMaximum
 	 * @return void
 	 */
 	public function setLevelMaximum($levelMaximum) {
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
index 973f592c8c1a5fc9b6824128592a84e0e623cabb..caa8eb44b8b6fe48d43182b021965927f8fdb5dc 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
@@ -149,7 +149,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
 	/**
 	 * Sets the lookup mode
 	 *
-	 * @param integer $lookupMode
+	 * @param int $lookupMode
 	 * @return void
 	 */
 	public function setLookupMode($lookupMode) {
@@ -187,7 +187,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
 	/**
 	 * Sets the root uid
 	 *
-	 * @param integer $rootUid
+	 * @param int $rootUid
 	 * @return void
 	 */
 	public function setRootUid($rootUid) {
@@ -227,7 +227,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
 	 *
 	 * @param \TYPO3\CMS\Backend\Tree\TreeNode $basicNode
 	 * @param NULL|\TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode $parent
-	 * @param integer $level
+	 * @param int $level
 	 * @return \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode Node object
 	 */
 	protected function buildRepresentationForNode(\TYPO3\CMS\Backend\Tree\TreeNode $basicNode, \TYPO3\CMS\Core\Tree\TableConfiguration\DatabaseTreeNode $parent = NULL, $level = 0) {
@@ -292,7 +292,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
 	 * Gets node children
 	 *
 	 * @param \TYPO3\CMS\Backend\Tree\TreeNode $node
-	 * @param integer $level
+	 * @param int $level
 	 * @return NULL|\TYPO3\CMS\Backend\Tree\TreeNodeCollection
 	 */
 	protected function getChildrenOf(\TYPO3\CMS\Backend\Tree\TreeNode $node, $level) {
@@ -417,7 +417,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
 	 * Queries the table for an field which might contain a list.
 	 *
 	 * @param string $fieldName the name of the field to be queried
-	 * @param integer $queryId the uid to search for
+	 * @param int $queryId the uid to search for
 	 * @return integer[] all uids found
 	 */
 	protected function listFieldQuery($fieldName, $queryId) {
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index 335fe3d14d586d80e727945c15044a7b29f26a0b..11ef07a4dba7a4c564d0713e386315b6f4ee5031 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -587,7 +587,7 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
 	 * and turns it into a hierachical array to show dependencies (used by TemplateAnalyzer)
 	 *
 	 * @param array $depthDataArr (empty array on external call)
-	 * @param integer &$pointer Element number (1! to count()) of $this->hierarchyInfo that should be processed.
+	 * @param int &$pointer Element number (1! to count()) of $this->hierarchyInfo that should be processed.
 	 *
 	 * @return array Processed hierachyInfo.
 	 */
@@ -617,7 +617,7 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
 	 * @param bool $comments Enable including comments in output.
 	 * @param bool $crop Enable cropping of long lines.
 	 * @param bool $syntaxHL Enrich output with syntaxhighlighting.
-	 * @param integer $syntaxHLBlockmode
+	 * @param int $syntaxHLBlockmode
 	 *
 	 * @return string
 	 *
@@ -664,7 +664,7 @@ class ExtendedTemplateService extends \TYPO3\CMS\Core\TypoScript\TemplateService
 	/**
 	 * [Describe function...]
 	 *
-	 * @param integer $lineNumber Line Number
+	 * @param int $lineNumber Line Number
 	 * @param 	[type]		$str: ...
 	 * @return string
 	 */
diff --git a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
index 44a08c942ed6554b05e06bc4a2a3edf248d6ee84..37acce27edae0b17e7c437180788f879a82612c3 100644
--- a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
+++ b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
@@ -723,7 +723,7 @@ class TypoScriptParser {
 	 * If "TT" is a global object (as it is in the frontend when backend users are logged in) the message will be registered here as well.
 	 *
 	 * @param string $err The error message string
-	 * @param integer $num The error severity (in the scale of $GLOBALS['TT']->setTSlogMessage: Approx: 2=warning, 1=info, 0=nothing, 3=fatal.)
+	 * @param int $num The error severity (in the scale of $GLOBALS['TT']->setTSlogMessage: Approx: 2=warning, 1=info, 0=nothing, 3=fatal.)
 	 * @return void
 	 */
 	public function error($err, $num = 2) {
@@ -738,7 +738,7 @@ class TypoScriptParser {
 	 * Use: \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::checkIncludeLines()
 	 *
 	 * @param string $string Unparsed TypoScript
-	 * @param integer $cycle_counter Counter for detecting endless loops
+	 * @param int $cycle_counter Counter for detecting endless loops
 	 * @param bool $returnFiles When set an array containing the resulting typoscript and all included files will get returned
 	 * @param string $parentFilenameOrPath The parent file (with absolute path) or path for relative includes
 	 * @return string Complete TypoScript with includes added.
@@ -847,7 +847,7 @@ class TypoScriptParser {
 	 * Further include_typoscript tags in the contents are processed recursively
 	 *
 	 * @param string $filename Relative path to the typoscript file to be included
-	 * @param integer $cycle_counter Counter for detecting endless loops
+	 * @param int $cycle_counter Counter for detecting endless loops
 	 * @param bool $returnFiles When set, filenames of included files will be prepended to the array &$includedFiles
 	 * @param string &$newString The output string to which the content of the file will be prepended (referenced
 	 * @param array &$includedFiles Array to which the filenames of included files will be prepended (referenced)
@@ -895,7 +895,7 @@ class TypoScriptParser {
 	 * Further include_typoscript tags in the contents of the files are processed recursively.
 	 *
 	 * @param string $dirPath Relative path to the directory to be included
-	 * @param integer $cycle_counter Counter for detecting endless loops
+	 * @param int $cycle_counter Counter for detecting endless loops
 	 * @param bool $returnFiles When set, filenames of included files will be prepended to the array &$includedFiles
 	 * @param string &$newString The output string to which the content of the file will be prepended (referenced)
 	 * @param array &$includedFiles Array to which the filenames of included files will be prepended (referenced)
@@ -967,7 +967,7 @@ class TypoScriptParser {
 	 * and save the content between the BEGIN and the END line to the specified file
 	 *
 	 * @param string  $string Template content
-	 * @param integer $cycle_counter Counter for detecting endless loops
+	 * @param int $cycle_counter Counter for detecting endless loops
 	 * @param array   $extractedFileNames
 	 * @param string  $parentFilenameOrPath
 	 *
@@ -1157,8 +1157,8 @@ class TypoScriptParser {
 	 * Registers a part of a TypoScript line for syntax highlighting.
 	 *
 	 * @param string $code Key from the internal array $this->highLightStyles
-	 * @param integer $pointer Pointer to the line in $this->raw which this is about
-	 * @param integer $strlen The number of chars LEFT on this line before the end is reached.
+	 * @param int $pointer Pointer to the line in $this->raw which this is about
+	 * @param int $strlen The number of chars LEFT on this line before the end is reached.
 	 * @return void
 	 * @access private
 	 * @see 	parse()
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index d876dd6511aa7e07d207c181b86e112e7f2dcd9d..7d46906feb48863acc9f10d2e2118bed1fdbc86e 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -421,7 +421,7 @@ class TemplateService {
 	 * Also creates $this->rootLine which is a root line stopping at the root template (contrary to $GLOBALS['TSFE']->rootLine which goes all the way to the root of the tree
 	 *
 	 * @param array $theRootLine The rootline of the current page (going ALL the way to tree root)
-	 * @param integer $start_template_uid Set specific template record UID to select; this is only for debugging/development/analysis use in backend modules like "Web > Template". For parsing TypoScript templates in the frontend it should be 0 (zero)
+	 * @param int $start_template_uid Set specific template record UID to select; this is only for debugging/development/analysis use in backend modules like "Web > Template". For parsing TypoScript templates in the frontend it should be 0 (zero)
 	 * @return void
 	 * @see start()
 	 */
@@ -1040,7 +1040,7 @@ class TemplateService {
 	 * The concept is known as "optionSplit" and is rather advanced to handle but quite powerful, in particular for creating menus in TYPO3.
 	 *
 	 * @param array $conf A TypoScript array
-	 * @param integer $splitCount The number of items for which to generated individual TypoScript arrays
+	 * @param int $splitCount The number of items for which to generated individual TypoScript arrays
 	 * @return array The individualized TypoScript array.
 	 * @see \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::IMGTEXT(), \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject::procesItemStates()
 	 */
@@ -1385,7 +1385,7 @@ class TemplateService {
 	 * Initializes the automatically created MPmap coming from the "config.MP_mapRootPoints" setting
 	 * Can be called many times with overhead only the first time since then the map is generated and cached in memory.
 	 *
-	 * @param integer $pageId Page id to return MPvar value for.
+	 * @param int $pageId Page id to return MPvar value for.
 	 * @return string
 	 * @see initMPmap_create()
 	 * @todo Implement some caching of the result between hits. (more than just the memory caching used here)
@@ -1418,9 +1418,9 @@ class TemplateService {
 	/**
 	 * Creating MPmap for a certain ID root point.
 	 *
-	 * @param integer $id Root id from which to start map creation.
+	 * @param int $id Root id from which to start map creation.
 	 * @param array $MP_array MP_array passed from root page.
-	 * @param integer $level Recursion brake. Incremented for each recursive call. 20 is the limit.
+	 * @param int $level Recursion brake. Incremented for each recursive call. 20 is the limit.
 	 * @return void
 	 * @see getFromMPvar()
 	 */
diff --git a/typo3/sysext/core/Classes/Utility/ArrayUtility.php b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
index 4be94b8e95dae0dbb2c590820a6a27c0408f2b90..a52330980f240b30db2221c19468389d2c5c7d91 100644
--- a/typo3/sysext/core/Classes/Utility/ArrayUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
@@ -295,7 +295,7 @@ class ArrayUtility {
 	 * See unit tests for detailed examples
 	 *
 	 * @param array $array Array to export
-	 * @param integer $level Internal level used for recursion, do *not* set from outside!
+	 * @param int $level Internal level used for recursion, do *not* set from outside!
 	 * @return string String representation of array
 	 * @throws \RuntimeException
 	 */
@@ -470,7 +470,7 @@ class ArrayUtility {
 	 *  array(0 => 'Zero', 1 => 'One')
 	 *
 	 * @param array $array Input array
-	 * @param integer $level Internal level used for recursion, do *not* set from outside!
+	 * @param int $level Internal level used for recursion, do *not* set from outside!
 	 * @return array
 	 */
 	static public function renumberKeysToAvoidLeapsIfKeysAreAllNumeric(array $array = array(), $level = 0) {
diff --git a/typo3/sysext/core/Classes/Utility/CommandUtility.php b/typo3/sysext/core/Classes/Utility/CommandUtility.php
index 4132edaad608383575f23d29b6f013507a6944e7..6fedc18680378757f4269e1e7c7b30d56ac27b92 100644
--- a/typo3/sysext/core/Classes/Utility/CommandUtility.php
+++ b/typo3/sysext/core/Classes/Utility/CommandUtility.php
@@ -78,7 +78,7 @@ class CommandUtility {
 	 * @static
 	 * @param string $command
 	 * @param NULL|array $output
-	 * @param integer $returnValue
+	 * @param int $returnValue
 	 * @return NULL|array
 	 */
 	static public function exec($command, &$output = NULL, &$returnValue = 0) {
diff --git a/typo3/sysext/core/Classes/Utility/DebugUtility.php b/typo3/sysext/core/Classes/Utility/DebugUtility.php
index 74e9b6a2f3a3d3f20900320b85e778f12a0cdcd9..8b7214ded4c39f3b4c2d178b06a48f4ff0316636 100644
--- a/typo3/sysext/core/Classes/Utility/DebugUtility.php
+++ b/typo3/sysext/core/Classes/Utility/DebugUtility.php
@@ -240,7 +240,7 @@ class DebugUtility {
 	 * Returns a string with a list of ascii-values for the first $characters characters in $string
 	 *
 	 * @param string $string String to show ASCII value for
-	 * @param integer $characters Number of characters to show
+	 * @param int $characters Number of characters to show
 	 * @return string The string with ASCII values in separated by a space char.
 	 */
 	static public function ordinalValue($string, $characters = 100) {
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index 36d729630f2b089a859c244a49bc8505b4d0e721..0693c1a9764515377e1c903a81ec1e93d11a029b 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -1320,7 +1320,7 @@ class ExtensionManagementUtility {
 	 * @param string $classFile The PHP-class filename relative to the extension root directory. If set to blank a default value is chosen according to convensions.
 	 * @param string $prefix Is used as a - yes, suffix - of the class name (fx. "_pi1")
 	 * @param string $type See description above
-	 * @param integer $cached If $cached is set as USER content object (cObject) is created - otherwise a USER_INT object is created.
+	 * @param int $cached If $cached is set as USER content object (cObject) is created - otherwise a USER_INT object is created.
 	 *
 	 * @return void
 	 */
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
index 148b2a829eab8acbda4f3652b934fdbd4b614024..add97d6ead338ecc37d33f794fad78eb58ef4783 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
@@ -339,9 +339,9 @@ class ExtendedFileUtility extends \TYPO3\CMS\Core\Utility\File\BasicFileUtility
 	/**
 	 * Logging file operations
 	 *
-	 * @param integer $action The action number. See the functions in the class for a hint. Eg. edit is '9', upload is '1' ...
-	 * @param integer $error The severity: 0 = message, 1 = error, 2 = System Error, 3 = security notice (admin)
-	 * @param integer $details_nr This number is unique for every combination of $type and $action. This is the error-message number, which can later be used to translate error messages.
+	 * @param int $action The action number. See the functions in the class for a hint. Eg. edit is '9', upload is '1' ...
+	 * @param int $error The severity: 0 = message, 1 = error, 2 = System Error, 3 = security notice (admin)
+	 * @param int $details_nr This number is unique for every combination of $type and $action. This is the error-message number, which can later be used to translate error messages.
 	 * @param string $details This is the default, raw error message in english
 	 * @param array $data Array with special information that may go into $details by "%s" marks / sprintf() when the log is shown
 	 * @return void
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index fc4dc172e530f1dd6f5c887e20fbbdb4c35f5168..f7b59912f848a183857407cb0b669e57a9706d04 100644
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -361,7 +361,7 @@ class GeneralUtility {
 	 * Truncates a string with appended/prepended "..." and takes current character set into consideration.
 	 *
 	 * @param string $string String to truncate
-	 * @param integer $chars Must be an integer with an absolute value of at least 4. if negative the string is cropped from the right end.
+	 * @param int $chars Must be an integer with an absolute value of at least 4. if negative the string is cropped from the right end.
 	 * @param string $appendString Appendix to the truncated string
 	 * @return string Cropped string
 	 */
@@ -797,7 +797,7 @@ class GeneralUtility {
 	 * Returns the first 10 positions of the MD5-hash		(changed from 6 to 10 recently)
 	 *
 	 * @param string $input Input string to be md5-hashed
-	 * @param integer $len The string-length of the output
+	 * @param int $len The string-length of the output
 	 * @return string Substring of the resulting md5-hash, being $len chars long (from beginning)
 	 */
 	static public function shortMD5($input, $len = 10) {
@@ -905,9 +905,9 @@ class GeneralUtility {
 	 * Modifies a HTML Hex color by adding/subtracting $R,$G and $B integers
 	 *
 	 * @param string $color A hexadecimal color code, #xxxxxx
-	 * @param integer $R Offset value 0-255
-	 * @param integer $G Offset value 0-255
-	 * @param integer $B Offset value 0-255
+	 * @param int $R Offset value 0-255
+	 * @param int $G Offset value 0-255
+	 * @param int $B Offset value 0-255
 	 * @return string A hexadecimal color code, #xxxxxx, modified according to input vars
 	 * @see modifyHTMLColorAll()
 	 */
@@ -923,7 +923,7 @@ class GeneralUtility {
 	 * Modifies a HTML Hex color by adding/subtracting $all integer from all R/G/B channels
 	 *
 	 * @param string $color A hexadecimal color code, #xxxxxx
-	 * @param integer $all Offset value 0-255 for all three channels.
+	 * @param int $all Offset value 0-255 for all three channels.
 	 * @return string A hexadecimal color code, #xxxxxx, modified according to input vars
 	 * @see modifyHTMLColor()
 	 */
@@ -945,7 +945,7 @@ class GeneralUtility {
 	/**
 	 * Formats the input integer $sizeInBytes as bytes/kilobytes/megabytes (-/K/M)
 	 *
-	 * @param integer $sizeInBytes Number of bytes to format.
+	 * @param int $sizeInBytes Number of bytes to format.
 	 * @param string $labels Labels for bytes, kilo, mega and giga separated by vertical bar (|) and possibly encapsulated in "". Eg: " | K| M| G" (which is the default value)
 	 * @return string Formatted representation of the byte number, for output.
 	 */
@@ -1184,7 +1184,7 @@ class GeneralUtility {
 	 * Note: Returned values are not guaranteed to be crypto-safe,
 	 * most likely they are not, depending on the used retrieval method.
 	 *
-	 * @param integer $bytesToReturn Number of characters (bytes) to return
+	 * @param int $bytesToReturn Number of characters (bytes) to return
 	 * @return string Random Bytes
 	 * @see http://bugs.php.net/bug.php?id=52523
 	 * @see http://www.php-security.org/2010/05/09/mops-submission-04-generating-unpredictable-session-ids-and-hashes/index.html
@@ -1307,7 +1307,7 @@ class GeneralUtility {
 	/**
 	 * Returns a hex representation of a random byte string.
 	 *
-	 * @param integer $count Number of hex characters to return
+	 * @param int $count Number of hex characters to return
 	 * @return string Random Bytes
 	 */
 	static public function getRandomHexString($count) {
@@ -1451,7 +1451,7 @@ class GeneralUtility {
 	 * @param string $delimiter Delimiter string to explode with
 	 * @param string $string The string to explode
 	 * @param bool $removeEmptyValues If set, all empty values (='') will NOT be set in output
-	 * @param integer $limit If positive, the result will contain a maximum of limit elements,
+	 * @param int $limit If positive, the result will contain a maximum of limit elements,
 	 * @return array Exploded values, all converted to integers
 	 */
 	static public function intExplode($delimiter, $string, $removeEmptyValues = FALSE, $limit = 0) {
@@ -1487,7 +1487,7 @@ class GeneralUtility {
 	 *
 	 * @param string $delimiter Delimiter string to explode with
 	 * @param string $string The string to explode
-	 * @param integer $count Number of array entries
+	 * @param int $count Number of array entries
 	 * @return array Exploded values
 	 */
 	static public function revExplode($delimiter, $string, $count = 0) {
@@ -1515,7 +1515,7 @@ class GeneralUtility {
 	 * @param string $delim Delimiter string to explode with
 	 * @param string $string The string to explode
 	 * @param bool $removeEmptyValues If set, all empty values will be removed in output
-	 * @param integer $limit If positive, the result will contain a maximum of
+	 * @param int $limit If positive, the result will contain a maximum of
 	 * @return array Exploded values
 	 */
 	static public function trimExplode($delim, $string, $removeEmptyValues = FALSE, $limit = 0) {
@@ -1994,7 +1994,7 @@ class GeneralUtility {
 	 * Parses XML input into a PHP array with associative keys
 	 *
 	 * @param string $string XML data input
-	 * @param integer $depth Number of element levels to resolve the XML into an array. Any further structure will be set as XML.
+	 * @param int $depth Number of element levels to resolve the XML into an array. Any further structure will be set as XML.
 	 * @return mixed The array with the parsed structure unless the XML parser returns with an error in which case the error message string is returned.
 	 * @author bisqwit at iki dot fi dot not dot for dot ads dot invalid / http://dk.php.net/xml_parse_into_struct + kasperYYYY@typo3.com
 	 */
@@ -2085,9 +2085,9 @@ class GeneralUtility {
 	 *
 	 * @param array $array The input PHP array with any kind of data; text, binary, integers. Not objects though.
 	 * @param string $NSprefix tag-prefix, eg. a namespace prefix like "T3:
-	 * @param integer $level Current recursion level. Don't change, stay at zero!
+	 * @param int $level Current recursion level. Don't change, stay at zero!
 	 * @param string $docTag Alternative document tag. Default is "phparray".
-	 * @param integer $spaceInd If greater than zero, then the number of spaces corresponding to this number is used for indenting, if less than zero - no indentation, if zero - a single TAB is used
+	 * @param int $spaceInd If greater than zero, then the number of spaces corresponding to this number is used for indenting, if less than zero - no indentation, if zero - a single TAB is used
 	 * @param array $options Options for the compilation. Key "useNindex" => 0/1 (boolean: whether to use "n0, n1, n2" for num. indexes); Key "useIndexTagForNum" => "[tag for numerical indexes]"; Key "useIndexTagForAssoc" => "[tag for associative indexes"; Key "parentTagMap" => array('parentTag' => 'thisLevelTag')
 	 * @param array $stackData Stack data. Don't touch.
 	 * @return string An XML string made from the input content in the array.
@@ -2427,7 +2427,7 @@ class GeneralUtility {
 	 * If you are having trouble with proxys when reading URLs you can configure your way out of that with settings like $GLOBALS['TYPO3_CONF_VARS']['SYS']['curlUse'] etc.
 	 *
 	 * @param string $url File/URL to read
-	 * @param integer $includeHeader Whether the HTTP header should be fetched or not. 0=disable, 1=fetch header+content, 2=fetch header only
+	 * @param int $includeHeader Whether the HTTP header should be fetched or not. 0=disable, 1=fetch header+content, 2=fetch header only
 	 * @param array $requestHeaders HTTP headers to be used in the request
 	 * @param array $report Error code/message and, if $includeHeader is 1, response meta data (HTTP status and content type)
 	 * @return mixed The content from the resource given as input. FALSE if an error has occurred.
@@ -2966,7 +2966,7 @@ Connection: close
 	 * @param string $path The path to read recursively from (absolute) (include trailing slash!)
 	 * @param string $extList Comma list of file extensions: Only files with extensions in this list (if applicable) will be selected.
 	 * @param bool $regDirs If set, directories are also included in output.
-	 * @param integer $recursivityLevels The number of levels to dig down...
+	 * @param int $recursivityLevels The number of levels to dig down...
 	 * @param string $excludePattern regex pattern of files/directories to exclude
 	 * @return array An array with the found files/directories.
 	 */
@@ -3072,7 +3072,7 @@ Connection: close
 	 * TYPO3 installation. The first parameter can be used to set something that overrides
 	 * the maxFileSize, usually for the TCA values.
 	 *
-	 * @param integer $localLimit the number of Kilobytes (!) that should be used as
+	 * @param int $localLimit the number of Kilobytes (!) that should be used as
 	 * @return integer The maximum size of uploads that are allowed (measured in kilobytes)
 	 */
 	static public function getMaxUploadFileSize($localLimit = 0) {
@@ -3953,7 +3953,7 @@ Connection: close
 	 *
 	 * @param mixed $uid_or_record Uid (integer) or record (array)
 	 * @param string $fields List of fields from the record if that is given.
-	 * @param integer $codeLength Length of returned authentication code.
+	 * @param int $codeLength Length of returned authentication code.
 	 * @return string MD5 hash of 8 chars.
 	 */
 	static public function stdAuthCode($uid_or_record, $fields = '', $codeLength = 8) {
@@ -3979,7 +3979,7 @@ Connection: close
 	/**
 	 * Responds on input localization setting value whether the page it comes from should be hidden if no translation exists or not.
 	 *
-	 * @param integer $l18n_cfg_fieldValue Value from "l18n_cfg" field of a page record
+	 * @param int $l18n_cfg_fieldValue Value from "l18n_cfg" field of a page record
 	 * @return boolean TRUE if the page should be hidden
 	 */
 	static public function hideIfNotTranslated($l18n_cfg_fieldValue) {
@@ -3994,7 +3994,7 @@ Connection: close
 	 * Returns true if the "l18n_cfg" field value is not set to hide
 	 * pages in the default language
 	 *
-	 * @param integer $localizationConfiguration
+	 * @param int $localizationConfiguration
 	 * @return boolean
 	 */
 	static public function hideIfDefaultLanguage($localizationConfiguration) {
@@ -4007,7 +4007,7 @@ Connection: close
 	 * @param string $fileRef Input is a file-reference (see \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName). That file is expected to be a 'locallang.php' file containing a $LOCAL_LANG array (will be included!) or a 'locallang.xml' file conataining a valid XML TYPO3 language structure.
 	 * @param string $langKey Language key
 	 * @param string $charset Character set (option); if not set, determined by the language key
-	 * @param integer $errorMode Error mode (when file could not be found): 0 - syslog entry, 1 - do nothing, 2 - throw an exception
+	 * @param int $errorMode Error mode (when file could not be found): 0 - syslog entry, 1 - do nothing, 2 - throw an exception
 	 * @return array Value of $LOCAL_LANG found in the included file. If that array is found it will returned.
 	 */
 	static public function readLLfile($fileRef, $langKey, $charset = '', $errorMode = 0) {
@@ -4137,7 +4137,7 @@ Connection: close
 	 * @param mixed $params Parameters to be pass along (typically an array) (REFERENCE!)
 	 * @param mixed $ref Reference to be passed along (typically "$this" - being a reference to the calling object) (REFERENCE!)
 	 * @param string $checkPrefix Not used anymore since 6.0
-	 * @param integer $errorMode Error mode (when class/function could not be found): 0 - call debug(), 1 - do nothing, 2 - raise an exception (allows to call a user function that may return FALSE)
+	 * @param int $errorMode Error mode (when class/function could not be found): 0 - call debug(), 1 - do nothing, 2 - raise an exception (allows to call a user function that may return FALSE)
 	 * @return mixed Content from method/function call or FALSE if the class/method/function was not found
 	 * @see getUserObj()
 	 */
@@ -4648,7 +4648,7 @@ Connection: close
 	 * See RFC 1521, section 5.1 Quoted-Printable Content-Transfer-Encoding
 	 *
 	 * @param string $string Content to encode
-	 * @param integer $maxlen Length of the lines, default is 76
+	 * @param int $maxlen Length of the lines, default is 76
 	 * @return string The QP encoded string
 	 */
 	static public function quoted_printable($string, $maxlen = 76) {
@@ -4795,7 +4795,7 @@ Connection: close
 	 * Sub-function for substUrlsInPlainText() above.
 	 *
 	 * @param string $inUrl Input URL
-	 * @param integer $l URL string length limit
+	 * @param int $l URL string length limit
 	 * @param string $index_script_url URL of "index script" - the prefix of the "?RDCT=..." parameter. If not supplied it will default to \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('TYPO3_REQUEST_DIR').'index.php'
 	 * @return string Processed URL
 	 */
@@ -4820,7 +4820,7 @@ Connection: close
 	/**
 	 * Function to compensate for FreeType2 96 dpi
 	 *
-	 * @param integer $font_size Fontsize for freetype function call
+	 * @param int $font_size Fontsize for freetype function call
 	 * @return integer Compensated fontsize based on $GLOBALS['TYPO3_CONF_VARS']['GFX']['TTFdpi']
 	 */
 	static public function freetypeDpiComp($font_size) {
@@ -4877,7 +4877,7 @@ Connection: close
 	 *
 	 * @param string $msg Message (in English).
 	 * @param string $extKey Extension key (from which extension you are calling the log) or "Core
-	 * @param integer $severity \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_* constant
+	 * @param int $severity \TYPO3\CMS\Core\Utility\GeneralUtility::SYSLOG_SEVERITY_* constant
 	 * @return void
 	 */
 	static public function sysLog($msg, $extKey, $severity = 0) {
@@ -4948,7 +4948,7 @@ Connection: close
 	 *
 	 * @param string $msg Message (in english).
 	 * @param string $extKey Extension key (from which extension you are calling the log)
-	 * @param integer $severity Severity: 0 is info, 1 is notice, 2 is warning, 3 is fatal error, -1 is "OK" message
+	 * @param int $severity Severity: 0 is info, 1 is notice, 2 is warning, 3 is fatal error, -1 is "OK" message
 	 * @param mixed $dataVar Additional data you want to pass to the logger.
 	 * @return void
 	 */
@@ -5053,7 +5053,7 @@ Connection: close
 	 *
 	 * @param array $arr Data array which should be outputted
 	 * @param mixed $valueList List of keys which should be listed in the output string. Pass a comma list or an array. An empty list outputs the whole array.
-	 * @param integer $valueLength Long string values are shortened to this length. Default: 20
+	 * @param int $valueLength Long string values are shortened to this length. Default: 20
 	 * @return string Output string with key names and their value as string
 	 */
 	static public function arrayToLogString(array $arr, $valueList = array(), $valueLength = 20) {
diff --git a/typo3/sysext/core/Classes/Utility/MailUtility.php b/typo3/sysext/core/Classes/Utility/MailUtility.php
index 6ae443c43dd934e6d0e822f6b3433c7e74691763..077efc0067cbf83a0f2e25732a9eec83da3c87d2 100644
--- a/typo3/sysext/core/Classes/Utility/MailUtility.php
+++ b/typo3/sysext/core/Classes/Utility/MailUtility.php
@@ -103,7 +103,7 @@ class MailUtility {
 	 *
 	 * @param string $str The string to break up
 	 * @param string $newlineChar The string to implode the broken lines with (default/typically \n)
-	 * @param integer $lineWidth The line width
+	 * @param int $lineWidth The line width
 	 * @return string Reformated text
 	 */
 	static public function breakLinesForEmail($str, $newlineChar = LF, $lineWidth = 76) {
diff --git a/typo3/sysext/core/Classes/Utility/MathUtility.php b/typo3/sysext/core/Classes/Utility/MathUtility.php
index 6ef60edd4357926b16b10ab0c9d232d80b3e5fdc..9e33876e4b6893de641eaa088c4b898c4b5a5323 100644
--- a/typo3/sysext/core/Classes/Utility/MathUtility.php
+++ b/typo3/sysext/core/Classes/Utility/MathUtility.php
@@ -23,10 +23,10 @@ class MathUtility {
 	/**
 	 * Forces the integer $theInt into the boundaries of $min and $max. If the $theInt is FALSE then the $defaultValue is applied.
 	 *
-	 * @param integer $theInt Input value
-	 * @param integer $min Lower limit
-	 * @param integer $max Higher limit
-	 * @param integer $defaultValue Default value if input is FALSE.
+	 * @param int $theInt Input value
+	 * @param int $min Lower limit
+	 * @param int $max Higher limit
+	 * @param int $defaultValue Default value if input is FALSE.
 	 * @return integer The input value forced into the boundaries of $min and $max
 	 */
 	static public function forceIntegerInRange($theInt, $min, $max = 2000000000, $defaultValue = 0) {
@@ -49,7 +49,7 @@ class MathUtility {
 	/**
 	 * Returns $theInt if it is greater than zero, otherwise returns zero.
 	 *
-	 * @param integer $theInt Integer string to process
+	 * @param int $theInt Integer string to process
 	 * @return integer
 	 */
 	static public function convertToPositiveInteger($theInt) {
@@ -187,9 +187,9 @@ class MathUtility {
 	/**
 	 * Checks whether the given number $value is an integer in the range [$minimum;$maximum]
 	 *
-	 * @param integer $value Integer value to check
-	 * @param integer $minimum Lower boundary of the range
-	 * @param integer $maximum Upper boundary of the range
+	 * @param int $value Integer value to check
+	 * @param int $minimum Lower boundary of the range
+	 * @param int $maximum Upper boundary of the range
 	 * @return boolean
 	 */
 	static public function isIntegerInRange($value, $minimum, $maximum) {
diff --git a/typo3/sysext/core/Classes/Utility/PathUtility.php b/typo3/sysext/core/Classes/Utility/PathUtility.php
index 9076e746a0c611c03403ee20bb4f162fd8e88963..9bc9c7c58495ec4e0a2fbd56d378ee8424af6925 100644
--- a/typo3/sysext/core/Classes/Utility/PathUtility.php
+++ b/typo3/sysext/core/Classes/Utility/PathUtility.php
@@ -167,7 +167,7 @@ class PathUtility {
 	 *
 	 *
 	 * @param string $path
-	 * @param integer $options
+	 * @param int $options
 	 *
 	 * @return string|array
 	 *
diff --git a/typo3/sysext/core/Classes/Utility/RootlineUtility.php b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
index 67394865cbd0d74094725eff0e2a8f072c278c8a..7dca77293af35d3c9396a08e3c2ef0a36f801f9f 100644
--- a/typo3/sysext/core/Classes/Utility/RootlineUtility.php
+++ b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
@@ -114,7 +114,7 @@ class RootlineUtility {
 	protected $databaseConnection;
 
 	/**
-	 * @param integer $uid
+	 * @param int $uid
 	 * @param string $mountPointParameter
 	 * @param \TYPO3\CMS\Frontend\Page\PageRepository $context
 	 * @throws \RuntimeException
@@ -176,7 +176,7 @@ class RootlineUtility {
 	/**
 	 * Constructs the cache Identifier
 	 *
-	 * @param integer $otherUid
+	 * @param int $otherUid
 	 * @return string
 	 */
 	public function getCacheIdentifier($otherUid = NULL) {
@@ -231,7 +231,7 @@ class RootlineUtility {
 	/**
 	 * Queries the database for the page record and returns it.
 	 *
-	 * @param integer $uid Page id
+	 * @param int $uid Page id
 	 * @throws \RuntimeException
 	 * @return array
 	 */
@@ -261,7 +261,7 @@ class RootlineUtility {
 	/**
 	 * Resolve relations as defined in TCA and add them to the provided $pageRecord array.
 	 *
-	 * @param integer $uid Page id
+	 * @param int $uid Page id
 	 * @param array $pageRecord Array with page data to add relation data to.
 	 * @throws \RuntimeException
 	 * @return array $pageRecord with additional relations
diff --git a/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php b/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
index f391c395b89114d1eae7b981693ee6f7c4da67bb..ddab19bdac2527ad3f726d11795cf33773d797d8 100644
--- a/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
+++ b/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
@@ -34,7 +34,7 @@ class VersionNumberUtility {
 	/**
 	 * Returns the three part version number (string) from an integer, eg 4012003 -> '4.12.3'
 	 *
-	 * @param integer $versionInteger Integer representation of version number
+	 * @param int $versionInteger Integer representation of version number
 	 * @return string Version number as format x.x.x
 	 * @throws \InvalidArgumentException if $versionInteger is not an integer
 	 */
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/Framework/ActionService.php b/typo3/sysext/core/Tests/Functional/DataHandling/Framework/ActionService.php
index 31c63c4997974509efb1c9b8d54745a8633f66d0..63aec5343ef5bacb4395b9f1e4faeb84e57b67b1 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/Framework/ActionService.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/Framework/ActionService.php
@@ -35,7 +35,7 @@ class ActionService {
 
 	/**
 	 * @param string $tableName
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @param array $recordData
 	 * @return array
 	 */
@@ -44,7 +44,7 @@ class ActionService {
 	}
 
 	/**
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @param array $tableRecordData
 	 * @return array
 	 */
@@ -88,7 +88,7 @@ class ActionService {
 
 	/**
 	 * @param string $tableName
-	 * @param integer $uid
+	 * @param int $uid
 	 * @param array $recordData
 	 * @param NULL|array $deleteTableRecordIds
 	 */
@@ -115,7 +115,7 @@ class ActionService {
 	}
 
 	/**
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @param array $tableRecordData
 	 */
 	public function modifyRecords($pageId, array $tableRecordData) {
@@ -151,7 +151,7 @@ class ActionService {
 
 	/**
 	 * @param string $tableName
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return array
 	 */
 	public function deleteRecord($tableName, $uid) {
@@ -184,7 +184,7 @@ class ActionService {
 
 	/**
 	 * @param string $tableName
-	 * @param integer $uid
+	 * @param int $uid
 	 */
 	public function clearWorkspaceRecord($tableName, $uid) {
 		$this->clearWorkspaceRecords(
@@ -215,8 +215,8 @@ class ActionService {
 
 	/**
 	 * @param string $tableName
-	 * @param integer $uid
-	 * @param integer $pageId
+	 * @param int $uid
+	 * @param int $pageId
 	 * @param NULL|array $recordData
 	 * @return array
 	 */
@@ -243,8 +243,8 @@ class ActionService {
 
 	/**
 	 * @param string $tableName
-	 * @param integer $uid
-	 * @param integer $pageId
+	 * @param int $uid
+	 * @param int $pageId
 	 * @param NULL|array $recordData
 	 */
 	public function moveRecord($tableName, $uid, $pageId, array $recordData = NULL) {
@@ -269,8 +269,8 @@ class ActionService {
 
 	/**
 	 * @param string $tableName
-	 * @param integer $uid
-	 * @param integer $languageId
+	 * @param int $uid
+	 * @param int $languageId
 	 * @return array
 	 */
 	public function localizeRecord($tableName, $uid, $languageId) {
@@ -289,7 +289,7 @@ class ActionService {
 
 	/**
 	 * @param string $tableName
-	 * @param integer $uid
+	 * @param int $uid
 	 * @param string $fieldName
 	 * @param array $referenceIds
 	 */
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php
index 463c41129518eb8c17e3f7c4208dfb8e3ebbc360..47d5a19be34716837028d82a169d7c2c0697a5ab 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php
@@ -76,7 +76,7 @@ abstract class AbstractTestCase extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
 	/**
 	 * Sets the number of expected log entries.
 	 *
-	 * @param integer $count
+	 * @param int $count
 	 * @return void
 	 */
 	protected function setExpectedLogEntries($count) {
@@ -331,7 +331,7 @@ abstract class AbstractTestCase extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
 
 	/**
 	 * @param string $parentTableName
-	 * @param integer $parentId
+	 * @param int $parentId
 	 * @param string $parentFieldName
 	 * @param array $assertions
 	 * @param string $mmTable
diff --git a/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php b/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
index 1f0ded79cb5a4b39fab97730f63bb6080c0290ad..32ecfe23e69c6798734dba08fc2ae947508057d3 100644
--- a/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
+++ b/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
@@ -643,7 +643,7 @@ class FunctionalTestCaseBootstrapUtility {
 	 * See unit tests for detailed examples
 	 *
 	 * @param array $array Array to export
-	 * @param integer $level Internal level used for recursion, do *not* set from outside!
+	 * @param int $level Internal level used for recursion, do *not* set from outside!
 	 * @return string String representation of array
 	 * @throws \RuntimeException
 	 */
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
index 49540bd53b81e1c0a7d257f73267b714bf35c024..e4a77c3ce4ded50afad59d9d6ee5d6e6fc39d59b 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
@@ -426,7 +426,7 @@ class BackendUserAuthenticationTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @param array $defaultPermissions
-	 * @param integer $storageUid
+	 * @param int $storageUid
 	 * @param array $storagePermissions
 	 * @param array $expectedPermissions
 	 * @test
diff --git a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
index a64fe3a593e43edeb09c6cfd93646f24658ee844..526aae4fafa2ca00dcfb35a4bb8a72174c52c22e 100644
--- a/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/PreparedStatementTest.php
@@ -170,7 +170,7 @@ class PreparedStatementTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @expectedException \InvalidArgumentException
 	 * @dataProvider invalidParameterTypesPassedToBindValueThrowsExceptionDataProvider
 	 * @param mixed $parameter Parameter to be replaced in the query
-	 * @param integer $type Type of the parameter value
+	 * @param int $type Type of the parameter value
 	 * @return void
 	 */
 	public function invalidParameterTypesPassedToBindValueThrowsException($parameter, $type) {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
index 9e5119938d479542e4276369fbb14846de3e0280..18e4182b56d2c7896ec99fbc9c71de9e660c5bcf 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
@@ -147,7 +147,7 @@ class ResourceFactoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @param array $storageConfiguration
 	 * @param string $path
-	 * @param integer $expectedStorageId
+	 * @param int $expectedStorageId
 	 * @test
 	 * @dataProvider storageDetectionDataProvider
 	 */
diff --git a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
index f89c4d4f62fa431f153b09fe2c212e3fa92e438c..e16229bb12c162282bcfdd6ba9ad18398628c69b 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
@@ -4424,7 +4424,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @test
 	 * @dataProvider generateRandomBytesReturnsExpectedAmountOfBytesDataProvider
-	 * @param integer $numberOfBytes Number of Bytes to generate
+	 * @param int $numberOfBytes Number of Bytes to generate
 	 */
 	public function generateRandomBytesReturnsExpectedAmountOfBytes($numberOfBytes) {
 		$this->assertEquals(strlen(Utility\GeneralUtility::generateRandomBytes($numberOfBytes)), $numberOfBytes);
@@ -4453,7 +4453,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @test
 	 * @dataProvider generateRandomBytesReturnsDifferentBytesDuringDifferentCallsDataProvider
-	 * @param integer $numberOfBytes  Number of Bytes to generate
+	 * @param int $numberOfBytes  Number of Bytes to generate
 	 */
 	public function generateRandomBytesReturnsDifferentBytesDuringDifferentCalls($numberOfBytes) {
 		$results = array();
diff --git a/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php b/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
index 46392ea3bad505dd93859590d782c371166cca35..b57806c83b7d74a5302be882cb79af27deab34c7 100644
--- a/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
+++ b/typo3/sysext/cshmanual/Classes/Controller/HelpModuleController.php
@@ -507,7 +507,7 @@ class HelpModuleController {
 	 * Returns header HTML content
 	 *
 	 * @param string $str Header text
-	 * @param integer $type Header type (1, 0)
+	 * @param int $type Header type (1, 0)
 	 * @return string The HTML for the header.
 	 */
 	public function headerLine($str, $type = 0) {
diff --git a/typo3/sysext/cshmanual/mod/index.php b/typo3/sysext/cshmanual/mod/index.php
index f3f03474c8f9c0d13fe33fd4d3657b4ac8d078a9..c5912afbdf18291723a518dbdf8b4fa0c913ab0f 100644
--- a/typo3/sysext/cshmanual/mod/index.php
+++ b/typo3/sysext/cshmanual/mod/index.php
@@ -22,7 +22,7 @@ class local_t3lib_parsehtml extends \TYPO3\CMS\Core\Html\HtmlParser {
 	 * Processing content between tags for HTML_cleaner
 	 *
 	 * @param string $value The value
-	 * @param integer $dir Direction, either -1 or +1. 0 (zero) means no change to input value.
+	 * @param int $dir Direction, either -1 or +1. 0 (zero) means no change to input value.
 	 * @param mixed $conf Not used, ignore.
 	 * @return string The processed value.
 	 * @access private
diff --git a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
index 1f5596d119f1fb50e1095fa7a5992d419de7da55..a45f4d38e6b954810286e51cafc007c450c81f6a 100644
--- a/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
+++ b/typo3/sysext/css_styled_content/Classes/Controller/CssStyledContentController.php
@@ -369,7 +369,7 @@ class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlug
 	 * uses "1:1" column relations by default.
 	 *
 	 * @param array $conf TS configuration for img
-	 * @param integer $colCount number of columns
+	 * @param int $colCount number of columns
 	 * @return array
 	 */
 	protected function getImgColumnRelations($conf, $colCount) {
@@ -411,8 +411,8 @@ class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlug
 	 * Returns an array containing the image widths for an image row with $colCount columns.
 	 *
 	 * @param array $conf TS configuration of img
-	 * @param integer $colCount number of columns
-	 * @param integer $netW max usable width for images (without spaces and borders)
+	 * @param int $colCount number of columns
+	 * @param int $netW max usable width for images (without spaces and borders)
 	 * @return array
 	 */
 	protected function getImgColumnWidths($conf, $colCount, $netW) {
@@ -1176,7 +1176,7 @@ class CssStyledContentController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlug
 	 * Returns table attributes for uploads / tables.
 	 *
 	 * @param array $conf TypoScript configuration array
-	 * @param integer $type The "layout" type
+	 * @param int $type The "layout" type
 	 * @return array Array with attributes inside.
 	 */
 	public function getTableAttributes($conf, $type) {
diff --git a/typo3/sysext/dbal/Classes/Database/AdodbPreparedStatement.php b/typo3/sysext/dbal/Classes/Database/AdodbPreparedStatement.php
index 7ef99a4a2fbaf03e5fab004464d398fab4120f40..7d75013df5c4ce9dc4a60b1dab4cccb7d962febb 100644
--- a/typo3/sysext/dbal/Classes/Database/AdodbPreparedStatement.php
+++ b/typo3/sysext/dbal/Classes/Database/AdodbPreparedStatement.php
@@ -219,7 +219,7 @@ class AdodbPreparedStatement extends \TYPO3\CMS\Dbal\Database\DatabaseConnection
 	/**
 	 * Seeks to an arbitrary row in statement result set.
 	 *
-	 * @param integer $offset Must be between zero and the total number of rows minus one
+	 * @param int $offset Must be between zero and the total number of rows minus one
 	 * @return boolean TRUE on success or FALSE on failure
 	 */
 	public function data_seek($offset) {
diff --git a/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php b/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
index 709e007f9fdc03900d36401fa0b385f41783f0ac..97604c1b4bff4344231288e137c61ccdf1e23423 100644
--- a/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
@@ -2361,7 +2361,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
 	 * Move internal result pointer
 	 *
 	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-	 * @param integer $seek Seek result number.
+	 * @param int $seek Seek result number.
 	 * @return bool Returns TRUE on success or FALSE on failure.
 	 */
 	public function sql_data_seek($res, $seek) {
@@ -2386,7 +2386,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
 	 * If the first parameter is a string, it is used as table name for the lookup.
 	 *
 	 * @param string $table MySQL result pointer (of SELECT query) / DBAL object / table name
-	 * @param integer $field Field index. In case of ADOdb a string (field name!)
+	 * @param int $field Field index. In case of ADOdb a string (field name!)
 	 * @return string Returns the type of the specified field index
 	 */
 	public function sql_field_metatype($table, $field) {
@@ -2409,7 +2409,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
 	 * mysql_field_type() wrapper function
 	 *
 	 * @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
-	 * @param integer $pointer Field index.
+	 * @param int $pointer Field index.
 	 * @return string Returns the name of the specified field index, or FALSE on error
 	 */
 	public function sql_field_type($res, $pointer) {
@@ -3752,10 +3752,10 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
 	 * Inserts row in the log table
 	 *
 	 * @param string $query The current query
-	 * @param integer $ms Execution time of query in milliseconds
+	 * @param int $ms Execution time of query in milliseconds
 	 * @param array $data Data to be stored serialized.
 	 * @param string $join Join string if there IS a join.
-	 * @param integer $errorFlag Error status.
+	 * @param int $errorFlag Error status.
 	 * @param string $script The script calling the logging
 	 * @return void
 	 */
diff --git a/typo3/sysext/documentation/Classes/ViewHelpers/Link/ActionViewHelper.php b/typo3/sysext/documentation/Classes/ViewHelpers/Link/ActionViewHelper.php
index b4689ea24ee0f54519dddd0c419b77d4545fe2c8..71e58c3b2ae09d71f69a9ac6a7226a85653fda78 100644
--- a/typo3/sysext/documentation/Classes/ViewHelpers/Link/ActionViewHelper.php
+++ b/typo3/sysext/documentation/Classes/ViewHelpers/Link/ActionViewHelper.php
@@ -37,8 +37,8 @@ class ActionViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Link\ActionViewHelpe
 	 * @param string $controller Target controller. If NULL current controllerName is used
 	 * @param string $extensionName Target Extension Name (without "tx_" prefix and no underscores). If NULL the current extension name is used
 	 * @param string $pluginName Target plugin. If empty, the current plugin name is used
-	 * @param integer $pageUid target page. See TypoLink destination
-	 * @param integer $pageType type of the target page. See typolink.parameter
+	 * @param int $pageUid target page. See TypoLink destination
+	 * @param int $pageType type of the target page. See typolink.parameter
 	 * @param bool $noCache set this to disable caching for the target page. You should not need this.
 	 * @param bool $noCacheHash set this to suppress the cHash query parameter created by TypoLink. You should not need this.
 	 * @param string $section the anchor to be added to the URI
diff --git a/typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php b/typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
index 664ae9f5ebf430682c71cef7400a72ef1bc4093c..f78774afec9f232157c9faaf5fa48e1120fb00bf 100644
--- a/typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
+++ b/typo3/sysext/extbase/Classes/Configuration/AbstractConfigurationManager.php
@@ -279,7 +279,7 @@ abstract class AbstractConfigurationManager implements \TYPO3\CMS\Core\Singleton
 	 * storage pid.
 	 *
 	 * @param string $storagePid Storage PID to start at; multiple PIDs possible as comma-separated list
-	 * @param integer $recursionDepth Maximum number of levels to search, 0 to disable recursive lookup
+	 * @param int $recursionDepth Maximum number of levels to search, 0 to disable recursive lookup
 	 * @return string storage PIDs
 	 */
 	abstract protected function getRecursiveStoragePids($storagePid, $recursionDepth = 0);
diff --git a/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php b/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
index 6c7cc22ac481e31f5560622a0b5d0c4fd438178c..8ada6112a731911924d9ac49653fc8557047bfb2 100644
--- a/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
+++ b/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
@@ -203,7 +203,7 @@ class BackendConfigurationManager extends \TYPO3\CMS\Extbase\Configuration\Abstr
 	 * Returns a comma separated list of storagePid that are below a certain storage pid.
 	 *
 	 * @param string $storagePid Storage PID to start at; multiple PIDs possible as comma-separated list
-	 * @param integer $recursionDepth Maximum number of levels to search, 0 to disable recursive lookup
+	 * @param int $recursionDepth Maximum number of levels to search, 0 to disable recursive lookup
 	 * @return string storage PIDs
 	 */
 	protected function getRecursiveStoragePids($storagePid, $recursionDepth = 0) {
diff --git a/typo3/sysext/extbase/Classes/Configuration/FrontendConfigurationManager.php b/typo3/sysext/extbase/Classes/Configuration/FrontendConfigurationManager.php
index 67104305213238c1e288e9f5b53d1c4d3afc3a01..eb5e60e82e82abd7aaf2b63e3e475cc8ecc79392 100644
--- a/typo3/sysext/extbase/Classes/Configuration/FrontendConfigurationManager.php
+++ b/typo3/sysext/extbase/Classes/Configuration/FrontendConfigurationManager.php
@@ -220,7 +220,7 @@ class FrontendConfigurationManager extends \TYPO3\CMS\Extbase\Configuration\Abst
 	 * Returns a comma separated list of storagePid that are below a certain storage pid.
 	 *
 	 * @param string $storagePid Storage PID to start at; multiple PIDs possible as comma-separated list
-	 * @param integer $recursionDepth Maximum number of levels to search, 0 to disable recursive lookup
+	 * @param int $recursionDepth Maximum number of levels to search, 0 to disable recursive lookup
 	 * @return string storage PIDs
 	 */
 	protected function getRecursiveStoragePids($storagePid, $recursionDepth = 0) {
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php b/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
index 8aeff6cc85251f75df48bceccbb590e67295fc5c..4d55ca6bf14e76e611f8a40248786c813af1584a 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
@@ -375,7 +375,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Getter for file operation permissions
 	 *
-	 * @param integer $fileOperationPermissions
+	 * @param int $fileOperationPermissions
 	 * @return void
 	 */
 	public function setFileOperationPermissions($fileOperationPermissions) {
@@ -546,7 +546,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Helper method for checking the permissions bitwise.
 	 *
-	 * @param integer $permission
+	 * @param int $permission
 	 * @return boolean
 	 */
 	protected function isPermissionSet($permission) {
@@ -556,7 +556,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Helper method for settung permissions bitwise.
 	 *
-	 * @param integer $permission
+	 * @param int $permission
 	 * @param bool $value
 	 * @return void
 	 */
diff --git a/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php b/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
index b5ade37130b614b7cd723aed580460aa669d3525..a5d71c307fb805b74ac825bb1a5a0a2b5bfd5b0d 100644
--- a/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
+++ b/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
@@ -87,7 +87,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
 	/**
 	 * Setter for the pid.
 	 *
-	 * @param integer|NULL $pid
+	 * @param int|NULL $pid
 	 * @return void
 	 */
 	public function setPid($pid) {
diff --git a/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php b/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
index 129f809deea43a9b1c77ae8800a5bbe4f9ffe940..ab1b11559074bca30110789db024e8d2d19590e6 100644
--- a/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
+++ b/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
@@ -33,7 +33,7 @@ interface DomainObjectInterface {
 	/**
 	 * Setter for the pid.
 	 *
-	 * @param integer $pid
+	 * @param int $pid
 	 * @return void
 	 */
 	public function setPid($pid);
diff --git a/typo3/sysext/extbase/Classes/Error/Message.php b/typo3/sysext/extbase/Classes/Error/Message.php
index 3f69e36e2fe9e2436cce0c62d63dabded3b422a3..f1f09f65b5a83657e60f4cc12b4423a79ebae209 100644
--- a/typo3/sysext/extbase/Classes/Error/Message.php
+++ b/typo3/sysext/extbase/Classes/Error/Message.php
@@ -60,7 +60,7 @@ class Message {
 	 * Constructs this error
 	 *
 	 * @param string $message An english error message which is used if no other error message can be resolved
-	 * @param integer $code A unique error code
+	 * @param int $code A unique error code
 	 * @param array $arguments Array of arguments to be replaced in message
 	 * @param string $title optional title for the message
 	 * @api
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php b/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
index 7833cd6b15c259df72858333221fdc6547df4d7a..7969ffad8366316f4b78ea20c2cff1356bcfb07b 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
@@ -28,7 +28,7 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response {
 	/**
 	 * Sets the numerical exit code which should be returned when exiting this application.
 	 *
-	 * @param integer $exitCode
+	 * @param int $exitCode
 	 * @throws \InvalidArgumentException
 	 * @return void
 	 * @api
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
index 128410a2e3378582f1a755602c2c1fa57e78be6e..3cb10aeee5e56f4f964f04f39c2ae803bb2be90a 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
@@ -152,7 +152,7 @@ abstract class AbstractController implements ControllerInterface {
 	 *
 	 * @param string $messageBody The message
 	 * @param string $messageTitle Optional message title
-	 * @param integer $severity Optional severity, must be one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
+	 * @param int $severity Optional severity, must be one of \TYPO3\CMS\Core\Messaging\FlashMessage constants
 	 * @param bool $storeInSession Optional, defines whether the message should be stored in the session (default) or not
 	 * @return void
 	 * @throws \InvalidArgumentException if the message body is no string
@@ -279,9 +279,9 @@ abstract class AbstractController implements ControllerInterface {
 	 * @param string $controllerName Unqualified object name of the controller to forward to. If not specified, the current controller is used.
 	 * @param string $extensionName Name of the extension containing the controller to forward to. If not specified, the current extension is assumed.
 	 * @param array $arguments Arguments to pass to the target action
-	 * @param integer $pageUid Target page uid. If NULL, the current page uid is used
-	 * @param integer $delay (optional) The delay in seconds. Default is no delay.
-	 * @param integer $statusCode (optional) The HTTP status code for the redirect. Default is "303 See Other
+	 * @param int $pageUid Target page uid. If NULL, the current page uid is used
+	 * @param int $delay (optional) The delay in seconds. Default is no delay.
+	 * @param int $statusCode (optional) The HTTP status code for the redirect. Default is "303 See Other
 	 * @return void
 	 * @throws UnsupportedRequestTypeException If the request is not a web request
 	 * @throws StopActionException
@@ -309,8 +309,8 @@ abstract class AbstractController implements ControllerInterface {
 	 * NOTE: This method only supports web requests and will thrown an exception if used with other request types.
 	 *
 	 * @param mixed $uri A string representation of a URI
-	 * @param integer $delay (optional) The delay in seconds. Default is no delay.
-	 * @param integer $statusCode (optional) The HTTP status code for the redirect. Default is "303 See Other
+	 * @param int $delay (optional) The delay in seconds. Default is no delay.
+	 * @param int $statusCode (optional) The HTTP status code for the redirect. Default is "303 See Other
 	 * @throws UnsupportedRequestTypeException If the request is not a web request
 	 * @throws StopActionException
 	 * @api
@@ -347,7 +347,7 @@ abstract class AbstractController implements ControllerInterface {
 	 *
 	 * NOTE: This method only supports web requests and will thrown an exception if used with other request types.
 	 *
-	 * @param integer $statusCode The HTTP status code
+	 * @param int $statusCode The HTTP status code
 	 * @param string $statusMessage A custom HTTP status message
 	 * @param string $content Body content which further explains the status
 	 * @throws UnsupportedRequestTypeException If the request is not a web request
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
index 57c7a7518806e547c68f365319d18942dc8f2532..472479149166e56245bc307d6b1668374afee32b 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
@@ -277,7 +277,7 @@ class CommandController implements CommandControllerInterface {
 	 * Exits the CLI through the dispatcher
 	 * An exit status code can be specified @see http://www.php.net/exit
 	 *
-	 * @param integer $exitCode Exit code to return on exit
+	 * @param int $exitCode Exit code to return on exit
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
 	 * @return void
 	 */
@@ -290,7 +290,7 @@ class CommandController implements CommandControllerInterface {
 	 * Sends the response and exits the CLI without any further code execution
 	 * Should be used for commands that flush code caches.
 	 *
-	 * @param integer $exitCode Exit code to return on exit
+	 * @param int $exitCode Exit code to return on exit
 	 * @return void
 	 */
 	protected function sendAndExit($exitCode = 0) {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Exception/AmbiguousCommandIdentifierException.php b/typo3/sysext/extbase/Classes/Mvc/Exception/AmbiguousCommandIdentifierException.php
index 0976cf3f84d804f5acb9ffcba342f884a437907a..34f974736188bb35026c8300d48c14732ff15f78 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Exception/AmbiguousCommandIdentifierException.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Exception/AmbiguousCommandIdentifierException.php
@@ -29,7 +29,7 @@ class AmbiguousCommandIdentifierException extends \TYPO3\CMS\Extbase\Mvc\Excepti
 	 * Overwrites parent constructor to be able to inject matching commands.
 	 *
 	 * @param string $message
-	 * @param integer $code
+	 * @param int $code
 	 * @param \Exception|NULL $previousException
 	 * @param array $matchingCommands <\TYPO3\CMS\Extbase\Mvc\Cli\Command> $matchingCommands Commands that matched the command identifier
 	 * @see Exception
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Response.php b/typo3/sysext/extbase/Classes/Mvc/Web/Response.php
index 818f2b0397e650cb841b3ec9abb9c5696ecd7da2..22d0a4796ce4631d74a48e30c4f8be494b233aa8 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Response.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Response.php
@@ -121,7 +121,7 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response {
 	/**
 	 * Sets the HTTP status code and (optionally) a customized message.
 	 *
-	 * @param integer $code The status code
+	 * @param int $code The status code
 	 * @param string $message If specified, this message is sent instead of the standard message
 	 * @throws \InvalidArgumentException if the specified status code is not valid
 	 * @return void
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
index c855764859a73c00d5729c9baba7cfc24cb61984..b51ae959bfd7fe1106f2940c26828c34b471b310 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
@@ -363,7 +363,7 @@ class UriBuilder {
 	/**
 	 * Uid of the target page
 	 *
-	 * @param integer $targetPageUid
+	 * @param int $targetPageUid
 	 * @return \TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder the current UriBuilder to allow method chaining
 	 * @api
 	 */
@@ -385,7 +385,7 @@ class UriBuilder {
 	/**
 	 * Sets the page type of the target URI. Defaults to 0
 	 *
-	 * @param integer $targetPageType
+	 * @param int $targetPageType
 	 * @return \TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder the current UriBuilder to allow method chaining
 	 * @api
 	 */
diff --git a/typo3/sysext/extbase/Classes/Object/Container/Container.php b/typo3/sysext/extbase/Classes/Object/Container/Container.php
index 432ecb0c7017bb1ca46740ed4d2dee8dde21078d..ce3359e8917b8a6ae5030d547155b6765205ed14 100644
--- a/typo3/sysext/extbase/Classes/Object/Container/Container.php
+++ b/typo3/sysext/extbase/Classes/Object/Container/Container.php
@@ -230,7 +230,7 @@ class Container implements \TYPO3\CMS\Core\SingletonInterface {
 	 * Wrapper for dev log, in order to ease testing
 	 *
 	 * @param string $message Message (in english).
-	 * @param integer $severity Severity: 0 is info, 1 is notice, 2 is warning, 3 is fatal error, -1 is "OK" message
+	 * @param int $severity Severity: 0 is info, 1 is notice, 2 is warning, 3 is fatal error, -1 is "OK" message
 	 * @return void
 	 */
 	protected function log($message, $severity) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
index c5e5b244f330631810f2b2772fb19377215caf12..47dd9476978f791c5420adb3d49a74d01500fb1e 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
@@ -507,7 +507,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
 	 * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object
 	 * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject
 	 * @param string $parentPropertyName
-	 * @param integer $sortingPosition
+	 * @param int $sortingPosition
 	 * @return void
 	 */
 	protected function attachObjectToParentObject(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $parentPropertyName, $sortingPosition = 0) {
@@ -526,7 +526,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
 	 * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object
 	 * @param \TYPO3\CMS\Extbase\DomainObject\AbstractEntity $parentObject
 	 * @param string $parentPropertyName
-	 * @param integer $sortingPosition
+	 * @param int $sortingPosition
 	 * @return void
 	 */
 	protected function updateRelationOfObjectToParentObject(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\AbstractEntity $parentObject, $parentPropertyName, $sortingPosition = 0) {
@@ -545,7 +545,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
 	 * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object
 	 * @param \TYPO3\CMS\Extbase\DomainObject\AbstractEntity $parentObject
 	 * @param string $parentPropertyName
-	 * @param integer $sortingPosition
+	 * @param int $sortingPosition
 	 * @throws \TYPO3\CMS\Extbase\Persistence\Exception\IllegalRelationTypeException
 	 * @return void
 	 */
@@ -687,7 +687,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
 	 * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object The related object
 	 * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject The parent object
 	 * @param string $propertyName The name of the parent object's property where the related objects are stored in
-	 * @param integer $sortingPosition Defaults to NULL
+	 * @param int $sortingPosition Defaults to NULL
 	 * @return integer The uid of the inserted row
 	 */
 	protected function insertRelationInRelationtable(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $sortingPosition = NULL) {
@@ -720,7 +720,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
 	 * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object The related object
 	 * @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject The parent object
 	 * @param string $propertyName The name of the parent object's property where the related objects are stored in
-	 * @param integer $sortingPosition Defaults to NULL
+	 * @param int $sortingPosition Defaults to NULL
 	 * @return bool TRUE if update was successfully
 	 */
 	protected function updateRelationInRelationTable(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $sortingPosition = 0) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
index d6a3b0496df742a700b8c93f1f3a9dab7dea08f4..eee8eb1c34d84c47e8c46712788578cccc0d82c9 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
@@ -258,7 +258,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
 	 * Creates a DateTime from an unix timestamp or date/datetime value.
 	 * If the input is empty, NULL is returned.
 	 *
-	 * @param integer|string $value Unix timestamp or date/datetime value
+	 * @param int|string $value Unix timestamp or date/datetime value
 	 * @param NULL|string $storageFormat Storage format for native date/datetime fields
 	 * @return \DateTime
 	 */
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/PropertyType.php b/typo3/sysext/extbase/Classes/Persistence/Generic/PropertyType.php
index 860b2d8b12047fab0b1b47b88703e02c31aa9e94..d95d47f9520c10621f31e8d3734fb255587e572b 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/PropertyType.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/PropertyType.php
@@ -208,7 +208,7 @@ class PropertyType {
 	/**
 	 * Returns the name of the specified type, as used in serialization.
 	 *
-	 * @param integer $type type the property type
+	 * @param int $type type the property type
 	 * @return string  name of the specified type
 	 */
 	static public function nameFromValue($type) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
index 93e789e7958bbe05eab3ea835e109b1e6da820ab..3c8a2971f769aa9492bc502d2169c7718384e442 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
@@ -84,7 +84,7 @@ class Comparison implements ComparisonInterface {
 	 * Constructs this Comparison instance
 	 *
 	 * @param PropertyValueInterface $operand1
-	 * @param integer $operator one of QueryInterface::OPERATOR_*
+	 * @param int $operator one of QueryInterface::OPERATOR_*
 	 * @param mixed $operand2
 	 */
 	public function __construct(PropertyValueInterface $operand1, $operator, $operand2) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
index 81503819660245b2785413ec6fee3061694e0eaf..128f33df3dbb33650f8ba947a62db66e8d10b493 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
@@ -239,7 +239,7 @@ class Query implements QueryInterface {
 	 * Sets the maximum size of the result set to limit. Returns $this to allow
 	 * for chaining (fluid interface)
 	 *
-	 * @param integer $limit
+	 * @param int $limit
 	 * @throws \InvalidArgumentException
 	 * @return QueryInterface
 	 * @api
@@ -278,7 +278,7 @@ class Query implements QueryInterface {
 	 * Sets the start offset of the result set to offset. Returns $this to
 	 * allow for chaining (fluid interface)
 	 *
-	 * @param integer $offset
+	 * @param int $offset
 	 * @throws \InvalidArgumentException
 	 * @return QueryInterface
 	 * @api
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php b/typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php
index 1033b962d4cae37f2dc362a49f745e4b81ad3253..3f32608dc5205fbe4364497c6a2e83c5cb72d1f1 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php
@@ -91,7 +91,7 @@ interface QuerySettingsInterface {
 	public function getLanguageMode();
 
 	/**
-	 * @param integer $languageUid
+	 * @param int $languageUid
 	 * @return \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface instance of $this to allow method chaining
 	 * @api
 	 */
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
index dd6ae3c407366531c001178787e948e0cb3f60f7..c1a2df8f12a9d5c26b580dda90e1c7214fe2ae33 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
@@ -827,7 +827,7 @@ class Typo3DbBackend implements BackendInterface, \TYPO3\CMS\Core\SingletonInter
 	 * Much of this functionality is taken from t3lib_tcemain::clear_cache() which unfortunately only works with logged-in BE user.
 	 *
 	 * @param string $tableName Table name of the record
-	 * @param integer $uid UID of the record
+	 * @param int $uid UID of the record
 	 * @return void
 	 */
 	protected function clearPageCache($tableName, $uid) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php b/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
index 3c60152929ae81eac5e2bb0483759f28abe94f57..b3d3f163914bb6f8e54c1dcbaab5093512f910f3 100644
--- a/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
@@ -152,7 +152,7 @@ interface QueryInterface {
 	 * Sets the maximum size of the result set to limit. Returns $this to allow
 	 * for chaining (fluid interface).
 	 *
-	 * @param integer $limit
+	 * @param int $limit
 	 * @return \TYPO3\CMS\Extbase\Persistence\QueryInterface
 	 * @api
 	 */
@@ -162,7 +162,7 @@ interface QueryInterface {
 	 * Sets the start offset of the result set to offset. Returns $this to
 	 * allow for chaining (fluid interface).
 	 *
-	 * @param integer $offset
+	 * @param int $offset
 	 * @return \TYPO3\CMS\Extbase\Persistence\QueryInterface
 	 * @api
 	 */
diff --git a/typo3/sysext/extbase/Classes/Persistence/Repository.php b/typo3/sysext/extbase/Classes/Persistence/Repository.php
index 0400cfcc2a433901a89936c53f8e4fc48fdf5c03..3078307bc3b8b7aeef7ca7a27304d5abe8746cd4 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Repository.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Repository.php
@@ -172,7 +172,7 @@ class Repository implements RepositoryInterface, \TYPO3\CMS\Core\SingletonInterf
 	/**
 	 * Finds an object matching the given identifier.
 	 *
-	 * @param integer $uid The identifier of the object to find
+	 * @param int $uid The identifier of the object to find
 	 * @return object The matching object if found, otherwise NULL
 	 * @api
 	 */
diff --git a/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php b/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
index bf0b0e8d2a3044751011cc038757b5ea8bdfe5cb..bbe5b19d2ad895d44b37cd6286f81653de82d899 100644
--- a/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
@@ -74,7 +74,7 @@ interface RepositoryInterface {
 	/**
 	 * Finds an object matching the given identifier.
 	 *
-	 * @param integer $uid The identifier of the object to find
+	 * @param int $uid The identifier of the object to find
 	 * @return object The matching object if found, otherwise NULL
 	 * @api
 	 */
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileCollectionConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileCollectionConverter.php
index 525edd4a73d6179645e30d7b929d2f03863737de..d29a5702e138094daa8062ffd923f9dd654f6cf7 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileCollectionConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileCollectionConverter.php
@@ -40,7 +40,7 @@ abstract class AbstractFileCollectionConverter extends \TYPO3\CMS\Extbase\Proper
 	 * Actually convert from $source to $targetType, taking into account the fully
 	 * built $convertedChildProperties and $configuration.
 	 *
-	 * @param integer $source
+	 * @param int $source
 	 * @param string $targetType
 	 * @param array $convertedChildProperties
 	 * @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration
@@ -60,7 +60,7 @@ abstract class AbstractFileCollectionConverter extends \TYPO3\CMS\Extbase\Proper
 	}
 
 	/**
-	 * @param integer $source
+	 * @param int $source
 	 * @return \TYPO3\CMS\Core\Resource\Collection\AbstractFileCollection
 	 */
 	abstract protected function getObject($source);
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/FileReferenceConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/FileReferenceConverter.php
index fc369f780f1155ae4fe09ef91eca0befd67f41c9..5404041a68c6bfa937d19d62175911fb2450a7da 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/FileReferenceConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/FileReferenceConverter.php
@@ -36,7 +36,7 @@ class FileReferenceConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\A
 	protected $expectedObjectType = 'TYPO3\\CMS\\Core\\Resource\\FileReference';
 
 	/**
-	 * @param integer $source
+	 * @param int $source
 	 * @return \TYPO3\CMS\Core\Resource\FileReference
 	 */
 	protected function getOriginalResource($source) {
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderBasedFileCollectionConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderBasedFileCollectionConverter.php
index f56fb764b78a471e322b8b1b5bac7399c5605d7c..08548b3c198d0f93ceaac290208be23e3c9512be 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderBasedFileCollectionConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/FolderBasedFileCollectionConverter.php
@@ -36,7 +36,7 @@ class FolderBasedFileCollectionConverter extends \TYPO3\CMS\Extbase\Property\Typ
 	protected $expectedObjectType = 'TYPO3\\CMS\\Core\\Resource\\Collection\\FolderBasedFileCollection';
 
 	/**
-	 * @param integer $source
+	 * @param int $source
 	 * @return \TYPO3\CMS\Core\Resource\Collection\FolderBasedFileCollection
 	 */
 	protected function getObject($source) {
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
index a99aeb4d41afd44185dc6ffba1a9649b8be35e6f..bead3cbd8b4d3060e155fafd2c2bf00664d8bd50 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
@@ -45,7 +45,7 @@ class IntegerConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstrac
 	/**
 	 * Actually convert from $source to $targetType, in fact a noop here.
 	 *
-	 * @param integer|string $source
+	 * @param int|string $source
 	 * @param string $targetType
 	 * @param array $convertedChildProperties
 	 * @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/StaticFileCollectionConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/StaticFileCollectionConverter.php
index 04192fc48f26a94b73d4b4016fa72d93be140ff9..fa49272e93bcae63a702e3874601e2ff83b19ffa 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/StaticFileCollectionConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/StaticFileCollectionConverter.php
@@ -36,7 +36,7 @@ class StaticFileCollectionConverter extends \TYPO3\CMS\Extbase\Property\TypeConv
 	protected $expectedObjectType = 'TYPO3\\CMS\\Core\\Resource\\Collection\\StaticFileCollection';
 
 	/**
-	 * @param integer $source
+	 * @param int $source
 	 * @return \TYPO3\CMS\Core\Resource\Collection\StaticFileCollection
 	 */
 	protected function getObject($source) {
diff --git a/typo3/sysext/extbase/Classes/Reflection/ClassReflection.php b/typo3/sysext/extbase/Classes/Reflection/ClassReflection.php
index 2b222945816bd36e5de3b35ca92cb68c8dd45388..91e019d05fca6c80678c3165b84953f03d90b780 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ClassReflection.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ClassReflection.php
@@ -28,7 +28,7 @@ class ClassReflection extends \ReflectionClass {
 	 * that \TYPO3\CMS\Extbase\Reflection\MethodReflection objects are returned instead of the
 	 * original ReflectionMethod instances.
 	 *
-	 * @param integer|NULL $filter A filter mask
+	 * @param int|NULL $filter A filter mask
 	 * @return MethodReflection[] Method reflection objects of the methods in this class
 	 */
 	public function getMethods($filter = NULL) {
@@ -76,7 +76,7 @@ class ClassReflection extends \ReflectionClass {
 	 * that \TYPO3\CMS\Extbase\Reflection\PropertyReflection objects are returned instead of the
 	 * original ReflectionProperty instances.
 	 *
-	 * @param integer|NULL $filter A filter mask
+	 * @param int|NULL $filter A filter mask
 	 * @return PropertyReflection[] Property reflection objects of the properties in this class
 	 */
 	public function getProperties($filter = NULL) {
diff --git a/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php b/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
index 9c2a6dbad90adaf00eba17ebad16fadb21d16d97..24d6793a585aff75a268ed24472ebeb24dcb10cc 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
@@ -131,7 +131,7 @@ class ClassSchema {
 	/**
 	 * Sets the model type of the class this schema is referring to.
 	 *
-	 * @param integer $modelType The model type, one of the MODELTYPE_* constants.
+	 * @param int $modelType The model type, one of the MODELTYPE_* constants.
 	 * @throws \InvalidArgumentException
 	 * @return void
 	 */
diff --git a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
index bef7a4fcd80873abd10bf12c55a00e21a683d55b..7fc4e32c4048c1811da620aedf6b99862d6bbc70 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
@@ -451,7 +451,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
 	 * Converts the given parameter reflection into an information array
 	 *
 	 * @param ParameterReflection $parameter The parameter to reflect
-	 * @param integer $parameterPosition
+	 * @param int $parameterPosition
 	 * @param MethodReflection|NULL $method
 	 * @return array Parameter information array
 	 */
diff --git a/typo3/sysext/extbase/Classes/Utility/ArrayUtility.php b/typo3/sysext/extbase/Classes/Utility/ArrayUtility.php
index ffc9d60f183be57459b56b45991e4f269c1d4a30..59433f0e18c1d6050052c91abc37d36965587b35 100644
--- a/typo3/sysext/extbase/Classes/Utility/ArrayUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/ArrayUtility.php
@@ -244,7 +244,7 @@ class ArrayUtility {
 	 * Sorts multidimensional arrays by recursively calling ksort on its elements.
 	 *
 	 * @param array &$array the array to sort
-	 * @param integer $sortFlags may be used to modify the sorting behavior using these values (see http://www.php.net/manual/en/function.sort.php)
+	 * @param int $sortFlags may be used to modify the sorting behavior using these values (see http://www.php.net/manual/en/function.sort.php)
 	 * @return boolean TRUE on success, FALSE on failure
 	 * @see asort()
 	 * @api
diff --git a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
index 56fcb80d58fa432d5a2690fbca2327b806c35c2e..51ba12be9d0ce3bf0ebab197bdb37731898076cc 100644
--- a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
@@ -90,7 +90,7 @@ class DebuggerUtility {
 	 * Renders a dump of the given value
 	 *
 	 * @param mixed $value
-	 * @param integer $level
+	 * @param int $level
 	 * @param bool $plainText
 	 * @param bool $ansiColors
 	 * @return string
@@ -122,7 +122,7 @@ class DebuggerUtility {
 	 * Renders a dump of the given array
 	 *
 	 * @param array|\Traversable $array
-	 * @param integer $level
+	 * @param int $level
 	 * @param bool $plainText
 	 * @param bool $ansiColors
 	 * @return string
@@ -161,7 +161,7 @@ class DebuggerUtility {
 	 * Renders a dump of the given object
 	 *
 	 * @param object $object
-	 * @param integer $level
+	 * @param int $level
 	 * @param bool $plainText
 	 * @param bool $ansiColors
 	 * @return string
@@ -213,7 +213,7 @@ class DebuggerUtility {
 	 * Renders the header of a given object/collection. It is usually the class name along with some flags.
 	 *
 	 * @param object $object
-	 * @param integer $level
+	 * @param int $level
 	 * @param bool $plainText
 	 * @param bool $ansiColors
 	 * @return string The rendered header with tags
@@ -297,7 +297,7 @@ class DebuggerUtility {
 
 	/**
 	 * @param object $object
-	 * @param integer $level
+	 * @param int $level
 	 * @param bool $plainText
 	 * @param bool $ansiColors
 	 * @return string The rendered body content of the Object(Storage)
@@ -339,7 +339,7 @@ class DebuggerUtility {
 
 	/**
 	 * @param mixed $collection
-	 * @param integer $level
+	 * @param int $level
 	 * @param bool $plainText
 	 * @param bool $ansiColors
 	 * @return string
@@ -377,7 +377,7 @@ class DebuggerUtility {
 	 *
 	 * @param mixed $variable The value to dump
 	 * @param string $title optional custom title for the debug output
-	 * @param integer $maxDepth Sets the max recursion depth of the dump. De- or increase the number according to your needs and memory limit.
+	 * @param int $maxDepth Sets the max recursion depth of the dump. De- or increase the number according to your needs and memory limit.
 	 * @param bool $plainText If TRUE, the dump is in plain text, if FALSE the debug output is in HTML format.
 	 * @param bool $ansiColors If TRUE (default), ANSI color codes is added to the output, if FALSE the debug output not colored.
 	 * @param bool $return if TRUE, the dump is returned for custom post-processing (e.g. embed in custom HTML). If FALSE (default), the dump is directly displayed.
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
index 114ba81ac0438ee9872da4799093650b0e519741..7b45a218e9b9e904b5ba4e561e40c22f52ceb70e 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
@@ -113,7 +113,7 @@ abstract class AbstractValidator implements ValidatorInterface {
 	 * Creates a new validation error object and adds it to $this->results
 	 *
 	 * @param string $message The error message
-	 * @param integer $code The error code (a unix timestamp)
+	 * @param int $code The error code (a unix timestamp)
 	 * @param array $arguments Arguments to be replaced in message
 	 * @param string $title title of the error
 	 * @return void
diff --git a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Repository/PostRepository.php b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Repository/PostRepository.php
index 42ddfda8c70bff76f364ddf5e758a726c9832df1..a55f678cd8f36bd80429cb1da580ed389d74666e 100644
--- a/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Repository/PostRepository.php
+++ b/typo3/sysext/extbase/Tests/Functional/Fixtures/Extensions/blog_example/Classes/Domain/Repository/PostRepository.php
@@ -111,7 +111,7 @@ class PostRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 	 * Finds most recent posts by the specified blog
 	 *
 	 * @param \ExtbaseTeam\BlogExample\Domain\Model\Blog $blog The blog the post must refer to
-	 * @param integer $limit The number of posts to return at max
+	 * @param int $limit The number of posts to return at max
 	 * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface The posts
 	 */
 	public function findRecentByBlog(\ExtbaseTeam\BlogExample\Domain\Model\Blog $blog, $limit = 5) {
diff --git a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
index 219aff4ba520532a6f24f36527772a0271d88576..41ddbf4b02511b2595c47c4e1ecd1dbd8ab389a1 100644
--- a/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
@@ -232,7 +232,7 @@ class PersistentObjectConverterTest extends UnitTestCase {
 	}
 
 	/**
-	 * @param integer $numberOfResults
+	 * @param int $numberOfResults
 	 * @param Matcher $howOftenIsGetFirstCalled
 	 * @return \stdClass
 	 */
diff --git a/typo3/sysext/extbase/Tests/Unit/Scheduler/Fixtures/MockACommandController.php b/typo3/sysext/extbase/Tests/Unit/Scheduler/Fixtures/MockACommandController.php
index da8713845fc15f1dc03b2cf1fede9fd01a7e020d..2146c5f7ed3b01360a0110942928421a7d4c9e63 100644
--- a/typo3/sysext/extbase/Tests/Unit/Scheduler/Fixtures/MockACommandController.php
+++ b/typo3/sysext/extbase/Tests/Unit/Scheduler/Fixtures/MockACommandController.php
@@ -22,7 +22,7 @@ class MockACommandController extends \TYPO3\CMS\Extbase\Mvc\Controller\CommandCo
 	/**
 	 * funcACommand
 	 *
-	 * @param integer $arg A not required argument
+	 * @param int $arg A not required argument
 	 * @return string
 	 */
 	public function funcACommand($arg = 1) {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
index 7ad4a3f4cbf71632a7e6c244f674a12a38c9a686..38a413a1a824b58195d918a67057d56d0710eaa9 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
@@ -186,7 +186,7 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $highlight
+	 * @param int $highlight
 	 * @return void
 	 */
 	public function setHighlight($highlight) {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
index 94a02eee0c0ba167b2643531d74f19b80abfb7ad..97f7dfd0f73f1d363fc0a8a258d627e350576b92 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
@@ -187,7 +187,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $category
+	 * @param int $category
 	 * @return void
 	 */
 	public function setCategory($category) {
@@ -283,7 +283,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $state
+	 * @param int $state
 	 * @return void
 	 */
 	public function setState($state) {
@@ -509,7 +509,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $integerVersion
+	 * @param int $integerVersion
 	 * @return void
 	 */
 	public function setIntegerVersion($integerVersion) {
@@ -524,7 +524,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $reviewState
+	 * @param int $reviewState
 	 * @return void
 	 */
 	public function setReviewState($reviewState) {
@@ -539,7 +539,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $position
+	 * @param int $position
 	 * @return void
 	 */
 	public function setPosition($position) {
@@ -554,7 +554,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $alldownloadcounter
+	 * @param int $alldownloadcounter
 	 */
 	public function setAlldownloadcounter($alldownloadcounter) {
 		$this->alldownloadcounter = $alldownloadcounter;
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
index 40ec81bd31be7cdf39a68366f27c671238159bbc..2854e595e4402d7347907df6500a6f1ce517cd1f 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
@@ -49,7 +49,7 @@ class Mirrors extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Method selects one specific mirror to be used.
 	 *
-	 * @param integer $mirrorId number (>=1) of mirror or NULL for random selection
+	 * @param int $mirrorId number (>=1) of mirror or NULL for random selection
 	 * @return void
 	 * @see $currentMirror
 	 */
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
index 64aa65986b5f0b234b8170929ff377ce0982886a..b364ddcc93c5ad216a482b39a4c12c4809023ed3 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
@@ -174,8 +174,8 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 	 * Find an extension between a certain version range ordered by version number
 	 *
 	 * @param string $extensionKey
-	 * @param integer $lowestVersion
-	 * @param integer $highestVersion
+	 * @param int $lowestVersion
+	 * @param int $highestVersion
 	 * @return \TYPO3\CMS\Extbase\Persistence\QueryResultInterface
 	 */
 	public function findByVersionRangeAndExtensionKeyOrderedByVersion($extensionKey, $lowestVersion = 0, $highestVersion = 0) {
@@ -247,8 +247,8 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 	 * Count extensions with a certain key between a given version range
 	 *
 	 * @param string $extensionKey
-	 * @param integer $lowestVersion
-	 * @param integer $highestVersion
+	 * @param int $lowestVersion
+	 * @param int $highestVersion
 	 * @return integer
 	 */
 	public function countByVersionRangeAndExtensionKey($extensionKey, $lowestVersion = 0, $highestVersion = 0) {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
index 51d3ff93bf8ac11de6e106937b7ec19b1cfbc745..a290ed6270c4cab5549b21e8549ba0156c6a225d 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
@@ -35,8 +35,8 @@ class RepositoryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 	/**
 	 * Updates ExtCount and lastUpdated in Repository eg after import
 	 *
-	 * @param integer $extCount
-	 * @param integer $uid
+	 * @param int $extCount
+	 * @param int $uid
 	 * @return void
 	 */
 	public function updateRepositoryCount($extCount, $uid = 1) {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
index 0080879b579787209ed39407c7a34e1aabd90384..3a4abb588bd11051ce113a50778698642d10894e 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
@@ -134,7 +134,7 @@ class ExtensionListUtility implements \SplObserver {
 	 * Method initializes parsing of extension.xml.gz file.
 	 *
 	 * @param string $localExtensionListFile absolute path to extension list xml.gz
-	 * @param integer $repositoryUid UID of repository when inserting records into DB
+	 * @param int $repositoryUid UID of repository when inserting records into DB
 	 * @return integer total number of imported extension versions
 	 */
 	public function import($localExtensionListFile, $repositoryUid = NULL) {
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ImageViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ImageViewHelper.php
index d8191a91aad722f66f0aae8daa85d81de8184492..c91910bb53d1d92326a4a4e31251860b71909275 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ImageViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ImageViewHelper.php
@@ -53,10 +53,10 @@ class ImageViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\ImageViewHelper {
 	 * @param string $src
 	 * @param string $width width of the image. This can be a numeric value representing the fixed width of the image in pixels. But you can also perform simple calculations by adding "m" or "c" to the value. See imgResource.width for possible options.
 	 * @param string $height height of the image. This can be a numeric value representing the fixed height of the image in pixels. But you can also perform simple calculations by adding "m" or "c" to the value. See imgResource.width for possible options.
-	 * @param integer $minWidth minimum width of the image
-	 * @param integer $minHeight minimum height of the image
-	 * @param integer $maxWidth maximum width of the image
-	 * @param integer $maxHeight maximum height of the image
+	 * @param int $minWidth minimum width of the image
+	 * @param int $minHeight minimum height of the image
+	 * @param int $maxWidth maximum width of the image
+	 * @param int $maxHeight maximum height of the image
 	 * @param string $fallbackImage an optional fallback image if the $src image cannot be loaded
 	 * @return string rendered tag.
 	 */
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
index b9d6e4c764e09c86d344bf9c1c8fbbaef52ec1e7..40b188a481317e246152c7157b6118e8f922a55c 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
@@ -77,7 +77,7 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 * @dataProvider getCategoryIndexFromStringOrNumberReturnsIndexDataProvider
 	 * @param string|integer $input Given input
-	 * @param integer $expected Expected result
+	 * @param int $expected Expected result
 	 * @return void
 	 */
 	public function getCategoryIndexFromStringOrNumberReturnsIndex($input, $expected) {
diff --git a/typo3/sysext/feedit/Classes/FrontendEditPanel.php b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
index 7599e0278172128850e7712698c817e96e604679..a9bfebfefcb0cbcda76968a455cf33879f9015f0 100644
--- a/typo3/sysext/feedit/Classes/FrontendEditPanel.php
+++ b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
@@ -46,7 +46,7 @@ class FrontendEditPanel {
 	 * @param array $dataArr Alternative data array to use. Default is $this->data
 	 * @param string $table
 	 * @param string $allow
-	 * @param integer $newUID
+	 * @param int $newUID
 	 * @param array $hiddenFields
 	 * @return string The input content string with the editPanel appended. This function returns only an edit panel appended to the content string if a backend user is logged in (and has the correct permissions). Otherwise the content string is directly returned.
 	 */
@@ -165,7 +165,7 @@ class FrontendEditPanel {
 	 * @param array $dataArr Alternative data array to use. Default is $this->data
 	 * @param string $addUrlParamStr Additional URL parameters for the link pointing to alt_doc.php
 	 * @param string $table
-	 * @param integer $editUid
+	 * @param int $editUid
 	 * @param string $fieldList
 	 * @return string The input content string, possibly with edit icons added (not necessarily in the end but just after the last string of normal content.
 	 */
diff --git a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
index c613af0ef10f6ac35b2658cc35213b0f32c47d08..525d558ce563f623c1a585916e8aad30b0206afe 100644
--- a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
+++ b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
@@ -874,7 +874,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
 	 * Is used by forgot password - function with md5 option.
 	 *
 	 * @author Bernhard Kraft
-	 * @param integer $len Length of new password
+	 * @param int $len Length of new password
 	 * @return string New password
 	 */
 	protected function generatePassword($len) {
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index 4663d330587749323dc9eea43dd05ed55e9d2698..f23e546256ecb2410cf4f24ffad0027343c38d18 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -105,7 +105,7 @@ class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
 	 * Initialization of class
 	 *
 	 * @param \TYPO3\CMS\Core\Resource\Folder $folderObject The folder to work on
-	 * @param integer $pointer Pointer
+	 * @param int $pointer Pointer
 	 * @param bool $sort Sorting column
 	 * @param bool $sortRev Sorting direction
 	 * @param bool $bigControlPanel Show clipboard flag
diff --git a/typo3/sysext/filelist/Classes/FileListFolderTree.php b/typo3/sysext/filelist/Classes/FileListFolderTree.php
index d9cb1caacfa38e7fec6a5be41ec186c16ebc9778..90e7418b25418ba7f4e931b990e11040d68dfffa 100644
--- a/typo3/sysext/filelist/Classes/FileListFolderTree.php
+++ b/typo3/sysext/filelist/Classes/FileListFolderTree.php
@@ -46,7 +46,7 @@ class FileListFolderTree extends \TYPO3\CMS\Backend\Tree\View\FolderTreeView {
 	 *
 	 * @param string $title Title string
 	 * @param \TYPO3\CMS\Core\Resource\Folder $folderObject Folder to work on
-	 * @param integer $bank Bank pointer (which mount point number)
+	 * @param int $bank Bank pointer (which mount point number)
 	 * @return string
 	 * @access private
 	 */
diff --git a/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php b/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
index 86ff562d685b25d5c0b78ab57876aaaaf13ba6ce..bb50fc2496e9a3ab3a02a342349088905cfe6c82 100644
--- a/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
+++ b/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
@@ -36,7 +36,7 @@ abstract class AbstractCompiledTemplate implements \TYPO3\CMS\Fluid\Core\Parser\
 	/**
 	 * Public such that it is callable from within closures
 	 *
-	 * @param integer $uniqueCounter
+	 * @param int $uniqueCounter
 	 * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
 	 * @param string $viewHelperName
 	 * @return \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
diff --git a/typo3/sysext/fluid/Classes/Core/Parser/Configuration.php b/typo3/sysext/fluid/Classes/Core/Parser/Configuration.php
index 1d2eb4406d813431e220f37598f04b2f8f160dea..a9aa8836985347f7fe02181072b568325358f04f 100644
--- a/typo3/sysext/fluid/Classes/Core/Parser/Configuration.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/Configuration.php
@@ -44,7 +44,7 @@ class Configuration {
 	/**
 	 * Returns all interceptors for a given Interception Point.
 	 *
-	 * @param integer $interceptionPoint one of the \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_* constants,
+	 * @param int $interceptionPoint one of the \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_* constants,
 	 * @return \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface>
 	 */
 	public function getInterceptors($interceptionPoint) {
diff --git a/typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php b/typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php
index 38771f979ad14a39a771760133eda1709f94e34d..ed1638cb5d512fd0ed432f16b45d29051d78dfa9 100644
--- a/typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php
@@ -42,7 +42,7 @@ class Escape implements \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface {
 	 * If "escapingInterceptorEnabled" in the ViewHelper is FALSE, will disable itself inside the ViewHelpers body.
 	 *
 	 * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $node
-	 * @param integer $interceptorPosition One of the INTERCEPT_* constants for the current interception point
+	 * @param int $interceptorPosition One of the INTERCEPT_* constants for the current interception point
 	 * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $parsingState the current parsing state. Not needed in this interceptor.
 	 * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface
 	 */
diff --git a/typo3/sysext/fluid/Classes/Core/Parser/InterceptorInterface.php b/typo3/sysext/fluid/Classes/Core/Parser/InterceptorInterface.php
index 657d5281d8286b8031cd7db67278ad69d34c407d..5de240911f09c82fbece3bceb92789cbf396d69c 100644
--- a/typo3/sysext/fluid/Classes/Core/Parser/InterceptorInterface.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/InterceptorInterface.php
@@ -27,7 +27,7 @@ interface InterceptorInterface {
 	 * that will be used in place of the given node.
 	 *
 	 * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $node
-	 * @param integer $interceptorPosition One of the INTERCEPT_* constants for the current interception point
+	 * @param int $interceptorPosition One of the INTERCEPT_* constants for the current interception point
 	 * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $parsingState the parsing state
 	 * @return \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface
 	 */
diff --git a/typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php b/typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php
index 08fc053d74de842b892321662af1540a2c28e6f7..7a2dfbd164801da069f8642004e5ec2931df6df0 100644
--- a/typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/TemplateParser.php
@@ -420,7 +420,7 @@ class TemplateParser {
 	 * Build object tree from the split template
 	 *
 	 * @param array $splitTemplate The split template, so that every tag with a namespace declaration is already a separate array element.
-	 * @param integer $context one of the CONTEXT_* constants, defining whether we are inside or outside of ViewHelper arguments currently.
+	 * @param int $context one of the CONTEXT_* constants, defining whether we are inside or outside of ViewHelper arguments currently.
 	 * @return \TYPO3\CMS\Fluid\Core\Parser\ParsingState
 	 * @throws \TYPO3\CMS\Fluid\Core\Parser\Exception
 	 */
@@ -680,7 +680,7 @@ class TemplateParser {
 	 * Call all interceptors registered for a given interception point.
 	 *
 	 * @param \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\NodeInterface $node The syntax tree node which can be modified by the interceptors.
-	 * @param integer $interceptionPoint the interception point. One of the \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_* constants.
+	 * @param int $interceptionPoint the interception point. One of the \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface::INTERCEPT_* constants.
 	 * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state the parsing state
 	 * @return void
 	 */
@@ -802,7 +802,7 @@ class TemplateParser {
 	 *
 	 * @param \TYPO3\CMS\Fluid\Core\Parser\ParsingState $state Current parsing state
 	 * @param string $text Text to process
-	 * @param integer $context one of the CONTEXT_* constants, defining whether we are inside or outside of ViewHelper arguments currently.
+	 * @param int $context one of the CONTEXT_* constants, defining whether we are inside or outside of ViewHelper arguments currently.
 	 * @return void
 	 */
 	protected function textAndShorthandSyntaxHandler(\TYPO3\CMS\Fluid\Core\Parser\ParsingState $state, $text, $context) {
diff --git a/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php b/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
index 10efd94710feff6bc1f35f5775eed0ddfad86e90..670888ed078dfb51f3602cc27a20644febf45b0c 100644
--- a/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
+++ b/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
@@ -358,7 +358,7 @@ abstract class AbstractTemplateView implements \TYPO3\CMS\Extbase\Mvc\View\ViewI
 	/**
 	 * Start a new nested rendering. Pushes the given information onto the $renderingStack.
 	 *
-	 * @param integer $type one of the RENDERING_* constants
+	 * @param int $type one of the RENDERING_* constants
 	 * @param \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterface $parsedTemplate
 	 * @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
 	 * @return void
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php
index 96d4ac4ea6a1cc4a786073bffe9fe66ccb284d32..f9ebdb7c1d1508ea653da4973d040ebe84c6c16d 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php
@@ -58,10 +58,10 @@ class TableListViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBacken
 	 *
 	 * @param string $tableName name of the database table
 	 * @param array $fieldList list of fields to be displayed. If empty, only the title column (configured in $TCA[$tableName]['ctrl']['title']) is shown
-	 * @param integer $storagePid by default, records are fetched from the storage PID configured in persistence.storagePid. With this argument, the storage PID can be overwritten
-	 * @param integer $levels corresponds to the level selector of the TYPO3 list module. By default only records from the current storagePid are fetched
+	 * @param int $storagePid by default, records are fetched from the storage PID configured in persistence.storagePid. With this argument, the storage PID can be overwritten
+	 * @param int $levels corresponds to the level selector of the TYPO3 list module. By default only records from the current storagePid are fetched
 	 * @param string $filter corresponds to the "Search String" textbox of the TYPO3 list module. If not empty, only records matching the string will be fetched
-	 * @param integer $recordsPerPage amount of records to be displayed at once. Defaults to $TCA[$tableName]['interface']['maxSingleDBListItems'] or (if that's not set) to 100
+	 * @param int $recordsPerPage amount of records to be displayed at once. Defaults to $TCA[$tableName]['interface']['maxSingleDBListItems'] or (if that's not set) to 100
 	 * @param string $sortField table field to sort the results by
 	 * @param bool $sortDescending if TRUE records will be sorted in descending order
 	 * @param bool $readOnly if TRUE, the edit icons won't be shown. Otherwise edit icons will be shown, if the current BE user has edit rights for the specified table!
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
index e8ee4abe93f67c4eb8b0b185c4e296ac3800527b..de96b7da56c48c91a69254c9215adc7cb8f1649c 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
@@ -66,7 +66,7 @@ class PaginateController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetCont
 	}
 
 	/**
-	 * @param integer $currentPage
+	 * @param int $currentPage
 	 * @return void
 	 */
 	public function indexAction($currentPage = 1) {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php
index dea82ee5a7bd9657e5ae647a5132dc9d6a44fe33..844528e762570abdd6983169269e83c932c5c7b7 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/DebugViewHelper.php
@@ -38,7 +38,7 @@ class DebugViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelpe
 	 * A wrapper for Tx_Extbase_Utility_Debugger::var_dump().
 	 *
 	 * @param string $title optional custom title for the debug output
-	 * @param integer $maxDepth Sets the max recursion depth of the dump (defaults to 8). De- or increase the number according to your needs and memory limit.
+	 * @param int $maxDepth Sets the max recursion depth of the dump (defaults to 8). De- or increase the number according to your needs and memory limit.
 	 * @param bool $plainText If TRUE, the dump is in plain text, if FALSE the debug output is in HTML format.
 	 * @param bool $ansiColors If TRUE, ANSI color codes is added to the plaintext output, if FALSE (default) the plaintext debug output not colored.
 	 * @param bool $inline if TRUE, the dump is rendered at the position of the <f:debug> tag. If FALSE (default), the dump is displayed at the top of the page.
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
index 07616410b8695e86ea5e9ea30ab8bb8f731ecd76..71ecbed2df9e857771b0aa76d02709a53b6ce0b4 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/FormViewHelper.php
@@ -102,9 +102,9 @@ class FormViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormViewH
 	 * @param string $controller Target controller
 	 * @param string $extensionName Target Extension Name (without "tx_" prefix and no underscores). If NULL the current extension name is used
 	 * @param string $pluginName Target plugin. If empty, the current plugin name is used
-	 * @param integer $pageUid Target page uid
+	 * @param int $pageUid Target page uid
 	 * @param mixed $object Object to use for the form. Use in conjunction with the "property" attribute on the sub tags
-	 * @param integer $pageType Target page type
+	 * @param int $pageType Target page type
 	 * @param bool $noCache set this to disable caching for the target page. You should not need this.
 	 * @param bool $noCacheHash set this to supress the cHash query parameter created by TypoLink. You should not need this.
 	 * @param string $section The anchor to be added to the action URI (only active if $actionUri is not set)
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
index 9ef58f513a1887252fa308ec0d6c8ad458fe33d1..3ff98cc74babb6f7e43d4aee289c6ac1e1f0e41a 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/BytesViewHelper.php
@@ -44,8 +44,8 @@ class BytesViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelpe
 	/**
 	 * Render the supplied byte count as a human readable string.
 	 *
-	 * @param integer $value The incoming data to convert, or NULL if VH children should be used
-	 * @param integer $decimals The number of digits after the decimal point
+	 * @param int $value The incoming data to convert, or NULL if VH children should be used
+	 * @param int $decimals The number of digits after the decimal point
 	 * @param string $decimalSeparator The decimal point character
 	 * @param string $thousandsSeparator The character for grouping the thousand digits
 	 * @return string Formatted byte count
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
index 5d049127325bec57c20f76dfc1b58c0c72e2b52f..fd42cc27414d7b3d32fe7634108746eb92873c40 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
@@ -83,7 +83,7 @@ class CropViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
 	/**
 	 * Render the cropped text
 	 *
-	 * @param integer $maxCharacters Place where to truncate the string
+	 * @param int $maxCharacters Place where to truncate the string
 	 * @param string $append What to append, if truncation happened
 	 * @param bool $respectWordBoundaries If TRUE and division is in the middle of a word, the remains of that word is removed.
 	 * @param bool $respectHtml If TRUE the cropped string will respect HTML tags and entities. Technically that means, that cropHTML() is called rather than crop()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CurrencyViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CurrencyViewHelper.php
index e06257928f99fe0ec0c7caf152eb124f37dc95a1..6a66c4e5cdf46ae3174f7b1e242ce4eff188c9be 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CurrencyViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CurrencyViewHelper.php
@@ -47,7 +47,7 @@ class CurrencyViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHe
 	 * @param string $thousandsSeparator (optional) The thousands separator.
 	 * @param bool $prependCurrency (optional) Select if the curreny sign should be prepended
 	 * @param bool $separateCurrency (optional) Separate the currency sign from the number by a single space, defaults to true due to backwards compatibility
-	 * @param integer $decimals (optional) Set decimals places.
+	 * @param int $decimals (optional) Set decimals places.
 	 * @return string the formatted amount.
 	 * @api
 	 */
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/NumberViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/NumberViewHelper.php
index 9b8e03abcee42b65ea1622c081be8330457bafb4..d1a3d678701ff07595de6669e2ec79ae1e97315b 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/NumberViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/NumberViewHelper.php
@@ -39,7 +39,7 @@ class NumberViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelp
 	 * Format the numeric value as a number with grouped thousands, decimal point and
 	 * precision.
 	 *
-	 * @param integer $decimals The number of digits after the decimal point
+	 * @param int $decimals The number of digits after the decimal point
 	 * @param string $decimalSeparator The decimal point character
 	 * @param string $thousandsSeparator The character for grouping the thousand digits
 	 * @return string The formatted number
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/PaddingViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/PaddingViewHelper.php
index de460de9bd346da181c19dec787d29cb12f04455..edd8736809d866a1a778ec01223b06db55f277f5 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/PaddingViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/PaddingViewHelper.php
@@ -45,7 +45,7 @@ class PaddingViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHel
 	/**
 	 * Pad a string to a certain length with another string
 	 *
-	 * @param integer $padLength Length of the resulting string. If the value of pad_length is negative or less than the length of the input string, no padding takes place.
+	 * @param int $padLength Length of the resulting string. If the value of pad_length is negative or less than the length of the input string, no padding takes place.
 	 * @param string $padString The padding string
 	 * @param string $padType Append the padding at this site (Possible values: right,left,both. Default: right)
 	 * @return string The formatted value
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
index 449094e0d6edd4f90a7e6970430ced06a0c3bb65..a100e3e0bd09e2d1ffd3e2c9d078c88bdbe31225 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/ImageViewHelper.php
@@ -86,10 +86,10 @@ class ImageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedV
 	 * @param string $src a path to a file, a combined FAL identifier or an uid (integer). If $treatIdAsReference is set, the integer is considered the uid of the sys_file_reference record. If you already got a FAL object, consider using the $image parameter instead
 	 * @param string $width width of the image. This can be a numeric value representing the fixed width of the image in pixels. But you can also perform simple calculations by adding "m" or "c" to the value. See imgResource.width for possible options.
 	 * @param string $height height of the image. This can be a numeric value representing the fixed height of the image in pixels. But you can also perform simple calculations by adding "m" or "c" to the value. See imgResource.width for possible options.
-	 * @param integer $minWidth minimum width of the image
-	 * @param integer $minHeight minimum height of the image
-	 * @param integer $maxWidth maximum width of the image
-	 * @param integer $maxHeight maximum height of the image
+	 * @param int $minWidth minimum width of the image
+	 * @param int $minHeight minimum height of the image
+	 * @param int $maxWidth maximum width of the image
+	 * @param int $maxHeight maximum height of the image
 	 * @param bool $treatIdAsReference given src argument is a sys_file_reference record
 	 * @param FileInterface|AbstractFileFolder $image a FAL object
 	 *
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
index a773999a7c1a67aa9ffdca45ba0123a2b87a938f..6573810124684481b797f8c6ccafd1f03b415adb 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
@@ -52,8 +52,8 @@ class ActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBased
 	 * @param string $controller Target controller. If NULL current controllerName is used
 	 * @param string $extensionName Target Extension Name (without "tx_" prefix and no underscores). If NULL the current extension name is used
 	 * @param string $pluginName Target plugin. If empty, the current plugin name is used
-	 * @param integer $pageUid target page. See TypoLink destination
-	 * @param integer $pageType type of the target page. See typolink.parameter
+	 * @param int $pageUid target page. See TypoLink destination
+	 * @param int $pageType type of the target page. See typolink.parameter
 	 * @param bool $noCache set this to disable caching for the target page. You should not need this.
 	 * @param bool $noCacheHash set this to supress the cHash query parameter created by TypoLink. You should not need this.
 	 * @param string $section the anchor to be added to the URI
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
index 0bd08724d861122d7b76128aeed5ef58323a2fef..32ebf61fef6c38aa9ac9fbf1762628c598103b03 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
@@ -61,9 +61,9 @@ class PageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractTagBasedVi
 	}
 
 	/**
-	 * @param integer|NULL $pageUid target page. See TypoLink destination
+	 * @param int|NULL $pageUid target page. See TypoLink destination
 	 * @param array $additionalParams query parameters to be attached to the resulting URI
-	 * @param integer $pageType type of the target page. See typolink.parameter
+	 * @param int $pageType type of the target page. See typolink.parameter
 	 * @param bool $noCache set this to disable caching for the target page. You should not need this.
 	 * @param bool $noCacheHash set this to supress the cHash query parameter created by TypoLink. You should not need this.
 	 * @param string $section the anchor to be added to the URI
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
index ffa38c613d44cc5015b8623304d0ab7b90a4f1c6..059b4b339e9683dba064f722256e00634411a13a 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ActionViewHelper.php
@@ -34,8 +34,8 @@ class ActionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelp
 	 * @param string $controller Target controller. If NULL current controllerName is used
 	 * @param string $extensionName Target Extension Name (without "tx_" prefix and no underscores). If NULL the current extension name is used
 	 * @param string $pluginName Target plugin. If empty, the current plugin name is used
-	 * @param integer $pageUid target page. See TypoLink destination
-	 * @param integer $pageType type of the target page. See typolink.parameter
+	 * @param int $pageUid target page. See TypoLink destination
+	 * @param int $pageType type of the target page. See typolink.parameter
 	 * @param bool $noCache set this to disable caching for the target page. You should not need this.
 	 * @param bool $noCacheHash set this to supress the cHash query parameter created by TypoLink. You should not need this.
 	 * @param string $section the anchor to be added to the URI
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
index c5cd09d0c9a9eabc5e8133c94f56c95e656aac50..36641a0da27d4f4b5b7c7dce391b68a6f92e4875 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/ImageViewHelper.php
@@ -70,10 +70,10 @@ class ImageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelpe
 	 * @param FileInterface|AbstractFileFolder $image
 	 * @param string $width width of the image. This can be a numeric value representing the fixed width of the image in pixels. But you can also perform simple calculations by adding "m" or "c" to the value. See imgResource.width for possible options.
 	 * @param string $height height of the image. This can be a numeric value representing the fixed height of the image in pixels. But you can also perform simple calculations by adding "m" or "c" to the value. See imgResource.width for possible options.
-	 * @param integer $minWidth minimum width of the image
-	 * @param integer $minHeight minimum height of the image
-	 * @param integer $maxWidth maximum width of the image
-	 * @param integer $maxHeight maximum height of the image
+	 * @param int $minWidth minimum width of the image
+	 * @param int $minHeight minimum height of the image
+	 * @param int $maxWidth maximum width of the image
+	 * @param int $maxHeight maximum height of the image
 	 * @param bool $treatIdAsReference given src argument is a sys_file_reference record
 	 * @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
 	 * @return string path to the image
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/PageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/PageViewHelper.php
index 401cb29e0311a172fccc89070dc44ca5b8b8b5e9..16f5b2308cb3f962fd6029fcae339a70831d12f3 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Uri/PageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Uri/PageViewHelper.php
@@ -45,9 +45,9 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Uri;
 class PageViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
 	/**
-	 * @param integer|NULL $pageUid target PID
+	 * @param int|NULL $pageUid target PID
 	 * @param array $additionalParams query parameters to be attached to the resulting URI
-	 * @param integer $pageType type of the target page. See typolink.parameter
+	 * @param int $pageType type of the target page. See typolink.parameter
 	 * @param bool $noCache set this to disable caching for the target page. You should not need this.
 	 * @param bool $noCacheHash set this to supress the cHash query parameter created by TypoLink. You should not need this.
 	 * @param string $section the anchor to be added to the URI
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
index 3b1369c42fff20d4b856bbe649cc03d185064c35..a1e1f059ab8ae767807bd013cf74d77dcf15c0ac 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
@@ -58,7 +58,7 @@ class PaginateController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetCont
 	}
 
 	/**
-	 * @param integer $currentPage
+	 * @param int $currentPage
 	 * @return void
 	 */
 	public function indexAction($currentPage = 1) {
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper.php b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper.php
index 49b96b7d9063a78f55962a843c3c5cb08da08933..30c182bca16299d68dca7965c65083c3b0cad89e 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper.php
@@ -6,7 +6,7 @@ class TestViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
 	/**
 	 * My comments. Bla blubb.
 	 *
-	 * @param integer $param1 P1 Stuff
+	 * @param int $param1 P1 Stuff
 	 * @param array $param2 P2 Stuff
 	 * @param string $param3 P3 Stuff
 	 */
diff --git a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper2.php b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper2.php
index 5d9d6b96e2288a722b32160b9cfb6deac0e12e16..8029ec9da231d19042d93faf9638a1ef907c89df 100644
--- a/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper2.php
+++ b/typo3/sysext/fluid/Tests/Unit/Core/Fixtures/TestViewHelper2.php
@@ -6,7 +6,7 @@ class TestViewHelper2 extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelpe
 	/**
 	 * My comments. Bla blubb.
 	 *
-	 * @param integer $param1 P1 Stuff
+	 * @param int $param1 P1 Stuff
 	 * @param array $param2 P2 Stuff
 	 * @param string $param3 P3 Stuff
 	 */
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/UserDomainClass.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/UserDomainClass.php
index 6712f8da8b815e6e16bd92fdbde89ed7999096fd..bb49bb58f82eb18202f911622b226e97019f27d3 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/UserDomainClass.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/UserDomainClass.php
@@ -25,7 +25,7 @@ class UserDomainClass {
 	/**
 	 * Constructor.
 	 *
-	 * @param integer $id
+	 * @param int $id
 	 * @param string $firstName
 	 * @param string $lastName
 	 */
diff --git a/typo3/sysext/form/Classes/Domain/Factory/JsonToTypoScript.php b/typo3/sysext/form/Classes/Domain/Factory/JsonToTypoScript.php
index 9cc5b349749ce3839a9ad634a443b2731066abe3..a4287d8bb0df3dcededf62b0b9580cee7c250d27 100644
--- a/typo3/sysext/form/Classes/Domain/Factory/JsonToTypoScript.php
+++ b/typo3/sysext/form/Classes/Domain/Factory/JsonToTypoScript.php
@@ -142,7 +142,7 @@ class JsonToTypoScript {
 	 * @param array $element The JSON array for this element
 	 * @param array $parent The parent element
 	 * @param bool $childrenWithParentName Indicates if the children use the parent name
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function getContainer(array $element, array &$parent, $elementCounter, $childrenWithParentName = FALSE) {
@@ -160,7 +160,7 @@ class JsonToTypoScript {
 	 *
 	 * @param array $element The JSON array for this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function getForm(array $element, array &$parent, $elementCounter) {
@@ -178,7 +178,7 @@ class JsonToTypoScript {
 	 *
 	 * @param array $element The JSON array for this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @param bool $childrenWithParentName Indicates if the children use the parent name
 	 * @return void
 	 */
@@ -240,7 +240,7 @@ class JsonToTypoScript {
 	 *
 	 * @param array $element The JSON array for this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @param bool $childrenWithParentName Indicates if the children use the parent name
 	 * @return void
 	 */
@@ -291,7 +291,7 @@ class JsonToTypoScript {
 	 *
 	 * @param array $attributes The JSON array for the attributes of this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @param bool $childrenWithParentName Indicates if the children use the parent name
 	 * @return void
 	 */
@@ -313,7 +313,7 @@ class JsonToTypoScript {
 	 *
 	 * @param bool $confirmation TRUE when confirmation screen
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function setConfirmation($confirmation, array &$parent, $elementCounter) {
@@ -325,7 +325,7 @@ class JsonToTypoScript {
 	 *
 	 * @param array $filters The JSON array for the filters of this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function setFilters(array $filters, array &$parent, $elementCounter) {
@@ -345,7 +345,7 @@ class JsonToTypoScript {
 	 *
 	 * @param array $label The JSON array for the label of this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function setLabel(array $label, array &$parent, $elementCounter) {
@@ -364,7 +364,7 @@ class JsonToTypoScript {
 	 * @param array $element The JSON array for this element
 	 * @param string $value The layout setting, back or front
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function setLayout(array $element, $value, array &$parent, $elementCounter) {
@@ -411,7 +411,7 @@ class JsonToTypoScript {
 	 *
 	 * @param array $legend The JSON array for the legend of this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function setLegend(array $legend, array &$parent, $elementCounter) {
@@ -430,7 +430,7 @@ class JsonToTypoScript {
 	 * @param array $element The JSON array for this element
 	 * @param array $options The JSON array for the options of this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function setOptions(array $element, array $options, array &$parent, $elementCounter) {
@@ -452,7 +452,7 @@ class JsonToTypoScript {
 	 *
 	 * @param array $postProcessors The JSON array for the post processors of this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function setPostProcessor(array $postProcessors, array &$parent, $elementCounter) {
@@ -474,7 +474,7 @@ class JsonToTypoScript {
 	 *
 	 * @param string $prefix The prefix for all element names
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function setPrefix($prefix, array &$parent, $elementCounter) {
@@ -512,7 +512,7 @@ class JsonToTypoScript {
 	 * @param array $element The JSON array for this element
 	 * @param array $options The JSON array for the various options of this element
 	 * @param array $parent The parent element
-	 * @param integer $elementCounter The element counter
+	 * @param int $elementCounter The element counter
 	 * @return void
 	 */
 	protected function setVarious(array $element, array $various, array &$parent, $elementCounter) {
@@ -536,7 +536,7 @@ class JsonToTypoScript {
 	 *
 	 * @param array $typoscriptArray The TypoScript array
 	 * @param string $addKey Key which has underlying configuration
-	 * @param integer $tabCount The amount of tabs for indentation
+	 * @param int $tabCount The amount of tabs for indentation
 	 * @return string The formatted TypoScript string
 	 */
 	protected function typoscriptArrayToString(array $typoscriptArray, $addKey = '', $tabCount = -1) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
index 3d94abd45aa4d610892ca9d527be7548f91f82ec..ce27f4c38a00c0ca737a233e6e5bb23ff2a3c338 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
@@ -45,7 +45,7 @@ class AttributesAttribute {
 	/**
 	 * Constructor
 	 *
-	 * @param integer $elementId The ID of the element
+	 * @param int $elementId The ID of the element
 	 * @return void
 	 */
 	public function __construct($elementId) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Content.php b/typo3/sysext/form/Classes/Domain/Model/Content.php
index 37185f84bf9329ba991247154ab5db4c0c3212ad..efb1dab4d91a095fa4f9268c8c0bd6af35109d55 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Content.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Content.php
@@ -45,7 +45,7 @@ class Content {
 	/**
 	 * Sets the uid
 	 *
-	 * @param integer $uid The uid
+	 * @param int $uid The uid
 	 * @return void
 	 */
 	public function setUid($uid) {
@@ -64,7 +64,7 @@ class Content {
 	/**
 	 * Sets the page id
 	 *
-	 * @param integer $pageId The page id
+	 * @param int $pageId The page id
 	 * @return void
 	 */
 	public function setPageId($pageId) {
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
index 757bae75db0d057f77a36deed3dce349fe1a6882..87066e77799ae9ab646fcfa17f67f784bdb1f1ab 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
@@ -150,7 +150,7 @@ abstract class AbstractElement {
 	/**
 	 * Constructor
 	 *
-	 * @param integer $elementId Internal Id of the element
+	 * @param int $elementId Internal Id of the element
 	 * @param array $arguments Configuration array
 	 */
 	public function __construct() {
@@ -167,7 +167,7 @@ abstract class AbstractElement {
 	/**
 	 * Set the internal ID of the element
 	 *
-	 * @param integer $elementId Internal Id of the element
+	 * @param int $elementId Internal Id of the element
 	 * @return void
 	 */
 	public function setElementId() {
diff --git a/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php b/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php
index f8564304559cb420e00ccaec66bd209bdfcfdcf0..3e6c6f2399d802b86e194bd753bdd07409bd5987 100644
--- a/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php
@@ -59,7 +59,7 @@ class FileMaximumSizeValidator extends \TYPO3\CMS\Form\Validation\AbstractValida
 	/**
 	 * Set the maximum value
 	 *
-	 * @param integer $maximum Maximum value
+	 * @param int $maximum Maximum value
 	 * @return object Rule object
 	 */
 	public function setMaximum($maximum) {
diff --git a/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php b/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php
index 3b9ba320aae3b11e4d9afc8842b8a644430c75a6..6ee447c6df186903769dc6772857561dfa305885 100644
--- a/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php
@@ -58,7 +58,7 @@ class FileMinimumSizeValidator extends \TYPO3\CMS\Form\Validation\AbstractValida
 	/**
 	 * Set the minimum value
 	 *
-	 * @param integer $minimum Minimum value
+	 * @param int $minimum Minimum value
 	 * @return object Rule object
 	 */
 	public function setMinimum($minimum) {
diff --git a/typo3/sysext/form/Classes/Validation/LengthValidator.php b/typo3/sysext/form/Classes/Validation/LengthValidator.php
index 534f0f032980a4cc2d454cacecc672b8fcb7a433..05a0189380617bb0d03ee03dcab72efa97454986 100644
--- a/typo3/sysext/form/Classes/Validation/LengthValidator.php
+++ b/typo3/sysext/form/Classes/Validation/LengthValidator.php
@@ -76,7 +76,7 @@ class LengthValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 	/**
 	 * Set the minimum value
 	 *
-	 * @param integer $minimum Minimum value
+	 * @param int $minimum Minimum value
 	 * @return object Rule object
 	 */
 	public function setMinimum($minimum) {
@@ -87,7 +87,7 @@ class LengthValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 	/**
 	 * Set the maximum value
 	 *
-	 * @param integer $maximum Maximum value
+	 * @param int $maximum Maximum value
 	 * @return object Rule object
 	 */
 	public function setMaximum($maximum) {
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php
index ae551d97a32a17be8e84cf592662ae33fa795f0e..45ee0c9be0e1cc3bf69e49754f1c15096e7c3835 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php
@@ -35,7 +35,7 @@ abstract class AbstractElementView {
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement $model
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\AbstractElement $model, $spaces) {
 		$this->model = $model;
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxElementView.php
index 0b1e60cedc31d447bd76564369895853a108530a..087edefe76a726fe0c33ca01490f76e354475573 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxElementView.php
@@ -25,7 +25,7 @@ class CheckboxElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Abstra
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\CheckboxElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\CheckboxElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxGroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxGroupElementView.php
index 521e8b5f7bb7472773af1975721b28d23c249445..1d82ab0b70e800b21cce3df2c9eabdc3e5775f22 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/CheckboxGroupElementView.php
@@ -24,7 +24,7 @@ class CheckboxGroupElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\C
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\CheckboxGroupElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\CheckboxGroupElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/ContainerElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/ContainerElementView.php
index b9523e6c12d18f548abcdf6acd4d5c09084cbbec..2daf09766735bb5a50f6e874897226ad4d6720c9 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/ContainerElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/ContainerElementView.php
@@ -23,7 +23,7 @@ class ContainerElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Abstr
 
 	/**
 	 * @param array $children
-	 * @param integer $spaces
+	 * @param int $spaces
 	 * @return string
 	 */
 	protected function renderChildren(array $children, $spaces = 0) {
@@ -37,7 +37,7 @@ class ContainerElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Abstr
 
 	/**
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement $modelChild
-	 * @param integer $spaces
+	 * @param int $spaces
 	 * @return string
 	 */
 	protected function renderChild(\TYPO3\CMS\Form\Domain\Model\Element\AbstractElement $modelChild, $spaces) {
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/FieldsetElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/FieldsetElementView.php
index db9caefca714b9f9a90bbfe6ba327f4bbcee5e0b..94cd9b687b2a52f4d7044ebe56b09bd8bb6448ca 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/FieldsetElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/FieldsetElementView.php
@@ -25,7 +25,7 @@ class FieldsetElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Contai
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\FieldsetElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\FieldsetElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/FileuploadElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/FileuploadElementView.php
index 6c1075b376f3f6b6a6baa0624e51201e2e0a9184..bcfccdba2658bb309218cb9b597835aa48a69d8c 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/FileuploadElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/FileuploadElementView.php
@@ -30,7 +30,7 @@ class FileuploadElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Cont
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\FileuploadElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\FileuploadElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/HiddenElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/HiddenElementView.php
index a94074f45dd9ab0e8f9b534d905dbd2ba791c265..11bb7b9564e44632d8e7a76c11a77a0c0f212552 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/HiddenElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/HiddenElementView.php
@@ -25,7 +25,7 @@ class HiddenElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Abstract
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\HiddenElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\HiddenElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptgroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptgroupElementView.php
index c06b02ba1e1d46505a6e742374ba12d9a27c1ff0..f1e013fe7c2b023aabc44b37fe8c97d85bc4cd38 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptgroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptgroupElementView.php
@@ -25,7 +25,7 @@ class OptgroupElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Contai
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\OptgroupElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\OptgroupElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptionElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptionElementView.php
index 5aed0222a1c0063846adc7212799dfda46e9ff79..8dcbf41182682a12358e618bd8bcd94deee673fb 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptionElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/OptionElementView.php
@@ -25,7 +25,7 @@ class OptionElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Abstract
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\OptionElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\OptionElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioElementView.php
index 3d80466620f036f88ded470377dbe55d414c8613..05e1abed80fa1b780a9b79f0bbb07eb3bb1a8970 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioElementView.php
@@ -25,7 +25,7 @@ class RadioElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\AbstractE
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\RadioElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\RadioElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioGroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioGroupElementView.php
index ae6fb2c7e92013da2f7e591056b46dc8699766f5..d366238cbc7749c23d4b4f63d65db5b987108f58 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioGroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/RadioGroupElementView.php
@@ -25,7 +25,7 @@ class RadioGroupElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Cont
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\RadioGroupElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\RadioGroupElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/SelectElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/SelectElementView.php
index e184969a0e85c0fa79d775c4db99404811f507bd..bbebeec8aea4ee1ed454212011478eb03566c347 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/SelectElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/SelectElementView.php
@@ -25,7 +25,7 @@ class SelectElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Containe
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\SelectElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\SelectElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextareaElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextareaElementView.php
index 63ae3f9b26ad60c62844071cd32eae22032e6723..8d64cb503c7e6278879b54c558d0fa83c0cf434a 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextareaElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextareaElementView.php
@@ -25,7 +25,7 @@ class TextareaElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Abstra
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\TextareaElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\TextareaElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextlineElementView.php b/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextlineElementView.php
index 4fd229e0f6391e4b8d99de405b06540f230f8baa..0072a9817406c7d23a75714a41ed28a2296e3c14 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextlineElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/TextlineElementView.php
@@ -25,7 +25,7 @@ class TextlineElementView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\Abstra
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Element\TextlineElement $model Model for this element
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Element\TextlineElement $model, $spaces) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/form/Classes/View/Mail/Plain/PlainView.php b/typo3/sysext/form/Classes/View/Mail/Plain/PlainView.php
index 328ed8a2a5becd31d34ba91b78a554e855621eb6..07842517cab14fa14d85b936496c3e42e6cdc048 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/PlainView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/PlainView.php
@@ -25,7 +25,7 @@ class PlainView extends \TYPO3\CMS\Form\View\Mail\Plain\Element\ContainerElement
 	 * Constructor
 	 *
 	 * @param \TYPO3\CMS\Form\Domain\Model\Form $model
-	 * @param integer $spaces
+	 * @param int $spaces
 	 */
 	public function __construct(\TYPO3\CMS\Form\Domain\Model\Form $model, $spaces = 0) {
 		parent::__construct($model, $spaces);
diff --git a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
index 16ac08a73d4c7c16498ecf438ab5977ac8f9c957..2ec06dedf8ad2d04dbe544e4b24a1ed47556978e 100644
--- a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
+++ b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
@@ -563,7 +563,7 @@ class FrontendUserAuthentication extends \TYPO3\CMS\Core\Authentication\Abstract
 	 * If a change in the recs storage happens (which it probably does) the function setKey() is called in order to store the array again.
 	 *
 	 * @param array $recs The data array to merge into/override the current recs values. The $recs array is constructed as [table]][uid] = scalar-value (eg. string/integer).
-	 * @param integer $maxSizeOfSessionData The maximum size of stored session data. If zero, no limit is applied and even confirmation of cookie session is discarded.
+	 * @param int $maxSizeOfSessionData The maximum size of stored session data. If zero, no limit is applied and even confirmation of cookie session is discarded.
 	 * @return void
 	 */
 	public function record_registration($recs, $maxSizeOfSessionData = 0) {
@@ -598,7 +598,7 @@ class FrontendUserAuthentication extends \TYPO3\CMS\Core\Authentication\Abstract
 	 *
 	 * This calls the parent function but additionally tries to look up the session ID in the "fe_session_data" table.
 	 *
-	 * @param integer $id Claimed Session ID
+	 * @param int $id Claimed Session ID
 	 * @return boolean Returns TRUE if a corresponding session was found in the database
 	 */
 	public function isExistingSessionRecord($id) {
diff --git a/typo3/sysext/frontend/Classes/Category/Collection/CategoryCollection.php b/typo3/sysext/frontend/Classes/Category/Collection/CategoryCollection.php
index fe725d87148aaf5276353138dafbb8c4e5683dbf..8b1b68045944150ea4d095e22fe8eb71e377f0d3 100644
--- a/typo3/sysext/frontend/Classes/Category/Collection/CategoryCollection.php
+++ b/typo3/sysext/frontend/Classes/Category/Collection/CategoryCollection.php
@@ -54,7 +54,7 @@ class CategoryCollection extends \TYPO3\CMS\Core\Category\Collection\CategoryCol
 	 * Overrides the parent method because of the call to "self::create()" which otherwise calls up
 	 * \TYPO3\CMS\Core\Category\Collection\CategoryCollection
 	 *
-	 * @param integer $id Id of database record to be loaded
+	 * @param int $id Id of database record to be loaded
 	 * @param bool $fillItems Populates the entries directly on load, might be bad for memory on large collections
 	 * @param string $tableName the table name
 	 * @param string $fieldName Name of the categories relation field
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index a27b8bfa4e1662359894ae48a842bec661253d72..2fc8fc158c8d9474b81a847e0d57792add04849f 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -1477,7 +1477,7 @@ class ContentObjectRenderer {
 	 * The SYS_LASTCHANGED timestamp can be used by various caching/indexing applications to determine if the page has new content.
 	 * Therefore you should call this function with the last-changed timestamp of any element you display.
 	 *
-	 * @param integer $tstamp Unix timestamp (number of seconds since 1970)
+	 * @param int $tstamp Unix timestamp (number of seconds since 1970)
 	 * @return void
 	 * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::setSysLastChanged()
 	 */
@@ -5522,7 +5522,7 @@ class ContentObjectRenderer {
 	 * Processing of key values pointing to entries in $arr; Here negative values are converted to positive keys pointer to an entry in the array but from behind (based on the negative value).
 	 * Example: entrylevel = -1 means that entryLevel ends up pointing at the outermost-level, -2 means the level before the outermost...
 	 *
-	 * @param integer $key The integer to transform
+	 * @param int $key The integer to transform
 	 * @param array $arr array in which the key should be found.
 	 * @return integer The processed integer key value.
 	 * @access private
@@ -6288,7 +6288,7 @@ class ContentObjectRenderer {
 	 * Returns the current page URL
 	 *
 	 * @param array|string $urlParameters As an array key/value pairs represent URL parameters to set. Values NOT URL-encoded yet, keys should be URL-encoded if needed. As a string the parameter is expected to be URL-encoded already.
-	 * @param integer $id An alternative ID to the current id ($GLOBALS['TSFE']->id)
+	 * @param int $id An alternative ID to the current id ($GLOBALS['TSFE']->id)
 	 * @return string The URL
 	 * @see getTypoLink_URL()
 	 */
@@ -6300,7 +6300,7 @@ class ContentObjectRenderer {
 	 * Returns the &MP variable value for a page id.
 	 * The function will do its best to find a MP value that will keep the page id inside the current Mount Point rootline if any.
 	 *
-	 * @param integer $pageId page id
+	 * @param int $pageId page id
 	 * @param bool $raw If TRUE, the MPvalue is returned raw. Normally it is encoded as &MP=... variable
 	 * @return string MP value, prefixed with &MP= (depending on $raw)
 	 * @see typolink()
@@ -6652,7 +6652,7 @@ class ContentObjectRenderer {
 	/**
 	 * Returns the 'age' of the tstamp $seconds
 	 *
-	 * @param integer $seconds Seconds to return age for. Example: "70" => "1 min", "3601" => "1 hrs
+	 * @param int $seconds Seconds to return age for. Example: "70" => "1 min", "3601" => "1 hrs
 	 * @param string $labels The labels of the individual units. Defaults to : ' min| hrs| days| yrs'
 	 * @return string The formatted string
 	 */
@@ -6867,8 +6867,8 @@ class ContentObjectRenderer {
 	 * Splits a text string into lines and returns an array with these lines but a max number of lines.
 	 *
 	 * @param string $string The string to break
-	 * @param integer $chars Max number of characters per line.
-	 * @param integer $maxLines Max number of lines in all.
+	 * @param int $chars Max number of characters per line.
+	 * @param int $maxLines Max number of lines in all.
 	 * @return array array with lines.
 	 * @access private
 	 * @see gifBuilderTextBox()
@@ -6986,7 +6986,7 @@ class ContentObjectRenderer {
 	 * If the $GLOBALS['TCA'] config for the table tells us to NOT "physically" delete the record but rather set the "deleted" field to "1" then an UPDATE query is returned doing just that. Otherwise it truely is a DELETE query.
 	 *
 	 * @param string $table The table name, should be in $GLOBALS['TCA']
-	 * @param integer $uid The UID of the record from $table which we are going to delete
+	 * @param int $uid The UID of the record from $table which we are going to delete
 	 * @param bool $doExec If set, the query is executed. IT'S HIGHLY RECOMMENDED TO USE THIS FLAG to execute the query directly!!!
 	 * @return string The query, ready to execute unless $doExec was TRUE in which case the return value is FALSE.
 	 * @see DBgetUpdate(), DBgetInsert(), user_feAdmin
@@ -7023,7 +7023,7 @@ class ContentObjectRenderer {
 	 * NOTICE: From TYPO3 3.6.0 this function ALWAYS adds slashes to values inserted in the query.
 	 *
 	 * @param string $table The table name, should be in $GLOBALS['TCA']
-	 * @param integer $uid The UID of the record from $table which we are going to update
+	 * @param int $uid The UID of the record from $table which we are going to update
 	 * @param array $dataArr The data array where key/value pairs are fieldnames/values for the record to update.
 	 * @param string $fieldList Comma list of fieldnames which are allowed to be updated. Only values from the data record for fields in this list will be updated!!
 	 * @param bool $doExec If set, the query is executed. IT'S HIGHLY RECOMMENDED TO USE THIS FLAG to execute the query directly!!!
@@ -7062,7 +7062,7 @@ class ContentObjectRenderer {
 	 * NOTICE: From TYPO3 3.6.0 this function ALWAYS adds slashes to values inserted in the query.
 	 *
 	 * @param string $table The table name, should be in $GLOBALS['TCA']
-	 * @param integer $pid The PID value for the record to insert
+	 * @param int $pid The PID value for the record to insert
 	 * @param array $dataArr The data array where key/value pairs are fieldnames/values for the record to insert
 	 * @param string $fieldList Comma list of fieldnames which are allowed to be inserted. Only values from the data record for fields in this list will be inserted!!
 	 * @param bool $doExec If set, the query is executed. IT'S HIGHLY RECOMMENDED TO USE THIS FLAG to execute the query directly!!!
@@ -7235,14 +7235,14 @@ class ContentObjectRenderer {
 	 * Mount Pages are also descended but notice that these ID numbers are not
 	 * useful for links unless the correct MPvar is set.
 	 *
-	 * @param integer $id The id of the start page from which point in the page tree to descend. IF NEGATIVE the id itself is included in the end of the list (only if $begin is 0) AND the output does NOT contain a last comma. Recommended since it will resolve the input ID for mount pages correctly and also check if the start ID actually exists!
-	 * @param integer $depth The number of levels to descend. If you want to descend infinitely, just set this to 100 or so. Should be at least "1" since zero will just make the function return (no decend...)
-	 * @param integer $begin Is an optional integer that determines at which level in the tree to start collecting uid's. Zero means 'start right away', 1 = 'next level and out'
+	 * @param int $id The id of the start page from which point in the page tree to descend. IF NEGATIVE the id itself is included in the end of the list (only if $begin is 0) AND the output does NOT contain a last comma. Recommended since it will resolve the input ID for mount pages correctly and also check if the start ID actually exists!
+	 * @param int $depth The number of levels to descend. If you want to descend infinitely, just set this to 100 or so. Should be at least "1" since zero will just make the function return (no decend...)
+	 * @param int $begin Is an optional integer that determines at which level in the tree to start collecting uid's. Zero means 'start right away', 1 = 'next level and out'
 	 * @param bool $dontCheckEnableFields See function description
 	 * @param string $addSelectFields Additional fields to select. Syntax: ",[fieldname],[fieldname],...
 	 * @param string $moreWhereClauses Additional where clauses. Syntax: " AND [fieldname]=[value] AND ...
 	 * @param array $prevId_array array of IDs from previous recursions. In order to prevent infinite loops with mount pages.
-	 * @param integer $recursionLevel Internal: Zero for the first recursion, incremented for each recursive call.
+	 * @param int $recursionLevel Internal: Zero for the first recursion, incremented for each recursive call.
 	 * @return string Returns the list of ids as a comma separated string
 	 * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::checkEnableFields(), \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::checkPagerecordForIncludeSection()
 	 */
@@ -7831,7 +7831,7 @@ class ContentObjectRenderer {
 	/**
 	 * Checks if a page UID is available due to enableFields() AND the list of bad doktype numbers ($this->checkPid_badDoktypeList)
 	 *
-	 * @param integer $uid Page UID to test
+	 * @param int $uid Page UID to test
 	 * @return boolean TRUE if OK
 	 * @access private
 	 * @see getWhere(), checkPidArray()
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index ae219ab0c73a104fa903653574a25bf8071f2d97..fef2dead6d56a79c545d01baa4464922d8c16f3c 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -133,9 +133,9 @@ class AbstractMenuContentObject {
 	 *
 	 * @param object $tmpl The $GLOBALS['TSFE']->tmpl object
 	 * @param object $sys_page The $GLOBALS['TSFE']->sys_page object
-	 * @param integer $id A starting point page id. This should probably be blank since the 'entryLevel' value will be used then.
+	 * @param int $id A starting point page id. This should probably be blank since the 'entryLevel' value will be used then.
 	 * @param array $conf The TypoScript configuration for the HMENU cObject
-	 * @param integer $menuNumber Menu number; 1,2,3. Should probably be '1'
+	 * @param int $menuNumber Menu number; 1,2,3. Should probably be '1'
 	 * @param string $objSuffix Submenu Object suffix. This offers submenus a way to use alternative configuration for specific positions in the menu; By default "1 = TMENU" would use "1." for the TMENU configuration, but if this string is set to eg. "a" then "1a." would be used for configuration instead (while "1 = " is still used for the overall object definition of "TMENU")
 	 * @return boolean Returns TRUE on success
 	 * @see \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::HMENU()
@@ -933,7 +933,7 @@ class AbstractMenuContentObject {
 	 * Basically it will produce an individual array for each menu item based on the item states. BUT in addition the "optionSplit" syntax for the values is ALSO evaluated here so that all property-values are "option-splitted" and the output will thus be resolved.
 	 * Is called from the "generate" functions in the extension classes. The function is processor intensive due to the option split feature in particular. But since the generate function is not always called (since the ->result array may be cached, see makeMenu) it doesn't hurt so badly.
 	 *
-	 * @param integer $splitCount Number of menu items in the menu
+	 * @param int $splitCount Number of menu items in the menu
 	 * @return array An array with two keys: array($NOconf,$ROconf) - where $NOconf contains the resolved configuration for each item when NOT rolled-over and $ROconf contains the ditto for the mouseover state (if any)
 	 * @access private
 	 */
@@ -1182,9 +1182,9 @@ class AbstractMenuContentObject {
 	 * Creates the URL, target and onclick values for the menu item link. Returns them in an array as key/value pairs for <A>-tag attributes
 	 * This function doesn't care about the url, because if we let the url be redirected, it will be logged in the stat!!!
 	 *
-	 * @param integer $key Pointer to a key in the $this->menuArr array where the value for that key represents the menu item we are linking to (page record)
+	 * @param int $key Pointer to a key in the $this->menuArr array where the value for that key represents the menu item we are linking to (page record)
 	 * @param string $altTarget Alternative target
-	 * @param integer $typeOverride Alternative type
+	 * @param int $typeOverride Alternative type
 	 * @return array Returns an array with A-tag attributes as key/value pairs (HREF, TARGET and onClick)
 	 * @access private
 	 */
@@ -1363,7 +1363,7 @@ class AbstractMenuContentObject {
 	/**
 	 * Creates a submenu level to the current level - if configured for.
 	 *
-	 * @param integer $uid Page id of the current page for which a submenu MAY be produced (if conditions are met)
+	 * @param int $uid Page id of the current page for which a submenu MAY be produced (if conditions are met)
 	 * @param string $objSuffix Object prefix, see ->start()
 	 * @return string HTML content of the submenu
 	 * @access private
@@ -1417,7 +1417,7 @@ class AbstractMenuContentObject {
 	/**
 	 * Returns TRUE if the page with UID $uid is the NEXT page in root line (which means a submenu should be drawn)
 	 *
-	 * @param integer $uid Page uid to evaluate.
+	 * @param int $uid Page uid to evaluate.
 	 * @param string $MPvar MPvar for the current position of item.
 	 * @return boolean TRUE if page with $uid is active
 	 * @access private
@@ -1437,7 +1437,7 @@ class AbstractMenuContentObject {
 	/**
 	 * Returns TRUE if the page with UID $uid is active (in the current rootline)
 	 *
-	 * @param integer $uid Page uid to evaluate.
+	 * @param int $uid Page uid to evaluate.
 	 * @param string $MPvar MPvar for the current position of item.
 	 * @return boolean TRUE if page with $uid is active
 	 * @access private
@@ -1456,7 +1456,7 @@ class AbstractMenuContentObject {
 	/**
 	 * Returns TRUE if the page with UID $uid is the CURRENT page (equals $GLOBALS['TSFE']->id)
 	 *
-	 * @param integer $uid Page uid to evaluate.
+	 * @param int $uid Page uid to evaluate.
 	 * @param string $MPvar MPvar for the current position of item.
 	 * @return boolean TRUE if page $uid = $GLOBALS['TSFE']->id
 	 * @access private
@@ -1472,7 +1472,7 @@ class AbstractMenuContentObject {
 	 * Returns TRUE if there is a submenu with items for the page id, $uid
 	 * Used by the item states "IFSUB", "ACTIFSUB" and "CURIFSUB" to check if there is a submenu
 	 *
-	 * @param integer $uid Page uid for which to search for a submenu
+	 * @param int $uid Page uid for which to search for a submenu
 	 * @return boolean Returns TRUE if there was a submenu with items found
 	 * @access private
 	 */
@@ -1521,7 +1521,7 @@ class AbstractMenuContentObject {
 	 * Used by procesItemStates() to evaluate if a menu item (identified by $key) is in a certain state.
 	 *
 	 * @param string $kind The item state to evaluate (SPC, IFSUB, ACT etc... but no xxxRO states of course)
-	 * @param integer $key Key pointing to menu item from ->menuArr
+	 * @param int $key Key pointing to menu item from ->menuArr
 	 * @return boolean True (integer!=0) if match, otherwise FALSE (=0, zero)
 	 * @access private
 	 * @see procesItemStates()
@@ -1632,7 +1632,7 @@ class AbstractMenuContentObject {
 	/**
 	 * Return MPvar string for entry $key in ->menuArr
 	 *
-	 * @param integer $key Pointer to element in ->menuArr
+	 * @param int $key Pointer to element in ->menuArr
 	 * @return string MP vars for element.
 	 * @see link()
 	 */
@@ -1723,7 +1723,7 @@ class AbstractMenuContentObject {
 	 * Used for menus with sectionIndex enabled
 	 *
 	 * @param string $altSortField Alternative sorting field
-	 * @param integer $pid The page id to search for sections
+	 * @param int $pid The page id to search for sections
 	 * @throws UnexpectedValueException if the query to fetch the content elements unexpectedly fails
 	 * @return array
 	 */
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
index 98903c459f359a4aa03f481b5cd70bf882473243..99b3dad7897bcb94440b803d0f7847ef05210a6e 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
@@ -267,7 +267,7 @@ class GraphicalMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\
 	 * Remember to upgrade the code in here if the makeGifs function is updated.
 	 *
 	 * @param array $conf Same configuration array as passed to makeGifs()
-	 * @param integer $items The number of menu items
+	 * @param int $items The number of menu items
 	 * @param array $Hobjs Array with "applyTotalH" numbers
 	 * @param array $Wobjs Array with "applyTotalW" numbers
 	 * @param array $minDim Array with "min" x/y
@@ -477,7 +477,7 @@ class GraphicalMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\
 	/**
 	 * Called after all processing for RollOver of an element has been done.
 	 *
-	 * @param integer Pointer to $this->menuArr[$key] where the current menu element record is found OR $this->result['RO'][$key] where the configuration for that elements RO version is found!
+	 * @param int Pointer to $this->menuArr[$key] where the current menu element record is found OR $this->result['RO'][$key] where the configuration for that elements RO version is found!
 	 * @return void
 	 * @access private
 	 * @see writeMenu()
@@ -489,7 +489,7 @@ class GraphicalMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\
 	/**
 	 * Called right before the creation of the link for the menu item
 	 *
-	 * @param integer Pointer to $this->menuArr[$key] where the current menu element record is found
+	 * @param int Pointer to $this->menuArr[$key] where the current menu element record is found
 	 * @return void
 	 * @access private
 	 * @see writeMenu()
@@ -503,7 +503,7 @@ class GraphicalMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\
 	 * This function MUST set $this->WMresult.=[HTML for menu item] to add the generated menu item to the internal accumulation of items.
 	 * Further this calls the subMenu function in the parent class to create any submenu there might be.
 	 *
-	 * @param integer Pointer to $this->menuArr[$key] where the current menu element record is found
+	 * @param int Pointer to $this->menuArr[$key] where the current menu element record is found
 	 * @return void
 	 * @access private
 	 * @see writeMenu(), AbstractMenuContentObject::subMenu()
@@ -521,7 +521,7 @@ class GraphicalMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\
 	 * Called before the "wrap" happens on the menu item.
 	 *
 	 * @param string The current content of the menu item, $this->I['theItem'], passed along.
-	 * @param integer Pointer to $this->menuArr[$key] where the current menu element record is found
+	 * @param int Pointer to $this->menuArr[$key] where the current menu element record is found
 	 * @return string The modified version of $item, going back into $this->I['theItem']
 	 * @access private
 	 * @see writeMenu()
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/JavaScriptMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/JavaScriptMenuContentObject.php
index ad9079d33988b8ab07e3c155b9d4ef72a5a066f2..e3f2f836e817d30f54e014d78a3c29e9d8c6d987 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/JavaScriptMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/JavaScriptMenuContentObject.php
@@ -85,9 +85,9 @@ class JavaScriptMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu
 	 * Generates a number of lines of JavaScript code for a menu level.
 	 * Calls itself recursively for additional levels.
 	 *
-	 * @param integer $levels Number of levels to generate
-	 * @param integer $count Current level being generated - and if this number is less than $levels it will call itself recursively with $count incremented
-	 * @param integer $pid Page id of the starting point.
+	 * @param int $levels Number of levels to generate
+	 * @param int $count Current level being generated - and if this number is less than $levels it will call itself recursively with $count incremented
+	 * @param int $pid Page id of the starting point.
 	 * @param array $menuItemArray $this->menuArr passed along
 	 * @param array $MP_array Previous MP vars
 	 * @return string JavaScript code lines.
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
index 81f4d371c2414dc81f2245a309f50a7fa38ccec8..9256790d5937179756eaf11efdd47fe91d2ff644 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
@@ -207,7 +207,7 @@ class TextMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\Abstr
 	/**
 	 * Called right before the creation of the link for the menu item
 	 *
-	 * @param integer Pointer to $this->menuArr[$key] where the current menu element record is found
+	 * @param int Pointer to $this->menuArr[$key] where the current menu element record is found
 	 * @return void
 	 * @access private
 	 * @see writeMenu()
@@ -220,7 +220,7 @@ class TextMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\Abstr
 	 * Called right after the creation of links for the menu item. This is also the last function call before the while-loop traversing menu items goes to the next item.
 	 * This function MUST set $this->WMresult.=[HTML for menu item] to add the generated menu item to the internal accumulation of items.
 	 *
-	 * @param integer Pointer to $this->menuArr[$key] where the current menu element record is found
+	 * @param int Pointer to $this->menuArr[$key] where the current menu element record is found
 	 * @return void
 	 * @access private
 	 * @see writeMenu()
@@ -238,7 +238,7 @@ class TextMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\Abstr
 	 * Called before the "allWrap" happens on the menu item.
 	 *
 	 * @param string $item The current content of the menu item, $this->I['theItem'], passed along.
-	 * @param integer $key Pointer to $this->menuArr[$key] where the current menu element record is found
+	 * @param int $key Pointer to $this->menuArr[$key] where the current menu element record is found
 	 * @return string The modified version of $item, going back into $this->I['theItem']
 	 * @access private
 	 * @see writeMenu()
diff --git a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
index 470f8e1fea4000bc0044420b771ef23116023f00..60cb09fe7323cc4eb8c22c4a3939d54b1b81e27f 100644
--- a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
@@ -292,8 +292,8 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
 	/**
 	 * Get an alternative language record for a specific page / language
 	 *
-	 * @param integer $pageId Page ID to look up for.
-	 * @param integer $langId Language UID to select for.
+	 * @param int $pageId Page ID to look up for.
+	 * @param int $langId Language UID to select for.
 	 * @return array pages_languages_overlay record
 	 */
 	public function getLangStatus($pageId, $langId) {
@@ -317,8 +317,8 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
 	/**
 	 * Counting content elements for a single language on a page.
 	 *
-	 * @param integer $pageId Page id to select for.
-	 * @param integer $sysLang Sys language uid
+	 * @param int $pageId Page id to select for.
+	 * @param int $sysLang Sys language uid
 	 * @return integer Number of content elements from the PID where the language is set to a certain value.
 	 */
 	public function getContentElementCount($pageId, $sysLang) {
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index adc9cdf114e284b33c5e540cb5359df87d704770..c35a3785d2924e7f4e29c87553f1eb4598acfd0a 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -849,7 +849,7 @@ class TypoScriptFrontendController {
 	 *
 	 * @param array $TYPO3_CONF_VARS The global $TYPO3_CONF_VARS array. Will be set internally in ->TYPO3_CONF_VARS
 	 * @param mixed $id The value of \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id')
-	 * @param integer $type The value of \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('type')
+	 * @param int $type The value of \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('type')
 	 * @param bool|string $no_cache The value of \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('no_cache'), evaluated to 1/0
 	 * @param string $cHash The value of \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('cHash')
 	 * @param string $jumpurl The value of \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('jumpurl')
@@ -1582,10 +1582,10 @@ class TypoScriptFrontendController {
 	/**
 	 * Get page shortcut; Finds the records pointed to by input value $SC (the shortcut value)
 	 *
-	 * @param integer $SC The value of the "shortcut" field from the pages record
-	 * @param integer $mode The shortcut mode: 1 will select first subpage, 2 a random subpage, 3 the parent page; default is the page pointed to by $SC
-	 * @param integer $thisUid The current page UID of the page which is a shortcut
-	 * @param integer $itera Safety feature which makes sure that the function is calling itself recursively max 20 times (since this function can find shortcuts to other shortcuts to other shortcuts...)
+	 * @param int $SC The value of the "shortcut" field from the pages record
+	 * @param int $mode The shortcut mode: 1 will select first subpage, 2 a random subpage, 3 the parent page; default is the page pointed to by $SC
+	 * @param int $thisUid The current page UID of the page which is a shortcut
+	 * @param int $itera Safety feature which makes sure that the function is calling itself recursively max 20 times (since this function can find shortcuts to other shortcuts to other shortcuts...)
 	 * @param array $pageLog An array filled with previous page uids tested by the function - new page uids are evaluated against this to avoid going in circles.
 	 * @throws \RuntimeException
 	 * @throws PageNotFoundException
@@ -1825,7 +1825,7 @@ class TypoScriptFrontendController {
 	 * Gets ->page and ->rootline information based on ->id. ->id may change during this operation.
 	 * If not inside domain, then default to first page in domain.
 	 *
-	 * @param integer $domainStartPage Page uid of the page where the found domain record is (pid of the domain record)
+	 * @param int $domainStartPage Page uid of the page where the found domain record is (pid of the domain record)
 	 * @return void
 	 * @access private
 	 */
@@ -3154,7 +3154,7 @@ class TypoScriptFrontendController {
 	 *
 	 * @param string $content The content to store in the HTML field of the cache table
 	 * @param mixed $data The additional cache_data array, fx. $this->config
-	 * @param integer $expirationTstamp Expiration timestamp
+	 * @param int $expirationTstamp Expiration timestamp
 	 * @return void
 	 * @see realPageCacheContent(), tempPageCacheContent()
 	 */
@@ -3888,10 +3888,10 @@ class TypoScriptFrontendController {
 	 * Encryption (or decryption) of a single character.
 	 * Within the given range the character is shifted with the supplied offset.
 	 *
-	 * @param integer $n Ordinal of input character
-	 * @param integer $start Start of range
-	 * @param integer $end End of range
-	 * @param integer $offset Offset
+	 * @param int $n Ordinal of input character
+	 * @param int $start Start of range
+	 * @param int $end End of range
+	 * @param int $offset Offset
 	 * @return string encoded/decoded version of character
 	 */
 	public function encryptCharcode($n, $start, $end, $offset) {
@@ -4388,7 +4388,7 @@ class TypoScriptFrontendController {
 	/**
 	 * Sets the cache-timeout in seconds
 	 *
-	 * @param integer $seconds Cache-timeout in seconds
+	 * @param int $seconds Cache-timeout in seconds
 	 * @return void
 	 */
 	public function set_cache_timeout_default($seconds) {
@@ -4675,7 +4675,7 @@ class TypoScriptFrontendController {
 	 * Find the minimum starttime or endtime value in the table and pid that is greater than the current time.
 	 *
 	 * @param string $tableDef Table definition (format tablename:pid)
-	 * @param integer $now "Now" time value
+	 * @param int $now "Now" time value
 	 * @throws \InvalidArgumentException
 	 * @return integer Value of the next start/stop time or PHP_INT_MAX if not found
 	 * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::calculatePageCacheTimeout()
diff --git a/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php b/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
index 7357feb17d884765907e9d708c342a2bb30eef4c..7e304939f4daf5e43e1fdf869282aa0fd524c1bd 100644
--- a/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
+++ b/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
@@ -90,7 +90,7 @@ class TreelistCacheUpdateHooks {
 	 *
 	 * @param string $command The TCE command
 	 * @param string $table The record's table
-	 * @param integer $recordId The record's uid
+	 * @param int $recordId The record's uid
 	 * @param array $commandValue The commands value, typically an array with more detailed command information
 	 * @param \TYPO3\CMS\Core\DataHandling\DataHandler $tceMain The TCEmain parent object
 	 * @return void
@@ -112,8 +112,8 @@ class TreelistCacheUpdateHooks {
 	 * changes take place to determine whether the cache needs to be updated
 	 *
 	 * @param string $table Table name of the moved record
-	 * @param integer $recordId The record's uid
-	 * @param integer $destinationPid The record's destination page id
+	 * @param int $recordId The record's uid
+	 * @param int $destinationPid The record's destination page id
 	 * @param array $movedRecord The record that moved
 	 * @param array $updatedFields Array of changed fields
 	 * @param \TYPO3\CMS\Core\DataHandling\DataHandler $tceMain TCEmain parent object
@@ -137,9 +137,9 @@ class TreelistCacheUpdateHooks {
 	 * changes take place to determine whether the cache needs to be updated
 	 *
 	 * @param string $table Table name of the moved record
-	 * @param integer $recordId The record's uid
-	 * @param integer $destinationPid The record's destination page id
-	 * @param integer $originalDestinationPid (negative) page id th page has been moved after
+	 * @param int $recordId The record's uid
+	 * @param int $destinationPid The record's destination page id
+	 * @param int $originalDestinationPid (negative) page id th page has been moved after
 	 * @param array $movedRecord The record that moved
 	 * @param array $updatedFields Array of changed fields
 	 * @param \TYPO3\CMS\Core\DataHandling\DataHandler $tceMain TCEmain parent object
@@ -179,8 +179,8 @@ class TreelistCacheUpdateHooks {
 	/**
 	 * Calls the cache maintainance functions according to the determined actions
 	 *
-	 * @param integer $affectedPage uid of the affected page
-	 * @param integer $affectedParentPage parent uid of the affected page
+	 * @param int $affectedPage uid of the affected page
+	 * @param int $affectedParentPage parent uid of the affected page
 	 * @param array $updatedFields Array of updated fields and their new values
 	 * @param array $actions Array of actions to carry out
 	 * @return void
@@ -214,7 +214,7 @@ class TreelistCacheUpdateHooks {
 	 * Clears the treelist cache for all parents of a changed page.
 	 * gets called after creating a new page and after moving a page
 	 *
-	 * @param integer $affectedParentPage Parent page id of the changed page, the page to start clearing from
+	 * @param int $affectedParentPage Parent page id of the changed page, the page to start clearing from
 	 * @return void
 	 */
 	protected function clearCacheForAllParents($affectedParentPage) {
@@ -235,7 +235,7 @@ class TreelistCacheUpdateHooks {
 	 * Clears the treelist cache for all pages where the affected page is found
 	 * in the treelist
 	 *
-	 * @param integer $affectedPage ID of the changed page
+	 * @param int $affectedPage ID of the changed page
 	 * @return void
 	 */
 	protected function clearCacheWhereUidInTreelist($affectedPage) {
@@ -246,8 +246,8 @@ class TreelistCacheUpdateHooks {
 	 * Sets an expiration time for all cache entries having the changed page in
 	 * the treelist.
 	 *
-	 * @param integer $affectedPage Uid of the changed page
-	 * @param integer $expirationTime
+	 * @param int $affectedPage Uid of the changed page
+	 * @param int $expirationTime
 	 * @return void
 	 */
 	protected function setCacheExpiration($affectedPage, $expirationTime) {
diff --git a/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php b/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php
index 253797c9e38bb48296ddc4f80c942e669302aa9f..be77139469a235130a9f76c47e275a4a7f1313ee 100644
--- a/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php
+++ b/typo3/sysext/frontend/Classes/Page/FramesetRenderer.php
@@ -57,7 +57,7 @@ class FramesetRenderer {
 	 * Creates the attributes for a <frame> tag based on a $conf array and the type number
 	 *
 	 * @param array $setup Configuration for the parameter generation for the FRAME set. See link
-	 * @param integer $typeNum The typenumber to use for the link.
+	 * @param int $typeNum The typenumber to use for the link.
 	 * @return string String with attributes for the frame-tag. With a prefixed space character.
 	 * @access private
 	 * @link http://typo3.org/documentation/document-library/references/doc_core_tsref/current/view/7/9/
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepository.php b/typo3/sysext/frontend/Classes/Page/PageRepository.php
index a92bb556e7b28f1d59b174ce7a9ead54a755b807..013ff6e39309d94e0d7cff4d6d68f62e53496827 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepository.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepository.php
@@ -194,7 +194,7 @@ class PageRepository {
 	 * Any pages_language_overlay will be applied before the result is returned.
 	 * If no page is found an empty array is returned.
 	 *
-	 * @param integer $uid The page id to look up.
+	 * @param int $uid The page id to look up.
 	 * @param bool $disableGroupAccessCheck If set, the check for group access is disabled. VERY rarely used
 	 * @throws \UnexpectedValueException
 	 * @return array The page row with overlayed localized fields. Empty it no page.
@@ -234,7 +234,7 @@ class PageRepository {
 	 * Return the $row for the page with uid = $uid WITHOUT checking for
 	 * ->where_hid_del (start- and endtime or hidden). Only "deleted" is checked!
 	 *
-	 * @param integer $uid The page id to look up
+	 * @param int $uid The page id to look up
 	 * @return array The page row with overlayed localized fields. Empty array if no page.
 	 * @see getPage()
 	 */
@@ -259,7 +259,7 @@ class PageRepository {
 	/**
 	 * Returns the $row of the first web-page in the tree (for the default menu...)
 	 *
-	 * @param integer $uid The page id for which to fetch first subpages (PID)
+	 * @param int $uid The page id for which to fetch first subpages (PID)
 	 * @return mixed If found: The page record (with overlayed localized fields, if any). If NOT found: blank value (not array!)
 	 * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::fetch_the_id()
 	 */
@@ -305,7 +305,7 @@ class PageRepository {
 	 * Returns the relevant page overlay record fields
 	 *
 	 * @param mixed $pageInput If $pageInput is an integer, it's the pid of the pageOverlay record and thus the page overlay record is returned. If $pageInput is an array, it's a page-record and based on this page record the language record is found and OVERLAYED before the page record is returned.
-	 * @param integer $lUid Language UID if you want to set an alternative value to $this->sys_language_uid which is default. Should be >=0
+	 * @param int $lUid Language UID if you want to set an alternative value to $this->sys_language_uid which is default. Should be >=0
 	 * @throws \UnexpectedValueException
 	 * @return array Page row which is overlayed with language_overlay record (or the overlay record alone)
 	 */
@@ -384,7 +384,7 @@ class PageRepository {
 	 *
 	 * @param string $table Table name
 	 * @param array $row Record to overlay. Must containt uid, pid and $table]['ctrl']['languageField']
-	 * @param integer $sys_language_content Pointer to the sys_language uid for content on the site.
+	 * @param int $sys_language_content Pointer to the sys_language uid for content on the site.
 	 * @param string $OLmode Overlay mode. If "hideNonTranslated" then records without translation will not be returned  un-translated but unset (and return value is FALSE)
 	 * @throws \UnexpectedValueException
 	 * @return mixed Returns the input record, possibly overlaid with a translation.  But if $OLmode is "hideNonTranslated" then it will return FALSE if no translation is found.
@@ -477,7 +477,7 @@ class PageRepository {
 	 * If the $uid being input does in itself require MPvars to define a correct
 	 * rootline these must be handled externally to this function.
 	 *
-	 * @param integer $uid The page id for which to fetch subpages (PID)
+	 * @param int $uid The page id for which to fetch subpages (PID)
 	 * @param string $fields List of fields to select. Default is "*" = all
 	 * @param string $sortField The field to sort by. Default is "sorting
 	 * @param string $addWhere Optional additional where clauses. Like "AND title like '%blabla%'" for instance.
@@ -601,7 +601,7 @@ class PageRepository {
 	 * If you want more fields in the rootline records than default such can be added
 	 * by listing them in $GLOBALS['TYPO3_CONF_VARS']['FE']['addRootLineFields']
 	 *
-	 * @param integer $uid The page uid for which to seek back to the page tree root.
+	 * @param int $uid The page uid for which to seek back to the page tree root.
 	 * @param string $MP Commalist of MountPoint parameters, eg. "1-2,3-4" etc. Normally this value comes from the GET var, MP
 	 * @param bool $ignoreMPerrors If set, some errors related to Mount Points in root line are ignored.
 	 * @throws \Exception
@@ -633,7 +633,7 @@ class PageRepository {
 	 * Used for writing statistics.
 	 *
 	 * @param array $rl A rootline array!
-	 * @param integer $len The max length of each title from the rootline.
+	 * @param int $len The max length of each title from the rootline.
 	 * @return string The path in the form "/page title/This is another pageti.../Another page
 	 * @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::getConfigArray()
 	 */
@@ -678,10 +678,10 @@ class PageRepository {
 	 * Does a recursive search if the mounted page should be a mount page itself. It
 	 * has a run-away break so it can't go into infinite loops.
 	 *
-	 * @param integer $pageId Page id for which to look for a mount pid. Will be returned only if mount pages are enabled, the correct doktype (7) is set for page and there IS a mount_pid (which has a valid record that is not deleted...)
+	 * @param int $pageId Page id for which to look for a mount pid. Will be returned only if mount pages are enabled, the correct doktype (7) is set for page and there IS a mount_pid (which has a valid record that is not deleted...)
 	 * @param array $pageRec Optional page record for the page id. If not supplied it will be looked up by the system. Must contain at least uid,pid,doktype,mount_pid,mount_pid_ol
 	 * @param array $prevMountPids Array accumulating formerly tested page ids for mount points. Used for recursivity brake.
-	 * @param integer $firstPageUid The first page id.
+	 * @param int $firstPageUid The first page id.
 	 * @return mixed Returns FALSE if no mount point was found, "-1" if there should have been one, but no connection to it, otherwise an array with information about mount pid and modes.
 	 * @see \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject
 	 */
@@ -745,7 +745,7 @@ class PageRepository {
 	 * The row is returned if everything's OK.
 	 *
 	 * @param string $table The table name to search
-	 * @param integer $uid The uid to look up in $table
+	 * @param int $uid The uid to look up in $table
 	 * @param bool $checkPage If checkPage is set, it's also required that the page on which the record resides is accessible
 	 * @return mixed Returns array (the record) if OK, otherwise blank/0 (zero)
 	 */
@@ -779,7 +779,7 @@ class PageRepository {
 	 * Returns record no matter what - except if record is deleted
 	 *
 	 * @param string $table The table name to search
-	 * @param integer $uid The uid to look up in $table
+	 * @param int $uid The uid to look up in $table
 	 * @param string $fields The fields to select, default is "*
 	 * @param bool $noWSOL If set, no version overlay is applied
 	 * @return mixed Returns array (the record) if found, otherwise blank/0 (zero)
@@ -846,7 +846,7 @@ class PageRepository {
 	 * like \TYPO3\CMS\Frontend\Page\PageRepository::getHash()
 	 *
 	 * @param string $hash The hash-string which was used to store the data value
-	 * @param integer The expiration time (not used anymore)
+	 * @param int The expiration time (not used anymore)
 	 * @return mixed The "data" from the cache
 	 * @see tslib_TStemplate::start(), storeHash()
 	 */
@@ -870,7 +870,7 @@ class PageRepository {
 	 * @param string $hash 32 bit hash string (eg. a md5 hash of a serialized array identifying the data being stored)
 	 * @param mixed $data The data to store
 	 * @param string $ident Is just a textual identification in order to inform about the content!
-	 * @param integer $lifetime The lifetime for the cache entry in seconds
+	 * @param int $lifetime The lifetime for the cache entry in seconds
 	 * @return void
 	 * @see tslib_TStemplate::start(), getHash()
 	 */
@@ -906,7 +906,7 @@ class PageRepository {
 	 * determines for each table which of these features applies to that table.
 	 *
 	 * @param string $table Table name found in the $GLOBALS['TCA'] array
-	 * @param integer $show_hidden If $show_hidden is set (0/1), any hidden-fields in records are ignored. NOTICE: If you call this function, consider what to do with the show_hidden parameter. Maybe it should be set? See ContentObjectRenderer->enableFields where it's implemented correctly.
+	 * @param int $show_hidden If $show_hidden is set (0/1), any hidden-fields in records are ignored. NOTICE: If you call this function, consider what to do with the show_hidden parameter. Maybe it should be set? See ContentObjectRenderer->enableFields where it's implemented correctly.
 	 * @param array $ignore_array Array you can pass where keys can be "disabled", "starttime", "endtime", "fe_group" (keys from "enablefields" in TCA) and if set they will make sure that part of the clause is not added. Thus disables the specific part of the clause. For previewing etc.
 	 * @param bool $noVersionPreview If set, enableFields will be applied regardless of any versioning preview settings which might otherwise disable enableFields
 	 * @throws \InvalidArgumentException
@@ -1207,7 +1207,7 @@ class PageRepository {
 	 * Returns move placeholder of online (live) version
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record UID of online version
+	 * @param int $uid Record UID of online version
 	 * @param string $fields Field list, default is *
 	 * @return array If found, the record, otherwise nothing.
 	 * @see \TYPO3\CMS\Backend\Utility\BackendUtility::getMovePlaceholder()
@@ -1232,9 +1232,9 @@ class PageRepository {
 	/**
 	 * Select the version of a record for a workspace
 	 *
-	 * @param integer $workspace Workspace ID
+	 * @param int $workspace Workspace ID
 	 * @param string $table Table name to select from
-	 * @param integer $uid Record uid for which to find workspace version.
+	 * @param int $uid Record uid for which to find workspace version.
 	 * @param string $fields Field list to select
 	 * @param bool $bypassEnableFieldsCheck If TRUE, enablefields are not checked for.
 	 * @return mixed If found, return record, otherwise other value: Returns 1 if version was sought for but not found, returns -1/-2 if record (offline/online) existed but had enableFields that would disable it. Returns FALSE if not in workspace or no versioning for record. Notice, that the enablefields of the online record is also tested.
@@ -1287,7 +1287,7 @@ class PageRepository {
 	/**
 	 * Checks if user has access to workspace.
 	 *
-	 * @param integer $wsid	Workspace ID
+	 * @param int $wsid	Workspace ID
 	 * @return boolean <code>TRUE</code> if has access
 	 */
 	public function checkWorkspaceAccess($wsid) {
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
index 86e2139de332528c0c0b996feb22c10e5b36e9d8..64a4d691dc4e39543924c5fbd5ef3caae0b14651 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageHookInterface.php
@@ -24,7 +24,7 @@ interface PageRepositoryGetPageHookInterface {
 	/**
 	 * Modifies the DB params
 	 *
-	 * @param integer $uid The page ID
+	 * @param int $uid The page ID
 	 * @param bool $disableGroupAccessCheck If set, the check for group access is disabled. VERY rarely used
 	 * @param \TYPO3\CMS\Frontend\Page\PageRepository $parentObject Parent object
 	 * @return void
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
index 39d3c933b3805da67d71d646402b4bf6f9f851eb..d989138b8818489c68eac13f0a30c67fb6cd3fbc 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetPageOverlayHookInterface.php
@@ -25,7 +25,7 @@ interface PageRepositoryGetPageOverlayHookInterface {
 	 * enables to preprocess the pageoverlay
 	 *
 	 * @param array $pageInput The page record
-	 * @param integer $lUid The overlay language
+	 * @param int $lUid The overlay language
 	 * @param \TYPO3\CMS\Frontend\Page\PageRepository $parent The calling parent object
 	 * @return void
 	 */
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php
index f6c2fc3eb2a686f94089ecc8c78fd7997249e30f..5883c845f31be37819f968d37ff02fa54dfd2485 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepositoryGetRecordOverlayHookInterface.php
@@ -25,7 +25,7 @@ interface PageRepositoryGetRecordOverlayHookInterface {
 	 *
 	 * @param string $table
 	 * @param array $row
-	 * @param integer $sys_language_content
+	 * @param int $sys_language_content
 	 * @param string $OLmode
 	 * @param \TYPO3\CMS\Frontend\Page\PageRepository $parent
 	 */
@@ -36,7 +36,7 @@ interface PageRepositoryGetRecordOverlayHookInterface {
 	 *
 	 * @param string $table
 	 * @param array $row
-	 * @param integer $sys_language_content
+	 * @param int $sys_language_content
 	 * @param string $OLmode
 	 * @param \TYPO3\CMS\Frontend\Page\PageRepository $parent
 	 */
diff --git a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
index 9bb2c44bfe4622f0b3ab005e662565100e59eeb7..983db131463691f0909e69f48aa33f41486f1863 100644
--- a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
+++ b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
@@ -236,7 +236,7 @@ class AbstractPlugin {
 	 * Recursively looks for stdWrap and executes it
 	 *
 	 * @param array $conf Current section of configuration to work on
-	 * @param integer $level Current level being processed (currently just for tracking; no limit enforced)
+	 * @param int $level Current level being processed (currently just for tracking; no limit enforced)
 	 * @return array Current section of configuration after stdWrap applied
 	 */
 	protected function applyStdWrapRecursive(array $conf, $level = 0) {
@@ -293,7 +293,7 @@ class AbstractPlugin {
 	 *
 	 * The function basically calls $this->cObj->getTypoLink_URL()
 	 *
-	 * @param integer $id Page id
+	 * @param int $id Page id
 	 * @param string $target Target value to use. Affects the &type-value of the URL, defaults to current.
 	 * @param array|string $urlParameters As an array key/value pairs represent URL parameters to set. Values NOT URL-encoded yet, keys should be URL-encoded if needed. As a string the parameter is expected to be URL-encoded already.
 	 * @return string The resulting URL
@@ -310,7 +310,7 @@ class AbstractPlugin {
 	 * Simple example: $this->pi_linkToPage('My link', 123) to get something like <a href="index.php?id=123&type=1">My link</a>
 	 *
 	 * @param string $str The content string to wrap in <a> tags
-	 * @param integer $id Page id
+	 * @param int $id Page id
 	 * @param string $target Target value to use. Affects the &type-value of the URL, defaults to current.
 	 * @param array|string $urlParameters As an array key/value pairs represent URL parameters to set. Values NOT URL-encoded yet, keys should be URL-encoded if needed. As a string the parameter is expected to be URL-encoded already.
 	 * @return string The input string wrapped in <a> tags with the URL and target set.
@@ -327,7 +327,7 @@ class AbstractPlugin {
 	 * @param string $str The content string to wrap in <a> tags
 	 * @param array $urlParameters Array with URL parameters as key/value pairs. They will be "imploded" and added to the list of parameters defined in the plugins TypoScript property "parent.addParams" plus $this->pi_moreParams.
 	 * @param bool $cache If $cache is set (0/1), the page is asked to be cached by a &cHash value (unless the current plugin using this class is a USER_INT). Otherwise the no_cache-parameter will be a part of the link.
-	 * @param integer $altPageId Alternative page ID for the link. (By default this function links to the SAME page!)
+	 * @param int $altPageId Alternative page ID for the link. (By default this function links to the SAME page!)
 	 * @return string The input string wrapped in <a> tags
 	 * @see pi_linkTP_keepPIvars(), \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::typoLink()
 	 */
@@ -349,7 +349,7 @@ class AbstractPlugin {
 	 * @param array $overrulePIvars Array of values to override in the current piVars. Contrary to pi_linkTP the keys in this array must correspond to the real piVars array and therefore NOT be prefixed with the $this->prefixId string. Further, if a value is a blank string it means the piVar key will not be a part of the link (unset)
 	 * @param bool $cache If $cache is set, the page is asked to be cached by a &cHash value (unless the current plugin using this class is a USER_INT). Otherwise the no_cache-parameter will be a part of the link.
 	 * @param bool $clearAnyway If set, then the current values of piVars will NOT be preserved anyways... Practical if you want an easy way to set piVars without having to worry about the prefix, "tx_xxxxx[]
-	 * @param integer $altPageId Alternative page ID for the link. (By default this function links to the SAME page!)
+	 * @param int $altPageId Alternative page ID for the link. (By default this function links to the SAME page!)
 	 * @return string The input string wrapped in <a> tags
 	 * @see pi_linkTP()
 	 */
@@ -374,7 +374,7 @@ class AbstractPlugin {
 	 * @param array $overrulePIvars See pi_linkTP_keepPIvars
 	 * @param bool $cache See pi_linkTP_keepPIvars
 	 * @param bool $clearAnyway See pi_linkTP_keepPIvars
-	 * @param integer $altPageId See pi_linkTP_keepPIvars
+	 * @param int $altPageId See pi_linkTP_keepPIvars
 	 * @return string The URL ($this->cObj->lastTypoLinkUrl)
 	 * @see pi_linkTP_keepPIvars()
 	 */
@@ -388,11 +388,11 @@ class AbstractPlugin {
 	 * Uses pi_linkTP for the linking
 	 *
 	 * @param string $str The content string to wrap in <a> tags
-	 * @param integer $uid UID of the record for which to display details (basically this will become the value of [showUid]
+	 * @param int $uid UID of the record for which to display details (basically this will become the value of [showUid]
 	 * @param bool $cache See pi_linkTP_keepPIvars
 	 * @param array $mergeArr Array of values to override in the current piVars. Same as $overrulePIvars in pi_linkTP_keepPIvars
 	 * @param bool $urlOnly If TRUE, only the URL is returned, not a full link
-	 * @param integer $altPageId Alternative page ID for the link. (By default this function links to the SAME page!)
+	 * @param int $altPageId Alternative page ID for the link. (By default this function links to the SAME page!)
 	 * @return string The input string wrapped in <a> tags
 	 * @see pi_linkTP(), pi_linkTP_keepPIvars()
 	 */
@@ -453,7 +453,7 @@ class AbstractPlugin {
 	 * If $wrapArr['showResultsNumbersWrap'] is set, the formatting string is expected to hold template markers (###FROM###, ###TO###, ###OUT_OF###, ###FROM_TO###, ###CURRENT_PAGE###, ###TOTAL_PAGES###)
 	 * otherwise the formatting string is expected to hold sprintf-markers (%s) for from, to, outof (in that sequence)
 	 *
-	 * @param integer $showResultCount Determines how the results of the pagerowser will be shown. See description below
+	 * @param int $showResultCount Determines how the results of the pagerowser will be shown. See description below
 	 * @param string $tableParams Attributes for the table tag which is wrapped around the table cells containing the browse links
 	 * @param array $wrapArr Array with elements to overwrite the default $wrapper-array.
 	 * @param string $pointerName varname for the pointer.
@@ -704,7 +704,7 @@ class AbstractPlugin {
 	 * (Dummy)
 	 * Notice: This function should ALWAYS be defined in the extension class of the plugin since it is directly concerned with the specific layout of the listing for your plugins purpose.
 	 *
-	 * @param integer $c Row counting. Starts at 0 (zero). Used for alternating class values in the output rows.
+	 * @param int $c Row counting. Starts at 0 (zero). Used for alternating class values in the output rows.
 	 * @return string HTML output, a table row with a class attribute set (alternative based on odd/even rows)
 	 */
 	public function pi_list_row($c) {
@@ -1054,7 +1054,7 @@ class AbstractPlugin {
 	 * (Simply calling $GLOBALS['TSFE']->sys_page->checkRecord())
 	 *
 	 * @param string $table The table name
-	 * @param integer $uid The uid of the record from the table
+	 * @param int $uid The uid of the record from the table
 	 * @param bool $checkPage If $checkPage is set, it's required that the page on which the record resides is accessible
 	 * @return array If record is found, an array. Otherwise FALSE.
 	 */
@@ -1066,7 +1066,7 @@ class AbstractPlugin {
 	 * Returns a commalist of page ids for a query (eg. 'WHERE pid IN (...)')
 	 *
 	 * @param string $pid_list A comma list of page ids (if empty current page is used)
-	 * @param integer$recursive An integer >=0 telling how deep to dig for pids under each entry in $pid_list
+	 * @param int$recursive An integer >=0 telling how deep to dig for pids under each entry in $pid_list
 	 * @return string List of PID values (comma separated)
 	 */
 	public function pi_getPidList($pid_list, $recursive = 0) {
@@ -1108,7 +1108,7 @@ class AbstractPlugin {
 	 * Will select all records from the "category table", $table, and return them in an array.
 	 *
 	 * @param string $table The name of the category table to select from.
-	 * @param integer $pid The page from where to select the category records.
+	 * @param int $pid The page from where to select the category records.
 	 * @param string $whereClause Optional additional WHERE clauses put in the end of the query. DO NOT PUT IN GROUP BY, ORDER BY or LIMIT!
 	 * @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
 	 * @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
@@ -1135,7 +1135,7 @@ class AbstractPlugin {
 	 * Notice that this function will only work as long as values are integers.
 	 *
 	 * @param string $fList List of fields (keys from piVars) to evaluate on
-	 * @param integer $lowerThan Limit for the values.
+	 * @param int $lowerThan Limit for the values.
 	 * @return boolean Returns TRUE (1) if conditions are met.
 	 */
 	public function pi_isOnlyFields($fList, $lowerThan = -1) {
diff --git a/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php b/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php
index 7bee3c773a1aa2c1de72fe2a61bccf6713d040b0..4dafe7be3fad98000ccbfe15dc91a119b6267c75 100644
--- a/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php
+++ b/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php
@@ -35,7 +35,7 @@ class CompressionUtility implements \TYPO3\CMS\Core\SingletonInterface {
 	 * is enabled.
 	 *
 	 * @param string $outputBuffer Output buffer to compress
-	 * @param integer $mode One of PHP_OUTPUT_HANDLER_xxx constants
+	 * @param int $mode One of PHP_OUTPUT_HANDLER_xxx constants
 	 * @return string Compressed string
 	 * @see ob_start()
 	 * @see ob_gzhandler()
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
index 7501475d725a20e3a6c401c9e663055c16d3bf55..ba65fe92d9891ac0a1690b43a5bf056ece5e1dd2 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
@@ -140,7 +140,7 @@ class AbstractMenuContentObjectTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @test
 	 * @dataProvider sectionIndexFiltersDataProvider
-	 * @param integer $expectedAmount
+	 * @param int $expectedAmount
 	 * @param array $dataRow
 	 */
 	public function sectionIndexFilters($expectedAmount, array $dataRow) {
diff --git a/typo3/sysext/impexp/Classes/Clickmenu.php b/typo3/sysext/impexp/Classes/Clickmenu.php
index 6e6d98dd1ae2544087ded4c794410e31f5d5c080..77f9d375f440941d4635ca5136597c8f3dd49f5f 100644
--- a/typo3/sysext/impexp/Classes/Clickmenu.php
+++ b/typo3/sysext/impexp/Classes/Clickmenu.php
@@ -27,7 +27,7 @@ class Clickmenu {
 	 * @param object $backRef Reference to parent
 	 * @param array $menuItems Menu items array to modify
 	 * @param string $table Table name
-	 * @param integer $uid Uid of the record
+	 * @param int $uid Uid of the record
 	 * @return array Menu item array, returned after modification
 	 * @todo Skinning for icons...
 	 */
diff --git a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
index 202bc26ffc1bcffebe7c7937ab8bf2a06f6f869a..02efc5165ff58575a67ef0f87890d223d14c9a42 100644
--- a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
+++ b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
@@ -451,9 +451,9 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 	/**
 	 * Adds records to the export object for a specific page id.
 	 *
-	 * @param integer $k Page id for which to select records to add
+	 * @param int $k Page id for which to select records to add
 	 * @param array $tables Array of table names to select from
-	 * @param integer $maxNumber Max amount of records to select
+	 * @param int $maxNumber Max amount of records to select
 	 * @return void
 	 */
 	public function addRecordsForPid($k, $tables, $maxNumber) {
@@ -478,8 +478,8 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 	 * Selects records from table / pid
 	 *
 	 * @param string $table Table to select from
-	 * @param integer $pid Page ID to select from
-	 * @param integer $limit Max number of records to select
+	 * @param int $pid Page ID to select from
+	 * @param int $limit Max number of records to select
 	 * @return \mysqli_result|object Database resource
 	 */
 	public function exec_listQueryPid($table, $pid, $limit) {
@@ -1242,7 +1242,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 	/**
 	 * Get single preset record
 	 *
-	 * @param integer $uid Preset record
+	 * @param int $uid Preset record
 	 * @return array Preset record, if any (otherwise FALSE)
 	 */
 	public function getPreset($uid) {
diff --git a/typo3/sysext/impexp/Classes/ImportExport.php b/typo3/sysext/impexp/Classes/ImportExport.php
index f747701ab019a0a9af112116b00052513aa8416c..a6feb0d902e9c3bb55cf9f93a5ac92cc1e07b005 100644
--- a/typo3/sysext/impexp/Classes/ImportExport.php
+++ b/typo3/sysext/impexp/Classes/ImportExport.php
@@ -612,7 +612,7 @@ class ImportExport {
 	 *
 	 * @param array $idH Page uid hierarchy
 	 * @param array $a Accumulation array of pages (internal, don't set from outside)
-	 * @param integer $pid PID value (internal)
+	 * @param int $pid PID value (internal)
 	 * @return array Array with uid-pid pairs for all pages in the page tree.
 	 * @see flatInversePageTree()
 	 */
@@ -666,7 +666,7 @@ class ImportExport {
 	 *
 	 * @param string $table Table name
 	 * @param array $row Record row.
-	 * @param integer $relationLevel (Internal) if the record is added as a relation, this is set to the "level" it was on.
+	 * @param int $relationLevel (Internal) if the record is added as a relation, this is set to the "level" it was on.
 	 * @return void
 	 */
 	public function export_addRecord($table, $row, $relationLevel = 0) {
@@ -761,7 +761,7 @@ class ImportExport {
 	 * In principle it should not allow to infinite recursivity, but you better set a limit...
 	 * Call this BEFORE the ext_addFilesFromRelations (so files from added relations are also included of course)
 	 *
-	 * @param integer $relationLevel Recursion level
+	 * @param int $relationLevel Recursion level
 	 * @return array overview of relations found and added: Keys [table]:[uid], values array with table and id
 	 * @see export_addFilesFromRelations()
 	 */
@@ -1489,7 +1489,7 @@ class ImportExport {
 	/**
 	 * Imports the internal data array to $pid.
 	 *
-	 * @param integer $pid Page ID in which to import the content
+	 * @param int $pid Page ID in which to import the content
 	 * @return void
 	 */
 	public function importData($pid) {
@@ -1832,7 +1832,7 @@ class ImportExport {
 	/**
 	 * Writing pagetree/pages to database:
 	 *
-	 * @param integer $pid PID in which to import. If the operation is an update operation, the root of the page tree inside will be moved to this PID unless it is the same as the root page from the import
+	 * @param int $pid PID in which to import. If the operation is an update operation, the root of the page tree inside will be moved to this PID unless it is the same as the root page from the import
 	 * @return void
 	 * @see writeRecords_records()
 	 */
@@ -1886,7 +1886,7 @@ class ImportExport {
 	 * Organize all updated pages in page tree so they are related like in the import file
 	 * Only used for updates and when $this->dat['header']['pagetree'] is an array.
 	 *
-	 * @param integer $pid Page id in which to import
+	 * @param int $pid Page id in which to import
 	 * @return void
 	 * @access private
 	 * @see writeRecords_pages(), writeRecords_records_order()
@@ -1926,7 +1926,7 @@ class ImportExport {
 	/**
 	 * Write all database records except pages (writtein in writeRecords_pages())
 	 *
-	 * @param integer $pid Page id in which to import
+	 * @param int $pid Page id in which to import
 	 * @return void
 	 * @see writeRecords_pages()
 	 */
@@ -1977,7 +1977,7 @@ class ImportExport {
 	 * Organize all updated record to their new positions.
 	 * Only used for updates
 	 *
-	 * @param integer $mainPid Main PID into which we import.
+	 * @param int $mainPid Main PID into which we import.
 	 * @return void
 	 * @access private
 	 * @see writeRecords_records(), writeRecords_pages_order()
@@ -2031,8 +2031,8 @@ class ImportExport {
 	 * That is done with setRelations() later
 	 *
 	 * @param string $table Table name (from import memory)
-	 * @param integer $uid Record UID (from import memory)
-	 * @param integer $pid Page id
+	 * @param int $uid Record UID (from import memory)
+	 * @param int $pid Page id
 	 * @return void
 	 * @see writeRecords()
 	 */
@@ -3221,7 +3221,7 @@ class ImportExport {
 	 * Returns the next content part from the $filecontent
 	 *
 	 * @param string $filecontent File content string
-	 * @param integer $pointer File pointer (where to read from)
+	 * @param int $pointer File pointer (where to read from)
 	 * @param bool $unserialize If set, the returned content is unserialized into an array, otherwise you get the raw string
 	 * @param string $name For error messages this indicates the section of the problem.
 	 * @return string|NULL Data string
@@ -3484,7 +3484,7 @@ class ImportExport {
 	 * Add entries for a single record
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
+	 * @param int $uid Record uid
 	 * @param array $lines Output lines array (is passed by reference and modified)
 	 * @param string $preCode Pre-HTML code
 	 * @param bool $checkImportInPidRecord If you want import validation, you can set this so it checks if the import can take place on the specified page.
@@ -3817,7 +3817,7 @@ class ImportExport {
 	 * Verifies that a table is allowed on a certain doktype of a page
 	 *
 	 * @param string $checkTable Table name to check
-	 * @param integer $doktype doktype value.
+	 * @param int $doktype doktype value.
 	 * @return boolean TRUE if OK
 	 */
 	public function checkDokType($checkTable, $doktype) {
@@ -3942,7 +3942,7 @@ class ImportExport {
 	 * Returns TRUE if the element should be excluded as static record.
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID value
+	 * @param int $uid UID value
 	 * @return boolean TRUE, if table is marked static
 	 */
 	public function isExcluded($table, $uid) {
@@ -3962,7 +3962,7 @@ class ImportExport {
 	/**
 	 * Checking if a PID is in the webmounts of the user
 	 *
-	 * @param integer $pid Page ID to check
+	 * @param int $pid Page ID to check
 	 * @return boolean TRUE if OK
 	 */
 	public function checkPID($pid) {
@@ -3976,7 +3976,7 @@ class ImportExport {
 	 * Checks if the position of an updated record is configured to be corrected. This can be disabled globally and changed for elements individually.
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Uid or record
+	 * @param int $uid Uid or record
 	 * @return boolean TRUE if the position of the record should be updated to match the one in the import structure
 	 */
 	public function dontIgnorePid($table, $uid) {
@@ -3987,7 +3987,7 @@ class ImportExport {
 	 * Checks if the record exists
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid UID of record
+	 * @param int $uid UID of record
 	 * @param string $fields Field list to select. Default is "uid,pid
 	 * @return array Result of \TYPO3\CMS\Backend\Utility\BackendUtility::getRecord() which means the record if found, otherwise FALSE
 	 */
@@ -3998,7 +3998,7 @@ class ImportExport {
 	/**
 	 * Returns the page title path of a PID value. Results are cached internally
 	 *
-	 * @param integer $pid Record PID to check
+	 * @param int $pid Record PID to check
 	 * @return string The path for the input PID
 	 */
 	public function getRecordPath($pid) {
diff --git a/typo3/sysext/impexp/Classes/LocalPageTree.php b/typo3/sysext/impexp/Classes/LocalPageTree.php
index 1d895da62a5fdbf25a2ac7e6cbe932363b0823fc..2ad16df20ed7db575d4963a229f99391d60f74b4 100644
--- a/typo3/sysext/impexp/Classes/LocalPageTree.php
+++ b/typo3/sysext/impexp/Classes/LocalPageTree.php
@@ -75,7 +75,7 @@ class LocalPageTree extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
 	/**
 	 * Tree rendering
 	 *
-	 * @param integer $pid PID value
+	 * @param int $pid PID value
 	 * @param string $clause Additional where clause
 	 * @return array Array of tree elements
 	 */
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
index 0656eaf9175a7bc054fcfe472ed367dccdd98c8c..e91b5b1b97703047ab4be27dd8cc16f3ad202433 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
@@ -200,7 +200,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 	 *
 	 * @param array $searchWords Search words array (for display of text describing what was searched for)
 	 * @param array $resultData Array with result rows, count, first row.
-	 * @param integer $freeIndexUid Pointing to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+	 * @param int $freeIndexUid Pointing to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
 	 * @return array
 	 */
 	protected function getDisplayResults($searchWords, $resultData, $freeIndexUid = -1) {
@@ -235,7 +235,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 	 * Takes the "group" var into account: Makes a "section" or "flat" display.
 	 *
 	 * @param array $resultRows Result rows
-	 * @param integer $freeIndexUid Pointing to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+	 * @param int $freeIndexUid Pointing to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
 	 * @return string HTML
 	 */
 	protected function compileResultRows($resultRows, $freeIndexUid = -1) {
@@ -318,7 +318,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 	 * This prints a single result row, including a recursive call for subrows.
 	 *
 	 * @param array $row Search result row
-	 * @param integer $headerOnly 1=Display only header (for sub-rows!), 2=nothing at all
+	 * @param int $headerOnly 1=Display only header (for sub-rows!), 2=nothing at all
 	 * @return string HTML code
 	 */
 	protected function compileSingleResultRow($row, $headerOnly = 0) {
@@ -547,7 +547,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 	 *
 	 * @param array $row Search result row
 	 * @param bool $noMarkup If noMarkup is FALSE, then the index_fulltext table is used to select the content of the page, split it with regex to display the search words in the text.
-	 * @param integer $length String length
+	 * @param int $length String length
 	 * @return string HTML string
 	 * @todo overwork this
 	 */
@@ -1115,7 +1115,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 	/**
 	 * Links the $linkText to page $pageUid
 	 *
-	 * @param integer $pageUid Page id
+	 * @param int $pageUid Page id
 	 * @param string $linkText Title String to link
 	 * @param array $row Result row
 	 * @param array $markUpSwParams Additional parameters for marking up seach words
@@ -1163,7 +1163,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 	/**
 	 * Return the menu of pages used for the selector.
 	 *
-	 * @param integer $pageUid Page ID for which to return menu
+	 * @param int $pageUid Page ID for which to return menu
 	 * @return array Menu items (for making the section selector box)
 	 */
 	protected function getMenuOfPages($pageUid) {
@@ -1183,7 +1183,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 	/**
 	 * Returns the path to the page $id
 	 *
-	 * @param integer $id Page ID
+	 * @param int $id Page ID
 	 * @param string MP variable content
 	 * @return string Path
 	 */
@@ -1225,7 +1225,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 	/**
 	 * Gets the first sys_domain record for the page, $id
 	 *
-	 * @param integer $id Page id
+	 * @param int $id Page id
 	 * @return string Domain name
 	 */
 	protected function getFirstSysDomainRecordForPage($id) {
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
index 67888daffa56f95beb0942856fcfec6dd19f2286..c7d3a313ee0265c35ac3abf82f78b01c54e973cc 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
@@ -452,7 +452,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * Get search result rows / data from database. Returned as data in array.
 	 *
 	 * @param array $searchWordArray Search word array
-	 * @param integer Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+	 * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
 	 * @return array False if no result, otherwise an array with keys for first row, result rows and total number of results found.
 	 */
 	public function getResultRows($searchWordArray, $freeIndexUid = -1) {
@@ -822,7 +822,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * Search for a word
 	 *
 	 * @param string $sWord Word to search for
-	 * @param integer $mode Bit-field which can contain WILDCARD_LEFT and/or WILDCARD_RIGHT
+	 * @param int $mode Bit-field which can contain WILDCARD_LEFT and/or WILDCARD_RIGHT
 	 * @return pointer SQL result pointer
 	 */
 	public function searchWord($sWord, $mode) {
@@ -2214,7 +2214,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	/**
 	 * Formats date as 'created' date
 	 *
-	 * @param integer $date
+	 * @param int $date
 	 * @return string
 	 */
 	protected function formatCreatedDate($date) {
@@ -2225,7 +2225,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	/**
 	 * Formats date as 'modified' date
 	 *
-	 * @param integer $date
+	 * @param int $date
 	 * @return string
 	 */
 	protected function formatModifiedDate($date) {
@@ -2237,7 +2237,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * Formats the date using format string from TypoScript or default format
 	 * if TypoScript format is not set
 	 *
-	 * @param integer $date
+	 * @param int $date
 	 * @param string $tsKey
 	 * @param string $defaultFormat
 	 * @return string
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
index 3423573e4539a6da1e5e4acd9e07308ebf87bd47..7a342be6b0bc01af05a3456b67a2f96d015b1cc3 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
@@ -123,7 +123,7 @@ class IndexSearchRepository {
 	 * Get search result rows / data from database. Returned as data in array.
 	 *
 	 * @param array $searchWords Search word array
-	 * @param integer $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+	 * @param int $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
 	 * @return boolean|array FALSE if no result, otherwise an array with keys for first row, result rows and total number of results found.
 	 */
 	public function doSearch($searchWords, $freeIndexUid = -1) {
@@ -213,7 +213,7 @@ class IndexSearchRepository {
 	 * Gets a SQL result pointer to traverse for the search records.
 	 *
 	 * @param array $searchWords Search words
-	 * @param integer $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+	 * @param int $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
 	 * @return boolean|pointer
 	 */
 	protected function getResultRows_SQLpointer($searchWords, $freeIndexUid = -1) {
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php
index 483272293ead422798097ae33ee34766ce192a31..992eb3f6a8d528306f711d6f796bbb9ddc8654cb 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php
@@ -23,9 +23,9 @@ class PageBrowsingResultsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abs
 	/**
 	 * main render function
 	 *
-	 * @param integer $numberOfResults
-	 * @param integer $resultsPerPage
-	 * @param integer $currentPage
+	 * @param int $numberOfResults
+	 * @param int $resultsPerPage
+	 * @param int $currentPage
 	 * @return the content
 	 */
 	public function render($numberOfResults, $resultsPerPage, $currentPage = 1) {
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
index 9be6e7ceb1da266e07e85985542e7d656b4c087f..64af42a9943d1754f65e582e74bd638c6096858a 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
@@ -31,10 +31,10 @@ class PageBrowsingViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractVi
 	/**
 	 * Main render function
 	 *
-	 * @param integer $maximumNumberOfResultPages The number of page links shown
-	 * @param integer $numberOfResults Total number of results
-	 * @param integer $resultsPerPage Number of results per page
-	 * @param integer $currentPage The current page starting with 0
+	 * @param int $maximumNumberOfResultPages The number of page links shown
+	 * @param int $numberOfResults Total number of results
+	 * @param int $resultsPerPage Number of results per page
+	 * @param int $currentPage The current page starting with 0
 	 * @param string|NULL $freeIndexUid List of integers pointing to free indexing configurations to search. -1 represents no filtering, 0 represents TYPO3 pages only, any number above zero is a uid of an indexing configuration!
 	 * @return string The content
 	 */
@@ -91,7 +91,7 @@ class PageBrowsingViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractVi
 	 * Notice how the links must resubmit the form after setting the new currentPage-value in a hidden formfield.
 	 *
 	 * @param string $str String to wrap in <a> tag
-	 * @param integer $p currentPage value
+	 * @param int $p currentPage value
 	 * @param string $freeIndexUid List of integers pointing to free indexing configurations to search. -1 represents no filtering, 0 represents TYPO3 pages only, any number above zero is a uid of an indexing configuration!
 	 * @return string Input string wrapped in <a> tag with onclick event attribute set.
 	 */
diff --git a/typo3/sysext/indexed_search_mysql/Classes/Hook/MysqlFulltextIndexHook.php b/typo3/sysext/indexed_search_mysql/Classes/Hook/MysqlFulltextIndexHook.php
index 9adb780e705a9a77a2b9ee17c51d7ea707175550..0d0fe247c57ec808372038dee79be5ab0ef7f63c 100644
--- a/typo3/sysext/indexed_search_mysql/Classes/Hook/MysqlFulltextIndexHook.php
+++ b/typo3/sysext/indexed_search_mysql/Classes/Hook/MysqlFulltextIndexHook.php
@@ -34,7 +34,7 @@ class MysqlFulltextIndexHook {
 	 * Gets a SQL result pointer to traverse for the search records.
 	 *
 	 * @param array $searchWordsArray Search words
-	 * @param integer $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+	 * @param int $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
 	 * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
 	 */
 	public function getResultRows_SQLpointer($searchWordsArray, $freeIndexUid = -1) {
@@ -135,7 +135,7 @@ class MysqlFulltextIndexHook {
 	 * Execute final query, based on phash integer list. The main point is sorting the result in the right order.
 	 *
 	 * @param array $searchData Array with search string, boolean indicator, and fulltext index reference
-	 * @param integer $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+	 * @param int $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
 	 * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
 	 */
 	protected function execFinalQuery_fulltext($searchData, $freeIndexUid = -1) {
diff --git a/typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php b/typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php
index dabb2de095a11ef07627bce45db186f8ca36ebe7..d1861ec0ec169a823f5b9ff547c3ff35397087f3 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php
@@ -557,7 +557,7 @@ class TestSetup extends Action\AbstractAction {
 	/**
 	 * Create a 'image test was done' message
 	 *
-	 * @param integer $parseTime Parse time
+	 * @param int $parseTime Parse time
 	 * @return \TYPO3\CMS\Install\Status\StatusInterface
 	 */
 	protected function imageTestDoneMessage($parseTime = 0) {
diff --git a/typo3/sysext/install/Classes/Service/SessionService.php b/typo3/sysext/install/Classes/Service/SessionService.php
index 57408b65b191317ed5b59ea3c6d838c02b853f55..c27c44c613fb2515f8fe0b2d6455d545d1592002 100644
--- a/typo3/sysext/install/Classes/Service/SessionService.php
+++ b/typo3/sysext/install/Classes/Service/SessionService.php
@@ -382,7 +382,7 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Garbage collect session info. See @session_set_save_handler
 	 *
-	 * @param integer $maxLifeTime The setting of session.gc_maxlifetime
+	 * @param int $maxLifeTime The setting of session.gc_maxlifetime
 	 * @return boolean
 	 */
 	public function gc($maxLifeTime) {
diff --git a/typo3/sysext/install/Classes/Updates/FilePermissionUpdate.php b/typo3/sysext/install/Classes/Updates/FilePermissionUpdate.php
index 7ec46131d6215a886615cfadfddbf7ef058157c3..b19ea8693ac04366891509b6842988e61d00d261 100644
--- a/typo3/sysext/install/Classes/Updates/FilePermissionUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/FilePermissionUpdate.php
@@ -144,7 +144,7 @@ class FilePermissionUpdate extends AbstractUpdate {
 	/**
 	 * Processes the actual transformation from old binary file permissions to new separate list
 	 *
-	 * @param integer $oldFileOperationPermissions
+	 * @param int $oldFileOperationPermissions
 	 * @return string
 	 */
 	protected function getFilePermissions($oldFileOperationPermissions) {
diff --git a/typo3/sysext/install/Classes/Updates/MediaFlexformUpdate.php b/typo3/sysext/install/Classes/Updates/MediaFlexformUpdate.php
index 846675371b6e75e45bfd9d937541fdf363903bfa..27463efb3b13c012b8b3befefb86207e1eefbfaa 100644
--- a/typo3/sysext/install/Classes/Updates/MediaFlexformUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/MediaFlexformUpdate.php
@@ -28,7 +28,7 @@ class MediaFlexformUpdate extends AbstractUpdate {
 	 * Checks whether updates need to be performed
 	 *
 	 * @param string &$description The description for the update
-	 * @param integer &$showUpdate 0=dont show update; 1=show update and next button; 2=only show description
+	 * @param int &$showUpdate 0=dont show update; 1=show update and next button; 2=only show description
 	 * @return boolean
 	 */
 	public function checkForUpdate(&$description, &$showUpdate = 0) {
diff --git a/typo3/sysext/install/Classes/Updates/RootTemplateUpdate.php b/typo3/sysext/install/Classes/Updates/RootTemplateUpdate.php
index 319214a6daa72515e48a2ec37a72e15636fc2897..696db3283e08bacadd963b35d953aaa05315a0b9 100644
--- a/typo3/sysext/install/Classes/Updates/RootTemplateUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/RootTemplateUpdate.php
@@ -28,7 +28,7 @@ class RootTemplateUpdate extends AbstractUpdate implements InstallerProcessInter
 	 * Checks whether updates need to be performed
 	 *
 	 * @param string &$description The description for the update
-	 * @param integer &$showUpdate 0=dont show update; 1=show update and next button; 2=only show description
+	 * @param int &$showUpdate 0=dont show update; 1=show update and next button; 2=only show description
 	 * @return boolean
 	 */
 	public function checkForUpdate(&$description, &$showUpdate = 0) {
diff --git a/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php b/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php
index ee2a6bd208e0b3e87553864928051a43944db463..4eb56dc097e99944074ae2748f402b5f5a9e0789 100644
--- a/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php
@@ -194,7 +194,7 @@ class TtContentUploadsUpdateWizard extends AbstractUpdate {
 	 * Removes the old fields from the database-record
 	 *
 	 * @param array $record
-	 * @param integer $fileCount
+	 * @param int $fileCount
 	 * @param array $collectionUids
 	 * @return void
 	 */
diff --git a/typo3/sysext/install/Classes/ViewHelpers/Format/CropViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/Format/CropViewHelper.php
index 5c25f714a7f55ab530ca3cd26997aa7f50867a2b..773fd1b422050e2dadcf749fd41b6b84d48b872a 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/Format/CropViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/Format/CropViewHelper.php
@@ -39,7 +39,7 @@ class CropViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
 	/**
 	 * Render the cropped text
 	 *
-	 * @param integer $maxCharacters Place where to truncate the string
+	 * @param int $maxCharacters Place where to truncate the string
 	 * @throws \TYPO3\CMS\Install\ViewHelpers\Exception
 	 * @return string cropped text
 	 */
diff --git a/typo3/sysext/install/Classes/ViewHelpers/Format/PhpErrorCodeViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/Format/PhpErrorCodeViewHelper.php
index c51ff5f3e198e6385df7f5164b1b27e50389b930..2852fdd84a03a36604f6fbf9d5a78b55a9c5405b 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/Format/PhpErrorCodeViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/Format/PhpErrorCodeViewHelper.php
@@ -43,7 +43,7 @@ class PhpErrorCodeViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractVi
 	/**
 	 * Render a readable string for PHP error code
 	 *
-	 * @param integer $phpErrorCode
+	 * @param int $phpErrorCode
 	 * @return string
 	 */
 	public function render($phpErrorCode) {
diff --git a/typo3/sysext/lang/Classes/Domain/Model/Extension.php b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
index 3dab2f14633beafec9cacdd1851ae3f80ab3b3e8..5d023a2763b24fae4667ed08d8b3af440285f67c 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
@@ -134,7 +134,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Setter for the version
 	 *
-	 * @param integer $version Needs to have a valid version format like 1003007
+	 * @param int $version Needs to have a valid version format like 1003007
 	 * @return void
 	 */
 	public function setVersion($version) {
diff --git a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
index acc07865fd00ad01170eee7a37eeb67c0487e382..f500a44cabd1c49f6745ceb30f8cfda4ac3f8945 100644
--- a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
+++ b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
@@ -377,9 +377,9 @@ class LinkAnalyzer {
 	 * Generates a list of page uids from $id. List does not include $id itself.
 	 * The only pages excluded from the list are deleted pages.
 	 *
-	 * @param integer $id Start page id
-	 * @param integer $depth Depth to traverse down the page tree.
-	 * @param integer $begin is an optional integer that determines at which
+	 * @param int $id Start page id
+	 * @param int $depth Depth to traverse down the page tree.
+	 * @param int $begin is an optional integer that determines at which
 	 * @param string $permsClause Perms clause
 	 * @param bool $considerHidden Whether to consider hidden pages or not
 	 * @return string Returns the list with a comma in the end (if any pages selected!)
diff --git a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
index d759d5c0edddf55ea123e0f65ccb2cff3ab817ad..2bc2d96594ac671474c9b0232f477838e9cc846b 100644
--- a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
+++ b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
@@ -159,7 +159,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Set the value of the private property page
 	 *
-	 * @param integer $page UID of the start page for this task.
+	 * @param int $page UID of the start page for this task.
 	 * @return void
 	 */
 	public function setPage($page) {
@@ -178,7 +178,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Set the value of the private property depth
 	 *
-	 * @param integer $depth Level of pages the task should check
+	 * @param int $depth Level of pages the task should check
 	 * @return void
 	 */
 	public function setDepth($depth) {
@@ -271,7 +271,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Validate all links for a page based on the task configuration
 	 *
-	 * @param integer $page Uid of the page to parse
+	 * @param int $page Uid of the page to parse
 	 * @return string $pageSections Content of page section
 	 */
 	protected function checkPageLinks($page) {
@@ -316,7 +316,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Get the linkvalidator modTSconfig for a page
 	 *
-	 * @param integer $page Uid of the page
+	 * @param int $page Uid of the page
 	 * @return array $modTsConfig mod.linkvalidator TSconfig array
 	 * @throws \Exception
 	 */
@@ -457,7 +457,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Build the mail content
 	 *
-	 * @param integer $curPage Id of the current page
+	 * @param int $curPage Id of the current page
 	 * @param string $pageList List of pages id
 	 * @param array $markerArray Array of markers
 	 * @param array $oldBrokenLink Marker array with the number of link found
diff --git a/typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php b/typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php
index 3bfe368cffa21b69946b64919b4ae6a8958e0db2..b4819a622add9446560d43dc3490b8b7c4004e83 100644
--- a/typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php
+++ b/typo3/sysext/lowlevel/Classes/CleanFlexformCommand.php
@@ -70,10 +70,10 @@ Cleaning XML for FlexForm fields.
 	 * Call back function for page tree traversal!
 	 *
 	 * @param string $tableName Table name
-	 * @param integer $uid UID of record in processing
-	 * @param integer $echoLevel Echo level  (see calling function
+	 * @param int $uid UID of record in processing
+	 * @param int $echoLevel Echo level  (see calling function
 	 * @param string $versionSwapmode Version swap mode on that level (see calling function
-	 * @param integer $rootIsVersion Is root version (see calling function
+	 * @param int $rootIsVersion Is root version (see calling function
 	 * @return void
 	 */
 	public function main_parseTreeCallBack($tableName, $uid, $echoLevel, $versionSwapmode, $rootIsVersion) {
diff --git a/typo3/sysext/lowlevel/Classes/CleanerCommand.php b/typo3/sysext/lowlevel/Classes/CleanerCommand.php
index 16b4ed271f5f9c4e343b15607df63e70af942611..b8a7b43cc1779169ca4957db45617fe002480ce9 100644
--- a/typo3/sysext/lowlevel/Classes/CleanerCommand.php
+++ b/typo3/sysext/lowlevel/Classes/CleanerCommand.php
@@ -278,8 +278,8 @@ NOW Running --AUTOFIX on result. OK?' . ($this->cli_isArg('--dryrun') ? ' (--dry
 	 * Traverses the FULL/part of page tree, mainly to register ALL validly connected records (to find orphans) but also to register deleted records, versions etc.
 	 * Output (in $this->recStats) can be useful for multiple purposes.
 	 *
-	 * @param integer $rootID Root page id from where to start traversal. Use "0" (zero) to have full page tree (necessary when spotting orphans, otherwise you can run it on parts only)
-	 * @param integer $depth Depth to traverse. zero is do not traverse at all. 1 = 1 sublevel, 1000= 1000 sublevels (all...)
+	 * @param int $rootID Root page id from where to start traversal. Use "0" (zero) to have full page tree (necessary when spotting orphans, otherwise you can run it on parts only)
+	 * @param int $depth Depth to traverse. zero is do not traverse at all. 1 = 1 sublevel, 1000= 1000 sublevels (all...)
 	 * @param bool $echoLevel If >0, will echo information about the traversal process.
 	 * @param string $callBack Call back function (from this class or subclass)
 	 * @return void
@@ -349,12 +349,12 @@ NOW Running --AUTOFIX on result. OK?' . ($this->cli_isArg('--dryrun') ? ' (--dry
 	/**
 	 * Recursive traversal of page tree:
 	 *
-	 * @param integer $rootID Page root id (must be online, valid page record - or zero for page tree root)
-	 * @param integer $depth Depth
-	 * @param integer $echoLevel Echo Level
+	 * @param int $rootID Page root id (must be online, valid page record - or zero for page tree root)
+	 * @param int $depth Depth
+	 * @param int $echoLevel Echo Level
 	 * @param string $callBack Call back function (from this class or subclass)
 	 * @param string $versionSwapmode DON'T set from outside, internal. (indicates we are inside a version of a page) - will be "SWAPMODE:-1" or empty
-	 * @param integer $rootIsVersion DON'T set from outside, internal. (1: Indicates that rootID is a version of a page, 2: ...that it is even a version of a version (which triggers a warning!)
+	 * @param int $rootIsVersion DON'T set from outside, internal. (1: Indicates that rootID is a version of a page, 2: ...that it is even a version of a version (which triggers a warning!)
 	 * @param string $accumulatedPath Internal string that accumulates the path
 	 * @return void
 	 * @access private
diff --git a/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php b/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php
index dce91abf230cc03f5bebd5851f1a6485537c37a1..afe2f51fc9144e83647deea01d942e5cd67d94de 100644
--- a/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php
+++ b/typo3/sysext/lowlevel/Classes/Utility/ArrayBrowser.php
@@ -207,7 +207,7 @@ class ArrayBrowser {
 	 * Fixed length function
 	 *
 	 * @param string $string String to process
-	 * @param integer $chars Max number of chars
+	 * @param int $chars Max number of chars
 	 * @return string Processed string
 	 */
 	public function fixed_lgd($string, $chars) {
diff --git a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
index 82b138362a2da91b6eda4308ffc9230152aac99d..b4e7d294c06492062477d69668a24d9e888463c4 100644
--- a/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
+++ b/typo3/sysext/lowlevel/Classes/View/DatabaseIntegrityView.php
@@ -512,7 +512,7 @@ class DatabaseIntegrityView {
 	 * @param string $basedir Base directory
 	 * @param string $pattern Match pattern
 	 * @param array $matching_files Array of matching files, passed by reference
-	 * @param integer $depth Depth to recurse
+	 * @param int $depth Depth to recurse
 	 * @deprecated since 6.2 will be removed two versions later
 	 * @return array Array with various information about the search result
 	 */
diff --git a/typo3/sysext/openid/Classes/OpenidStore.php b/typo3/sysext/openid/Classes/OpenidStore.php
index 52f0b06301bdfe882f681ef2d77a1f2f31469df5..89a74209c56826cfd3d4f034c9adf7bef87d948c 100644
--- a/typo3/sysext/openid/Classes/OpenidStore.php
+++ b/typo3/sysext/openid/Classes/OpenidStore.php
@@ -128,7 +128,7 @@ class OpenidStore extends \Auth_OpenID_OpenIDStore {
 	 * Checks if this nonce was already used
 	 *
 	 * @param string $serverUrl Server URL
-	 * @param integer $timestamp Time stamp
+	 * @param int $timestamp Time stamp
 	 * @param string $salt Nonce value
 	 * @return boolean TRUE if nonce was not used before anc can be used now
 	 */
@@ -213,7 +213,7 @@ class OpenidStore extends \Auth_OpenID_OpenIDStore {
 	/**
 	 * Updates association time stamp.
 	 *
-	 * @param integer $recordId Association record id in the database
+	 * @param int $recordId Association record id in the database
 	 * @return void
 	 */
 	protected function updateAssociationTimeStamp($recordId) {
diff --git a/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php b/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php
index 27d81342857b5d1bad577514e74f401b88db69f3..4b9d2d764c659a2feebfd335803406add1353a8c 100644
--- a/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php
+++ b/typo3/sysext/perm/Classes/Controller/PermissionAjaxController.php
@@ -156,8 +156,8 @@ class PermissionAjaxController {
 	/**
 	 * Generate the user selector element
 	 *
-	 * @param integer $page The page id to change the user for
-	 * @param integer $ownerUid The page owner uid
+	 * @param int $page The page id to change the user for
+	 * @param int $ownerUid The page owner uid
 	 * @param string $username The username to display
 	 * @return string The html select element
 	 */
@@ -188,8 +188,8 @@ class PermissionAjaxController {
 	/**
 	 * Generate the group selector element
 	 *
-	 * @param integer $page The page id to change the user for
-	 * @param integer $groupUid The page group uid
+	 * @param int $page The page id to change the user for
+	 * @param int $groupUid The page group uid
 	 * @param string $username The username to display
 	 * @return string The html select element
 	 */
@@ -231,8 +231,8 @@ class PermissionAjaxController {
 	/**
 	 * Print the string with the new owner of a page record
 	 *
-	 * @param integer $page The TYPO3 page id
-	 * @param integer $ownerUid The new page user uid
+	 * @param int $page The TYPO3 page id
+	 * @param int $ownerUid The new page user uid
 	 * @param string $username The TYPO3 BE username (used to display in the element)
 	 * @param bool $validUser Must be set to FALSE, if the user has no name or is deleted
 	 * @return string The new group wrapped in HTML
@@ -246,8 +246,8 @@ class PermissionAjaxController {
 	/**
 	 * Print the string with the new group of a page record
 	 *
-	 * @param integer $page The TYPO3 page id
-	 * @param integer $groupUid The new page group uid
+	 * @param int $page The TYPO3 page id
+	 * @param int $groupUid The new page group uid
 	 * @param string $groupname The TYPO3 BE groupname (used to display in the element)
 	 * @param bool $validGroup Must be set to FALSE, if the group has no name or is deleted
 	 * @return string The new group wrapped in HTML
@@ -261,7 +261,7 @@ class PermissionAjaxController {
 	/**
 	 * Print the string with the new edit lock state of a page record
 	 *
-	 * @param integer $page The TYPO3 page id
+	 * @param int $page The TYPO3 page id
 	 * @param string $editlockstate The state of the TYPO3 page (locked, unlocked)
 	 * @return string The new edit lock string wrapped in HTML
 	 */
@@ -277,8 +277,8 @@ class PermissionAjaxController {
 	/**
 	 * Print a set of permissions. Also used in index.php
 	 *
-	 * @param integer $int Permission integer (bits)
-	 * @param integer $page The TYPO3 page id
+	 * @param int $int Permission integer (bits)
+	 * @param int $page The TYPO3 page id
 	 * @param string $who The scope (user, group or everybody)
 	 * @return string HTML marked up x/* indications.
 	 */
diff --git a/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php b/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
index ae810ca26ad31083e6e4ffad1b0f41e12193aa30..080dc3cb17962134033733b83007a95ed3d650e1 100644
--- a/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
+++ b/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
@@ -594,7 +594,7 @@ class PermissionModuleController {
 	 * Print a checkbox for the edit-permission form
 	 *
 	 * @param string $checkName Checkbox name key
-	 * @param integer $num Checkbox number index
+	 * @param int $num Checkbox number index
 	 * @return string HTML checkbox
 	 */
 	public function printCheckBox($checkName, $num) {
@@ -605,7 +605,7 @@ class PermissionModuleController {
 	/**
 	 * Finding tree and offer setting of values recursively.
 	 *
-	 * @param integer $id Page id.
+	 * @param int $id Page id.
 	 * @param string $perms_clause Select clause
 	 * @return string Select form element for recursive levels (if any levels are found)
 	 */
diff --git a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
index ad7e791763186a1cd6f2c66a7fce230014992533..bce85ce3186c0d6ddf5d887b024d96f1d6106723 100644
--- a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
@@ -2574,7 +2574,7 @@ class ElementBrowser {
 	/**
 	 * Get the HTML data required for a bulk selection of files of the TYPO3 Element Browser.
 	 *
-	 * @param integer $filesCount Number of files currently displayed
+	 * @param int $filesCount Number of files currently displayed
 	 * @return string HTML data required for a bulk selection of files - if $filesCount is 0, nothing is returned
 	 */
 	public function getBulkSelector($filesCount) {
diff --git a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
index ad2b2b80762188fe414155bb9f1569525cc08153..a5231821f5d52eba5a1dc4e821f79700f7c4111a 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
@@ -166,12 +166,12 @@ class AbstractDatabaseRecordList extends \TYPO3\CMS\Backend\RecordList\AbstractR
 	/**
 	 * Initializes the list generation
 	 *
-	 * @param integer $id Page id for which the list is rendered. Must be >= 0
+	 * @param int $id Page id for which the list is rendered. Must be >= 0
 	 * @param string $table Tablename - if extended mode where only one table is listed at a time.
-	 * @param integer $pointer Browsing pointer.
+	 * @param int $pointer Browsing pointer.
 	 * @param string $search Search word, if any
-	 * @param integer $levels Number of levels to search down the page tree
-	 * @param integer $showLimit Limit of records to be listed.
+	 * @param int $levels Number of levels to search down the page tree
+	 * @param int $showLimit Limit of records to be listed.
 	 * @return void
 	 */
 	public function start($id, $table, $pointer, $search = '', $levels = '', $showLimit = 0) {
@@ -394,7 +394,7 @@ class AbstractDatabaseRecordList extends \TYPO3\CMS\Backend\RecordList\AbstractR
 	 * Returns the SQL-query array to select the records from a table $table with pid = $id
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Page id (NOT USED! $this->pidSelect is used instead)
+	 * @param int $id Page id (NOT USED! $this->pidSelect is used instead)
 	 * @param string $addWhere Additional part for where clause
 	 * @param string $fieldList Field list to select, * for all (for "SELECT [fieldlist] FROM ...")
 	 * @return array Returns query array
@@ -467,7 +467,7 @@ class AbstractDatabaseRecordList extends \TYPO3\CMS\Backend\RecordList\AbstractR
 	 * fields in input table.
 	 *
 	 * @param string $table Table, in which the fields are being searched.
-	 * @param integer $currentPid Page id for the possible search limit. -1 only if called from an old XCLASS.
+	 * @param int $currentPid Page id for the possible search limit. -1 only if called from an old XCLASS.
 	 * @return string Returns part of WHERE-clause for searching, if applicable.
 	 */
 	public function makeSearchString($table, $currentPid = -1) {
@@ -583,7 +583,7 @@ class AbstractDatabaseRecordList extends \TYPO3\CMS\Backend\RecordList\AbstractR
 	 * Returns the title (based on $code) of a record (from table $table) with the proper link around (that is for 'pages'-records a link to the level of that record...)
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Item uid
+	 * @param int $uid Item uid
 	 * @param string $code Item title (not htmlspecialchars()'ed yet)
 	 * @param array $row Item row
 	 * @return string The item title. Ready for HTML output (is htmlspecialchars()'ed)
@@ -778,8 +778,8 @@ class AbstractDatabaseRecordList extends \TYPO3\CMS\Backend\RecordList\AbstractR
 	 * Creates an instance of \TYPO3\CMS\Backend\Tree\View\PageTreeView which will select a page
 	 * tree to $depth and return the object. In that object we will find the ids of the tree.
 	 *
-	 * @param integer $id Page id.
-	 * @param integer $depth Depth to go down.
+	 * @param int $id Page id.
+	 * @param int $depth Depth to go down.
 	 * @param string $perms_clause Select clause
 	 * @return \TYPO3\CMS\Backend\Tree\View\PageTreeView instance with created list of ids.
 	 * @deprecated Deprecated since 6.2, will be removed 2 versions later
@@ -800,8 +800,8 @@ class AbstractDatabaseRecordList extends \TYPO3\CMS\Backend\RecordList\AbstractR
 	/**
 	 * Get all allowed mount pages to be searched in.
 	 *
-	 * @param integer $id Page id
-	 * @param integer $depth Depth to go down
+	 * @param int $id Page id
+	 * @param int $depth Depth to go down
 	 * @param string $perms_clause select clause
 	 * @return array
 	 */
diff --git a/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php b/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
index 7748b03f9be4d308cb806ba7a65eb1923f51a0e2..6de190b536f3167810e332abcd8cee5a25a6af26 100644
--- a/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
+++ b/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
@@ -28,7 +28,7 @@ class DeletedRecordsController {
 	 * Transforms the rows for the deleted Records into the Array View necessary for ExtJS Ext.data.ArrayReader
 	 *
 	 * @param array     $rows   Array with table as key and array with all deleted rows
-	 * @param integer	$totalDeleted: Number of deleted records in total, for PagingToolbar
+	 * @param int	$totalDeleted: Number of deleted records in total, for PagingToolbar
 	 * @return string   JSON Array
 	 */
 	public function transform($deletedRowsArray, $totalDeleted) {
diff --git a/typo3/sysext/reports/Classes/Status.php b/typo3/sysext/reports/Classes/Status.php
index 9bfa97acf4837261547239ddf9e2b7a1a3a1879a..4328b5fb34112aa4126cf380692d8818ff7b7f2c 100644
--- a/typo3/sysext/reports/Classes/Status.php
+++ b/typo3/sysext/reports/Classes/Status.php
@@ -55,7 +55,7 @@ class Status {
 	 * @param string $value Status value, eg. "Disabled"
 	 * @param string $message Optional message further describing the title/value combination
 	 * 			Example:, eg "The deprecation log is important and does foo, to disable it do bar"
-	 * @param integer $severity A severity level. Use one of the constants above!
+	 * @param int $severity A severity level. Use one of the constants above!
 	 */
 	public function __construct($title, $value, $message = '', $severity = self::OK) {
 		$this->title = (string) $title;
diff --git a/typo3/sysext/rsaauth/Classes/Keypair.php b/typo3/sysext/rsaauth/Classes/Keypair.php
index 73719744b3a58cad9354f3d9dcda12e01b5feba7..42f5fc6a4e9409e2afc36b963a6f61ba239d1850 100644
--- a/typo3/sysext/rsaauth/Classes/Keypair.php
+++ b/typo3/sysext/rsaauth/Classes/Keypair.php
@@ -65,7 +65,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
 	 *
 	 * Note: This method must not be called more than one time.
 	 *
-	 * @param integer $exponent the new exponent
+	 * @param int $exponent the new exponent
 	 *
 	 * @return void
 	 *
@@ -139,7 +139,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
 	 *
 	 * Note: This method must not be called more than one time.
 	 *
-	 * @param integer $publicKeyModulus the new public key modulus
+	 * @param int $publicKeyModulus the new public key modulus
 	 *
 	 * @return void
 	 *
diff --git a/typo3/sysext/rtehtmlarea/Classes/Hook/SoftReferenceHook.php b/typo3/sysext/rtehtmlarea/Classes/Hook/SoftReferenceHook.php
index 7d0899190c6de775cce7a749b35bd42c312de420..4328d5995d95ee9090bbc41dcbe99082c7ac388a 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Hook/SoftReferenceHook.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Hook/SoftReferenceHook.php
@@ -28,7 +28,7 @@ class SoftReferenceHook extends \TYPO3\CMS\Core\Database\SoftReferenceIndex {
 	 *
 	 * @param string Database table name
 	 * @param string Field name for which processing occurs
-	 * @param integer UID of the record
+	 * @param int UID of the record
 	 * @param string The content/value of the field
 	 * @param string The softlink parser key. This is only interesting if more than one parser is grouped in the same class. That is the case with this parser.
 	 * @param array Parameters of the softlink parser. Basically this is the content inside optional []-brackets after the softref keys. Parameters are exploded by ";
diff --git a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
index cba500665ccde2326157f0152cc2980ec9b76e6d..55cc04d7237b1711aa3f0d3b90243bafa639e31a 100644
--- a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
+++ b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
@@ -323,7 +323,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
 	 * @param array $thisConfig Configuration for RTEs; A mix between TSconfig and otherwise. Contains configuration for display, which buttons are enabled, additional transformation information etc.
 	 * @param string $RTEtypeVal Record "type" field value.
 	 * @param string $RTErelPath Relative path for images/links in RTE; this is used when the RTE edits content from static files where the path of such media has to be transformed forth and back!
-	 * @param integer $thePidValue PID value of record (true parent page id)
+	 * @param int $thePidValue PID value of record (true parent page id)
 	 * @return string HTML code for RTE!
 	 */
 	public function drawRTE($parentObject, $table, $field, $row, $PA, $specConf, $thisConfig, $RTEtypeVal, $RTErelPath, $thePidValue) {
diff --git a/typo3/sysext/saltedpasswords/Classes/Evaluation/Evaluator.php b/typo3/sysext/saltedpasswords/Classes/Evaluation/Evaluator.php
index f380a66a0a906d735b3ac7c3d9bdb9b5c0e8d430..b50d9896ea2d92eff54502636ac1220893b2d7ec 100644
--- a/typo3/sysext/saltedpasswords/Classes/Evaluation/Evaluator.php
+++ b/typo3/sysext/saltedpasswords/Classes/Evaluation/Evaluator.php
@@ -46,7 +46,7 @@ class Evaluator {
 	 *
 	 * @param mixed $value The value that has to be checked.
 	 * @param string $is_in Is-In String
-	 * @param integer $set Determines if the field can be set (value correct) or not, e.g. if input is required but the value is empty, then $set should be set to FALSE. (PASSED BY REFERENCE!)
+	 * @param int $set Determines if the field can be set (value correct) or not, e.g. if input is required but the value is empty, then $set should be set to FALSE. (PASSED BY REFERENCE!)
 	 * @return The new value of the field
 	 */
 	public function evaluateFieldValue($value, $is_in, &$set) {
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php
index dd717a90605c9977340d80ae41c5c41176126aef..13bc6e230c6f654aa0935ce4a42af847d3aba1ab 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php
@@ -56,7 +56,7 @@ abstract class AbstractSalt {
 	 * Encodes bytes into printable base 64 using the *nix standard from crypt().
 	 *
 	 * @param string $input The string containing bytes to encode.
-	 * @param integer $count The number of characters (bytes) to encode.
+	 * @param int $count The number of characters (bytes) to encode.
 	 * @return string Encoded string
 	 */
 	public function base64Encode($input, $count) {
@@ -89,7 +89,7 @@ abstract class AbstractSalt {
 	 * Method determines required length of base64 characters for a given
 	 * length of a byte string.
 	 *
-	 * @param integer $byteLength Length of bytes to calculate in base64 chars
+	 * @param int $byteLength Length of bytes to calculate in base64 chars
 	 * @return integer Required length of base64 characters
 	 */
 	protected function getLengthBase64FromBytes($byteLength) {
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
index 1177757af174b6e371fed731ccae8e5e4433cce0..2b7dfab6e1cd7c2c8b3e5b566b9dcc8f5026a0b0 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
@@ -253,7 +253,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
 	/**
 	 * Method sets log2 number of iterations for password stretching.
 	 *
-	 * @param integer $hashCount log2 number of iterations for password stretching to set
+	 * @param int $hashCount log2 number of iterations for password stretching to set
 	 * @see HASH_COUNT
 	 * @see $hashCount
 	 * @see getHashCount()
@@ -265,7 +265,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
 	/**
 	 * Method sets maximum allowed log2 number of iterations for password stretching.
 	 *
-	 * @param integer $maxHashCount Maximum allowed log2 number of iterations for password stretching to set
+	 * @param int $maxHashCount Maximum allowed log2 number of iterations for password stretching to set
 	 * @see MAX_HASH_COUNT
 	 * @see $maxHashCount
 	 * @see getMaxHashCount()
@@ -277,7 +277,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
 	/**
 	 * Method sets minimum allowed log2 number of iterations for password stretching.
 	 *
-	 * @param integer $minHashCount Minimum allowed log2 number of iterations for password stretching to set
+	 * @param int $minHashCount Minimum allowed log2 number of iterations for password stretching to set
 	 * @see MIN_HASH_COUNT
 	 * @see $minHashCount
 	 * @see getMinHashCount()
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
index 1e2bfa0c7e63d1f598562932dabcacab2a09c8a0..8a520909b5b45f5b7d78235b897799cb64c354fe 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
@@ -343,7 +343,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
 	/**
 	 * Method sets log2 number of iterations for password stretching.
 	 *
-	 * @param integer $hashCount log2 number of iterations for password stretching to set
+	 * @param int $hashCount log2 number of iterations for password stretching to set
 	 * @see HASH_COUNT
 	 * @see $hashCount
 	 * @see getHashCount()
@@ -355,7 +355,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
 	/**
 	 * Method sets maximum allowed log2 number of iterations for password stretching.
 	 *
-	 * @param integer $maxHashCount Maximum allowed log2 number of iterations for password stretching to set
+	 * @param int $maxHashCount Maximum allowed log2 number of iterations for password stretching to set
 	 * @see MAX_HASH_COUNT
 	 * @see $maxHashCount
 	 * @see getMaxHashCount()
@@ -367,7 +367,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
 	/**
 	 * Method sets minimum allowed log2 number of iterations for password stretching.
 	 *
-	 * @param integer $minHashCount Minimum allowed log2 number of iterations for password stretching to set
+	 * @param int $minHashCount Minimum allowed log2 number of iterations for password stretching to set
 	 * @see MIN_HASH_COUNT
 	 * @see $minHashCount
 	 * @see getMinHashCount()
diff --git a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
index 9c90f3f391e68a6cd08e2222a97fc116b2664075..8c2ea1e2f310c04c897130d9f60031cb1dc7fea2 100644
--- a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
+++ b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
@@ -217,7 +217,7 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
 	/**
 	 * Method updates a FE/BE user record - in this case a new password string will be set.
 	 *
-	 * @param integer $uid uid of user record that will be updated
+	 * @param int $uid uid of user record that will be updated
 	 * @param mixed $updateFields Field values as key=>value pairs to be updated in database
 	 * @return void
 	 */
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
index 93b279f5f13d54f305e0aac78d6ea292ecb1ebb8..e7beda27636f514e9c59576213ea34708f2926ab 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
@@ -195,7 +195,7 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	 * Increments current user record counter by number of handled rows.
 	 *
 	 * @param string $mode 'FE' for frontend, 'BE' for backend user records
-	 * @param integer $number Number of handled rows
+	 * @param int $number Number of handled rows
 	 * @return void
 	 */
 	protected function incrementUserRecordPointer($mode, $number) {
@@ -244,7 +244,7 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Set number of records
 	 *
-	 * @param integer $numberOfRecords
+	 * @param int $numberOfRecords
 	 * @return void
 	 */
 	public function setNumberOfRecords($numberOfRecords) {
diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index 134d37c3c083172a46a2fee986efae99d7a28173..98f118118345fbccece82778c2704f3bfdadc8e9 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -1418,7 +1418,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
 	 * This method is used to add a message to the internal queue
 	 *
 	 * @param string $message The message itself
-	 * @param integer $severity Message level (according to FlashMessage class constants)
+	 * @param int $severity Message level (according to FlashMessage class constants)
 	 * @return void
 	 */
 	public function addMessage($message, $severity = FlashMessage::OK) {
diff --git a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
index b461091446f3f535b42124a2227c500558c572fc..e63eaaccbdb58638d20715faecdd20a40a58f9fc 100644
--- a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
+++ b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
@@ -131,7 +131,7 @@ class CronCommand {
 	/**
 	 * Determine if current timestamp matches minute and hour cron command restriction.
 	 *
-	 * @param integer $timestamp to test
+	 * @param int $timestamp to test
 	 * @return boolean TRUE if cron command conditions are met
 	 */
 	protected function minuteAndHourMatchesCronCommand($timestamp) {
@@ -148,7 +148,7 @@ class CronCommand {
 	 * Determine if current timestamp matches day of month, month and day of week
 	 * cron command restriction
 	 *
-	 * @param integer $timestamp to test
+	 * @param int $timestamp to test
 	 * @return boolean TRUE if cron command conditions are met
 	 */
 	protected function dayMatchesCronCommand($timestamp) {
@@ -179,7 +179,7 @@ class CronCommand {
 	 * command must be a 'normalized' list with only comma separated integers or '*'
 	 *
 	 * @param string $commandExpression: cron command
-	 * @param integer $numberToMatch: number to look up
+	 * @param int $numberToMatch: number to look up
 	 * @return boolean TRUE if number is in list
 	 */
 	protected function isInCommandList($commandExpression, $numberToMatch) {
@@ -201,7 +201,7 @@ class CronCommand {
 	 * and on last sunday of october they are set back one hour (from 3:00 to 2:00).
 	 * This shortens and lengthens the length of a day by one hour.
 	 *
-	 * @param integer $timestamp Unix timestamp
+	 * @param int $timestamp Unix timestamp
 	 * @return integer Number of seconds of day
 	 */
 	protected function numberOfSecondsInDay($timestamp) {
@@ -215,7 +215,7 @@ class CronCommand {
 	/**
 	 * Round a timestamp down to full minute.
 	 *
-	 * @param integer $timestamp Unix timestamp
+	 * @param int $timestamp Unix timestamp
 	 * @return integer Rounded timestamp
 	 */
 	protected function roundTimestamp($timestamp) {
diff --git a/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php b/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php
index 6d1f23bd7ccf76a594cee11bb338f721e48261e3..24388c79cee4d70ca48084e7e41b0217c5718542 100644
--- a/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php
+++ b/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php
@@ -156,8 +156,8 @@ class NormalizeCommand {
 	 *
 	 * @throws \InvalidArgumentException If field is invalid or out of bounds
 	 * @param string $expression Expression
-	 * @param integer $lowerBound Lower limit of result list
-	 * @param integer $upperBound Upper limit of result list
+	 * @param int $lowerBound Lower limit of result list
+	 * @param int $upperBound Upper limit of result list
 	 * @return string Normalized expression
 	 */
 	static protected function normalizeIntegerField($expression, $lowerBound = 0, $upperBound = 59) {
diff --git a/typo3/sysext/scheduler/Classes/Execution.php b/typo3/sysext/scheduler/Classes/Execution.php
index 1243195009ee11bcee47f4485d9b8e19c0098b86..17e11819a98256d0aed0fcdd649cb0154afa1c03 100644
--- a/typo3/sysext/scheduler/Classes/Execution.php
+++ b/typo3/sysext/scheduler/Classes/Execution.php
@@ -73,7 +73,7 @@ class Execution {
 	/**
 	 * This method is used to set the start date
 	 *
-	 * @param integer $start Start date (timestamp)
+	 * @param int $start Start date (timestamp)
 	 * @return void
 	 */
 	public function setStart($start) {
@@ -92,7 +92,7 @@ class Execution {
 	/**
 	 * This method is used to set the end date
 	 *
-	 * @param integer $end End date (timestamp)
+	 * @param int $end End date (timestamp)
 	 * @return void
 	 */
 	public function setEnd($end) {
@@ -111,7 +111,7 @@ class Execution {
 	/**
 	 * This method is used to set the interval
 	 *
-	 * @param integer $interval Interval (in seconds)
+	 * @param int $interval Interval (in seconds)
 	 * @return void
 	 */
 	public function setInterval($interval) {
diff --git a/typo3/sysext/scheduler/Classes/Scheduler.php b/typo3/sysext/scheduler/Classes/Scheduler.php
index 267040016d98d8c903aed694b7ba430eb0d405cd..47cc86b01cc68ea482d9b496ed11ce41f40ee77f 100644
--- a/typo3/sysext/scheduler/Classes/Scheduler.php
+++ b/typo3/sysext/scheduler/Classes/Scheduler.php
@@ -243,7 +243,7 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
 	 * with the uid is returned, else the object representing the next due task is returned.
 	 * If there are no due tasks the method throws an exception.
 	 *
-	 * @param integer $uid Primary key of a task
+	 * @param int $uid Primary key of a task
 	 * @return \TYPO3\CMS\Scheduler\Task\AbstractTask The fetched task object
 	 * @throws \OutOfBoundsException
 	 * @throws \UnexpectedValueException
@@ -294,7 +294,7 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
 	 * This method is used to get the database record for a given task
 	 * It returns the database record and not the task object
 	 *
-	 * @param integer $uid Primary key of the task to get
+	 * @param int $uid Primary key of the task to get
 	 * @return array Database record for the task
 	 * @see \TYPO3\CMS\Scheduler\Scheduler::fetchTask()
 	 * @throws \OutOfBoundsException
@@ -368,7 +368,7 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
 	 * It could be expanded to write to some other log
 	 *
 	 * @param string $message The message to write to the log
-	 * @param integer $status Status (0 = message, 1 = error)
+	 * @param int $status Status (0 = message, 1 = error)
 	 * @param mixed $code Key for the message
 	 * @return void
 	 */
diff --git a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
index 0c73d67eebc360690d0f54289fce0ca2d553cc29..8f654551ae7f827db8d8dfca2bc96da6a08ec212 100644
--- a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
@@ -107,7 +107,7 @@ abstract class AbstractTask {
 	/**
 	 * This method is used to set the unique id of the task
 	 *
-	 * @param integer $id Primary key (from the database record) of the scheduled task
+	 * @param int $id Primary key (from the database record) of the scheduled task
 	 * @return void
 	 */
 	public function setTaskUid($id) {
@@ -176,7 +176,7 @@ abstract class AbstractTask {
 	/**
 	 * This method is used to set the timestamp corresponding to the next execution time of the task
 	 *
-	 * @param integer $timestamp Timestamp of next execution
+	 * @param int $timestamp Timestamp of next execution
 	 * @return void
 	 */
 	public function setExecutionTime($timestamp) {
@@ -195,7 +195,7 @@ abstract class AbstractTask {
 	/**
 	 * This method is used to set the task group (uid) of the task
 	 *
-	 * @param integer $timestamp Uid of task group
+	 * @param int $timestamp Uid of task group
 	 * @return void
 	 */
 	public function setTaskGroup($taskGroup) {
@@ -253,7 +253,7 @@ abstract class AbstractTask {
 	/**
 	 * Registers a single execution of the task
 	 *
-	 * @param integer $timestamp Timestamp of the next execution
+	 * @param int $timestamp Timestamp of the next execution
 	 */
 	public function registerSingleExecution($timestamp) {
 		/** @var $execution \TYPO3\CMS\Scheduler\Execution */
@@ -271,9 +271,9 @@ abstract class AbstractTask {
 	/**
 	 * Registers a recurring execution of the task
 	 *
-	 * @param integer $start The first date/time where this execution should occur (timestamp)
+	 * @param int $start The first date/time where this execution should occur (timestamp)
 	 * @param string $interval Execution interval in seconds
-	 * @param integer $end The last date/time where this execution should occur (timestamp)
+	 * @param int $end The last date/time where this execution should occur (timestamp)
 	 * @param bool $multiple Set to FALSE if multiple executions of this task are not permitted in parallel
 	 * @param string $cron_cmd Used like in crontab (minute hour day month weekday)
 	 * @return void
@@ -399,7 +399,7 @@ abstract class AbstractTask {
 	/**
 	 * Removes given execution from list
 	 *
-	 * @param integer $executionID Id of the execution to remove.
+	 * @param int $executionID Id of the execution to remove.
 	 * @param \Exception $failure An exception to signal a failed execution
 	 * @return 	void
 	 */
diff --git a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
index c8f209ee9e7941fb6fd7c2bf6736f9628becd925..01d6be5820b2c5a0fbc81b1d4f87ca3019fbcc06 100644
--- a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
@@ -68,7 +68,7 @@ class RecyclerGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTa
 	 *
 	 * @throws \RuntimeException If folders are not found or files can not be deleted
 	 * @param string $directory Path to the directory
-	 * @param integer $timestamp Timestamp of the last file modification
+	 * @param int $timestamp Timestamp of the last file modification
 	 * @return boolean TRUE if success
 	 */
 	protected function cleanupRecycledFiles($directory, $timestamp) {
diff --git a/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php b/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php
index dd641403019cda0310a67f2778be6aaa879bc70b..12ac2f15227e6e62ad399f93ec45d2305bf23112 100644
--- a/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/Controller/SchedulerModuleControllerTest.php
@@ -135,7 +135,7 @@ class SchedulerModuleControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @dataProvider checkDateWithTypo3DateSyntaxDataProvider
 	 * @test
 	 * @param string $typo3DateValue Test value which will be passed to $this->testObject->checkDate
-	 * @param integer $expectedTimestamp Expected value to compare with result from operation
+	 * @param int $expectedTimestamp Expected value to compare with result from operation
 	 */
 	public function checkDateWithTypo3DateSyntax($typo3DateValue, $expectedTimestamp) {
 		$this->assertSame($expectedTimestamp, $this->testObject->checkDate($typo3DateValue), 'Fails with value "' . $typo3DateValue . '"');
diff --git a/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php b/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
index f70f694864c4c7493e88f4f7d9bf6dc1997be0d6..b64a773191fc9709b8648768692a01bf801ef2ed 100644
--- a/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
@@ -231,8 +231,8 @@ class CronCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 * @dataProvider expectedTimestampDataProvider
 	 * @param string $cronCommand Cron command
-	 * @param integer $startTimestamp Timestamp for start of calculation
-	 * @param integer $expectedTimestamp Expected result (next time of execution)
+	 * @param int $startTimestamp Timestamp for start of calculation
+	 * @param int $expectedTimestamp Expected result (next time of execution)
 	 */
 	public function calculateNextValueDeterminesCorrectNextTimestamp($cronCommand, $startTimestamp, $expectedTimestamp) {
 		$instance = new CronCommand($cronCommand, $startTimestamp);
@@ -244,7 +244,7 @@ class CronCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 * @dataProvider expectedCalculatedTimestampDataProvider
 	 * @param string $cronCommand Cron command
-	 * @param integer $startTimestamp Timestamp for start of calculation
+	 * @param int $startTimestamp Timestamp for start of calculation
 	 * @param string $expectedTimestamp Expected result (next time of execution), to be feeded to strtotime
 	 */
 	public function calculateNextValueDeterminesCorrectNextCalculatedTimestamp($cronCommand, $startTimestamp, $expectedTimestamp) {
@@ -257,9 +257,9 @@ class CronCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 * @dataProvider expectedTimestampDataProvider
 	 * @param string $cronCommand Cron command
-	 * @param integer $startTimestamp [unused] Timestamp for start of calculation
-	 * @param integer $firstTimestamp Timestamp of the next execution
-	 * @param integer $secondTimestamp Timestamp of the further execution
+	 * @param int $startTimestamp [unused] Timestamp for start of calculation
+	 * @param int $firstTimestamp Timestamp of the next execution
+	 * @param int $secondTimestamp Timestamp of the further execution
 	 */
 	public function calculateNextValueDeterminesCorrectNextTimestampOnConsecutiveCall($cronCommand, $startTimestamp, $firstTimestamp, $secondTimestamp) {
 		$instance = new CronCommand($cronCommand, $firstTimestamp);
@@ -271,7 +271,7 @@ class CronCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 * @dataProvider expectedCalculatedTimestampDataProvider
 	 * @param string $cronCommand Cron command
-	 * @param integer $startTimestamp [unused] Timestamp for start of calculation
+	 * @param int $startTimestamp [unused] Timestamp for start of calculation
 	 * @param string $firstTimestamp Timestamp of the next execution, to be fed to strtotime
 	 * @param string $secondTimestamp Timestamp of the further execution, to be fed to strtotime
 	 */
diff --git a/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php b/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
index 224b2a9ea20ca44578bc6a57a77e6fadc3271613..29140b78e79ef27f14ff4314b75405a724e385c4 100644
--- a/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
@@ -292,8 +292,8 @@ class NormalizeCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @dataProvider normalizeIntegerFieldInvalidDataProvider
 	 * @expectedException \InvalidArgumentException
 	 * @param string $expression Cron command partial integer expression (invalid)
-	 * @param integer $lowerBound Lower limit
-	 * @param integer $upperBound Upper limit
+	 * @param int $lowerBound Lower limit
+	 * @param int $upperBound Upper limit
 	 */
 	public function normalizeIntegerFieldThrowsExceptionForInvalidExpressions($expression, $lowerBound, $upperBound) {
 		$accessibleProxyClassName = $this->getAccessibleProxy();
@@ -502,7 +502,7 @@ class NormalizeCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 * @dataProvider validMonthNamesDataProvider
 	 * @param string $monthName Month name
-	 * @param integer $expectedInteger Number of the month
+	 * @param int $expectedInteger Number of the month
 	 */
 	public function normalizeMonthConvertsName($monthName, $expectedInteger) {
 		$accessibleProxyClassName = $this->getAccessibleProxy();
@@ -514,7 +514,7 @@ class NormalizeCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 * @dataProvider validMonthNamesDataProvider
 	 * @param string $monthName Month name
-	 * @param integer $expectedInteger Number of the month (not used)
+	 * @param int $expectedInteger Number of the month (not used)
 	 */
 	public function normalizeMonthReturnsInteger($monthName, $expectedInteger) {
 		$accessibleProxyClassName = $this->getAccessibleProxy();
@@ -598,7 +598,7 @@ class NormalizeCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 * @dataProvider validWeekdayDataProvider
 	 * @param string $weekday Weekday expression
-	 * @param integer $expectedInteger Number of weekday
+	 * @param int $expectedInteger Number of weekday
 	 */
 	public function normalizeWeekdayConvertsName($weekday, $expectedInteger) {
 		$accessibleProxyClassName = $this->getAccessibleProxy();
@@ -610,7 +610,7 @@ class NormalizeCommandTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 * @dataProvider validWeekdayDataProvider
 	 * @param string $weekday Weekday expression
-	 * @param integer $expectedInteger Number of weekday (not used)
+	 * @param int $expectedInteger Number of weekday (not used)
 	 */
 	public function normalizeWeekdayReturnsInteger($weekday, $expectedInteger) {
 		$accessibleProxyClassName = $this->getAccessibleProxy();
diff --git a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
index 2c23515a391f7140388c2e978512ae7c433ae2cc..2bfc26e8c213790b303317c5373c52e5567a6bed 100644
--- a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
+++ b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
@@ -116,15 +116,15 @@ class AbstractAuthenticationService extends \TYPO3\CMS\Core\Service\AbstractServ
 	/**
 	 * Writes to log database table in pObj
 	 *
-	 * @param integer $type denotes which module that has submitted the entry. This is the current list:  1=tce_db; 2=tce_file; 3=system (eg. sys_history save); 4=modules; 254=Personal settings changed; 255=login / out action: 1=login, 2=logout, 3=failed login (+ errorcode 3), 4=failure_warning_email sent
-	 * @param integer $action denotes which specific operation that wrote the entry (eg. 'delete', 'upload', 'update' and so on...). Specific for each $type. Also used to trigger update of the interface. (see the log-module for the meaning of each number !!)
-	 * @param integer $error flag. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
-	 * @param integer $details_nr The message number. Specific for each $type and $action. in the future this will make it possible to translate errormessages to other languages
+	 * @param int $type denotes which module that has submitted the entry. This is the current list:  1=tce_db; 2=tce_file; 3=system (eg. sys_history save); 4=modules; 254=Personal settings changed; 255=login / out action: 1=login, 2=logout, 3=failed login (+ errorcode 3), 4=failure_warning_email sent
+	 * @param int $action denotes which specific operation that wrote the entry (eg. 'delete', 'upload', 'update' and so on...). Specific for each $type. Also used to trigger update of the interface. (see the log-module for the meaning of each number !!)
+	 * @param int $error flag. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
+	 * @param int $details_nr The message number. Specific for each $type and $action. in the future this will make it possible to translate errormessages to other languages
 	 * @param string $details Default text that follows the message
 	 * @param array $data Data that follows the log. Might be used to carry special information. If an array the first 5 entries (0-4) will be sprintf'ed the details-text...
 	 * @param string $tablename Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
-	 * @param integer $recuid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
-	 * @param integer $recpid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
+	 * @param int $recuid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
+	 * @param int $recpid Special field used by tce_main.php. These ($tablename, $recuid, $recpid) holds the reference to the record which the log-entry is about. (Was used in attic status.php to update the interface.)
 	 * @return void
 	 */
 	public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename = '', $recuid = '', $recpid = '') {
diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php
index 8e90b5c8199be21d4cd922a23bb03dac2fdd46ca..9a19907c06af6c16700156b6c15d8fb8452070fb 100644
--- a/typo3/sysext/sys_action/Classes/ActionTask.php
+++ b/typo3/sysext/sys_action/Classes/ActionTask.php
@@ -323,8 +323,8 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 	/**
 	 * Delete a BE user and redirect to the action by its id
 	 *
-	 * @param integer $userId Id of the BE user
-	 * @param integer $actionId Id of the action
+	 * @param int $userId Id of the BE user
+	 * @param int $actionId Id of the action
 	 * @return void
 	 */
 	protected function deleteUser($userId, $actionId) {
@@ -340,7 +340,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 	/**
 	 * Check if a BE user is created by the current user
 	 *
-	 * @param integer $id Id of the BE user
+	 * @param int $id Id of the BE user
 	 * @param array $action sys_action record.
 	 * @return mixed The record of the BE user if found, otherwise FALSE
 	 */
@@ -357,7 +357,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 	 * Render all users who are created by the current BE user including a link to edit the record
 	 *
 	 * @param array $action sys_action record.
-	 * @param integer $selectedUser Id of a selected user
+	 * @param int $selectedUser Id of a selected user
 	 * @return string html list of users
 	 */
 	protected function getCreatedUsers($action, $selectedUser) {
@@ -388,8 +388,8 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 	 *
 	 * @param string $username Username
 	 * @param string $realName Real name of the user
-	 * @param integer $sysActionUid Id of the sys_action record
-	 * @param integer $userId Id of the user
+	 * @param int $sysActionUid Id of the sys_action record
+	 * @param int $userId Id of the user
 	 * @return string html link
 	 */
 	protected function action_linkUserName($username, $realName, $sysActionUid, $userId) {
@@ -544,7 +544,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 	/**
 	 * Check if a page is inside the rootline the current user can see
 	 *
-	 * @param integer $pageId Id of the the page to be checked
+	 * @param int $pageId Id of the the page to be checked
 	 * @return boolean Access to the page
 	 */
 	protected function checkRootline($pageId) {
@@ -575,7 +575,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
 	/**
 	 * Create a user directory if defined
 	 *
-	 * @param integer $uid Id of the user record
+	 * @param int $uid Id of the user record
 	 * @return void
 	 */
 	protected function action_createDir($uid) {
diff --git a/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php b/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
index c61f80993f9978cf5f698af1241f7b69c2b44e28..22d074ab3412b42dfbfd8c6448210f2fd9e80011 100644
--- a/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
+++ b/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
@@ -154,7 +154,7 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	}
 
 	/**
-	 * @param integer $category
+	 * @param int $category
 	 * @return void
 	 */
 	public function setCategory($category) {
diff --git a/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php b/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php
index dc3256d1cd422ddbfcf7c08e00b2c6cea67e2e4d..2290aa53c51a2b6b3ea57dd6a29e1100a001880d 100644
--- a/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php
+++ b/typo3/sysext/sys_note/Classes/ViewHelpers/EditLinkViewHelper.php
@@ -22,7 +22,7 @@ namespace TYPO3\CMS\SysNote\ViewHelpers;
 class EditLinkViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
 	/**
-	 * @param integer $id
+	 * @param int $id
 	 * @return string
 	 */
 	public function render($id) {
diff --git a/typo3/sysext/t3editor/Classes/CodeCompletion.php b/typo3/sysext/t3editor/Classes/CodeCompletion.php
index 3629383d225298968a18e7c005237da13da09d52..e5011a15c4065be6b865f4ffe345d39c43b76353 100644
--- a/typo3/sysext/t3editor/Classes/CodeCompletion.php
+++ b/typo3/sysext/t3editor/Classes/CodeCompletion.php
@@ -59,8 +59,8 @@ class CodeCompletion {
 	 * Loads all templates up to a given page id (walking the rootline) and
 	 * cleans parts that are not required for the t3editor codecompletion.
 	 *
-	 * @param integer $pageId ID of the page
-	 * @param integer $templateId Currently unused (default: 0)
+	 * @param int $pageId ID of the page
+	 * @param int $templateId Currently unused (default: 0)
 	 * @return array Cleaned array of TypoScript information
 	 * @author Oliver Hader <oliver@typo3.org>
 	 */
@@ -84,8 +84,8 @@ class CodeCompletion {
 	 * Gets merged templates by walking the rootline to a given page id.
 	 *
 	 * @todo oliver@typo3.org: Refactor this method and comment what's going on there
-	 * @param integer $pageId
-	 * @param integer $templateId
+	 * @param int $pageId
+	 * @param int $templateId
 	 * @return array Setup part of merged template records
 	 */
 	protected function getMergedTemplates($pageId, $templateId = 0) {
diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index b40e39422977bd89f14177c92e4c0836479cc059..16da2e5f71bee4d59f46c16e97d0bd5721afb908 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -352,7 +352,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 	 * Returns HTML code to dislay an url in an iframe at the right side of the taskcenter
 	 *
 	 * @param string $url Url to display
-	 * @param integer $max
+	 * @param int $max
 	 * @return string Code that inserts the iframe (HTML)
 	 */
 	public function urlInIframe($url, $max = 0) {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
index f050c9678ab92e9735f6d6c3590876e5d2f3e30f..9a2c4b40b46cc6bfffbbf03e7fe072f82fdec76c 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
@@ -55,8 +55,8 @@ class TemplateAnalyzerModuleFunctionController extends \TYPO3\CMS\Backend\Module
 	/**
 	 * Initialize editor
 	 *
-	 * @param integer $pageId
-	 * @param integer $template_uid
+	 * @param int $pageId
+	 * @param int $template_uid
 	 * @return integer
 	 */
 	public function initialize_editor($pageId, $template_uid = 0) {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
index 390adbf742852aaf3f4feb41314e3179241c8a22..621257070b7866d0382b5b8c93d699e42f146f12 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
@@ -29,8 +29,8 @@ class TypoScriptTemplateConstantEditorModuleFunctionController extends \TYPO3\CM
 	/**
 	 * Initialize editor
 	 *
-	 * @param integer $pageId
-	 * @param integer $template_uid
+	 * @param int $pageId
+	 * @param int $template_uid
 	 * @return integer
 	 */
 	public function initialize_editor($pageId, $template_uid = 0) {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
index bc43e0c22f8fe6c5c24f9e32194dc12eb38aa309..2648444be216d60a66dbd7589f33cca414473efc 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
@@ -72,8 +72,8 @@ class TypoScriptTemplateInformationModuleFunctionController extends AbstractFunc
 	 * $GLOBALS['tmpl'] and looks for the first (visible) template
 	 * record. If $template_uid was given and greater than zero, this record will be checked.
 	 *
-	 * @param integer $pageId The uid of the current page
-	 * @param integer $template_uid: The uid of the template record to be rendered (only if more than one template on the current page)
+	 * @param int $pageId The uid of the current page
+	 * @param int $template_uid: The uid of the template record to be rendered (only if more than one template on the current page)
 	 * @return boolean Returns TRUE if a template record was found, otherwise FALSE
 	 */
 	public function initialize_editor($pageId, $template_uid = 0) {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index 44d5ed9d31b1c2adf41ae713742568745976f8ea..7c6fbc9fed49a0c00e11301317f61b14d8f493ab 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -291,7 +291,7 @@ class TypoScriptTemplateModuleController extends \TYPO3\CMS\Backend\Module\BaseS
 	/**
 	 * No template
 	 *
-	 * @param integer $newStandardTemplate
+	 * @param int $newStandardTemplate
 	 * @return string
 	 */
 	public function noTemplate($newStandardTemplate = 0) {
@@ -369,8 +369,8 @@ class TypoScriptTemplateModuleController extends \TYPO3\CMS\Backend\Module\BaseS
 	/**
 	 * Create template
 	 *
-	 * @param integer $id
-	 * @param integer $actTemplateId
+	 * @param int $id
+	 * @param int $actTemplateId
 	 * @return string
 	 */
 	public function createTemplate($id, $actTemplateId = 0) {
@@ -459,7 +459,7 @@ page.10.value = HELLO WORLD!
 	 *
 	 * @param array $pArray
 	 * @param array $lines
-	 * @param integer $c
+	 * @param int $c
 	 * @return array
 	 */
 	public function renderList($pArray, $lines = array(), $c = 0) {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
index aa5a76ab33994eef1521d5bc6d5d0d0d017e5335..fb03a0a7ce38799dedbab4cecc7f3bd3e47ffbb7 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
@@ -155,8 +155,8 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends \TYPO3\CMS
 	/**
 	 * Initialize editor
 	 *
-	 * @param integer $pageId
-	 * @param integer $template_uid
+	 * @param int $pageId
+	 * @param int $template_uid
 	 * @return integer
 	 */
 	public function initialize_editor($pageId, $template_uid = 0) {
diff --git a/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php b/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
index 2c97773cf148ad17b93dedb8e7c4e631c4fa48ed..7199c5827c414dca253d0815f1908ccee02120bc 100644
--- a/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
+++ b/typo3/sysext/version/Classes/ClickMenu/VersionClickMenu.php
@@ -27,7 +27,7 @@ class VersionClickMenu {
 	 * @param object $backRef References to parent clickmenu objects.
 	 * @param array $menuItems Array of existing menu items accumulated. New element added to this.
 	 * @param string $table Table name of the element
-	 * @param integer $uid Record UID of the element
+	 * @param int $uid Record UID of the element
 	 * @return array Modified menuItems array
 	 */
 	public function main(&$backRef, $menuItems, $table, $uid) {
diff --git a/typo3/sysext/version/Classes/Controller/VersionModuleController.php b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
index 95bb88b9c0f19e3fa81aaf1ccae79b842c6fb00c..c32df01423e38b0ab04cfe2f09276684e415d54a 100644
--- a/typo3/sysext/version/Classes/Controller/VersionModuleController.php
+++ b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
@@ -401,8 +401,8 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
 	/**
 	 * Recursively look for children for page version with $pid
 	 *
-	 * @param integer $pid UID of page record for which to look up sub-elements following that version
-	 * @param integer $c Counter, do not set (limits to 100 levels)
+	 * @param int $pid UID of page record for which to look up sub-elements following that version
+	 * @param int $c Counter, do not set (limits to 100 levels)
 	 * @return string Table with content if any
 	 */
 	public function pageSubContent($pid, $c = 0) {
@@ -451,7 +451,7 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
 	 * Look for number of versions of a record
 	 *
 	 * @param string $table Table name
-	 * @param integer $uid Record uid
+	 * @param int $uid Record uid
 	 * @return integer Number of versions for record, FALSE if none.
 	 */
 	public function lookForOwnVersions($table, $uid) {
diff --git a/typo3/sysext/version/Classes/DataHandler/CommandMap.php b/typo3/sysext/version/Classes/DataHandler/CommandMap.php
index b6ff022382829073da75de0fe43bc0d066d5cf40..0ea04709c8818ecc8ecbb6189fedff7d9c59139b 100644
--- a/typo3/sysext/version/Classes/DataHandler/CommandMap.php
+++ b/typo3/sysext/version/Classes/DataHandler/CommandMap.php
@@ -287,7 +287,7 @@ class CommandMap {
 	 * Applies workspaces behaviour for swapping/publishing and takes care of the swapMode.
 	 *
 	 * @param string $table
-	 * @param integer $liveId
+	 * @param int $liveId
 	 * @param array $properties
 	 * @return void
 	 */
@@ -314,7 +314,7 @@ class CommandMap {
 	 *
 	 * @param \TYPO3\CMS\Version\Dependency\DependencyResolver $dependency
 	 * @param string $table
-	 * @param integer $liveId
+	 * @param int $liveId
 	 * @param array $properties
 	 * @return void
 	 */
diff --git a/typo3/sysext/version/Classes/Dependency/DependencyEntityFactory.php b/typo3/sysext/version/Classes/Dependency/DependencyEntityFactory.php
index b42ad36afe8752b91d992470f4d56c444901ec62..fed1cd8d21226b006290a204bf42c7b09795c83d 100644
--- a/typo3/sysext/version/Classes/Dependency/DependencyEntityFactory.php
+++ b/typo3/sysext/version/Classes/Dependency/DependencyEntityFactory.php
@@ -33,7 +33,7 @@ class DependencyEntityFactory {
 	 * Gets and registers a new element.
 	 *
 	 * @param string $table
-	 * @param integer $id
+	 * @param int $id
 	 * @param array $data (optional)
 	 * @param \TYPO3\CMS\Version\Dependency\DependencyResolver $dependency
 	 * @return \TYPO3\CMS\Version\Dependency\ElementEntity
@@ -67,7 +67,7 @@ class DependencyEntityFactory {
 	 * Gets and registers a new reference.
 	 *
 	 * @param string $table
-	 * @param integer $id
+	 * @param int $id
 	 * @param string $field
 	 * @param array $data (optional)
 	 * @param \TYPO3\CMS\Version\Dependency\DependencyResolver $dependency
diff --git a/typo3/sysext/version/Classes/Dependency/DependencyResolver.php b/typo3/sysext/version/Classes/Dependency/DependencyResolver.php
index dd0e61e75f08326106f19b4977947f8f81975643..2df960c1849a22c346d2fa6c56acd7b6524a8fa1 100644
--- a/typo3/sysext/version/Classes/Dependency/DependencyResolver.php
+++ b/typo3/sysext/version/Classes/Dependency/DependencyResolver.php
@@ -111,7 +111,7 @@ class DependencyResolver {
 	 * Adds an element to be checked for dependent references.
 	 *
 	 * @param string $table
-	 * @param integer $id
+	 * @param int $id
 	 * @param array $data
 	 * @return \TYPO3\CMS\Version\Dependency\ElementEntity
 	 */
diff --git a/typo3/sysext/version/Classes/Dependency/ElementEntity.php b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
index d7c18a8801ba2a5324bd6f0a4ded8680b1e7ff4d..d77654f3f2037562e1a7f0eedf3813dd46d82641 100644
--- a/typo3/sysext/version/Classes/Dependency/ElementEntity.php
+++ b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
@@ -85,7 +85,7 @@ class ElementEntity {
 	 * Creates this object.
 	 *
 	 * @param string $table
-	 * @param integer $id
+	 * @param int $id
 	 * @param array $data (optional)
 	 * @param \TYPO3\CMS\Version\Dependency\DependencyResolver $dependency
 	 */
@@ -317,7 +317,7 @@ class ElementEntity {
 	 * Converts the object for string representation.
 	 *
 	 * @param string $table
-	 * @param integer $id
+	 * @param int $id
 	 * @return string
 	 */
 	static public function getIdentifier($table, $id) {
diff --git a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
index 75bdaf40ec68320ee745ed5bf7cc09f2b3cf6f10..4427bf4eb994fc095b81bce750546a8bd3cc10e3 100644
--- a/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/version/Classes/Hook/DataHandlerHook.php
@@ -69,7 +69,7 @@ class DataHandlerHook {
 	 *
 	 * @param string $command the command to be executed
 	 * @param string $table the table of the record
-	 * @param integer $id the ID of the record
+	 * @param int $id the ID of the record
 	 * @param mixed $value the value containing the data
 	 * @param bool $commandIsProcessed can be set so that other hooks or
 	 * @param DataHandler $tcemainObj reference to the main tcemain object
@@ -149,7 +149,7 @@ class DataHandlerHook {
 	 * hook that is called when an element shall get deleted
 	 *
 	 * @param string $table the table of the record
-	 * @param integer $id the ID of the record
+	 * @param int $id the ID of the record
 	 * @param array $record The accordant database record
 	 * @param bool $recordWasDeleted can be set so that other hooks or
 	 * @param DataHandler $tcemainObj reference to the main tcemain object
@@ -253,11 +253,11 @@ class DataHandlerHook {
 	 * moving records that are *not* in the live workspace
 	 *
 	 * @param string $table the table of the record
-	 * @param integer $uid the ID of the record
-	 * @param integer $destPid Position to move to: $destPid: >=0 then it points to
+	 * @param int $uid the ID of the record
+	 * @param int $destPid Position to move to: $destPid: >=0 then it points to
 	 * @param array $propArr Record properties, like header and pid (includes workspace overlay)
 	 * @param array $moveRec Record properties, like header and pid (without workspace overlay)
-	 * @param integer $resolvedPid The final page ID of the record
+	 * @param int $resolvedPid The final page ID of the record
 	 * @param bool $recordWasMoved can be set so that other hooks or
 	 * @param DataHandler $tcemainObj
 	 * @return void
@@ -406,9 +406,9 @@ class DataHandlerHook {
 	 * Send an email notification to users in workspace
 	 *
 	 * @param array $stat Workspace access array from \TYPO3\CMS\Core\Authentication\BackendUserAuthentication::checkWorkspace()
-	 * @param integer $stageId New Stage number: 0 = editing, 1= just ready for review, 10 = ready for publication, -1 = rejected!
+	 * @param int $stageId New Stage number: 0 = editing, 1= just ready for review, 10 = ready for publication, -1 = rejected!
 	 * @param string $table Table name of element (or list of element names if $id is zero)
-	 * @param integer $id Record uid of element (if zero, then $table is used as reference to element(s) alone)
+	 * @param int $id Record uid of element (if zero, then $table is used as reference to element(s) alone)
 	 * @param string $comment User comment sent along with action
 	 * @param DataHandler $tcemainObj TCEmain object
 	 * @param array $notificationAlternativeRecipients List of recipients to notify instead of be_users selected by sys_workspace, list is generated by workspace extension module
@@ -646,8 +646,8 @@ class DataHandlerHook {
 	 * Setting stage of record
 	 *
 	 * @param string $table Table name
-	 * @param integer $integer Record UID
-	 * @param integer $stageId Stage ID to set
+	 * @param int $integer Record UID
+	 * @param int $stageId Stage ID to set
 	 * @param string $comment Comment that goes into log
 	 * @param bool $notificationEmailInfo Accumulate state changes in memory for compiled notification email?
 	 * @param DataHandler $tcemainObj TCEmain object
@@ -693,9 +693,9 @@ class DataHandlerHook {
 	/**
 	 * Creates a new version of a page including content and possible subpages.
 	 *
-	 * @param integer $uid Page uid to create new version of.
+	 * @param int $uid Page uid to create new version of.
 	 * @param string $label Version label
-	 * @param integer $versionizeTree Indicating "treeLevel" - "page" (0) or "branch" (>=1) ["element" type must call versionizeRecord() directly]
+	 * @param int $versionizeTree Indicating "treeLevel" - "page" (0) or "branch" (>=1) ["element" type must call versionizeRecord() directly]
 	 * @param DataHandler $tcemainObj TCEmain object
 	 * @return void
 	 * @see copyPages()
@@ -754,8 +754,8 @@ class DataHandlerHook {
 	 * Version from archive (future/past, called "swap version") will get the uid of the "t3ver_oid", the official element with uid = "t3ver_oid" will get the new versions old uid. PIDs are swapped also
 	 *
 	 * @param string $table Table name
-	 * @param integer $id UID of the online record to swap
-	 * @param integer $swapWith UID of the archived version to swap with!
+	 * @param int $id UID of the online record to swap
+	 * @param int $swapWith UID of the archived version to swap with!
 	 * @param bool $swapIntoWS If set, swaps online into workspace instead of publishing out of workspace.
 	 * @param DataHandler $tcemainObj TCEmain object
 	 * @param string $comment Notification comment
@@ -982,7 +982,7 @@ class DataHandlerHook {
 	 *
 	 * @param \TYPO3\CMS\Core\Database\RelationHandler $dbAnalysis Instance that holds the sorting order of child records
 	 * @param array $configuration The TCA field configuration
-	 * @param integer $parentId The uid of the parent record
+	 * @param int $parentId The uid of the parent record
 	 * @return void
 	 */
 	public function writeRemappedForeignField(\TYPO3\CMS\Core\Database\RelationHandler $dbAnalysis, array $configuration, $parentId) {
@@ -998,7 +998,7 @@ class DataHandlerHook {
 	 * Release version from this workspace (and into "Live" workspace but as an offline version).
 	 *
 	 * @param string $table Table name
-	 * @param integer $id Record UID
+	 * @param int $id Record UID
 	 * @param bool $flush If set, will completely delete element
 	 * @param DataHandler $tcemainObj TCEmain object
 	 * @return void
@@ -1054,8 +1054,8 @@ class DataHandlerHook {
 	 * Copies all records from tables in $copyTablesArray from page with $old_pid to page with $new_pid
 	 * Uses raw-copy for the operation (meant for versioning!)
 	 *
-	 * @param integer $oldPageId Current page id.
-	 * @param integer $newPageId New page id
+	 * @param int $oldPageId Current page id.
+	 * @param int $newPageId New page id
 	 * @param array $copyTablesArray Array of tables from which to copy
 	 * @param DataHandler $tcemainObj TCEmain object
 	 * @return void
@@ -1084,8 +1084,8 @@ class DataHandlerHook {
 	 * Finds all elements for swapping versions in workspace
 	 *
 	 * @param string $table Table name of the original element to swap
-	 * @param integer $id UID of the original element to swap (online)
-	 * @param integer $offlineId As above but offline
+	 * @param int $id UID of the original element to swap (online)
+	 * @param int $offlineId As above but offline
 	 * @return array Element data. Key is table name, values are array with first element as online UID, second - offline UID
 	 */
 	public function findPageElementsForVersionSwap($table, $id, $offlineId) {
@@ -1125,7 +1125,7 @@ class DataHandlerHook {
 	 * Searches for all elements from all tables on the given pages in the same workspace.
 	 *
 	 * @param array $pageIdList List of PIDs to search
-	 * @param integer $workspaceId Workspace ID
+	 * @param int $workspaceId Workspace ID
 	 * @param array $elementList List of found elements. Key is table name, value is array of element UIDs
 	 * @return void
 	 */
@@ -1154,7 +1154,7 @@ class DataHandlerHook {
 	 *
 	 * @param string $table Table to search
 	 * @param array $idList List of records' UIDs
-	 * @param integer $workspaceId Workspace ID. We need this parameter because user can be in LIVE but he still can publisg DRAFT from ws module!
+	 * @param int $workspaceId Workspace ID. We need this parameter because user can be in LIVE but he still can publisg DRAFT from ws module!
 	 * @param array $pageIdList List of found page UIDs
 	 * @param array $elementList List of found element UIDs. Key is table name, value is list of UIDs
 	 * @return void
@@ -1202,9 +1202,9 @@ class DataHandlerHook {
 	 * Moving original: Will either create the placeholder if it doesn't exist or move existing placeholder in workspace.
 	 *
 	 * @param string $table Table name to move
-	 * @param integer $uid Record uid to move (online record)
-	 * @param integer $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
-	 * @param integer $wsUid UID of offline version of online record
+	 * @param int $uid Record uid to move (online record)
+	 * @param int $destPid Position to move to: $destPid: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
+	 * @param int $wsUid UID of offline version of online record
 	 * @param DataHandler $tcemainObj TCEmain object
 	 * @return void
 	 * @see moveRecord()
diff --git a/typo3/sysext/version/Classes/Utility/WorkspacesUtility.php b/typo3/sysext/version/Classes/Utility/WorkspacesUtility.php
index 5cc2bebe9037c5ca2cf6f54ad3777225bdf203f3..481886cdac53077e523782b4cc85002b9ddfef3d 100644
--- a/typo3/sysext/version/Classes/Utility/WorkspacesUtility.php
+++ b/typo3/sysext/version/Classes/Utility/WorkspacesUtility.php
@@ -26,7 +26,7 @@ class WorkspacesUtility {
 	/**
 	 * Building tcemain CMD-array for swapping all versions in a workspace.
 	 *
-	 * @param integer $wsid Real workspace ID, cannot be ONLINE (zero).
+	 * @param int $wsid Real workspace ID, cannot be ONLINE (zero).
 	 * @param bool $doSwap If set, then the currently online versions are swapped into the workspace in exchange for the offline versions. Otherwise the workspace is emptied.
 	 * @param int $pageId
 	 * @return array Command array for tcemain
@@ -65,10 +65,10 @@ class WorkspacesUtility {
 	 * Used from backend to display workspace overview
 	 * User for auto-publishing for selecting versions for publication
 	 *
-	 * @param integer $wsid Workspace ID. If -99, will select ALL versions from ANY workspace. If -98 will select all but ONLINE. >=-1 will select from the actual workspace
-	 * @param integer $filter Lifecycle filter: 1 = select all drafts (never-published), 2 = select all published one or more times (archive/multiple), anything else selects all.
-	 * @param integer $stage Stage filter: -99 means no filtering, otherwise it will be used to select only elements with that stage. For publishing, that would be "10
-	 * @param integer $pageId Page id: Live page for which to find versions in workspace!
+	 * @param int $wsid Workspace ID. If -99, will select ALL versions from ANY workspace. If -98 will select all but ONLINE. >=-1 will select from the actual workspace
+	 * @param int $filter Lifecycle filter: 1 = select all drafts (never-published), 2 = select all published one or more times (archive/multiple), anything else selects all.
+	 * @param int $stage Stage filter: -99 means no filtering, otherwise it will be used to select only elements with that stage. For publishing, that would be "10
+	 * @param int $pageId Page id: Live page for which to find versions in workspace!
 	 * @return array Array of all records uids etc. First key is table name, second key incremental integer. Records are associative arrays with uid and t3ver_oid fields. The REAL pid of the online record is found as "realpid
 	 */
 	public function selectVersionsInWorkspace($wsid, $filter = 0, $stage = -99, $pageId = -1) {
diff --git a/typo3/sysext/version/Classes/View/VersionView.php b/typo3/sysext/version/Classes/View/VersionView.php
index e7896bd2f8d4cf3cd1970a6c19a4ff4416d934c5..ac3a08d6aaa3e18c39d5f456fa7c653a6db6a0d6 100644
--- a/typo3/sysext/version/Classes/View/VersionView.php
+++ b/typo3/sysext/version/Classes/View/VersionView.php
@@ -24,7 +24,7 @@ class VersionView {
 	 * Creates the version selector for the page id inputted.
 	 * Moved out of the core file \TYPO3\CMS\Backend\Template\DocumentTemplate
 	 *
-	 * @param integer $id Page id to create selector for.
+	 * @param int $id Page id to create selector for.
 	 * @param bool $noAction If set, there will be no button for swapping page.
 	 * @return void
 	 * @see \TYPO3\CMS\Backend\Template\DocumentTemplate
diff --git a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
index 488f232f30d57def48548d8d63cb3389116e4430..84fd81a24d35dc0bbd709b779b5a3f54d9bdd3a3 100644
--- a/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
+++ b/typo3/sysext/viewpage/Classes/Controller/ViewModuleController.php
@@ -87,7 +87,7 @@ class ViewModuleController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionContr
 	/**
 	 * Get admin command
 	 *
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return string
 	 */
 	protected function getAdminCommand($pageId) {
@@ -105,7 +105,7 @@ class ViewModuleController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionContr
 	 * for a page id or a page tree.
 	 * The method checks if a type is set for the given id and returns the additional GET string.
 	 *
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return string
 	 */
 	protected function getTypeParameterIfSet($pageId) {
@@ -121,7 +121,7 @@ class ViewModuleController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionContr
 	/**
 	 * Get domain name for requested page id
 	 *
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return string|NULL Domain name from first sys_domains-Record or from TCEMAIN.previewDomain, NULL if neither is configured
 	 */
 	protected function getDomainName($pageId) {
diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
index 29fd8eaaaed06c2feb4e02beca8c8fede866be21..e8f556f922a50cde2bed46f73b64ef4f0d2202a2 100644
--- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
@@ -79,7 +79,7 @@ class PreviewController extends AbstractController {
 	 * The preview itself consists of three frames, so there are
 	 * only the frames-urls we've to generate here
 	 *
-	 * @param integer $previewWS
+	 * @param int $previewWS
 	 * @return void
 	 */
 	public function indexAction($previewWS = NULL) {
diff --git a/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php b/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php
index e8b99e080b1d4035521dd5b40c26d136b23504b9..562e2db793a27cd832d7d3a737943bab1c5bab36 100644
--- a/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php
+++ b/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php
@@ -39,8 +39,8 @@ class CombinedRecord {
 	 * Creates combined record object just by live-id and version-id of database record rows.
 	 *
 	 * @param string $table Name of the database table
-	 * @param integer $liveId Id of the database live-record row
-	 * @param integer $versionId Id of the datbase version-record row
+	 * @param int $liveId Id of the database live-record row
+	 * @param int $versionId Id of the datbase version-record row
 	 * @return \TYPO3\CMS\Workspaces\Domain\Model\CombinedRecord
 	 */
 	static public function create($table, $liveId, $versionId) {
diff --git a/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php b/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
index eeddf7ce153d527a3645e0605faf5e666e0442e1..1b74d953e9bcceaedbc1b22de0a38c95145aad13 100644
--- a/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
+++ b/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
@@ -39,7 +39,7 @@ class DatabaseRecord {
 	 * Creates database record object just by id of database record.
 	 *
 	 * @param string $table Name of the database table
-	 * @param integer $uid Id of the datbase record row
+	 * @param int $uid Id of the datbase record row
 	 * @return \TYPO3\CMS\Workspaces\Domain\Model\DatabaseRecord
 	 */
 	static public function create($table, $uid) {
@@ -59,7 +59,7 @@ class DatabaseRecord {
 
 	/**
 	 * @param string $table Name of the database table
-	 * @param integer $uid Id of the datbase record row
+	 * @param int $uid Id of the datbase record row
 	 * @param array|NULL $row The relevant database record row
 	 */
 	public function __construct($table, $uid, array $row = NULL) {
@@ -101,7 +101,7 @@ class DatabaseRecord {
 	/**
 	 * Sets the id of the database record row.
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return void
 	 */
 	public function setUid($uid) {
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php b/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
index 0ddb6e0863439cb0044454c7dd581df6381e7818..fa61090662abb11f0d4a1f4a44872e9bb9465541 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
@@ -33,7 +33,7 @@ abstract class AbstractHandler {
 	 * Gets an error response to be shown in the grid component.
 	 *
 	 * @param string $errorLabel Name of the label in the locallang.xlf file
-	 * @param integer $errorCode The error code to be used
+	 * @param int $errorCode The error code to be used
 	 * @param bool $successFlagValue Value of the success flag to be delivered back (might be FALSE in most cases)
 	 * @return array
 	 */
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php b/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
index 82f5cf75509562ba82013ae4af7d80eaa56c3afa..17d1d2bd352943791deead5677c4001b271990ef 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
@@ -40,7 +40,7 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Generates a workspace preview link.
 	 *
-	 * @param integer $uid The ID of the record to be linked
+	 * @param int $uid The ID of the record to be linked
 	 * @return string the full domain including the protocol http:// or https://, but without the trailing '/'
 	 */
 	public function generateWorkspacePreviewLink($uid) {
@@ -51,8 +51,8 @@ class ActionHandler extends AbstractHandler {
 	 * Swaps a single record.
 	 *
 	 * @param string $table
-	 * @param integer $t3ver_oid
-	 * @param integer $orig_uid
+	 * @param int $t3ver_oid
+	 * @param int $orig_uid
 	 * @return void
 	 * @todo What about reporting errors back to the ExtJS interface? /olly/
 	 */
@@ -74,7 +74,7 @@ class ActionHandler extends AbstractHandler {
 	 * Deletes a single record.
 	 *
 	 * @param string $table
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return void
 	 * @todo What about reporting errors back to the ExtJS interface? /olly/
 	 */
@@ -192,7 +192,7 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Saves the selected language.
 	 *
-	 * @param integer|string $language
+	 * @param int|string $language
 	 * @return void
 	 */
 	public function saveLanguageSelection($language) {
@@ -206,9 +206,9 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Gets the dialog window to be displayed before a record can be sent to the next stage.
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @param string $table
-	 * @param integer $t3ver_oid
+	 * @param int $t3ver_oid
 	 * @return array
 	 */
 	public function sendToNextStageWindow($uid, $table, $t3ver_oid) {
@@ -240,7 +240,7 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Gets the dialog window to be displayed before a record can be sent to the previous stage.
 	 *
-	 * @param integer $uid
+	 * @param int $uid
 	 * @param string $table
 	 * @return array
 	 */
@@ -277,7 +277,7 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Gets the dialog window to be displayed before a record can be sent to a specific stage.
 	 *
-	 * @param integer $nextStageId
+	 * @param int $nextStageId
 	 * @return array
 	 */
 	public function sendToSpecificStageWindow($nextStageId) {
@@ -293,7 +293,7 @@ class ActionHandler extends AbstractHandler {
 	 *
 	 * @param array list of recipients
 	 * @param string given user string of additional recipients
-	 * @param integer stage id
+	 * @param int stage id
 	 * @return array
 	 */
 	public function getRecipientList(array $uidOfRecipients, $additionalRecipients, $stageId) {
@@ -355,7 +355,7 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Discard all items from given page id.
 	 *
-	 * @param integer $pageId
+	 * @param int $pageId
 	 * @return array
 	 * @author Michael Klapper <development@morphodo.com>
 	 */
@@ -658,7 +658,7 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Gets all assigned recipients of a particular stage.
 	 *
-	 * @param integer $stage
+	 * @param int $stage
 	 * @return array
 	 */
 	protected function getReceipientsOfStage($stage) {
@@ -702,7 +702,7 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Gets the default comment of a particular stage.
 	 *
-	 * @param integer $stage
+	 * @param int $stage
 	 * @return string
 	 */
 	protected function getDefaultCommentOfStage($stage) {
@@ -725,7 +725,7 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Send all available workspace records to the previous stage.
 	 *
-	 * @param integer $id Current page id to process items to previous stage.
+	 * @param int $id Current page id to process items to previous stage.
 	 * @return array
 	 * @author Michael Klapper <development@morphodo.com>
 	 */
@@ -744,7 +744,7 @@ class ActionHandler extends AbstractHandler {
 	}
 
 	/**
-	 * @param integer $id Current Page id to select Workspace items from.
+	 * @param int $id Current Page id to select Workspace items from.
 	 * @return array
 	 * @author Michael Klapper <development@morphodo.com>
 	 */
@@ -765,7 +765,7 @@ class ActionHandler extends AbstractHandler {
 	/**
 	 * Fetch the current label and visible state of the buttons.
 	 *
-	 * @param integer $id
+	 * @param int $id
 	 * @return array Contains the visibility state and label of the stage change buttons.
 	 * @author Michael Klapper <development@morphodo.com>
 	 */
@@ -794,7 +794,7 @@ class ActionHandler extends AbstractHandler {
 	}
 
 	/**
-	 * @param integer $workspaceId
+	 * @param int $workspaceId
 	 * @return integer Id of the original workspace
 	 * @throws \TYPO3\CMS\Core\Exception
 	 */
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/ExtDirectServer.php b/typo3/sysext/workspaces/Classes/ExtDirect/ExtDirectServer.php
index a0fc6b40a457a7699d160ef0a973bcea36c08b8e..f3deb5891b9cc96959179f38ae82cbc9a39c1da2 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/ExtDirectServer.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/ExtDirectServer.php
@@ -213,7 +213,7 @@ class ExtDirectServer extends AbstractHandler {
 	/**
 	 * Gets an array with all sys_log entries and their comments for the given record uid and table
 	 *
-	 * @param integer $uid uid of changed element to search for in log
+	 * @param int $uid uid of changed element to search for in log
 	 * @param string $table Name of the record's table
 	 * @return array
 	 */
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php b/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
index 1bcbf6015da8b2d48db275b819c4545de8f0977a..55c3a395aaa9413304e9cd14cae7ab72fa2769da 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
@@ -120,9 +120,9 @@ class MassActionHandler extends AbstractHandler {
 	/**
 	 * Initializes the command map to be used for publishing.
 	 *
-	 * @param integer $workspace
+	 * @param int $workspace
 	 * @param bool $swap
-	 * @param integer $language
+	 * @param int $language
 	 * @return integer
 	 */
 	protected function initPublishData($workspace, $swap, $language = NULL) {
@@ -143,8 +143,8 @@ class MassActionHandler extends AbstractHandler {
 	/**
 	 * Initializes the command map to be used for flushing.
 	 *
-	 * @param integer $workspace
-	 * @param integer $language
+	 * @param int $workspace
+	 * @param int $language
 	 * @return integer
 	 */
 	protected function initFlushData($workspace, $language = NULL) {
@@ -165,7 +165,7 @@ class MassActionHandler extends AbstractHandler {
 	/**
 	 * Processes the data.
 	 *
-	 * @param integer $workspace
+	 * @param int $workspace
 	 * @return integer
 	 */
 	protected function processData($workspace) {
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/PagetreeCollectionsProcessor.php b/typo3/sysext/workspaces/Classes/ExtDirect/PagetreeCollectionsProcessor.php
index 90f12469fe7b72dda5ba7b8720928e337f940f85..12947a17d505417c3b7adb607c28712f73fc417f 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/PagetreeCollectionsProcessor.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/PagetreeCollectionsProcessor.php
@@ -24,8 +24,8 @@ class PagetreeCollectionsProcessor implements \TYPO3\CMS\Backend\Tree\Pagetree\C
 	/**
 	 * @abstract
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
-	 * @param integer $mountPoint
-	 * @param integer $level
+	 * @param int $mountPoint
+	 * @param int $level
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
 	 * @return void
 	 */
@@ -40,7 +40,7 @@ class PagetreeCollectionsProcessor implements \TYPO3\CMS\Backend\Tree\Pagetree\C
 	 * @abstract
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $node
 	 * @param string $searchFilter
-	 * @param integer $mountPoint
+	 * @param int $mountPoint
 	 * @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNodeCollection $nodeCollection
 	 * @return void
 	 */
diff --git a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
index b50dd9b6dab9dedab4e9f591ab806c26d38c3e4d..d04664f8406d9a570a25a86e5f7b3bc2eb4e2463 100644
--- a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
@@ -61,7 +61,7 @@ class DataHandlerHook {
 	 * for all existing records in that stage to avoid that any of these end up
 	 * as orphan records.
 	 *
-	 * @param integer $stageId Elements with this stage are resetted
+	 * @param int $stageId Elements with this stage are resetted
 	 * @return void
 	 */
 	protected function resetStageOfElements($stageId) {
@@ -79,7 +79,7 @@ class DataHandlerHook {
 	/**
 	 * Flushes elements of a particular workspace to avoid orphan records.
 	 *
-	 * @param integer $workspaceId The workspace to be flushed
+	 * @param int $workspaceId The workspace to be flushed
 	 * @return void
 	 */
 	protected function flushWorkspaceElements($workspaceId) {
@@ -125,7 +125,7 @@ class DataHandlerHook {
 	/**
 	 * Flushes the workspace cache for current workspace and for the virtual "all workspaces" too.
 	 *
-	 * @param integer $workspaceId The workspace to be flushed in cache
+	 * @param int $workspaceId The workspace to be flushed in cache
 	 * @return void
 	 */
 	protected function flushWorkspaceCacheEntriesByWorkspaceId($workspaceId) {
diff --git a/typo3/sysext/workspaces/Classes/Service/GridDataService.php b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
index f4afc0ededaf8020ac60c91e55857cd4e6acd413..2852bf2ef1397abe1ced194a7cb0d6f16b768f91 100644
--- a/typo3/sysext/workspaces/Classes/Service/GridDataService.php
+++ b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
@@ -83,7 +83,7 @@ class GridDataService {
 	 *
 	 * @param array $versions All records uids etc. First key is table name, second key incremental integer. Records are associative arrays with uid and t3ver_oid fields. The pid of the online record is found as "livepid" the pid of the offline record is found in "wspid
 	 * @param object $parameter Parameters as submitted by JavaScript component
-	 * @param integer $currentWorkspace The current workspace
+	 * @param int $currentWorkspace The current workspace
 	 * @return array Version record information (filtered, sorted and limited)
 	 * @throws \InvalidArgumentException
 	 */
@@ -245,8 +245,8 @@ class GridDataService {
 	/**
 	 * Gets the data array by considering the page to be shown in the grid view.
 	 *
-	 * @param integer $start
-	 * @param integer $limit
+	 * @param int $start
+	 * @param int $limit
 	 * @return array
 	 */
 	protected function getDataArray($start, $limit) {
@@ -484,7 +484,7 @@ class GridDataService {
 	/**
 	 * Gets the state of a given state value.
 	 *
-	 * @param integer $stateId stateId of offline record
+	 * @param int $stateId stateId of offline record
 	 * @param bool $hiddenOnline hidden status of online record
 	 * @param bool $hiddenOffline hidden status of offline record
 	 * @return string
@@ -551,7 +551,7 @@ class GridDataService {
 	/**
 	 * Gets a named value of the available sys_language elements.
 	 *
-	 * @param integer $id sys_language uid
+	 * @param int $id sys_language uid
 	 * @param string $key Name of the value to be fetched (e.g. title)
 	 * @return string|NULL
 	 * @see getSystemLanguages
diff --git a/typo3/sysext/workspaces/Classes/Service/HistoryService.php b/typo3/sysext/workspaces/Classes/Service/HistoryService.php
index 03775f4e3d72554874c42e5425163abb2798f46e..3df7dfa2c49b98c3b24a1754fe039788281e8613 100644
--- a/typo3/sysext/workspaces/Classes/Service/HistoryService.php
+++ b/typo3/sysext/workspaces/Classes/Service/HistoryService.php
@@ -49,7 +49,7 @@ class HistoryService implements \TYPO3\CMS\Core\SingletonInterface {
 	 * Gets the editing history of a record.
 	 *
 	 * @param string $table Name of the table
-	 * @param integer $id Uid of the record
+	 * @param int $id Uid of the record
 	 * @return array Record history entries
 	 */
 	public function getHistory($table, $id) {
@@ -134,7 +134,7 @@ class HistoryService implements \TYPO3\CMS\Core\SingletonInterface {
 	 * Gets an instance of the record history service.
 	 *
 	 * @param string $table Name of the table
-	 * @param integer $id Uid of the record
+	 * @param int $id Uid of the record
 	 * @return \TYPO3\CMS\Backend\History\RecordHistory
 	 */
 	protected function getHistoryObject($table, $id) {
diff --git a/typo3/sysext/workspaces/Classes/Service/IntegrityService.php b/typo3/sysext/workspaces/Classes/Service/IntegrityService.php
index 6ad7dcd21841c74dae9e11f8515e6ba734824216..27f20fb0d73e022b0fef8c6e9ca5b5c688043498 100644
--- a/typo3/sysext/workspaces/Classes/Service/IntegrityService.php
+++ b/typo3/sysext/workspaces/Classes/Service/IntegrityService.php
@@ -224,7 +224,7 @@ class IntegrityService {
 	 * Adds an issue.
 	 *
 	 * @param string $identifier Record identifier (table:id)
-	 * @param integer $status Status code (see constants)
+	 * @param int $status Status code (see constants)
 	 * @param string $message Message/description of the issue
 	 * @return void
 	 */
diff --git a/typo3/sysext/workspaces/Classes/Service/StagesService.php b/typo3/sysext/workspaces/Classes/Service/StagesService.php
index 80c3c102fa1cffa7f54c537a2ce7ec96fb129bb5..494798e299acbf1030d25380b20a32ec299206f5 100644
--- a/typo3/sysext/workspaces/Classes/Service/StagesService.php
+++ b/typo3/sysext/workspaces/Classes/Service/StagesService.php
@@ -267,7 +267,7 @@ class StagesService {
 	/**
 	 * Gets the title of a stage.
 	 *
-	 * @param integer $ver_stage
+	 * @param int $ver_stage
 	 * @return string
 	 */
 	public function getStageTitle($ver_stage) {
@@ -295,7 +295,7 @@ class StagesService {
 	/**
 	 * Gets a particular stage record.
 	 *
-	 * @param integer $stageid
+	 * @param int $stageid
 	 * @return array
 	 */
 	public function getStageRecord($stageid) {
@@ -305,7 +305,7 @@ class StagesService {
 	/**
 	 * Gets next stage in process for given stage id
 	 *
-	 * @param integer $stageId Id of the stage to fetch the next one for
+	 * @param int $stageId Id of the stage to fetch the next one for
 	 * @return integer The next stage Id
 	 * @throws \InvalidArgumentException
 	 */
@@ -342,7 +342,7 @@ class StagesService {
 	 * Recursive function to get all next stages for a record depending on user permissions
 	 *
 	 * @param array $nextStageArray Next stages
-	 * @param integer $stageId Current stage id of the record
+	 * @param int $stageId Current stage id of the record
 	 * @return array Next stages
 	 */
 	public function getNextStages(array &$nextStageArray, $stageId) {
@@ -372,7 +372,7 @@ class StagesService {
 	/**
 	 * Get next stage in process for given stage id
 	 *
-	 * @param integer $stageId Id of the stage to fetch the previous one for
+	 * @param int $stageId Id of the stage to fetch the previous one for
 	 * @return integer The previous stage Id
 	 * @throws \InvalidArgumentException
 	 */
@@ -402,7 +402,7 @@ class StagesService {
 	 * Recursive function to get all prev stages for a record depending on user permissions
 	 *
 	 * @param array	$prevStageArray Prev stages
-	 * @param integer $stageId Current stage id of the record
+	 * @param int $stageId Current stage id of the record
 	 * @return array prev stages
 	 */
 	public function getPrevStages(array &$prevStageArray, $stageId) {
@@ -425,7 +425,7 @@ class StagesService {
 	/**
 	 * Get array of all responsilbe be_users for a stage
 	 *
-	 * @param integer $stageId Stage id
+	 * @param int $stageId Stage id
 	 * @param bool $selectDefaultUserField If field notification_defaults should be selected instead of responsible users
 	 * @return array be_users with e-mail and name
 	 */
@@ -591,7 +591,7 @@ class StagesService {
 	/**
 	 * Gets a property of a workspaces stage.
 	 *
-	 * @param integer $stageId
+	 * @param int $stageId
 	 * @param string $property
 	 * @return string
 	 * @throws \InvalidArgumentException
@@ -612,7 +612,7 @@ class StagesService {
 	 * Gets the position of the given workspace in the hole process
 	 * f.e. 3 means step 3 of 20, by which 1 is edit and 20 is ready to publish
 	 *
-	 * @param integer $stageId
+	 * @param int $stageId
 	 * @return array position => 3, count => 20
 	 */
 	public function getPositionOfCurrentStage($stageId) {
@@ -640,7 +640,7 @@ class StagesService {
 	/**
 	 * Check if the user has access to the previous stage, relative to the given stage
 	 *
-	 * @param integer $stageId
+	 * @param int $stageId
 	 * @return boolean
 	 */
 	public function isPrevStageAllowedForUser($stageId) {
@@ -662,7 +662,7 @@ class StagesService {
 	/**
 	 * Check if the user has access to the next stage, relative to the given stage
 	 *
-	 * @param integer $stageId
+	 * @param int $stageId
 	 * @return boolean
 	 */
 	public function isNextStageAllowedForUser($stageId) {
@@ -700,7 +700,7 @@ class StagesService {
 	/**
 	 * Determines whether a stage Id is valid.
 	 *
-	 * @param integer $stageId The stage Id to be checked
+	 * @param int $stageId The stage Id to be checked
 	 * @return boolean
 	 */
 	public function isValid($stageId) {
@@ -723,7 +723,7 @@ class StagesService {
 	 * 1 = notify all responsible users (some users checked per default and you're not allowed to uncheck them)
 	 * 2 = notify all responsible users (all users are checked and nothing can be changed during stage change)
 	 *
-	 * @param integer $stageId Stage id to return the notification mode for
+	 * @param int $stageId Stage id to return the notification mode for
 	 * @return integer
 	 * @throws \InvalidArgumentException
 	 */
diff --git a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
index 13276e601cd3f06206d77532aaa253852eec67bb..0a0c721dd067a2636e700622fc675be3e7851c3c 100644
--- a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
+++ b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
@@ -84,7 +84,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Find the title for the requested workspace.
 	 *
-	 * @param integer $wsId
+	 * @param int $wsId
 	 * @return string
 	 * @throws \InvalidArgumentException
 	 */
@@ -110,10 +110,10 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Building tcemain CMD-array for swapping all versions in a workspace.
 	 *
-	 * @param integer Real workspace ID, cannot be ONLINE (zero).
+	 * @param int Real workspace ID, cannot be ONLINE (zero).
 	 * @param bool If set, then the currently online versions are swapped into the workspace in exchange for the offline versions. Otherwise the workspace is emptied.
-	 * @param integer $pageId The page id
-	 * @param integer $language Select specific language only
+	 * @param int $pageId The page id
+	 * @param int $language Select specific language only
 	 * @return array Command array for tcemain
 	 */
 	public function getCmdArrayForPublishWS($wsid, $doSwap, $pageId = 0, $language = NULL) {
@@ -144,10 +144,10 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Building tcemain CMD-array for releasing all versions in a workspace.
 	 *
-	 * @param integer Real workspace ID, cannot be ONLINE (zero).
+	 * @param int Real workspace ID, cannot be ONLINE (zero).
 	 * @param bool Run Flush (TRUE) or ClearWSID (FALSE) command
-	 * @param integer $pageId The page id
-	 * @param integer $language Select specific language only
+	 * @param int $pageId The page id
+	 * @param int $language Select specific language only
 	 * @return array Command array for tcemain
 	 */
 	public function getCmdArrayForFlushWS($wsid, $flush = TRUE, $pageId = 0, $language = NULL) {
@@ -174,13 +174,13 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	 * Used from backend to display workspace overview
 	 * User for auto-publishing for selecting versions for publication
 	 *
-	 * @param integer Workspace ID. If -99, will select ALL versions from ANY workspace. If -98 will select all but ONLINE. >=-1 will select from the actual workspace
-	 * @param integer Lifecycle filter: 1 = select all drafts (never-published), 2 = select all published one or more times (archive/multiple), anything else selects all.
-	 * @param integer Stage filter: -99 means no filtering, otherwise it will be used to select only elements with that stage. For publishing, that would be "10
-	 * @param integer Page id: Live page for which to find versions in workspace!
-	 * @param integer Recursion Level - select versions recursive - parameter is only relevant if $pageId != -1
+	 * @param int Workspace ID. If -99, will select ALL versions from ANY workspace. If -98 will select all but ONLINE. >=-1 will select from the actual workspace
+	 * @param int Lifecycle filter: 1 = select all drafts (never-published), 2 = select all published one or more times (archive/multiple), anything else selects all.
+	 * @param int Stage filter: -99 means no filtering, otherwise it will be used to select only elements with that stage. For publishing, that would be "10
+	 * @param int Page id: Live page for which to find versions in workspace!
+	 * @param int Recursion Level - select versions recursive - parameter is only relevant if $pageId != -1
 	 * @param string How to collect records for "listing" or "modify" these tables. Support the permissions of each type of record, see \TYPO3\CMS\Core\Authentication\BackendUserAuthentication::check.
-	 * @param integer $language Select specific language only
+	 * @param int $language Select specific language only
 	 * @return array Array of all records uids etc. First key is table name, second key incremental integer. Records are associative arrays with uid and t3ver_oidfields. The pid of the online record is found as "livepid" the pid of the offline record is found in "wspid
 	 */
 	public function selectVersionsInWorkspace($wsid, $filter = 0, $stage = -99, $pageId = -1, $recursionLevel = 0, $selectionType = 'tables_select', $language = NULL) {
@@ -231,10 +231,10 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	 *
 	 * @param string $table
 	 * @param string $pageList
-	 * @param integer $wsid
-	 * @param integer $filter
-	 * @param integer $stage
-	 * @param integer $language
+	 * @param int $wsid
+	 * @param int $filter
+	 * @param int $stage
+	 * @param int $language
 	 * @return array
 	 */
 	protected function selectAllVersionsFromPages($table, $pageList, $wsid, $filter, $stage, $language = NULL) {
@@ -297,9 +297,9 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	 *
 	 * @param string $table
 	 * @param string $pageList
-	 * @param integer $wsid
-	 * @param integer $filter
-	 * @param integer $stage
+	 * @param int $wsid
+	 * @param int $filter
+	 * @param int $stage
 	 * @return array
 	 */
 	protected function getMoveToPlaceHolderFromPages($table, $pageList, $wsid, $filter, $stage) {
@@ -342,9 +342,9 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Find all page uids recursive starting from a specific page
 	 *
-	 * @param integer $pageId
-	 * @param integer $wsid
-	 * @param integer $recursionLevel
+	 * @param int $pageId
+	 * @param int $wsid
+	 * @param int $recursionLevel
 	 * @return string Comma sep. uid list
 	 */
 	protected function getTreeUids($pageId, $wsid, $recursionLevel) {
@@ -468,8 +468,8 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Determine whether a specific page is new and not yet available in the LIVE workspace
 	 *
-	 * @param integer $id Primary key of the page to check
-	 * @param integer $language Language for which to check the page
+	 * @param int $id Primary key of the page to check
+	 * @param int $language Language for which to check the page
 	 * @return boolean
 	 */
 	static public function isNewPage($id, $language = 0) {
@@ -498,7 +498,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	 *
 	 * @static
 	 * @param string $table Table to be used
-	 * @param integer $uid Uid of the version(!) record
+	 * @param int $uid Uid of the version(!) record
 	 * @param array $liveRecord Optional live record data
 	 * @param array $versionRecord Optional version record data
 	 * @return string
@@ -549,8 +549,8 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Determine whether this page for the current
 	 *
-	 * @param integer $pageUid
-	 * @param integer $workspaceUid
+	 * @param int $pageUid
+	 * @param int $workspaceUid
 	 * @return boolean
 	 */
 	public function canCreatePreviewLink($pageUid, $workspaceUid) {
@@ -573,7 +573,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Generates a workspace preview link.
 	 *
-	 * @param integer $uid The ID of the record to be linked
+	 * @param int $uid The ID of the record to be linked
 	 * @return string the full domain including the protocol http:// or https://, but without the trailing '/'
 	 */
 	public function generateWorkspacePreviewLink($uid) {
@@ -590,7 +590,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Generates a workspace splitted preview link.
 	 *
-	 * @param integer $uid The ID of the record to be linked
+	 * @param int $uid The ID of the record to be linked
 	 * @param bool $addDomain Parameter to decide if domain should be added to the generated link, FALSE per default
 	 * @return string the preview link without the trailing '/'
 	 */
@@ -623,7 +623,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
 	 * the results are cached at run-time to avoid too many database-queries
 	 *
 	 * @throws \InvalidArgumentException
-	 * @param integer $uid
+	 * @param int $uid
 	 * @return integer
 	 */
 	public function getLivePageUid($uid) {