From 4d96664f363b761fbc9d8cda4cf574cc4f9d95e6 Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Thu, 30 Oct 2014 18:59:48 +0100
Subject: [PATCH] [TASK] Use "int" or "bool" in @var notation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use "int" or "bool" in @var notation instead of
"interger" or "boolean".

Resolves: #62571
Releases: master
Change-Id: Icc17d2a7806a4632da2c4684c57f1f6d619878a3
Reviewed-on: http://review.typo3.org/33632
Reviewed-by: Frank Nägler <typo3@naegler.net>
Tested-by: Frank Nägler <typo3@naegler.net>
Reviewed-by: Markus Klein <klein.t3@reelworx.at>
Tested-by: Markus Klein <klein.t3@reelworx.at>
---
 .../ElementInformationController.php          |  2 +-
 .../Form/Element/SuggestDefaultReceiver.php   |  2 +-
 .../Classes/Form/FormDataTraverser.php        |  4 +-
 .../backend/Classes/Form/FormEngine.php       |  4 +-
 .../FrontendBackendUserAuthentication.php     |  6 +--
 .../Classes/Search/LiveSearch/LiveSearch.php  | 10 ++--
 .../Classes/Sprite/SpriteGenerator.php        | 16 +++----
 .../Classes/Template/DocumentTemplate.php     |  4 +-
 .../backend/Classes/Tree/ExtDirectNode.php    | 16 +++----
 .../Classes/Tree/Pagetree/Commands.php        |  8 ++--
 .../Classes/Tree/Pagetree/DataProvider.php    |  4 +-
 .../Classes/Tree/Pagetree/PagetreeNode.php    |  6 +--
 .../Tree/Renderer/ExtJsJsonTreeRenderer.php   |  2 +-
 .../Renderer/UnorderedListTreeRenderer.php    |  2 +-
 .../Classes/Tree/View/FolderTreeView.php      |  2 +-
 .../BackendLayout/DataProviderContext.php     |  2 +-
 .../backend/Classes/View/PageLayoutView.php   |  2 +-
 .../Classes/Controller/AbstractController.php | 18 ++++----
 .../belog/Classes/Domain/Model/Constraint.php | 20 ++++----
 .../belog/Classes/Domain/Model/LogEntry.php   | 22 ++++-----
 .../belog/Classes/Domain/Model/Workspace.php  |  4 +-
 .../beuser/Classes/Domain/Model/Demand.php    | 20 ++++----
 .../Classes/Cache/Backend/AbstractBackend.php |  2 +-
 .../Classes/Cache/Backend/FileBackend.php     |  2 +-
 .../Classes/Cache/Backend/RedisBackend.php    | 12 ++---
 .../Cache/Backend/SimpleFileBackend.php       |  4 +-
 .../Cache/Backend/Typo3DatabaseBackend.php    |  8 ++--
 typo3/sysext/core/Classes/Cache/Cache.php     |  2 +-
 .../Cache/Frontend/VariableFrontend.php       |  2 +-
 .../Collection/AbstractRecordCollection.php   |  2 +-
 .../core/Classes/DataHandling/DataHandler.php | 46 +++++++++----------
 .../Classes/Database/DatabaseConnection.php   |  8 ++--
 .../Classes/Database/PreparedStatement.php    | 16 +++----
 .../core/Classes/Database/RelationHandler.php | 12 ++---
 .../Classes/Imaging/GraphicalFunctions.php    |  2 +-
 .../Integrity/DatabaseIntegrityCheck.php      |  6 +--
 .../Localization/LocalizationFactory.php      |  2 +-
 typo3/sysext/core/Classes/Locking/Locker.php  |  8 ++--
 typo3/sysext/core/Classes/Log/LogLevel.php    | 16 +++----
 typo3/sysext/core/Classes/Log/LogRecord.php   |  2 +-
 typo3/sysext/core/Classes/Log/Logger.php      |  2 +-
 .../Log/Processor/AbstractMemoryProcessor.php |  4 +-
 .../Log/Processor/IntrospectionProcessor.php  |  2 +-
 .../core/Classes/Log/Writer/SyslogWriter.php  |  2 +-
 .../sysext/core/Classes/Mail/MailMessage.php  |  2 +-
 .../Classes/Mail/Rfc822AddressesParser.php    |  6 +--
 .../Classes/Messaging/AbstractMessage.php     |  2 +-
 .../core/Classes/Messaging/FlashMessage.php   |  2 +-
 .../Package/FailsafePackageManager.php        |  2 +-
 .../sysext/core/Classes/Page/PageRenderer.php | 44 +++++++++---------
 .../core/Classes/Resource/AbstractFile.php    |  2 +-
 .../Resource/Driver/AbstractDriver.php        |  4 +-
 typo3/sysext/core/Classes/Resource/File.php   |  2 +-
 .../Resource/Filter/FileNameFilter.php        |  2 +-
 .../core/Classes/Resource/Index/Indexer.php   |  2 +-
 .../core/Classes/Resource/ProcessedFile.php   |  2 +-
 .../Resource/Processing/AbstractTask.php      |  4 +-
 .../core/Classes/Resource/ResourceStorage.php |  6 +--
 ...ractTableConfigurationTreeDataProvider.php |  4 +-
 .../DatabaseTreeDataProvider.php              |  4 +-
 .../TableConfiguration/DatabaseTreeNode.php   |  8 ++--
 .../Classes/TypoScript/TemplateService.php    |  8 ++--
 .../core/Classes/Utility/CommandUtility.php   |  2 +-
 .../Utility/ExtensionManagementUtility.php    |  2 +-
 .../core/Classes/Utility/RootlineUtility.php  |  8 ++--
 typo3/sysext/core/Tests/BaseTestCase.php      |  4 +-
 .../Collection/CategoryCollectionTest.php     |  2 +-
 .../DataHandling/IRRE/AbstractTestCase.php    |  2 +-
 .../core/Tests/Unit/Core/ClassLoaderTest.php  |  2 +-
 .../BackendConfigurationManager.php           |  2 +-
 .../Classes/Domain/Model/BackendUser.php      |  6 +--
 .../Classes/Domain/Model/BackendUserGroup.php |  6 +--
 .../Classes/Domain/Model/FileMount.php        |  2 +-
 .../DomainObject/AbstractDomainObject.php     |  2 +-
 typo3/sysext/extbase/Classes/Error/Result.php |  6 +--
 .../Mvc/Cli/CommandArgumentDefinition.php     |  2 +-
 .../extbase/Classes/Mvc/Cli/Request.php       |  2 +-
 .../extbase/Classes/Mvc/Cli/Response.php      |  2 +-
 .../Classes/Mvc/Controller/Argument.php       |  2 +-
 typo3/sysext/extbase/Classes/Mvc/Request.php  |  2 +-
 .../extbase/Classes/Mvc/Web/Request.php       |  2 +-
 .../extbase/Classes/Mvc/Web/Response.php      |  2 +-
 .../Classes/Mvc/Web/Routing/UriBuilder.php    | 14 +++---
 .../Classes/Object/Container/ClassInfo.php    |  4 +-
 .../Persistence/Generic/Qom/Comparison.php    |  2 +-
 .../Classes/Persistence/Generic/Qom/Join.php  |  2 +-
 .../Classes/Persistence/ObjectStorage.php     |  4 +-
 .../Property/PropertyMappingConfiguration.php |  4 +-
 .../AbstractFileCollectionConverter.php       |  2 +-
 .../AbstractFileFolderConverter.php           |  2 +-
 .../TypeConverter/AbstractTypeConverter.php   |  2 +-
 .../Property/TypeConverter/ArrayConverter.php |  2 +-
 .../TypeConverter/BooleanConverter.php        |  2 +-
 .../TypeConverter/CoreTypeConverter.php       |  2 +-
 .../TypeConverter/DateTimeConverter.php       |  2 +-
 .../Property/TypeConverter/FloatConverter.php |  2 +-
 .../TypeConverter/IntegerConverter.php        |  2 +-
 .../TypeConverter/ObjectConverter.php         |  6 +--
 .../TypeConverter/ObjectStorageConverter.php  |  2 +-
 .../PersistentObjectConverter.php             |  6 +--
 .../TypeConverter/StringConverter.php         |  2 +-
 .../Classes/Reflection/ClassSchema.php        |  4 +-
 .../Classes/Reflection/ReflectionService.php  |  6 +--
 .../extbase/Classes/SignalSlot/Dispatcher.php |  2 +-
 .../Classes/Utility/DebuggerUtility.php       |  2 +-
 .../Validator/AbstractValidator.php           |  2 +-
 .../Validator/NotEmptyValidator.php           |  2 +-
 ...tainerConstructorInjectionTestFixtures.php |  2 +-
 .../Persistence/Fixture/Model/Entity2.php     |  2 +-
 .../Persistence/Fixture/Model/Entity3.php     |  2 +-
 .../Classes/Domain/Model/Extension.php        | 14 +++---
 .../Classes/Domain/Model/Mirrors.php          |  4 +-
 .../Domain/Repository/ExtensionRepository.php |  2 +-
 .../Utility/Importer/ExtensionListUtility.php |  4 +-
 .../Classes/Utility/Repository/Helper.php     |  6 +--
 .../Controller/FrontendLoginController.php    |  8 ++--
 .../Core/Compiler/TemplateCompiler.php        |  2 +-
 .../Core/Parser/Interceptor/Escape.php        |  2 +-
 .../Classes/Core/Parser/ParsingState.php      |  2 +-
 .../Core/ViewHelper/AbstractViewHelper.php    |  4 +-
 .../Core/ViewHelper/ArgumentDefinition.php    |  4 +-
 .../Classes/Core/ViewHelper/TagBuilder.php    |  2 +-
 .../Core/Widget/AbstractWidgetViewHelper.php  |  2 +-
 typo3/sysext/fluid/Classes/Fluid.php          |  2 +-
 .../Widget/Controller/PaginateController.php  | 10 ++--
 .../Classes/ViewHelpers/CObjectViewHelper.php |  2 +-
 .../Classes/ViewHelpers/CommentViewHelper.php |  2 +-
 .../Classes/ViewHelpers/CountViewHelper.php   |  2 +-
 .../Classes/ViewHelpers/CycleViewHelper.php   |  2 +-
 .../ViewHelpers/Format/CdataViewHelper.php    |  2 +-
 .../ViewHelpers/Format/DateViewHelper.php     |  2 +-
 .../ViewHelpers/Format/HtmlViewHelper.php     |  2 +-
 .../Format/HtmlentitiesDecodeViewHelper.php   |  2 +-
 .../Format/HtmlentitiesViewHelper.php         |  2 +-
 .../Format/HtmlspecialcharsViewHelper.php     |  2 +-
 .../ViewHelpers/Format/RawViewHelper.php      |  2 +-
 .../Format/StripTagsViewHelper.php            |  2 +-
 .../Format/UrlencodeViewHelper.php            |  2 +-
 .../Classes/ViewHelpers/SwitchViewHelper.php  |  2 +-
 .../Widget/Controller/PaginateController.php  |  6 +--
 .../Domain/Factory/JsonToTypoScript.php       |  4 +-
 .../Domain/Factory/TypoScriptFactory.php      |  2 +-
 .../Model/Attribute/AbstractAttribute.php     |  2 +-
 .../Model/Attribute/AttributesAttribute.php   |  2 +-
 .../Domain/Model/Attribute/NameAttribute.php  |  2 +-
 .../form/Classes/Domain/Model/Content.php     |  4 +-
 .../Domain/Model/Element/AbstractElement.php  |  4 +-
 .../Domain/Model/Element/CheckboxElement.php  |  2 +-
 .../Domain/Model/Element/RadioElement.php     |  2 +-
 .../Domain/Model/Json/AbstractJsonElement.php |  2 +-
 typo3/sysext/form/Classes/ElementCounter.php  |  2 +-
 .../form/Classes/Filter/AlphabeticFilter.php  |  2 +-
 .../Classes/Filter/AlphanumericFilter.php     |  2 +-
 .../form/Classes/Filter/RegExpFilter.php      |  2 +-
 .../Classes/Validation/AbstractValidator.php  |  2 +-
 .../Validation/AlphabeticValidator.php        |  2 +-
 .../Validation/AlphanumericValidator.php      |  2 +-
 .../Classes/Validation/BetweenValidator.php   |  2 +-
 .../Classes/Validation/InArrayValidator.php   |  2 +-
 .../Element/AbstractElementView.php           |  2 +-
 .../Element/OptgroupElementView.php           |  2 +-
 .../View/Form/Element/AbstractElementView.php |  2 +-
 .../View/Form/Element/OptgroupElementView.php |  2 +-
 .../View/Form/Element/OptionElementView.php   |  2 +-
 .../Mail/Html/Element/AbstractElementView.php |  2 +-
 .../Mail/Html/Element/OptgroupElementView.php |  2 +-
 .../Mail/Html/Element/OptionElementView.php   |  2 +-
 .../Plain/Element/AbstractElementView.php     |  2 +-
 .../View/Wizard/AbstractWizardView.php        |  2 +-
 .../ContentObject/ContentObjectRenderer.php   |  2 +-
 .../Classes/Utility/CompressionUtility.php    |  2 +-
 .../frontend/Classes/View/AdminPanelView.php  |  4 +-
 .../Configuration/AbstractCustomPreset.php    |  4 +-
 .../Classes/Configuration/AbstractPreset.php  |  2 +-
 .../Charset/CoreInternalPreset.php            |  2 +-
 .../Configuration/Charset/IconvPreset.php     |  2 +-
 .../Configuration/Charset/MbstringPreset.php  |  2 +-
 .../Context/DevelopmentPreset.php             |  2 +-
 .../Context/ProductionPreset.php              |  2 +-
 .../ExtbaseObjectCache/ApcPreset.php          |  2 +-
 .../ExtbaseObjectCache/DatabasePreset.php     |  2 +-
 .../Image/GraphicsMagickPreset.php            |  2 +-
 .../Image/ImageMagick6Preset.php              |  2 +-
 .../Ajax/ExtensionCompatibilityTester.php     |  2 +-
 .../Classes/Service/SessionService.php        |  4 +-
 .../Classes/Updates/AbstractUpdate.php        |  2 +-
 .../Classes/ViewHelpers/PhpInfoViewHelper.php |  2 +-
 .../lang/Classes/Domain/Model/Extension.php   |  2 +-
 .../lang/Classes/Domain/Model/Language.php    |  2 +-
 typo3/sysext/lang/Classes/LanguageService.php |  2 +-
 .../Classes/Linktype/InternalLinktype.php     |  4 +-
 .../Classes/Report/LinkValidatorReport.php    |  4 +-
 .../Classes/Task/ValidatorTask.php            | 20 ++++----
 .../Controller/PermissionModuleController.php | 12 ++---
 .../sysext/recordlist/Classes/RecordList.php  |  2 +-
 .../Report/Status/ConfigurationStatus.php     |  4 +-
 typo3/sysext/reports/Classes/Status.php       |  2 +-
 .../Classes/Backend/BackendFactory.php        |  2 +-
 .../Classes/Backend/CommandLineBackend.php    |  2 +-
 typo3/sysext/rsaauth/Classes/Keypair.php      |  4 +-
 .../Classes/Salt/BlowfishSalt.php             |  8 ++--
 .../saltedpasswords/Classes/Salt/Md5Salt.php  |  2 +-
 .../Classes/Salt/PhpassSalt.php               |  8 ++--
 .../Classes/SaltedPasswordService.php         |  2 +-
 .../Classes/Task/BulkUpdateFieldProvider.php  |  4 +-
 .../Classes/Task/BulkUpdateTask.php           |  6 +--
 .../ExtensionManagerConfigurationUtility.php  |  2 +-
 .../scheduler/Classes/Example/SleepTask.php   |  2 +-
 typo3/sysext/scheduler/Classes/Execution.php  | 10 ++--
 .../scheduler/Classes/Task/AbstractTask.php   |  8 ++--
 .../Task/FileStorageExtractionTask.php        |  4 +-
 .../Classes/Task/FileStorageIndexingTask.php  |  2 +-
 ...rbageCollectionAdditionalFieldProvider.php |  2 +-
 .../Task/TableGarbageCollectionTask.php       |  4 +-
 .../sys_note/Classes/Domain/Model/SysNote.php |  4 +-
 typo3/sysext/t3editor/Classes/T3editor.php    |  4 +-
 ...ateInformationModuleFunctionController.php |  2 +-
 .../Classes/DataHandler/CommandMap.php        |  2 +-
 .../Classes/Dependency/DependencyResolver.php |  2 +-
 .../Classes/Dependency/ElementEntity.php      |  4 +-
 .../Classes/Controller/AbstractController.php |  2 +-
 .../Classes/Domain/Model/DatabaseRecord.php   |  2 +-
 .../Classes/Service/GridDataService.php       |  2 +-
 .../Classes/Service/IntegrityService.php      |  8 ++--
 224 files changed, 479 insertions(+), 479 deletions(-)

diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
index 839790ff9769..125cc9c7a33f 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 61b2e0952fce..2c53c13c7d6a 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 745ed9375df0..af653961cd67 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 e5e7184898c5..7638946f3734 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 0c78e98bb1c3..8e912a3af370 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 dd019ef4dda5..fc4d033cec71 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 b6a2c3d9a542..65b601cdede1 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 10a7ef5a4c62..40b70e3203cf 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 0a53551e78fa..17198d250aba 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 6c663b71527c..fb4f63132c8a 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 fbb97678c949..8d5682a92d41 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 b07713e7f7e2..14cedfed210f 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 5025e285e422..b4bb2e11ecdd 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 547d931935c1..766fe1b0628e 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 fa00f392cd2a..6a9298e48be0 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 f6b9daa271f7..b5c82c4dd17a 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 f7089dcaa2d3..b9b137c25da7 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 a24bf6162af2..d44513524478 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 bb6b90bd5343..92dab95baa06 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 e4fbd8798859..6674bc5f57b2 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 3cc06b5ad696..3215abce2b06 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 dc7b9023680a..b86021502282 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 00277d5ae881..1eab621d1acd 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 17baabdcd72a..f91955cb7427 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 692580008fc5..9e65fd0585d8 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 d08a7fb07cdd..850cbd7437a5 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 8a4377dcdea4..5a96175ae977 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 4832f21ebc35..fd66ec38bdcd 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 0047ee16cbfa..19d5005fedc6 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 7d0121926560..b45368dc4c72 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 46507de4618c..fc3e18d9d1d0 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 c8d0f0495d94..0e13e83d8bf2 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 a84222e8b4a3..778000a6bddc 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 c8f83233136e..716980eaf168 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 da1aad11e80f..dfd4167ff192 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 c6b9bd3a45dc..05a5ed2112bd 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 ba825bebd7cc..f074fb101132 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 6d1f4f8f94d8..64d35e69c59d 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 49d7c10cd809..3ab5e3d72d2a 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 f175456f1bf5..551d9ed8cf9e 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 1e488a563ae9..8d992f7ee4ca 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 fe005ec451ff..08d73b81bd71 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 92210bdb2623..17620c8b8358 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 56658d7abbac..4b94f087f81d 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 ffe743671049..b53c1f0ffa67 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 202c65b5271b..b4ce3016558f 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 23c3e27b168f..c1eaf299b78f 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 c14909b5c51e..3c2383568e86 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 d467843b19e9..2d741a7a83d0 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 efc90153823a..e08a70b3d444 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 b00174f6f6bc..8a6f6141a1a0 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 72562b5fea2b..c02a6bbfcf39 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 307053631774..cef9d5f42a02 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 a118a2c12810..6c571a232e0c 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 28c7248fb7a4..59ee05bfa69b 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 a5c275ed29ca..1778e666ac73 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 5500bf601e46..2b50d99f5ac2 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 b14494805b89..1b96abe26a2e 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 760d0e65739b..9924645510e5 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 0a10166cc83c..972b578586f7 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 b57177edb8ae..e97b907c14c9 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 e1443aa2ba2a..82f1c091ff95 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 4124bae398d0..c1c07a7b34b0 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 a46d5b740a57..1f03adef247d 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 ae5236332cca..448d75afc820 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 4d63e756251d..4b89fcc0d4a7 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 a17be8eaf443..05d25416224e 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 f9d3bf81707e..23b1e83eafc4 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 3af34922648c..7407efd36033 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 728b01cf5e52..2a4b7a571c1e 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 62011591806b..f26b47ee5d8c 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 ec5ac839a476..413e1f5c4ef4 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 d63b912c6bb1..bd7d9014b567 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 85f3c895fe85..098d7fe017c3 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 02a54764fa05..e14228521ccc 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 25f3115ce5e5..2e52fb2fa28f 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 e12420220bb2..4b54c1bb164b 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 b495e4db53d8..3e55941b117c 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 bac72b8ce47d..9578581475aa 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 510cb0f784ba..23de2eee89b1 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 f472b0918922..e7f8b0cd5273 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 22d0a4796ce4..f5b6c22081d3 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 1e59b7a6e2c3..5305a245da1f 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 81481fbfbadc..808eb8341550 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 3c8a2971f769..2ed0b2e0672c 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 e6e329057c2e..aafe5b476106 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 7c3fc380fbc1..3c70da18104b 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 260be4e6885c..4f40b7e25541 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 d29a5702e138..e059e5e85149 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 9b2504cfe307..254391011574 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 a70645901c7c..0f71910ff714 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 a28f7bb30c40..30d6af8128bd 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 7dd98031c271..70b736db3982 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 5d193d131018..289507c36093 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 640e302f1c18..c2a76ce0bb9f 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 c46ef9fdbd96..9d94cda816b6 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 885a2ec08ed9..364e42cf3a13 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 0a8f88678557..715d4453e888 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 c984130c6a1f..3f2fa4c457c4 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 87268a8c3b47..18b4f5386604 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 e65a772d6af0..f21a76e33760 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 8454c85cedf1..9a6ae6619a56 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 bc64f983d6bb..926556bcf812 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 4facf8903623..6e89f2e96f38 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 a6664415521b..c7d4c1cae04d 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 5e63d3bfb5e2..ce02bc369513 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 e853a54d9797..82ec46cc674b 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 6410acbe18b6..5f61cfb008bb 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 8fd4b7328dbe..38d6781e1ce9 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 6a51583a9ac0..62d23ef9c70f 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 5eee1cb4bc4e..65eddcaafb65 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 f3283e18703b..99369a289079 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 5f837a997206..d140d6d572de 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 cd6e8df43e5b..92c63e8912b8 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 3d26e7959de7..173ff768226a 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 519b61a36f64..bb7bec756895 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 61483e4f06fd..62c6066a05a1 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 ed1638cb5d51..947dbe39dfdd 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 09e974cb69fd..d6436ab82b47 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 950e33fc245c..922befdc6f70 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 6bd210f8d909..dcdae41500d6 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 a85a2302554d..d0b301b06ea1 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 4d072f8fdf27..68751f472a36 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 7e654394f5d9..28f0c9e70ce3 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 de96b7da56c4..601da79c07e7 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 703ede65504c..755459567a3e 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 2b96d8dc6894..110f7c9f33cf 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 9759fd19edf6..5727fdf3297e 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 d975080da76b..b0dc38fded87 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 890214393e27..ba3248237e02 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 914106527762..711d4206be26 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 2f2bbeb4a0d1..13cab6b33273 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 7e6939abaf8e..638dd32da665 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 54290fe52b11..6f885ac35509 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 fceeb429c7df..01302423c265 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 f4e17535b260..807cfd2addd0 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 4f0e01a3679f..62bc99c83f52 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 767a19e2831b..8145bf4da7db 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 36b146f56e4b..c60a8945bc04 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 a1e1f059ab8a..cf6728d6f7ad 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 a4287d8bb0df..202fcd689959 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 4f207adb4c77..7b086ef25b9d 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 ce93c38b38e7..fe40b873ff9e 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 91e72113cf6e..b6dd7a5f4a73 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 3ec7e27f9f7f..1615b0bb7dc2 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 51e06536cb09..df50820ddd0d 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 dc659639ff50..8f4f1d225356 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 7ad51f418901..a335f2c2ea22 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 eae1fe36915f..d3e7983fe7bb 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 f2a130a84fa7..f39195f8718c 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 ef67b090f62f..576b2edf5f6f 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 26ecf3fc3939..94ffe7e5e6dd 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 76dfc3428924..0d872ed35bf9 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 a4761b06bbbb..f518be4ea56c 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 93852b1f699d..b73893399a08 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 ea36a0240769..bee55b2e5fcc 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 7ff0be1b0525..3a15f5499ae2 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 6f143ae607de..1ffa17fbc1a6 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 0f7d75e5b4ce..8a10b938e56f 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 10bdeec4101d..5aeab36f3518 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 220b961a4430..8d8b2650a7c4 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 66567860d0ba..1f78332abd42 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 08a10c0e4b89..f48019edcbf6 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 f1ee745e3332..d944c59f8e89 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 737767b46159..6f72d3c9caa4 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 b2aec0e7f0d0..c098b470994e 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 154dab1a3eef..2c0443384e6e 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 45ee0c9be0e1..1aa6abc81303 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 541478831687..23000d095dfc 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 1c4bf918652c..eb56a2e53467 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 4dafe7be3fad..cae94e524428 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 427e2f5c343f..9f7600a16517 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 a2e998f96fec..4015b1115553 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 37b7d68a5ba5..1b3ff9406d73 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 79f81643fcbf..d40e16db7533 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 6ab2e99c3822..176235c4b958 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 b5c15a4ba508..fba2e270612e 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 95ef8ab4f787..c44d2692df03 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 f1dd3d40bff5..80f3141a09ea 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 12c2fb8878ea..079f6c5de797 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 b77a7a9b1f88..886aadbf66a6 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 73b7bda04726..4673e69baa4f 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 08394efcfb8b..7638c2354bdc 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 e3c6cbb7145f..45ac16cd7166 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 35411777ae32..54bdb6e87caa 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 060203bfbaec..d8d9b2bf2ec9 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 2448716ca15b..ed6e8f4b3198 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 509909f637ce..b4f779c100cf 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 9838b0ec2926..b98610a7b076 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 75d62cd7f62e..6f879397efcc 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 90dfe02ba0f9..f692d2b005b3 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 3d55dcf0dd8e..9d5e48b9f843 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 aaff6d63c8ab..25519283fd5d 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 c6af98706cb5..c598deac47bc 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 c9775df8b0d7..128ed6eacae2 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 2c5019624d46..887445671dcc 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 09f5567ea94b..1fb3ef913e6a 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 768f44de231c..27f625216cb7 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 74d58e2d1a6b..4bd71cd364ec 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 f085acef7e43..efd783a634a0 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 2d8e7abbcfff..6f5fb15c62a2 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 1b5d93956c4b..bccaf9e9fba6 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 ca6e8676bd58..c1d79b588f32 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 37a91147f089..d7d203a12c77 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 59c63d966fa1..4bf7c5c024b7 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 a6040453c23f..22dfdbc83986 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 5f2f6a2248cd..807c454e4b9f 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 225b575bf8bc..be4f9748c5f0 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 7338ca5b011b..eefac0fa8b7d 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 61690a8ea000..a13de0d24a7f 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 328b43ef2d61..5f027514345c 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 8effee71de18..15945860fc4d 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 7c200522a417..4b8d7041105c 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 06b063cfbf1c..b4ee4199fed1 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 562a750c2473..fd30c29051d7 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 b2ea0a77328b..e9ec03b24495 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 36c086a16706..2c7be8fc0288 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 24e8a4842dae..c04f90da1c33 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 2df960c1849a..5c4f4bde7839 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 a64b0e7ce01c..2e6f6a949557 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 e8e445a97bc9..058d18da074f 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 b32c5d7b52f0..5c7b3834718b 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 9ab9053a43f9..4dfb32a8db5a 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 27f20fb0d73e..b4ca11762303 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;
 	/**
-- 
GitLab