diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
index 839790ff9769803ecfa36f52a52a3ef56149b8b6..125cc9c7a33f00a72748846ea2d257d5fcc832ca 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
@@ -46,7 +46,7 @@ class ElementInformationController {
 	protected $permsClause;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	public $access = FALSE;
 
diff --git a/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php b/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
index 61b2e0952fce8031ad95853bfd1a3388d2d3e0f7..2c53c13c7d6a83f0016f55969c039d0125cd3c7b 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
@@ -83,7 +83,7 @@ class SuggestDefaultReceiver {
 	/**
 	 * The maximum number of items to select.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $maxItems = 10;
 
diff --git a/typo3/sysext/backend/Classes/Form/FormDataTraverser.php b/typo3/sysext/backend/Classes/Form/FormDataTraverser.php
index 745ed9375df0f278836ebcf3a2b5d1e5cc5b1930..af653961cd67d4342824ffa42a715d62a8eb3e00 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataTraverser.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataTraverser.php
@@ -37,7 +37,7 @@ class FormDataTraverser {
 	 * If this is TRUE the alternative field value will be used even if
 	 * the detected field value is not empty.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $forceAlternativeFieldValueUse = FALSE;
 
@@ -66,7 +66,7 @@ class FormDataTraverser {
 	 * If the first record in the chain is translatable the language
 	 * UID of this record is stored in this variable.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $originalLanguageUid = NULL;
 
diff --git a/typo3/sysext/backend/Classes/Form/FormEngine.php b/typo3/sysext/backend/Classes/Form/FormEngine.php
index e5e7184898c59ba6138371bb0538cf855e3a7963..7638946f37349a88e7eeb98479ccfc26c31d8060 100644
--- a/typo3/sysext/backend/Classes/Form/FormEngine.php
+++ b/typo3/sysext/backend/Classes/Form/FormEngine.php
@@ -250,7 +250,7 @@ class FormEngine {
 	/**
 	 * Value that gets added for style="width: ...px" for textareas compared to input fields.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $form_additionalTextareaStyleWidth = 23;
 
@@ -640,7 +640,7 @@ class FormEngine {
 	public $templateFile = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 * @var internal
 	 */
 	public $multiSelectFilterCount = 0;
diff --git a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
index 0c78e98bb1c3cc7bda9d76654edba777006d8d1a..8e912a3af370d0ea9bc939fb35e1138ad11b16f4 100644
--- a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
+++ b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
@@ -50,14 +50,14 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
 	/**
 	 * Decides if the writelog() function is called at login and logout.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $writeStdLog = FALSE;
 
 	/**
 	 * If the writelog() functions is called if a login-attempt has be tried without success.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $writeAttemptLog = FALSE;
 
@@ -71,7 +71,7 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
 	/**
 	 * General flag which is set if the adminpanel should be displayed at all.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $extAdmEnabled = FALSE;
 
diff --git a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
index dd019ef4dda597cb3875ea7e87015f39642e85ff..fc4d033cec717701b803413c8cad4a4b577cfeb2 100644
--- a/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
+++ b/typo3/sysext/backend/Classes/Search/LiveSearch/LiveSearch.php
@@ -32,15 +32,15 @@ class LiveSearch {
 	 */
 	const PAGE_JUMP_TABLE = 'pages';
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const RECURSIVE_PAGE_LEVEL = 99;
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const GROUP_TITLE_MAX_LENGTH = 15;
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const RECORD_TITLE_MAX_LENGTH = 28;
 	/**
@@ -49,12 +49,12 @@ class LiveSearch {
 	private $queryString = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	private $startCount = 0;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	private $limitCount = 5;
 
diff --git a/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php b/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php
index b6a2c3d9a5426d9956abed1653fb9663bba2cdfe..65b601cdede192874529c9d2ae1f913871bd72e1 100644
--- a/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php
+++ b/typo3/sysext/backend/Classes/Sprite/SpriteGenerator.php
@@ -60,35 +60,35 @@ class SpriteGenerator {
 ';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $enableHighDensitySprite = TRUE;
 
 	/**
 	 * Most common icon-width in the sprite
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $defaultWidth = 0;
 
 	/**
 	 * Most common icon-height in the sprite
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $defaultHeight = 0;
 
 	/**
 	 * Calculated width of the sprite
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $spriteWidth = 0;
 
 	/**
 	 * Calculated height of the sprite
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $spriteHeight = 0;
 
@@ -116,7 +116,7 @@ class SpriteGenerator {
 	/**
 	 * The spriteName will not be included in icon names
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $omitSpriteNameInIconName = FALSE;
 
@@ -131,7 +131,7 @@ class SpriteGenerator {
 	 * Setting this to TRUE, the timestamp of the creation will be included to the background import
 	 * helps to easily rebuild sprites without cache problems
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $includeTimestampInCSS = TRUE;
 
@@ -167,7 +167,7 @@ class SpriteGenerator {
 	/**
 	 * space in px between to icons in the sprite (gap)
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $space = 2;
 
diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index 10a7ef5a4c620b9e706518a1e92b49292ab038ed..40b70e3203cff5e12c2ac4a1ee57e5135fb7b7e5 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -213,7 +213,7 @@ function jumpToUrl(URL) {
 	/**
 	 * Whether to use the X-UA-Compatible meta tag
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $useCompatibilityTag = TRUE;
 
@@ -330,7 +330,7 @@ function jumpToUrl(URL) {
 	/**
 	 * Whether flashmessages should be rendered or not
 	 *
-	 * @var boolean $showFlashMessages
+	 * @var bool $showFlashMessages
 	 */
 	public $showFlashMessages = TRUE;
 
diff --git a/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php b/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
index 0a53551e78fa1aacc4f62ec6c1c8942b01198340..17198d250abab8f26456bc28ee4ec5655e686c6a 100644
--- a/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
+++ b/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
@@ -37,28 +37,28 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
 	/**
 	 * Indicator if the node is expanded
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $expanded = FALSE;
 
 	/**
 	 * Indicator if the node can be expanded
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $expandable = FALSE;
 
 	/**
 	 * Indicator if the node is draggable
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $draggable = TRUE;
 
 	/**
 	 * Indicator if the node is allowed as a drop target
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isDropTarget = TRUE;
 
@@ -121,14 +121,14 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
 	/**
 	 * Indicator if the copy mode is activated
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $t3InCopyMode = FALSE;
 
 	/**
 	 * Indicator if the cut mode is activated
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $t3InCutMode = FALSE;
 
@@ -149,14 +149,14 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
 	/**
 	 * Indicator if the label is editable
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $labelIsEditable = TRUE;
 
 	/**
 	 * Indicator if the node can have children's
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $allowChildren = TRUE;
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
index 6c663b71527cd5ce9e70195fc74662afb7a1b910..fb4f63132c8a76ae8d25cccb76725e6fedea28f2 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
@@ -28,17 +28,17 @@ use TYPO3\CMS\Core\Versioning\VersionState;
 class Commands {
 
 	/**
-	 * @var boolean|null
+	 * @var bool|null
 	 */
 	static protected $useNavTitle = NULL;
 
 	/**
-	 * @var boolean|null
+	 * @var bool|null
 	 */
 	static protected $addIdAsPrefix = NULL;
 
 	/**
-	 * @var boolean|null
+	 * @var bool|null
 	 */
 	static protected $addDomainName = NULL;
 
@@ -48,7 +48,7 @@ class Commands {
 	static protected $backgroundColors = NULL;
 
 	/**
-	 * @var integer|null
+	 * @var int|null
 	 */
 	static protected $titleLength = NULL;
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
index fbb97678c94912217ee22a904c68e696e7e5702a..8d5682a92d416b7be565d45196af93b7b57479a8 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
@@ -27,14 +27,14 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 	/**
 	 * Node limit that should be loaded for this request per mount
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $nodeLimit = 0;
 
 	/**
 	 * Current amount of nodes
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $nodeCounter = 0;
 
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
index b07713e7f7e25adf1c8149ccd96d2d095513893e..14cedfed210feabf7ca1d03dbf8107b341f455c6 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
@@ -33,14 +33,14 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
 	/**
 	 * Workspace Overlay Id
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $workspaceId = 0;
 
 	/**
 	 * Mount Point Id
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $mountPoint = 0;
 
@@ -54,7 +54,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
 	/**
 	 * Indicator if the node is a mount point
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isMountPoint = FALSE;
 
diff --git a/typo3/sysext/backend/Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php b/typo3/sysext/backend/Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php
index 5025e285e4224dfc1f1fa0774a396ed88765f078..b4bb2e11ecdd76c8925483dcbb9c338dbb0c58a1 100644
--- a/typo3/sysext/backend/Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php
+++ b/typo3/sysext/backend/Classes/Tree/Renderer/ExtJsJsonTreeRenderer.php
@@ -24,7 +24,7 @@ class ExtJsJsonTreeRenderer extends \TYPO3\CMS\Backend\Tree\Renderer\AbstractTre
 	/**
 	 * recursion level
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $recursionLevel = 0;
 
diff --git a/typo3/sysext/backend/Classes/Tree/Renderer/UnorderedListTreeRenderer.php b/typo3/sysext/backend/Classes/Tree/Renderer/UnorderedListTreeRenderer.php
index 547d931935c19aadde3e8ce262533fd935dbf51e..766fe1b0628e2f0ef72bc507f6ef55d6b124adba 100644
--- a/typo3/sysext/backend/Classes/Tree/Renderer/UnorderedListTreeRenderer.php
+++ b/typo3/sysext/backend/Classes/Tree/Renderer/UnorderedListTreeRenderer.php
@@ -23,7 +23,7 @@ class UnorderedListTreeRenderer extends \TYPO3\CMS\Backend\Tree\Renderer\Abstrac
 	/**
 	 * recursion level
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $recursionLevel = 0;
 
diff --git a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
index fa00f392cd2a72368aac96fb04fa67bd5dd50789..6a9298e48be0d8e1de941c7af8a435312c7669ce 100644
--- a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
@@ -43,7 +43,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
 	 * Indicates, whether the AJAX call was successful,
 	 * i.e. the requested page has been found
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $ajaxStatus = FALSE;
 
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php
index f6b9daa271f79619ba6c88b7b405de792b007044..b5c82c4dd17aa6750e847d420a41f479998d3537 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php
@@ -22,7 +22,7 @@ namespace TYPO3\CMS\Backend\View\BackendLayout;
 class DataProviderContext implements \TYPO3\CMS\Core\SingletonInterface {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $pageId;
 
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index f7089dcaa2d3ddc9da2fa6fee96a3b8e4369b00c..b9b137c25da78e0e77e487c1286aa74f027e03e0 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -174,7 +174,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
 	/**
 	 * User permissions
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $ext_CALC_PERMS;
 
diff --git a/typo3/sysext/belog/Classes/Controller/AbstractController.php b/typo3/sysext/belog/Classes/Controller/AbstractController.php
index a24bf6162af267963240e70a29d66fbfac59da20..d445135244781c32cff25a515e031b823e323022 100644
--- a/typo3/sysext/belog/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/belog/Classes/Controller/AbstractController.php
@@ -22,51 +22,51 @@ namespace TYPO3\CMS\Belog\Controller;
 abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const TIMEFRAME_THISWEEK = 0;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const TIMEFRAME_LASTWEEK = 1;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const TIMEFRAME_LASTSEVENDAYS = 2;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const TIMEFRAME_THISMONTH = 10;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const TIMEFRAME_LASTMONTH = 11;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const TIMEFRAME_LAST31DAYS = 12;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const TIMEFRAME_CUSTOM = 30;
 
 	/**
 	 * Whether plugin is running in page context (sub module of Web > Info)
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isInPageContext = FALSE;
 
 	/**
 	 * Page ID in page context
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $pageId = 0;
 
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
index bb6b90bd5343c794dca8a46732d4f4262c596268..92dab95baa06f43ba8c34052337e5a71ede49b2c 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
@@ -31,35 +31,35 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Number of log rows to show
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $number = 20;
 
 	/**
 	 * UID of selected workspace
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $workspaceUid = \TYPO3\CMS\Belog\Domain\Model\Workspace::UID_ANY_WORKSPACE;
 
 	/**
 	 * Selected time frame
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $timeFrame = 0;
 
 	/**
 	 * Selected action
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $action = 0;
 
 	/**
 	 * Whether rows should be grouped by page
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $groupByPage = FALSE;
 
@@ -80,35 +80,35 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Calculated start timestamp
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $startTimestamp = 0;
 
 	/**
 	 * Calculated end timestamp
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $endTimestamp = 0;
 
 	/**
 	 * Whether the plugin is called in page context (submodule of Web > Info)
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isInPageContext = FALSE;
 
 	/**
 	 * Selected page ID in page context
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $pageId = 0;
 
 	/**
 	 * Page level depth
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $depth = 0;
 
diff --git a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
index e4fbd87988590ba1efd1ea63945e722c4734c4a1..6674bc5f57b2bd666426552fa258e08cdfc89c52 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
@@ -26,7 +26,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Storage page ID of the log entry
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $pid = 0;
 
@@ -37,21 +37,21 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	 * have found now is to resolve the username (if it exists) in a
 	 * view helper and just use the uid of the be user here.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $backendUserUid = 0;
 
 	/**
 	 * Action ID of the action that happened, for example 3 was a file action
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $action = 0;
 
 	/**
 	 * UID of the record the event happened to
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $recordUid = 0;
 
@@ -65,14 +65,14 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * PID of the record the event happened to
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $recordPid = 0;
 
 	/**
 	 * Error code
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $error = 0;
 
@@ -86,21 +86,21 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Timestamp when the log entry was written
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $tstamp = 0;
 
 	/**
 	 * Type code
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $type = 0;
 
 	/**
 	 * Details number
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $detailsNumber = 0;
 
@@ -121,14 +121,14 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * Event PID
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $eventPid = 0;
 
 	/**
 	 * This is only the UID and not the full workspace object for the same reason as in $beUserUid.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $workspaceUid = 0;
 
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Workspace.php b/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
index 3cc06b5ad696f8b81010522ae5b2b5aaed1bc99d..3215abce2b069eb0d313525f443b89f9b8f00679 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Workspace.php
@@ -23,12 +23,12 @@ namespace TYPO3\CMS\Belog\Domain\Model;
 class Workspace extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const UID_LIVE_WORKSPACE = 0;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const UID_ANY_WORKSPACE = -99;
 
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
index dc7b9023680afafaca39a56ad76564f756920179..b86021502282ae783b285f6fe1f463a56a73b6ad 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
@@ -22,31 +22,31 @@ namespace TYPO3\CMS\Beuser\Domain\Model;
 class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const ALL = 0;
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const USERTYPE_ADMINONLY = 1;
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const USERTYPE_USERONLY = 2;
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const STATUS_ACTIVE = 1;
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const STATUS_INACTIVE = 2;
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const LOGIN_SOME = 1;
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const LOGIN_NONE = 2;
 	/**
@@ -55,17 +55,17 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $userName = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $userType = self::ALL;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $status = self::ALL;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $logins = 0;
 
diff --git a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
index 00277d5ae881a855b196579527dbcf2e5ec6cc01..1eab621d1acd1aecbc20d85bc9fa405b64d71f06 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/AbstractBackend.php
@@ -53,7 +53,7 @@ abstract class AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\BackendI
 	/**
 	 * Default lifetime of a cache entry in seconds
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $defaultLifetime = 3600;
 
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
index 17baabdcd72a7a590c92a5ab8f11ab1ad3c7c9fd..f91955cb7427162ceb498f07becddc9c7967110d 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
@@ -42,7 +42,7 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
 	protected $cacheEntryIdentifiers = array();
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $frozen = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
index 692580008fc5e6589844a08da3148d048f0a77f6..9e65fd0585d834a946986a45dea0045ec8712af3 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
@@ -37,7 +37,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
 	 * we just make every entry volatile and treat a high number as "unlimited"
 	 *
 	 * @see http://code.google.com/p/redis/wiki/ExpireCommand
-	 * @var integer Faked unlimited lifetime
+	 * @var int Faked unlimited lifetime
 	 */
 	const FAKED_UNLIMITED_LIFETIME = 31536000;
 	/**
@@ -68,7 +68,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
 	/**
 	 * Indicates whether the server is connected
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $connected = FALSE;
 
@@ -82,14 +82,14 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
 	/**
 	 * Port of the Redis server, defaults to 6379
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $port = 6379;
 
 	/**
 	 * Number of selected database, defaults to 0
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $database = 0;
 
@@ -103,14 +103,14 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
 	/**
 	 * Indicates whether data is compressed or not (requires php zlib)
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $compression = FALSE;
 
 	/**
 	 * -1 to 9, indicates zlib compression level: -1 = default level 6, 0 = no compression, 9 maximum compression
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $compressionLevel = -1;
 
diff --git a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
index d08a7fb07cdda327b1cbb127cdee7cc40ce71743..850cbd7437a52356e1021099bf012aec8104b8bf 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
@@ -53,7 +53,7 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
 	protected $cacheEntryIdentifiers = array();
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $frozen = FALSE;
 
@@ -61,7 +61,7 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
 	 * If the extension "igbinary" is installed, use it for increased performance.
 	 * Caching the result of extension_loaded() here is faster than calling extension_loaded() multiple times.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $useIgBinary = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
index 8a4377dcdea43ce1cc443622ccba464b7461d3a8..5a96175ae9774719062a9db4ebd62fce5d4d2750 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
@@ -23,7 +23,7 @@ namespace TYPO3\CMS\Core\Cache\Backend;
 class Typo3DatabaseBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implements \TYPO3\CMS\Core\Cache\Backend\TaggableBackendInterface {
 
 	/**
-	 * @var integer Timestamp of 2038-01-01)
+	 * @var int Timestamp of 2038-01-01)
 	 */
 	const FAKED_UNLIMITED_EXPIRE = 2145909600;
 	/**
@@ -37,12 +37,12 @@ class Typo3DatabaseBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend
 	protected $tagsTable;
 
 	/**
-	 * @var boolean Indicates whether data is compressed or not (requires php zlib)
+	 * @var bool Indicates whether data is compressed or not (requires php zlib)
 	 */
 	protected $compression = FALSE;
 
 	/**
-	 * @var integer -1 to 9, indicates zlib compression level: -1 = default level 6, 0 = no compression, 9 maximum compression
+	 * @var int -1 to 9, indicates zlib compression level: -1 = default level 6, 0 = no compression, 9 maximum compression
 	 */
 	protected $compressionLevel = -1;
 
@@ -57,7 +57,7 @@ class Typo3DatabaseBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend
 	protected $expiresField;
 
 	/**
-	 * @var integer Maximum lifetime to stay with expire field below FAKED_UNLIMITED_LIFETIME
+	 * @var int Maximum lifetime to stay with expire field below FAKED_UNLIMITED_LIFETIME
 	 */
 	protected $maximumLifetime;
 
diff --git a/typo3/sysext/core/Classes/Cache/Cache.php b/typo3/sysext/core/Classes/Cache/Cache.php
index 4832f21ebc35be7613a0ff22b3ca775596132159..fd66ec38bdcd701ddf71881276ba36ec15becfd2 100644
--- a/typo3/sysext/core/Classes/Cache/Cache.php
+++ b/typo3/sysext/core/Classes/Cache/Cache.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 class Cache {
 
 	/**
-	 * @var boolean TRUE if caching framework was fully initialized
+	 * @var bool TRUE if caching framework was fully initialized
 	 */
 	static protected $isCachingFrameworkInitialized = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
index 0047ee16cbfa36b9c90a7b9eebefa53a89b8a30d..19d5005fedc6cfab6f9642b27a7f91f5ff04ce0b 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/VariableFrontend.php
@@ -28,7 +28,7 @@ class VariableFrontend extends \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend {
 	 * If the extension "igbinary" is installed, use it for increased performance.
 	 * Caching the result of extension_loaded() here is faster than calling extension_loaded() multiple times.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $useIgBinary = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
index 7d0121926560e5c7d0d4c98c593578b3bce63b54..b45368dc4c727556b5b7aec7c0455839f2b630c2 100644
--- a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
+++ b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
@@ -46,7 +46,7 @@ abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\Re
 	/**
 	 * Uid of the storage
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $uid = 0;
 
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index 46507de4618cdec0eb10613da4988aa0229461eb..fc3e18d9d1d010ffb20745cf17b3e354ffadd755 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -44,14 +44,14 @@ class DataHandler {
 	 * If TRUE, the default log-messages will be stored. This should not be necessary if the locallang-file for the
 	 * log-display is properly configured. So disabling this will just save some database-space as the default messages are not saved.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $storeLogMessages = TRUE;
 
 	/**
 	 * If TRUE, actions are logged to sys_log.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $enableLogging = TRUE;
 
@@ -59,7 +59,7 @@ class DataHandler {
 	 * If TRUE, the datamap array is reversed in the order, which is a nice thing if you're creating a whole new
 	 * bunch of records.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $reverseOrder = FALSE;
 
@@ -67,7 +67,7 @@ class DataHandler {
 	 * If TRUE, only fields which are different from the database values are saved! In fact, if a whole input array
 	 * is similar, it's not saved then.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $checkSimilar = TRUE;
 
@@ -75,7 +75,7 @@ class DataHandler {
 	 * If TRUE, incoming values in the data-array have their slashes stripped. ALWAYS SET THIS TO ZERO and supply an
 	 * unescaped data array instead. This switch may totally disappear in future versions of this class!
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $stripslashes_values = TRUE;
 
@@ -83,14 +83,14 @@ class DataHandler {
 	 * This will read the record after having updated or inserted it. If anything is not properly submitted an error
 	 * is written to the log. This feature consumes extra time by selecting records
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $checkStoredRecords = TRUE;
 
 	/**
 	 * If set, values '' and 0 will equal each other when the stored records are checked.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $checkStoredRecords_loose = TRUE;
 
@@ -98,35 +98,35 @@ class DataHandler {
 	 * If this is set, then a page is deleted by deleting the whole branch under it (user must have
 	 * delete permissions to it all). If not set, then the page is deleted ONLY if it has no branch.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $deleteTree = FALSE;
 
 	/**
 	 * If set, then the 'hideAtCopy' flag for tables will be ignored.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $neverHideAtCopy = FALSE;
 
 	/**
 	 * If set, then the TCE class has been instantiated during an import action of a T3D
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $isImporting = FALSE;
 
 	/**
 	 * If set, then transformations are NOT performed on the input.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $dontProcessTransformations = FALSE;
 
 	/**
 	 * If set, .vDEFbase values are unset in flexforms.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $clear_flexFormData_vDEFbase = FALSE;
 
@@ -135,7 +135,7 @@ class DataHandler {
 	 * FALSE: Will not update anything.
 	 * "FORCE_FFUPD" (string): Like TRUE, but will force update to the FlexForm Field
 	 *
-	 * @var boolean|string
+	 * @var bool|string
 	 */
 	public $updateModeL10NdiffData = TRUE;
 
@@ -143,7 +143,7 @@ class DataHandler {
 	 * If TRUE, the translation diff. fields will in fact be reset so that they indicate that all needs to change again!
 	 * It's meant as the opposite of declaring the record translated.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $updateModeL10NdiffDataClear = FALSE;
 
@@ -151,7 +151,7 @@ class DataHandler {
 	 * If TRUE, workspace restrictions are bypassed on edit an create actions (process_datamap()).
 	 * YOU MUST KNOW what you do if you use this feature!
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $bypassWorkspaceRestrictions = FALSE;
 
@@ -159,7 +159,7 @@ class DataHandler {
 	 * If TRUE, file handling of attached files (addition, deletion etc) is bypassed - the value is saved straight away.
 	 * YOU MUST KNOW what you are doing with this feature!
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $bypassFileHandling = FALSE;
 
@@ -167,7 +167,7 @@ class DataHandler {
 	 * If TRUE, access check, check for deleted etc. for records is bypassed.
 	 * YOU MUST KNOW what you are doing if you use this feature!
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $bypassAccessCheckForRecords = FALSE;
 
@@ -184,7 +184,7 @@ class DataHandler {
 	 * If 1 then pages on the 1st level is copied.
 	 * If 2 then pages on the second level is copied ... and so on
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $copyTree = 0;
 
@@ -327,7 +327,7 @@ class DataHandler {
 	/**
 	 * Will be set to uid of be_user executing this script
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $userid;
 
@@ -341,7 +341,7 @@ class DataHandler {
 	/**
 	 * Will be set if user is admin
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $admin;
 
@@ -406,7 +406,7 @@ class DataHandler {
 	/**
 	 * Integer: The interval between sorting numbers used with tables with a 'sorting' field defined. Min 1
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $sortIntervals = 256;
 
@@ -585,14 +585,14 @@ class DataHandler {
 	/**
 	 * A signal flag used to tell file processing that autoversioning has happend and hence certain action should be applied.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $autoVersioningUpdate = FALSE;
 
 	/**
 	 * Disable delete clause
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $disableDeleteClause = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Database/DatabaseConnection.php b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
index c8d0f0495d94e9f35220a5f5c331a1f6f2544b13..0e13e83d8bf2a8d756ac2c4f4cc345740ee52827 100644
--- a/typo3/sysext/core/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
@@ -90,7 +90,7 @@ class DatabaseConnection {
 	protected $databaseHost = '';
 
 	/**
-	 * @var integer Database port to connect to
+	 * @var int Database port to connect to
 	 */
 	protected $databasePort = 3306;
 
@@ -115,13 +115,13 @@ class DatabaseConnection {
 	protected $databaseUserPassword = '';
 
 	/**
-	 * @var boolean TRUE if database connection should be persistent
+	 * @var bool TRUE if database connection should be persistent
 	 * @see http://php.net/manual/de/mysqli.persistconns.php
 	 */
 	protected $persistentDatabaseConnection = FALSE;
 
 	/**
-	 * @var boolean TRUE if connection between client and sql server is compressed
+	 * @var bool TRUE if connection between client and sql server is compressed
 	 */
 	protected $connectionCompression = FALSE;
 
@@ -139,7 +139,7 @@ class DatabaseConnection {
 	protected $initializeCommandsAfterConnect = array();
 
 	/**
-	 * @var boolean TRUE if database connection is established
+	 * @var bool TRUE if database connection is established
 	 */
 	protected $isConnected = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Database/PreparedStatement.php b/typo3/sysext/core/Classes/Database/PreparedStatement.php
index a84222e8b4a3b188a1aa42164a55476138bb1f23..778000a6bddc8a4833c0c4444ec7ec20dc5889b9 100644
--- a/typo3/sysext/core/Classes/Database/PreparedStatement.php
+++ b/typo3/sysext/core/Classes/Database/PreparedStatement.php
@@ -35,31 +35,31 @@ class PreparedStatement {
 	/**
 	 * Represents the SQL NULL data type.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const PARAM_NULL = 0;
 	/**
 	 * Represents the SQL INTEGER data type.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const PARAM_INT = 1;
 	/**
 	 * Represents the SQL CHAR, VARCHAR, or other string data type.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const PARAM_STR = 2;
 	/**
 	 * Represents a boolean data type.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const PARAM_BOOL = 3;
 	/**
 	 * Automatically detects underlying type
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const PARAM_AUTOTYPE = 4;
 	/**
@@ -68,14 +68,14 @@ class PreparedStatement {
 	 * contains multiple columns with the same name, \TYPO3\CMS\Core\Database\PreparedStatement::FETCH_ASSOC
 	 * returns only a single value per column name.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const FETCH_ASSOC = 2;
 	/**
 	 * Specifies that the fetch method shall return each row as an array indexed by
 	 * column number as returned in the corresponding result set, starting at column 0.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const FETCH_NUM = 3;
 	/**
@@ -109,7 +109,7 @@ class PreparedStatement {
 	/**
 	 * Default fetch mode.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $defaultFetchMode = self::FETCH_ASSOC;
 
diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index c8f83233136e6dd34fd26aff8915186260118cf6..716980eaf168b3619cfbe227997e511fa4066126 100644
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -31,7 +31,7 @@ class RelationHandler {
 	/**
 	 * $fetchAllFields if false getFromDB() fetches only uid, pid, thumbnail and label fields (as defined in TCA)
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $fetchAllFields = FALSE;
 
@@ -70,7 +70,7 @@ class RelationHandler {
 	/**
 	 * Deleted-column is added to additionalWhere... if this is set...
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $checkIfDeleted = TRUE;
 
@@ -97,7 +97,7 @@ class RelationHandler {
 	 * If TRUE, uid_local and uid_foreign are switched, and the current table
 	 * is inserted as tablename - this means you display a foreign relation "from the opposite side"
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $MM_is_foreign = FALSE;
 
@@ -140,7 +140,7 @@ class RelationHandler {
 	 * If a record should be undeleted
 	 * (so do not use the $useDeleteClause on \TYPO3\CMS\Backend\Utility\BackendUtility)
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $undeleteRecord;
 
@@ -155,7 +155,7 @@ class RelationHandler {
 	/**
 	 * This is set to TRUE if the MM table has a UID field.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $MM_hasUidField;
 
@@ -181,7 +181,7 @@ class RelationHandler {
 	protected $MM_oppositeUsage;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $updateReferenceIndex = TRUE;
 
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index da1aad11e80f8a3cc64dff2818bf2db4e0b22a63..dfd4167ff192d5a5b336dde9c4eec7db2b43d776 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -200,7 +200,7 @@ class GraphicalFunctions {
 	/**
 	 * Preserve the alpha transparency layer of read PNG images
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $saveAlphaLayer = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
index c6b9bd3a45dcb4f169ce8d5edb5f3fe174aed216..05a5ed2112bd5c373dabc918d8f3b0fd61b4549b 100644
--- a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
+++ b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
@@ -28,17 +28,17 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
 class DatabaseIntegrityCheck {
 
 	/**
-	 * @var boolean If set, genTree() includes deleted pages. This is default.
+	 * @var bool If set, genTree() includes deleted pages. This is default.
 	 */
 	public $genTree_includeDeleted = TRUE;
 
 	/**
-	 * @var boolean If set, genTree() includes versionized pages/records. This is default.
+	 * @var bool If set, genTree() includes versionized pages/records. This is default.
 	 */
 	public $genTree_includeVersions = TRUE;
 
 	/**
-	 * @var boolean If set, genTree() includes records from pages.
+	 * @var bool If set, genTree() includes records from pages.
 	 */
 	public $genTree_includeRecords = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
index ba825bebd7ccbbbd7c8f73762116975e883e1138..f074fb101132851596809ba314a35683f53c0c84 100644
--- a/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
+++ b/typo3/sysext/core/Classes/Localization/LocalizationFactory.php
@@ -26,7 +26,7 @@ class LocalizationFactory implements \TYPO3\CMS\Core\SingletonInterface {
 	protected $cacheInstance;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $errorMode;
 
diff --git a/typo3/sysext/core/Classes/Locking/Locker.php b/typo3/sysext/core/Classes/Locking/Locker.php
index 6d1f4f8f94d84aaca35cfe0b3e156a80b76314b2..64d35e69c59db32621b2067727d17e03b5577d14 100644
--- a/typo3/sysext/core/Classes/Locking/Locker.php
+++ b/typo3/sysext/core/Classes/Locking/Locker.php
@@ -55,17 +55,17 @@ class Locker {
 	protected $filePointer;
 
 	/**
-	 * @var boolean True if lock is acquired
+	 * @var bool True if lock is acquired
 	 */
 	protected $isAcquired = FALSE;
 
 	/**
-	 * @var integer Number of times a locked resource is tried to be acquired. Only used in manual locks method "simple".
+	 * @var int Number of times a locked resource is tried to be acquired. Only used in manual locks method "simple".
 	 */
 	protected $loops = 150;
 
 	/**
-	 * @var integer Milliseconds after lock acquire is retried. $loops * $step results in the maximum delay of a lock. Only used in manual lock method "simple".
+	 * @var int Milliseconds after lock acquire is retried. $loops * $step results in the maximum delay of a lock. Only used in manual lock method "simple".
 	 */
 	protected $step = 200;
 
@@ -75,7 +75,7 @@ class Locker {
 	protected $syslogFacility = 'cms';
 
 	/**
-	 * @var boolean True if locking should be logged
+	 * @var bool True if locking should be logged
 	 */
 	protected $isLoggingEnabled = TRUE;
 
diff --git a/typo3/sysext/core/Classes/Log/LogLevel.php b/typo3/sysext/core/Classes/Log/LogLevel.php
index 49d7c10cd8098e5cc8066aa673a913087f50ad95..3ab5e3d72d2aa48f63ef9bbea0a25177d91ccbd1 100644
--- a/typo3/sysext/core/Classes/Log/LogLevel.php
+++ b/typo3/sysext/core/Classes/Log/LogLevel.php
@@ -26,7 +26,7 @@ class LogLevel {
 	 * You'd likely not be able to reach the system. You better have an SLA in
 	 * place when this happens.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const EMERGENCY = 0;
 	/**
@@ -34,7 +34,7 @@ class LogLevel {
 	 *
 	 * Example: Entire website down, database unavailable, etc.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const ALERT = 1;
 	/**
@@ -42,7 +42,7 @@ class LogLevel {
 	 *
 	 * Example: unexpected exception.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const CRITICAL = 2;
 	/**
@@ -50,7 +50,7 @@ class LogLevel {
 	 *
 	 * Example: Runtime error.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const ERROR = 3;
 	/**
@@ -59,7 +59,7 @@ class LogLevel {
 	 * Examples: Use of deprecated APIs, undesirable things that are not
 	 * necessarily wrong.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const WARNING = 4;
 	/**
@@ -67,7 +67,7 @@ class LogLevel {
 	 *
 	 * Example: things you should have a look at, nothing to worry about though.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const NOTICE = 5;
 	/**
@@ -75,7 +75,7 @@ class LogLevel {
 	 *
 	 * Examples: User logs in, SQL logs.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const INFO = 6;
 	/**
@@ -83,7 +83,7 @@ class LogLevel {
 	 *
 	 * Example: Detailed status information.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const DEBUG = 7;
 	/**
diff --git a/typo3/sysext/core/Classes/Log/LogRecord.php b/typo3/sysext/core/Classes/Log/LogRecord.php
index f175456f1bf5195d76d06c377eb2c1209d50add2..551d9ed8cf9eeb9af1d12ccd0b49f5a798f3bc74 100644
--- a/typo3/sysext/core/Classes/Log/LogRecord.php
+++ b/typo3/sysext/core/Classes/Log/LogRecord.php
@@ -45,7 +45,7 @@ class LogRecord implements \ArrayAccess {
 	/**
 	 * Severity level
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $level = \TYPO3\CMS\Core\Log\LogLevel::INFO;
 
diff --git a/typo3/sysext/core/Classes/Log/Logger.php b/typo3/sysext/core/Classes/Log/Logger.php
index 1e488a563ae99b7e539ca109983f03bddf70124b..8d992f7ee4cac035eafbe74d61973ae9f2416279 100644
--- a/typo3/sysext/core/Classes/Log/Logger.php
+++ b/typo3/sysext/core/Classes/Log/Logger.php
@@ -36,7 +36,7 @@ class Logger implements \Psr\Log\LoggerInterface {
 	/**
 	 * Minimum log level, anything below this level will be ignored.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $minimumLogLevel = \TYPO3\CMS\Core\Log\LogLevel::EMERGENCY;
 
diff --git a/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php b/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
index fe005ec451ff117118c6dae702a8ebcf645fb6a8..08d73b81bd71bf61119229acf8ea68ec1dfea8fd 100644
--- a/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
@@ -26,7 +26,7 @@ abstract class AbstractMemoryProcessor extends \TYPO3\CMS\Core\Log\Processor\Abs
 	 * If set, the real size of memory allocated from system is used.
 	 * Otherwise the memory used by emalloc() is used.
 	 *
-	 * @var boolean
+	 * @var bool
 	 * @see memory_get_usage()
 	 * @see memory_get_peak_usage()
 	 */
@@ -35,7 +35,7 @@ abstract class AbstractMemoryProcessor extends \TYPO3\CMS\Core\Log\Processor\Abs
 	/**
 	 * Whether the size is formatted, e.g. in megabytes
 	 *
-	 * @var boolean
+	 * @var bool
 	 * @see \TYPO3\CMS\Core\Utility\GeneralUtility::formatSize()
 	 */
 	protected $formatSize = TRUE;
diff --git a/typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php b/typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php
index 92210bdb2623231f4766b345e76ca9821240a28f..17620c8b835815945168a740ac7a53b9daf911f4 100644
--- a/typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/IntrospectionProcessor.php
@@ -25,7 +25,7 @@ class IntrospectionProcessor extends \TYPO3\CMS\Core\Log\Processor\AbstractProce
 	 * Add the full backtrace to the log entry or
 	 * just the last entry of the backtrace
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $appendFullBackTrace = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
index 56658d7abbac129d1911de1e3cbd6483608cdce9..4b94f087f81d22dda74188f93a77390bb0f7d513 100644
--- a/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
+++ b/typo3/sysext/core/Classes/Log/Writer/SyslogWriter.php
@@ -44,7 +44,7 @@ class SyslogWriter extends \TYPO3\CMS\Core\Log\Writer\AbstractWriter {
 	/**
 	 * Type of program that is logging to syslog.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $facility = LOG_USER;
 
diff --git a/typo3/sysext/core/Classes/Mail/MailMessage.php b/typo3/sysext/core/Classes/Mail/MailMessage.php
index ffe743671049921676be723d04ed4ab9a13d6fd2..b53c1f0ffa679ee1246b6ff91be930681af29b31 100644
--- a/typo3/sysext/core/Classes/Mail/MailMessage.php
+++ b/typo3/sysext/core/Classes/Mail/MailMessage.php
@@ -37,7 +37,7 @@ class MailMessage extends \Swift_Message {
 	/**
 	 * TRUE if the message has been sent.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $sent = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php b/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
index 202c65b5271ba286c7c1bc7ce08386aa8dea411d..b4ce3016558f39cab26baecf4d6e882150c7a341 100644
--- a/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
+++ b/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
@@ -86,7 +86,7 @@ class Rfc822AddressesParser {
 	/**
 	 * Whether or not to validate atoms for non-ascii characters.
 	 *
-	 * @var boolean $validate
+	 * @var bool $validate
 	 */
 	private $validate = TRUE;
 
@@ -114,14 +114,14 @@ class Rfc822AddressesParser {
 	/**
 	 * An internal counter/pointer.
 	 *
-	 * @var integer $index
+	 * @var int $index
 	 */
 	private $index = NULL;
 
 	/**
 	 * The number of groups that have been found in the address list.
 	 *
-	 * @var integer $num_groups
+	 * @var int $num_groups
 	 * @access public
 	 */
 	private $num_groups = 0;
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
index 23c3e27b168f68138fe6614c5797468956b8217b..c1eaf299b78f322409a827d145b23fc2ca759e5a 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
@@ -43,7 +43,7 @@ abstract class AbstractMessage {
 	/**
 	 * The message's severity
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $severity = self::OK;
 
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessage.php b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
index c14909b5c51e40d10418ddb5efcc1de190a31a34..3c2383568e860212a9dbc12813bbe35c09d939e4 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
@@ -23,7 +23,7 @@ class FlashMessage extends \TYPO3\CMS\Core\Messaging\AbstractMessage {
 	/**
 	 * defines whether the message should be stored in the session (to survive redirects) or only for one request (default)
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $storeInSession = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Package/FailsafePackageManager.php b/typo3/sysext/core/Classes/Package/FailsafePackageManager.php
index d467843b19e926e0bd4c1a31d5526bc73e71dcc5..2d741a7a83d0dd045ddc62a43df95ea63c23dfad 100644
--- a/typo3/sysext/core/Classes/Package/FailsafePackageManager.php
+++ b/typo3/sysext/core/Classes/Package/FailsafePackageManager.php
@@ -27,7 +27,7 @@ class FailsafePackageManager extends \TYPO3\CMS\Core\Package\PackageManager {
 	protected $configurationManager;
 
 	/**
-	 * @var boolean TRUE if package manager is in failsafe mode
+	 * @var bool TRUE if package manager is in failsafe mode
 	 */
 	protected $inFailsafeMode = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index efc90153823a9739d2d19f2a0969221c12801040..e08a70b3d4441cb635f7f80bddf554a038baa28f 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -41,37 +41,37 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	const JQUERY_NAMESPACE_DEFAULT = 'jQuery';
 	const JQUERY_NAMESPACE_DEFAULT_NOCONFLICT = 'defaultNoConflict';
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $compressJavascript = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $compressCss = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $removeLineBreaksFromTemplate = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $concatenateFiles = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $concatenateJavascript = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $concatenateCss = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $moveJsFromHeaderToFooter = FALSE;
 
@@ -162,7 +162,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	protected $baseUrl;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $renderXhtml = TRUE;
 
@@ -349,7 +349,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 
 	/**
 	 * if set, the requireJS library is included
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $addRequireJs = FALSE;
 
@@ -360,12 +360,12 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	protected $requireJsConfig = array();
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $addPrototype = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $addScriptaculous = FALSE;
 
@@ -375,12 +375,12 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	protected $addScriptaculousModules = array('builder' => FALSE, 'effects' => FALSE, 'dragdrop' => FALSE, 'controls' => FALSE, 'slider' => FALSE);
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $addExtJS = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $addExtCore = FALSE;
 
@@ -390,37 +390,37 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	protected $extJSadapter = 'ext/ext-base.js';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $extDirectCodeAdded = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $enableExtJsDebug = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $enableExtCoreDebug = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $enableJqueryDebug = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $extJStheme = TRUE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $extJScss = TRUE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $enableExtJSQuickTips = FALSE;
 
@@ -461,12 +461,12 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * SVG library
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $addSvg = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $enableSvgDebug = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Resource/AbstractFile.php b/typo3/sysext/core/Classes/Resource/AbstractFile.php
index b00174f6f6bc1da475956412b4912387703def4f..8a6f6141a1a0cb8ba7717daf854770e0473527df 100644
--- a/typo3/sysext/core/Classes/Resource/AbstractFile.php
+++ b/typo3/sysext/core/Classes/Resource/AbstractFile.php
@@ -60,7 +60,7 @@ abstract class AbstractFile implements FileInterface {
 	/**
 	 * If set to true, this file is regarded as being deleted.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $deleted = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
index 72562b5fea2b5b4636239d4672694e572762e9fe..c02a6bbfcf3925beebd80552480c8f4cd9ff5a2f 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
@@ -29,7 +29,7 @@ abstract class AbstractDriver implements DriverInterface {
 	 * The capabilities of this driver. See Storage::CAPABILITY_* constants for possible values. This value should be set
 	 * in the constructor of derived classes.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $capabilities = 0;
 
@@ -37,7 +37,7 @@ abstract class AbstractDriver implements DriverInterface {
 	/**
 	 * The storage uid the driver was instantiated for
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $storageUid;
 
diff --git a/typo3/sysext/core/Classes/Resource/File.php b/typo3/sysext/core/Classes/Resource/File.php
index 307053631774fae7da1e4c7009d959576af66758..cef9d5f42a02654de4e492b9ca1a6aca4bc6a99b 100644
--- a/typo3/sysext/core/Classes/Resource/File.php
+++ b/typo3/sysext/core/Classes/Resource/File.php
@@ -35,7 +35,7 @@ class File extends AbstractFile {
 	/**
 	 * Set to TRUE while this file is being indexed - used to prevent some endless loops
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $indexingInProgress = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php b/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
index a118a2c128108cc393ef23d0917d09d4c5e328a4..6c571a232e0c261877aa71a36fc313340400272a 100644
--- a/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
+++ b/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
@@ -23,7 +23,7 @@ class FileNameFilter {
 	/**
 	 * whether to also show the hidden files (don't show them by default)
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	static protected $showHiddenFilesAndFolders = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Resource/Index/Indexer.php b/typo3/sysext/core/Classes/Resource/Index/Indexer.php
index 28c7248fb7a4f2af7b13fa20877b59d53b4649de..59ee05bfa69ba19c38cf89419783058b7b68632e 100644
--- a/typo3/sysext/core/Classes/Resource/Index/Indexer.php
+++ b/typo3/sysext/core/Classes/Resource/Index/Indexer.php
@@ -28,7 +28,7 @@ class Indexer {
 	protected $filesToUpdate = array();
 
 	/**
-	 * @var integer[]
+	 * @var int[]
 	 */
 	protected $identifiedFileUids = array();
 
diff --git a/typo3/sysext/core/Classes/Resource/ProcessedFile.php b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
index a5c275ed29caaff809d568648f27d26e3c7f0fa8..1778e666ac738bdb2a794a9927b5d5ff16af6551 100644
--- a/typo3/sysext/core/Classes/Resource/ProcessedFile.php
+++ b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
@@ -98,7 +98,7 @@ class ProcessedFile extends AbstractFile {
 	 * A flag that shows if this object has been updated during its lifetime, i.e. the file has been
 	 * replaced with a new one.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $updated = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php b/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php
index 5500bf601e4611dde12b68e608e57c3deb86e8fd..2b50d99f5ac22bc8118c5e0ed4495af3b4b13304 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php
@@ -57,12 +57,12 @@ abstract class AbstractTask implements TaskInterface {
 	protected $name;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $executed = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $successful;
 
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index b14494805b89de0d47831425728c8c0f10406bcf..1b96abe26a2e6582574a7fd5bc2177c1f1330fe4 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -87,7 +87,7 @@ class ResourceStorage implements ResourceStorageInterface {
 	 * Default is FALSE so that resources are accessible for
 	 * front end rendering or admins.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $evaluatePermissions = FALSE;
 
@@ -127,12 +127,12 @@ class ResourceStorage implements ResourceStorageInterface {
 	/**
 	 * whether this storage is online or offline in this request
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isOnline = NULL;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isDefault = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
index 760d0e65739b23f768654ece779e62c5108838fe..9924645510e5685f08d9f3d1ff83230b64de565c 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
@@ -21,12 +21,12 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
 abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $expandAll = FALSE;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $levelMaximum = 2;
 
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
index 0a10166cc83cedd7821bb09aab6dbbd9a200ed58..972b578586f7b84478887e282d32ede30cd5cc78 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
@@ -46,7 +46,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
 	protected $tableWhere = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $lookupMode = self::MODE_CHILDREN;
 
@@ -56,7 +56,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
 	protected $lookupField = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $rootUid = 0;
 
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
index b57177edb8aea25e907a00eee7d08b9ae9b37f0d..e97b907c14c9b1266622d955a3bc02e18b926bb2 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
@@ -21,22 +21,22 @@ namespace TYPO3\CMS\Core\Tree\TableConfiguration;
 class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode {
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $selectable;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $selected = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $expanded = TRUE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $hasChildren = FALSE;
 
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index e1443aa2ba2a0ce8cc297593b5720625e4fa5d83..82f1c091ff95347e05c6ba8cb82d4da18ad0e0a8 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -164,14 +164,14 @@ class TemplateService {
 	 * has been processed or the $processExtensionStatics
 	 * property has been set to TRUE.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $extensionStaticsProcessed = FALSE;
 
 	/**
 	 * Trigger value, to ensure that extension statics are processed.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $processExtensionStatics = FALSE;
 
@@ -180,7 +180,7 @@ class TemplateService {
 	 * This prevents double inclusion of the same TypoScript code.
 	 *
 	 * @see addDefaultTypoScript()
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isDefaultTypoScriptAdded = FALSE;
 
@@ -190,7 +190,7 @@ class TemplateService {
 	 * This prevents double processing of INCLUDES.
 	 *
 	 * @see processIncludes()
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $processIncludesHasBeenRun = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Utility/CommandUtility.php b/typo3/sysext/core/Classes/Utility/CommandUtility.php
index 4124bae398d0cc5a7f825d0f7f364276218bed3a..c1c07a7b34b074d40c26ef75b1af733f2502383e 100644
--- a/typo3/sysext/core/Classes/Utility/CommandUtility.php
+++ b/typo3/sysext/core/Classes/Utility/CommandUtility.php
@@ -49,7 +49,7 @@ class CommandUtility {
 	/**
 	 * Tells if object is already initialized
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected static $initialized = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index a46d5b740a577fcef80e0d3947c7824edad253ed..1f03adef247d85b5a5ee4bb3838f7bd56dfc77e0 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -36,7 +36,7 @@ class ExtensionManagementUtility {
 	 * already read from cache
 	 *
 	 * @TODO : See if we can get rid of the 'load multiple times' scenario in fe
-	 * @var boolean
+	 * @var bool
 	 */
 	static protected $extTablesWasReadFromCacheOnce = FALSE;
 
diff --git a/typo3/sysext/core/Classes/Utility/RootlineUtility.php b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
index ae5236332cca5ba0b42097562bbf4006fd79743e..448d75afc820aaf7910c30e05190f7d6e2cfac31 100644
--- a/typo3/sysext/core/Classes/Utility/RootlineUtility.php
+++ b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
@@ -23,7 +23,7 @@ use TYPO3\CMS\Frontend\Page\PageRepository;
 class RootlineUtility {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $pageUid;
 
@@ -38,17 +38,17 @@ class RootlineUtility {
 	protected $parsedMountPointParameters = array();
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $languageUid = 0;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $workspaceUid = 0;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $versionPreview = FALSE;
 
diff --git a/typo3/sysext/core/Tests/BaseTestCase.php b/typo3/sysext/core/Tests/BaseTestCase.php
index 4d63e756251d7fec9eac2c9f99551ca250cbb6b7..4b89fcc0d4a7d3025c791e98f634fdeaf48ff4aa 100644
--- a/typo3/sysext/core/Tests/BaseTestCase.php
+++ b/typo3/sysext/core/Tests/BaseTestCase.php
@@ -26,14 +26,14 @@ abstract class BaseTestCase extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Whether global variables should be backed up
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $backupGlobals = TRUE;
 
 	/**
 	 * Whether static attributes should be backed up
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $backupStaticAttributes = FALSE;
 
diff --git a/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php b/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
index a17be8eaf4439c787bdc550476803de6edb75ada..05d25416224ebae10bdea84bc431d9be849eadd4 100644
--- a/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
+++ b/typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
@@ -48,7 +48,7 @@ class CategoryCollectionTest extends \TYPO3\CMS\Core\Tests\FunctionalTestCase {
 	private $collectionRecord = array();
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	private $numberOfRecords = 5;
 
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php
index f9d3bf81707e1800b5d3489df5a5935f5e558399..23b1e83eafc4b3ae9071b6fef6546e74ead748f5 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php
@@ -37,7 +37,7 @@ abstract class AbstractTestCase extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
 	protected $testExtensionsToLoad = array('typo3/sysext/core/Tests/Functional/Fixtures/Extensions/irre_tutorial');
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	private $expectedLogEntries = 0;
 
diff --git a/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php b/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
index 3af34922648cfd9ce2376c8adcdb5f08b4d3fa28..7407efd36033cf2078c5947be3df4c775fa67b22 100644
--- a/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/ClassLoaderTest.php
@@ -46,7 +46,7 @@ class ClassLoaderTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * Test flag used in in this test case
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public static $testClassWasLoaded = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php b/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
index 728b01cf5e5236efb31b959a43ebe54b72b5b9c6..2a4b7a571c1eede8ec2adbebe92c2c1edb17ccb0 100644
--- a/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
+++ b/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
@@ -33,7 +33,7 @@ class BackendConfigurationManager extends \TYPO3\CMS\Extbase\Configuration\Abstr
 
 	/**
 	 * stores the current page ID
-	 * @var integer
+	 * @var int
 	 */
 	protected $currentPageId;
 
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php b/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
index 62011591806b627d3870cd23d9f594e714adde54..f26b47ee5d8cb6602f55e008c6f03ec69e3b620b 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
@@ -27,12 +27,12 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $userName = '';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isAdministrator = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isDisabled = FALSE;
 
@@ -62,7 +62,7 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $lastLoginDateAndTime;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $ipLockIsDisabled = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php b/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
index ec5ac839a476ccf8fed44059765d267f19f281fc..413e1f5c4ef4d8975c6cb181f1a36da0a68b9e77 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
@@ -78,7 +78,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $allowedLanguages = '';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $workspacePermission = FALSE;
 
@@ -88,7 +88,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $databaseMounts = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $fileOperationPermissions = 0;
 
@@ -98,7 +98,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $lockToDomain = '';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $hideInList = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php b/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
index d63b912c6bb136ee416e325ff6464e0425abfa92..bd7d9014b56741e5a0cb1817d92170246a1be9e2 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
@@ -43,7 +43,7 @@ class FileMount extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	 * If the value is true the path is an absolute one, otherwise the path is relative
 	 * the fileadmin.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isAbsolutePath = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php b/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
index 85f3c895fe85e9f9f8e1d403fde275f4b0a20683..098d7fe017c3dd8680f1a9d414857e669ccdce57 100644
--- a/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
+++ b/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
@@ -48,7 +48,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
 	/**
 	 * TRUE if the object is a clone
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	private $_isClone = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Error/Result.php b/typo3/sysext/extbase/Classes/Error/Result.php
index 02a54764fa052a5b33424cbd9f19bfa0834ee6f8..e14228521ccc9dd4ddcda38d48f33cfaa7a5f3a7 100644
--- a/typo3/sysext/extbase/Classes/Error/Result.php
+++ b/typo3/sysext/extbase/Classes/Error/Result.php
@@ -35,7 +35,7 @@ class Result {
 
 	/**
 	 * Caches the existence of errors
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $errorsExist = FALSE;
 
@@ -46,7 +46,7 @@ class Result {
 
 	/**
 	 * Caches the existence of warning
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $warningsExist = FALSE;
 
@@ -57,7 +57,7 @@ class Result {
 
 	/**
 	 * Caches the existence of notices
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noticesExist = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/CommandArgumentDefinition.php b/typo3/sysext/extbase/Classes/Mvc/Cli/CommandArgumentDefinition.php
index 25f3115ce5e54db891aaf1a35f7090c48f517ac5..2e52fb2fa28f958022b867ece3dbeab44f416a16 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/CommandArgumentDefinition.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/CommandArgumentDefinition.php
@@ -26,7 +26,7 @@ class CommandArgumentDefinition {
 	protected $name = '';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $required = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php b/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
index e12420220bb2679438c74fc3c6cfa6754c062c2f..4b54c1bb164ba14e0fe59c037314c71959ea5f82 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
@@ -57,7 +57,7 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface {
 	/**
 	 * If this request has been changed and needs to be dispatched again
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $dispatched = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php b/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
index b495e4db53d8b71f3997d96519f03de605b87461..3e55941b117c22a1379894739479955ed4f57ca4 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
@@ -21,7 +21,7 @@ namespace TYPO3\CMS\Extbase\Mvc\Cli;
 class Response extends \TYPO3\CMS\Extbase\Mvc\Response {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	private $exitCode = 0;
 
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php b/typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php
index bac72b8ce47d75207516c40e38961f2067dd7e52..9578581475aae7929dc041deea4f9fd4d7872310 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php
@@ -58,7 +58,7 @@ class Argument {
 	/**
 	 * TRUE if this argument is required
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isRequired = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Mvc/Request.php b/typo3/sysext/extbase/Classes/Mvc/Request.php
index 510cb0f784baa0c7b82be9bec83b27aa4be43c81..23de2eee89b1677f249480910d9171904c383730 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Request.php
@@ -92,7 +92,7 @@ class Request implements RequestInterface {
 	protected $format = 'txt';
 
 	/**
-	 * @var boolean If this request has been changed and needs to be dispatched again
+	 * @var bool If this request has been changed and needs to be dispatched again
 	 */
 	protected $dispatched = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Request.php b/typo3/sysext/extbase/Classes/Mvc/Web/Request.php
index f472b091892231bcb705ab70c587a0311cb3ff40..e7f8b0cd5273afae9f433eff9852d749d9a43b82 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Request.php
@@ -47,7 +47,7 @@ class Request extends \TYPO3\CMS\Extbase\Mvc\Request {
 	protected $baseUri;
 
 	/**
-	 * @var boolean TRUE if the current request is cached, false otherwise.
+	 * @var bool TRUE if the current request is cached, false otherwise.
 	 */
 	protected $isCached = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Response.php b/typo3/sysext/extbase/Classes/Mvc/Web/Response.php
index 22d0a4796ce4631d74a48e30c4f8be494b233aa8..f5b6c22081d372fabb15a0447523fc4a729a8440 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Response.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Response.php
@@ -41,7 +41,7 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response {
 	/**
 	 * The HTTP status code
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $statusCode;
 
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
index 1e59b7a6e2c37b456bd5670d3368fca86c66fd69..5305a245da1faf30685e138cb8faa39177303542 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
@@ -64,7 +64,7 @@ class UriBuilder {
 	protected $section = '';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $createAbsoluteUri = FALSE;
 
@@ -74,7 +74,7 @@ class UriBuilder {
 	protected $absoluteUriScheme = NULL;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $addQueryString = FALSE;
 
@@ -89,27 +89,27 @@ class UriBuilder {
 	protected $argumentsToBeExcludedFromQueryString = array();
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $linkAccessRestrictedPages = FALSE;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $targetPageUid = NULL;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $targetPageType = 0;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noCache = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $useCacheHash = TRUE;
 
diff --git a/typo3/sysext/extbase/Classes/Object/Container/ClassInfo.php b/typo3/sysext/extbase/Classes/Object/Container/ClassInfo.php
index 81481fbfbadcad13f7e1fe1db915db047b5ffd47..808eb8341550fe594d86003fe87cb505d9c5ac37 100644
--- a/typo3/sysext/extbase/Classes/Object/Container/ClassInfo.php
+++ b/typo3/sysext/extbase/Classes/Object/Container/ClassInfo.php
@@ -62,14 +62,14 @@ class ClassInfo {
 	/**
 	 * Indicates if the class is a singleton or not.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	private $isSingleton = FALSE;
 
 	/**
 	 * Indicates if the class has the method initializeObject
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	private $isInitializeable = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
index 3c8a2971f769aa9492bc502d2169c7718384e442..2ed0b2e0672c6809c288a21520aa94a56fc1742d 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Comparison.php
@@ -66,7 +66,7 @@ class Comparison implements ComparisonInterface {
 	protected $operand1;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $operator;
 
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Join.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Join.php
index e6e329057c2e14dfaf70b645b83045e153d03313..aafe5b476106e7c4aa66225828b6c9c77c5dd74b 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Join.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Qom/Join.php
@@ -29,7 +29,7 @@ class Join implements JoinInterface {
 	protected $right;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $joinType;
 
diff --git a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
index 7c3fc380fbc199495db0254ba9d81aec2faebfc7..3c70da18104b32a9060ff0794569ba071886fe44 100644
--- a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
@@ -50,7 +50,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
 	/**
 	 * A flag indication if the object storage was modified after reconstitution (eg. by adding a new object)
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isModified = FALSE;
 
@@ -74,7 +74,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
 	 * An internal var holding the count of added objects to be stored as position.
 	 * It would be resetted, when all objects will be removed from the objectstorage
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $positionCounter = 0;
 
diff --git a/typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php b/typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
index 260be4e6885cc6259b01ab0a8c75e25f21213f76..4f40b7e25541dc3b58ecbc1c1242308eafd63bb4 100644
--- a/typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
+++ b/typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
@@ -88,14 +88,14 @@ class PropertyMappingConfiguration implements PropertyMappingConfigurationInterf
 	/**
 	 * If TRUE, unknown properties will be skipped during property mapping
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $skipUnknownProperties = FALSE;
 
 	/**
 	 * If TRUE, unknown properties will be mapped.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $mapUnknownProperties = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileCollectionConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileCollectionConverter.php
index d29a5702e138094daa8062ffd923f9dd654f6cf7..e059e5e85149514965d18083607a45ebe880accc 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileCollectionConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileCollectionConverter.php
@@ -21,7 +21,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
 abstract class AbstractFileCollectionConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
index 9b2504cfe307cc16723c7ad700d8e2db2c8e8f37..254391011574a2d1de796d2cae3a4d01926b0137 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
@@ -21,7 +21,7 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
 abstract class AbstractFileFolderConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractTypeConverter {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php
index a70645901c7c69e90278cabf96407f1cf8a84363..0f71910ff7146ab9f9b6ccce5a5443f2d69ebe9a 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php
@@ -51,7 +51,7 @@ abstract class AbstractTypeConverter implements \TYPO3\CMS\Extbase\Property\Type
 	/**
 	 * The priority for this converter.
 	 *
-	 * @var integer
+	 * @var int
 	 * @api
 	 */
 	protected $priority;
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/ArrayConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/ArrayConverter.php
index a28f7bb30c40eab993450c442609e56a290fb153..30d6af8128bd76a081c52a9b4212f505026b0224 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/ArrayConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/ArrayConverter.php
@@ -38,7 +38,7 @@ class ArrayConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractT
 	protected $targetType = 'array';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/BooleanConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/BooleanConverter.php
index 7dd98031c2719d3a9951fa1d196bcb31379a6d75..70b736db39821133f72801a5890755efaa86ad34 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/BooleanConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/BooleanConverter.php
@@ -38,7 +38,7 @@ class BooleanConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstrac
 	protected $targetType = 'boolean';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/CoreTypeConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/CoreTypeConverter.php
index 5d193d131018d6999b9ad27b5949e49ae376a578..289507c36093a9d0777bafa676f46ea75f1fd5fb 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/CoreTypeConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/CoreTypeConverter.php
@@ -42,7 +42,7 @@ class CoreTypeConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstra
 	protected $targetType = 'TYPO3\\CMS\\Core\\Type\\TypeInterface';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
index 640e302f1c1878df520334fd3ce4f209f2b5975e..c2a76ce0bb9f6f0ef8f775420034fea4dfae97e5 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
@@ -86,7 +86,7 @@ class DateTimeConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstra
 	protected $targetType = 'DateTime';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/FloatConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/FloatConverter.php
index c46ef9fdbd965cebe42492ee6d75b9adadd1637b..9d94cda816b61c93f3244f939551faa3b075b2d0 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/FloatConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/FloatConverter.php
@@ -40,7 +40,7 @@ class FloatConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractT
 	protected $targetType = 'float';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
index 885a2ec08ed9636d00af603a7895535b9f46912f..364e42cf3a13b274a5314b4eca800cce94edeaab 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
@@ -38,7 +38,7 @@ class IntegerConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstrac
 	protected $targetType = 'integer';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php
index 0a8f8867855789dd56f0067c6f2727b4b7453b10..715d4453e8881a5eb6008da767daad32c240f942 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php
@@ -28,12 +28,12 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
 class ObjectConverter extends AbstractTypeConverter implements \TYPO3\CMS\Core\SingletonInterface {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const CONFIGURATION_TARGET_TYPE = 3;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const CONFIGURATION_OVERRIDE_TARGET_TYPE_ALLOWED = 4;
 
@@ -48,7 +48,7 @@ class ObjectConverter extends AbstractTypeConverter implements \TYPO3\CMS\Core\S
 	protected $targetType = 'object';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 0;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php
index c984130c6a1f9a5469f068ab2c0978db76f0b144..3f2fa4c457c43996befa574e6d3c9a4acdb07103 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php
@@ -40,7 +40,7 @@ class ObjectStorageConverter extends AbstractTypeConverter {
 	protected $targetType = 'TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/PersistentObjectConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/PersistentObjectConverter.php
index 87268a8c3b47cf9363f876c049362a1014a0ed13..18b4f5386604d431cd693e92fd72e0b982ae957f 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/PersistentObjectConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/PersistentObjectConverter.php
@@ -37,12 +37,12 @@ namespace TYPO3\CMS\Extbase\Property\TypeConverter;
 class PersistentObjectConverter extends ObjectConverter {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const CONFIGURATION_MODIFICATION_ALLOWED = 1;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const CONFIGURATION_CREATION_ALLOWED = 2;
 
@@ -57,7 +57,7 @@ class PersistentObjectConverter extends ObjectConverter {
 	protected $targetType = 'object';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/StringConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/StringConverter.php
index e65a772d6af0228ea20f4554dfa0e6271d7bf50f..f21a76e33760fc3c6b7f9bc81dd3becfc010b904 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/StringConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/StringConverter.php
@@ -38,7 +38,7 @@ class StringConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstract
 	protected $targetType = 'string';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $priority = 1;
 
diff --git a/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php b/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
index 8454c85cedf1dfbeb51127de6d2f5769a1c361c6..9a6ae6619a5663861da3293f9e03247a519b3f9a 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
@@ -39,14 +39,14 @@ class ClassSchema {
 	/**
 	 * Model type of the class this schema is referring to
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $modelType = self::MODELTYPE_ENTITY;
 
 	/**
 	 * Whether a repository exists for the class this schema is referring to
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $aggregateRoot = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
index bc64f983d6bb91cfd97213b14ad6f94cae8bc98b..926556bcf812c9dfc250efd4377f9a1f90b16a81 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
@@ -34,7 +34,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Whether this service has been initialized.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $initialized = FALSE;
 
@@ -46,7 +46,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Whether class alterations should be detected on each initialization.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $detectClassChanges = FALSE;
 
@@ -116,7 +116,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
 	 *
 	 * @see reflectClass()
 	 * @see getMethodReflection()
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $dataCacheNeedsUpdate = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/SignalSlot/Dispatcher.php b/typo3/sysext/extbase/Classes/SignalSlot/Dispatcher.php
index 4facf8903623099da3a38a8fde7c30feb2ee4ae1..6e89f2e96f38d9791337ae2f57148304cec8effe 100644
--- a/typo3/sysext/extbase/Classes/SignalSlot/Dispatcher.php
+++ b/typo3/sysext/extbase/Classes/SignalSlot/Dispatcher.php
@@ -23,7 +23,7 @@ namespace TYPO3\CMS\Extbase\SignalSlot;
 class Dispatcher implements \TYPO3\CMS\Core\SingletonInterface {
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isInitialized = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
index a6664415521b5cc02e2dcab06b94fabc93c198bf..c7d4c1cae04de3e4ff7975e6e58ce6203a6730e6 100644
--- a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
@@ -66,7 +66,7 @@ class DebuggerUtility {
 	/**
 	 * Is set to TRUE once the CSS file is included in the current page to prevent double inclusions of the CSS file.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	static protected $stylesheetEchoed = FALSE;
 
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
index 5e63d3bfb5e2bb2090b103fdfd0ad2850538b0bd..ce02bc36951353e028bd32a8c9b2d2fcee4313b1 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
@@ -27,7 +27,7 @@ abstract class AbstractValidator implements ValidatorInterface {
 	 * Note: A value is considered empty if it is NULL or an empty string!
 	 * By default all validators except for NotEmpty and the Composite Validators accept empty values
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $acceptsEmptyValues = TRUE;
 
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
index e853a54d9797a67559869829bdcc3b3e4cdb6a5f..82ec46cc674b15353e08eb301b2e6b624cff0841 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
@@ -25,7 +25,7 @@ class NotEmptyValidator extends AbstractValidator {
 	 * This validator always needs to be executed even if the given value is empty.
 	 * See AbstractValidator::validate()
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $acceptsEmptyValues = FALSE;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Object/Container/Fixtures/ContainerConstructorInjectionTestFixtures.php b/typo3/sysext/extbase/Tests/Unit/Object/Container/Fixtures/ContainerConstructorInjectionTestFixtures.php
index 6410acbe18b6e7f72b197fae4fa1ae059e4fdf22..5f61cfb008bbe9ca508d43536b9b753e649ddc45 100644
--- a/typo3/sysext/extbase/Tests/Unit/Object/Container/Fixtures/ContainerConstructorInjectionTestFixtures.php
+++ b/typo3/sysext/extbase/Tests/Unit/Object/Container/Fixtures/ContainerConstructorInjectionTestFixtures.php
@@ -5,7 +5,7 @@ namespace TYPO3\CMS\Extbase\Tests\Unit\Object\Container\Fixtures;
 class SimpleTypeConstructorArgument {
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	public $foo;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity2.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity2.php
index 8fd4b7328dbe979fffc90df5f7c7c7fb8d26faa6..38d6781e1ce9701b82db94f460feedb5d0368ce4 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity2.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity2.php
@@ -28,7 +28,7 @@ class Entity2 extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	public $someString;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	public $someInteger;
 
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity3.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity3.php
index 6a51583a9ac0c3d625f34b880ff7f0ace02d8576..62d23ef9c70f240f00684127145101a546744924 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity3.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Fixture/Model/Entity3.php
@@ -25,7 +25,7 @@ class Entity3 extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	public $someString;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	public $someInteger;
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
index 5eee1cb4bc4e6fa8487cc75d3a17eb01df3f841b..65eddcaafb65430244989e3763d7d90d27d9873e 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
@@ -76,7 +76,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $version = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $integerVersion = 0;
 
@@ -91,12 +91,12 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $description = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $state = 0;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $category = 0;
 
@@ -121,7 +121,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $authorEmail = '';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $currentVersion = FALSE;
 
@@ -131,12 +131,12 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $md5hash = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $reviewState;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $alldownloadcounter;
 
@@ -152,7 +152,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 
 	/**
 	 * @internal
-	 * @var integer
+	 * @var int
 	 */
 	protected $position = 0;
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
index f3283e18703b6a8c78ef3cb65b6b57eb7682e1dd..99369a289079a98fce2098b8cb335e8311ed3bde 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
@@ -34,7 +34,7 @@ class Mirrors extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	 *
 	 * Is array index.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $currentMirror;
 
@@ -42,7 +42,7 @@ class Mirrors extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	 * Keeps information if a mirror should
 	 * be randomly selected.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isRandomSelection = TRUE;
 
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
index 5f837a997206f3656bb9f97adfe04c174a8a1ad0..d140d6d572de39436a981eda1c20d7fbeaeff8fc 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
@@ -30,7 +30,7 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 	 * being updated to 500 to make sure it does not collide with a limit in any
 	 * other DBMS.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const CHUNK_SIZE = 500;
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
index cd6e8df43e5b4c87859928d1434895557205881c..92c63e8912b8e23164f53381776fe018aca91c24 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
@@ -38,7 +38,7 @@ class ExtensionListUtility implements \SplObserver {
 	/**
 	 * Keeps number of processed version records.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $sumRecords = 0;
 
@@ -89,7 +89,7 @@ class ExtensionListUtility implements \SplObserver {
 	 *
 	 * The UID is necessary for inserting records.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $repositoryUid = 1;
 
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
index 3d26e7959de7d71bd78e161c2bf6edc8d874ea0f..173ff768226a7d017fb165b1a8b6b466df96c837 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
@@ -29,19 +29,19 @@ class Helper implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Type of problem: extension file not existing in file system.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const PROBLEM_EXTENSION_FILE_NOT_EXISTING = 1;
 	/**
 	 * Type of problem: wrong hash indicates outdated extension file.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const PROBLEM_EXTENSION_HASH_CHANGED = 2;
 	/**
 	 * Type of problem: no version records in database.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const PROBLEM_NO_VERSIONS_IN_DATABASE = 4;
 	/**
diff --git a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
index 519b61a36f64192c8e02ef262d53d4b6a73f4dde..bb7bec756895dc40859e3f34f342f57621f2677d 100644
--- a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
+++ b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
@@ -46,19 +46,19 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
 	public $extKey = 'felogin';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	public $pi_checkCHash = FALSE;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	public $pi_USER_INT_obj = TRUE;
 
 	/**
 	 * Is user logged in?
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $userIsLoggedIn;
 
@@ -86,7 +86,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
 	/**
 	 * Flag for disable the redirect
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noRedirect = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/Core/Compiler/TemplateCompiler.php b/typo3/sysext/fluid/Classes/Core/Compiler/TemplateCompiler.php
index 61483e4f06fdbd095173f5092bc596b6a222dfd3..62c6066a05a10baca411e7f54f6d306ed8e4c582 100644
--- a/typo3/sysext/fluid/Classes/Core/Compiler/TemplateCompiler.php
+++ b/typo3/sysext/fluid/Classes/Core/Compiler/TemplateCompiler.php
@@ -21,7 +21,7 @@ class TemplateCompiler implements \TYPO3\CMS\Core\SingletonInterface {
 	protected $templateCache;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $variableCounter = 0;
 
diff --git a/typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php b/typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php
index ed1638cb5d512fd0ed432f16b45d29051d78dfa9..947dbe39dfdd0da3de394928dbe64684c499615f 100644
--- a/typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/Interceptor/Escape.php
@@ -19,7 +19,7 @@ class Escape implements \TYPO3\CMS\Fluid\Core\Parser\InterceptorInterface {
 	/**
 	 * Is the interceptor enabled right now?
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $interceptorEnabled = TRUE;
 
diff --git a/typo3/sysext/fluid/Classes/Core/Parser/ParsingState.php b/typo3/sysext/fluid/Classes/Core/Parser/ParsingState.php
index 09e974cb69fd0a1f4d7f37357a7d0bc12ed5ed0c..d6436ab82b4743efaa172cfce7aa0b954477f828 100644
--- a/typo3/sysext/fluid/Classes/Core/Parser/ParsingState.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/ParsingState.php
@@ -49,7 +49,7 @@ class ParsingState implements \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterfa
 	protected $layoutNameNode;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $compilable = TRUE;
 
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
index 950e33fc245ceaaf771ebd26972cdf064f09701f..922befdc6f70bafc22e5cb37484e676458369d5e 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
@@ -21,7 +21,7 @@ abstract class AbstractViewHelper {
 	/**
 	 * TRUE if arguments have already been initialized
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	private $argumentsInitialized = FALSE;
 
@@ -108,7 +108,7 @@ abstract class AbstractViewHelper {
 	/**
 	 * With this flag, you can disable the escaping interceptor inside this ViewHelper.
 	 * THIS MIGHT CHANGE WITHOUT NOTICE, NO PUBLIC API!
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = TRUE;
 
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/ArgumentDefinition.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/ArgumentDefinition.php
index 6bd210f8d9091e4f3d04431197112709d71775d5..dcdae41500d6ea02c8e267e224c0ab3b0d6db89c 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/ArgumentDefinition.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/ArgumentDefinition.php
@@ -40,7 +40,7 @@ class ArgumentDefinition {
 	/**
 	 * Is argument required?
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $required = FALSE;
 
@@ -54,7 +54,7 @@ class ArgumentDefinition {
 	/**
 	 * TRUE if it is a method parameter
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isMethodParameter = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
index a85a2302554def13b99e335682640db98c7e016b..d0b301b06ea15726b72e47374e381ee55a2156ee 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
@@ -43,7 +43,7 @@ class TagBuilder {
 	 * Specifies whether this tag needs a closing tag.
 	 * E.g. <textarea> cant be self-closing even if its empty
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $forceClosingTag = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
index 4d072f8fdf27948ca18152f4bc298bd497f6ddcb..68751f472a36a88d00ebb4e46bd10b36793cb9b6 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/AbstractWidgetViewHelper.php
@@ -38,7 +38,7 @@ abstract class AbstractWidgetViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper
 	/**
 	 * If set to TRUE, it is an AJAX widget.
 	 *
-	 * @var boolean
+	 * @var bool
 	 * @api
 	 */
 	protected $ajaxWidget = FALSE;
diff --git a/typo3/sysext/fluid/Classes/Fluid.php b/typo3/sysext/fluid/Classes/Fluid.php
index 7e654394f5d932187a721e9e456815175d9fe1fc..28f0c9e70ce33db146c71b5908fb3224e4ad4689 100644
--- a/typo3/sysext/fluid/Classes/Fluid.php
+++ b/typo3/sysext/fluid/Classes/Fluid.php
@@ -27,7 +27,7 @@ class Fluid {
 	 * This is NO PUBLIC API and the way this mode is enabled might change without
 	 * notice in the future.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	static public $debugMode = FALSE;
 }
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 de96b7da56c48c91a69254c9215adc7cb8f1649c..601da79c07e702734bf25be71a7fa0f3759acd23 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Widget/Controller/PaginateController.php
@@ -31,27 +31,27 @@ class PaginateController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetCont
 	protected $objects;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $currentPage = 1;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $numberOfPages = 1;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $offset = 0;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $itemsPerPage = 0;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $numberOfObjects = 0;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
index 703ede65504c30fc92f0f58c6f00c9fb00bbce97..755459567a3e8abdfb6777a5847a7a8419e12625 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CObjectViewHelper.php
@@ -45,7 +45,7 @@ class CObjectViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHel
 	 * Disable the escaping interceptor because otherwise the child nodes would be escaped before this view helper
 	 * can decode the text's entities.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CommentViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CommentViewHelper.php
index 2b96d8dc68948b61b7aaaad1d739e8615b591562..110f7c9f33cfc8520383b82c5bf7acb08253a83d 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CommentViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CommentViewHelper.php
@@ -45,7 +45,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
 class CommentViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CountViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CountViewHelper.php
index 9759fd19edf684765e75e628d3146582a4f28727..5727fdf3297ee101776020c45a56e1ee3a02414b 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CountViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CountViewHelper.php
@@ -35,7 +35,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers;
 class CountViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CycleViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CycleViewHelper.php
index d975080da76b83127d18bb21063b26ac32da97c1..b0dc38fded87e3e1bcbc9ec7adc39396c417064a 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CycleViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CycleViewHelper.php
@@ -57,7 +57,7 @@ class CycleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelpe
 	/**
 	 * current values index
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $currentCycleIndex = NULL;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CdataViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CdataViewHelper.php
index 890214393e272b2d2123d1cbcf22f039cef9c481..ba3248237e0218f8a0039da58fbd875f34daaeec 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CdataViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CdataViewHelper.php
@@ -47,7 +47,7 @@ class CdataViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelpe
 	 * Disable the escaping interceptor because otherwise the child nodes would be escaped before this view helper
 	 * can decode the text's entities.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
index 914106527762f489d26e678d21773728818be286..711d4206be26c8ec6c9536acab6525f8a7354bf6 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
@@ -77,7 +77,7 @@ namespace TYPO3\CMS\Fluid\ViewHelpers\Format;
 class DateViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
index 2f2bbeb4a0d190d83d57057c7d8b190f23de28b5..13cab6b3327395923010fef9af0b282231bec208 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlViewHelper.php
@@ -60,7 +60,7 @@ class HtmlViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
 	 * If the escaping interceptor should be disabled inside this ViewHelper, then set this value to FALSE.
 	 * This is internal and NO part of the API. It is very likely to change.
 	 *
-	 * @var boolean
+	 * @var bool
 	 * @internal
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesDecodeViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesDecodeViewHelper.php
index 7e6939abaf8e4d344914b4f4b1f49d5f878290e8..638dd32da665ea0f7aa172993c249bbf734436ba 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesDecodeViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesDecodeViewHelper.php
@@ -39,7 +39,7 @@ class HtmlentitiesDecodeViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Format\A
 	 * Disable the escaping interceptor because otherwise the child nodes would be escaped before this view helper
 	 * can decode the text's entities.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesViewHelper.php
index 54290fe52b11e515b89bdfa1b9f681ef7e66a335..6f885ac35509d5f75672eab73c93698d851a85af 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlentitiesViewHelper.php
@@ -39,7 +39,7 @@ class HtmlentitiesViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Format\Abstrac
 	 * Disable the escaping interceptor because otherwise the child nodes would be escaped before this view helper
 	 * can decode the text's entities.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlspecialcharsViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlspecialcharsViewHelper.php
index fceeb429c7df4910cd51c9c74322a2e9fae601c5..01302423c2653002562dce7a45065e882043dfe0 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlspecialcharsViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/HtmlspecialcharsViewHelper.php
@@ -39,7 +39,7 @@ class HtmlspecialcharsViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Format\Abs
 	 * Disable the escaping interceptor because otherwise the child nodes would be escaped before this view helper
 	 * can decode the text's entities.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/RawViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/RawViewHelper.php
index f4e17535b2609ab443215a50a3fa1b8ddbfce264..807cfd2addd014743344cd6f12599367433236cc 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/RawViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/RawViewHelper.php
@@ -49,7 +49,7 @@ class RawViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
 	 * Disable the escaping interceptor because otherwise the child nodes would be escaped before this view helper
 	 * can decode the text's entities.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
index 4f0e01a3679fd52d945d301eefbe46d7f77507fd..62bc99c83f52a0cedae5fd6d31716cba8e16762a 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/StripTagsViewHelper.php
@@ -40,7 +40,7 @@ class StripTagsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewH
 	 * Disable the escaping interceptor because otherwise the child nodes would be escaped before this view helper
 	 * can decode the text's entities.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
index 767a19e2831b974b4468e881d06f7e702e5670c9..8145bf4da7db020a1b5738ea279e376a5fe1bee8 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/UrlencodeViewHelper.php
@@ -39,7 +39,7 @@ class UrlencodeViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewH
 	 * Disable the escaping interceptor because otherwise the child nodes would be escaped before this view helper
 	 * can decode the text's entities.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/SwitchViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/SwitchViewHelper.php
index 36b146f56e4b440ca606a8d2cf5b9c3a6077321a..c60a8945bc049437f5d58a53d00abc9dd81f704b 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/SwitchViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/SwitchViewHelper.php
@@ -50,7 +50,7 @@ class SwitchViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelp
 	protected $backupSwitchExpression = NULL;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $backupBreakState = FALSE;
 
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
index a1e1f059ab8ae767807bd013cf74d77dcf15c0ac..cf6728d6f7ad66a59d2adc0c218d52bcb5f4c792 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Widget/Controller/PaginateController.php
@@ -33,17 +33,17 @@ class PaginateController extends \TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetCont
 	protected $objects;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $currentPage = 1;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $maximumNumberOfLinks = 99;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $numberOfPages = 1;
 
diff --git a/typo3/sysext/form/Classes/Domain/Factory/JsonToTypoScript.php b/typo3/sysext/form/Classes/Domain/Factory/JsonToTypoScript.php
index a4287d8bb0df3dcededf62b0b9580cee7c250d27..202fcd689959df0dfe0f68c7f86d09f3da9a28fe 100644
--- a/typo3/sysext/form/Classes/Domain/Factory/JsonToTypoScript.php
+++ b/typo3/sysext/form/Classes/Domain/Factory/JsonToTypoScript.php
@@ -26,7 +26,7 @@ class JsonToTypoScript {
 	/**
 	 * Internal counter for the elements
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $elementId = 0;
 
@@ -41,7 +41,7 @@ class JsonToTypoScript {
 	/**
 	 * Internal counter for the validation rules
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $validationRulesCounter = 1;
 
diff --git a/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php b/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php
index 4f207adb4c772e0bb9be65e923a38aa98ab70a57..7b086ef25b9d235d92d48dba51b8426e20e18fea 100644
--- a/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php
+++ b/typo3/sysext/form/Classes/Domain/Factory/TypoScriptFactory.php
@@ -35,7 +35,7 @@ class TypoScriptFactory implements \TYPO3\CMS\Core\SingletonInterface {
 	protected $localContentObject;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $disableContentElement = FALSE;
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AbstractAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AbstractAttribute.php
index ce93c38b38e79b85bcf49a3274b22ed9429d9631..fe40b873ff9ee99724a6314573d529200b9e5d9c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AbstractAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AbstractAttribute.php
@@ -31,7 +31,7 @@ abstract class AbstractAttribute {
 	/**
 	 * Internal Id of the element
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $elementId;
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
index 91e72113cf6e42c8a09ad4c76e1be1b975f50744..b6dd7a5f4a735a30fa50c27502c4b83a3cab3906 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
@@ -31,7 +31,7 @@ class AttributesAttribute {
 	/**
 	 * Internal Id of the element
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $elementId;
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/NameAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/NameAttribute.php
index 3ec7e27f9f7f6501de69489c23757aacc60c5725..1615b0bb7dc21ec0c3ff7b6b1d6beba6d4a306dc 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/NameAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/NameAttribute.php
@@ -31,7 +31,7 @@ class NameAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttri
 	/**
 	 * TRUE if value is expected without prefix
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $returnValueWithoutPrefix = FALSE;
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Content.php b/typo3/sysext/form/Classes/Domain/Model/Content.php
index 51e06536cb0960604f023f9909c5ebb8d9b240ec..df50820ddd0d5625d96463867bb5de752b9b7ba5 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Content.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Content.php
@@ -24,14 +24,14 @@ class Content {
 	/**
 	 * The uid
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $uid = 0;
 
 	/**
 	 * The page id
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $pageId = 0;
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
index dc659639ff500a4218e901d904439b80c5311c63..8f4f1d225356a0c51ebe4ee65d0a59931a07cf7c 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
@@ -38,7 +38,7 @@ abstract class AbstractElement {
 	/**
 	 * Internal Id of the element
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $elementId;
 
@@ -58,7 +58,7 @@ abstract class AbstractElement {
 	 * True if it accepts the parent name instead of its own
 	 * This is necessary for groups
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $acceptsParentName = FALSE;
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxElement.php
index 7ad51f418901c00644c83f307469d6cf0ea5cc8b..a335f2c2ea22dbdaf9d36f61c1c3eca519f2063d 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/CheckboxElement.php
@@ -56,7 +56,7 @@ class CheckboxElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractEleme
 	 * True if it accepts the parent name instead of its own
 	 * This is necessary for groups
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $acceptsParentName = TRUE;
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/RadioElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/RadioElement.php
index eae1fe36915f865b744f93ca34f5366a8c61dbd3..d3e7983fe7bb3917e95f7f8a24148586e8703b46 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/RadioElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/RadioElement.php
@@ -57,7 +57,7 @@ class RadioElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement
 	 * True if it accepts the parent name instead of its own
 	 * This is necessary for groups
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $acceptsParentName = TRUE;
 
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php
index f2a130a84fa73fa2007a13d8f9b17c76f40db99b..f39195f8718c9d82966b6880bfa83ed64a6c2d65 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php
@@ -47,7 +47,7 @@ class AbstractJsonElement {
 	 *
 	 * Some elements like select handle their own child elements
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $childElementsAllowed = TRUE;
 
diff --git a/typo3/sysext/form/Classes/ElementCounter.php b/typo3/sysext/form/Classes/ElementCounter.php
index ef67b090f62fa2d914827207b7b94bc7fb40f44f..576b2edf5f6f5d44c2ad3a5ffd12d6104bd46a9e 100644
--- a/typo3/sysext/form/Classes/ElementCounter.php
+++ b/typo3/sysext/form/Classes/ElementCounter.php
@@ -24,7 +24,7 @@ class ElementCounter implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Counter
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $elementCounter = 1;
 
diff --git a/typo3/sysext/form/Classes/Filter/AlphabeticFilter.php b/typo3/sysext/form/Classes/Filter/AlphabeticFilter.php
index 26ecf3fc3939e6ad5223e9a7c9f5adf6196d46bf..94ffe7e5e6dddc7fb2b5564df691cac93e437f69 100644
--- a/typo3/sysext/form/Classes/Filter/AlphabeticFilter.php
+++ b/typo3/sysext/form/Classes/Filter/AlphabeticFilter.php
@@ -24,7 +24,7 @@ class AlphabeticFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 	/**
 	 * Allow whitespace
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $allowWhiteSpace;
 
diff --git a/typo3/sysext/form/Classes/Filter/AlphanumericFilter.php b/typo3/sysext/form/Classes/Filter/AlphanumericFilter.php
index 76dfc3428924dc74828cab9fe81668467b649aa6..0d872ed35bf961de9bbb836c9c2333f2c831aa94 100644
--- a/typo3/sysext/form/Classes/Filter/AlphanumericFilter.php
+++ b/typo3/sysext/form/Classes/Filter/AlphanumericFilter.php
@@ -24,7 +24,7 @@ class AlphanumericFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 	/**
 	 * Allow whitespace
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $allowWhiteSpace;
 
diff --git a/typo3/sysext/form/Classes/Filter/RegExpFilter.php b/typo3/sysext/form/Classes/Filter/RegExpFilter.php
index a4761b06bbbb9293506882018e556eb7b4240ae4..f518be4ea56c1d2bc8cb970ba63d5b43428bb910 100644
--- a/typo3/sysext/form/Classes/Filter/RegExpFilter.php
+++ b/typo3/sysext/form/Classes/Filter/RegExpFilter.php
@@ -24,7 +24,7 @@ class RegExpFilter implements \TYPO3\CMS\Form\Filter\FilterInterface {
 	/**
 	 * Regular expression for filter
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $regularExpression;
 
diff --git a/typo3/sysext/form/Classes/Validation/AbstractValidator.php b/typo3/sysext/form/Classes/Validation/AbstractValidator.php
index 93852b1f699da2c329a89625c5167d0890542846..b73893399a08e2bfb3630ec7d0aeb564280328cf 100644
--- a/typo3/sysext/form/Classes/Validation/AbstractValidator.php
+++ b/typo3/sysext/form/Classes/Validation/AbstractValidator.php
@@ -51,7 +51,7 @@ abstract class AbstractValidator implements \TYPO3\CMS\Form\Validation\Validator
 	/**
 	 * Display the message like mandatory
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $showMessage = TRUE;
 
diff --git a/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php b/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php
index ea36a02407692865b3d34ad1a3655e21ee31bcda..bee55b2e5fcc6da1709a6d9fbe9f084606c9a67f 100644
--- a/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php
+++ b/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php
@@ -24,7 +24,7 @@ class AlphabeticValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 	/**
 	 * Allow white space in the submitted value
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $allowWhiteSpace;
 
diff --git a/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php b/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php
index 7ff0be1b052586006da5489fa48f93d694a9ddb9..3a15f5499ae202c46118ce57e2aba8f9f95aeb7b 100644
--- a/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php
+++ b/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php
@@ -24,7 +24,7 @@ class AlphanumericValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator
 	/**
 	 * Allow white space in the submitted value
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $allowWhiteSpace;
 
diff --git a/typo3/sysext/form/Classes/Validation/BetweenValidator.php b/typo3/sysext/form/Classes/Validation/BetweenValidator.php
index 6f143ae607de9a0e2c20a33834d99457d2e9ed22..1ffa17fbc1a6d09491e759f005414d5571b68847 100644
--- a/typo3/sysext/form/Classes/Validation/BetweenValidator.php
+++ b/typo3/sysext/form/Classes/Validation/BetweenValidator.php
@@ -39,7 +39,7 @@ class BetweenValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator impl
 	/**
 	 * If TRUE, minimum and maximum values are included in comparison
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $inclusive;
 
diff --git a/typo3/sysext/form/Classes/Validation/InArrayValidator.php b/typo3/sysext/form/Classes/Validation/InArrayValidator.php
index 0f7d75e5b4ce6e39f391dfc00111e564e36b6218..8a10b938e56fa90513a745df0b9856c4224a97ef 100644
--- a/typo3/sysext/form/Classes/Validation/InArrayValidator.php
+++ b/typo3/sysext/form/Classes/Validation/InArrayValidator.php
@@ -31,7 +31,7 @@ class InArrayValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
 	/**
 	 * Search strict
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $strict;
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php
index 10bdeec4101d738b6efb162112ff5fef8d0e6d5d..5aeab36f351874f2efdc15b1a1a4cc428d0796b1 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php
@@ -43,7 +43,7 @@ abstract class AbstractElementView {
 	 * True if element needs no element wrap
 	 * like <li>element</li>
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noWrap = FALSE;
 
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/OptgroupElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/OptgroupElementView.php
index 220b961a443081fdc86f7c3eee1385fe7554c032..8d8b2650a7c4bf36f7b46ff6c9e48ee48b58d37c 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/OptgroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/OptgroupElementView.php
@@ -34,7 +34,7 @@ class OptgroupElementView extends \TYPO3\CMS\Form\View\Confirmation\Element\Cont
 	 * True if element needs no element wrap
 	 * like <li>element</li>
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noWrap = TRUE;
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php
index 66567860d0ba5d62b54a039ead59f99b0d132c5d..1f78332abd429a9b1e9bbc75ed12ddecbcd2e209 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php
@@ -48,7 +48,7 @@ abstract class AbstractElementView {
 	 * True if element needs no element wrap
 	 * like <li>element</li>
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noWrap = FALSE;
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/OptgroupElementView.php b/typo3/sysext/form/Classes/View/Form/Element/OptgroupElementView.php
index 08a10c0e4b8937376cbd640405620a7704ac8f00..f48019edcbf6cd8361f602bbe59ffec5f4afc4d6 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/OptgroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/OptgroupElementView.php
@@ -36,7 +36,7 @@ class OptgroupElementView extends \TYPO3\CMS\Form\View\Form\Element\ContainerEle
 	 * True if element needs no element wrap
 	 * like <li>element</li>
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noWrap = TRUE;
 
diff --git a/typo3/sysext/form/Classes/View/Form/Element/OptionElementView.php b/typo3/sysext/form/Classes/View/Form/Element/OptionElementView.php
index f1ee745e3332ac32927811f2dd9c5256ee99d842..d944c59f8e894d1a0903649d84bd2b155fe50834 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/OptionElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/OptionElementView.php
@@ -34,7 +34,7 @@ class OptionElementView extends \TYPO3\CMS\Form\View\Form\Element\AbstractElemen
 	 * True if element needs no element wrap
 	 * like <li>element</li>
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noWrap = TRUE;
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php
index 737767b46159f3930e2d551bbd34e996366bc1b5..6f72d3c9caa4e8525e76351fb6d668aaceff4974 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php
@@ -43,7 +43,7 @@ abstract class AbstractElementView {
 	 * True if element needs no element wrap
 	 * like <li>element</li>
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noWrap = FALSE;
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/OptgroupElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/OptgroupElementView.php
index b2aec0e7f0d0493c40fef020e4ed841131f0f081..c098b470994eef49f1417332f0ff104f7793f9d7 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/OptgroupElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/OptgroupElementView.php
@@ -34,7 +34,7 @@ class OptgroupElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\Contain
 	 * True if element needs no element wrap
 	 * like <li>element</li>
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noWrap = TRUE;
 
diff --git a/typo3/sysext/form/Classes/View/Mail/Html/Element/OptionElementView.php b/typo3/sysext/form/Classes/View/Mail/Html/Element/OptionElementView.php
index 154dab1a3eef546ffbb674f298affa2d6854ef1f..2c0443384e6e25aeef759a62a65633bcf574234a 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/OptionElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/OptionElementView.php
@@ -36,7 +36,7 @@ class OptionElementView extends \TYPO3\CMS\Form\View\Mail\Html\Element\AbstractE
 	 * True if element needs no element wrap
 	 * like <li>element</li>
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $noWrap = TRUE;
 
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 45ee0c9be0e1cc3bf69e49754f1c15096e7c3835..1aa6abc813034b3f39e4000a751d1fa830c75954 100644
--- a/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Plain/Element/AbstractElementView.php
@@ -27,7 +27,7 @@ abstract class AbstractElementView {
 	protected $model;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $spaces;
 
diff --git a/typo3/sysext/form/Classes/View/Wizard/AbstractWizardView.php b/typo3/sysext/form/Classes/View/Wizard/AbstractWizardView.php
index 5414788316876d64965afbad4577dffdfe07393d..23000d095dfc0693656fcfe09eaa34212c4efbd4 100644
--- a/typo3/sysext/form/Classes/View/Wizard/AbstractWizardView.php
+++ b/typo3/sysext/form/Classes/View/Wizard/AbstractWizardView.php
@@ -24,7 +24,7 @@ abstract class AbstractWizardView {
 	/**
 	 * Is the referenced record available
 	 *
-	 * @var boolean TRUE if available, FALSE if not
+	 * @var bool TRUE if available, FALSE if not
 	 */
 	protected $recordIsAvailable = FALSE;
 
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index 1c4bf918652caa73eb4b09788782d45c53d93859..eb56a2e5346720742794c3b428d3b4a0226d9dcc 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -475,7 +475,7 @@ class ContentObjectRenderer {
 	protected $stopRendering = array();
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $stdWrapRecursionLevel = 0;
 
diff --git a/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php b/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php
index 4dafe7be3fad98000ccbfe15dc91a119b6267c75..cae94e52442861203ca258357cea4010a278527a 100644
--- a/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php
+++ b/typo3/sysext/frontend/Classes/Utility/CompressionUtility.php
@@ -26,7 +26,7 @@ class CompressionUtility implements \TYPO3\CMS\Core\SingletonInterface {
 	 * replace the Content-length HTTP header after compression if it was added
 	 * by TYPO3 before compression.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $contentLength = 0;
 
diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelView.php b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
index 427e2f5c343ff1e4412e3d233fcf1c75c6584dda..9f7600a16517f6d9c2d589e2e7c6c193912d9d3a 100644
--- a/typo3/sysext/frontend/Classes/View/AdminPanelView.php
+++ b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
@@ -26,14 +26,14 @@ class AdminPanelView {
 	/**
 	 * Determines whether the update button should be shown.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $extNeedUpdate = FALSE;
 
 	/**
 	 * Force preview
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $ext_forcePreview = FALSE;
 
diff --git a/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php b/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php
index a2e998f96fec5e4d4cd4a808c2d87a953bfdaaee..4015b1115553ca6a53ff20b85d46e24b564ab6cb 100644
--- a/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php
@@ -25,12 +25,12 @@ abstract class AbstractCustomPreset extends AbstractPreset {
 	protected $name = 'Custom';
 
 	/**
-	 * @var boolean TRUE if custom preset is active
+	 * @var bool TRUE if custom preset is active
 	 */
 	protected $isActive = FALSE;
 
 	/**
-	 * @var integer Priority of custom prefix is usually the lowest
+	 * @var int Priority of custom prefix is usually the lowest
 	 */
 	protected $priority = 10;
 
diff --git a/typo3/sysext/install/Classes/Configuration/AbstractPreset.php b/typo3/sysext/install/Classes/Configuration/AbstractPreset.php
index 37b7d68a5ba52fbb1724ea33202528fb88fa2fd4..1b3ff9406d73b80f835cafd3fdef67667fdd6a53 100644
--- a/typo3/sysext/install/Classes/Configuration/AbstractPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/AbstractPreset.php
@@ -31,7 +31,7 @@ abstract class AbstractPreset implements PresetInterface {
 	protected $name = '';
 
 	/**
-	 * @var integer Default priority of preset
+	 * @var int Default priority of preset
 	 */
 	protected $priority = 50;
 
diff --git a/typo3/sysext/install/Classes/Configuration/Charset/CoreInternalPreset.php b/typo3/sysext/install/Classes/Configuration/Charset/CoreInternalPreset.php
index 79f81643fcbfa8df02926aeeb612ebbb37a3e035..d40e16db7533958146f1a86d47ebc7bd3dec0084 100644
--- a/typo3/sysext/install/Classes/Configuration/Charset/CoreInternalPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Charset/CoreInternalPreset.php
@@ -27,7 +27,7 @@ class CoreInternalPreset extends Configuration\AbstractPreset {
 	protected $name = 'CoreInternal';
 
 	/**
-	 * @var integer Priority of preset
+	 * @var int Priority of preset
 	 */
 	protected $priority = 20;
 
diff --git a/typo3/sysext/install/Classes/Configuration/Charset/IconvPreset.php b/typo3/sysext/install/Classes/Configuration/Charset/IconvPreset.php
index 6ab2e99c3822fc95f2272aa0d5c9e113c10c3d79..176235c4b958514a69666b38d90d549e3f4d5a6d 100644
--- a/typo3/sysext/install/Classes/Configuration/Charset/IconvPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Charset/IconvPreset.php
@@ -27,7 +27,7 @@ class IconvPreset extends Configuration\AbstractPreset {
 	protected $name = 'Iconv';
 
 	/**
-	 * @var integer Priority of preset
+	 * @var int Priority of preset
 	 */
 	protected $priority = 80;
 
diff --git a/typo3/sysext/install/Classes/Configuration/Charset/MbstringPreset.php b/typo3/sysext/install/Classes/Configuration/Charset/MbstringPreset.php
index b5c15a4ba508de5391680fb5a8ef0c19329162e2..fba2e270612e2bddf723bc575075604ae3002bcb 100644
--- a/typo3/sysext/install/Classes/Configuration/Charset/MbstringPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Charset/MbstringPreset.php
@@ -27,7 +27,7 @@ class MbstringPreset extends Configuration\AbstractPreset {
 	protected $name = 'Mbstring';
 
 	/**
-	 * @var integer Priority of preset
+	 * @var int Priority of preset
 	 */
 	protected $priority = 90;
 
diff --git a/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php b/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
index 95ef8ab4f7874f135e63deaa53af0b3fc925eda1..c44d2692df0386b6f3a080de675c59ff3a1b515a 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
@@ -27,7 +27,7 @@ class DevelopmentPreset extends Configuration\AbstractPreset {
 	protected $name = 'Development';
 
 	/**
-	 * @var integer Priority of preset
+	 * @var int Priority of preset
 	 */
 	protected $priority = 50;
 
diff --git a/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php b/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
index f1dd3d40bff5b62ba3d1551c2aed6b96b2acf914..80f3141a09ea54bd9192a2d5000476ae90bd6de4 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
@@ -27,7 +27,7 @@ class ProductionPreset extends Configuration\AbstractPreset {
 	protected $name = 'Production';
 
 	/**
-	 * @var integer Priority of preset
+	 * @var int Priority of preset
 	 */
 	protected $priority = 50;
 
diff --git a/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ApcPreset.php b/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ApcPreset.php
index 12c2fb8878ea2a0f7c6a78740e72c3b18da4a899..079f6c5de79769f6f952c27eabd3db8ef3efc7cd 100644
--- a/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ApcPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ApcPreset.php
@@ -27,7 +27,7 @@ class ApcPreset extends Configuration\AbstractPreset {
 	protected $name = 'Apc';
 
 	/**
-	 * @var integer Priority of preset
+	 * @var int Priority of preset
 	 */
 	protected $priority = 80;
 
diff --git a/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/DatabasePreset.php b/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/DatabasePreset.php
index b77a7a9b1f889752e774b5e42a9870379b755b24..886aadbf66a6c1d5246e5107b765d0d9bc913146 100644
--- a/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/DatabasePreset.php
+++ b/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/DatabasePreset.php
@@ -27,7 +27,7 @@ class DatabasePreset extends Configuration\AbstractPreset {
 	protected $name = 'Database';
 
 	/**
-	 * @var integer Priority of preset
+	 * @var int Priority of preset
 	 */
 	protected $priority = 50;
 
diff --git a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
index 73b7bda047266ed27ad3ea016853d4fc549cc7ac..4673e69baa4fde2e49129206828e5688189a1f95 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
@@ -27,7 +27,7 @@ class GraphicsMagickPreset extends AbstractImagePreset implements Configuration\
 	protected $name = 'GraphicsMagick';
 
 	/**
-	 * @var integer Priority of preset
+	 * @var int Priority of preset
 	 */
 	protected $priority = 80;
 
diff --git a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
index 08394efcfb8b69121fc73a72fc87b330c6fd070b..7638c2354bdca0e274279a83cfd5d3119087ed1e 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
@@ -27,7 +27,7 @@ class ImageMagick6Preset extends AbstractImagePreset implements Configuration\Pr
 	protected $name = 'ImageMagick6';
 
 	/**
-	 * @var integer Priority of preset
+	 * @var int Priority of preset
 	 */
 	protected $priority = 70;
 
diff --git a/typo3/sysext/install/Classes/Controller/Action/Ajax/ExtensionCompatibilityTester.php b/typo3/sysext/install/Classes/Controller/Action/Ajax/ExtensionCompatibilityTester.php
index e3c6cbb7145f77c03a27a2ea9e8525ce4dc71993..45ac16cd7166513892019e798512767bcbaa0ee4 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Ajax/ExtensionCompatibilityTester.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Ajax/ExtensionCompatibilityTester.php
@@ -43,7 +43,7 @@ class ExtensionCompatibilityTester extends AbstractAjaxAction {
 	/**
 	 * Define whether to log errors to file or not.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $logError = FALSE;
 
diff --git a/typo3/sysext/install/Classes/Service/SessionService.php b/typo3/sysext/install/Classes/Service/SessionService.php
index 35411777ae32e86a1f464ec67ee4472c17c212b6..54bdb6e87caa94b14de1dd2aa51e0ed8b3ecdfa6 100644
--- a/typo3/sysext/install/Classes/Service/SessionService.php
+++ b/typo3/sysext/install/Classes/Service/SessionService.php
@@ -49,14 +49,14 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * time (minutes) to expire an unused session
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	private $expireTimeInMinutes = 60;
 
 	/**
 	 * time (minutes) to generate a new session id for our current session
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	private $regenerateSessionIdTime = 5;
 
diff --git a/typo3/sysext/install/Classes/Updates/AbstractUpdate.php b/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
index 060203bfbaec8fe642e6f28a6ca81d79b70de6b0..d8d9b2bf2ec9d554d8b0c8001e4c8623a39220c9 100644
--- a/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
@@ -57,7 +57,7 @@ abstract class AbstractUpdate {
 	 * Current TYPO3 version number, set from outside
 	 * Version number coming from \TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger()
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $versionNumber;
 
diff --git a/typo3/sysext/install/Classes/ViewHelpers/PhpInfoViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/PhpInfoViewHelper.php
index 2448716ca15b7a2f10bcc06accfb3af91bdbaecd..ed6e8f4b3198216ea4f8ff30eab0cd938bdc9a84 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/PhpInfoViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/PhpInfoViewHelper.php
@@ -25,7 +25,7 @@ class PhpInfoViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHel
 	 * Disable the escaping interceptor because otherwise the child nodes would be escaped before this view helper
 	 * can decode the text's entities.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $escapingInterceptorEnabled = FALSE;
 
diff --git a/typo3/sysext/lang/Classes/Domain/Model/Extension.php b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
index 509909f637ce97f75b845d0cbaa15517a1cdde8d..b4f779c100cfd6948b890776eafaf2c53ebb5be6 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
@@ -37,7 +37,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $icon = '';
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $version = '';
 
diff --git a/typo3/sysext/lang/Classes/Domain/Model/Language.php b/typo3/sysext/lang/Classes/Domain/Model/Language.php
index 9838b0ec29260647d6657d71206e3105a27da72f..b98610a7b076d8229964d7a56d6dd2c297510170 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/Language.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/Language.php
@@ -31,7 +31,7 @@ class Language extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $language = '';
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $selected = FALSE;
 
diff --git a/typo3/sysext/lang/Classes/LanguageService.php b/typo3/sysext/lang/Classes/LanguageService.php
index 75d62cd7f62e26869c7ad33b94045989119355e3..6f879397efcca706efbbbbb6decc1882cc9ef777 100644
--- a/typo3/sysext/lang/Classes/LanguageService.php
+++ b/typo3/sysext/lang/Classes/LanguageService.php
@@ -60,7 +60,7 @@ class LanguageService {
 	/**
 	 * If TRUE, will show the key/location of labels in the backend.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $debugKey = FALSE;
 
diff --git a/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php b/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php
index 90dfe02ba0f9081304b6a7555d626dbc97f9be7b..f692d2b005b3456080c86fdbbdc964cff91be548 100644
--- a/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php
+++ b/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php
@@ -52,14 +52,14 @@ class InternalLinktype extends \TYPO3\CMS\Linkvalidator\Linktype\AbstractLinktyp
 	/**
 	 * Result of the check, if the current page uid is valid or not
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $responsePage = TRUE;
 
 	/**
 	 * Result of the check, if the current content uid is valid or not
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $responseContent = TRUE;
 
diff --git a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
index 3d55dcf0dd8e29b56c661b7f77cc161c95ba1822..9d5e48b9f843cd400205263b913b27d97d00aa9c 100644
--- a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
+++ b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
@@ -45,14 +45,14 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
 	/**
 	 * Information, if the module is accessible for the current user or not
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isAccessibleForCurrentUser = FALSE;
 
 	/**
 	 * Depth for the recursive traversal of pages for the link validation
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $searchLevel;
 
diff --git a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
index aaff6d63c8ab0c3867db461b10567e28358f72c4..25519283fd5d2003b44e2dd5384acf2d5e9fc936 100644
--- a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
+++ b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
@@ -25,31 +25,31 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $sleepTime;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $sleepAfterFinish;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $countInARun;
 
 	/**
 	 * Total number of broken links
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $totalBrokenLink = 0;
 
 	/**
 	 * Total number of broken links from the last run
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $oldTotalBrokenLink = 0;
 
@@ -70,7 +70,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Shows if number of result was different from the result of the last check
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $isDifferentToLastRun;
 
@@ -84,14 +84,14 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Level of pages the task should check
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $depth;
 
 	/**
 	 * UID of the start page for this task
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $page;
 
@@ -105,7 +105,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Only send an email, if new broken links were found
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $emailOnBrokenLinkOnly;
 
@@ -392,7 +392,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 		$markerArray = array();
 		/** @var array $validEmailList */
 		$validEmailList = array();
-		/** @var boolean $sendEmail */
+		/** @var bool $sendEmail */
 		$sendEmail = TRUE;
 		$markerArray['totalBrokenLink'] = $this->totalBrokenLink;
 		$markerArray['totalBrokenLink_old'] = $this->oldTotalBrokenLink;
diff --git a/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php b/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
index c6af98706cb55c322c5017b1631e38e82d55777b..c598deac47bca950f1b22b329e784d90acab2633 100644
--- a/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
+++ b/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
@@ -35,7 +35,7 @@ class PermissionModuleController {
 	/**
 	 * Number of levels to enable recursive settings for
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $getLevels = 10;
 
@@ -113,14 +113,14 @@ class PermissionModuleController {
 	/**
 	 * Set internally if the current user either OWNS the page OR is admin user!
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $editingAllowed;
 
 	/**
 	 * Internal, static: GPvars: Page id.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $id;
 
@@ -128,21 +128,21 @@ class PermissionModuleController {
 	 * If set, editing of the page permissions will occur (showing the editing screen). Notice:
 	 * This value is evaluated against permissions and so it will change internally!
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $edit;
 
 	/**
 	 * ID to return to after editing.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $return_id;
 
 	/**
 	 * Id of the page which was just edited.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $lastEdited;
 
diff --git a/typo3/sysext/recordlist/Classes/RecordList.php b/typo3/sysext/recordlist/Classes/RecordList.php
index c9775df8b0d7a65b43bcb6025655f12f408fe0e7..128ed6eacae2e274e701f9f030f1e5b8dd1afd12 100644
--- a/typo3/sysext/recordlist/Classes/RecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList.php
@@ -27,7 +27,7 @@ class RecordList {
 	// Internal, GPvars:
 	// Page Id for which to make the listing
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	public $id;
 
diff --git a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
index 2c5019624d467f47d60e4163e13edab236b21e1f..887445671dccf2722bfcd1ac1273bde3e5c16dc7 100644
--- a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
@@ -26,14 +26,14 @@ class ConfigurationStatus implements \TYPO3\CMS\Reports\StatusProviderInterface
 	/**
 	 * 10MB
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $deprecationLogFileSizeWarningThreshold = 10485760;
 
 	/**
 	 * 100MB
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $deprecationLogFileSizeErrorThreshold = 104857600;
 
diff --git a/typo3/sysext/reports/Classes/Status.php b/typo3/sysext/reports/Classes/Status.php
index 09f5567ea94b6f9ed0c2160cd4e044966384a0f1..1fb3ef913e6a2eaa59aea06ab9b826309eb04bc1 100644
--- a/typo3/sysext/reports/Classes/Status.php
+++ b/typo3/sysext/reports/Classes/Status.php
@@ -41,7 +41,7 @@ class Status {
 	protected $message;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $severity;
 
diff --git a/typo3/sysext/rsaauth/Classes/Backend/BackendFactory.php b/typo3/sysext/rsaauth/Classes/Backend/BackendFactory.php
index 768f44de231cd38e3e4d5e22fb7a7b00f41c404b..27f625216cb7e8121c59803513cd351b726f73e0 100644
--- a/typo3/sysext/rsaauth/Classes/Backend/BackendFactory.php
+++ b/typo3/sysext/rsaauth/Classes/Backend/BackendFactory.php
@@ -36,7 +36,7 @@ class BackendFactory {
 	 * A flag that tells if the factory is initialized. This is to prevent
 	 * continuous creation of backends in case if none of them is available.
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	static protected $initialized = FALSE;
 
diff --git a/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php b/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php
index 74d58e2d1a6b7c367afe13a0ad8109a42cffe25e..4bd71cd364ecf2f8b90f2b8047ffab20996a305f 100644
--- a/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php
+++ b/typo3/sysext/rsaauth/Classes/Backend/CommandLineBackend.php
@@ -25,7 +25,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class CommandLineBackend extends \TYPO3\CMS\Rsaauth\Backend\AbstractBackend {
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	const DEFAULT_EXPONENT = 65537;
 
diff --git a/typo3/sysext/rsaauth/Classes/Keypair.php b/typo3/sysext/rsaauth/Classes/Keypair.php
index f085acef7e43f6bc3fe4ef2343cf0759e52c06d9..efd783a634a0b37ca26d35ed0772e08d8242bcec 100644
--- a/typo3/sysext/rsaauth/Classes/Keypair.php
+++ b/typo3/sysext/rsaauth/Classes/Keypair.php
@@ -24,7 +24,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * RSA public exponent (3 or 0x10001)
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $exponent = 0;
 
@@ -38,7 +38,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * The public key modulus
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $publicKeyModulus = 0;
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
index 2d8e7abbcfffbb190fe58a7eaca21a939f45a0b4..6f5fb15c62a2b9c7d70558eb69361fe68b0615d4 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
@@ -43,7 +43,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
 	 * Keeps log2 number
 	 * of iterations for password stretching.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	static protected $hashCount;
 
@@ -51,7 +51,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
 	 * Keeps maximum allowed log2 number
 	 * of iterations for password stretching.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	static protected $maxHashCount;
 
@@ -59,14 +59,14 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
 	 * Keeps minimum allowed log2 number
 	 * of iterations for password stretching.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	static protected $minHashCount;
 
 	/**
 	 * Keeps length of a Blowfish salt in bytes.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	static protected $saltLengthBlowfish = 16;
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php b/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php
index 1b5d93956c4bd8f414d11300bec5cf3a175a3fe8..bccaf9e9fba68c0c25bb23681130f00cf16b87cb 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php
@@ -33,7 +33,7 @@ class Md5Salt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements \T
 	/**
 	 * Keeps length of a MD5 salt in bytes.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	static protected $saltLengthMD5 = 6;
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
index ca6e8676bd584672f386cbed90154800d90fe289..c1d79b588f3283abf44b96fafad8c50a499abc4a 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
@@ -52,7 +52,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
 	 * Keeps log2 number
 	 * of iterations for password stretching.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	static protected $hashCount;
 
@@ -60,7 +60,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
 	 * Keeps maximum allowed log2 number
 	 * of iterations for password stretching.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	static protected $maxHashCount;
 
@@ -68,14 +68,14 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
 	 * Keeps minimum allowed log2 number
 	 * of iterations for password stretching.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	static protected $minHashCount;
 
 	/**
 	 * Keeps length of a PHPass salt in bytes.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	static protected $saltLengthPhpass = 6;
 
diff --git a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
index 37a91147f0891160a97902a464f757a429c1ae13..d7d203a12c7770ddec562a607b4b48915056c765 100644
--- a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
+++ b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
@@ -67,7 +67,7 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
 	 * Prevents authentication bypass. See vulnerability report:
 	 * { @link http://forge.typo3.org/issues/22030 }
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $authenticationFailed = FALSE;
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
index 59c63d966fa161da950e27ed071567771d75b537..4bf7c5c024b77548548926bc286b4392c19fa6ca 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
@@ -23,14 +23,14 @@ class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldPro
 	/**
 	 * Default value whether the task deactivates itself after last run.
 	 *
-	 * @var boolean Whether the task is allowed to deactivate itself after processing all existing user records.
+	 * @var bool Whether the task is allowed to deactivate itself after processing all existing user records.
 	 */
 	protected $defaultCanDeactivateSelf = TRUE;
 
 	/**
 	 * Default value for the number of records to handle at each run.
 	 *
-	 * @var integer Number of records
+	 * @var int Number of records
 	 */
 	protected $defaultNumberOfRecords = 250;
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
index a6040453c23f4933f124d204f18f28efa54ccdc7..22dfdbc83986f921f1bd7e779ef8c0cfb0902319 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
@@ -22,7 +22,7 @@ namespace TYPO3\CMS\Saltedpasswords\Task;
 class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
 	/**
-	 * @var boolean Whether or not the task is allowed to deactivate itself after processing all existing user records.
+	 * @var bool Whether or not the task is allowed to deactivate itself after processing all existing user records.
 	 */
 	protected $canDeactivateSelf = TRUE;
 
@@ -32,12 +32,12 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	 * Therefore only a small number of frontend and backend users are processed.
 	 * If saltedpasswords is enabled for both frontend and backend 2 * numberOfRecords will be handled.
 	 *
-	 * @var integer Number of records
+	 * @var int Number of records
 	 */
 	protected $numberOfRecords = 250;
 
 	/**
-	 * @var integer Pointer to last handled frontend and backend user row
+	 * @var int Pointer to last handled frontend and backend user row
 	 */
 	protected $userRecordPointer = array();
 
diff --git a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
index 5f2f6a2248cdedfe0c0ca7ac49cff71b69236c65..807c454e4b9f975a3047cc6f99923f1c441690a6 100644
--- a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
+++ b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
@@ -24,7 +24,7 @@ use TYPO3\CMS\Core\Messaging\FlashMessage;
 class ExtensionManagerConfigurationUtility {
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $errorType = FlashMessage::OK;
 
diff --git a/typo3/sysext/scheduler/Classes/Example/SleepTask.php b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
index 225b575bf8bcc2d32a351379f8313330ed49c833..be4f9748c5f04360c5558e8b733c2c4bfab0fa78 100644
--- a/typo3/sysext/scheduler/Classes/Example/SleepTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
@@ -25,7 +25,7 @@ class SleepTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Number of seconds the task should be sleeping for
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $sleepTime = 10;
 
diff --git a/typo3/sysext/scheduler/Classes/Execution.php b/typo3/sysext/scheduler/Classes/Execution.php
index 7338ca5b011b4d0c890315f8e2b7e214c865be94..eefac0fa8b7d0b2d2de32e2d15efaa6e3f201e0e 100644
--- a/typo3/sysext/scheduler/Classes/Execution.php
+++ b/typo3/sysext/scheduler/Classes/Execution.php
@@ -26,28 +26,28 @@ class Execution {
 	/**
 	 * Start date of a task (timestamp)
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $start;
 
 	/**
 	 * End date of a task (timestamp)
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $end;
 
 	/**
 	 * Interval between executions (in seconds)
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $interval;
 
 	/**
 	 * Flag for concurrent executions: TRUE if allowed, FALSE otherwise (default)
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $multiple = FALSE;
 
@@ -62,7 +62,7 @@ class Execution {
 	 * This flag is used to mark a new single execution
 	 * See explanations in method setIsNewSingleExecution()
 	 *
-	 * @var boolean
+	 * @var bool
 	 * @see \TYPO3\CMS\Scheduler\Execution::setIsNewSingleExecution()
 	 */
 	protected $isNewSingleExecution = FALSE;
diff --git a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
index 61690a8ea000c57f735f38604ee43884d65c8af9..a13de0d24a7febf17de269ea9d0c205ae1fa814c 100644
--- a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
@@ -34,14 +34,14 @@ abstract class AbstractTask {
 	/**
 	 * The unique id of the task used to identify it in the database
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $taskUid;
 
 	/**
 	 * Disable flag, TRUE if task is disabled, FALSE otherwise
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $disabled = FALSE;
 
@@ -55,7 +55,7 @@ abstract class AbstractTask {
 	/**
 	 * This variable contains the time of next execution of the task
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $executionTime = 0;
 
@@ -69,7 +69,7 @@ abstract class AbstractTask {
 	/**
 	 * Task group for this task
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $taskGroup;
 
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php
index 328b43ef2d61206bef92629ba31c9a100a99758d..5f027514345c0894f5c265bc4d35fca86f27424d 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php
@@ -22,14 +22,14 @@ class FileStorageExtractionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Storage Uid
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $storageUid = -1;
 
 	/**
 	 * FileCount
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $maxFileCount = 100;
 
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
index 8effee71de1898ed8cfed98ce725e593ecc356b6..15945860fc4dff22ea1ca5f467b56e9c72e9186b 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
@@ -22,7 +22,7 @@ class FileStorageIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 	/**
 	 * Storage Uid
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	public $storageUid = -1;
 
diff --git a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
index 7c200522a417ad3e822c1c2e183fe0baa0c71153..4b8d7041105cde65c061907cdc918233dbdaaa7c 100644
--- a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
@@ -27,7 +27,7 @@ class RecyclerGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Sch
 	/**
 	 * Default period in days to remove a recycled file
 	 *
-	 * @var integer Default number of days
+	 * @var int Default number of days
 	 */
 	protected $defaultNumberOfDays = 30;
 
diff --git a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
index 06b063cfbf1cbd082da026581e5740969afade25..b4ee4199fed1b0579be447918a8e6c7c7b401d28 100644
--- a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
@@ -28,12 +28,12 @@ namespace TYPO3\CMS\Scheduler\Task;
 class TableGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
 
 	/**
-	 * @var boolean True if all tables should be cleaned up
+	 * @var bool True if all tables should be cleaned up
 	 */
 	public $allTables = FALSE;
 
 	/**
-	 * @var integer Number of days
+	 * @var int Number of days
 	 */
 	public $numberOfDays = 180;
 
diff --git a/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php b/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
index 562a750c2473029645aca86645763c14d5144f30..fd30c29051d716a00d3eb89808266d5604115716 100644
--- a/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
+++ b/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
@@ -47,12 +47,12 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	protected $message;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $personal;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $category;
 
diff --git a/typo3/sysext/t3editor/Classes/T3editor.php b/typo3/sysext/t3editor/Classes/T3editor.php
index b2ea0a77328b8a90a0771693fe51a0d94ad2b5fa..e9ec03b244951543cace4163b6e35efe6e6a9e95 100644
--- a/typo3/sysext/t3editor/Classes/T3editor.php
+++ b/typo3/sysext/t3editor/Classes/T3editor.php
@@ -42,14 +42,14 @@ class T3editor implements \TYPO3\CMS\Core\SingletonInterface {
 	/**
 	 * Counts the editors on the current page
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $editorCounter = 0;
 
 	/**
 	 * Flag to enable the t3editor
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $_isEnabled = TRUE;
 
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
index 36c086a167068aad57efed3b493888dae662fcdc..2c7be8fc02880028d159d4845127783ed435478d 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
@@ -34,7 +34,7 @@ class TypoScriptTemplateInformationModuleFunctionController extends AbstractFunc
 	/**
 	 * Indicator for t3editor, whether data is stored
 	 *
-	 * @var boolean
+	 * @var bool
 	 */
 	public $tce_processed = FALSE;
 
diff --git a/typo3/sysext/version/Classes/DataHandler/CommandMap.php b/typo3/sysext/version/Classes/DataHandler/CommandMap.php
index 24e8a4842dae8951b432affdd25f3a95c405bbd1..c04f90da1c33097fc576436126027ccf9dde9cd0 100644
--- a/typo3/sysext/version/Classes/DataHandler/CommandMap.php
+++ b/typo3/sysext/version/Classes/DataHandler/CommandMap.php
@@ -69,7 +69,7 @@ class CommandMap {
 	protected $workspacesChangeStageMode;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $workspacesConsiderReferences;
 
diff --git a/typo3/sysext/version/Classes/Dependency/DependencyResolver.php b/typo3/sysext/version/Classes/Dependency/DependencyResolver.php
index 2df960c1849a22c346d2fa6c56acd7b6524a8fa1..5c4f4bde7839d9657f6389302f608409b5fa7125 100644
--- a/typo3/sysext/version/Classes/Dependency/DependencyResolver.php
+++ b/typo3/sysext/version/Classes/Dependency/DependencyResolver.php
@@ -40,7 +40,7 @@ class DependencyResolver {
 	protected $eventCallbacks = array();
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $outerMostParentsRequireReferences = FALSE;
 
diff --git a/typo3/sysext/version/Classes/Dependency/ElementEntity.php b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
index a64b0e7ce01c743d0535042da2e035059dee2c05..2e6f6a949557fbc2fd311f9257bb8fb515ac5581 100644
--- a/typo3/sysext/version/Classes/Dependency/ElementEntity.php
+++ b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
@@ -37,7 +37,7 @@ class ElementEntity {
 	protected $table;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $id;
 
@@ -67,7 +67,7 @@ class ElementEntity {
 	protected $parents;
 
 	/**
-	 * @var boolean
+	 * @var bool
 	 */
 	protected $traversingParents = FALSE;
 
diff --git a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
index e8e445a97bc96fa7410055bd9e75b5b904001b70..058d18da074f4d54753e3369c675e75f2f5a579b 100644
--- a/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/AbstractController.php
@@ -32,7 +32,7 @@ class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControl
 	protected $pageRenderer;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $pageId;
 
diff --git a/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php b/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
index b32c5d7b52f083c310d4e788f6896dac3127a7ff..5c7b3834718b5554bef2b74c373900cfd8cccf2a 100644
--- a/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
+++ b/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
@@ -26,7 +26,7 @@ class DatabaseRecord {
 	protected $table;
 
 	/**
-	 * @var integer
+	 * @var int
 	 */
 	protected $uid;
 
diff --git a/typo3/sysext/workspaces/Classes/Service/GridDataService.php b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
index 9ab9053a43f9c2ffad1187916d746b7b995f7abc..4dfb32a8db5a991f9e44b85b366095cca4605f6a 100644
--- a/typo3/sysext/workspaces/Classes/Service/GridDataService.php
+++ b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
@@ -38,7 +38,7 @@ class GridDataService {
 	/**
 	 * Id of the current active workspace.
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	protected $currentWorkspace = NULL;
 
diff --git a/typo3/sysext/workspaces/Classes/Service/IntegrityService.php b/typo3/sysext/workspaces/Classes/Service/IntegrityService.php
index 27f20fb0d73e022b0fef8c6e9ca5b5c688043498..b4ca1176230302ac2a4e4c099d6ef2ea0dd447c2 100644
--- a/typo3/sysext/workspaces/Classes/Service/IntegrityService.php
+++ b/typo3/sysext/workspaces/Classes/Service/IntegrityService.php
@@ -27,25 +27,25 @@ class IntegrityService {
 	/**
 	 * Succes status - everything is fine
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const STATUS_Succes = 100;
 	/**
 	 * Info status - nothing is wrong, but a notice is shown
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const STATUS_Info = 101;
 	/**
 	 * Warning status - user interaction might be required
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const STATUS_Warning = 102;
 	/**
 	 * Error status - user interaction is required
 	 *
-	 * @var integer
+	 * @var int
 	 */
 	const STATUS_Error = 103;
 	/**