diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
index c1a2df8f12a9d5c26b580dda90e1c7214fe2ae33..9c9fa0f9be9d6843287b7257e7692fc86b37bfe5 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
@@ -705,7 +705,7 @@ class Typo3DbBackend implements BackendInterface, \TYPO3\CMS\Core\SingletonInter
 	 * @param Qom\SourceInterface $source The source (selector od join)
 	 * @param array $rows
 	 * @param \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $querySettings The TYPO3 CMS specific query settings
-	 * @param null|integer $workspaceUid
+	 * @param null|int $workspaceUid
 	 * @return array
 	 */
 	protected function doLanguageAndWorkspaceOverlay(Qom\SourceInterface $source, array $rows, \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface $querySettings, $workspaceUid = NULL) {
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
index 616789fb29cf779e41190378a990312fe722dd6c..9b2504cfe307cc16723c7ad700d8e2db2c8e8f37 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
@@ -40,7 +40,7 @@ abstract class AbstractFileFolderConverter extends \TYPO3\CMS\Extbase\Property\T
 	 * Actually convert from $source to $targetType, taking into account the fully
 	 * built $convertedChildProperties and $configuration.
 	 *
-	 * @param string|integer $source
+	 * @param string|int $source
 	 * @param string $targetType
 	 * @param array $convertedChildProperties
 	 * @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration
@@ -60,7 +60,7 @@ abstract class AbstractFileFolderConverter extends \TYPO3\CMS\Extbase\Property\T
 	}
 
 	/**
-	 * @param string|integer $source
+	 * @param string|int $source
 	 * @return \TYPO3\CMS\Core\Resource\ResourceInterface
 	 */
 	abstract protected function getOriginalResource($source);
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
index f749a5e633122866b677bb715a4b31038aec577a..8b88d50442abefb3168b76657c2a9304ae3bf84e 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
@@ -113,7 +113,7 @@ class DateTimeConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstra
 	/**
 	 * Converts $source to a \DateTime using the configured dateFormat
 	 *
-	 * @param string|integer|array $source the string to be converted to a \DateTime object
+	 * @param string|int|array $source the string to be converted to a \DateTime object
 	 * @param string $targetType must be "DateTime"
 	 * @param array $convertedChildProperties not used currently
 	 * @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php
index fddc5bb668cfc8e606d1d58731df3def06271fdf..dd3c7ed41e20a65b8e27fbf1ba14496a6127143c 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/FileConverter.php
@@ -36,7 +36,7 @@ class FileConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractFi
 	protected $expectedObjectType = 'TYPO3\\CMS\\Core\\Resource\\File';
 
 	/**
-	 * @param string|integer $source
+	 * @param string|int $source
 	 * @return \TYPO3\CMS\Core\Resource\FileInterface|\TYPO3\CMS\Core\Resource\Folder
 	 */
 	protected function getOriginalResource($source) {
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
index b8590c81af10793a2af786c510aec378ed951bae..6039c8a98a70776bd548d9aca4538403ea0c1159 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
@@ -215,7 +215,7 @@ class DataMapperTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	}
 
 	/**
-	 * @param NULL|string|integer $value
+	 * @param NULL|string|int $value
 	 * @param NULL|string $storageFormat
 	 * @param NULL|string $expectedValue
 	 * @test
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
index 97f7dfd0f73f1d363fc0a8a258d627e350576b92..2b49b09ce2ae97291b9ca2c5f9cfde055948bd5d 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
@@ -218,7 +218,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	 * Returns category index from a given string or a integer.
 	 * Fallback to 4 - 'misc' in case string is not found or integer ist out of range.
 	 *
-	 * @param string|integer $category Category string or integer
+	 * @param string|int $category Category string or integer
 	 * @return integer Valid category index
 	 */
 	public function getCategoryIndexFromStringOrNumber($category) {
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
index 40b188a481317e246152c7157b6118e8f922a55c..b0666ba2ec0ca905ff44d87efebd0abb9d85dc11 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/ExtensionTest.php
@@ -76,7 +76,7 @@ class ExtensionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @test
 	 * @dataProvider getCategoryIndexFromStringOrNumberReturnsIndexDataProvider
-	 * @param string|integer $input Given input
+	 * @param string|int $input Given input
 	 * @param int $expected Expected result
 	 * @return void
 	 */
diff --git a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
index 983db131463691f0909e69f48aa33f41486f1863..1360eeca1dbf92bf2d492421076a2e5448e03b41 100644
--- a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
+++ b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
@@ -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 int$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) {
diff --git a/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php b/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
index fda07c5f96bd59d18a6ebbc330ca6d2b19a47cac..59e11d6c6ff1db2eaefd454a7f66c3f4c8003fb7 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
@@ -460,7 +460,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	/**
 	 * Showing details for a particular phash row
 	 *
-	 * @param 	integer		phash value to display details for.
+	 * @param	int		phash value to display details for.
 	 * @return 	string		HTML content
 	 */
 	public function showDetailsForPhash($phash) {
@@ -597,7 +597,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	 * Wraps input string in a link that will display details for the word. Eg. which other pages has the word, metaphone associations etc.
 	 *
 	 * @param 	string		String to wrap, possibly a title or so.
-	 * @param 	integer		wid value to show details for
+	 * @param	int		wid value to show details for
 	 * @return 	string		Wrapped string
 	 */
 	public function linkWordDetails($string, $wid) {
@@ -608,7 +608,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	 * Wraps input string in a link to see more details for metaphone value
 	 *
 	 * @param 	string		String to wrap
-	 * @param 	integer		Metaphone value
+	 * @param	int		Metaphone value
 	 * @return 	string		Wrapped string
 	 */
 	public function linkMetaPhoneDetails($string, $metaphone) {
@@ -618,7 +618,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	/**
 	 * Creates message for flag value
 	 *
-	 * @param 	integer		Flags integer
+	 * @param	int		Flags integer
 	 * @return 	string		Message string
 	 */
 	public function flagsMsg($flags) {
@@ -635,7 +635,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	/**
 	 * Show details for words
 	 *
-	 * @param 	integer		Word ID (wid)
+	 * @param	int		Word ID (wid)
 	 * @return 	string		HTML content
 	 */
 	public function showDetailsForWord($wid) {
@@ -678,7 +678,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	/**
 	 * Show details for metaphone value
 	 *
-	 * @param 	integer		Metaphone integer hash
+	 * @param	int		Metaphone integer hash
 	 * @return 	string		HTML content
 	 */
 	public function showDetailsForMetaphone($metaphone) {
@@ -745,7 +745,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	 * Wraps input string in a link that will display details for the phash value set.
 	 *
 	 * @param 	string		String to wrap, possibly a title or so.
-	 * @param 	integer		phash value to show details for
+	 * @param	int		phash value to show details for
 	 * @return 	string		Wrapped string
 	 */
 	public function linkDetails($string, $phash) {
@@ -765,7 +765,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	 * Wraps input string in a link that will display details for the phash value set.
 	 *
 	 * @param 	string		String to wrap, possibly a title or so.
-	 * @param 	integer		phash value to show details for
+	 * @param	int		phash value to show details for
 	 * @return 	string		Wrapped string
 	 */
 	public function showPageDetails($string, $id) {
@@ -850,8 +850,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	/**
 	 * Re-indexing files/records attached to a page.
 	 *
-	 * @param 	integer		Phash value
-	 * @param 	integer		The page uid for the section record (file/url could appear more than one place you know...)
+	 * @param	int		Phash value
+	 * @param	int		The page uid for the section record (file/url could appear more than one place you know...)
 	 * @return 	string		HTML content
 	 */
 	public function reindexPhash($phash, $pageId) {
@@ -891,7 +891,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	 * Get rootline for closest TypoScript template root.
 	 * Algorithm same as used in Web > Template, Object browser
 	 *
-	 * @param 	integer		The page id to traverse rootline back from
+	 * @param	int		The page id to traverse rootline back from
 	 * @return 	array		Array where the root lines uid values are found.
 	 */
 	public function getUidRootLineForClosestTemplate($id) {
@@ -963,7 +963,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	/**
 	 * Returns an array with gr_list records for a phash
 	 *
-	 * @param 	integer		phash integer to look up on
+	 * @param	int		phash integer to look up on
 	 * @param 	string		gr_list string to filter OUT of the result (first occurence)
 	 * @return 	array		Array of records from index_grlist table
 	 */
@@ -1003,7 +1003,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
 	 * Setting / Unsetting keywords in page header
 	 *
 	 * @param 	array		Page keywords as keys in array with value 0 or 1 for set or unset.
-	 * @param 	integer		The page uid of the header where the keywords are to be set.
+	 * @param	int		The page uid of the header where the keywords are to be set.
 	 * @return 	void
 	 */
 	public function processPageKeywords($pageKeywords, $pageUid) {
diff --git a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
index cd583e8446319c3c621d4d7927dd1cb85c4df64d..3e676b77ea05c106aad44128f1f437d98190e3d0 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
@@ -134,9 +134,9 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
 	 * 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		Start page id
-	 * @param 	integer		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		Start page id
+	 * @param	int		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
 	 * @return 	string		Returns the list with a comma in the end (if any pages selected!)
 	 */
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
index e91b5b1b97703047ab4be27dd8cc16f3ad202433..081404d39d180b5dec498643b0adcd3cb9f06678 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
@@ -648,8 +648,8 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
 	 *
 	 * @param 	array		search params
 	 * @param 	array		Search Word array
-	 * @param 	integer		Number of hits
-	 * @param 	integer		Milliseconds the search took
+	 * @param 	int			Number of hits
+	 * @param 	int			Milliseconds the search took
 	 * @return 	void
 	 */
 	protected function writeSearchStat($searchParams, $searchWords, $count, $pt) {
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
index dd81cf6f4229b1813f9909973caf0e03a3153688..42cd0dedf65662c1954516d6db45a2591bbb4c0d 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
@@ -558,7 +558,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * Gets a SQL result pointer to traverse for the search records.
 	 *
 	 * @param 	array		Search words
-	 * @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 	pointer
 	 */
 	public function getResultRows_SQLpointer($sWArr, $freeIndexUid = -1) {
@@ -581,7 +581,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 *
 	 * @param 	array		Search words array (for display of text describing what was searched for)
 	 * @param 	array		Array with result rows, count, first row.
-	 * @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 	string		HTML content to display result.
 	 */
 	public function getDisplayResults($sWArr, $resData, $freeIndexUid = -1) {
@@ -625,7 +625,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * Takes the "group" var into account: Makes a "section" or "flat" display.
 	 *
 	 * @param 	array		Result rows
-	 * @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 	string		HTML
 	 */
 	public function compileResult($resultRows, $freeIndexUid = -1) {
@@ -960,7 +960,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	/**
 	 * Where-clause for free index-uid value.
 	 *
-	 * @param 	integer		Free Index UID value to limit search to.
+	 * @param	int		Free Index UID value to limit search to.
 	 * @return 	string		WHERE SQL clause part.
 	 */
 	public function freeIndexUidWhere($freeIndexUid) {
@@ -1000,7 +1000,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * Execute final query, based on phash integer list. The main point is sorting the result in the right order.
 	 *
 	 * @param 	string		List of phash integers which match the search.
-	 * @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 	pointer		Query result pointer
 	 */
 	public function execFinalQuery($list, $freeIndexUid = -1) {
@@ -1186,8 +1186,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * Write statistics information to database for the search operation
 	 *
 	 * @param 	array		Search Word array
-	 * @param 	integer		Number of hits
-	 * @param 	integer		Milliseconds the search took
+	 * @param	int		Number of hits
+	 * @param	int		Milliseconds the search took
 	 * @return 	void
 	 */
 	public function writeSearchStat($sWArr, $count, $pt) {
@@ -1417,7 +1417,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 *
 	 * @param 	string		ID for the section (used for anchor link)
 	 * @param 	string		Section title with linked wrapped around
-	 * @param 	integer		Number of results in section
+	 * @param	int		Number of results in section
 	 * @return 	string		HTML output
 	 */
 	public function makeSectionHeader($id, $sectionTitleLinked, $countResultRows) {
@@ -1434,7 +1434,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * This prints a single result row, including a recursive call for subrows.
 	 *
 	 * @param 	array		Search result row
-	 * @param 	integer		1=Display only header (for sub-rows!), 2=nothing at all
+	 * @param	int		1=Display only header (for sub-rows!), 2=nothing at all
 	 * @return 	string		HTML code
 	 */
 	public function printResultRow($row, $headerOnly = 0) {
@@ -1687,7 +1687,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * Notice how the links must resubmit the form after setting the new pointer-value in a hidden formfield.
 	 *
 	 * @param 	string		String to wrap in <a> tag
-	 * @param 	integer		Pointer value
+	 * @param	int		Pointer value
 	 * @param 	string		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.
 	 */
@@ -1793,7 +1793,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 *
 	 * @param 	array		Search result row
 	 * @param 	bool		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		String length
+	 * @param	int		String length
 	 * @return 	string		HTML string		...
 	 */
 	public function makeDescription($row, $noMarkup = 0, $lgd = 180) {
@@ -1992,7 +1992,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	 * Returns the HTML code for the locking symbol.
 	 * NOTICE: Requires a call to ->getPathFromPageId() first in order to work (done in ->makeInfo() by calling that first)
 	 *
-	 * @param 	integer		Page id for which to find answer
+	 * @param	int		Page id for which to find answer
 	 * @return 	string		<img> tag if access is limited.
 	 */
 	public function makeAccessIndication($id) {
@@ -2004,7 +2004,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	/**
 	 * Links the $str to page $id
 	 *
-	 * @param 	integer		Page id
+	 * @param	int		Page id
 	 * @param 	string		Title String to link
 	 * @param 	array		Result row
 	 * @param 	array		Additional parameters for marking up seach words
@@ -2052,7 +2052,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	/**
 	 * Returns the path to the page $id
 	 *
-	 * @param 	integer		Page ID
+	 * @param	int		Page ID
 	 * @param 	string		MP variable content.
 	 * @return 	string		Root line for result.
 	 */
@@ -2067,7 +2067,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	/**
 	 * Gets the first sys_domain record for the page, $id
 	 *
-	 * @param 	integer		Page id
+	 * @param	int		Page id
 	 * @return 	string		Domain name
 	 */
 	public function getFirstSysDomainRecordForPage($id) {
@@ -2079,7 +2079,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	/**
 	 * Returns the path to the page $id
 	 *
-	 * @param 	integer		Page ID
+	 * @param	int		Page ID
 	 * @param 	string		MP variable content
 	 * @return 	string		Path
 	 */
@@ -2125,7 +2125,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
 	/**
 	 * Return the menu of pages used for the selector.
 	 *
-	 * @param 	integer		Page ID for which to return menu
+	 * @param	int		Page ID for which to return menu
 	 * @return 	array		Menu items (for making the section selector box)
 	 */
 	public function getMenu($id) {
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
index a39e438c8b35b60f08e7c5129d9e4acb4691fc47..48fca58aa82520580b552274af06706691b4b27b 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
@@ -357,7 +357,7 @@ class IndexSearchRepository {
 	 * Search for a word
 	 *
 	 * @param 	string the search word
-	 * @param 	integer constant from this class to see if the wildcard should be left and/or right of the search string
+	 * @param	int constant from this class to see if the wildcard should be left and/or right of the search string
 	 * @return 	pointer		SQL result pointer
 	 */
 	protected function searchWord($sWord, $mode) {
@@ -494,7 +494,7 @@ class IndexSearchRepository {
 	/**
 	 * Where-clause for free index-uid value.
 	 *
-	 * @param 	integer		Free Index UID value to limit search to.
+	 * @param	int		Free Index UID value to limit search to.
 	 * @return 	string		WHERE SQL clause part.
 	 */
 	public function freeIndexUidWhere($freeIndexUid) {
@@ -536,7 +536,7 @@ class IndexSearchRepository {
 	 * Execute final query, based on phash integer list. The main point is sorting the result in the right order.
 	 *
 	 * @param 	string		List of phash integers which match the search.
-	 * @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 	pointer		Query result pointer
 	 */
 	protected function execFinalQuery($list, $freeIndexUid = -1) {
diff --git a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
index cd1ad7a361548c330f46cb68ae77fa9b9e9f21e1..ffbaefe76f3ff097e1e3db95750bdf3713c97cbf 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
@@ -464,10 +464,10 @@ class CrawlerHook {
 	 * Indexing External URL
 	 *
 	 * @param 	string		URL, http://....
-	 * @param 	integer		Page id to relate indexing to.
+	 * @param	int		Page id to relate indexing to.
 	 * @param 	array		Rootline array to relate indexing to
-	 * @param 	integer		Configuration UID
-	 * @param 	integer		Set ID value
+	 * @param	int		Configuration UID
+	 * @param	int		Set ID value
 	 * @return 	array		URLs found on this page
 	 */
 	public function indexExtUrl($url, $pageId, $rl, $cfgUid, $setId) {
@@ -554,7 +554,7 @@ class CrawlerHook {
 	 * Get rootline for closest TypoScript template root.
 	 * Algorithm same as used in Web > Template, Object browser
 	 *
-	 * @param 	integer		The page id to traverse rootline back from
+	 * @param	int		The page id to traverse rootline back from
 	 * @return 	array		Array where the root lines uid values are found.
 	 */
 	public function getUidRootLineForClosestTemplate($id) {
@@ -641,7 +641,7 @@ class CrawlerHook {
 	/**
 	 * Deletes all data stored by indexed search for a given page
 	 *
-	 * @param 	integer		Uid of the page to delete all pHash
+	 * @param	int		Uid of the page to delete all pHash
 	 * @return 	void
 	 */
 	public function deleteFromIndex($id) {
diff --git a/typo3/sysext/indexed_search/Classes/Indexer.php b/typo3/sysext/indexed_search/Classes/Indexer.php
index c2bc17fb6b3cbd6b54cac490ca83d78f642a88ea..ffbefb1318a35bda167feed074ec43922d5f51e3 100644
--- a/typo3/sysext/indexed_search/Classes/Indexer.php
+++ b/typo3/sysext/indexed_search/Classes/Indexer.php
@@ -233,9 +233,9 @@ class Indexer {
 	/**
 	 * Initializing the "combined ID" of the page (phash) being indexed (or for which external media is attached)
 	 *
-	 * @param 	integer		The page uid, &id=
-	 * @param 	integer		The page type, &type=
-	 * @param 	integer		sys_language uid, typically &L=
+	 * @param	int		The page uid, &id=
+	 * @param	int		The page type, &type=
+	 * @param	int		sys_language uid, typically &L=
 	 * @param 	string		The MP variable (Mount Points), &MP=
 	 * @param 	array		Rootline array of only UIDs.
 	 * @param 	array		Array of GET variables to register with this indexing
@@ -287,8 +287,8 @@ class Indexer {
 	/**
 	 * Sets the free-index uid. Can be called right after backend_initIndexer()
 	 *
-	 * @param 	integer		Free index UID
-	 * @param 	integer		Set id - an integer identifying the "set" of indexing operations.
+	 * @param	int		Free index UID
+	 * @param	int		Set id - an integer identifying the "set" of indexing operations.
 	 * @return 	void
 	 */
 	public function backend_setFreeIndexUid($freeIndexUid, $freeIndexSetId = 0) {
@@ -304,9 +304,9 @@ class Indexer {
 	 * @param 	string		Description equivalent
 	 * @param 	string		The main content to index
 	 * @param 	string		The charset of the title, keyword, description and body-content. MUST BE VALID, otherwise nothing is indexed!
-	 * @param 	integer		Last modification time, in seconds
-	 * @param 	integer		The creation date of the content, in seconds
-	 * @param 	integer		The record UID that the content comes from (for registration with the indexed rows)
+	 * @param	int		Last modification time, in seconds
+	 * @param	int		The creation date of the content, in seconds
+	 * @param	int		The record UID that the content comes from (for registration with the indexed rows)
 	 * @return 	void
 	 */
 	public function backend_indexAsTYPO3Page($title, $keywords, $description, $content, $charset, $mtime, $crdate = 0, $recordUid = 0) {
@@ -809,7 +809,7 @@ class Indexer {
 	 * Getting HTTP request headers of URL
 	 *
 	 * @param 	string		The URL
-	 * @param 	integer		Timeout (seconds?)
+	 * @param	int		Timeout (seconds?)
 	 * @return 	mixed		If no answer, returns FALSE. Otherwise an array where HTTP headers are keys
 	 */
 	public function getUrlHeaders($url) {
@@ -1221,7 +1221,7 @@ class Indexer {
 	 * @param 	array		Index array, passed by reference
 	 * @param 	array		Standard content array
 	 * @param 	string		Key from standard content array
-	 * @param 	integer		Bit-wise priority to type
+	 * @param	int		Bit-wise priority to type
 	 * @return 	void
 	 */
 	public function analyzeHeaderinfo(&$retArr, $content, $key, $offset) {
@@ -1384,8 +1384,8 @@ class Indexer {
 	/**
 	 * Stores gr_list in the database.
 	 *
-	 * @param 	integer		Search result record phash
-	 * @param 	integer		Actual phash of current content
+	 * @param	int		Search result record phash
+	 * @param	int		Actual phash of current content
 	 * @return 	void
 	 * @see update_grlist()
 	 */
@@ -1406,8 +1406,8 @@ class Indexer {
 	 * Stores section
 	 * $hash and $hash_t3 are the same for TYPO3 pages, but different when it is external files.
 	 *
-	 * @param 	integer		phash of TYPO3 parent search result record
-	 * @param 	integer		phash of the file indexation search record
+	 * @param	int		phash of TYPO3 parent search result record
+	 * @param	int		phash of the file indexation search record
 	 * @return 	void
 	 */
 	public function submit_section($hash, $hash_t3) {
@@ -1425,7 +1425,7 @@ class Indexer {
 	/**
 	 * Removes records for the indexed page, $phash
 	 *
-	 * @param 	integer		phash value to flush
+	 * @param	int		phash value to flush
 	 * @return 	void
 	 */
 	public function removeOldIndexedPages($phash) {
@@ -1454,10 +1454,10 @@ class Indexer {
 	 * @param 	string		File name
 	 * @param 	array		Array of "cHashParams" for files: This is for instance the page index for a PDF file (other document types it will be a zero)
 	 * @param 	string		File extension determining the type of media.
-	 * @param 	integer		Modification time of file.
-	 * @param 	integer		Creation time of file.
-	 * @param 	integer		Size of file in bytes
-	 * @param 	integer		Content HASH value.
+	 * @param	int		Modification time of file.
+	 * @param	int		Creation time of file.
+	 * @param	int		Size of file in bytes
+	 * @param	int		Content HASH value.
 	 * @param 	array		Standard content array (using only title and body for a file)
 	 * @return 	void
 	 */
@@ -1526,7 +1526,7 @@ class Indexer {
 	/**
 	 * Stores file gr_list for a file IF it does not exist already
 	 *
-	 * @param 	integer		phash value of file
+	 * @param	int		phash value of file
 	 * @return 	void
 	 */
 	public function submitFile_grlist($hash) {
@@ -1542,7 +1542,7 @@ class Indexer {
 	/**
 	 * Stores file section for a file IF it does not exist
 	 *
-	 * @param 	integer		phash value of file
+	 * @param	int		phash value of file
 	 * @return 	void
 	 */
 	public function submitFile_section($hash) {
@@ -1558,7 +1558,7 @@ class Indexer {
 	/**
 	 * Removes records for the indexed page, $phash
 	 *
-	 * @param 	integer		phash value to flush
+	 * @param	int		phash value to flush
 	 * @return 	void
 	 */
 	public function removeOldIndexedFiles($phash) {
@@ -1580,8 +1580,8 @@ class Indexer {
 	 * Check the mtime / tstamp of the currently indexed page/file (based on phash)
 	 * Return positive integer if the page needs to be indexed
 	 *
-	 * @param 	integer		mtime value to test against limits and indexed page (usually this is the mtime of the cached document)
-	 * @param 	integer		"phash" used to select any already indexed page to see what its mtime is.
+	 * @param	int		mtime value to test against limits and indexed page (usually this is the mtime of the cached document)
+	 * @param	int		"phash" used to select any already indexed page to see what its mtime is.
 	 * @return 	integer		Result integer: Generally: <0 = No indexing, >0 = Do indexing (see $this->reasons): -2) Min age was NOT exceeded and so indexing cannot occur.  -1) mtime matched so no need to reindex page. 0) N/A   1) Max age exceeded, page must be indexed again.   2) mtime of indexed page doesn't match mtime given for current content and we must index page.  3) No mtime was set, so we will index...  4) No indexed page found, so of course we will index.
 	 */
 	public function checkMtimeTstamp($mtime, $phash) {
@@ -1653,8 +1653,8 @@ class Indexer {
 	 * Check content hash for external documents
 	 * Returns TRUE if the document needs to be indexed (that is, there was no result)
 	 *
-	 * @param 	integer		phash value to check (phash_grouping)
-	 * @param 	integer		Content hash to check
+	 * @param	int		phash value to check (phash_grouping)
+	 * @param	int		Content hash to check
 	 * @return 	boolean		Returns TRUE if the document needs to be indexed (that is, there was no result)
 	 */
 	public function checkExternalDocContentHash($hashGr, $content_md5h) {
@@ -1669,7 +1669,7 @@ class Indexer {
 	/**
 	 * Checks if a grlist record has been set for the phash value input (looking at the "real" phash of the current content, not the linked-to phash of the common search result page)
 	 *
-	 * @param 	integer		Phash integer to test.
+	 * @param	int		Phash integer to test.
 	 * @return 	boolean
 	 */
 	public function is_grlist_set($phash_x) {
@@ -1684,8 +1684,8 @@ class Indexer {
 	/**
 	 * Check if an grlist-entry for this hash exists and if not so, write one.
 	 *
-	 * @param 	integer		phash of the search result that should be found
-	 * @param 	integer		The real phash of the current content. The two values are different when a page with userlogin turns out to contain the exact same content as another already indexed version of the page; This is the whole reason for the grlist table in fact...
+	 * @param	int		phash of the search result that should be found
+	 * @param	int		The real phash of the current content. The two values are different when a page with userlogin turns out to contain the exact same content as another already indexed version of the page; This is the whole reason for the grlist table in fact...
 	 * @return 	void
 	 * @see submit_grlist()
 	 */
@@ -1702,8 +1702,8 @@ class Indexer {
 	/**
 	 * Update tstamp for a phash row.
 	 *
-	 * @param 	integer		phash value
-	 * @param 	integer		If set, update the mtime field to this value.
+	 * @param	int		phash value
+	 * @param	int		If set, update the mtime field to this value.
 	 * @return 	void
 	 */
 	public function updateTstamp($phash, $mtime = 0) {
@@ -1721,7 +1721,7 @@ class Indexer {
 	/**
 	 * Update SetID of the index_phash record.
 	 *
-	 * @param 	integer		phash value
+	 * @param	int		phash value
 	 * @return 	void
 	 */
 	public function updateSetId($phash) {
@@ -1736,8 +1736,8 @@ class Indexer {
 	/**
 	 * Update parsetime for phash row.
 	 *
-	 * @param 	integer		phash value.
-	 * @param 	integer		Parsetime value to set.
+	 * @param	int		phash value.
+	 * @param	int		Parsetime value to set.
 	 * @return 	void
 	 */
 	public function updateParsetime($phash, $parsetime) {
@@ -1855,7 +1855,7 @@ class Indexer {
 	 * Submits RELATIONS between words and phash
 	 *
 	 * @param 	array		Word list array
-	 * @param 	integer		phash value
+	 * @param	int		phash value
 	 * @return 	void
 	 */
 	public function submitWords($wordList, $phash) {
@@ -1980,7 +1980,7 @@ class Indexer {
 	 * Set log message function wrapper for TT logging
 	 *
 	 * @param 	string		Message to set
-	 * @param 	integer		Error number
+	 * @param	int		Error number
 	 * @return 	void
 	 */
 	public function log_setTSlogMessage($msg, $errorNum = 0) {
diff --git a/typo3/sysext/indexed_search/Classes/Lexer.php b/typo3/sysext/indexed_search/Classes/Lexer.php
index f143588b4e3304c90d6f999ee5eea5820f631c20..619e1ebe10581f0315afd4c2380cbff7cef2bdc3 100644
--- a/typo3/sysext/indexed_search/Classes/Lexer.php
+++ b/typo3/sysext/indexed_search/Classes/Lexer.php
@@ -111,8 +111,8 @@ class Lexer {
 	 *
 	 * @param 	array		Array of accumulated words
 	 * @param 	string		Complete Input string from where to extract word
-	 * @param 	integer		Start position of word in input string
-	 * @param 	integer		The Length of the word string from start position
+	 * @param	int		Start position of word in input string
+	 * @param	int		The Length of the word string from start position
 	 * @return 	void
 	 */
 	public function addWords(&$words, &$wordString, $start, $len) {
@@ -158,7 +158,7 @@ class Lexer {
 	 * Get the first word in a given utf-8 string (initial non-letters will be skipped)
 	 *
 	 * @param 	string		Input string (reference)
-	 * @param 	integer		Starting position in input string
+	 * @param	int		Starting position in input string
 	 * @return 	array		0: start, 1: len or FALSE if no word has been found
 	 */
 	public function get_word(&$str, $pos = 0) {
@@ -181,8 +181,8 @@ class Lexer {
 	 * See if a character is a letter (or a string of letters or non-letters).
 	 *
 	 * @param 	string		Input string (reference)
-	 * @param 	integer		Byte-length of character sequence (reference, return value)
-	 * @param 	integer		Starting position in input string
+	 * @param	int		Byte-length of character sequence (reference, return value)
+	 * @param	int		Starting position in input string
 	 * @return 	boolean		letter (or word) found
 	 */
 	public function utf8_is_letter(&$str, &$len, $pos = 0) {
@@ -251,7 +251,7 @@ class Lexer {
 	/**
 	 * Determine the type of character
 	 *
-	 * @param 	integer		Unicode number to evaluate
+	 * @param	int		Unicode number to evaluate
 	 * @return 	array		Type of char; index-0: the main type: num, alpha or CJK (Chinese / Japanese / Korean)
 	 */
 	public function charType($cp) {
@@ -275,8 +275,8 @@ class Lexer {
 	 * Converts a UTF-8 multibyte character to a UNICODE codepoint
 	 *
 	 * @param 	string		UTF-8 multibyte character string (reference)
-	 * @param 	integer		The length of the character (reference, return value)
-	 * @param 	integer		Starting position in input string
+	 * @param	int		The length of the character (reference, return value)
+	 * @param	int		Starting position in input string
 	 * @param 	bool		If set, then a hex. number is returned
 	 * @return 	integer		UNICODE codepoint
 	 */
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
index 773e8e5e2c2a625afbac20f818787f56a1874986..1d439b5cb1b87342b28f10203257d994bf009758 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
@@ -72,10 +72,10 @@ class DeletedRecords {
 	 * Load all deleted rows from $table
 	 * If table is not set, it iterates the TCA tables
 	 *
-	 * @param 	integer		$id: UID from selected page
+	 * @param	int		$id: UID from selected page
 	 * @param 	string		$table: Tablename
-	 * @param 	integer		$depth: How many levels recursive
-	 * @param 	integer		$limit: MySQL LIMIT
+	 * @param	int		$depth: How many levels recursive
+	 * @param	int		$limit: MySQL LIMIT
 	 * @param 	string		$filter: Filter text
 	 * @return 	recycler_model_delRecords
 	 */
@@ -107,9 +107,9 @@ class DeletedRecords {
 	/**
 	 * Find the total count of deleted records
 	 *
-	 * @param 	integer		$id: UID from record
+	 * @param	int		$id: UID from record
 	 * @param 	string		$table: Tablename from record
-	 * @param 	integer		$depth: How many levels recursive
+	 * @param	int		$depth: How many levels recursive
 	 * @param 	string		$filter: Filter text
 	 * @return 	void
 	 */
@@ -125,9 +125,9 @@ class DeletedRecords {
 	/**
 	 * Set all deleted rows
 	 *
-	 * @param 	integer		$id: UID from record
+	 * @param	int		$id: UID from record
 	 * @param 	string		$table: Tablename from record
-	 * @param 	integer		$depth: How many levels recursive
+	 * @param	int		$depth: How many levels recursive
 	 * @param 	array		$ctrl: TCA CTRL Array
 	 * @param 	string		$filter: Filter text
 	 * @return 	void
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
index 86ca867583d5502b4f9a08bd306fbfbb289e20b3..638b9d185b6cdf37d67dffe3122ea131f790712b 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
@@ -26,8 +26,8 @@ class Tables {
 	 *
 	 * @param 	string		$format: Return format (example: json)
 	 * @param 	bool		$withAllOption: 0 no, 1 return tables with a "all" option
-	 * @param 	integer		$id: UID from selected page
-	 * @param 	integer		$depth: How many levels recursive
+	 * @param 	int		$id: UID from selected page
+	 * @param 	int		$depth: How many levels recursive
 	 * @return 	string		The tables to be displayed
 	 */
 	public function getTables($format, $withAllOption = 0, $startUid, $depth = 0) {
diff --git a/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php b/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
index d14fc612f556ddf63d07307b7ad2c1b03a72ba78..d308b6b5d3d1d09de41dcc9b5e5f422e1de73aaa 100644
--- a/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
+++ b/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
@@ -68,10 +68,10 @@ class RecyclerUtility {
 	 * Each part of the path will be limited to $titleLimit characters
 	 * Deleted pages are filtered out.
 	 *
-	 * @param 	integer		Page uid for which to create record path
+	 * @param	int		Page uid for which to create record path
 	 * @param 	string		$clause is additional where clauses, eg.
-	 * @param 	integer		Title limit
-	 * @param 	integer		Title limit of Full title (typ. set to 1000 or so)
+	 * @param	int		Title limit
+	 * @param	int		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 = 1000, $fullTitleLimit = 0) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php
index 18adbb982687860d55269b5ae22da79ffb68a6d7..055e0e0dfa91fe3ff3d804f94d343c13cfb8cfaa 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php
@@ -94,7 +94,7 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
 	 * @param 	array		Configuration for RTEs; A mix between TSconfig and otherwise. Contains configuration for display, which buttons are enabled, additional transformation information etc.
 	 * @param 	string		Record "type" field value.
 	 * @param 	string		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 value of record (true parent page id)
+	 * @param 	int		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) {
@@ -268,7 +268,7 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
 	 * Return the JS-Code for copy the HTML-Code from the editor in the hidden input field.
 	 * This is for submit function from the form.
 	 *
-	 * @param 	integer		$RTEcounter: The index number of the RTE editing area.
+	 * @param 	int		$RTEcounter: The index number of the RTE editing area.
 	 * @param 	string		$form: the name of the form
 	 * @param 	string		$textareaId: the id of the textarea
 	 * @return 	string		the JS-Code
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/AboutEditor.php b/typo3/sysext/rtehtmlarea/Classes/Extension/AboutEditor.php
index 312b01506edf9bef54330d6e583381deb08a13c2..4de2b089d68c4439027379bf56e552513496cd83 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/AboutEditor.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/AboutEditor.php
@@ -53,7 +53,7 @@ class AboutEditor extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Acronym.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Acronym.php
index e85d999001ac8813dbb51241c30dcfdbe7a1fe75..b7fcc69b14efeb283efb2ef501405d318c47ff3a 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Acronym.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Acronym.php
@@ -79,7 +79,7 @@ class Acronym extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins, in this case, JS configuration of block elements
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php b/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
index 21a6d79810fc16538acb4f3436f41a823da1c83d..547fb00df3fdb486afdea534178ec259b6ef959e 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
@@ -88,7 +88,7 @@ class BlockElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins, in this case, JS configuration of block elements
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/CharacterMap.php b/typo3/sysext/rtehtmlarea/Classes/Extension/CharacterMap.php
index 526704861e5292a923176b91fb9d8e262a0f9113..d4bd54ad5071bfd8d586431137f6b785d0a7b5f5 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/CharacterMap.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/CharacterMap.php
@@ -54,7 +54,7 @@ class CharacterMap extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/ContextMenu.php b/typo3/sysext/rtehtmlarea/Classes/Extension/ContextMenu.php
index b5537b24c50680f52837bbc16f03f6d9ae8b8a4b..8003584ef25c19e02aa8d7c40c8e1e12cd0d549a 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/ContextMenu.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/ContextMenu.php
@@ -56,7 +56,7 @@ class ContextMenu extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($editorId) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/CopyPaste.php b/typo3/sysext/rtehtmlarea/Classes/Extension/CopyPaste.php
index ca040674b34cc24345cd48eea3a01f799f5c591d..4bac1a4c562cdf29fb7da59a64264c755ac9f96c 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/CopyPaste.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/CopyPaste.php
@@ -73,7 +73,7 @@ class CopyPaste extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultClean.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultClean.php
index c61cb2631165b5a90295ac7dd3e058a0cb040772..786fbc9f6dda926d94588f1d7367965308336953 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultClean.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultClean.php
@@ -57,7 +57,7 @@ class DefaultClean extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins, in this case, JS configuration of block elements
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultImage.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultImage.php
index 234196bde995f52a71c3fbeb0e2b5c5768b34a52..4ae369ea4b6a3754e034c9ae08b8bfef9177380e 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultImage.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultImage.php
@@ -59,7 +59,7 @@ class DefaultImage extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
index e9d9e8f4535ca41adf4ce9e7745a464fee86e69b..0efd42eddcbd17b3fe9f3bb336d6a26c1fd81cfb 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
@@ -58,7 +58,7 @@ class DefaultInline extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultLink.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultLink.php
index 7c8091173f60e5302e05b1685481c4ec4c60b27e..f0479f704d5abdf1b003e86930c839101d7dba1f 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultLink.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultLink.php
@@ -54,7 +54,7 @@ class DefaultLink extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefinitionList.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefinitionList.php
index 540faff516bf472374b2f72f7bd3e67df17b9ddb..a6a0e2b829c7da8b328a92b877d249f680e355e4 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefinitionList.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefinitionList.php
@@ -65,7 +65,7 @@ class DefinitionList extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/EditElement.php b/typo3/sysext/rtehtmlarea/Classes/Extension/EditElement.php
index f615b11b5a7dbb06953b12368a3d514b07cdb2e5..08e7a973b7dc2d5777e2699bbe0699c4f03cd4d9 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/EditElement.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/EditElement.php
@@ -56,7 +56,7 @@ class EditElement extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/FindReplace.php b/typo3/sysext/rtehtmlarea/Classes/Extension/FindReplace.php
index d0d8f74882b422cf4b9b54ac7104cb964b5984d5..ca09a1ed71e8523a7890bf77c2d384c831a12384 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/FindReplace.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/FindReplace.php
@@ -53,7 +53,7 @@ class FindReplace extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php b/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
index 4b1029c3d65e333dfcd7cdf5123eac76f6391abc..d1a2b12fabeb3c3e25844220e06c4640d5ce4272 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
@@ -130,7 +130,7 @@ class InlineElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/InsertSmiley.php b/typo3/sysext/rtehtmlarea/Classes/Extension/InsertSmiley.php
index 1f654fe9e29215331de92751ffbf244bedccb693..88e0a4e83860463f8133acf24aa98b3e8966e2b6 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/InsertSmiley.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/InsertSmiley.php
@@ -53,7 +53,7 @@ class InsertSmiley extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php
index 659a0b047bfb0effd5df236eba78e0990e6fc81f..13eaf99f260cc7b48a8174d8a202535dad66d4cb 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php
@@ -63,7 +63,7 @@ class Language extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php b/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php
index cad43fd3fb62ca493773f81f4c785c7b6069d468..514bb82dedb9514b852c43e0049d3d56d078ae84 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php
@@ -53,7 +53,7 @@ class MicroDataSchema extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Plaintext.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Plaintext.php
index 56220a80ac1add52b1a38ea8e84cdcb0f628cb12..d724e866397a0ce63b325024bb9b6282f3a08f2e 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Plaintext.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Plaintext.php
@@ -59,7 +59,7 @@ class Plaintext extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/RemoveFormat.php b/typo3/sysext/rtehtmlarea/Classes/Extension/RemoveFormat.php
index b2088bc460f6953e800e9f21139b1e3fa0616a85..92e4f4784c2d764ac4d52babaaae9edd55805305 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/RemoveFormat.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/RemoveFormat.php
@@ -53,7 +53,7 @@ class RemoveFormat extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php b/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php
index 0a7918768f0e652d15647b0f429909517f7e8b33..5b4f72a8ee1f5c0e3d5605dc0eace799c28a1676 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php
@@ -89,7 +89,7 @@ class SelectFont extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
@@ -107,7 +107,7 @@ class SelectFont extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return Javascript configuration of font faces
 	 *
-	 * @param 	integer		$RTEcounter: The index number of the current RTE editing area within the form.
+	 * @param 	int		$RTEcounter: The index number of the current RTE editing area within the form.
 	 * @param 	string		$buttonId: button id
 	 * @return 	string		Javascript configuration of font faces
 	 */
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php
index 076efd19e84752ffb081e6b0408834d3ef9d9017..4a482915505fd8f4b4c18c2e1ebd5a215170affc 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php
@@ -61,7 +61,7 @@ class Spellchecker extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/TableOperations.php b/typo3/sysext/rtehtmlarea/Classes/Extension/TableOperations.php
index 9612b3ab59994371cd46bbac7417a945d3995b37..a3ca896bae886b0721eca0515b8238a4653eb24d 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/TableOperations.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/TableOperations.php
@@ -88,7 +88,7 @@ class TableOperations extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins, in this case, JS configuration of block elements
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/TextIndicator.php b/typo3/sysext/rtehtmlarea/Classes/Extension/TextIndicator.php
index e46cc44b54dc9377d100a15ac28871681d21cd40..6c1dfc8b40a821d6d63b4cb7074d0eb2cf58bc03 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/TextIndicator.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/TextIndicator.php
@@ -53,7 +53,7 @@ class TextIndicator extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php
index 8c8f737aa7a19b6635d55af911ee115f5c3e7504..dacff21cb4d1ffad5ec54c36a32d3990cf96540e 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php
@@ -58,7 +58,7 @@ class Typo3Color extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
@@ -70,7 +70,7 @@ class Typo3Color extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return Javascript configuration of colors
 	 *
-	 * @param 	integer		$RTEcounter: The index number of the current RTE editing area within the form.
+	 * @param 	int		$RTEcounter: The index number of the current RTE editing area within the form.
 	 * @return 	string		Javascript configuration of colors
 	 */
 	public function buildJSColorsConfig($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3HtmlParser.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3HtmlParser.php
index 6b126d4b8521f590a92977a5afb1e070b9877067..023cdfdc1171776a3b187861986cef9bc6458383 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3HtmlParser.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3HtmlParser.php
@@ -57,7 +57,7 @@ class Typo3HtmlParser extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins, in this case, JS configuration of block elements
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Image.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Image.php
index b4a816b5eee7e9f84f7262249b52894a9cab77d8..baa4e5627ae21a93be71e4e9a2eb155eabc2453b 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Image.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Image.php
@@ -61,7 +61,7 @@ class Typo3Image extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins, in this case, JS configuration of block elements
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Link.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Link.php
index 81ce29d7b3b21eacb78d7bdf385146b92e01875c..a0b07eaac7815bf29ef97b76e0c75fda30162a2c 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Link.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Link.php
@@ -63,7 +63,7 @@ class Typo3Link extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins, in this case, JS configuration of block elements
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/UndoRedo.php b/typo3/sysext/rtehtmlarea/Classes/Extension/UndoRedo.php
index 2fca92f5ad4c84a18bc24d26cf0260ca66623f08..0a2ce10f824137ae9747de57acc7872b03761f52 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/UndoRedo.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/UndoRedo.php
@@ -54,7 +54,7 @@ class UndoRedo extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/UserElements.php b/typo3/sysext/rtehtmlarea/Classes/Extension/UserElements.php
index 22633e1bd964add5f29a6f68068c16a03c8eb3bf..5e56fceac43d81c83d670f465dcd5fef0e5ba301 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/UserElements.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/UserElements.php
@@ -53,7 +53,7 @@ class UserElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins, in this case, JS configuration of block elements
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaApi.php b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaApi.php
index 8448339c873ec81c966d3e93bf2a2729b6cd62d0..97d1641a2be0a3613c83334d38ecb3296ae2ae77 100644
--- a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaApi.php
+++ b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaApi.php
@@ -135,7 +135,7 @@ abstract class RteHtmlAreaApi {
 	/**
 	 * Return JS configuration of the htmlArea plugins registered by the extension
 	 *
-	 * @param 	integer		Relative id of the RTE editing area in the form
+	 * @param 	int		Relative id of the RTE editing area in the form
 	 * @return 	string		JS configuration for registered plugins
 	 */
 	public function buildJavascriptConfiguration($RTEcounter) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
index 79a0979859e0c4425b68f482c90e1ab0e7829a36..0c49205af70eb93ce5b5c7683dfac0d3b6569f09 100644
--- a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
+++ b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
@@ -883,7 +883,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
 	/**
 	 * Return the Javascript code for configuring the RTE
 	 *
-	 * @param 	integer		$RTEcounter: The index number of the current RTE editing area within the form.
+	 * @param	int		$RTEcounter: The index number of the current RTE editing area within the form.
 	 * @param 	string		$table: The table that includes this RTE (optional, necessary for IRRE).
 	 * @param 	string		$uid: The uid of that table that includes this RTE (optional, necessary for IRRE).
 	 * @param 	string		$field: The field of that record that includes this RTE (optional).
@@ -1044,7 +1044,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
 	/**
 	 * Return Javascript configuration of classes
 	 *
-	 * @param 	integer		$RTEcounter: The index number of the current RTE editing area within the form.
+	 * @param	int		$RTEcounter: The index number of the current RTE editing area within the form.
 	 * @return 	string		Javascript configuration of classes
 	 */
 	public function buildJSClassesConfig($RTEcounter) {
@@ -1181,7 +1181,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
 	/**
 	 * Return a file name containing the main JS language array for HTMLArea
 	 *
-	 * @param 	integer		$RTEcounter: The index number of the current RTE editing area within the form.
+	 * @param	int		$RTEcounter: The index number of the current RTE editing area within the form.
 	 * @return 	string		filename
 	 */
 	public function buildJSMainLangFile($RTEcounter) {
@@ -1341,7 +1341,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
 	 * Return the Javascript code for copying the HTML code from the editor into the hidden input field.
 	 * This is for submit function of the form.
 	 *
-	 * @param 	integer		$RTEcounter: The index number of the current RTE editing area within the form.
+	 * @param	int		$RTEcounter: The index number of the current RTE editing area within the form.
 	 * @param 	string		$formName: the name of the form
 	 * @param 	string		$textareaId: the id of the textarea
 	 * @param 	string		$textareaName: the name of the textarea
@@ -1355,7 +1355,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
 	 * Return the Javascript code for copying the HTML code from the editor into the hidden input field.
 	 * This is for submit function of the form.
 	 *
-	 * @param 	integer		$RTEcounter: The index number of the current RTE editing area within the form.
+	 * @param	int		$RTEcounter: The index number of the current RTE editing area within the form.
 	 * @param 	string		$formName: the name of the form
 	 * @param 	string		$textareaId: the id of the textarea
 	 * @return 	string		Javascript code
diff --git a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
index a7fc9a9c713a24a6016d8967f3128c3d834dbf29..adcca9f328127f7acaf8d26c4c4218871670c40b 100644
--- a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
+++ b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
@@ -252,8 +252,8 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
 	 * Echo the HTML page and JS that will insert the image
 	 *
 	 * @param 	string		$url: the url of the image
-	 * @param 	integer		$width: the width of the image
-	 * @param 	integer		$height: the height of the image
+	 * @param 	int		$width: the width of the image
+	 * @param 	int		$height: the height of the image
 	 * @param 	string		$altText: text for the alt attribute of the image
 	 * @param 	string		$titleText: text for the title attribute of the image
 	 * @param 	string		$additionalParams: text representing more html attributes to be added on the img tag