From 2204ebd2310925344f5be7bfd27a12cf57f7ebcd Mon Sep 17 00:00:00 2001
From: Wouter Wolters <typo3@wouterwolters.nl>
Date: Mon, 27 Oct 2014 18:59:07 +0100
Subject: [PATCH] [TASK] Cleanup phpDoc to match CGL
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Use bool in @return
* Use int in @return
* Use bool in @param
* Use int in @param
* Remove extra tabs and spaces in @param
Resolves: #62506
Releases: master
Change-Id: I673888aa08855a1364150d0060d0f205fc1f83a2
Reviewed-on: http://review.typo3.org/33577
Reviewed-by: Stefan Froemken <froemken@gmail.com>
Tested-by: Stefan Froemken <froemken@gmail.com>
Reviewed-by: Frank Nägler <typo3@naegler.net>
Tested-by: Frank Nägler <typo3@naegler.net>
---
typo3/class.browse_links.php | 8 +-
typo3/db_new.php | 2 +-
typo3/show_rechis.php | 2 +-
.../backend/Classes/AjaxLoginHandler.php | 4 +-
.../backend/Classes/ClickMenu/ClickMenu.php | 2 +-
.../backend/Classes/Clipboard/Clipboard.php | 4 +-
.../TranslationConfigurationProvider.php | 4 +-
.../ConditionMatching/ConditionMatcher.php | 14 +-
.../AbstractContextMenuDataProvider.php | 2 +-
.../Classes/ContextMenu/ContextMenuAction.php | 2 +-
.../Classes/Controller/BackendController.php | 4 +-
.../Controller/EditDocumentController.php | 2 +-
.../Controller/File/EditFileController.php | 2 +-
.../Controller/File/FileUploadController.php | 2 +-
.../FileSystemNavigationFrameController.php | 2 +-
.../Classes/Controller/LoginController.php | 2 +-
.../Controller/NewRecordController.php | 6 +-
.../PageTreeNavigationController.php | 4 +-
.../Wizard/ColorpickerController.php | 6 +-
.../Controller/Wizard/FormsController.php | 2 +-
.../Controller/Wizard/RteController.php | 2 +-
.../Controller/Wizard/TableController.php | 2 +-
.../Classes/Form/Element/InlineElement.php | 24 +-
.../Form/Element/SuggestDefaultReceiver.php | 2 +-
.../Classes/Form/ElementConditionMatcher.php | 16 +-
.../backend/Classes/Form/FlexFormsHelper.php | 2 +-
.../Classes/Form/FormDataTraverser.php | 4 +-
.../backend/Classes/Form/FormEngine.php | 10 +-
.../FrontendBackendUserAuthentication.php | 10 +-
.../backend/Classes/History/RecordHistory.php | 8 +-
.../backend/Classes/Module/ModuleLoader.php | 4 +-
.../RecordList/ElementBrowserRecordList.php | 2 +-
.../backend/Classes/Rte/AbstractRte.php | 2 +-
.../Classes/Search/LiveSearch/QueryParser.php | 6 +-
.../backend/Classes/Sprite/SpriteManager.php | 2 +-
.../Classes/Template/DocumentTemplate.php | 2 +-
.../Classes/Toolbar/ClearCacheToolbarItem.php | 2 +-
.../Classes/Toolbar/LiveSearchToolbarItem.php | 2 +-
.../Classes/Toolbar/ShortcutToolbarItem.php | 2 +-
.../Toolbar/ToolbarItemHookInterface.php | 2 +-
.../Classes/Tree/ComparableNodeInterface.php | 2 +-
.../backend/Classes/Tree/ExtDirectNode.php | 18 +-
.../Classes/Tree/Pagetree/Commands.php | 4 +-
.../Classes/Tree/Pagetree/DataProvider.php | 2 +-
.../Classes/Tree/Pagetree/PagetreeNode.php | 36 +--
.../Classes/Tree/SortedTreeNodeCollection.php | 4 +-
.../sysext/backend/Classes/Tree/TreeNode.php | 6 +-
.../Classes/Tree/View/AbstractTreeView.php | 10 +-
.../Classes/Tree/View/FolderTreeView.php | 12 +-
.../Classes/Tree/View/PagePositionMap.php | 2 +-
.../Classes/Tree/View/PageTreeView.php | 2 +-
.../BackendUserSettingsDataProvider.php | 2 +-
.../Classes/Utility/BackendUtility.php | 26 +-
.../BackendLayout/DataProviderContext.php | 2 +-
.../BackendLayout/DefaultDataProvider.php | 2 +-
.../Classes/View/BackendLayoutView.php | 2 +-
.../backend/Classes/View/PageLayoutView.php | 8 +-
.../backend/Classes/View/PageTreeView.php | 4 +-
.../ConditionMatcherTest.php | 18 +-
.../belog/Classes/Domain/Model/Constraint.php | 18 +-
.../belog/Classes/Domain/Model/LogEntry.php | 22 +-
.../IsExtensionLoadedViewHelper.php | 2 +-
.../Classes/Domain/Model/BackendUser.php | 2 +-
.../beuser/Classes/Domain/Model/Demand.php | 6 +-
.../AbstractUserAuthentication.php | 12 +-
.../BackendUserAuthentication.php | 56 ++--
.../core/Classes/Cache/Backend/ApcBackend.php | 4 +-
.../Cache/Backend/BackendInterface.php | 4 +-
.../Cache/Backend/ClassLoaderBackend.php | 6 +-
.../Cache/Backend/EarlyClassLoaderBackend.php | 4 +-
.../Classes/Cache/Backend/FileBackend.php | 8 +-
.../Backend/FreezableBackendInterface.php | 2 +-
.../Cache/Backend/MemcachedBackend.php | 4 +-
.../Classes/Cache/Backend/NullBackend.php | 6 +-
.../core/Classes/Cache/Backend/PdoBackend.php | 4 +-
.../Classes/Cache/Backend/RedisBackend.php | 4 +-
.../Cache/Backend/SimpleFileBackend.php | 6 +-
.../Cache/Backend/TransientMemoryBackend.php | 4 +-
.../Cache/Backend/Typo3DatabaseBackend.php | 4 +-
.../Classes/Cache/Backend/WincacheBackend.php | 4 +-
.../Classes/Cache/Backend/XcacheBackend.php | 6 +-
typo3/sysext/core/Classes/Cache/Cache.php | 2 +-
.../core/Classes/Cache/CacheManager.php | 2 +-
.../Cache/Frontend/AbstractFrontend.php | 8 +-
.../Cache/Frontend/FrontendInterface.php | 8 +-
.../Classes/Category/CategoryRegistry.php | 4 +-
.../core/Classes/Charset/CharsetConverter.php | 26 +-
.../Collection/AbstractRecordCollection.php | 10 +-
.../PersistableCollectionInterface.php | 2 +-
.../LoadedExtensionArrayElement.php | 4 +-
.../Compatibility/LoadedExtensionsArray.php | 8 +-
.../Configuration/ConfigurationManager.php | 14 +-
.../Configuration/FlexForm/FlexFormTools.php | 2 +-
.../AbstractConditionMatcher.php | 16 +-
.../Controller/CommandLineController.php | 8 +-
.../core/Classes/Core/ApplicationContext.php | 6 +-
.../core/Classes/DataHandling/DataHandler.php | 70 ++--
.../Classes/Database/DatabaseConnection.php | 40 +--
.../Classes/Database/PreparedStatement.php | 12 +-
.../core/Classes/Database/QueryView.php | 2 +-
.../core/Classes/Database/ReferenceIndex.php | 4 +-
.../core/Classes/Database/RelationHandler.php | 2 +-
.../Classes/Database/SoftReferenceIndex.php | 2 +-
.../core/Classes/Database/SqlParser.php | 2 +-
.../Classes/Encoder/JavaScriptEncoder.php | 2 +-
.../Error/ProductionExceptionHandler.php | 2 +-
.../core/Classes/ExtDirect/ExtDirectApi.php | 2 +-
.../FormProtection/AbstractFormProtection.php | 2 +-
.../FormProtection/BackendFormProtection.php | 2 +-
.../FormProtection/FormProtectionFactory.php | 6 +-
.../FrontendEditingController.php | 8 +-
.../core/Classes/Http/AjaxRequestHandler.php | 2 +-
.../Classes/Imaging/GraphicalFunctions.php | 18 +-
.../Integrity/DatabaseIntegrityCheck.php | 4 +-
.../Classes/Localization/LanguageStore.php | 2 +-
.../Parser/LocallangArrayParser.php | 2 +-
typo3/sysext/core/Classes/Locking/Locker.php | 4 +-
typo3/sysext/core/Classes/Log/LogLevel.php | 4 +-
typo3/sysext/core/Classes/Log/LogRecord.php | 4 +-
typo3/sysext/core/Classes/Log/Logger.php | 2 +-
.../Log/Processor/AbstractMemoryProcessor.php | 4 +-
.../sysext/core/Classes/Mail/MailMessage.php | 4 +-
.../Classes/Mail/MailerAdapterInterface.php | 2 +-
.../Classes/Mail/Rfc822AddressesParser.php | 22 +-
.../Classes/Messaging/AbstractMessage.php | 2 +-
.../core/Classes/Messaging/FlashMessage.php | 2 +-
.../Classes/Package/DependencyResolver.php | 2 +-
typo3/sysext/core/Classes/Package/Package.php | 4 +-
.../core/Classes/Package/PackageInterface.php | 4 +-
.../core/Classes/Package/PackageManager.php | 6 +-
.../sysext/core/Classes/Page/PageRenderer.php | 16 +-
.../core/Classes/Resource/AbstractFile.php | 18 +-
.../Classes/Resource/AbstractRepository.php | 2 +-
.../Collection/FileCollectionRegistry.php | 2 +-
.../Resource/Driver/AbstractDriver.php | 8 +-
.../AbstractHierarchicalFilesystemDriver.php | 2 +-
.../Resource/Driver/DriverInterface.php | 30 +-
.../Resource/Driver/DriverRegistry.php | 4 +-
.../Classes/Resource/Driver/LocalDriver.php | 26 +-
typo3/sysext/core/Classes/Resource/File.php | 8 +-
.../core/Classes/Resource/FileInterface.php | 12 +-
.../core/Classes/Resource/FileReference.php | 18 +-
.../core/Classes/Resource/FileRepository.php | 2 +-
.../Resource/Filter/FileExtensionFilter.php | 4 +-
.../Resource/Filter/FileNameFilter.php | 6 +-
typo3/sysext/core/Classes/Resource/Folder.php | 12 +-
.../core/Classes/Resource/FolderInterface.php | 6 +-
.../Classes/Resource/InaccessibleFolder.php | 8 +-
.../Resource/Index/ExtractorInterface.php | 6 +-
.../Resource/Index/FileIndexRepository.php | 4 +-
.../core/Classes/Resource/ProcessedFile.php | 20 +-
.../Resource/Processing/AbstractTask.php | 6 +-
.../Processing/ImageCropScaleMaskTask.php | 2 +-
.../Resource/Processing/ImagePreviewTask.php | 4 +-
.../Processing/LocalImageProcessor.php | 2 +-
.../Processing/ProcessorInterface.php | 2 +-
.../Resource/Processing/TaskInterface.php | 6 +-
.../Classes/Resource/ResourceCompressor.php | 4 +-
.../core/Classes/Resource/ResourceFactory.php | 2 +-
.../Service/FrontendContentAdapterService.php | 2 +-
.../Resource/Service/IndexerService.php | 2 +-
.../Classes/Resource/StorageRepository.php | 4 +-
.../core/Classes/Service/AbstractService.php | 8 +-
.../Classes/TimeTracker/NullTimeTracker.php | 2 +-
.../core/Classes/TimeTracker/TimeTracker.php | 4 +-
...ractTableConfigurationTreeDataProvider.php | 6 +-
.../DatabaseTreeDataProvider.php | 6 +-
.../TableConfiguration/DatabaseTreeNode.php | 10 +-
.../sysext/core/Classes/Type/Enumeration.php | 4 +-
.../TypoScript/Parser/TypoScriptParser.php | 2 +-
.../Classes/TypoScript/TemplateService.php | 4 +-
.../core/Classes/Utility/ArrayUtility.php | 2 +-
.../core/Classes/Utility/CommandUtility.php | 4 +-
.../Utility/ExtensionManagementUtility.php | 4 +-
.../Classes/Utility/File/BasicFileUtility.php | 76 ++---
.../Utility/File/ExtendedFileUtility.php | 6 +-
.../core/Classes/Utility/GeneralUtility.php | 72 ++---
.../core/Classes/Utility/MathUtility.php | 14 +-
.../Classes/Utility/OpcodeCacheUtility.php | 2 +-
.../core/Classes/Utility/PathUtility.php | 2 +-
.../Classes/Utility/PhpOptionsUtility.php | 6 +-
.../core/Classes/Utility/RootlineUtility.php | 4 +-
.../core/Classes/Utility/StringUtility.php | 6 +-
.../Classes/Utility/VersionNumberUtility.php | 2 +-
.../core/Classes/Versioning/VersionState.php | 2 +-
.../DataHandling/IRRE/AbstractTestCase.php | 10 +-
.../FunctionalTestCaseBootstrapUtility.php | 4 +-
typo3/sysext/core/Tests/Unit/RegistryTest.php | 2 +-
.../Fixtures/LocalDriverFilenameFilter.php | 2 +-
.../Tests/Unit/Utility/GeneralUtilityTest.php | 4 +-
.../Classes/Controller/ModuleController.php | 8 +-
.../Database/AdodbPreparedStatement.php | 14 +-
.../Classes/Database/DatabaseConnection.php | 34 +-
.../dbal/Classes/Database/SqlParser.php | 34 +-
typo3/sysext/dbal/Classes/QueryCache.php | 4 +-
.../Classes/RecordList/DatabaseRecordList.php | 8 +-
typo3/sysext/dbal/mod1/index.php | 4 +-
.../Classes/Service/DocumentationService.php | 6 +-
.../BackendConfigurationManager.php | 2 +-
.../Configuration/ConfigurationManager.php | 2 +-
.../ConfigurationManagerInterface.php | 2 +-
.../sysext/extbase/Classes/Core/Bootstrap.php | 2 +-
.../extbase/Classes/Core/ModuleRunner.php | 2 +-
.../Classes/Core/ModuleRunnerInterface.php | 2 +-
.../Classes/Domain/Model/BackendUser.php | 12 +-
.../Classes/Domain/Model/BackendUserGroup.php | 18 +-
.../Classes/Domain/Model/FileMount.php | 2 +-
.../DomainObject/AbstractDomainObject.php | 16 +-
.../DomainObject/DomainObjectInterface.php | 6 +-
typo3/sysext/extbase/Classes/Error/Result.php | 10 +-
.../extbase/Classes/Mvc/Cli/Command.php | 6 +-
.../Classes/Mvc/Cli/CommandManager.php | 2 +-
.../extbase/Classes/Mvc/Cli/Request.php | 4 +-
.../Classes/Mvc/Cli/RequestHandler.php | 4 +-
.../extbase/Classes/Mvc/Cli/Response.php | 2 +-
.../Mvc/Controller/AbstractController.php | 2 +-
.../Classes/Mvc/Controller/Argument.php | 4 +-
.../Classes/Mvc/Controller/Arguments.php | 4 +-
.../Mvc/Controller/CommandController.php | 2 +-
.../Mvc/Controller/ControllerInterface.php | 2 +-
typo3/sysext/extbase/Classes/Mvc/Request.php | 4 +-
.../Classes/Mvc/RequestHandlerInterface.php | 4 +-
.../extbase/Classes/Mvc/RequestInterface.php | 4 +-
.../extbase/Classes/Mvc/View/AbstractView.php | 2 +-
.../extbase/Classes/Mvc/View/EmptyView.php | 2 +-
.../Classes/Mvc/View/ViewInterface.php | 2 +-
.../Mvc/Web/AbstractRequestHandler.php | 4 +-
.../Classes/Mvc/Web/BackendRequestHandler.php | 2 +-
.../Mvc/Web/FrontendRequestHandler.php | 2 +-
.../extbase/Classes/Mvc/Web/Request.php | 2 +-
.../Classes/Mvc/Web/Routing/UriBuilder.php | 14 +-
.../Classes/Object/Container/ClassInfo.php | 8 +-
.../Object/Container/ClassInfoCache.php | 2 +-
.../Object/Container/ClassInfoFactory.php | 6 +-
.../Classes/Object/Container/Container.php | 4 +-
.../extbase/Classes/Object/ObjectManager.php | 4 +-
.../Classes/Object/ObjectManagerException.php | 2 +-
.../Classes/Object/ObjectManagerInterface.php | 4 +-
.../ObjectManagerInterfaceException.php | 2 +-
.../Classes/Persistence/Generic/Backend.php | 14 +-
.../Persistence/Generic/BackendInterface.php | 4 +-
.../Persistence/Generic/IdentityMap.php | 4 +-
.../Persistence/Generic/LazyLoadingProxy.php | 6 +-
.../Persistence/Generic/LazyObjectStorage.php | 14 +-
.../Persistence/Generic/Mapper/DataMap.php | 6 +-
.../Persistence/Generic/Mapper/DataMapper.php | 6 +-
.../Generic/PersistenceManager.php | 4 +-
.../Persistence/Generic/PropertyType.php | 4 +-
.../Classes/Persistence/Generic/Query.php | 6 +-
.../Persistence/Generic/QueryResult.php | 6 +-
.../Generic/QuerySettingsInterface.php | 12 +-
.../Classes/Persistence/Generic/Session.php | 6 +-
.../Generic/Storage/BackendInterface.php | 6 +-
.../Generic/Storage/Typo3DbBackend.php | 4 +-
.../Persistence/ObjectMonitoringInterface.php | 2 +-
.../Classes/Persistence/ObjectStorage.php | 14 +-
.../PersistenceManagerInterface.php | 4 +-
.../Classes/Persistence/QueryInterface.php | 8 +-
.../Classes/Persistence/Repository.php | 2 +-
.../Persistence/RepositoryInterface.php | 2 +-
.../Property/PropertyMappingConfiguration.php | 6 +-
.../PropertyMappingConfigurationInterface.php | 4 +-
.../TypeConverter/AbstractTypeConverter.php | 4 +-
.../Property/TypeConverter/ArrayConverter.php | 2 +-
.../TypeConverter/BooleanConverter.php | 2 +-
.../TypeConverter/CoreTypeConverter.php | 2 +-
.../TypeConverter/DateTimeConverter.php | 4 +-
.../TypeConverter/IntegerConverter.php | 2 +-
.../TypeConverter/ObjectConverter.php | 2 +-
.../PersistentObjectConverter.php | 2 +-
.../Property/TypeConverterInterface.php | 4 +-
.../Classes/Reflection/ClassReflection.php | 2 +-
.../Classes/Reflection/ClassSchema.php | 6 +-
.../Classes/Reflection/DocCommentParser.php | 2 +-
.../Classes/Reflection/MethodReflection.php | 2 +-
.../Classes/Reflection/ObjectAccess.php | 6 +-
.../Classes/Reflection/PropertyReflection.php | 2 +-
.../Classes/Reflection/ReflectionService.php | 10 +-
.../Classes/Scheduler/FieldProvider.php | 4 +-
.../sysext/extbase/Classes/Scheduler/Task.php | 2 +-
.../Security/Cryptography/HashService.php | 2 +-
.../Classes/Service/EnvironmentService.php | 6 +-
.../Classes/Service/ExtensionService.php | 6 +-
.../extbase/Classes/Utility/ArrayUtility.php | 4 +-
.../Classes/Utility/DebuggerUtility.php | 4 +-
.../Classes/Utility/TypeHandlingUtility.php | 6 +-
.../Validator/AbstractCompositeValidator.php | 2 +-
.../Validator/AbstractValidator.php | 2 +-
.../Validation/Validator/BooleanValidator.php | 2 +-
.../Validator/DateTimeValidator.php | 2 +-
.../Validator/EmailAddressValidator.php | 2 +-
.../Validator/GenericObjectValidator.php | 4 +-
.../Validator/NotEmptyValidator.php | 2 +-
.../Validation/Validator/NumberValidator.php | 2 +-
.../Reflection/Fixture/ArrayAccessClass.php | 2 +-
.../DummyClassWithGettersAndSetters.php | 2 +-
.../Domain/Model/ConfigurationItem.php | 2 +-
.../Classes/Domain/Model/Extension.php | 16 +-
.../Classes/Domain/Model/Mirrors.php | 2 +-
.../Classes/Domain/Model/Repository.php | 4 +-
.../Domain/Repository/ExtensionRepository.php | 4 +-
.../Classes/Task/UpdateExtensionListTask.php | 2 +-
.../Classes/Utility/DependencyUtility.php | 22 +-
.../Classes/Utility/FileHandlingUtility.php | 4 +-
.../Utility/Importer/ExtensionListUtility.php | 2 +-
.../Classes/Utility/InstallUtility.php | 6 +-
.../Parser/AbstractExtensionXmlParser.php | 2 +-
.../Utility/Parser/AbstractXmlParser.php | 4 +-
.../Utility/Parser/ExtensionXmlPullParser.php | 6 +-
.../Utility/Parser/ExtensionXmlPushParser.php | 2 +-
.../Utility/Parser/MirrorXmlPullParser.php | 2 +-
.../Utility/Parser/MirrorXmlPushParser.php | 2 +-
.../Classes/Utility/Repository/Helper.php | 4 +-
.../Classes/Utility/UpdateScriptUtility.php | 2 +-
.../feedit/Classes/FrontendEditPanel.php | 4 +-
.../Controller/FrontendLoginController.php | 6 +-
typo3/sysext/filelist/Classes/FileList.php | 2 +-
.../Compiler/AbstractCompiledTemplate.php | 4 +-
.../Core/Compiler/TemplateCompiler.php | 2 +-
.../Core/Parser/ParsedTemplateInterface.php | 6 +-
.../Classes/Core/Parser/ParsingState.php | 8 +-
.../Core/Parser/SyntaxTree/BooleanNode.php | 8 +-
.../Core/ViewHelper/AbstractViewHelper.php | 4 +-
.../Core/ViewHelper/ArgumentDefinition.php | 4 +-
.../Classes/Core/ViewHelper/Arguments.php | 4 +-
.../Classes/Core/ViewHelper/TagBuilder.php | 4 +-
.../ViewHelper/TemplateVariableContainer.php | 4 +-
.../ViewHelperVariableContainer.php | 2 +-
.../Core/Widget/WidgetRequestHandler.php | 4 +-
.../Classes/View/AbstractTemplateView.php | 4 +-
.../fluid/Classes/View/StandaloneView.php | 2 +-
.../fluid/Classes/View/TemplateView.php | 2 +-
.../Be/Security/IfHasRoleViewHelper.php | 2 +-
.../Classes/ViewHelpers/CountViewHelper.php | 2 +-
.../Form/AbstractFormFieldViewHelper.php | 4 +-
.../ViewHelpers/Form/SelectViewHelper.php | 2 +-
.../Security/IfHasRoleViewHelper.php | 2 +-
.../Form/Fixtures/UserDomainClass.php | 2 +-
.../Classes/Controller/FormController.php | 4 +-
.../AdditionalAdditionalElement.php | 2 +-
.../Model/Attribute/AttributesAttribute.php | 2 +-
.../Domain/Model/Attribute/ColsAttribute.php | 2 +-
.../Model/Attribute/MaxlengthAttribute.php | 2 +-
.../Domain/Model/Attribute/RowsAttribute.php | 2 +-
.../Domain/Model/Attribute/SizeAttribute.php | 2 +-
.../Model/Attribute/TabindexAttribute.php | 2 +-
.../form/Classes/Domain/Model/Content.php | 4 +-
.../Domain/Model/Element/AbstractElement.php | 10 +-
.../Model/Element/FileuploadElement.php | 2 +-
.../Domain/Model/Json/AbstractJsonElement.php | 2 +-
.../Domain/Repository/ContentRepository.php | 6 +-
typo3/sysext/form/Classes/ElementCounter.php | 2 +-
typo3/sysext/form/Classes/Request.php | 4 +-
.../form/Classes/Utility/ValidatorUtility.php | 6 +-
.../Classes/Validation/AbstractValidator.php | 2 +-
.../Validation/AlphabeticValidator.php | 2 +-
.../Validation/AlphanumericValidator.php | 2 +-
.../Classes/Validation/BetweenValidator.php | 2 +-
.../form/Classes/Validation/DateValidator.php | 2 +-
.../Classes/Validation/DigitValidator.php | 2 +-
.../Classes/Validation/EmailValidator.php | 2 +-
.../Classes/Validation/EqualsValidator.php | 2 +-
.../Validation/FileAllowedTypesValidator.php | 2 +-
.../Validation/FileMaximumSizeValidator.php | 2 +-
.../Validation/FileMinimumSizeValidator.php | 2 +-
.../Classes/Validation/FloatValidator.php | 2 +-
.../Validation/GreaterThanValidator.php | 2 +-
.../Classes/Validation/InArrayValidator.php | 2 +-
.../Classes/Validation/IntegerValidator.php | 2 +-
.../form/Classes/Validation/IpValidator.php | 2 +-
.../Classes/Validation/LengthValidator.php | 2 +-
.../Classes/Validation/LessthanValidator.php | 2 +-
.../Classes/Validation/RegExpValidator.php | 2 +-
.../Classes/Validation/RequiredValidator.php | 2 +-
.../form/Classes/Validation/UriValidator.php | 2 +-
.../Classes/Validation/ValidatorInterface.php | 4 +-
.../Element/AbstractElementView.php | 4 +-
.../View/Form/Element/AbstractElementView.php | 4 +-
.../Mail/Html/Element/AbstractElementView.php | 4 +-
.../form/Tests/Unit/Validation/Helper.php | 2 +-
.../FrontendUserAuthentication.php | 8 +-
.../ConditionMatching/ConditionMatcher.php | 8 +-
.../ContentObject/ContentObjectRenderer.php | 20 +-
.../Menu/AbstractMenuContentObject.php | 14 +-
.../AbstractMenuFilterPagesHookInterface.php | 2 +-
.../Menu/ImageMenuContentObject.php | 2 +-
.../SearchResultContentObject.php | 8 +-
.../Controller/DataSubmissionController.php | 2 +-
.../Controller/ExtDirectEidController.php | 2 +-
.../TranslationStatusController.php | 2 +-
.../TypoScriptFrontendController.php | 44 +--
.../Hooks/TreelistCacheUpdateHooks.php | 2 +-
.../frontend/Classes/Imaging/GifBuilder.php | 4 +-
.../MediaWizard/MediaWizardProvider.php | 2 +-
.../MediaWizardProviderInterface.php | 2 +-
.../Classes/Page/CacheHashCalculator.php | 12 +-
.../frontend/Classes/Page/PageGenerator.php | 2 +-
.../frontend/Classes/Page/PageRepository.php | 12 +-
.../Classes/Plugin/AbstractPlugin.php | 4 +-
.../frontend/Classes/View/AdminPanelView.php | 4 +-
.../ConditionMatcherTest.php | 4 +-
.../Controller/ImportExportController.php | 2 +-
typo3/sysext/impexp/Classes/ImportExport.php | 22 +-
.../Import/AbstractImportTestCase.php | 2 +-
.../Controller/IndexedPagesController.php | 142 ++++----
.../IndexingStatisticsController.php | 26 +-
.../Classes/Controller/ModuleController.php | 8 +-
.../Classes/Controller/SearchController.php | 18 +-
.../Controller/SearchFormController.php | 232 ++++++-------
.../Repository/IndexSearchRepository.php | 56 ++--
.../Classes/Example/CrawlerHook.php | 16 +-
.../Classes/Example/PluginHook.php | 18 +-
.../Classes/FileContentParser.php | 38 +--
.../Classes/Hook/CrawlerHook.php | 132 ++++----
.../Classes/Hook/TypoScriptFrontendHook.php | 8 +-
.../sysext/indexed_search/Classes/Indexer.php | 304 +++++++++---------
typo3/sysext/indexed_search/Classes/Lexer.php | 48 +--
.../Classes/Utility/IndexedSearchUtility.php | 4 +-
.../PageBrowsingResultsViewHelper.php | 2 +-
.../ViewHelpers/PageBrowsingViewHelper.php | 2 +-
typo3/sysext/indexed_search/class.crawler.php | 2 +-
.../Classes/Hook/MysqlFulltextIndexHook.php | 6 +-
.../Configuration/AbstractCustomPreset.php | 4 +-
.../Classes/Configuration/AbstractPreset.php | 8 +-
.../Charset/CoreInternalPreset.php | 2 +-
.../Configuration/Charset/IconvPreset.php | 2 +-
.../Configuration/Charset/MbstringPreset.php | 2 +-
.../Context/DevelopmentPreset.php | 4 +-
.../Context/ProductionPreset.php | 4 +-
.../ExtbaseObjectCache/ApcPreset.php | 2 +-
.../ExtbaseObjectCache/DatabasePreset.php | 2 +-
.../Image/AbstractImagePreset.php | 4 +-
.../Image/GraphicsMagickPreset.php | 2 +-
.../Image/ImageMagick6Preset.php | 2 +-
.../Classes/Configuration/PresetInterface.php | 10 +-
.../Classes/Controller/AbstractController.php | 4 +-
.../Controller/Action/AbstractAction.php | 2 +-
.../Action/Step/DatabaseConnect.php | 14 +-
.../Controller/Action/Step/DatabaseData.php | 2 +-
.../Controller/Action/Step/DatabaseSelect.php | 2 +-
.../Action/Step/DefaultConfiguration.php | 2 +-
.../Action/Step/EnvironmentAndFolders.php | 2 +-
.../Controller/Action/Step/StepInterface.php | 2 +-
.../Controller/Action/Tool/TestSetup.php | 2 +-
.../Database/DatabaseConnectionMock.php | 2 +-
.../Classes/FolderStructure/AbstractNode.php | 8 +-
.../Classes/FolderStructure/DirectoryNode.php | 6 +-
.../Classes/FolderStructure/FileNode.php | 4 +-
.../Classes/FolderStructure/LinkNode.php | 4 +-
.../Classes/FolderStructure/NodeInterface.php | 2 +-
.../Classes/Report/InstallStatusReport.php | 2 +-
.../Classes/Service/ContextService.php | 6 +-
.../Classes/Service/CoreUpdateService.php | 16 +-
.../Classes/Service/CoreVersionService.php | 10 +-
.../Classes/Service/EnableFileService.php | 8 +-
.../Classes/Service/SessionService.php | 14 +-
.../Classes/SystemEnvironment/Check.php | 8 +-
.../Classes/Updates/AbstractUpdate.php | 12 +-
.../Updates/BackendUserStartModuleUpdate.php | 4 +-
.../Classes/Updates/CompatVersionUpdate.php | 8 +-
.../Updates/ExtensionManagerTables.php | 6 +-
.../Updates/FileIdentifierHashUpdate.php | 6 +-
.../Classes/Updates/FilePermissionUpdate.php | 4 +-
.../Updates/FileTableSplittingUpdate.php | 4 +-
.../Classes/Updates/FilemountUpdateWizard.php | 4 +-
.../Classes/Updates/InitUpdateWizard.php | 4 +-
.../Classes/Updates/MediaFlexformUpdate.php | 4 +-
.../ReferenceIntegrityUpdateWizard.php | 4 +-
.../Classes/Updates/RootTemplateUpdate.php | 4 +-
.../Updates/RteFileLinksUpdateWizard.php | 4 +-
.../Updates/RteMagicImagesUpdateWizard.php | 4 +-
.../Classes/Updates/TceformsUpdateWizard.php | 4 +-
.../TruncateSysFileProcessedFileTable.php | 4 +-
.../Updates/TtContentUploadsUpdateWizard.php | 4 +-
.../ViewHelpers/File/ExistsViewHelper.php | 2 +-
.../File/ImageDimensionViewHelper.php | 2 +-
.../ViewHelpers/File/SizeViewHelper.php | 2 +-
.../lang/Classes/Domain/Model/Extension.php | 2 +-
.../lang/Classes/Domain/Model/Language.php | 2 +-
.../Service/UpdateTranslationService.php | 4 +-
.../lang/Classes/Utility/Connection/Ter.php | 4 +-
.../linkvalidator/Classes/LinkAnalyzer.php | 4 +-
.../Classes/Linktype/ExternalLinktype.php | 2 +-
.../Classes/Linktype/FileLinktype.php | 2 +-
.../Classes/Linktype/InternalLinktype.php | 6 +-
.../Classes/Linktype/LinkHandler.php | 2 +-
.../Classes/Report/LinkValidatorReport.php | 2 +-
.../Classes/Task/ValidatorTask.php | 10 +-
.../ValidatorTaskAdditionalFieldProvider.php | 2 +-
.../lowlevel/Classes/CleanerCommand.php | 2 +-
.../Classes/Controller/OpendocsController.php | 2 +-
typo3/sysext/openid/Classes/OpenidEid.php | 4 +-
.../openid/Classes/OpenidModuleSetup.php | 2 +-
typo3/sysext/openid/Classes/OpenidService.php | 6 +-
typo3/sysext/openid/Classes/OpenidStore.php | 8 +-
.../Controller/PermissionModuleController.php | 2 +-
.../Classes/Browser/ElementBrowser.php | 6 +-
.../ElementBrowserFramesetController.php | 2 +-
.../Controller/DeletedRecordsController.php | 8 +-
.../Controller/RecyclerAjaxController.php | 10 +-
.../Controller/RecyclerModuleController.php | 40 +--
.../Classes/Domain/Model/DeletedRecords.php | 66 ++--
.../recycler/Classes/Domain/Model/Tables.php | 12 +-
.../Classes/Utility/RecyclerUtility.php | 30 +-
.../Report/Status/ConfigurationStatus.php | 2 +-
.../Classes/Report/Status/SecurityStatus.php | 2 +-
.../reports/Classes/Report/Status/Status.php | 2 +-
typo3/sysext/reports/Classes/Status.php | 2 +-
...StatusUpdateTaskNotificationEmailField.php | 2 +-
.../rsaauth/Classes/Backend/PhpBackend.php | 2 +-
.../rsaauth/Classes/Hook/UserSetupHook.php | 2 +-
typo3/sysext/rsaauth/Classes/Keypair.php | 12 +-
.../sysext/rsaauth/Classes/RsaAuthService.php | 4 +-
.../rtehtmlarea/Classes/BrowseLinks.php | 20 +-
.../rtehtmlarea/Classes/ContentParser.php | 6 +-
.../AccessibilityLinkController.php | 4 +-
.../Controller/BrowseLinksController.php | 6 +-
.../Controller/CustomAttributeController.php | 6 +-
.../Controller/FrontendRteController.php | 44 +--
.../Controller/SelectImageController.php | 2 +-
.../Controller/SpellCheckingController.php | 2 +-
.../Classes/Extension/AboutEditor.php | 4 +-
.../rtehtmlarea/Classes/Extension/Acronym.php | 10 +-
.../Classes/Extension/BlockElements.php | 4 +-
.../Classes/Extension/CharacterMap.php | 4 +-
.../Classes/Extension/ContextMenu.php | 4 +-
.../Classes/Extension/CopyPaste.php | 8 +-
.../Classes/Extension/DefaultClean.php | 8 +-
.../Classes/Extension/DefaultImage.php | 4 +-
.../Classes/Extension/DefaultInline.php | 8 +-
.../Classes/Extension/DefaultLink.php | 4 +-
.../Classes/Extension/DefinitionList.php | 8 +-
.../Classes/Extension/EditElement.php | 4 +-
.../Classes/Extension/FindReplace.php | 4 +-
.../Classes/Extension/InlineElements.php | 4 +-
.../Classes/Extension/InsertSmiley.php | 4 +-
.../Classes/Extension/Language.php | 10 +-
.../Classes/Extension/MicroDataSchema.php | 4 +-
.../Classes/Extension/Plaintext.php | 8 +-
.../Classes/Extension/RemoveFormat.php | 4 +-
.../Classes/Extension/SelectFont.php | 10 +-
.../Classes/Extension/Spellchecker.php | 4 +-
.../Classes/Extension/TableOperations.php | 8 +-
.../Classes/Extension/TextIndicator.php | 4 +-
.../Classes/Extension/Typo3Color.php | 8 +-
.../Classes/Extension/Typo3HtmlParser.php | 8 +-
.../Classes/Extension/Typo3Image.php | 4 +-
.../Classes/Extension/Typo3Link.php | 10 +-
.../Classes/Extension/UndoRedo.php | 4 +-
.../Classes/Extension/UserElements.php | 4 +-
.../sysext/rtehtmlarea/Classes/FolderTree.php | 2 +-
.../Hook/Install/DeprecatedRteProperties.php | 26 +-
.../Classes/Hook/SoftReferenceHook.php | 6 +-
typo3/sysext/rtehtmlarea/Classes/PageTree.php | 10 +-
.../rtehtmlarea/Classes/RteHtmlAreaApi.php | 34 +-
.../rtehtmlarea/Classes/RteHtmlAreaBase.php | 98 +++---
.../rtehtmlarea/Classes/SelectImage.php | 48 +--
typo3/sysext/rtehtmlarea/Classes/User.php | 4 +-
typo3/sysext/rtehtmlarea/mod3/index.php | 4 +-
typo3/sysext/rtehtmlarea/mod4/index.php | 4 +-
typo3/sysext/rtehtmlarea/mod5/index.php | 4 +-
typo3/sysext/rtehtmlarea/mod6/index.php | 2 +-
.../Classes/Salt/AbstractSalt.php | 2 +-
.../Classes/Salt/BlowfishSalt.php | 18 +-
.../saltedpasswords/Classes/Salt/Md5Salt.php | 12 +-
.../Classes/Salt/PhpassSalt.php | 20 +-
.../Classes/Salt/SaltFactory.php | 2 +-
.../Classes/Salt/SaltInterface.php | 12 +-
.../Classes/SaltedPasswordService.php | 6 +-
.../Classes/Task/BulkUpdateFieldProvider.php | 2 +-
.../Classes/Task/BulkUpdateTask.php | 10 +-
.../ExtensionManagerConfigurationUtility.php | 2 +-
.../Utility/SaltedPasswordsUtility.php | 4 +-
.../AdditionalFieldProviderInterface.php | 2 +-
.../Controller/SchedulerModuleController.php | 6 +-
.../Classes/CronCommand/CronCommand.php | 12 +-
.../Classes/CronCommand/NormalizeCommand.php | 4 +-
.../scheduler/Classes/Example/SleepTask.php | 2 +-
.../SleepTaskAdditionalFieldProvider.php | 2 +-
.../scheduler/Classes/Example/TestTask.php | 2 +-
.../TestTaskAdditionalFieldProvider.php | 2 +-
typo3/sysext/scheduler/Classes/Execution.php | 20 +-
typo3/sysext/scheduler/Classes/Scheduler.php | 12 +-
.../scheduler/Classes/Task/AbstractTask.php | 26 +-
...rbageCollectionAdditionalFieldProvider.php | 2 +-
.../CachingFrameworkGarbageCollectionTask.php | 2 +-
.../Classes/Task/FileIndexingTask.php | 4 +-
...orageExtractionAdditionalFieldProvider.php | 2 +-
.../Task/FileStorageExtractionTask.php | 2 +-
...StorageIndexingAdditionalFieldProvider.php | 2 +-
.../Classes/Task/FileStorageIndexingTask.php | 2 +-
...rbageCollectionAdditionalFieldProvider.php | 2 +-
.../Task/RecyclerGarbageCollectionTask.php | 4 +-
...rbageCollectionAdditionalFieldProvider.php | 8 +-
.../Task/TableGarbageCollectionTask.php | 4 +-
.../Controller/SetupModuleController.php | 2 +-
.../Classes/AbstractAuthenticationService.php | 2 +-
.../sv/Classes/AuthenticationService.php | 7 +-
.../sv/Classes/Report/ServicesListReport.php | 2 +-
.../sysext/sys_action/Classes/ActionTask.php | 4 +-
.../sys_action/Classes/ActionToolbarMenu.php | 2 +-
.../sys_note/Classes/Core/Bootstrap.php | 2 +-
.../sys_note/Classes/Domain/Model/SysNote.php | 4 +-
.../t3editor/Classes/Hook/FileEditHook.php | 2 +-
.../Hook/TypoScriptTemplateInfoHook.php | 2 +-
typo3/sysext/t3editor/Classes/T3editor.php | 2 +-
.../Controller/TaskModuleController.php | 2 +-
...mplateAnalyzerModuleFunctionController.php | 2 +-
...ConstantEditorModuleFunctionController.php | 2 +-
...ateInformationModuleFunctionController.php | 2 +-
...eObjectBrowserModuleFunctionController.php | 2 +-
.../Controller/VersionModuleController.php | 2 +-
.../Classes/DataHandler/CommandMap.php | 4 +-
.../Classes/Dependency/ElementEntity.php | 4 +-
.../version/Classes/Hook/PreviewHook.php | 2 +-
.../Classes/Controller/PreviewController.php | 2 +-
.../Classes/Domain/Model/CombinedRecord.php | 4 +-
.../Classes/Domain/Model/DatabaseRecord.php | 2 +-
.../Classes/ExtDirect/AbstractHandler.php | 4 +-
.../Classes/ExtDirect/ActionHandler.php | 2 +-
.../Classes/ExtDirect/MassActionHandler.php | 6 +-
.../WorkspaceSelectorToolbarItem.php | 2 +-
.../Classes/Hook/BackendUtilityHook.php | 2 +-
.../Classes/Hook/DataHandlerHook.php | 2 +-
.../Classes/Service/AutoPublishService.php | 2 +-
.../Classes/Service/GridDataService.php | 10 +-
.../Classes/Service/StagesService.php | 18 +-
.../Classes/Service/WorkspaceService.php | 12 +-
.../Classes/Task/AutoPublishTask.php | 2 +-
.../Classes/Task/CleanupPreviewLinkTask.php | 2 +-
630 files changed, 2442 insertions(+), 2443 deletions(-)
diff --git a/typo3/class.browse_links.php b/typo3/class.browse_links.php
index 7cf02b2dfc2c..49578b260fe1 100644
--- a/typo3/class.browse_links.php
+++ b/typo3/class.browse_links.php
@@ -86,7 +86,7 @@ class localPageTree extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
*
* @param int $doktype Doktype value to test
* @param int $uid uid to test.
- * @return boolean
+ * @return bool
*/
public function ext_isLinkable($doktype, $uid) {
if ($uid && $doktype < 199) {
@@ -141,7 +141,7 @@ class TBE_PageTree extends localPageTree {
*
* @param int $doktype Doktype value to test
* @param int $uid uid to test.
- * @return boolean
+ * @return bool
*/
public function ext_isLinkable($doktype, $uid) {
return TRUE;
@@ -209,7 +209,7 @@ class localFolderTree extends \TYPO3\CMS\Backend\Tree\View\FolderTreeView {
* Returns TRUE if the input "record" contains a folder which can be linked.
*
* @param \TYPO3\CMS\Core\Resource\Folder $folderObject Object with information about the folder element. Contains keys like title, uid, path, _title
- * @return boolean TRUE is returned if the path is found in the web-part of the server and is NOT a recycler or temp folder
+ * @return bool TRUE is returned if the path is found in the web-part of the server and is NOT a recycler or temp folder
*/
public function ext_isLinkable(\TYPO3\CMS\Core\Resource\Folder $folderObject) {
if (strstr($folderObject->getIdentifier(), '_recycler_') || strstr($folderObject->getIdentifier(), '_temp_')) {
@@ -258,7 +258,7 @@ class TBE_FolderTree extends localFolderTree {
* Returns TRUE if the input "record" contains a folder which can be linked.
*
* @param \TYPO3\CMS\Core\Resource\Folder $folderObject object with information about the folder element. Contains keys like title, uid, path, _title
- * @return boolean TRUE is returned if the path is NOT a recycler or temp folder AND if ->ext_noTempRecyclerDirs is not set.
+ * @return bool TRUE is returned if the path is NOT a recycler or temp folder AND if ->ext_noTempRecyclerDirs is not set.
*/
public function ext_isLinkable($folderObject) {
if ($this->ext_noTempRecyclerDirs && (substr($folderObject->getIdentifier(), -7) == '_temp_/' || substr($folderObject->getIdentifier(), -11) == '_recycler_/')) {
diff --git a/typo3/db_new.php b/typo3/db_new.php
index 3b2b3d6c989a..f454122a79e3 100644
--- a/typo3/db_new.php
+++ b/typo3/db_new.php
@@ -45,7 +45,7 @@ class newRecordLocalPageTree extends \TYPO3\CMS\Backend\Tree\View\PageTreeView {
* Here the branch is expanded if the current id matches the global id for the listing/new
*
* @param int $id The ID (page id) of the element
- * @return boolean Returns TRUE if the IDs matches
+ * @return bool Returns TRUE if the IDs matches
*/
public function expandNext($id) {
return $id == $GLOBALS['SOBE']->id ? 1 : 0;
diff --git a/typo3/show_rechis.php b/typo3/show_rechis.php
index e94ebd1273b6..e89dbee59dc7 100644
--- a/typo3/show_rechis.php
+++ b/typo3/show_rechis.php
@@ -15,7 +15,7 @@
/**
* Shows information about a database or file item
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
require __DIR__ . '/init.php';
diff --git a/typo3/sysext/backend/Classes/AjaxLoginHandler.php b/typo3/sysext/backend/Classes/AjaxLoginHandler.php
index 98b960b08d9a..662aac9fd28c 100644
--- a/typo3/sysext/backend/Classes/AjaxLoginHandler.php
+++ b/typo3/sysext/backend/Classes/AjaxLoginHandler.php
@@ -49,7 +49,7 @@ class AjaxLoginHandler {
/**
* Checks if a user is logged in and the session is active.
*
- * @return boolean
+ * @return bool
*/
protected function isAuthorizedBackendSession() {
return isset($GLOBALS['BE_USER']) && $GLOBALS['BE_USER'] instanceof \TYPO3\CMS\Core\Authentication\BackendUserAuthentication && isset($GLOBALS['BE_USER']->user['uid']);
@@ -58,7 +58,7 @@ class AjaxLoginHandler {
/**
* Check whether the user was already authorized or not
*
- * @return boolean
+ * @return bool
*/
protected function hasLoginBeenProcessed() {
$loginFormData = $GLOBALS['BE_USER']->getLoginFormData();
diff --git a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
index f521bbaa43ee..e7286a64ae2e 100644
--- a/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
+++ b/typo3/sysext/backend/Classes/ClickMenu/ClickMenu.php
@@ -1476,7 +1476,7 @@ class ClickMenu {
/**
* Returns TRUE if there should be writing to the div-layers (commands sent to clipboard MUST NOT write to div-layers)
*
- * @return boolean
+ * @return bool
*/
public function isCMlayers() {
return !$this->CB;
diff --git a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
index fcbcb76041e1..814191de63f8 100644
--- a/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
+++ b/typo3/sysext/backend/Classes/Clipboard/Clipboard.php
@@ -405,7 +405,7 @@ class Clipboard {
/**
* Returns true if the clipboard contains elements
*
- * @return boolean
+ * @return bool
*/
public function hasElements() {
foreach ($this->clipData as $data) {
@@ -831,7 +831,7 @@ class Clipboard {
/**
* Reports if the current pad has elements (does not check file/DB type OR if file/DBrecord exists or not. Only counting array)
*
- * @return boolean TRUE if elements exist.
+ * @return bool TRUE if elements exist.
*/
public function isElements() {
return is_array($this->clipData[$this->current]['el']) && count($this->clipData[$this->current]['el']);
diff --git a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
index 54d26d1ea331..48df5b61304a 100644
--- a/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
+++ b/typo3/sysext/backend/Classes/Configuration/TranslationConfigurationProvider.php
@@ -135,7 +135,7 @@ class TranslationConfigurationProvider {
* Returns the table in which translations for input table is found.
*
* @param string $table The table name
- * @return boolean
+ * @return bool
*/
public function getTranslationTable($table) {
return $this->isTranslationInOwnTable($table) ? $table : $this->foreignTranslationTable($table);
@@ -145,7 +145,7 @@ class TranslationConfigurationProvider {
* Returns TRUE, if the input table has localization enabled and done so with records from the same table
*
* @param string $table The table name
- * @return boolean
+ * @return bool
*/
public function isTranslationInOwnTable($table) {
return $GLOBALS['TCA'][$table]['ctrl']['languageField'] && $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] && !$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerTable'];
diff --git a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index a03780dcc802..5b77e6f5e2ac 100644
--- a/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/backend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -36,7 +36,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
* Evaluates a TypoScript condition given as input, eg. "[browser=net][...(other conditions)...]"
*
* @param string $string The condition to match against its criterias.
- * @return boolean Whether the condition matched
+ * @return bool Whether the condition matched
* @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::parse()
*/
protected function evaluateCondition($string) {
@@ -121,7 +121,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
* (i.e. in the Extension Manager, etc.) this function will return "0", so that
* the accordant conditions (e.g. PIDinRootline) will return "FALSE"
*
- * @return integer The determined page id or otherwise 0
+ * @return int The determined page id or otherwise 0
*/
protected function determinePageId() {
$pageId = 0;
@@ -167,7 +167,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
* @param string $table Name of the table
* @param int $id Id of the accordant record
* @param bool $ignoreTable Whether to ignore the page, if TRUE a positive
- * @return integer Id of the page the record is persisted on
+ * @return int Id of the page the record is persisted on
*/
protected function getPageIdByRecord($table, $id, $ignoreTable = FALSE) {
$pageId = 0;
@@ -188,7 +188,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
* This information is required for conditions in BE for PIDupinRootline.
*
* @param int $pid The pid the check for as parent page
- * @return boolean TRUE if the is currently a new page record being edited with $pid as uid of the parent page
+ * @return bool TRUE if the is currently a new page record being edited with $pid as uid of the parent page
*/
protected function isNewPageWithPageId($pageId) {
if (isset($GLOBALS['SOBE']) && $GLOBALS['SOBE'] instanceof \TYPO3\CMS\Backend\Controller\EditDocumentController) {
@@ -235,7 +235,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
/**
* Get the id of the current user.
*
- * @return integer The id of the current user
+ * @return int The id of the current user
*/
protected function getUserId() {
$userId = $GLOBALS['BE_USER']->user['uid'];
@@ -245,7 +245,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
/**
* Determines if a user is logged in.
*
- * @return boolean Determines if a user is logged in
+ * @return bool Determines if a user is logged in
*/
protected function isUserLoggedIn() {
$userLoggedIn = FALSE;
@@ -258,7 +258,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
/**
* Determines whether the current user is admin.
*
- * @return boolean Whether the current user is admin
+ * @return bool Whether the current user is admin
*/
protected function isAdminUser() {
$isAdminUser = FALSE;
diff --git a/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php b/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php
index df87a880fa8f..e76e8545f572 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/AbstractContextMenuDataProvider.php
@@ -83,7 +83,7 @@ abstract class AbstractContextMenuDataProvider {
*
* @param \TYPO3\CMS\Backend\Tree\TreeNode $node
* @param string $displayCondition
- * @return boolean
+ * @return bool
*/
protected function evaluateDisplayCondition(\TYPO3\CMS\Backend\Tree\TreeNode $node, $displayCondition) {
if ($displayCondition === '') {
diff --git a/typo3/sysext/backend/Classes/ContextMenu/ContextMenuAction.php b/typo3/sysext/backend/Classes/ContextMenu/ContextMenuAction.php
index f0fb09f30c36..058bdf6f98d4 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/ContextMenuAction.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/ContextMenuAction.php
@@ -209,7 +209,7 @@ class ContextMenuAction {
/**
* Returns TRUE if the action has child actions
*
- * @return boolean
+ * @return bool
*/
public function hasChildActions() {
if ($this->childActions !== NULL) {
diff --git a/typo3/sysext/backend/Classes/Controller/BackendController.php b/typo3/sysext/backend/Classes/Controller/BackendController.php
index e7b89c2a752a..07a41e893315 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendController.php
@@ -657,7 +657,7 @@ class BackendController {
* Adds a javscript file to the backend after it has been checked that it exists
*
* @param string $javascriptFile Javascript file reference
- * @return boolean TRUE if the javascript file was successfully added, FALSE otherwise
+ * @return bool TRUE if the javascript file was successfully added, FALSE otherwise
*/
public function addJavascriptFile($javascriptFile) {
$jsFileAdded = FALSE;
@@ -687,7 +687,7 @@ class BackendController {
*
* @param string $cssFileName The css file's name with out the .css ending
* @param string $cssFile Css file reference
- * @return boolean TRUE if the css file was added, FALSE otherwise
+ * @return bool TRUE if the css file was added, FALSE otherwise
*/
public function addCssFile($cssFileName, $cssFile) {
$cssFileAdded = FALSE;
diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index 2b9125d944ad..56a873d969b8 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -307,7 +307,7 @@ class EditDocumentController {
/**
* Detects, if a save command has been triggered.
*
- * @return boolean TRUE, then save the document (data submitted)
+ * @return bool TRUE, then save the document (data submitted)
*/
public function doProcessData() {
$out = $this->doSave || isset($_POST['_savedok_x']) || isset($_POST['_saveandclosedok_x']) || isset($_POST['_savedokview_x']) || isset($_POST['_savedoknew_x']) || isset($_POST['_translation_savedok_x']) || isset($_POST['_translation_savedokclear_x']);
diff --git a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
index ac15daf123b0..feee9306c891 100644
--- a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
@@ -67,7 +67,7 @@ class EditFileController {
/**
* Initialize script class
*
- * @return void
+ * @return void
*/
protected function init() {
// Setting target, which must be a file reference to a file within the mounts.
diff --git a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
index 3e231ab7aee2..ac4154e8c9bd 100644
--- a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
@@ -79,7 +79,7 @@ class FileUploadController {
/**
* Initialize
*
- * @return void
+ * @return void
*/
protected function init() {
// Initialize GPvars:
diff --git a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
index cbcbf13f9f84..2d473bc6e505 100644
--- a/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
+++ b/typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
@@ -76,7 +76,7 @@ class FileSystemNavigationFrameController {
/**
* Initialiation of the script class
*
- * @return void
+ * @return void
*/
protected function init() {
// Setting backPath
diff --git a/typo3/sysext/backend/Classes/Controller/LoginController.php b/typo3/sysext/backend/Classes/Controller/LoginController.php
index 240afd2fadf0..43c5a89b259a 100644
--- a/typo3/sysext/backend/Classes/Controller/LoginController.php
+++ b/typo3/sysext/backend/Classes/Controller/LoginController.php
@@ -542,7 +542,7 @@ class LoginController {
/**
* Checks if login credentials are currently submitted
*
- * @return boolean
+ * @return bool
*/
protected function isLoginInProgress() {
$username = GeneralUtility::_GP('username');
diff --git a/typo3/sysext/backend/Classes/Controller/NewRecordController.php b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
index a369eaa09ce0..cd3f2d731ff9 100644
--- a/typo3/sysext/backend/Classes/Controller/NewRecordController.php
+++ b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
@@ -538,7 +538,7 @@ class NewRecordController {
*
* @param string $a First array element for compare
* @param string $b First array element for compare
- * @return integer -1 for lower, 0 for equal, 1 for greater
+ * @return int -1 for lower, 0 for equal, 1 for greater
*/
public function sortNewRecordsByConfig($a, $b) {
if (count($this->newRecordSortList)) {
@@ -597,7 +597,7 @@ class NewRecordController {
*
* @param array $pid_row Record for parent page.
* @param string $checkTable Table name to check
- * @return boolean Returns TRUE if the tablename $checkTable is allowed to be created on the page with record $pid_row
+ * @return bool Returns TRUE if the tablename $checkTable is allowed to be created on the page with record $pid_row
*/
public function isTableAllowedForThisPage($pid_row, $checkTable) {
if (!is_array($pid_row)) {
@@ -633,7 +633,7 @@ class NewRecordController {
* @param string $table Table name to test if in allowedTables
* @param array $allowedNewTables Array of new tables that are allowed.
* @param array $deniedNewTables Array of new tables that are not allowed.
- * @return boolean Returns TRUE if a link for creating new records should be displayed for $table
+ * @return bool Returns TRUE if a link for creating new records should be displayed for $table
*/
public function showNewRecLink($table, array $allowedNewTables = array(), array $deniedNewTables = array()) {
diff --git a/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php b/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
index 4436b9d3ec1b..7e44907413eb 100644
--- a/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
+++ b/typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
@@ -99,7 +99,7 @@ class PageTreeNavigationController {
/**
* Initialization of the class
*
- * @return void
+ * @return void
*/
protected function init() {
// Setting backPath
@@ -187,7 +187,7 @@ class PageTreeNavigationController {
/**
* Main function, rendering the browsable page tree
*
- * @return void
+ * @return void
*/
public function main() {
// Produce browse-tree:
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
index bceaef1de9e9..f0f925cb1e97 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
@@ -115,7 +115,7 @@ class ColorpickerController {
/**
* Initialises the Class
*
- * @return void
+ * @return void
*/
protected function init() {
// Setting GET vars (used in frameset script):
@@ -186,7 +186,7 @@ class ColorpickerController {
/**
* Main Method, rendering either colorpicker or frameset depending on ->showPicker
*
- * @return void
+ * @return void
*/
public function main() {
// Show frameset by default:
@@ -407,7 +407,7 @@ class ColorpickerController {
* Determines whether submitted field change functions are valid
* and are coming from the system and not from an external abuse.
*
- * @return boolean Whether the submitted field change functions are valid
+ * @return bool Whether the submitted field change functions are valid
*/
protected function areFieldChangeFunctionsValid() {
return $this->fieldChangeFunc && $this->fieldChangeFuncHash && $this->fieldChangeFuncHash === GeneralUtility::hmac($this->fieldChangeFunc);
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php b/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
index f997444a90f5..d2ef3b501912 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
@@ -870,7 +870,7 @@ class FormsController {
*
* @param string $table Table name
* @param int $uid Record uid
- * @return boolean
+ * @return bool
* @todo: Refactor to remove duplicate code (see TableController, RteController)
*/
protected function checkEditAccess($table, $uid) {
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php b/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
index c43434ec0a67..82398244c3b3 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
@@ -255,7 +255,7 @@ class RteController {
*
* @param string $table Table name
* @param int $uid Record uid
- * @return boolean
+ * @return bool
* @todo: Refactor to remove duplicate code (see FormsController, TableController)
*/
public function checkEditAccess($table, $uid) {
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
index f3ae3884c124..60b44e6bb10f 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
@@ -579,7 +579,7 @@ class TableController {
*
* @param string $table Table name
* @param int $uid Record uid
- * @return boolean
+ * @return bool
* @todo: Refactor to remove duplicate code (see FormsController, RteController)
*/
protected function checkEditAccess($table, $uid) {
diff --git a/typo3/sysext/backend/Classes/Form/Element/InlineElement.php b/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
index 440ffc0b95d6..c799f2ccfe52 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InlineElement.php
@@ -1709,7 +1709,7 @@ class InlineElement {
*
* @param string $table The table name
* @param int $parentPid The pid of the parent record
- * @return integer The corrected pid to be used for a new record
+ * @return int The corrected pid to be used for a new record
*/
protected function getNewRecordPid($table, $parentPid = NULL) {
$newRecordPid = $this->inlineFirstPid;
@@ -1904,7 +1904,7 @@ class InlineElement {
* Calculates structure level.
*
* @param int $level Which level to return
- * @return boolean|integer
+ * @return bool|int
*/
protected function calculateStructureLevel($level) {
$result = FALSE;
@@ -2012,7 +2012,7 @@ class InlineElement {
* @param string $table The table name of the record
* @param string $field The field name which this element is supposed to edit
* @param array $row The record data array of the parent
- * @return boolean If critical configuration errors were found, FALSE is returned
+ * @return bool If critical configuration errors were found, FALSE is returned
*/
public function checkConfiguration(&$config) {
$foreign_table = $config['foreign_table'];
@@ -2055,7 +2055,7 @@ class InlineElement {
* @param string $cmd The command that sould be performed ('new' or 'edit')
* @param string $table The table to check access for
* @param string $theUid The record uid of the table
- * @return boolean Returns TRUE is the user has access, or FALSE if not
+ * @return bool Returns TRUE is the user has access, or FALSE if not
*/
public function checkAccess($cmd, $table, $theUid) {
// Checking if the user has permissions? (Only working as a precaution, because the final permission check is always down in TCE. But it's good to notify the user on beforehand...)
@@ -2124,7 +2124,7 @@ class InlineElement {
* A boolean value is return depending on how the comparison was successful.
*
* @param array $compare Keys and values to compare to the ['config'] part of the top level of the stack
- * @return boolean Whether the comparison was successful
+ * @return bool Whether the comparison was successful
* @see arrayCompareComplex
*/
public function compareStructureConfiguration($compare) {
@@ -2181,7 +2181,7 @@ class InlineElement {
*
* @param string $table The table to check
* @param string $field The field on this table to check
- * @return boolean Is inline child and field is responsible for the label
+ * @return bool Is inline child and field is responsible for the label
*/
public function isInlineChildAndLabelField($table, $field) {
$level = $this->getStructureLevel(-1);
@@ -2197,7 +2197,7 @@ class InlineElement {
* Get the depth of the stable structure stack.
* (count($this->inlineStructure['stable'])
*
- * @return integer The depth of the structure stack
+ * @return int The depth of the structure stack
*/
public function getStructureDepth() {
return count($this->inlineStructure['stable']);
@@ -2233,7 +2233,7 @@ class InlineElement {
* @param array $subjectArray The array to search in
* @param array $searchArray The array with keys and values to search for
* @param string $type Use '%AND' or '%OR' for comparison
- * @return boolean The result of the comparison
+ * @return bool The result of the comparison
*/
public function arrayCompareComplex($subjectArray, $searchArray, $type = '') {
$localMatches = 0;
@@ -2289,7 +2289,7 @@ class InlineElement {
* Checks whether an object is an associative array.
*
* @param mixed $object The object to be checked
- * @return boolean Returns TRUE, if the object is an associative array
+ * @return bool Returns TRUE, if the object is an associative array
*/
public function isAssociativeArray($object) {
return is_array($object) && count($object) && array_keys($object) !== range(0, sizeof($object) - 1) ? TRUE : FALSE;
@@ -2394,7 +2394,7 @@ class InlineElement {
* @param string $field The field name
* @param array $row The record row from the database
* @param array $config TCA configuration of the field
- * @return boolean Determines whether the field should be skipped.
+ * @return bool Determines whether the field should be skipped.
*/
public function skipField($table, $field, $row, $config) {
$skipThisField = FALSE;
@@ -2443,7 +2443,7 @@ class InlineElement {
*
* @param string $table Name of the child table
* @param int $uid uid of the the child record
- * @return boolean TRUE=expand, FALSE=collapse
+ * @return bool TRUE=expand, FALSE=collapse
*/
public function getExpandedCollapsedState($table, $uid) {
if (isset($this->inlineView[$table]) && is_array($this->inlineView[$table])) {
@@ -2497,7 +2497,7 @@ class InlineElement {
/**
* Returns the the margin in pixels, that is used for each new inline level.
*
- * @return integer A pixel value for the margin of each new inline level.
+ * @return int A pixel value for the margin of each new inline level.
*/
public function getLevelMargin() {
$margin = ($this->inlineStyles['margin-right'] + 1) * 2;
diff --git a/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php b/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
index 2a3e09c118b5..61b2e0952fce 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SuggestDefaultReceiver.php
@@ -290,7 +290,7 @@ class SuggestDefaultReceiver {
*
* @param array $row
* @param int $uid
- * @return boolean
+ * @return bool
*/
protected function checkRecordAccess($row, $uid) {
$retValue = TRUE;
diff --git a/typo3/sysext/backend/Classes/Form/ElementConditionMatcher.php b/typo3/sysext/backend/Classes/Form/ElementConditionMatcher.php
index 5a9e4eeb2220..776f06a001cd 100644
--- a/typo3/sysext/backend/Classes/Form/ElementConditionMatcher.php
+++ b/typo3/sysext/backend/Classes/Form/ElementConditionMatcher.php
@@ -44,7 +44,7 @@ class ElementConditionMatcher {
* @param array $record
* @param string $flexformValueKey
* @param int $recursionLevel Internal level of recursion
- * @return boolean TRUE if condition evaluates successfully
+ * @return bool TRUE if condition evaluates successfully
*/
public function match($displayCondition, array $record = array(), $flexformValueKey = '', $recursionLevel = 0) {
if ($recursionLevel > 99) {
@@ -114,7 +114,7 @@ class ElementConditionMatcher {
* @param string $displayCondition
* @param array $record
* @param string $flexformValueKey
- * @return boolean
+ * @return bool
* @see match()
*/
protected function matchSingle($displayCondition, array $record = array(), $flexformValueKey = '') {
@@ -152,7 +152,7 @@ class ElementConditionMatcher {
* "EXT:saltedpasswords:LOADED:TRUE" => TRUE, if extension saltedpasswords is loaded.
*
* @param string $condition
- * @return boolean
+ * @return bool
*/
protected function matchExtensionCondition($condition) {
$result = FALSE;
@@ -175,7 +175,7 @@ class ElementConditionMatcher {
* "FIELD:sys_language_uid:>:0" => TRUE, if the field 'sys_language_uid' is greater than 0
*
* @param string $condition
- * @return boolean
+ * @return bool
*/
protected function matchFieldCondition($condition) {
list($fieldName, $operator, $operand) = explode(':', $condition, 3);
@@ -242,7 +242,7 @@ class ElementConditionMatcher {
/**
* Evaluates TRUE if current backend user is an admin.
*
- * @return boolean
+ * @return bool
*/
protected function matchHideForNonAdminsCondition() {
return (bool) $this->getBackendUser()->isAdmin();
@@ -253,7 +253,7 @@ class ElementConditionMatcher {
* Works only for <langChildren>=1, otherwise it has no effect.
*
* @param string $condition
- * @return boolean
+ * @return bool
*/
protected function matchHideL10nSiblingsCondition($condition) {
$result = FALSE;
@@ -273,7 +273,7 @@ class ElementConditionMatcher {
* "REC:NEW:FALSE" => TRUE, if the record is already persisted (has a uid > 0)
*
* @param string $condition
- * @return boolean
+ * @return bool
*/
protected function matchRecordCondition($condition) {
$result = FALSE;
@@ -293,7 +293,7 @@ class ElementConditionMatcher {
* Requires a record set via ->setRecord()
*
* @param string $condition
- * @return boolean
+ * @return bool
*/
protected function matchVersionCondition($condition) {
$result = FALSE;
diff --git a/typo3/sysext/backend/Classes/Form/FlexFormsHelper.php b/typo3/sysext/backend/Classes/Form/FlexFormsHelper.php
index 29361ebf503b..acefc33fdc9b 100644
--- a/typo3/sysext/backend/Classes/Form/FlexFormsHelper.php
+++ b/typo3/sysext/backend/Classes/Form/FlexFormsHelper.php
@@ -264,7 +264,7 @@ class FlexFormsHelper extends \TYPO3\CMS\Backend\Form\FormEngine {
*
* @param array $array1 First array
* @param array $array2 Second array
- * @return integer Negative int if first array is lower, zero if both are identical, and positive if second is higher
+ * @return int Negative int if first array is lower, zero if both are identical, and positive if second is higher
*/
static public function compareArraysByFirstValue(array $array1, array $array2) {
$array1 = reset($array1);
diff --git a/typo3/sysext/backend/Classes/Form/FormDataTraverser.php b/typo3/sysext/backend/Classes/Form/FormDataTraverser.php
index 8456ffbfe400..745ed9375df0 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataTraverser.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataTraverser.php
@@ -326,7 +326,7 @@ class FormDataTraverser {
* If exactly one table was defined the name of that table is returned.
*
* @param array $fieldConfig "config" section of a group field from the TCA.
- * @return boolean|string FALSE if none ore more than one table was found, otherwise the name of the table.
+ * @return bool|string FALSE if none ore more than one table was found, otherwise the name of the table.
*/
protected function getAllowedTableForGroupField(array $fieldConfig) {
$allowedTable = FALSE;
@@ -363,7 +363,7 @@ class FormDataTraverser {
* row is returned, otherwise FALSE.
*
* @param array $relatedUids All possible matching UIDs.
- * @return boolean|array The row data if a matching record was found, FALSE otherwise.
+ * @return bool|array The row data if a matching record was found, FALSE otherwise.
*/
protected function getMatchingRecordRowByTranslation(array $relatedUids) {
if ($this->originalLanguageUid === FALSE) {
diff --git a/typo3/sysext/backend/Classes/Form/FormEngine.php b/typo3/sysext/backend/Classes/Form/FormEngine.php
index 6771f9ce1fa8..958a1eb1edc7 100644
--- a/typo3/sysext/backend/Classes/Form/FormEngine.php
+++ b/typo3/sysext/backend/Classes/Form/FormEngine.php
@@ -1353,7 +1353,7 @@ class FormEngine {
* @param string $field Name of the field
* @param array $row Accordant data
* @param array $PA Parameters array with rendering instructions
- * @return boolean
+ * @return bool
*/
protected function isDisabledNullValueField($table, $field, array $row, array $PA) {
$result = FALSE;
@@ -2971,7 +2971,7 @@ class FormEngine {
* @param string $row Palette ID
* @param string $palette The record array
* @param bool $collapsed TRUE if collapsed
- * @return boolean Is collapsed
+ * @return bool Is collapsed
*/
public function wrapPaletteField($code, $table, $row, $palette, $collapsed) {
$display = $collapsed ? 'none' : 'block';
@@ -3546,7 +3546,7 @@ class FormEngine {
* Sets the design to the backend design.
* Backend
*
- * @return void
+ * @return void
*/
public function setNewBEDesign() {
$template = GeneralUtility::getUrl(PATH_typo3 . $this->templateFile);
@@ -4355,7 +4355,7 @@ class FormEngine {
*
* @param string $table The table name
* @param int $palette The palette pointer/number
- * @return boolean
+ * @return bool
*/
public function isPalettesCollapsed($table, $palette) {
if (is_array($GLOBALS['TCA'][$table]['palettes'][$palette]) && $GLOBALS['TCA'][$table]['palettes'][$palette]['isHiddenPalette']) {
@@ -4392,7 +4392,7 @@ class FormEngine {
* Returns TRUE if descriptions should be loaded always
*
* @param string $table Table for which to check
- * @return boolean
+ * @return bool
*/
public function doLoadTableDescr($table) {
return $GLOBALS['TCA'][$table]['interface']['always_description'];
diff --git a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
index 252f79703e00..0c78e98bb1c3 100644
--- a/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
+++ b/typo3/sysext/backend/Classes/FrontendBackendUserAuthentication.php
@@ -139,7 +139,7 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
/**
* Determines whether frontend editing is currently active.
*
- * @return boolean Whether frontend editing is active
+ * @return bool Whether frontend editing is active
*/
public function isFrontendEditingActive() {
return $this->extAdmEnabled
@@ -158,7 +158,7 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
/**
* Determines whether the admin panel is enabled and visible.
*
- * @return boolean Whether the admin panel is enabled and visible
+ * @return bool Whether the admin panel is enabled and visible
*/
public function isAdminPanelVisible() {
return $this->extAdmEnabled && !$this->extAdminConfig['hide'] && $GLOBALS['TSFE']->config['config']['admPanel'];
@@ -173,7 +173,7 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
* Implementing the access checks that the typo3/init.php script does before a user is ever logged in.
* Used in the frontend.
*
- * @return boolean Returns TRUE if access is OK
+ * @return bool Returns TRUE if access is OK
*/
public function checkBackendAccessSettingsFromInitPhp() {
// Check Hardcoded lock on BE
@@ -209,7 +209,7 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
* Used in index_ts.php
*
* @param array $pageRec The page record to evaluate for
- * @return boolean TRUE if read access
+ * @return bool TRUE if read access
*/
public function extPageReadAccess($pageRec) {
return $this->isInWebMount($pageRec['uid']) && $this->doesUserHaveAccess($pageRec, 1);
@@ -257,7 +257,7 @@ class FrontendBackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\B
* Returns the number of cached pages for a page id.
*
* @param int $pageId The page id.
- * @return integer The number of pages for this page in the table "cache_pages
+ * @return int The number of pages for this page in the table "cache_pages
*/
public function extGetNumberOfCachedPages($pageId) {
/** @var FrontendInterface $pageCache */
diff --git a/typo3/sysext/backend/Classes/History/RecordHistory.php b/typo3/sysext/backend/Classes/History/RecordHistory.php
index 2fc3f79d7d71..b875905c622e 100644
--- a/typo3/sysext/backend/Classes/History/RecordHistory.php
+++ b/typo3/sysext/backend/Classes/History/RecordHistory.php
@@ -615,7 +615,7 @@ class RecordHistory {
/**
* Creates change log including sub-elements, filling $this->changeLog
*
- * @return integer
+ * @return int
*/
public function createChangeLog() {
$elParts = explode(':', $this->element);
@@ -801,7 +801,7 @@ class RecordHistory {
*
* @param string $table Table of input element
* @param int $uid UID of record
- * @return integer converted UID of record
+ * @return int converted UID of record
*/
public function resolveElement($table, $uid) {
if (isset($GLOBALS['TCA'][$table])) {
@@ -832,7 +832,7 @@ class RecordHistory {
*
* @param string $table
* @param int $uid
- * @return boolean
+ * @return bool
*/
protected function hasPageAccess($table, $uid) {
$uid = (int)$uid;
@@ -857,7 +857,7 @@ class RecordHistory {
* Determines whether user has access to a table.
*
* @param string $table
- * @return boolean
+ * @return bool
*/
protected function hasTableAccess($table) {
return $this->getBackendUser()->check('tables_select', $table);
diff --git a/typo3/sysext/backend/Classes/Module/ModuleLoader.php b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
index 1d6fb1cf5d70..c5fabae37c82 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleLoader.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
@@ -389,7 +389,7 @@ class ModuleLoader {
*
* @param string $name Module name
* @param array $MCONF MCONF array (module configuration array) from the modules conf.php file (contains settings about what access level the module has)
- * @return boolean TRUE if access is granted for $this->BE_USER
+ * @return bool TRUE if access is granted for $this->BE_USER
*/
public function checkModAccess($name, $MCONF) {
if ($MCONF['access']) {
@@ -423,7 +423,7 @@ class ModuleLoader {
*
* @param string $name Module name
* @param array $MCONF MCONF array (module configuration array) from the modules conf.php file (contains settings about workspace restrictions)
- * @return boolean TRUE if access is granted for $this->BE_USER
+ * @return bool TRUE if access is granted for $this->BE_USER
*/
public function checkModWorkspace($name, $MCONF) {
if ($this->observeWorkspaces) {
diff --git a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
index 4fdfda01b6d1..e292caf2fd44 100644
--- a/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
+++ b/typo3/sysext/backend/Classes/RecordList/ElementBrowserRecordList.php
@@ -101,7 +101,7 @@ class ElementBrowserRecordList extends \TYPO3\CMS\Recordlist\RecordList\Database
*
* @param string $table String Table name
* @param array $row Array Record
- * @return boolean True, if all conditions are fulfilled.
+ * @return bool True, if all conditions are fulfilled.
*/
protected function isRowListingConditionFulfilled($table, $row) {
$returnValue = TRUE;
diff --git a/typo3/sysext/backend/Classes/Rte/AbstractRte.php b/typo3/sysext/backend/Classes/Rte/AbstractRte.php
index c7969631223d..430cd15a80e4 100644
--- a/typo3/sysext/backend/Classes/Rte/AbstractRte.php
+++ b/typo3/sysext/backend/Classes/Rte/AbstractRte.php
@@ -50,7 +50,7 @@ class AbstractRte {
* Returns TRUE if the RTE is available. Here you check if the browser requirements are met.
* If there are reasons why the RTE cannot be displayed you simply enter them as text in ->errorLog
*
- * @return boolean TRUE if this RTE object offers an RTE in the current browser environment
+ * @return bool TRUE if this RTE object offers an RTE in the current browser environment
*/
public function isAvailable() {
return TRUE;
diff --git a/typo3/sysext/backend/Classes/Search/LiveSearch/QueryParser.php b/typo3/sysext/backend/Classes/Search/LiveSearch/QueryParser.php
index 389109b1c5a3..bf1e3b8d4721 100644
--- a/typo3/sysext/backend/Classes/Search/LiveSearch/QueryParser.php
+++ b/typo3/sysext/backend/Classes/Search/LiveSearch/QueryParser.php
@@ -81,7 +81,7 @@ class QueryParser {
* Verify if an given query contains a page jump command.
*
* @param string $query A valid value looks like '#14'
- * @return integer
+ * @return int
*/
public function getId($query) {
return str_replace(self::COMMAND_KEY_INDICATOR, '', $query);
@@ -91,7 +91,7 @@ class QueryParser {
* Verify if a given query contains a page jump command.
*
* @param string $query A valid value looks like '#14'
- * @return boolean
+ * @return bool
*/
public function isValidPageJump($query) {
$isValid = FALSE;
@@ -105,7 +105,7 @@ class QueryParser {
* Verify if an given query contains an registered command key.
*
* @param string $query
- * @return boolean
+ * @return bool
*/
public function isValidCommand($query) {
$isValid = FALSE;
diff --git a/typo3/sysext/backend/Classes/Sprite/SpriteManager.php b/typo3/sysext/backend/Classes/Sprite/SpriteManager.php
index 1523c7c4c8ae..6e249d471145 100644
--- a/typo3/sysext/backend/Classes/Sprite/SpriteManager.php
+++ b/typo3/sysext/backend/Classes/Sprite/SpriteManager.php
@@ -62,7 +62,7 @@ class SpriteManager {
/**
* Whether the sprite manager is initialized.
*
- * @return boolean TRUE if sprite manager is initialized
+ * @return bool TRUE if sprite manager is initialized
*/
static public function isInitialized() {
return self::$isInitialized;
diff --git a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
index cc26bbdfd855..10a7ef5a4c62 100644
--- a/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
+++ b/typo3/sysext/backend/Classes/Template/DocumentTemplate.php
@@ -500,7 +500,7 @@ function jumpToUrl(URL) {
* Returns TRUE if click-menu layers can be displayed for the current user/browser
* Use this to test if click-menus (context sensitive menus) can and should be displayed in the backend.
*
- * @return boolean
+ * @return bool
* @deprecated since TYPO3 4.7, will be removed in TYPO3 6.1 - This function makes no sense anymore
*/
public function isCMlayers() {
diff --git a/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php b/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php
index 17c48094da7b..2da35a45c276 100644
--- a/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Toolbar/ClearCacheToolbarItem.php
@@ -114,7 +114,7 @@ class ClearCacheToolbarItem implements ToolbarItemHookInterface {
/**
* Checks whether the user has access to this toolbar item
*
- * @return boolean TRUE if user has access, FALSE if not
+ * @return bool TRUE if user has access, FALSE if not
*/
public function checkAccess() {
$backendUser = $this->getBackendUser();
diff --git a/typo3/sysext/backend/Classes/Toolbar/LiveSearchToolbarItem.php b/typo3/sysext/backend/Classes/Toolbar/LiveSearchToolbarItem.php
index 6eff7e45162c..e4635a0e30c2 100644
--- a/typo3/sysext/backend/Classes/Toolbar/LiveSearchToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Toolbar/LiveSearchToolbarItem.php
@@ -40,7 +40,7 @@ class LiveSearchToolbarItem implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHoo
/**
* Checks whether the user has access to this toolbar item
*
- * @return boolean TRUE if user has access, FALSE if not
+ * @return bool TRUE if user has access, FALSE if not
*/
public function checkAccess() {
$access = FALSE;
diff --git a/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php b/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
index 8ec948ec5583..45bc75358908 100644
--- a/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Toolbar/ShortcutToolbarItem.php
@@ -99,7 +99,7 @@ class ShortcutToolbarItem implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookI
/**
* Checks whether the user has access to this toolbar item
*
- * @return boolean TRUE if user has access, FALSE if not
+ * @return bool TRUE if user has access, FALSE if not
*/
public function checkAccess() {
return (bool) $GLOBALS['BE_USER']->getTSConfigVal('options.enableBookmarks');
diff --git a/typo3/sysext/backend/Classes/Toolbar/ToolbarItemHookInterface.php b/typo3/sysext/backend/Classes/Toolbar/ToolbarItemHookInterface.php
index 17f3fe74ba12..f3ba84d7e9db 100644
--- a/typo3/sysext/backend/Classes/Toolbar/ToolbarItemHookInterface.php
+++ b/typo3/sysext/backend/Classes/Toolbar/ToolbarItemHookInterface.php
@@ -29,7 +29,7 @@ interface ToolbarItemHookInterface {
/**
* Checks whether the user has access to this toolbar item
*
- * @return boolean TRUE if user has access, FALSE if not
+ * @return bool TRUE if user has access, FALSE if not
*/
public function checkAccess();
diff --git a/typo3/sysext/backend/Classes/Tree/ComparableNodeInterface.php b/typo3/sysext/backend/Classes/Tree/ComparableNodeInterface.php
index d279ab6d4b34..02900e288daa 100644
--- a/typo3/sysext/backend/Classes/Tree/ComparableNodeInterface.php
+++ b/typo3/sysext/backend/Classes/Tree/ComparableNodeInterface.php
@@ -40,7 +40,7 @@ interface ComparableNodeInterface
* </pre>
*
* @param \TYPO3\CMS\Backend\Tree\TreeNode $other
- * @return integer see description
+ * @return int see description
*/
public function compareTo($other);
diff --git a/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php b/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
index 882b79992a26..0a53551e78fa 100644
--- a/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
+++ b/typo3/sysext/backend/Classes/Tree/ExtDirectNode.php
@@ -192,7 +192,7 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
/**
* Returns if the node is a leaf node
*
- * @return boolean
+ * @return bool
*/
public function isLeafNode() {
return $this->leaf;
@@ -211,7 +211,7 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
/**
* Returns the expandable indicator
*
- * @return boolean
+ * @return bool
*/
public function isExpandable() {
return $this->expandable;
@@ -230,7 +230,7 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
/**
* Returns the expanded indicator
*
- * @return boolean
+ * @return bool
*/
public function isExpanded() {
if ($this->isLeafNode()) {
@@ -252,7 +252,7 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
/**
* Returns the draggable indicator
*
- * @return boolean
+ * @return bool
*/
public function isDraggable() {
return $this->draggable;
@@ -271,7 +271,7 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
/**
* Returns the indicator if the node is a drop target
*
- * @return boolean
+ * @return bool
*/
public function isDropTarget() {
return $this->isDropTarget;
@@ -343,7 +343,7 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
/**
* Returns the copy mode indicator
*
- * @return boolean
+ * @return bool
*/
public function isInCopyMode() {
return $this->t3InCopyMode;
@@ -362,7 +362,7 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
/**
* Returns the cut mode indicator
*
- * @return boolean
+ * @return bool
*/
public function isInCutMode() {
return $this->t3InCutMode;
@@ -456,7 +456,7 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
/**
* Returns the editable label indicator
*
- * @return boolean
+ * @return bool
*/
public function isLabelEditable() {
return $this->labelIsEditable;
@@ -526,7 +526,7 @@ class ExtDirectNode extends \TYPO3\CMS\Backend\Tree\TreeNode {
/**
* Checks if the node can have child nodes
*
- * @return boolean
+ * @return bool
*/
public function canHaveChildren() {
return $this->allowChildren;
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
index b96da001ead2..6c663b71527c 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/Commands.php
@@ -123,7 +123,7 @@ class Commands {
*
* @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $sourceNode
* @param int $targetId
- * @return integer
+ * @return int
*/
static public function copyNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $sourceNode, $targetId) {
$cmd['pages'][$sourceNode->getId()]['copy'] = $targetId;
@@ -151,7 +151,7 @@ class Commands {
* @param \TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $parentNode
* @param int $targetId
* @param int $pageType
- * @return integer
+ * @return int
*/
static public function createNode(\TYPO3\CMS\Backend\Tree\Pagetree\PagetreeNode $parentNode, $targetId, $pageType) {
$placeholder = 'NEW12345';
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
index 70964ca14be7..fbb97678c949 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/DataProvider.php
@@ -465,7 +465,7 @@ class DataProvider extends \TYPO3\CMS\Backend\Tree\AbstractTreeDataProvider {
* Returns TRUE if the node has child's
*
* @param int $id
- * @return boolean
+ * @return bool
*/
protected function hasNodeSubPages($id) {
$where = $this->getWhereClause($id);
diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
index 54bc14579f2d..b07713e7f7e2 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/PagetreeNode.php
@@ -97,7 +97,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Returns the original id of the element
*
- * @return integer
+ * @return int
*/
public function getWorkspaceId() {
return $this->workspaceId;
@@ -116,7 +116,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Returns the mount point id
*
- * @return integer
+ * @return int
*/
public function getMountPoint() {
return $this->mountPoint;
@@ -135,7 +135,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Returns TRUE if the node is a mount point
*
- * @return boolean
+ * @return bool
*/
public function isMountPoint() {
return $this->isMountPoint;
@@ -163,7 +163,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the user may create pages below the given page
*
- * @return boolean
+ * @return bool
*/
protected function canCreate() {
if (!isset($this->cachedAccessRights['create'])) {
@@ -175,7 +175,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the user has editing rights
*
- * @return boolean
+ * @return bool
*/
protected function canEdit() {
if (!isset($this->cachedAccessRights['edit'])) {
@@ -187,7 +187,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the user has the right to delete the page
*
- * @return boolean
+ * @return bool
*/
protected function canRemove() {
if (!isset($this->cachedAccessRights['remove'])) {
@@ -202,7 +202,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the page can be disabled
*
- * @return boolean
+ * @return bool
*/
public function canBeDisabledAndEnabled() {
return $this->canEdit($this->record) && $GLOBALS['BE_USER']->checkLanguageAccess(0);
@@ -211,7 +211,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the page is allowed to can be cut
*
- * @return boolean
+ * @return bool
*/
public function canBeCut() {
return (
@@ -224,7 +224,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the page is allowed to be edited
*
- * @return boolean
+ * @return bool
*/
public function canBeEdited() {
return $this->canEdit($this->record) && $GLOBALS['BE_USER']->checkLanguageAccess(0);
@@ -233,7 +233,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the page is allowed to be copied
*
- * @return boolean
+ * @return bool
*/
public function canBeCopied() {
return (
@@ -246,7 +246,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if there can be new pages created
*
- * @return boolean
+ * @return bool
*/
public function canCreateNewPages() {
return $this->canCreate($this->record) && $GLOBALS['BE_USER']->checkLanguageAccess(0);
@@ -255,7 +255,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the page is allowed to be removed
*
- * @return boolean
+ * @return bool
*/
public function canBeRemoved() {
return (
@@ -268,7 +268,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if something can be pasted into the node
*
- * @return boolean
+ * @return bool
*/
public function canBePastedInto() {
return (
@@ -281,7 +281,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if something can be pasted after the node
*
- * @return boolean
+ * @return bool
*/
public function canBePastedAfter() {
return (
@@ -294,7 +294,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the page is allowed to show history
*
- * @return boolean
+ * @return bool
*/
public function canShowHistory() {
return $GLOBALS['BE_USER']->checkLanguageAccess(0);
@@ -303,7 +303,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the page is allowed to be viewed
*
- * @return boolean
+ * @return bool
*/
public function canBeViewed() {
return !$this->isDeleted();
@@ -312,7 +312,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the page is allowed to show info
*
- * @return boolean
+ * @return bool
*/
public function canShowInfo() {
return TRUE;
@@ -321,7 +321,7 @@ class PagetreeNode extends \TYPO3\CMS\Backend\Tree\ExtDirectNode {
/**
* Checks if the page is allowed to be a temporary mount point
*
- * @return boolean
+ * @return bool
*/
public function canBeTemporaryMountPoint() {
return TRUE;
diff --git a/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php b/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
index 966cd0e4b87d..c664f40aef77 100644
--- a/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
+++ b/typo3/sysext/backend/Classes/Tree/SortedTreeNodeCollection.php
@@ -28,7 +28,7 @@ class SortedTreeNodeCollection extends \TYPO3\CMS\Backend\Tree\TreeNodeCollectio
* Checks if a specific node is inside the collection
*
* @param \TYPO3\CMS\Backend\Tree\TreeNode $node
- * @return boolean
+ * @return bool
*/
public function contains(\TYPO3\CMS\Backend\Tree\TreeNode $node) {
return $this->offsetOf($node) !== -1;
@@ -50,7 +50,7 @@ class SortedTreeNodeCollection extends \TYPO3\CMS\Backend\Tree\TreeNodeCollectio
* @param \TYPO3\CMS\Backend\Tree\TreeNode $node
* @param int $start
* @param int $end
- * @return integer
+ * @return int
*/
protected function binarySearch(\TYPO3\CMS\Backend\Tree\TreeNode $node, $start, $end) {
if (!$start && $end - $start >= 2 || $end - $start > 2) {
diff --git a/typo3/sysext/backend/Classes/Tree/TreeNode.php b/typo3/sysext/backend/Classes/Tree/TreeNode.php
index 1709f7d29abd..ef2d3dd205aa 100644
--- a/typo3/sysext/backend/Classes/Tree/TreeNode.php
+++ b/typo3/sysext/backend/Classes/Tree/TreeNode.php
@@ -93,7 +93,7 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
/**
* Returns TRUE if the node has child nodes attached
*
- * @return boolean
+ * @return bool
*/
public function hasChildNodes() {
if ($this->childNodes !== NULL) {
@@ -144,7 +144,7 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
* Compares a node if it's identical to another node by the id property.
*
* @param \TYPO3\CMS\Backend\Tree\TreeNode $other
- * @return boolean
+ * @return bool
*/
public function equals(\TYPO3\CMS\Backend\Tree\TreeNode $other) {
return $this->id == $other->getId();
@@ -159,7 +159,7 @@ class TreeNode implements \TYPO3\CMS\Backend\Tree\ComparableNodeInterface, \Seri
* 0 if its equal
*
* @param \TYPO3\CMS\Backend\Tree\TreeNode $other
- * @return integer See description above
+ * @return int See description above
*/
public function compareTo($other) {
if ($this->equals($other)) {
diff --git a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
index 1b627f1fc0f9..29d710855272 100644
--- a/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
@@ -592,7 +592,7 @@ abstract class AbstractTreeView {
* Extending parent function
*
* @param int $id Record id/key
- * @return boolean
+ * @return bool
* @access private
* @see \TYPO3\CMS\Backend\Tree\View\PageTreeView::expandNext()
*/
@@ -710,7 +710,7 @@ abstract class AbstractTreeView {
* Returns the id from the record (typ. uid)
*
* @param array $row Record array
- * @return integer The "uid" field value.
+ * @return int The "uid" field value.
*/
public function getId($row) {
return $row['uid'];
@@ -739,7 +739,7 @@ abstract class AbstractTreeView {
* @param string $depthData HTML-code prefix for recursive calls.
* @param string $blankLineCode ? (internal)
* @param string $subCSSclass CSS class to use for <td> sub-elements
- * @return integer The count of items on the level
+ * @return int The count of items on the level
*/
public function getTree($uid, $depth = 999, $depthData = '', $blankLineCode = '', $subCSSclass = '') {
// Buffer for id hierarchy is reset:
@@ -824,7 +824,7 @@ abstract class AbstractTreeView {
* Returns the number of records having the parent id, $uid
*
* @param int $uid Id to count subitems for
- * @return integer
+ * @return int
* @access private
*/
public function getCount($uid) {
@@ -890,7 +890,7 @@ abstract class AbstractTreeView {
* Getting the tree data: Counting elements in resource
*
* @param mixed $res Data handle
- * @return integer number of items
+ * @return int number of items
* @access private
* @see getDataInit()
*/
diff --git a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
index d9398613deab..fa00f392cd2a 100644
--- a/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/FolderTreeView.php
@@ -169,7 +169,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
* Returns the id from the record - for folders, this is an md5 hash.
*
* @param \TYPO3\CMS\Core\Resource\Folder $folderObject The folder object
- * @return integer The "uid" field value.
+ * @return int The "uid" field value.
*/
public function getId(\TYPO3\CMS\Core\Resource\Folder $folderObject) {
return GeneralUtility::md5Int($folderObject->getCombinedIdentifier());
@@ -320,7 +320,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
* @param \TYPO3\CMS\Core\Resource\Folder $folderObject the folderobject
* @param int $depth Max depth (recursivity limit)
* @param string $type HTML-code prefix for recursive calls.
- * @return integer The count of items on the level
+ * @return int The count of items on the level
* @see getBrowsableTree()
*/
public function getFolderTree(\TYPO3\CMS\Core\Resource\Folder $folderObject, $depth = 999, $type = '') {
@@ -502,7 +502,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
* Counts the number of directories in a file path.
*
* @param \TYPO3\CMS\Core\Resource\Folder $folderObject File path.
- * @return integer
+ * @return int
*/
public function getNumberOfSubfolders(\TYPO3\CMS\Core\Resource\Folder $folderObject) {
$subFolders = $folderObject->getSubfolders();
@@ -512,7 +512,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
/**
* Get stored tree structure AND updating it if needed according to incoming PM GET var.
*
- * @return void
+ * @return void
* @access private
*/
public function initializePositionSaving() {
@@ -543,7 +543,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
*
* @param \TYPO3\CMS\Core\Resource\ResourceStorage $storageObject
* @param \TYPO3\CMS\Core\Resource\Folder $startingPointFolder
- * @return integer
+ * @return int
*/
protected function getShortHashNumberForStorage(\TYPO3\CMS\Core\Resource\ResourceStorage $storageObject = NULL, \TYPO3\CMS\Core\Resource\Folder $startingPointFolder = NULL) {
if (!$this->storageHashNumbers) {
@@ -628,7 +628,7 @@ class FolderTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
/**
* Gets the AJAX status.
*
- * @return boolean
+ * @return bool
*/
public function getAjaxStatus() {
return $this->ajaxStatus;
diff --git a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
index 305597e0bf31..46c9228500b8 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
@@ -300,7 +300,7 @@ class PagePositionMap {
* Uses caching so only one regular lookup is made - hence you can call the function multiple times without worrying about performance.
*
* @param int $pid Page id for which to test.
- * @return boolean
+ * @return bool
*/
public function checkNewPageInPid($pid) {
if (!isset($this->checkNewPageCache[$pid])) {
diff --git a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
index 1d98acfd5b99..8e6d237cb69a 100644
--- a/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/Tree/View/PageTreeView.php
@@ -71,7 +71,7 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\AbstractTreeView {
* Returns TRUE/FALSE if the next level for $id should be expanded - and all levels should, so we always return 1.
*
* @param int $id ID (uid) to test for (see extending classes where this is checked against session data)
- * @return boolean
+ * @return bool
*/
public function expandNext($id) {
return 1;
diff --git a/typo3/sysext/backend/Classes/User/ExtDirect/BackendUserSettingsDataProvider.php b/typo3/sysext/backend/Classes/User/ExtDirect/BackendUserSettingsDataProvider.php
index 8037100af014..f6c97555bf18 100644
--- a/typo3/sysext/backend/Classes/User/ExtDirect/BackendUserSettingsDataProvider.php
+++ b/typo3/sysext/backend/Classes/User/ExtDirect/BackendUserSettingsDataProvider.php
@@ -172,4 +172,4 @@ class BackendUserSettingsDataProvider {
return $subkeys[count($subkeys) - 1];
}
-}
+}
\ No newline at end of file
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index b3255c9065b7..5f1fa54b1a41 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -638,7 +638,7 @@ class BackendUtility {
* Determines whether a table is localizable and has the languageField and transOrigPointerField set in $GLOBALS['TCA'].
*
* @param string $table The table to check
- * @return boolean Whether a table is localizable
+ * @return bool Whether a table is localizable
*/
static public function isTableLocalizable($table) {
$isLocalizable = FALSE;
@@ -1111,7 +1111,7 @@ class BackendUtility {
* @param string $hash 32 bit hash string (eg. a md5 hash of a serialized array identifying the data being stored)
* @param mixed $data The data to store
* @param string $ident $ident is just a textual identification in order to inform about the content!
- * @return void
+ * @return void
*/
static public function storeHash($hash, $data, $ident) {
GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Cache\\CacheManager')->getCache('cache_hash')->set($hash, $data, array('ident_' . $ident), 0);
@@ -1381,7 +1381,7 @@ class BackendUtility {
* Returns the difference in days between input $tstamp and $EXEC_TIME
*
* @param int $tstamp Time stamp, seconds
- * @return integer
+ * @return int
*/
static public function daysUntil($tstamp) {
$delta_t = $tstamp - $GLOBALS['EXEC_TIME'];
@@ -2910,7 +2910,7 @@ class BackendUtility {
* @param string $set Key to set the update signal. When setting, this value contains strings telling WHAT to set. At this point it seems that the value "updatePageTree" is the only one it makes sense to set. If empty, all update signals will be removed.
* @param mixed $params Additional information for the update signal, used to only refresh a branch of the tree
* @return void
- * @see BackendUtility::getUpdateSignalCode()
+ * @see BackendUtility::getUpdateSignalCode()
*/
static public function setUpdateSignal($set = '', $params = '') {
$beUser = static::getBackendUserAuthentication();
@@ -3393,7 +3393,7 @@ class BackendUtility {
* @param string $table Table name
* @param int $uid Record uid
* @param int $pid Record pid, could be negative then pointing to a record from same table whose pid to find and return.
- * @return integer
+ * @return int
* @internal
* @see \TYPO3\CMS\Core\DataHandling\DataHandler::copyRecord(), getTSCpid()
*/
@@ -3435,7 +3435,7 @@ class BackendUtility {
* @param string $table Table name
* @param int $uid Record uid
* @param int $pid Record pid
- * @return integer
+ * @return int
* @internal
* @see \TYPO3\CMS\Backend\Form\FormEngine::getTSCpid()
*/
@@ -3620,7 +3620,7 @@ class BackendUtility {
* Returns TRUE if $modName is set and is found as a main- or submodule in $TBE_MODULES array
*
* @param string $modName Module name
- * @return boolean
+ * @return bool
*/
static public function isModuleSetInTBE_MODULES($modName) {
$loaded = array();
@@ -3868,7 +3868,7 @@ class BackendUtility {
*
* @param string $table Table name
* @param array $row Row (passed by reference) - must be online record!
- * @return boolean TRUE if overlay is made.
+ * @return bool TRUE if overlay is made.
* @see PageRepository::movePlhOl()
*/
static public function movePlhOL($table, &$row) {
@@ -3936,7 +3936,7 @@ class BackendUtility {
*
* @param string $table Name of the table
* @param int $uid Uid of the offline/draft record
- * @return integer The id of the live version of the record (or NULL if nothing was found)
+ * @return int The id of the live version of the record (or NULL if nothing was found)
*/
static public function getLiveVersionIdOfRecord($table, $uid) {
$liveVersionId = NULL;
@@ -4025,7 +4025,7 @@ class BackendUtility {
*
* @param string $table Table name
* @param int $uid Record uid (of live record placeholder)
- * @return integer Uid of offline version if any, otherwise live uid.
+ * @return int Uid of offline version if any, otherwise live uid.
*/
static public function wsMapId($table, $uid) {
if ($wsRec = self::getWorkspaceVersionOfRecord(static::getBackendUserAuthentication()->workspace, $table, $uid, 'uid')) {
@@ -4119,7 +4119,7 @@ class BackendUtility {
* Returns "web" if the $path (absolute) is within the DOCUMENT ROOT - and thereby qualifies as a "web" folder.
*
* @param string $path Path to evaluate
- * @return boolean
+ * @return bool
*/
static public function getPathType_web_nonweb($path) {
return GeneralUtility::isFirstPartOfStr($path, GeneralUtility::getIndpEnv('TYPO3_DOCUMENT_ROOT')) ? 'web' : '';
@@ -4230,7 +4230,7 @@ class BackendUtility {
* in a valid user's web-mount.
*
* @param string $table Name of the table
- * @return boolean
+ * @return bool
*/
static public function isWebMountRestrictionIgnored($table) {
return !empty($GLOBALS['TCA'][$table]['ctrl']['security']['ignoreWebMountRestriction']);
@@ -4242,7 +4242,7 @@ class BackendUtility {
* only can be accessed by admin users.
*
* @param string $table Name of the table
- * @return boolean
+ * @return bool
*/
static public function isRootLevelRestrictionIgnored($table) {
return !empty($GLOBALS['TCA'][$table]['ctrl']['security']['ignoreRootLevelRestriction']);
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php
index 8fbe30bc7536..f6b9daa271f7 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/DataProviderContext.php
@@ -47,7 +47,7 @@ class DataProviderContext implements \TYPO3\CMS\Core\SingletonInterface {
protected $pageTsConfig;
/**
- * @return integer
+ * @return int
*/
public function getPageId() {
return $this->pageId;
diff --git a/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php b/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
index 431f47fce426..c0f8f985ae38 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayout/DefaultDataProvider.php
@@ -151,7 +151,7 @@ class DefaultDataProvider implements DataProviderInterface {
* Returns the storage PID from TCEFORM.
*
* @param array $pageTsConfig
- * @return integer
+ * @return int
*/
protected function getStoragePid(array $pageTsConfig) {
$storagePid = 0;
diff --git a/typo3/sysext/backend/Classes/View/BackendLayoutView.php b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
index 70c62ae348c5..7d7f076fc2f8 100644
--- a/typo3/sysext/backend/Classes/View/BackendLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/BackendLayoutView.php
@@ -165,7 +165,7 @@ class BackendLayoutView implements \TYPO3\CMS\Core\SingletonInterface {
* Returns the backend layout which should be used for this page.
*
* @param int $pageId
- * @return boolean|string Identifier of the backend layout to be used, or FALSE if none
+ * @return bool|string Identifier of the backend layout to be used, or FALSE if none
*/
public function getSelectedCombinedIdentifier($pageId) {
if (!isset($this->selectedCombinedIdentifier[$pageId])) {
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index 1c5834436087..f7089dcaa2d3 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -382,7 +382,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
* Returns the backend layout which should be used for this page.
*
* @param int $id Uid of the current page
- * @return boolean|string Identifier of the backend layout to be used, or FALSE if none
+ * @return bool|string Identifier of the backend layout to be used, or FALSE if none
* @deprecated since TYPO3 CMS 6.2, will be removed two versions later
*/
public function getSelectedBackendLayoutUid($id) {
@@ -1898,7 +1898,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
*
* @param string $table Table name
* @param int $pid Page id
- * @return integer Number of records.
+ * @return int Number of records.
*/
public function numberOfRecords($table, $pid) {
$count = 0;
@@ -1967,7 +1967,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
*
* @param string $table Tablename of table to test
* @param array $row Record row.
- * @return boolean Returns TRUE, if disabled.
+ * @return bool Returns TRUE, if disabled.
*/
public function isDisabled($table, $row) {
$enableCols = $GLOBALS['TCA'][$table]['ctrl']['enablecolumns'];
@@ -2051,7 +2051,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
* @param string $table Table name
* @param array $row Record row (needed, if there are RTE dependencies based on other fields in the record)
* @param string $field Field name
- * @return boolean Returns TRUE if the rich text editor would be enabled/available for the field name specified.
+ * @return bool Returns TRUE if the rich text editor would be enabled/available for the field name specified.
*/
public function isRTEforField($table, $row, $field) {
$specConf = $this->getSpecConfForField($table, $row, $field);
diff --git a/typo3/sysext/backend/Classes/View/PageTreeView.php b/typo3/sysext/backend/Classes/View/PageTreeView.php
index 0e744fb5cab8..e050a2ee81de 100644
--- a/typo3/sysext/backend/Classes/View/PageTreeView.php
+++ b/typo3/sysext/backend/Classes/View/PageTreeView.php
@@ -267,7 +267,7 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
*
* @param string $icon HTML string to wrap, probably an image tag.
* @param string $cmd Command for 'PM' get var
- * @return boolean $isExpand Link-wrapped input string
+ * @return bool $isExpand Link-wrapped input string
* @access private
*/
public function PMiconATagWrap($icon, $cmd, $isExpand = TRUE) {
@@ -344,7 +344,7 @@ class PageTreeView extends \TYPO3\CMS\Backend\Tree\View\BrowseTreeView {
* @param int $depth Max depth (recursivity limit)
* @param string $blankLineCode ? (internal)
* @param string $subCSSclass
- * @return integer The count of items on the level
+ * @return int The count of items on the level
*/
public function getTree($uid, $depth = 999, $blankLineCode = '', $subCSSclass = '') {
// Buffer for id hierarchy is reset:
diff --git a/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
index 8974d7f817b4..9fb15873afeb 100644
--- a/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Backend\Tests\Unit\Configuration\TypoScript\ConditionMatchin
/**
* Testcase for class \TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher.
*
- * @author Oliver Hader <oliver@typo3.org>
+ * @author Oliver Hader <oliver@typo3.org>
*/
class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
@@ -94,7 +94,7 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
/**
* Tests whether a condition matches Internet Explorer 7 on Windows.
*
- * @return void
+ * @return void
* @test
*/
public function conditionMatchesInternetExplorer7Windows() {
@@ -106,7 +106,7 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
/**
* Tests whether a condition does not match Internet Explorer 7 on Windows.
*
- * @return void
+ * @return void
* @test
*/
public function conditionDoesNotMatchInternetExplorer7Windows() {
@@ -949,10 +949,10 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* Callback method for pageIdCanBeDetermined test cases.
* Simulates TYPO3_DB->exec_SELECTquery().
*
- * @param string $fields
- * @param string $table
- * @param string $where
- * @return mixed
+ * @param string $fields
+ * @param string $table
+ * @param string $where
+ * @return mixed
*/
public function determinePageIdByRecordDatabaseExecuteCallback($fields, $table, $where) {
if ($table === $this->testTableName) {
@@ -971,8 +971,8 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* Callback method for pageIdCanBeDetermined test cases.
* Simulates TYPO3_DB->sql_fetch_assoc().
*
- * @param mixed $resource
- * @return mixed
+ * @param mixed $resource
+ * @return mixed
*/
public function determinePageIdByRecordDatabaseFetchCallback($resource) {
if (is_array($resource) && $resource['scope'] === $this->testTableName) {
diff --git a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
index ecef4c70cbd4..bb6b90bd5343 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/Constraint.php
@@ -151,7 +151,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get number of log entries to show
*
- * @return integer
+ * @return int
*/
public function getNumber() {
return $this->number;
@@ -189,7 +189,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get time frame
*
- * @return integer
+ * @return int
*/
public function getTimeFrame() {
return (int)$this->timeFrame;
@@ -208,7 +208,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get action
*
- * @return integer
+ * @return int
*/
public function getAction() {
return (int)$this->action;
@@ -227,7 +227,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get group by page
*
- * @return boolean
+ * @return bool
*/
public function getGroupByPage() {
return (bool) $this->groupByPage;
@@ -284,7 +284,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get calculated start timestamp from query constraints
*
- * @return integer
+ * @return int
*/
public function getStartTimestamp() {
return $this->startTimestamp;
@@ -303,7 +303,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get calculated end timestamp from query constraints
*
- * @return integer
+ * @return int
*/
public function getEndTimestamp() {
return $this->endTimestamp;
@@ -322,7 +322,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get page context
*
- * @return boolean
+ * @return bool
*/
public function getIsInPageContext() {
return (bool) $this->isInPageContext;
@@ -341,7 +341,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get page id
*
- * @return integer
+ * @return int
*/
public function getPageId() {
return $this->pageId;
@@ -360,7 +360,7 @@ class Constraint extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get page level depth
*
- * @return integer
+ * @return int
*/
public function getDepth() {
return (int)$this->depth;
diff --git a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
index 5ff7e9baba2a..e4fbd8798859 100644
--- a/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
+++ b/typo3/sysext/belog/Classes/Domain/Model/LogEntry.php
@@ -152,7 +152,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get pid
*
- * @return integer
+ * @return int
*/
public function getPid() {
return $this->pid;
@@ -171,7 +171,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get backend user id
*
- * @return integer
+ * @return int
*/
public function getBackendUserUid() {
return $this->backendUserUid;
@@ -190,7 +190,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get action
*
- * @return integer
+ * @return int
*/
public function getAction() {
return (int)$this->action;
@@ -209,7 +209,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get record uid
*
- * @return integer
+ * @return int
*/
public function getRecordUid() {
return (int)$this->recordUid;
@@ -247,7 +247,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get record pid
*
- * @return integer
+ * @return int
*/
public function getRecordPid() {
return (int)$this->recordPid;
@@ -266,7 +266,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get error
*
- * @return integer
+ * @return int
*/
public function getError() {
return (int)$this->error;
@@ -304,7 +304,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get tstamp
*
- * @return integer
+ * @return int
*/
public function getTstamp() {
return (int)$this->tstamp;
@@ -323,7 +323,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get type
*
- * @return integer
+ * @return int
*/
public function getType() {
return (int)$this->type;
@@ -342,7 +342,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get details number
*
- * @return integer
+ * @return int
*/
public function getDetailsNumber() {
return (int)$this->detailsNumber;
@@ -406,7 +406,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get event pid
*
- * @return integer
+ * @return int
*/
public function getEventPid() {
return (int)$this->eventPid;
@@ -425,7 +425,7 @@ class LogEntry extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Get workspace
*
- * @return integer
+ * @return int
*/
public function getWorkspaceUid() {
return (int)$this->workspaceUid;
diff --git a/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php b/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php
index 73ad4f03d01e..e43afd059968 100644
--- a/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php
+++ b/typo3/sysext/belog/Classes/ViewHelpers/IsExtensionLoadedViewHelper.php
@@ -25,7 +25,7 @@ class IsExtensionLoadedViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abstr
* Checks whether an extension is loaded.
*
* @param string $extensionKey The extension's key
- * @return boolean TRUE if extension is loaded, FALSE otherwise
+ * @return bool TRUE if extension is loaded, FALSE otherwise
*/
public function render($extensionKey) {
return \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extensionKey);
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php b/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
index f11d9c2728f2..1a6ff8731086 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/BackendUser.php
@@ -92,7 +92,7 @@ class BackendUser extends \TYPO3\CMS\Extbase\Domain\Model\BackendUser {
/**
* Check if user is active, not disabled
*
- * @return boolean
+ * @return bool
*/
public function isActive() {
if ($this->getIsDisabled()) {
diff --git a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
index 43279b1de772..dc7b9023680a 100644
--- a/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
+++ b/typo3/sysext/beuser/Classes/Domain/Model/Demand.php
@@ -98,7 +98,7 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getUserType() {
return $this->userType;
@@ -113,7 +113,7 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getStatus() {
return $this->status;
@@ -128,7 +128,7 @@ class Demand extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getLogins() {
return $this->logins;
diff --git a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
index 4b5673bf22a3..c77732d66a80 100644
--- a/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/AbstractUserAuthentication.php
@@ -573,7 +573,7 @@ abstract class AbstractUserAuthentication {
/**
* Determine whether a session cookie needs to be set (lifetime=0)
*
- * @return boolean
+ * @return bool
* @internal
*/
public function isSetSessionCookie() {
@@ -583,7 +583,7 @@ abstract class AbstractUserAuthentication {
/**
* Determine whether a non-session cookie needs to be set (lifetime>0)
*
- * @return boolean
+ * @return bool
* @internal
*/
public function isRefreshTimeBasedCookie() {
@@ -1003,7 +1003,7 @@ abstract class AbstractUserAuthentication {
* in the database. Don't care if session record is still valid or not.
*
* @param int $id Claimed Session ID
- * @return boolean Returns TRUE if a corresponding session was found in the database
+ * @return bool Returns TRUE if a corresponding session was found in the database
*/
public function isExistingSessionRecord($id) {
$statement = $this->db->prepare_SELECTquery('COUNT(*)', $this->session_table, 'ses_id = :ses_id');
@@ -1018,7 +1018,7 @@ abstract class AbstractUserAuthentication {
* or a cookie was already found in the system
* replaces the old functionality for "$this->cookieId"
*
- * @return boolean Returns TRUE if a cookie is set
+ * @return bool Returns TRUE if a cookie is set
*/
public function isCookieSet() {
return $this->cookieWasSetOnCurrentRequest || $this->getCookie($this->name);
@@ -1170,7 +1170,7 @@ abstract class AbstractUserAuthentication {
/**
* Creates hash integer to lock user to. Depends on configured keywords
*
- * @return integer Hash integer
+ * @return int Hash integer
* @access private
*/
protected function hashLockClause_getHashInt() {
@@ -1399,7 +1399,7 @@ abstract class AbstractUserAuthentication {
* @param array $user User data array
* @param array $loginData Login data array
* @param string $passwordCompareStrategy Alternative passwordCompareStrategy. Used when authentication services wants to override the default.
- * @return boolean TRUE if login data matched
+ * @return bool TRUE if login data matched
*/
public function compareUident($user, $loginData, $passwordCompareStrategy = '') {
$OK = FALSE;
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index 03df1a6abab9..c61dce706599 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -333,7 +333,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* Returns TRUE if user is admin
* Basically this function evaluates if the ->user[admin] field has bit 0 set. If so, user is admin.
*
- * @return boolean
+ * @return bool
*/
public function isAdmin() {
return is_array($this->user) && ($this->user['admin'] & 1) == 1;
@@ -345,7 +345,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* Will return TRUE also if the user is a member of a group through subgroups.
*
* @param int $groupId Group ID to look for in $this->groupList
- * @return boolean
+ * @return bool
*/
public function isMemberOfGroup($groupId) {
$groupId = (int)$groupId;
@@ -368,7 +368,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
*
* @param array $row Is the pagerow for which the permissions is checked
* @param int $perms Is the binary representation of the permission we are going to check. Every bit in this number represents a permission that must be set. See function explanation.
- * @return boolean
+ * @return bool
*/
public function doesUserHaveAccess($row, $perms) {
$userPerms = $this->calcPerms($row);
@@ -425,7 +425,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* @param array $conf $MCONF array of a backend module!
* @param bool $exitOnError If set, an array will issue an error message and exit.
* @throws \RuntimeException
- * @return boolean Will return TRUE if $MCONF['access'] is not set at all, if the BE_USER is admin or if the module is enabled in the be_users/be_groups records of the user (specifically enabled). Will return FALSE if the module name is not even found in $TBE_MODULES
+ * @return bool Will return TRUE if $MCONF['access'] is not set at all, if the BE_USER is admin or if the module is enabled in the be_users/be_groups records of the user (specifically enabled). Will return FALSE if the module name is not even found in $TBE_MODULES
*/
public function modAccess($conf, $exitOnError) {
if (!BackendUtility::isModuleSetInTBE_MODULES($conf['name'])) {
@@ -516,7 +516,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* If the user is admin, 31 is returned (full permissions for all five flags)
*
* @param array $row Input page row with all perms_* fields available.
- * @return integer Bitwise representation of the users permissions in relation to input page row, $row
+ * @return int Bitwise representation of the users permissions in relation to input page row, $row
*/
public function calcPerms($row) {
// Return 31 for admin users.
@@ -561,7 +561,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* a loaded extension, browser/client type and a configuration option in ->uc[edit_RTE]
* The reasons for a FALSE return can be found in $this->RTE_errors
*
- * @return boolean
+ * @return bool
*/
public function isRTE() {
// Start:
@@ -592,7 +592,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
*
* @param string $type The type value; "webmounts", "filemounts", "pagetypes_select", "tables_select", "tables_modify", "non_exclude_fields", "modules
* @param string $value String to search for in the groupData-list
- * @return boolean TRUE if permission is granted (that is, the value was found in the groupData list - or the BE_USER is "admin")
+ * @return bool TRUE if permission is granted (that is, the value was found in the groupData list - or the BE_USER is "admin")
*/
public function check($type, $value) {
if (isset($this->groupData[$type])) {
@@ -610,7 +610,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* @param string $field Field name (must be configured in TCA and of type "select" with authMode set!)
* @param string $value Value to evaluation (single value, must not contain any of the chars ":,|")
* @param string $authMode Auth mode keyword (explicitAllow, explicitDeny, individual)
- * @return boolean Whether access is granted or not
+ * @return bool Whether access is granted or not
*/
public function checkAuthMode($table, $field, $value, $authMode) {
// Admin users can do anything:
@@ -672,7 +672,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* Checking if a language value (-1, 0 and >0 for sys_language records) is allowed to be edited by the user.
*
* @param int $langValue Language value to evaluate
- * @return boolean Returns TRUE if the language value is allowed, otherwise FALSE.
+ * @return bool Returns TRUE if the language value is allowed, otherwise FALSE.
*/
public function checkLanguageAccess($langValue) {
// The users language list must be non-blank - otherwise all languages are allowed.
@@ -691,7 +691,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
*
* @param string $table The table
* @param array $record The current record
- * @return boolean
+ * @return bool
*/
public function checkFullLanguagesAccess($table, $record) {
$recordLocalizationAccess = $this->checkLanguageAccess(0);
@@ -732,7 +732,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* @param bool $newRecord Set, if testing a new (non-existing) record array. Will disable certain checks that doesn't make much sense in that context.
* @param bool $deletedRecord Set, if testing a deleted record array.
* @param bool $checkFullLanguageAccess Set, whenever access to all translations of the record is required
- * @return boolean TRUE if OK, otherwise FALSE
+ * @return bool TRUE if OK, otherwise FALSE
*/
public function recordEditAccessInternals($table, $idOrRow, $newRecord = FALSE, $deletedRecord = FALSE, $checkFullLanguageAccess = FALSE) {
if (!isset($GLOBALS['TCA'][$table])) {
@@ -836,7 +836,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* @param int $compiledPermissions Could typically be the "compiled permissions" integer returned by ->calcPerms
* @param string $tableName Is the tablename to check: If "pages" table then edit,new,delete and editcontent permissions can be checked. Other tables will be checked for "editcontent" only (and $type will be ignored)
* @param string $actionType For $tableName='pages' this can be 'edit' (2), 'new' (8 or 16), 'delete' (4), 'editcontent' (16). For all other tables this is ignored. (16 is used)
- * @return boolean
+ * @return bool
* @access public (used by typo3/alt_clickmenu.php)
*/
public function isPSet($compiledPermissions, $tableName, $actionType = '') {
@@ -869,7 +869,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
/**
* Returns TRUE if the BE_USER is allowed to *create* shortcuts in the backend modules
*
- * @return boolean
+ * @return bool
*/
public function mayMakeShortcut() {
return $this->getTSConfigVal('options.enableBookmarks')
@@ -995,7 +995,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
*
* @param int $pid Page id. This value must be the _ORIG_uid if available: So when you have pages versionized as "page" or "element" you must supply the id of the page version in the workspace!
* @param string $table Table name
- * @return boolean TRUE if OK.
+ * @return bool TRUE if OK.
*/
public function workspaceCreateNewRecord($pid, $table) {
if ($res = $this->workspaceAllowLiveRecordsInPID($pid, $table)) {
@@ -1017,7 +1017,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* @param string $table Table of the record
* @param int $id UID of record
* @param int $recpid PID of record
- * @return boolean TRUE if ok.
+ * @return bool TRUE if ok.
*/
public function workspaceAllowAutoCreation($table, $id, $recpid) {
// Auto-creation of version: In offline workspace, test if versioning is
@@ -1043,7 +1043,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* An option for custom workspaces allows members to also edit when the stage is "Review"
*
* @param int $stage Stage id from an element: -1,0 = editing, 1 = reviewer, >1 = owner
- * @return boolean TRUE if user is allowed access
+ * @return bool TRUE if user is allowed access
*/
public function workspaceCheckStageForCurrent($stage) {
// Always allow for admins
@@ -1107,7 +1107,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* draft workspace if the user has access to Live workspace.
*
* @param int $wsid Workspace UID; 0,1+
- * @return boolean Returns TRUE if the user has access to publish content from the workspace ID given.
+ * @return bool Returns TRUE if the user has access to publish content from the workspace ID given.
*/
public function workspacePublishAccess($wsid) {
if ($this->isAdmin()) {
@@ -1137,7 +1137,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
/**
* Workspace swap-mode access?
*
- * @return boolean Returns TRUE if records can be swapped in the current workspace, otherwise FALSE
+ * @return bool Returns TRUE if records can be swapped in the current workspace, otherwise FALSE
*/
public function workspaceSwapAccess() {
if ($this->workspace > 0 && (int)$this->workspaceRec['swap_modes'] === 2) {
@@ -1182,7 +1182,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
*
* @param string $objectString Object string, eg. "somestring.someproperty.somesubproperty
* @return string The value for that object string (object path)
- * @see getTSConfig()
+ * @see getTSConfig()
*/
public function getTSConfigVal($objectString) {
$TSConf = $this->getTSConfig($objectString);
@@ -1194,7 +1194,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
*
* @param string $objectString Object string, eg. "somestring.someproperty.somesubproperty
* @return array The properties for that object string (object path) - if any
- * @see getTSConfig()
+ * @see getTSConfig()
*/
public function getTSConfigProp($objectString) {
$TSConf = $this->getTSConfig($objectString);
@@ -1224,7 +1224,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* 128 - other (not used yet)
*
* @param int $bitmask Bitmask
- * @return boolean TRUE if the confirmation should be shown
+ * @return bool TRUE if the confirmation should be shown
*/
public function jsConfirmation($bitmask) {
$alertPopup = $this->getTSConfig('options.alertPopups');
@@ -2037,7 +2037,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* Sets a temporary workspace in the context of the current backend user.
*
* @param int $workspaceId
- * @return boolean
+ * @return bool
*/
public function setTemporaryWorkspace($workspaceId) {
$result = FALSE;
@@ -2078,7 +2078,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* If EXT:workspaces is not installed the user will be pushed the the
* Live workspace
*
- * @return integer Default workspace id. If no workspace is available it will be "-99
+ * @return int Default workspace id. If no workspace is available it will be "-99
*/
public function getDefaultWorkspace() {
$defaultWorkspace = -99;
@@ -2117,7 +2117,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* @param int $event_pid The page_uid (pid) where the event occurred. Used to select log-content for specific pages.
* @param string $NEWid Special field used by tce_main.php. NEWid string of newly created records.
* @param int $userId Alternative Backend User ID (used for logging login actions where this is not yet known).
- * @return integer Log entry ID.
+ * @return int Log entry ID.
*/
public function writelog($type, $action, $error, $details_nr, $details, $data, $tablename = '', $recuid = '', $recpid = '', $event_pid = -1, $NEWid = '', $userId = 0) {
if (!$userId && isset($this->user['uid'])) {
@@ -2150,7 +2150,7 @@ class BackendUserAuthentication extends \TYPO3\CMS\Core\Authentication\AbstractU
* @param string $message Log message
* @param string $extKey Option extension key / module name
* @param int $error Error level. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
- * @return integer Log entry UID
+ * @return int Log entry UID
*/
public function simplelog($message, $extKey = '', $error = 0) {
return $this->writelog(4, 0, $error, 0, ($extKey ? '[' . $extKey . '] ' : '') . $message, array());
@@ -2227,7 +2227,7 @@ This is a dump of the failures:
* an IP-list is found in the User TSconfig objString "options.lockToIP",
* then make an IP comparison with REMOTE_ADDR and return the outcome (TRUE/FALSE)
*
- * @return boolean TRUE, if IP address validates OK (or no check is done at all)
+ * @return bool TRUE, if IP address validates OK (or no check is done at all)
*/
public function checkLockToIP() {
$out = 1;
@@ -2279,7 +2279,7 @@ This is a dump of the failures:
/**
* If the backend script is in CLI mode, it will try to load a backend user named by the CLI module name (in lowercase)
*
- * @return boolean Returns TRUE if a CLI user was loaded, otherwise FALSE!
+ * @return bool Returns TRUE if a CLI user was loaded, otherwise FALSE!
*/
public function checkCLIuser() {
// First, check if cliMode is enabled:
@@ -2443,7 +2443,7 @@ This is a dump of the failures:
* + backend user is used in CLI context and adminOnly is explicitly set to "2"
* + backend user is being controlled by an admin user
*
- * @return boolean Whether a backend user is allowed to access the backend
+ * @return bool Whether a backend user is allowed to access the backend
*/
protected function isUserAllowedToLogin() {
$isUserAllowedToLogin = FALSE;
diff --git a/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php b/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
index 323c2ef93575..da38ec153788 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/ApcBackend.php
@@ -164,7 +164,7 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @api
*/
public function has($entryIdentifier) {
@@ -179,7 +179,7 @@ class ApcBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
* old entries for the identifier still exist, they are removed as well.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
* @api
*/
public function remove($entryIdentifier) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
index cdc5921dc174..3d0b56ef132d 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/BackendInterface.php
@@ -57,7 +57,7 @@ interface BackendInterface
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @api
*/
public function has($entryIdentifier);
@@ -68,7 +68,7 @@ interface BackendInterface
* old entries for the identifier still exist, they are removed as well.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
* @api
*/
public function remove($entryIdentifier);
diff --git a/typo3/sysext/core/Classes/Cache/Backend/ClassLoaderBackend.php b/typo3/sysext/core/Classes/Cache/Backend/ClassLoaderBackend.php
index 8cb894bd47ca..ff553dda44bf 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/ClassLoaderBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/ClassLoaderBackend.php
@@ -98,7 +98,7 @@ class ClassLoaderBackend extends SimpleFileBackend {
* command in the cache entry with the given identifier.
*
* @param string $entryIdentifier
- * @return boolean|string FALSE if required path can not be retrieved or the required file path on success
+ * @return bool|string FALSE if required path can not be retrieved or the required file path on success
* @internal
*/
public function getPathOfRequiredFileInCacheEntry($entryIdentifier) {
@@ -120,7 +120,7 @@ class ClassLoaderBackend extends SimpleFileBackend {
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @throws \InvalidArgumentException
* @internal
*/
@@ -137,7 +137,7 @@ class ClassLoaderBackend extends SimpleFileBackend {
* lifetime has exceeded.
*
* @param string $cacheEntryPathAndFilename
- * @return boolean
+ * @return bool
* @internal
*/
protected function isCacheFileExpired($cacheEntryPathAndFilename) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/EarlyClassLoaderBackend.php b/typo3/sysext/core/Classes/Cache/Backend/EarlyClassLoaderBackend.php
index 99c1d7c06bf8..cad6687902d9 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/EarlyClassLoaderBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/EarlyClassLoaderBackend.php
@@ -74,7 +74,7 @@ class EarlyClassLoaderBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBack
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @api
*/
public function has($entryIdentifier) {
@@ -87,7 +87,7 @@ class EarlyClassLoaderBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBack
* old entries for the identifier still exist, they are removed as well.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
* @api
*/
public function remove($entryIdentifier) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
index e6b8d4f976de..17baabdcd72a 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FileBackend.php
@@ -87,7 +87,7 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
/**
* Tells if this backend is frozen.
*
- * @return boolean
+ * @return bool
*/
public function isFrozen() {
return $this->frozen;
@@ -196,7 +196,7 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @throws \InvalidArgumentException
* @api
*/
@@ -215,7 +215,7 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
* Usually this only affects one entry.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
* @throws \RuntimeException
* @throws \InvalidArgumentException
* @api
@@ -309,7 +309,7 @@ class FileBackend extends \TYPO3\CMS\Core\Cache\Backend\SimpleFileBackend implem
* lifetime has exceeded.
*
* @param string $cacheEntryPathAndFilename
- * @return boolean
+ * @return bool
* @api
*/
protected function isCacheFileExpired($cacheEntryPathAndFilename) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/FreezableBackendInterface.php b/typo3/sysext/core/Classes/Cache/Backend/FreezableBackendInterface.php
index 9a2279a03a50..e6638d72e30b 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/FreezableBackendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/FreezableBackendInterface.php
@@ -33,7 +33,7 @@ interface FreezableBackendInterface extends \TYPO3\CMS\Core\Cache\Backend\Backen
/**
* Tells if this backend is frozen.
*
- * @return boolean
+ * @return bool
*/
public function isFrozen();
diff --git a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
index e6a381f2700d..0705e3d54340 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/MemcachedBackend.php
@@ -241,7 +241,7 @@ class MemcachedBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend imp
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @api
*/
public function has($entryIdentifier) {
@@ -254,7 +254,7 @@ class MemcachedBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend imp
* old entries for the identifier still exist, they are removed as well.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
* @api
*/
public function remove($entryIdentifier) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php b/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
index 0151ccc9ceb7..5968a6c2fbba 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/NullBackend.php
@@ -52,7 +52,7 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
* Returns False
*
* @param string $entryIdentifier ignored
- * @return boolean FALSE
+ * @return bool FALSE
* @api
*/
public function get($entryIdentifier) {
@@ -63,7 +63,7 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
* Returns False
*
* @param string $entryIdentifier ignored
- * @return boolean FALSE
+ * @return bool FALSE
* @api
*/
public function has($entryIdentifier) {
@@ -74,7 +74,7 @@ class NullBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implemen
* Does nothing
*
* @param string $entryIdentifier ignored
- * @return boolean FALSE
+ * @return bool FALSE
* @api
*/
public function remove($entryIdentifier) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php b/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
index 353cb455dc00..68caf1169aa3 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/PdoBackend.php
@@ -142,7 +142,7 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @api
*/
public function has($entryIdentifier) {
@@ -157,7 +157,7 @@ class PdoBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend implement
* old entries for the identifier still exist, they are removed as well.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
* @api
*/
public function remove($entryIdentifier) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
index 2e3eb42c88d8..692580008fc5 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/RedisBackend.php
@@ -331,7 +331,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
* Scales O(1) with number of cache entries
*
* @param string $entryIdentifier Identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @throws \InvalidArgumentException if identifier is not a string
* @api
*/
@@ -349,7 +349,7 @@ class RedisBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impleme
* Scales O(n) with number of tags
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
* @throws \InvalidArgumentException if identifier is not a string
* @api
*/
diff --git a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
index c3e127089cf4..d08a7fb07cdd 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/SimpleFileBackend.php
@@ -270,7 +270,7 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @throws \InvalidArgumentException
* @api
*/
@@ -286,7 +286,7 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
* Usually this only affects one entry.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
* @throws \InvalidArgumentException
* @api
*/
@@ -320,7 +320,7 @@ class SimpleFileBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend im
* lifetime has exceeded.
*
* @param string $cacheEntryPathAndFilename
- * @return boolean
+ * @return bool
* @api
*/
protected function isCacheFileExpired($cacheEntryPathAndFilename) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php b/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
index 692e294d73fd..d3fe2fafe1be 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/TransientMemoryBackend.php
@@ -73,7 +73,7 @@ class TransientMemoryBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBacke
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @api
*/
public function has($entryIdentifier) {
@@ -84,7 +84,7 @@ class TransientMemoryBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBacke
* Removes all cache entries matching the specified identifier.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if the entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if the entry could be removed or FALSE if no entry was found
* @api
*/
public function remove($entryIdentifier) {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
index 06cdc557405c..8a4377dcdea4 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
@@ -187,7 +187,7 @@ class Typo3DatabaseBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier Specifies the identifier to check for existence
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
*/
public function has($entryIdentifier) {
$this->throwExceptionIfFrontendDoesNotExist();
@@ -208,7 +208,7 @@ class Typo3DatabaseBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend
* Usually this only affects one entry.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
*/
public function remove($entryIdentifier) {
$this->throwExceptionIfFrontendDoesNotExist();
diff --git a/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php b/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
index 914ef4475efc..ef152322930f 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/WincacheBackend.php
@@ -104,7 +104,7 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
* Checks if a cache entry with the specified identifier exists
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
*/
public function has($entryIdentifier) {
return wincache_ucache_exists($this->identifierPrefix . $entryIdentifier);
@@ -116,7 +116,7 @@ class WincacheBackend extends \TYPO3\CMS\Core\Cache\Backend\AbstractBackend impl
* old entries for the identifier still exist, they are removed as well.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
*/
public function remove($entryIdentifier) {
$this->removeIdentifierFromAllTags($entryIdentifier);
diff --git a/typo3/sysext/core/Classes/Cache/Backend/XcacheBackend.php b/typo3/sysext/core/Classes/Cache/Backend/XcacheBackend.php
index c9a22df0d961..0a549d8e454c 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/XcacheBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/XcacheBackend.php
@@ -123,7 +123,7 @@ class XcacheBackend extends AbstractBackend implements TaggableBackendInterface
* Checks if a cache entry with the specified identifier exists
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
*/
public function has($entryIdentifier) {
if ($this->runningFromCliOrWrongConfiguration()) {
@@ -138,7 +138,7 @@ class XcacheBackend extends AbstractBackend implements TaggableBackendInterface
* old entries for the identifier still exist, they are removed as well.
*
* @param string $entryIdentifier Specifies the cache entry to remove
- * @return boolean TRUE if (at least) an entry could be removed or FALSE if no entry was found
+ * @return bool TRUE if (at least) an entry could be removed or FALSE if no entry was found
*/
public function remove($entryIdentifier) {
if ($this->runningFromCliOrWrongConfiguration()) {
@@ -294,7 +294,7 @@ class XcacheBackend extends AbstractBackend implements TaggableBackendInterface
* In this case all methods fail silently as xcache user cache is not available in CLI context.
* xcache.var_size cat be zero or empty if in CLI mode, or if not correctly configured.
*
- * @return boolean TRUE if misconfigured or in CLI mode
+ * @return bool TRUE if misconfigured or in CLI mode
*/
protected function runningFromCliOrWrongConfiguration() {
$varSize = ini_get('xcache.var_size');
diff --git a/typo3/sysext/core/Classes/Cache/Cache.php b/typo3/sysext/core/Classes/Cache/Cache.php
index 56e142e9277e..4832f21ebc35 100644
--- a/typo3/sysext/core/Classes/Cache/Cache.php
+++ b/typo3/sysext/core/Classes/Cache/Cache.php
@@ -61,7 +61,7 @@ class Cache {
* Determines whether the caching framework is initialized.
* The caching framework could be disabled for the core but used by an extension.
*
- * @return boolean True if caching framework is initialized
+ * @return bool True if caching framework is initialized
*/
static public function isCachingFrameworkInitialized() {
return self::$isCachingFrameworkInitialized;
diff --git a/typo3/sysext/core/Classes/Cache/CacheManager.php b/typo3/sysext/core/Classes/Cache/CacheManager.php
index 2da48773bbad..b2fc6d3e8ae7 100644
--- a/typo3/sysext/core/Classes/Cache/CacheManager.php
+++ b/typo3/sysext/core/Classes/Cache/CacheManager.php
@@ -134,7 +134,7 @@ class CacheManager implements \TYPO3\CMS\Core\SingletonInterface {
* Checks if the specified cache has been registered.
*
* @param string $identifier The identifier of the cache
- * @return boolean TRUE if a cache with the given identifier exists, otherwise FALSE
+ * @return bool TRUE if a cache with the given identifier exists, otherwise FALSE
* @api
*/
public function hasCache($identifier) {
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php b/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
index 78cae460c61a..cf9829377ed1 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/AbstractFrontend.php
@@ -76,7 +76,7 @@ abstract class AbstractFrontend implements \TYPO3\CMS\Core\Cache\Frontend\Fronte
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @throws \InvalidArgumentException If $entryIdentifier is invalid
* @api
*/
@@ -91,7 +91,7 @@ abstract class AbstractFrontend implements \TYPO3\CMS\Core\Cache\Frontend\Fronte
* Removes the given cache entry from the cache.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @throws \InvalidArgumentException
* @api
*/
@@ -149,7 +149,7 @@ abstract class AbstractFrontend implements \TYPO3\CMS\Core\Cache\Frontend\Fronte
* Checks the validity of an entry identifier. Returns TRUE if it's valid.
*
* @param string $identifier An identifier to be checked for validity
- * @return boolean
+ * @return bool
* @api
*/
public function isValidEntryIdentifier($identifier) {
@@ -160,7 +160,7 @@ abstract class AbstractFrontend implements \TYPO3\CMS\Core\Cache\Frontend\Fronte
* Checks the validity of a tag. Returns TRUE if it's valid.
*
* @param string $tag An identifier to be checked for validity
- * @return boolean
+ * @return bool
* @api
*/
public function isValidTag($tag) {
diff --git a/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php b/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
index 1fcdba7cac02..50174d7193b0 100644
--- a/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
+++ b/typo3/sysext/core/Classes/Cache/Frontend/FrontendInterface.php
@@ -86,7 +86,7 @@ interface FrontendInterface
* Checks if a cache entry with the specified identifier exists.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
* @api
*/
public function has($entryIdentifier);
@@ -95,7 +95,7 @@ interface FrontendInterface
* Removes the given cache entry from the cache.
*
* @param string $entryIdentifier An identifier specifying the cache entry
- * @return boolean TRUE if such an entry exists, FALSE if not
+ * @return bool TRUE if such an entry exists, FALSE if not
*/
public function remove($entryIdentifier);
@@ -127,7 +127,7 @@ interface FrontendInterface
* Checks the validity of an entry identifier. Returns TRUE if it's valid.
*
* @param string $identifier An identifier to be checked for validity
- * @return boolean
+ * @return bool
* @api
*/
public function isValidEntryIdentifier($identifier);
@@ -136,7 +136,7 @@ interface FrontendInterface
* Checks the validity of a tag. Returns TRUE if it's valid.
*
* @param string $tag A tag to be checked for validity
- * @return boolean
+ * @return bool
* @api
*/
public function isValidTag($tag);
diff --git a/typo3/sysext/core/Classes/Category/CategoryRegistry.php b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
index d5070ee30347..02b9fa59e39a 100644
--- a/typo3/sysext/core/Classes/Category/CategoryRegistry.php
+++ b/typo3/sysext/core/Classes/Category/CategoryRegistry.php
@@ -75,7 +75,7 @@ class CategoryRegistry implements \TYPO3\CMS\Core\SingletonInterface {
* + position: insert position of the categories field
* + label: backend label of the categories field
* + fieldConfiguration: TCA field config array to override defaults
- * @return boolean
+ * @return bool
* @throws \InvalidArgumentException
* @throws \RuntimeException
*/
@@ -172,7 +172,7 @@ class CategoryRegistry implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $tableName Name of the table to be looked up
* @param string $fieldName Name of the field to be looked up
- * @return boolean
+ * @return bool
*/
public function isRegistered($tableName, $fieldName = 'categories') {
return isset($this->registry[$tableName][$fieldName]);
diff --git a/typo3/sysext/core/Classes/Charset/CharsetConverter.php b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
index a304e1b19214..6952fe999ec9 100644
--- a/typo3/sysext/core/Classes/Charset/CharsetConverter.php
+++ b/typo3/sysext/core/Classes/Charset/CharsetConverter.php
@@ -1072,7 +1072,7 @@ class CharsetConverter {
*
* @param string $str UTF-8 multibyte character string
* @param bool $hex If set, then a hex. number is returned.
- * @return integer UNICODE integer
+ * @return int UNICODE integer
* @see UnumberToChar()
*/
public function utf8CharToUnumber($str, $hex = 0) {
@@ -1112,7 +1112,7 @@ class CharsetConverter {
* PLEASE SEE: http://www.unicode.org/Public/MAPPINGS/
*
* @param string The charset to be initialized. Use lowercase charset always (the charset must match exactly with a filename in csconvtbl/ folder ([charset].tbl)
- * @return integer Returns '1' if already loaded. Returns FALSE if charset conversion table was not found. Returns '2' if the charset conversion table was found and parsed.
+ * @return int Returns '1' if already loaded. Returns FALSE if charset conversion table was not found. Returns '2' if the charset conversion table was found and parsed.
* @acces private
*/
public function initCharset($charset) {
@@ -1177,7 +1177,7 @@ class CharsetConverter {
* PLEASE SEE: http://www.unicode.org/Public/UNIDATA/
*
* @param string $mode Mode ("case", "ascii", ...)
- * @return integer Returns FALSE on error, a TRUE value on success: 1 table already loaded, 2, cached version, 3 table parsed (and cached).
+ * @return int Returns FALSE on error, a TRUE value on success: 1 table already loaded, 2, cached version, 3 table parsed (and cached).
* @access private
*/
public function initUnicodeData($mode = NULL) {
@@ -1418,7 +1418,7 @@ class CharsetConverter {
* This function is automatically called by the case folding functions.
*
* @param string $charset Charset for which to initialize case folding.
- * @return integer Returns FALSE on error, a TRUE value on success: 1 table already loaded, 2, cached version, 3 table parsed (and cached).
+ * @return int Returns FALSE on error, a TRUE value on success: 1 table already loaded, 2, cached version, 3 table parsed (and cached).
* @access private
*/
public function initCaseFolding($charset) {
@@ -1479,7 +1479,7 @@ class CharsetConverter {
* This function is automatically called by the ASCII transliteration functions.
*
* @param string $charset Charset for which to initialize conversion.
- * @return integer Returns FALSE on error, a TRUE value on success: 1 table already loaded, 2, cached version, 3 table parsed (and cached).
+ * @return int Returns FALSE on error, a TRUE value on success: 1 table already loaded, 2, cached version, 3 table parsed (and cached).
* @access private
*/
public function initToASCII($charset) {
@@ -1580,7 +1580,7 @@ class CharsetConverter {
*
* @param string $charset The character set
* @param string $string Character string
- * @return integer The number of characters
+ * @return int The number of characters
* @see strlen()
*/
public function strlen($charset, $string) {
@@ -1917,7 +1917,7 @@ class CharsetConverter {
* Unit-tested by Kasper and works 100% like strlen() / mb_strlen()
*
* @param string $str UTF-8 multibyte character string
- * @return integer The number of characters
+ * @return int The number of characters
* @see strlen()
*/
public function utf8_strlen($str) {
@@ -1971,7 +1971,7 @@ class CharsetConverter {
* @param string $haystack UTF-8 string to search in
* @param string $needle UTF-8 string to search for
* @param int $offset Positition to start the search
- * @return integer The character position
+ * @return int The character position
* @see strpos()
*/
public function utf8_strpos($haystack, $needle, $offset = 0) {
@@ -1998,7 +1998,7 @@ class CharsetConverter {
*
* @param string $haystack UTF-8 string to search in
* @param string $needle UTF-8 character to search for (single character)
- * @return integer The character position
+ * @return int The character position
* @see strrpos()
*/
public function utf8_strrpos($haystack, $needle) {
@@ -2021,7 +2021,7 @@ class CharsetConverter {
*
* @param string $str UTF-8 string
* @param int $pos Character position (negative values start from the end)
- * @return integer Byte position
+ * @return int Byte position
*/
public function utf8_char2byte_pos($str, $pos) {
// Number of characters found
@@ -2067,7 +2067,7 @@ class CharsetConverter {
*
* @param string $str UTF-8 string
* @param int $pos Byte position
- * @return integer Character position
+ * @return int Character position
*/
public function utf8_byte2char_pos($str, $pos) {
// Number of characters
@@ -2216,7 +2216,7 @@ class CharsetConverter {
*
* @param string $str EUC multibyte character string
* @param string $charset The charset
- * @return integer The number of characters
+ * @return int The number of characters
* @see strlen()
*/
public function euc_strlen($str, $charset) {
@@ -2244,7 +2244,7 @@ class CharsetConverter {
* @param string $str EUC multibyte character string
* @param int $pos Character position (negative values start from the end)
* @param string $charset The charset
- * @return integer Byte position
+ * @return int Byte position
*/
public function euc_char2byte_pos($str, $pos, $charset) {
$sjis = $charset == 'shift_jis';
diff --git a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
index 70c34399e54f..7d0121926560 100644
--- a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
+++ b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
@@ -112,7 +112,7 @@ abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\Re
* Return the key of the current element
*
* @link http://php.net/manual/en/iterator.key.php
- * @return integer 0 on failure.
+ * @return int 0 on failure.
*/
public function key() {
$currentRecord = $this->storage->current();
@@ -124,7 +124,7 @@ abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\Re
* Checks if current position is valid
*
* @link http://php.net/manual/en/iterator.valid.php
- * @return boolean The return value will be casted to boolean and then evaluated.
+ * @return bool The return value will be casted to boolean and then evaluated.
*/
public function valid() {
return $this->storage->valid();
@@ -173,7 +173,7 @@ abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\Re
* Count elements of an object
*
* @link http://php.net/manual/en/countable.count.php
- * @return integer The custom count as an integer.
+ * @return int The custom count as an integer.
*/
public function count() {
return $this->storage->count();
@@ -191,7 +191,7 @@ abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\Re
/**
* Getter for the UID
*
- * @return integer
+ * @return int
*/
public function getUid() {
return $this->uid;
@@ -278,7 +278,7 @@ abstract class AbstractRecordCollection implements \TYPO3\CMS\Core\Collection\Re
/**
* Returns the uid of the collection
*
- * @return integer
+ * @return int
*/
public function getIdentifier() {
return $this->uid;
diff --git a/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php b/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
index 4bf3b63c13b1..9a09da55f459 100644
--- a/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
+++ b/typo3/sysext/core/Classes/Collection/PersistableCollectionInterface.php
@@ -31,7 +31,7 @@ interface PersistableCollectionInterface {
* session stored, registry stored or other collections might
* use a string as well
*
- * @return integer|string
+ * @return int|string
*/
public function getIdentifier();
diff --git a/typo3/sysext/core/Classes/Compatibility/LoadedExtensionArrayElement.php b/typo3/sysext/core/Classes/Compatibility/LoadedExtensionArrayElement.php
index 3207864541ab..ccbac5e7a18d 100644
--- a/typo3/sysext/core/Classes/Compatibility/LoadedExtensionArrayElement.php
+++ b/typo3/sysext/core/Classes/Compatibility/LoadedExtensionArrayElement.php
@@ -137,7 +137,7 @@ class LoadedExtensionArrayElement implements \IteratorAggregate, \ArrayAccess, \
*
* @link http://php.net/manual/en/arrayaccess.offsetexists.php
* @param mixed $offset An offset to check for.
- * @return boolean TRUE on success or FALSE on failure.
+ * @return bool TRUE on success or FALSE on failure.
*/
public function offsetExists($offset) {
return isset($this->extensionInformation[$offset]);
@@ -204,7 +204,7 @@ class LoadedExtensionArrayElement implements \IteratorAggregate, \ArrayAccess, \
* Count elements of an object
*
* @link http://php.net/manual/en/countable.count.php
- * @return integer The custom count as an integer. The return value is cast to an integer.
+ * @return int The custom count as an integer. The return value is cast to an integer.
*/
public function count() {
return count($this->extensionInformation);
diff --git a/typo3/sysext/core/Classes/Compatibility/LoadedExtensionsArray.php b/typo3/sysext/core/Classes/Compatibility/LoadedExtensionsArray.php
index 8bde7689e8f5..79253d55ca89 100644
--- a/typo3/sysext/core/Classes/Compatibility/LoadedExtensionsArray.php
+++ b/typo3/sysext/core/Classes/Compatibility/LoadedExtensionsArray.php
@@ -47,7 +47,7 @@ class LoadedExtensionsArray implements \Iterator, \ArrayAccess, \Serializable, \
*
* @link http://php.net/manual/en/arrayaccess.offsetexists.php
* @param mixed $offset An offset to check for.
- * @return boolean TRUE on success or FALSE on failure.
+ * @return bool TRUE on success or FALSE on failure.
*/
public function offsetExists($offset) {
return $this->packageManager->isPackageActive($offset);
@@ -120,7 +120,7 @@ class LoadedExtensionsArray implements \Iterator, \ArrayAccess, \Serializable, \
* Count elements of an object
*
* @link http://php.net/manual/en/countable.count.php
- * @return integer The custom count as an integer.
+ * @return int The custom count as an integer.
*/
public function count() {
return count($this->packageManager->getActivePackages());
@@ -167,7 +167,7 @@ class LoadedExtensionsArray implements \Iterator, \ArrayAccess, \Serializable, \
* Checks if current position is valid
*
* @link http://php.net/manual/en/iterator.valid.php
- * @return boolean The return value will be casted to boolean and then evaluated. Returns true on success or false on failure.
+ * @return bool The return value will be casted to boolean and then evaluated. Returns true on success or false on failure.
*/
public function valid() {
return $this->offsetExists($this->iteratorPosition);
@@ -197,7 +197,7 @@ class LoadedExtensionsArray implements \Iterator, \ArrayAccess, \Serializable, \
/**
* Whether package manager is set in class
*
- * @return boolean TRUE if package manager is set
+ * @return bool TRUE if package manager is set
*/
public function hasPackageManager() {
return $this->packageManager !== NULL;
diff --git a/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php b/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
index 8cd3ff410c8c..1e4c5b934560 100644
--- a/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
+++ b/typo3/sysext/core/Classes/Configuration/ConfigurationManager.php
@@ -193,7 +193,7 @@ class ConfigurationManager {
*
* @param string $path Path to update
* @param mixed $value Value to set
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function setLocalConfigurationValueByPath($path, $value) {
$result = FALSE;
@@ -209,7 +209,7 @@ class ConfigurationManager {
* Update / set a list of path and value pairs in local configuration file
*
* @param array $pairs Key is path, value is value to set
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function setLocalConfigurationValuesByPathValuePairs(array $pairs) {
$localConfiguration = $this->getLocalConfiguration();
@@ -225,7 +225,7 @@ class ConfigurationManager {
* Remove keys from LocalConfiguration
*
* @param array $keys Array with key paths to remove from LocalConfiguration
- * @return boolean TRUE if something was removed
+ * @return bool TRUE if something was removed
*/
public function removeLocalConfigurationKeysByPath(array $keys) {
$result = FALSE;
@@ -246,7 +246,7 @@ class ConfigurationManager {
/**
* Checks if the configuration can be written.
*
- * @return boolean
+ * @return bool
* @access private
*/
public function canWriteConfiguration() {
@@ -285,7 +285,7 @@ class ConfigurationManager {
*
* @param array $configuration The local configuration to be written
* @throws \RuntimeException
- * @return boolean TRUE on success
+ * @return bool TRUE on success
* @access private
*/
public function writeLocalConfiguration(array $configuration) {
@@ -318,7 +318,7 @@ class ConfigurationManager {
*
* @param array $additionalConfigurationLines The configuration lines to be written
* @throws \RuntimeException
- * @return boolean TRUE on success
+ * @return bool TRUE on success
* @access private
*/
public function writeAdditionalConfiguration(array $additionalConfigurationLines) {
@@ -362,7 +362,7 @@ class ConfigurationManager {
* Check if access / write to given path in local configuration is allowed.
*
* @param string $path Path to search for
- * @return boolean TRUE if access is allowed
+ * @return bool TRUE if access is allowed
*/
protected function isValidLocalConfigurationPath($path) {
// Early return for white listed paths
diff --git a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
index 3faf3a5684cf..264087660d17 100644
--- a/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
+++ b/typo3/sysext/core/Classes/Configuration/FlexForm/FlexFormTools.php
@@ -68,7 +68,7 @@ class FlexFormTools {
* @param array $row The record data array
* @param object $callBackObj Object (passed by reference) in which the call back function is located
* @param string $callBackMethod_value Method name of call back function in object for values
- * @return boolean If TRUE, error happened (error string returned)
+ * @return bool If TRUE, error happened (error string returned)
*/
public function traverseFlexFormXMLData($table, $field, $row, $callBackObj, $callBackMethod_value) {
if (!is_array($GLOBALS['TCA'][$table]) || !is_array($GLOBALS['TCA'][$table]['columns'][$field])) {
diff --git a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
index 2074aa4fe193..254d122de7e0 100644
--- a/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
+++ b/typo3/sysext/core/Classes/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcher.php
@@ -71,7 +71,7 @@ abstract class AbstractConditionMatcher {
/**
* Gets the id of the page to evaluate conditions for.
*
- * @return integer Id of the page
+ * @return int Id of the page
*/
public function getPageId() {
return $this->pageId;
@@ -143,7 +143,7 @@ abstract class AbstractConditionMatcher {
* Matches a TypoScript condition expression.
*
* @param string $expression The expression to match
- * @return boolean Whether the expression matched
+ * @return bool Whether the expression matched
*/
public function match($expression) {
// Return directly if result should be simulated:
@@ -516,7 +516,7 @@ abstract class AbstractConditionMatcher {
*
* @param string $test The value to compare with on the form [operator][number]. Eg. "< 123
* @param float $leftValue The value on the left side
- * @return boolean If $value is "50" and $test is "< 123" then it will return TRUE.
+ * @return bool If $value is "50" and $test is "< 123" then it will return TRUE.
*/
protected function compareNumber($test, $leftValue) {
if (preg_match('/^(!?=+|<=?|>=?)\\s*([^\\s]*)\\s*$/', $test, $matches)) {
@@ -571,7 +571,7 @@ abstract class AbstractConditionMatcher {
*
* @param string $haystack The string in which to find $needle.
* @param string $needle The string to find in $haystack
- * @return boolean Returns TRUE if $needle matches or is found in (according to wildcards) in $haystack. Eg. if $haystack is "Netscape 6.5" and $needle is "Net*" or "Net*ape" then it returns TRUE.
+ * @return bool Returns TRUE if $needle matches or is found in (according to wildcards) in $haystack. Eg. if $haystack is "Netscape 6.5" and $needle is "Net*" or "Net*ape" then it returns TRUE.
*/
protected function searchStringWildcard($haystack, $needle) {
$result = FALSE;
@@ -649,7 +649,7 @@ abstract class AbstractConditionMatcher {
* Evaluates a TypoScript condition given as input, eg. "[browser=net][...(other conditions)...]"
*
* @param string $string The condition to match against its criterias.
- * @return boolean Whether the condition matched
+ * @return bool Whether the condition matched
* @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::parse()
*/
abstract protected function evaluateCondition($string);
@@ -678,7 +678,7 @@ abstract class AbstractConditionMatcher {
/**
* Determines the current page Id.
*
- * @return integer The current page Id
+ * @return int The current page Id
*/
abstract protected function determinePageId();
@@ -699,14 +699,14 @@ abstract class AbstractConditionMatcher {
/**
* Gets the id of the current user.
*
- * @return integer The id of the current user
+ * @return int The id of the current user
*/
abstract protected function getUserId();
/**
* Determines if a user is logged in.
*
- * @return boolean Determines if a user is logged in
+ * @return bool Determines if a user is logged in
*/
abstract protected function isUserLoggedIn();
diff --git a/typo3/sysext/core/Classes/Controller/CommandLineController.php b/typo3/sysext/core/Classes/Controller/CommandLineController.php
index 5470a5218aae..d15a5951f71d 100644
--- a/typo3/sysext/core/Classes/Controller/CommandLineController.php
+++ b/typo3/sysext/core/Classes/Controller/CommandLineController.php
@@ -91,7 +91,7 @@ class CommandLineController {
* Return TRUE if option is found
*
* @param string $option Option string, eg. "-s
- * @return boolean TRUE if option found
+ * @return bool TRUE if option found
*/
public function cli_isArg($option) {
return isset($this->cli_args[$option]);
@@ -102,7 +102,7 @@ class CommandLineController {
*
* @param string $option Option string, eg. "-s
* @param int $idx Value index, default is 0 (zero) = the first one...
- * @return boolean TRUE if option found
+ * @return bool TRUE if option found
*/
public function cli_argValue($option, $idx = 0) {
return is_array($this->cli_args[$option]) ? $this->cli_args[$option][$idx] : '';
@@ -205,7 +205,7 @@ class CommandLineController {
* Asks for Yes/No from shell and returns TRUE if "y" or "yes" is found as input.
*
* @param string $msg String to ask before...
- * @return boolean TRUE if "y" or "yes" is the input (case insensitive)
+ * @return bool TRUE if "y" or "yes" is the input (case insensitive)
*/
public function cli_keyboardInput_yes($msg = '') {
// ONLY makes sense to echo it out since we are awaiting keyboard input - that cannot be silenced
@@ -218,7 +218,7 @@ class CommandLineController {
*
* @param string $string The string
* @param bool $force If string should be written even if -s is set (-ss will subdue it!)
- * @return boolean Returns TRUE if string was outputted.
+ * @return bool Returns TRUE if string was outputted.
*/
public function cli_echo($string = '', $force = FALSE) {
if (isset($this->cli_args['-ss'])) {
diff --git a/typo3/sysext/core/Classes/Core/ApplicationContext.php b/typo3/sysext/core/Classes/Core/ApplicationContext.php
index 9e1635b87a1a..4d0515932af2 100644
--- a/typo3/sysext/core/Classes/Core/ApplicationContext.php
+++ b/typo3/sysext/core/Classes/Core/ApplicationContext.php
@@ -92,7 +92,7 @@ class ApplicationContext {
/**
* Returns TRUE if this context is the Development context or a sub-context of it
*
- * @return boolean
+ * @return bool
* @api
*/
public function isDevelopment() {
@@ -102,7 +102,7 @@ class ApplicationContext {
/**
* Returns TRUE if this context is the Production context or a sub-context of it
*
- * @return boolean
+ * @return bool
* @api
*/
@@ -113,7 +113,7 @@ class ApplicationContext {
/**
* Returns TRUE if this context is the Testing context or a sub-context of it
*
- * @return boolean
+ * @return bool
* @api
*/
public function isTesting() {
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index 0cbee4bfee71..46507de4618c 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -2984,7 +2984,7 @@ class DataHandler {
* @param array $overrideValues Associative array with field/value pairs to override directly. Notice; Fields must exist in the table record and NOT be among excluded fields!
* @param string $excludeFields Commalist of fields to exclude from the copy process (might get default values)
* @param int $language Language ID (from sys_language table)
- * @return integer ID of new record, if any
+ * @return int ID of new record, if any
*/
public function copyRecord($table, $uid, $destPid, $first = 0, $overrideValues = array(), $excludeFields = '', $language = 0) {
$uid = ($origUid = (int)$uid);
@@ -3147,7 +3147,7 @@ class DataHandler {
* @param int $destPid Destination PID: >=0 then it points to a page-id on which to insert the record (as the first element). <0 then it points to a uid from its own table after which to insert it (works if
* @param array $copyTablesArray Table on pages to copy along with the page.
* @param bool $first Is a flag set, if the record copied is NOT a 'slave' to another record copied. That is, if this record was asked to be copied in the cmd-array
- * @return integer The id of the new page, if applicable.
+ * @return int The id of the new page, if applicable.
*/
public function copySpecificPage($uid, $destPid, $copyTablesArray, $first = 0) {
// Copy the page itself:
@@ -3183,7 +3183,7 @@ class DataHandler {
* @param int $pid Element PID (real PID, not checked)
* @param array $overrideArray Override array - must NOT contain any fields not in the table!
* @return array $workspaceOptions Options to be forwarded if actions happen on a workspace currently
- * @return integer Returns the new ID of the record (if applicable)
+ * @return int Returns the new ID of the record (if applicable)
*/
public function copyRecord_raw($table, $uid, $pid, $overrideArray = array(), array $workspaceOptions = array()) {
$uid = (int)$uid;
@@ -3245,7 +3245,7 @@ class DataHandler {
* @param string $table Table name
* @param array $fieldArray Field array to insert as a record
* @param int $realPid The value of PID field. -1 is indication that we are creating a new version!
- * @return integer Returns the new ID of the record (if applicable)
+ * @return int Returns the new ID of the record (if applicable)
*/
public function insertNewCopyVersion($table, $fieldArray, $realPid) {
$id = uniqid('NEW', TRUE);
@@ -4550,7 +4550,7 @@ class DataHandler {
*
* @param string $table Table name of the record
* @param int $uid uid of the record
- * @return boolean Whether the record can be undeleted
+ * @return bool Whether the record can be undeleted
*/
public function isRecordUndeletable($table, $uid) {
$result = FALSE;
@@ -4578,7 +4578,7 @@ class DataHandler {
* @param string $uid Record UID
* @param bool $undeleteRecord If a record should be undeleted (e.g. from history/undo)
* @return void
- * @see deleteRecord()
+ * @see deleteRecord()
*/
public function deleteRecord_procFields($table, $uid, $undeleteRecord = FALSE) {
$conf = $GLOBALS['TCA'][$table]['columns'];
@@ -4599,7 +4599,7 @@ class DataHandler {
* @param array $conf TCA configuration of current field
* @param bool $undeleteRecord If a record should be undeleted (e.g. from history/undo)
* @return void
- * @see deleteRecord()
+ * @see deleteRecord()
*/
public function deleteRecord_procBasedOnFieldType($table, $uid, $field, $value, $conf, $undeleteRecord = FALSE) {
if ($conf['type'] == 'inline') {
@@ -4686,7 +4686,7 @@ class DataHandler {
* @param int $id Record uid to versionize
* @param string $label Version label
* @param bool $delete If TRUE, the version is created to delete the record.
- * @return integer Returns the id of the new version (if any)
+ * @return int Returns the id of the new version (if any)
* @see copyRecord()
*/
public function versionizeRecord($table, $id, $label, $delete = FALSE) {
@@ -5354,7 +5354,7 @@ class DataHandler {
* Checking group modify_table access list
*
* @param string $table Table name
- * @return boolean Returns TRUE if the user has general access to modify the $table
+ * @return bool Returns TRUE if the user has general access to modify the $table
*/
public function checkModifyAccessList($table) {
$res = $this->admin || !$this->tableAdminOnly($table) && GeneralUtility::inList($this->BE_USER->groupData['tables_modify'], $table);
@@ -5371,7 +5371,7 @@ class DataHandler {
*
* @param string $table Table name
* @param int $id UID of record
- * @return boolean Returns TRUE if OK. Cached results.
+ * @return bool Returns TRUE if OK. Cached results.
*/
public function isRecordInWebMount($table, $id) {
if (!isset($this->isRecordInWebMount_Cache[($table . ':' . $id)])) {
@@ -5385,7 +5385,7 @@ class DataHandler {
* Checks if the input page ID is in the BE_USER webmounts
*
* @param int $pid Page ID to check
- * @return boolean TRUE if OK. Cached results.
+ * @return bool TRUE if OK. Cached results.
*/
public function isInWebMount($pid) {
if (!isset($this->isInWebMount_Cache[$pid])) {
@@ -5401,7 +5401,7 @@ class DataHandler {
* @param int $id Record UID
* @param array $data Record data
* @param array $hookObjectsArr Hook objects
- * @return boolean Returns TRUE if the user may update the record given by $table and $id
+ * @return bool Returns TRUE if the user may update the record given by $table and $id
*/
public function checkRecordUpdateAccess($table, $id, $data = FALSE, &$hookObjectsArr = FALSE) {
$res = NULL;
@@ -5573,7 +5573,7 @@ class DataHandler {
*
* @param int $id Page id
* @param int $perms Permission integer
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object (from exec_SELECTquery())
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object (from exec_SELECTquery())
* @access private
* @see doesRecordExist()
*/
@@ -5624,7 +5624,7 @@ class DataHandler {
* Checks if the $table is readOnly
*
* @param string $table Table name
- * @return boolean TRUE, if readonly
+ * @return bool TRUE, if readonly
*/
public function tableReadOnly($table) {
// Returns TRUE if table is readonly
@@ -5635,7 +5635,7 @@ class DataHandler {
* Checks if the $table is only editable by admin-users
*
* @param string $table Table name
- * @return boolean TRUE, if readonly
+ * @return bool TRUE, if readonly
*/
public function tableAdminOnly($table) {
// Returns TRUE if table is admin-only
@@ -5648,7 +5648,7 @@ class DataHandler {
*
* @param int $dest Destination Page ID to test
* @param int $id Page ID to test for presence inside Destination
- * @return boolean Returns FALSE if ID is inside destination (including equal to)
+ * @return bool Returns FALSE if ID is inside destination (including equal to)
*/
public function destNotInsideSelf($dest, $id) {
$loopCheck = 100;
@@ -5819,7 +5819,7 @@ class DataHandler {
* @param string $table
* @param int $uid
* @param int $pid
- * @return integer
+ * @return int
*/
public function eventPid($table, $uid, $pid) {
return $table == 'pages' ? $uid : $pid;
@@ -5882,7 +5882,7 @@ class DataHandler {
* @param bool $newVersion Set to TRUE if new version is created.
* @param int $suggestedUid Suggested UID value for the inserted record. See the array $this->suggestedInsertUids; Admin-only feature
* @param bool $dontSetNewIdIndex If TRUE, the ->substNEWwithIDs array is not updated. Only useful in very rare circumstances!
- * @return integer Returns ID on success.
+ * @return int Returns ID on success.
*/
public function insertDB($table, $id, $fieldArray, $newVersion = FALSE, $suggestedUid = 0, $dontSetNewIdIndex = FALSE) {
if (is_array($fieldArray) && is_array($GLOBALS['TCA'][$table]) && isset($fieldArray['pid'])) {
@@ -6112,7 +6112,7 @@ class DataHandler {
* @param int $pid Pid in which to resort records.
* @param string $sortRow Sorting row
* @param int $return_SortNumber_After_This_Uid Uid of record from $table in this $pid and for which the return value will be set to a free sorting number after that record. This is used to return a sortingValue if the list is resorted because of inserting records inside the list and not in the top
- * @return integer If $return_SortNumber_After_This_Uid is set, will contain usable sorting number after that record if found (otherwise 0)
+ * @return int If $return_SortNumber_After_This_Uid is set, will contain usable sorting number after that record if found (otherwise 0)
* @access private
* @see getSortNumber()
*/
@@ -6149,7 +6149,7 @@ class DataHandler {
* @param int $uid Uid of default language record
* @param int $pid Pid of default language record
* @param int $language Language of localization
- * @return integer uid of record after which the localized record should be inserted
+ * @return int uid of record after which the localized record should be inserted
*/
protected function getPreviousLocalizedRecordUid($table, $uid, $pid, $language) {
$previousLocalizedRecordUid = $uid;
@@ -6339,7 +6339,7 @@ class DataHandler {
* @param mixed $storedValue Value that is currently stored in the database
* @param string $storedType SQL type of the stored value column (see mysql_field_type(), e.g 'int', 'string', ...)
* @param bool $allowNull Whether NULL values are allowed by accordant TCA definition ('eval' = 'null')
- * @return boolean Whether both values are considered to be equal
+ * @return bool Whether both values are considered to be equal
*/
protected function isSubmittedValueEqualToStoredValue($submittedValue, $storedValue, $storedType, $allowNull = FALSE) {
// No NULL values are allowed, this is the regular behaviour.
@@ -6366,7 +6366,7 @@ class DataHandler {
* Calculates the bitvalue of the permissions given in a string, comma-sep
*
* @param string $string List of pMap strings
- * @return integer Integer mask
+ * @return int Integer mask
* @see setTSconfigPermissions(), newFieldArray()
*/
public function assemblePermissions($string) {
@@ -6480,7 +6480,7 @@ class DataHandler {
*
* @param string $table Table name
* @param int $uid Record uid
- * @return integer PID value (unless the record did not exist in which case FALSE)
+ * @return int PID value (unless the record did not exist in which case FALSE)
*/
public function getPID($table, $uid) {
$res_tmp = $GLOBALS['TYPO3_DB']->exec_SELECTquery('pid', $table, 'uid=' . (int)$uid);
@@ -6630,7 +6630,7 @@ class DataHandler {
* Returns TRUE if the TCA/columns field type is a DB reference field
*
* @param array $conf Config array for TCA/columns field
- * @return boolean TRUE if DB reference field (group/db or select with foreign-table)
+ * @return bool TRUE if DB reference field (group/db or select with foreign-table)
*/
public function isReferenceField($conf) {
return $conf['type'] == 'group' && $conf['internal_type'] == 'db' || $conf['type'] == 'select' && $conf['foreign_table'];
@@ -6709,7 +6709,7 @@ class DataHandler {
*
* @param string $table Table name
* @param int $pid "Destination pid" : If the value is >= 0 it's just returned directly (through (int)though) but if the value is <0 then the method looks up the record with the uid equal to abs($pid) (positive number) and returns the PID of that record! The idea is that negative numbers point to the record AFTER WHICH the position is supposed to be!
- * @return integer
+ * @return int
*/
public function resolvePid($table, $pid) {
$pid = (int)$pid;
@@ -6776,7 +6776,7 @@ class DataHandler {
* Used by the deleteFunctions to check if there are records from disallowed tables under the pages to be deleted.
*
* @param string $inList List of page integers
- * @return boolean Return TRUE, if permission granted
+ * @return bool Return TRUE, if permission granted
*/
public function noRecordsFromUnallowedTables($inList) {
$inList = trim($this->rmComma(trim($inList)));
@@ -6796,7 +6796,7 @@ class DataHandler {
*
* @param string $table The tablename of the record
* @param int $uid The uid of the record
- * @return boolean Returns TRUE if the record is copied or is the result of a copy action
+ * @return bool Returns TRUE if the record is copied or is the result of a copy action
*/
public function isRecordCopied($table, $uid) {
// If the record was copied:
@@ -7100,7 +7100,7 @@ class DataHandler {
* @param array $data Array with special information that may go into $details by '%s' marks / sprintf() when the log is shown
* @param int $event_pid The page_uid (pid) where the event occurred. Used to select log-content for specific pages.
* @param string $NEWid NEW id for new records
- * @return integer Log entry UID (0 if no log entry was written or logging is disabled)
+ * @return int Log entry UID (0 if no log entry was written or logging is disabled)
*/
public function log($table, $recuid, $action, $recpid, $error, $details, $details_nr = -1, $data = array(), $event_pid = -1, $NEWid = '') {
if (!$this->enableLogging) {
@@ -7126,7 +7126,7 @@ class DataHandler {
*
* @param string $message Message string
* @param int $error Error code, see log()
- * @return integer Log entry UID
+ * @return int Log entry UID
* @see log()
*/
public function newlog($message, $error = 0) {
@@ -7141,7 +7141,7 @@ class DataHandler {
* @param int $uid Record uid
* @param int $pid Record PID (from page tree). Will be turned into an event_pid internally in function: Meaning that the PID for a page will be its own UID, not its page tree PID.
* @param int $error Error code, see log()
- * @return integer Log entry UID
+ * @return int Log entry UID
* @see log()
*/
public function newlog2($message, $table, $uid, $pid = FALSE, $error = 0) {
@@ -7219,7 +7219,7 @@ class DataHandler {
*
* @param string $table Name of the table
* @param int $id Uid of the record
- * @return integer
+ * @return int
*/
public function getAutoVersionId($table, $id) {
$result = NULL;
@@ -7234,7 +7234,7 @@ class DataHandler {
*
* @param string $table Name of the table
* @param int $id Uid of the record
- * @return integer
+ * @return int
*/
protected function overlayAutoVersionId($table, $id) {
$autoVersionId = $this->getAutoVersionId($table, $id);
@@ -7283,7 +7283,7 @@ class DataHandler {
* Since DataHandler can create nested objects of itself,
* this method helps to determine the first (= outer most) one.
*
- * @return boolean
+ * @return bool
*/
public function isOuterMostInstance() {
return $this->getOuterMostInstance() === $this;
@@ -7305,7 +7305,7 @@ class DataHandler {
* @param string $table Name of the table
* @param int $id Uid of the record
* @param string $identifier Name of the action to be checked
- * @return boolean
+ * @return bool
*/
protected function isNestedElementCallRegistered($table, $id, $identifier) {
$nestedElementCalls = (array) $this->getMemoryCache()->get('nestedElementCalls');
@@ -7341,7 +7341,7 @@ class DataHandler {
*
* @param string $table Name of the table
* @param int $id Uid of the record
- * @return boolean
+ * @return bool
* @see registerElementsToBeDeleted
* @see resetElementsToBeDeleted
* @see copyRecord_raw
diff --git a/typo3/sysext/core/Classes/Database/DatabaseConnection.php b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
index 184482eb498a..c8d0f0495d94 100644
--- a/typo3/sysext/core/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/core/Classes/Database/DatabaseConnection.php
@@ -194,7 +194,7 @@ class DatabaseConnection {
* @param string $table Table name
* @param array $fields_values Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$insertFields" with 'fieldname'=>'value' and pass it to this function as argument.
* @param bool $no_quote_fields See fullQuoteArray()
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function exec_INSERTquery($table, $fields_values, $no_quote_fields = FALSE) {
$res = $this->query($this->INSERTquery($table, $fields_values, $no_quote_fields));
@@ -215,7 +215,7 @@ class DatabaseConnection {
* @param array $fields Field names
* @param array $rows Table rows. Each row should be an array with field values mapping to $fields
* @param bool $no_quote_fields See fullQuoteArray()
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function exec_INSERTmultipleRows($table, array $fields, array $rows, $no_quote_fields = FALSE) {
$res = $this->query($this->INSERTmultipleRows($table, $fields, $rows, $no_quote_fields));
@@ -237,7 +237,7 @@ class DatabaseConnection {
* @param string $where WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
* @param array $fields_values Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$updateFields" with 'fieldname'=>'value' and pass it to this function as argument.
* @param bool $no_quote_fields See fullQuoteArray()
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function exec_UPDATEquery($table, $where, $fields_values, $no_quote_fields = FALSE) {
$res = $this->query($this->UPDATEquery($table, $where, $fields_values, $no_quote_fields));
@@ -256,7 +256,7 @@ class DatabaseConnection {
*
* @param string $table Database tablename
* @param string $where WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function exec_DELETEquery($table, $where) {
$res = $this->query($this->DELETEquery($table, $where));
@@ -280,7 +280,7 @@ class DatabaseConnection {
* @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
* @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
* @param string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function exec_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '') {
$query = $this->SELECTquery($select_fields, $from_table, $where_clause, $groupBy, $orderBy, $limit);
@@ -312,7 +312,7 @@ class DatabaseConnection {
* @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
* @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
* @param string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
* @see exec_SELECTquery()
*/
public function exec_SELECT_mm_query($select, $local_table, $mm_table, $foreign_table, $whereClause = '', $groupBy = '', $orderBy = '', $limit = '') {
@@ -331,7 +331,7 @@ class DatabaseConnection {
* Executes a select based on input query parts array
*
* @param array $queryParts Query parts array
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
* @see exec_SELECTquery()
*/
public function exec_SELECT_queryArray($queryParts) {
@@ -977,7 +977,7 @@ class DatabaseConnection {
* using exec_SELECTquery() and similar methods instead.
*
* @param string $query Query to execute
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function sql_query($query) {
$res = $this->query($query);
@@ -999,7 +999,7 @@ class DatabaseConnection {
/**
* Returns the error number on the last query() execution
*
- * @return integer MySQLi error number
+ * @return int MySQLi error number
*/
public function sql_errno() {
return $this->link->errno;
@@ -1009,7 +1009,7 @@ class DatabaseConnection {
* Returns the number of selected rows.
*
* @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
- * @return integer Number of resulting rows
+ * @return int Number of resulting rows
*/
public function sql_num_rows($res) {
if ($this->debug_check_recordset($res)) {
@@ -1065,7 +1065,7 @@ class DatabaseConnection {
* free_result() wrapper function
*
* @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
- * @return boolean Returns TRUE on success or FALSE on failure.
+ * @return bool Returns TRUE on success or FALSE on failure.
*/
public function sql_free_result($res) {
if ($this->debug_check_recordset($res) && is_object($res)) {
@@ -1079,7 +1079,7 @@ class DatabaseConnection {
/**
* Get the ID generated from the previous INSERT operation
*
- * @return integer The uid of the last inserted record.
+ * @return int The uid of the last inserted record.
*/
public function sql_insert_id() {
return $this->link->insert_id;
@@ -1088,7 +1088,7 @@ class DatabaseConnection {
/**
* Returns the number of rows affected by the last INSERT, UPDATE or DELETE query
*
- * @return integer Number of rows affected by last query
+ * @return int Number of rows affected by last query
*/
public function sql_affected_rows() {
return $this->link->affected_rows;
@@ -1099,7 +1099,7 @@ class DatabaseConnection {
*
* @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
* @param int $seek Seek result number.
- * @return boolean Returns TRUE on success or FALSE on failure.
+ * @return bool Returns TRUE on success or FALSE on failure.
*/
public function sql_data_seek($res, $seek) {
if ($this->debug_check_recordset($res)) {
@@ -1157,7 +1157,7 @@ class DatabaseConnection {
* @param string $host Deprecated since 6.1, will be removed in two versions. Database host IP/domain[:port]
* @param string $username Deprecated since 6.1, will be removed in two versions. Username to connect with.
* @param string $password Deprecated since 6.1, will be removed in two versions. Password to connect with.
- * @return boolean|void
+ * @return bool|void
* @throws \RuntimeException
*/
public function sql_pconnect($host = NULL, $username = NULL, $password = NULL) {
@@ -1252,7 +1252,7 @@ class DatabaseConnection {
* Select a SQL database
*
* @param string $TYPO3_db Deprecated since 6.1, will be removed in two versions. Database to connect to.
- * @return boolean Returns TRUE on success or FALSE on failure.
+ * @return bool Returns TRUE on success or FALSE on failure.
*/
public function sql_select_db($TYPO3_db = NULL) {
if (!$this->isConnected) {
@@ -1408,7 +1408,7 @@ class DatabaseConnection {
* mysqli() wrapper function, used by the Install Tool and EM for all queries regarding management of the database!
*
* @param string $query Query to execute
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function admin_query($query) {
$res = $this->query($query);
@@ -1600,7 +1600,7 @@ class DatabaseConnection {
/**
* Checks if database is connected
*
- * @return boolean
+ * @return bool
*/
public function isConnected() {
// We think we're still connected
@@ -1784,7 +1784,7 @@ class DatabaseConnection {
* Checks if record set is valid and writes debugging information into devLog if not.
*
* @param bool|\mysqli_result|object MySQLi result object / DBAL object
- * @return boolean TRUE if the record set is valid, FALSE otherwise
+ * @return bool TRUE if the record set is valid, FALSE otherwise
*/
public function debug_check_recordset($res) {
if ($res !== FALSE) {
@@ -1830,7 +1830,7 @@ class DatabaseConnection {
* @param string $query SQL query
* @param string $from_table Table(s) from which to select. This is what comes right after "FROM ...". Required value.
* @param int $row_count Number of resulting rows
- * @return boolean TRUE if explain was run, FALSE otherwise
+ * @return bool TRUE if explain was run, FALSE otherwise
*/
protected function explain($query, $from_table, $row_count) {
$debugAllowedForIp = GeneralUtility::cmpIP(
diff --git a/typo3/sysext/core/Classes/Database/PreparedStatement.php b/typo3/sysext/core/Classes/Database/PreparedStatement.php
index 5ee70f55cc2d..a84222e8b4a3 100644
--- a/typo3/sysext/core/Classes/Database/PreparedStatement.php
+++ b/typo3/sysext/core/Classes/Database/PreparedStatement.php
@@ -275,7 +275,7 @@ class PreparedStatement {
* </code>
*
* @param array $input_parameters An array of values with as many elements as there are bound parameters in the SQL statement being executed. The PHP type of each array value will be used to decide which PARAM_* type to use (int, string, boolean, NULL), so make sure your variables are properly casted, if needed.
- * @return boolean Returns TRUE on success or FALSE on failure.
+ * @return bool Returns TRUE on success or FALSE on failure.
* @throws \InvalidArgumentException
* @api
*/
@@ -444,7 +444,7 @@ class PreparedStatement {
* Moves internal result pointer.
*
* @param int $rowNumber Where to place the result pointer (0 = start)
- * @return boolean Returns TRUE on success or FALSE on failure.
+ * @return bool Returns TRUE on success or FALSE on failure.
* @api
*/
public function seek($rowNumber) {
@@ -485,7 +485,7 @@ class PreparedStatement {
/**
* Returns the number of rows affected by the last SQL statement.
*
- * @return integer The number of rows.
+ * @return int The number of rows.
* @api
*/
public function rowCount() {
@@ -495,7 +495,7 @@ class PreparedStatement {
/**
* Returns the error number on the last execute() call.
*
- * @return integer Driver specific error code.
+ * @return int Driver specific error code.
* @api
*/
public function errorCode() {
@@ -542,7 +542,7 @@ class PreparedStatement {
* Guesses the type of a given value.
*
* @param mixed $value
- * @return integer One of the \TYPO3\CMS\Core\Database\PreparedStatement::PARAM_* constants
+ * @return int One of the \TYPO3\CMS\Core\Database\PreparedStatement::PARAM_* constants
*/
protected function guessValueType($value) {
if (is_bool($value)) {
@@ -561,7 +561,7 @@ class PreparedStatement {
* Returns TRUE if named placeholers are used in a query.
*
* @param string $query
- * @return boolean
+ * @return bool
*/
protected function hasNamedPlaceholders($query) {
$matches = preg_match('/(?<![\\w:]):[\\w]+\\b/', $query);
diff --git a/typo3/sysext/core/Classes/Database/QueryView.php b/typo3/sysext/core/Classes/Database/QueryView.php
index 3069a536600c..b4d2edc1a3c1 100644
--- a/typo3/sysext/core/Classes/Database/QueryView.php
+++ b/typo3/sysext/core/Classes/Database/QueryView.php
@@ -144,7 +144,7 @@ class QueryView {
* [Describe function...]
*
* @param int $uid
- * @return integer
+ * @return int
*/
public function saveQueryInAction($uid) {
if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('sys_action')) {
diff --git a/typo3/sysext/core/Classes/Database/ReferenceIndex.php b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
index 107c7f607292..36e9823ba2d5 100644
--- a/typo3/sysext/core/Classes/Database/ReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/ReferenceIndex.php
@@ -282,7 +282,7 @@ class ReferenceIndex {
* @param string $flexpointer Pointer to location inside flexform structure where reference is located in [field]
* @param int $deleted Whether record is deleted-flagged or not
* @param array $items Data array with file relations
- * @return void
+ * @return void
*/
public function createEntryData_fileRels($table, $uid, $fieldname, $flexpointer, $deleted, $items) {
foreach ($items as $sort => $i) {
@@ -855,7 +855,7 @@ class ReferenceIndex {
* Returns TRUE if the TCA/columns field type is a DB reference field
*
* @param array $conf Config array for TCA/columns field
- * @return boolean TRUE if DB reference field (group/db or select with foreign-table)
+ * @return bool TRUE if DB reference field (group/db or select with foreign-table)
*/
public function isReferenceField($conf) {
return (
diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index 1362926c8345..c8f83233136e 100644
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -1254,7 +1254,7 @@ class RelationHandler {
* @param string $parentUid The uid of the parent record
* @param array $parentConf The TCA configuration of the parent field embedding the child records
* @param array $childRec The record row of the child record
- * @return boolean Returns TRUE if looking from the symmetric ("other") side to the relation.
+ * @return bool Returns TRUE if looking from the symmetric ("other") side to the relation.
*/
static public function isOnSymmetricSide($parentUid, $parentConf, $childRec) {
return MathUtility::canBeInterpretedAsInteger($childRec['uid'])
diff --git a/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php b/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
index a485e407a750..16b1d645205d 100644
--- a/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
@@ -805,7 +805,7 @@ class SoftReferenceIndex {
* Look up and return page uid for alias
*
* @param int $link_param Page alias string value
- * @return integer Page uid corresponding to alias value.
+ * @return int Page uid corresponding to alias value.
*/
public function getPageIdFromAlias($link_param) {
$pRec = \TYPO3\CMS\Backend\Utility\BackendUtility::getRecordsByField('pages', 'alias', $link_param);
diff --git a/typo3/sysext/core/Classes/Database/SqlParser.php b/typo3/sysext/core/Classes/Database/SqlParser.php
index ebe26b28100b..1f4b03736568 100644
--- a/typo3/sysext/core/Classes/Database/SqlParser.php
+++ b/typo3/sysext/core/Classes/Database/SqlParser.php
@@ -1808,7 +1808,7 @@ class SqlParser {
*
* @param array $clauseArray WHERE clause configuration
* @return string WHERE clause as string.
- * @see explodeWhereClause()
+ * @see explodeWhereClause()
*/
public function compileWhereClause($clauseArray) {
// Prepare buffer variable:
diff --git a/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php b/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
index 020b4ffad59a..e283113debca 100644
--- a/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
+++ b/typo3/sysext/core/Classes/Encoder/JavaScriptEncoder.php
@@ -116,7 +116,7 @@ class JavaScriptEncoder implements \TYPO3\CMS\Core\SingletonInterface {
* Checks if the given character is one of the immune characters
*
* @param string $character utf-8 character to search for, must not be empty
- * @return boolean TRUE if character is immune, FALSE otherwise
+ * @return bool TRUE if character is immune, FALSE otherwise
*/
protected function isImmuneCharacter($character) {
return in_array($character, $this->immuneCharacters, TRUE);
diff --git a/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php b/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php
index 1eaef62d98ef..9bf2d2aec4dd 100644
--- a/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php
+++ b/typo3/sysext/core/Classes/Error/ProductionExceptionHandler.php
@@ -78,7 +78,7 @@ class ProductionExceptionHandler extends AbstractExceptionHandler {
* Determines, whether Exception details should be outputted
*
* @param \Exception $exception The exception
- * @return boolean
+ * @return bool
*/
protected function discloseExceptionInformation(\Exception $exception) {
// Allow message to be shown in production mode if the exception is about
diff --git a/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php b/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
index adcdbd2eae96..2a4e6e462949 100644
--- a/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
+++ b/typo3/sysext/core/Classes/ExtDirect/ExtDirectApi.php
@@ -185,7 +185,7 @@ class ExtDirectApi {
*
* @param string $namespace
* @param array $filterNamespaces
- * @return boolean
+ * @return bool
*/
protected function findNamespace($namespace, array $filterNamespaces) {
if ($filterNamespaces === array('TYPO3')) {
diff --git a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
index 9bbe951d9918..eda3bc10e51f 100644
--- a/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/AbstractFormProtection.php
@@ -91,7 +91,7 @@ abstract class AbstractFormProtection {
* @param string $formName
* @param string $action
* @param string $formInstanceName
- * @return boolean
+ * @return bool
*/
public function validateToken($tokenId, $formName, $action = '', $formInstanceName = '') {
$validTokenId = \TYPO3\CMS\Core\Utility\GeneralUtility::hmac(((string) $formName . (string) $action) . (string) $formInstanceName . $this->getSessionToken());
diff --git a/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php b/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
index dfbb5ce29e01..9fc4df4c2c58 100644
--- a/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
+++ b/typo3/sysext/core/Classes/FormProtection/BackendFormProtection.php
@@ -219,7 +219,7 @@ class BackendFormProtection extends \TYPO3\CMS\Core\FormProtection\AbstractFormP
/**
* Checks if a user is logged in and the session is active.
*
- * @return boolean
+ * @return bool
*/
protected function isAuthorizedBackendSession() {
return isset($GLOBALS['BE_USER']) && $GLOBALS['BE_USER'] instanceof \TYPO3\CMS\Core\Authentication\BackendUserAuthentication && isset($GLOBALS['BE_USER']->user['uid']);
diff --git a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
index d06d2f1daf39..a05b0b4ed58f 100644
--- a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
+++ b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
@@ -98,7 +98,7 @@ class FormProtectionFactory {
/**
* Check if we are in the install tool
*
- * @return boolean
+ * @return bool
*/
static protected function isInstallToolSession() {
return defined('TYPO3_enterInstallScript') && TYPO3_enterInstallScript;
@@ -107,7 +107,7 @@ class FormProtectionFactory {
/**
* Checks if a user is logged in and the session is active.
*
- * @return boolean
+ * @return bool
*/
static protected function isBackendSession() {
return isset($GLOBALS['BE_USER']) && $GLOBALS['BE_USER'] instanceof \TYPO3\CMS\Core\Authentication\BackendUserAuthentication && isset($GLOBALS['BE_USER']->user['uid']);
@@ -116,7 +116,7 @@ class FormProtectionFactory {
/**
* Checks if a frontend user is logged in and the session is active.
*
- * @return boolean
+ * @return bool
*/
static protected function isFrontendSession() {
return is_object($GLOBALS['TSFE']) && $GLOBALS['TSFE']->fe_user instanceof \TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication && isset($GLOBALS['TSFE']->fe_user->user['uid']) && TYPO3_MODE === 'FE';
diff --git a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
index 8311e757282c..7d979004b98a 100644
--- a/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
+++ b/typo3/sysext/core/Classes/FrontendEditing/FrontendEditingController.php
@@ -146,7 +146,7 @@ class FrontendEditingController {
/**
* Returns TRUE if an edit-action is sent from the Admin Panel
*
- * @return boolean
+ * @return bool
* @see index_ts.php
*/
public function isEditAction() {
@@ -168,7 +168,7 @@ class FrontendEditingController {
* Returns TRUE if an edit form is shown on the page.
* Used from index_ts.php where a TRUE return-value will result in classes etc. being included.
*
- * @return boolean
+ * @return bool
* @see index_ts.php
*/
public function isEditFormShown() {
@@ -418,7 +418,7 @@ class FrontendEditingController {
*
* @param string $table The name of the table.
* @param array $currentRecord The record.
- * @return boolean
+ * @return bool
*/
protected function allowedToEditLanguage($table, array $currentRecord) {
// If no access right to record languages, return immediately
@@ -446,7 +446,7 @@ class FrontendEditingController {
* @param array $dataArray The data array.
* @param array $conf The configuration array for the edit panel.
* @param bool $checkEditAccessInternals Boolean indicating whether recordEditAccessInternals should not be checked. Defaults
- * @return boolean
+ * @return bool
*/
protected function allowedToEdit($table, array $dataArray, array $conf, $checkEditAccessInternals = TRUE) {
// Unless permissions specifically allow it, editing is not allowed.
diff --git a/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php b/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
index abacadec5696..2d9f5b31cbba 100644
--- a/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
+++ b/typo3/sysext/core/Classes/Http/AjaxRequestHandler.php
@@ -161,7 +161,7 @@ class AjaxRequestHandler {
/**
* Checks whether an error occurred during the execution or not
*
- * @return boolean Whether this AJAX call had errors
+ * @return bool Whether this AJAX call had errors
*/
public function isError() {
return $this->isError;
diff --git a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
index d86e4b14830d..da1aad11e80f 100644
--- a/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
+++ b/typo3/sysext/core/Classes/Imaging/GraphicalFunctions.php
@@ -898,7 +898,7 @@ class GraphicalFunctions {
* Function that finds the right fontsize that will render the textstring within a certain width
*
* @param array $conf The TypoScript properties of the TEXT GIFBUILDER object
- * @return integer The new fontSize
+ * @return int The new fontSize
* @access private
* @see \TYPO3\CMS\Frontend\Imaging\GifBuilder::start()
*/
@@ -1188,7 +1188,7 @@ class GraphicalFunctions {
* Calculates and returns the niceText.scaleFactor
*
* @param array $conf TypoScript array for the TEXT GIFBUILDER object
- * @return integer TypoScript value from eg $conf['niceText.']['scaleFactor']
+ * @return int TypoScript value from eg $conf['niceText.']['scaleFactor']
* @access private
*/
public function getTextScalFactor($conf) {
@@ -1289,7 +1289,7 @@ class GraphicalFunctions {
*
* @param array $conf TypoScript configuration for the currently rendered object
* @param array $boundingBox The bounding box the the currently rendered object
- * @return integer The break space
+ * @return int The break space
*/
protected function getBreakSpace($conf, array $boundingBox = NULL) {
if (!isset($boundingBox)) {
@@ -2267,7 +2267,7 @@ class GraphicalFunctions {
* file exists!
*
* @param array $identifyResult Result of the getImageDimensions function
- * @return boolean TRUE if operation was successful
+ * @return bool TRUE if operation was successful
*/
public function cacheImageDimensions($identifyResult) {
// Create md5 hash of filemtime and filesize
@@ -2446,7 +2446,7 @@ class GraphicalFunctions {
*
* @param string $output Output imagefile
* @param string $orig Original basis file
- * @return boolean Returns TRUE if the file is already being made; thus "TRUE" means "Don't render the image again
+ * @return bool Returns TRUE if the file is already being made; thus "TRUE" means "Don't render the image again
* @access private
*/
public function file_exists_typo3temp_file($output, $orig = '') {
@@ -2568,7 +2568,7 @@ class GraphicalFunctions {
* @param string $mask The relative (to PATH_site) image filepath, the mask file (grayscale)
* @param string $output The relative (to PATH_site) image filepath, output filename (written to)
* @param bool $handleNegation
- * @return void
+ * @return void
*/
public function combineExec($input, $overlay, $mask, $output, $handleNegation = FALSE) {
if (!$this->NO_IMAGE_MAGICK) {
@@ -2629,7 +2629,7 @@ class GraphicalFunctions {
* Creates subdirectory in typo3temp/ if not already found.
*
* @param string $dirName Name of sub directory
- * @return boolean Result of \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir(), TRUE if it went well.
+ * @return bool Result of \TYPO3\CMS\Core\Utility\GeneralUtility::mkdir(), TRUE if it went well.
*/
public function createTempSubDir($dirName) {
// Checking if the this->tempPath is already prefixed with PATH_site and if not, prefix it with that constant.
@@ -2761,7 +2761,7 @@ class GraphicalFunctions {
* @param pointer $destImg The GDlib image resource pointer
* @param string $theImage The filename to write to
* @param int $quality The image quality (for JPEGs)
- * @return boolean The output of either imageGif, imagePng or imageJpeg based on the filename to write
+ * @return bool The output of either imageGif, imagePng or imageJpeg based on the filename to write
* @see maskImageOntoImage(), scale(), output()
*/
public function ImageWrite($destImg, $theImage, $quality = 0) {
@@ -2866,7 +2866,7 @@ class GraphicalFunctions {
* @param pointer $img Image resource
* @param array $colArr Array containing RGB color arrays
* @param bool $closest
- * @return integer The index of the unified color
+ * @return int The index of the unified color
*/
public function unifyColors(&$img, $colArr, $closest = FALSE) {
$retCol = -1;
diff --git a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
index 67701195f36c..c6b9bd3a45dc 100644
--- a/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
+++ b/typo3/sysext/core/Classes/Integrity/DatabaseIntegrityCheck.php
@@ -184,7 +184,7 @@ class DatabaseIntegrityCheck {
* @param string $depthData HTML-code used when this function calls itself recursively.
* @param string $table Table to get the records from
* @param bool $versions Internal variable, don't set from outside!
- * @return void
+ * @return void
*/
public function genTree_records($theID, $depthData, $table = '', $versions = FALSE) {
if ($versions) {
@@ -279,7 +279,7 @@ class DatabaseIntegrityCheck {
*
* @param string $table Database tablename
* @param int $uid The uid of the record which will have the PID value set to 0 (zero)
- * @return boolean TRUE if done.
+ * @return bool TRUE if done.
*/
public function fixLostRecord($table, $uid) {
if ($table && $GLOBALS['TCA'][$table] && $uid && is_array($this->lRecords[$table][$uid]) && $GLOBALS['BE_USER']->user['admin']) {
diff --git a/typo3/sysext/core/Classes/Localization/LanguageStore.php b/typo3/sysext/core/Classes/Localization/LanguageStore.php
index 888f60d2f9f7..bbaa12075c46 100644
--- a/typo3/sysext/core/Classes/Localization/LanguageStore.php
+++ b/typo3/sysext/core/Classes/Localization/LanguageStore.php
@@ -69,7 +69,7 @@ class LanguageStore implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $fileReference File reference
* @param string $languageKey Valid language key
- * @return boolean
+ * @return bool
*/
public function hasData($fileReference, $languageKey) {
if (isset($this->data[$fileReference][$languageKey]) && is_array($this->data[$fileReference][$languageKey])) {
diff --git a/typo3/sysext/core/Classes/Localization/Parser/LocallangArrayParser.php b/typo3/sysext/core/Classes/Localization/Parser/LocallangArrayParser.php
index 175933f6c3ae..004f480365a1 100644
--- a/typo3/sysext/core/Classes/Localization/Parser/LocallangArrayParser.php
+++ b/typo3/sysext/core/Classes/Localization/Parser/LocallangArrayParser.php
@@ -182,7 +182,7 @@ class LocallangArrayParser implements \TYPO3\CMS\Core\Localization\Parser\Locali
* Checks if the file is within the web root.
*
* @param string $fileName
- * @return boolean
+ * @return bool
*/
protected function isWithinWebRoot($fileName) {
return (bool) \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($fileName);
diff --git a/typo3/sysext/core/Classes/Locking/Locker.php b/typo3/sysext/core/Classes/Locking/Locker.php
index fb47b3da17b9..6d1f4f8f94d8 100644
--- a/typo3/sysext/core/Classes/Locking/Locker.php
+++ b/typo3/sysext/core/Classes/Locking/Locker.php
@@ -165,7 +165,7 @@ class Locker {
* It is important to know that the lock will be acquired in any case, even if the request was blocked first.
* Therefore, the lock needs to be released in every situation.
*
- * @return boolean Returns TRUE if lock could be acquired without waiting, FALSE otherwise.
+ * @return bool Returns TRUE if lock could be acquired without waiting, FALSE otherwise.
* @throws \RuntimeException
* @deprecated since 6.2 - will be removed two versions later; use new API instead
*/
@@ -325,7 +325,7 @@ class Locker {
/**
* Release the lock
*
- * @return boolean Returns TRUE on success or FALSE on failure
+ * @return bool Returns TRUE on success or FALSE on failure
*/
public function release() {
if (!$this->isAcquired) {
diff --git a/typo3/sysext/core/Classes/Log/LogLevel.php b/typo3/sysext/core/Classes/Log/LogLevel.php
index 64878eee8edc..49d7c10cd809 100644
--- a/typo3/sysext/core/Classes/Log/LogLevel.php
+++ b/typo3/sysext/core/Classes/Log/LogLevel.php
@@ -118,7 +118,7 @@ class LogLevel {
* whether it is an integer and in the range of 0-7.
*
* @param int $level log level to validate
- * @return boolean TRUE if the given log level is valid, FALSE otherwise
+ * @return bool TRUE if the given log level is valid, FALSE otherwise
*/
static public function isValidLevel($level) {
return \TYPO3\CMS\Core\Utility\MathUtility::isIntegerInRange($level, self::EMERGENCY, self::DEBUG);
@@ -141,7 +141,7 @@ class LogLevel {
* Normalizes level by converting it from string to integer
*
* @param string $level
- * @return integer|string
+ * @return int|string
*/
static public function normalizeLevel($level) {
if (is_string($level) && defined(__CLASS__ . '::' . strtoupper($level))) {
diff --git a/typo3/sysext/core/Classes/Log/LogRecord.php b/typo3/sysext/core/Classes/Log/LogRecord.php
index 9b6f296091a2..f175456f1bf5 100644
--- a/typo3/sysext/core/Classes/Log/LogRecord.php
+++ b/typo3/sysext/core/Classes/Log/LogRecord.php
@@ -163,7 +163,7 @@ class LogRecord implements \ArrayAccess {
* Returns the severity level
*
* @see \TYPO3\CMS\Core\Log\Level
- * @return integer Severity level
+ * @return int Severity level
*/
public function getLevel() {
return $this->level;
@@ -275,7 +275,7 @@ class LogRecord implements \ArrayAccess {
* Checks whether an offset exists, required by ArrayAccess interface
*
* @param mixed $offset
- * @return boolean
+ * @return bool
*/
public function offsetExists($offset) {
$offsetExists = FALSE;
diff --git a/typo3/sysext/core/Classes/Log/Logger.php b/typo3/sysext/core/Classes/Log/Logger.php
index 6f76d41763a7..1e488a563ae9 100644
--- a/typo3/sysext/core/Classes/Log/Logger.php
+++ b/typo3/sysext/core/Classes/Log/Logger.php
@@ -79,7 +79,7 @@ class Logger implements \Psr\Log\LoggerInterface {
/**
* Gets the minimum log level for which log records are written.
*
- * @return integer Minimum log level
+ * @return int Minimum log level
*/
protected function getMinimumLogLevel() {
return $this->minimumLogLevel;
diff --git a/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php b/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
index c2066ef4e896..fe005ec451ff 100644
--- a/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
+++ b/typo3/sysext/core/Classes/Log/Processor/AbstractMemoryProcessor.php
@@ -53,7 +53,7 @@ abstract class AbstractMemoryProcessor extends \TYPO3\CMS\Core\Log\Processor\Abs
/**
* Returns the allocated memory usage type
*
- * @return boolean
+ * @return bool
*/
public function getRealMemoryUsage() {
return $this->realMemoryUsage;
@@ -72,7 +72,7 @@ abstract class AbstractMemoryProcessor extends \TYPO3\CMS\Core\Log\Processor\Abs
/**
* Returns whether size should be formatted
*
- * @return boolean
+ * @return bool
*/
public function getFormatSize() {
return $this->formatSize;
diff --git a/typo3/sysext/core/Classes/Mail/MailMessage.php b/typo3/sysext/core/Classes/Mail/MailMessage.php
index 6cf3074287c3..ffe743671049 100644
--- a/typo3/sysext/core/Classes/Mail/MailMessage.php
+++ b/typo3/sysext/core/Classes/Mail/MailMessage.php
@@ -58,7 +58,7 @@ class MailMessage extends \Swift_Message {
/**
* Sends the message.
*
- * @return integer the number of recipients who were accepted for delivery
+ * @return int the number of recipients who were accepted for delivery
* @author Karsten Dambekalns <karsten@typo3.org>
*/
public function send() {
@@ -71,7 +71,7 @@ class MailMessage extends \Swift_Message {
/**
* Checks whether the message has been sent.
*
- * @return boolean
+ * @return bool
* @author Karsten Dambekalns <karsten@typo3.org>
*/
public function isSent() {
diff --git a/typo3/sysext/core/Classes/Mail/MailerAdapterInterface.php b/typo3/sysext/core/Classes/Mail/MailerAdapterInterface.php
index 22690763ad4e..7847bae145f8 100644
--- a/typo3/sysext/core/Classes/Mail/MailerAdapterInterface.php
+++ b/typo3/sysext/core/Classes/Mail/MailerAdapterInterface.php
@@ -28,7 +28,7 @@ interface MailerAdapterInterface {
* @param array $additionalHeaders Additional mail headers.
* @param array $additionalParameters Additional mailer parameters.
* @param bool $fakeSending Whether to fake sending or not, used in Unit Tests.
- * @return boolean TRUE if the mail was successfully sent, FALSE otherwise.
+ * @return bool TRUE if the mail was successfully sent, FALSE otherwise.
*/
public function mail($to, $subject, $messageBody, $additionalHeaders = NULL, $additionalParameters = NULL, $fakeSending = FALSE);
diff --git a/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php b/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
index 99ef89d8e4eb..202c65b5271b 100644
--- a/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
+++ b/typo3/sysext/core/Classes/Mail/Rfc822AddressesParser.php
@@ -211,7 +211,7 @@ class Rfc822AddressesParser {
*
* @access private
* @param string $address The addresses to split.
- * @return boolean Success or failure.
+ * @return bool Success or failure.
*/
protected function _splitAddresses($address) {
if (!empty($this->limit) && count($this->addresses) == $this->limit) {
@@ -272,7 +272,7 @@ class Rfc822AddressesParser {
*
* @access private
* @param string $address The address to check.
- * @return boolean Whether or not there is a group at the start of the string.
+ * @return bool Whether or not there is a group at the start of the string.
*/
protected function _isGroup($address) {
// First comma not in quotes, angles or escaped:
@@ -321,7 +321,7 @@ class Rfc822AddressesParser {
*
* @access private
* @param string $string The string to check.
- * @return boolean TRUE if there are unclosed quotes inside the string,
+ * @return bool TRUE if there are unclosed quotes inside the string,
*/
protected function _hasUnclosedQuotes($string) {
$string = trim($string);
@@ -351,7 +351,7 @@ class Rfc822AddressesParser {
* @access private
* @param string $string The string to check.
* @param string $chars The characters to check for.
- * @return boolean TRUE if there are unclosed brackets inside the string, FALSE otherwise.
+ * @return bool TRUE if there are unclosed brackets inside the string, FALSE otherwise.
*/
protected function _hasUnclosedBrackets($string, $chars) {
$num_angle_start = substr_count($string, $chars[0]);
@@ -373,7 +373,7 @@ class Rfc822AddressesParser {
* @param string $string The string to check.
* @param int &$num The number of occurrences.
* @param string $char The character to count.
- * @return integer The number of occurrences of $char in $string, adjusted for backslashes.
+ * @return int The number of occurrences of $char in $string, adjusted for backslashes.
*/
protected function _hasUnclosedBracketsSub($string, &$num, $char) {
$parts = explode($char, $string);
@@ -459,7 +459,7 @@ class Rfc822AddressesParser {
*
* @access private
* @param string $phrase The phrase to check.
- * @return boolean Success or failure.
+ * @return bool Success or failure.
*/
protected function _validatePhrase($phrase) {
// Splits on one or more Tab or space.
@@ -498,7 +498,7 @@ class Rfc822AddressesParser {
*
* @access private
* @param string $atom The string to check.
- * @return boolean Success or failure.
+ * @return bool Success or failure.
*/
protected function _validateAtom($atom) {
if (!$this->validate) {
@@ -526,7 +526,7 @@ class Rfc822AddressesParser {
*
* @access private
* @param string $qstring The string to check
- * @return boolean Success or failure.
+ * @return bool Success or failure.
*/
protected function _validateQuotedString($qstring) {
// Leading and trailing "
@@ -542,7 +542,7 @@ class Rfc822AddressesParser {
*
* @access public
* @param string &$mailbox The string to check.
- * @return boolean Success or failure.
+ * @return bool Success or failure.
*/
protected function validateMailbox(&$mailbox) {
// A couple of defaults.
@@ -708,7 +708,7 @@ class Rfc822AddressesParser {
*
* @access private
* @param string $subdomain The string to check.
- * @return boolean Success or failure.
+ * @return bool Success or failure.
*/
protected function _validateSubdomain($subdomain) {
if (preg_match('|^\\[(.*)]$|', $subdomain, $arr)) {
@@ -730,7 +730,7 @@ class Rfc822AddressesParser {
*
* @access private
* @param string $dliteral The string to check.
- * @return boolean Success or failure.
+ * @return bool Success or failure.
*/
protected function _validateDliteral($dliteral) {
return !preg_match('/(.)[][\\x0D\\\\]/', $dliteral, $matches) && $matches[1] != '\\';
diff --git a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
index 34065cc7ecd1..23c3e27b168f 100644
--- a/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/AbstractMessage.php
@@ -88,7 +88,7 @@ abstract class AbstractMessage {
/**
* Gets the message' severity.
*
- * @return integer The message' severity, must be one of AbstractMessage::INFO or similar contstants
+ * @return int The message' severity, must be one of AbstractMessage::INFO or similar contstants
*/
public function getSeverity() {
return $this->severity;
diff --git a/typo3/sysext/core/Classes/Messaging/FlashMessage.php b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
index c115df365cce..c14909b5c51e 100644
--- a/typo3/sysext/core/Classes/Messaging/FlashMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/FlashMessage.php
@@ -57,7 +57,7 @@ class FlashMessage extends \TYPO3\CMS\Core\Messaging\AbstractMessage {
/**
* Gets the message's storeInSession flag.
*
- * @return boolean TRUE if message should be stored in the session, otherwise FALSE.
+ * @return bool TRUE if message should be stored in the session, otherwise FALSE.
*/
public function isSessionMessage() {
return $this->storeInSession;
diff --git a/typo3/sysext/core/Classes/Package/DependencyResolver.php b/typo3/sysext/core/Classes/Package/DependencyResolver.php
index ad8627e3d503..d35dafeb8931 100644
--- a/typo3/sysext/core/Classes/Package/DependencyResolver.php
+++ b/typo3/sysext/core/Classes/Package/DependencyResolver.php
@@ -249,7 +249,7 @@ class DependencyResolver {
*
* @param array $dependencyGraph
* @param string $packageKey
- * @return integer
+ * @return int
*/
protected function getIncomingEdgeCount(array $dependencyGraph, $packageKey) {
$incomingEdgeCount = 0;
diff --git a/typo3/sysext/core/Classes/Package/Package.php b/typo3/sysext/core/Classes/Package/Package.php
index 2d6ec5d034e3..00096e7419ab 100644
--- a/typo3/sysext/core/Classes/Package/Package.php
+++ b/typo3/sysext/core/Classes/Package/Package.php
@@ -126,7 +126,7 @@ class Package extends \TYPO3\Flow\Package\Package implements PackageInterface {
}
/**
- * @return boolean
+ * @return bool
*/
public function isPartOfMinimalUsableSystem() {
return $this->partOfMinimalUsableSystem;
@@ -320,7 +320,7 @@ class Package extends \TYPO3\Flow\Package\Package implements PackageInterface {
* Check whether the given package requirement (like "typo3/flow" or "php") is a composer package or not
*
* @param string $requirement the composer requirement string
- * @return boolean TRUE if $requirement is a composer package (contains a slash), FALSE otherwise
+ * @return bool TRUE if $requirement is a composer package (contains a slash), FALSE otherwise
*/
protected function packageRequirementIsComposerPackage($requirement) {
// According to http://getcomposer.org/doc/02-libraries.md#platform-packages
diff --git a/typo3/sysext/core/Classes/Package/PackageInterface.php b/typo3/sysext/core/Classes/Package/PackageInterface.php
index 423a7ccba3b9..f1992c2245e6 100644
--- a/typo3/sysext/core/Classes/Package/PackageInterface.php
+++ b/typo3/sysext/core/Classes/Package/PackageInterface.php
@@ -32,7 +32,7 @@ interface PackageInterface extends \TYPO3\Flow\Package\PackageInterface {
* Tells if the package is part of the default factory configuration
* and therefor activated at first installation.
*
- * @return boolean
+ * @return bool
*/
public function isPartOfFactoryDefault();
@@ -41,7 +41,7 @@ interface PackageInterface extends \TYPO3\Flow\Package\PackageInterface {
* and therefor activated if PackageStates is created from scratch for
* whatever reason.
*
- * @return boolean
+ * @return bool
*/
public function isPartOfMinimalUsableSystem();
}
diff --git a/typo3/sysext/core/Classes/Package/PackageManager.php b/typo3/sysext/core/Classes/Package/PackageManager.php
index 2525a3cd496c..dfd5f60a6d01 100644
--- a/typo3/sysext/core/Classes/Package/PackageManager.php
+++ b/typo3/sysext/core/Classes/Package/PackageManager.php
@@ -576,7 +576,7 @@ class PackageManager extends \TYPO3\Flow\Package\PackageManager implements \TYPO
* or FALSE if it's not. If a package is available it doesn't mean necessarily that it's active!
*
* @param string $packageKey The key of the package to check
- * @return boolean TRUE if the package is available, otherwise FALSE
+ * @return bool TRUE if the package is available, otherwise FALSE
* @api
*/
public function isPackageAvailable($packageKey) {
@@ -590,7 +590,7 @@ class PackageManager extends \TYPO3\Flow\Package\PackageManager implements \TYPO
* Returns TRUE if a package is activated or FALSE if it's not.
*
* @param string $packageKey The key of the package to check
- * @return boolean TRUE if package is active, otherwise FALSE
+ * @return bool TRUE if package is active, otherwise FALSE
* @api
*/
public function isPackageActive($packageKey) {
@@ -762,7 +762,7 @@ class PackageManager extends \TYPO3\Flow\Package\PackageManager implements \TYPO
* Check the conformance of the given package key
*
* @param string $packageKey The package key to validate
- * @return boolean If the package key is valid, returns TRUE otherwise FALSE
+ * @return bool If the package key is valid, returns TRUE otherwise FALSE
* @api
*/
public function isPackageKeyValid($packageKey) {
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index d2e55656ef57..efc90153823a 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -921,7 +921,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Returns rendering mode XHTML or HTML
*
- * @return boolean TRUE if XHTML, FALSE if HTML
+ * @return bool TRUE if XHTML, FALSE if HTML
*/
public function getRenderXhtml() {
return $this->renderXhtml;
@@ -993,7 +993,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Gets MoveJsFromHeaderToFooter
*
- * @return boolean
+ * @return bool
*/
public function getMoveJsFromHeaderToFooter() {
return $this->moveJsFromHeaderToFooter;
@@ -1002,7 +1002,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Gets compress of javascript
*
- * @return boolean
+ * @return bool
*/
public function getCompressJavascript() {
return $this->compressJavascript;
@@ -1011,7 +1011,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Gets compress of css
*
- * @return boolean
+ * @return bool
*/
public function getCompressCss() {
return $this->compressCss;
@@ -1020,7 +1020,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Gets concatenate of js and css files
*
- * @return boolean
+ * @return bool
*/
public function getConcatenateFiles() {
return $this->concatenateFiles;
@@ -1029,7 +1029,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Gets concatenate of js files
*
- * @return boolean
+ * @return bool
*/
public function getConcatenateJavascript() {
return $this->concatenateJavascript;
@@ -1038,7 +1038,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Gets concatenate of css files
*
- * @return boolean
+ * @return bool
*/
public function getConcatenateCss() {
return $this->concatenateCss;
@@ -1047,7 +1047,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Gets remove of empty lines from template
*
- * @return boolean
+ * @return bool
*/
public function getRemoveLineBreaksFromTemplate() {
return $this->removeLineBreaksFromTemplate;
diff --git a/typo3/sysext/core/Classes/Resource/AbstractFile.php b/typo3/sysext/core/Classes/Resource/AbstractFile.php
index 47e1d1884ec9..b00174f6f6bc 100644
--- a/typo3/sysext/core/Classes/Resource/AbstractFile.php
+++ b/typo3/sysext/core/Classes/Resource/AbstractFile.php
@@ -106,7 +106,7 @@ abstract class AbstractFile implements FileInterface {
* Returns true if the given property key exists for this file.
*
* @param string $key
- * @return boolean
+ * @return bool
*/
public function hasProperty($key) {
return array_key_exists($key, $this->properties);
@@ -177,7 +177,7 @@ abstract class AbstractFile implements FileInterface {
* Returns the size of this file
*
* @throws \RuntimeException
- * @return integer
+ * @return int
*/
public function getSize() {
if ($this->deleted) {
@@ -189,7 +189,7 @@ abstract class AbstractFile implements FileInterface {
/**
* Returns the uid of this file
*
- * @return integer
+ * @return int
*/
public function getUid() {
return $this->getProperty('uid');
@@ -212,7 +212,7 @@ abstract class AbstractFile implements FileInterface {
* Returns the creation time of the file as Unix timestamp
*
* @throws \RuntimeException
- * @return integer
+ * @return int
*/
public function getCreationTime() {
if ($this->deleted) {
@@ -225,7 +225,7 @@ abstract class AbstractFile implements FileInterface {
* Returns the date (as UNIX timestamp) the file was last modified.
*
* @throws \RuntimeException
- * @return integer
+ * @return int
*/
public function getModificationTime() {
if ($this->deleted) {
@@ -267,7 +267,7 @@ abstract class AbstractFile implements FileInterface {
* "other"
* see the constants in this class
*
- * @return integer $fileType
+ * @return int $fileType
*/
public function getType() {
// this basically extracts the mimetype and guess the filetype based
@@ -355,7 +355,7 @@ abstract class AbstractFile implements FileInterface {
* it might only return FALSE when this object has been created from an
* index record without checking for.
*
- * @return boolean TRUE if this file physically exists
+ * @return bool TRUE if this file physically exists
*/
public function exists() {
if ($this->deleted) {
@@ -408,7 +408,7 @@ abstract class AbstractFile implements FileInterface {
/**
* Deletes this file from its storage. This also means that this object becomes useless.
*
- * @return boolean TRUE if deletion succeeded
+ * @return bool TRUE if deletion succeeded
*/
public function delete() {
// The storage will mark this file as deleted
@@ -428,7 +428,7 @@ abstract class AbstractFile implements FileInterface {
/**
* Returns TRUE if this file has been deleted
*
- * @return boolean
+ * @return bool
*/
public function isDeleted() {
return $this->deleted;
diff --git a/typo3/sysext/core/Classes/Resource/AbstractRepository.php b/typo3/sysext/core/Classes/Resource/AbstractRepository.php
index 05dbca041dbf..7513c02c306f 100644
--- a/typo3/sysext/core/Classes/Resource/AbstractRepository.php
+++ b/typo3/sysext/core/Classes/Resource/AbstractRepository.php
@@ -145,7 +145,7 @@ abstract class AbstractRepository implements \TYPO3\CMS\Extbase\Persistence\Repo
/**
* Returns the total number objects of this repository.
*
- * @return integer The object count
+ * @return int The object count
* @api
*/
public function countAll() {
diff --git a/typo3/sysext/core/Classes/Resource/Collection/FileCollectionRegistry.php b/typo3/sysext/core/Classes/Resource/Collection/FileCollectionRegistry.php
index b6fd85709528..8c9ff0e2e3eb 100644
--- a/typo3/sysext/core/Classes/Resource/Collection/FileCollectionRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Collection/FileCollectionRegistry.php
@@ -124,7 +124,7 @@ class FileCollectionRegistry implements \TYPO3\CMS\Core\SingletonInterface {
* Checks if the given FileCollection type exists
*
* @param string $type Type of the FileCollection
- * @return boolean TRUE if the FileCollection exists, FALSE otherwise
+ * @return bool TRUE if the FileCollection exists, FALSE otherwise
*/
public function fileCollectionTypeExists($type) {
return isset($this->types[$type]);
diff --git a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
index e0d06c2bc8be..72562b5fea2b 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/AbstractDriver.php
@@ -71,7 +71,7 @@ abstract class AbstractDriver implements DriverInterface {
* drivers if they have different file naming rules.
*
* @param string $fileName
- * @return boolean TRUE if file name is valid
+ * @return bool TRUE if file name is valid
*/
protected function isValidFilename($fileName) {
if (strpos($fileName, '/') !== FALSE) {
@@ -96,7 +96,7 @@ abstract class AbstractDriver implements DriverInterface {
/**
* Returns the capabilities of this driver.
*
- * @return integer
+ * @return int
* @see Storage::CAPABILITY_* constants
*/
public function getCapabilities() {
@@ -107,7 +107,7 @@ abstract class AbstractDriver implements DriverInterface {
* Returns TRUE if this driver has the given capability.
*
* @param int $capability A capability, as defined in a CAPABILITY_* constant
- * @return boolean
+ * @return bool
*/
public function hasCapability($capability) {
return $this->capabilities & $capability == $capability;
@@ -159,7 +159,7 @@ abstract class AbstractDriver implements DriverInterface {
* therefore always reflect the file system and not try to change its
* behaviour
*
- * @return boolean
+ * @return bool
*/
public function isCaseSensitiveFileSystem() {
if (isset($this->configuration['caseSensitive'])) {
diff --git a/typo3/sysext/core/Classes/Resource/Driver/AbstractHierarchicalFilesystemDriver.php b/typo3/sysext/core/Classes/Resource/Driver/AbstractHierarchicalFilesystemDriver.php
index 4b5f5d6fad66..25ae441a9ad0 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/AbstractHierarchicalFilesystemDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/AbstractHierarchicalFilesystemDriver.php
@@ -25,7 +25,7 @@ abstract class AbstractHierarchicalFilesystemDriver extends AbstractDriver {
* Wrapper for \TYPO3\CMS\Core\Utility\GeneralUtility::validPathStr()
*
* @param string $theFile Filepath to evaluate
- * @return boolean TRUE if no '/', '..' or '\' is in the $theFile
+ * @return bool TRUE if no '/', '..' or '\' is in the $theFile
* @see \TYPO3\CMS\Core\Utility\GeneralUtility::validPathStr()
*/
protected function isPathValid($theFile) {
diff --git a/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php b/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
index 7d861862c236..a91074523f04 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/DriverInterface.php
@@ -46,7 +46,7 @@ interface DriverInterface {
/**
* Returns the capabilities of this driver.
*
- * @return integer
+ * @return int
* @see Storage::CAPABILITY_* constants
*/
public function getCapabilities();
@@ -58,7 +58,7 @@ interface DriverInterface {
*
* @param int $capabilities
*
- * @return integer
+ * @return int
*/
public function mergeConfigurationCapabilities($capabilities);
@@ -66,7 +66,7 @@ interface DriverInterface {
* Returns TRUE if this driver has the given capability.
*
* @param int $capability A capability, as defined in a CAPABILITY_* constant
- * @return boolean
+ * @return bool
*/
public function hasCapability($capability);
@@ -77,7 +77,7 @@ interface DriverInterface {
* therefore always reflect the file system and not try to change its
* behaviour
*
- * @return boolean
+ * @return bool
*/
public function isCaseSensitiveFileSystem();
@@ -159,7 +159,7 @@ interface DriverInterface {
*
* @param string $folderIdentifier
* @param bool $deleteRecursively
- * @return boolean
+ * @return bool
*/
public function deleteFolder($folderIdentifier, $deleteRecursively = FALSE);
@@ -168,7 +168,7 @@ interface DriverInterface {
*
* @param string $fileIdentifier
*
- * @return boolean
+ * @return bool
*/
public function fileExists($fileIdentifier);
@@ -177,7 +177,7 @@ interface DriverInterface {
*
* @param string $folderIdentifier
*
- * @return boolean
+ * @return bool
*/
public function folderExists($folderIdentifier);
@@ -185,7 +185,7 @@ interface DriverInterface {
* Checks if a folder contains files and (if supported) other folders.
*
* @param string $folderIdentifier
- * @return boolean TRUE if there are no files and folders within $folder
+ * @return bool TRUE if there are no files and folders within $folder
*/
public function isFolderEmpty($folderIdentifier);
@@ -239,7 +239,7 @@ interface DriverInterface {
*
* @param string $fileIdentifier
* @param string $localFilePath
- * @return boolean TRUE if the operation succeeded
+ * @return bool TRUE if the operation succeeded
*/
public function replaceFile($fileIdentifier, $localFilePath);
@@ -249,7 +249,7 @@ interface DriverInterface {
* this has to be taken care of in the upper layers (e.g. the Storage)!
*
* @param string $fileIdentifier
- * @return boolean TRUE if deleting the file succeeded
+ * @return bool TRUE if deleting the file succeeded
*/
public function deleteFile($fileIdentifier);
@@ -295,7 +295,7 @@ interface DriverInterface {
* @param string $targetFolderIdentifier
* @param string $newFolderName
*
- * @return boolean
+ * @return bool
*/
public function copyFolderWithinStorage($sourceFolderIdentifier, $targetFolderIdentifier, $newFolderName);
@@ -315,7 +315,7 @@ interface DriverInterface {
*
* @param string $fileIdentifier
* @param string $contents
- * @return integer The number of bytes written to the file
+ * @return int The number of bytes written to the file
*/
public function setFileContents($fileIdentifier, $contents);
@@ -324,7 +324,7 @@ interface DriverInterface {
*
* @param string $fileName
* @param string $folderIdentifier
- * @return boolean
+ * @return bool
*/
public function fileExistsInFolder($fileName, $folderIdentifier);
@@ -333,7 +333,7 @@ interface DriverInterface {
*
* @param string $folderName
* @param string $folderIdentifier
- * @return boolean
+ * @return bool
*/
public function folderExistsInFolder($folderName, $folderIdentifier);
@@ -380,7 +380,7 @@ interface DriverInterface {
*
* @param string $folderIdentifier
* @param string $identifier identifier to be checked against $folderIdentifier
- * @return boolean TRUE if $content is within or matches $folderIdentifier
+ * @return bool TRUE if $content is within or matches $folderIdentifier
*/
public function isWithin($folderIdentifier, $identifier);
diff --git a/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php b/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
index f8f62751457a..72f948c96631 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/DriverRegistry.php
@@ -48,7 +48,7 @@ class DriverRegistry implements \TYPO3\CMS\Core\SingletonInterface {
* @param string $shortName
* @param string $label
* @param string $flexFormDataStructurePathAndFilename
- * @return boolean TRUE if registering succeeded
+ * @return bool TRUE if registering succeeded
* @throws \InvalidArgumentException
*/
public function registerDriverClass($className, $shortName = NULL, $label = NULL, $flexFormDataStructurePathAndFilename = NULL) {
@@ -121,7 +121,7 @@ class DriverRegistry implements \TYPO3\CMS\Core\SingletonInterface {
* Checks if the given driver exists
*
* @param string $shortName Name of the driver
- * @return boolean TRUE if the driver exists, FALSE otherwise
+ * @return bool TRUE if the driver exists, FALSE otherwise
*/
public function driverExists($shortName) {
return array_key_exists($shortName, $this->drivers);
diff --git a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
index edba6b812853..1a05948f5c11 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
@@ -82,7 +82,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
*
* @param int $capabilities
*
- * @return integer
+ * @return int
*/
public function mergeConfigurationCapabilities($capabilities) {
$this->capabilities &= $capabilities;
@@ -408,7 +408,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
* @param string $itemIdentifier
* @param string $parentIdentifier
* @throws \RuntimeException
- * @return boolean
+ * @return bool
*/
protected function applyFilterMethodsToDirectoryItem(array $filterMethods, $itemName, $itemIdentifier, $parentIdentifier) {
foreach ($filterMethods as $filter) {
@@ -677,7 +677,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
*
* @param string $fileIdentifier
*
- * @return boolean
+ * @return bool
*/
public function fileExists($fileIdentifier) {
$absoluteFilePath = $this->getAbsolutePath($fileIdentifier);
@@ -689,7 +689,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
*
* @param string $fileName
* @param string $folderIdentifier
- * @return boolean
+ * @return bool
*/
public function fileExistsInFolder($fileName, $folderIdentifier) {
$identifier = $folderIdentifier . '/' . $fileName;
@@ -702,7 +702,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
*
* @param string $folderIdentifier
*
- * @return boolean
+ * @return bool
*/
public function folderExists($folderIdentifier) {
$absoluteFilePath = $this->getAbsolutePath($folderIdentifier);
@@ -714,7 +714,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
*
* @param string $folderName
* @param string $folderIdentifier
- * @return boolean
+ * @return bool
*/
public function folderExistsInFolder($folderName, $folderIdentifier) {
$identifier = $folderIdentifier . '/' . $folderName;
@@ -740,7 +740,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
*
* @param string $fileIdentifier
* @param string $localFilePath
- * @return boolean TRUE if the operation succeeded
+ * @return bool TRUE if the operation succeeded
* @throws \RuntimeException
*/
public function replaceFile($fileIdentifier, $localFilePath) {
@@ -882,7 +882,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
* @param string $targetFolderIdentifier
* @param string $newFolderName
*
- * @return boolean
+ * @return bool
* @throws \TYPO3\CMS\Core\Resource\Exception\FileOperationErrorException
*/
public function copyFolderWithinStorage($sourceFolderIdentifier, $targetFolderIdentifier, $newFolderName) {
@@ -998,7 +998,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
* this has to be taken care of in the upper layers (e.g. the Storage)!
*
* @param string $fileIdentifier
- * @return boolean TRUE if deleting the file succeeded
+ * @return bool TRUE if deleting the file succeeded
* @throws \RuntimeException
*/
public function deleteFile($fileIdentifier) {
@@ -1015,7 +1015,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
*
* @param string $folderIdentifier
* @param bool $deleteRecursively
- * @return boolean
+ * @return bool
* @throws \TYPO3\CMS\Core\Resource\Exception\FileOperationErrorException
*/
public function deleteFolder($folderIdentifier, $deleteRecursively = FALSE) {
@@ -1034,7 +1034,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
* Checks if a folder contains files and (if supported) other folders.
*
* @param string $folderIdentifier
- * @return boolean TRUE if there are no files and folders within $folder
+ * @return bool TRUE if there are no files and folders within $folder
*/
public function isFolderEmpty($folderIdentifier) {
$path = $this->getAbsolutePath($folderIdentifier);
@@ -1094,7 +1094,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
*
* @param string $folderIdentifier
* @param string $identifier identifier to be checked against $folderIdentifier
- * @return boolean TRUE if $content is within or matches $folderIdentifier
+ * @return bool TRUE if $content is within or matches $folderIdentifier
*/
public function isWithin($folderIdentifier, $identifier) {
$folderIdentifier = $this->canonicalizeAndCheckFileIdentifier($folderIdentifier);
@@ -1159,7 +1159,7 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver {
*
* @param string $fileIdentifier
* @param string $contents
- * @return integer The number of bytes written to the file
+ * @return int The number of bytes written to the file
* @throws \RuntimeException if the operation failed
*/
public function setFileContents($fileIdentifier, $contents) {
diff --git a/typo3/sysext/core/Classes/Resource/File.php b/typo3/sysext/core/Classes/Resource/File.php
index 497b5402f278..307053631774 100644
--- a/typo3/sysext/core/Classes/Resource/File.php
+++ b/typo3/sysext/core/Classes/Resource/File.php
@@ -96,7 +96,7 @@ class File extends AbstractFile {
* can be retrieved by "getProperty"
*
* @param string $key
- * @return boolean
+ * @return bool
*/
public function hasProperty($key) {
if (!parent::hasProperty($key)) {
@@ -175,7 +175,7 @@ class File extends AbstractFile {
/**
* Returns TRUE if this file is indexed
*
- * @return boolean|NULL
+ * @return bool|NULL
*/
public function isIndexed() {
return TRUE;
@@ -272,7 +272,7 @@ class File extends AbstractFile {
* Check if a file operation (= action) is allowed for this file
*
* @param string $action, can be read, write, delete
- * @return boolean
+ * @return bool
*/
public function checkActionPermission($action) {
return $this->getStorage()->checkFileActionPermission($action, $this);
@@ -342,7 +342,7 @@ class File extends AbstractFile {
}
/**
- * @return boolean
+ * @return bool
*/
public function isMissing() {
return (bool) $this->getProperty('missing');
diff --git a/typo3/sysext/core/Classes/Resource/FileInterface.php b/typo3/sysext/core/Classes/Resource/FileInterface.php
index 5797cde25174..75ea4a4813e4 100644
--- a/typo3/sysext/core/Classes/Resource/FileInterface.php
+++ b/typo3/sysext/core/Classes/Resource/FileInterface.php
@@ -26,7 +26,7 @@ interface FileInterface extends ResourceInterface {
* Returns true if the given key exists for this file.
*
* @param string $key
- * @return boolean
+ * @return bool
*/
public function hasProperty($key);
@@ -41,7 +41,7 @@ interface FileInterface extends ResourceInterface {
/**
* Returns the size of this file
*
- * @return integer
+ * @return int
*/
public function getSize();
@@ -76,14 +76,14 @@ interface FileInterface extends ResourceInterface {
/**
* Returns the modification time of the file as Unix timestamp
*
- * @return integer
+ * @return int
*/
public function getModificationTime();
/**
* Returns the creation time of the file as Unix timestamp
*
- * @return integer
+ * @return int
*/
public function getCreationTime();
@@ -113,7 +113,7 @@ interface FileInterface extends ResourceInterface {
/**
* Deletes this file from its storage. This also means that this object becomes useless.
*
- * @return boolean TRUE if deletion succeeded
+ * @return bool TRUE if deletion succeeded
*/
public function delete();
@@ -142,7 +142,7 @@ interface FileInterface extends ResourceInterface {
/**
* Returns TRUE if this file is indexed
*
- * @return boolean
+ * @return bool
*/
public function isIndexed();
diff --git a/typo3/sysext/core/Classes/Resource/FileReference.php b/typo3/sysext/core/Classes/Resource/FileReference.php
index 808b8689505f..7d35d64914f2 100644
--- a/typo3/sysext/core/Classes/Resource/FileReference.php
+++ b/typo3/sysext/core/Classes/Resource/FileReference.php
@@ -102,7 +102,7 @@ class FileReference implements FileInterface {
* Returns true if the given key exists for this file.
*
* @param string $key The property to be looked up
- * @return boolean
+ * @return bool
*/
public function hasProperty($key) {
return array_key_exists($key, $this->getProperties());
@@ -235,7 +235,7 @@ class FileReference implements FileInterface {
/**
* Returns the uid of this File In Use
*
- * @return integer
+ * @return int
*/
public function getUid() {
return (int)$this->propertiesOfFileReference['uid'];
@@ -244,7 +244,7 @@ class FileReference implements FileInterface {
/**
* Returns the size of this file
*
- * @return integer
+ * @return int
*/
public function getSize() {
return (int)$this->originalFile->getSize();
@@ -289,7 +289,7 @@ class FileReference implements FileInterface {
/**
* Returns the modification time of the file as Unix timestamp
*
- * @return integer
+ * @return int
*/
public function getModificationTime() {
return (int)$this->originalFile->getModificationTime();
@@ -298,7 +298,7 @@ class FileReference implements FileInterface {
/**
* Returns the creation time of the file as Unix timestamp
*
- * @return integer
+ * @return int
*/
public function getCreationTime() {
return (int)$this->originalFile->getCreationTime();
@@ -307,7 +307,7 @@ class FileReference implements FileInterface {
/**
* Returns the fileType of this file
*
- * @return integer $fileType
+ * @return int $fileType
*/
public function getType() {
return (int)$this->originalFile->getType();
@@ -316,7 +316,7 @@ class FileReference implements FileInterface {
/**
* Check if file is marked as missing by indexer
*
- * @return boolean
+ * @return bool
*/
public function isMissing() {
return (bool) $this->originalFile->getProperty('missing');
@@ -379,7 +379,7 @@ class FileReference implements FileInterface {
* (database table sys_file_reference) but leaves the original file untouched.
*
* @throws \BadMethodCallException
- * @return boolean TRUE if deletion succeeded
+ * @return bool TRUE if deletion succeeded
*/
public function delete() {
// TODO: Implement this function. This should only delete the
@@ -425,7 +425,7 @@ class FileReference implements FileInterface {
* sys_file_reference record to be present, which in turn can only exist if
* the original file is indexed.
*
- * @return boolean
+ * @return bool
*/
public function isIndexed() {
return TRUE;
diff --git a/typo3/sysext/core/Classes/Resource/FileRepository.php b/typo3/sysext/core/Classes/Resource/FileRepository.php
index 6946e84a58b3..fb6ec835c2a5 100644
--- a/typo3/sysext/core/Classes/Resource/FileRepository.php
+++ b/typo3/sysext/core/Classes/Resource/FileRepository.php
@@ -100,7 +100,7 @@ class FileRepository extends AbstractRepository {
* indexed, the uid otherwise.
*
* @param File $fileObject
- * @return boolean|integer
+ * @return bool|int
* @deprecated since TYPO3 6.2, will be removed two versions later - use FileIndexRepository::isIndexed
*/
public function getFileIndexStatus(File $fileObject) {
diff --git a/typo3/sysext/core/Classes/Resource/Filter/FileExtensionFilter.php b/typo3/sysext/core/Classes/Resource/Filter/FileExtensionFilter.php
index c9bcaef6f67f..6c759f7e86d6 100644
--- a/typo3/sysext/core/Classes/Resource/Filter/FileExtensionFilter.php
+++ b/typo3/sysext/core/Classes/Resource/Filter/FileExtensionFilter.php
@@ -81,7 +81,7 @@ class FileExtensionFilter {
* @param string $parentIdentifier
* @param array $additionalInformation Additional information about the inspected item
* @param \TYPO3\CMS\Core\Resource\Driver\DriverInterface $driver
- * @return boolean|integer -1 if the file should not be included in a listing
+ * @return bool|int -1 if the file should not be included in a listing
*/
public function filterFileList($itemName, $itemIdentifier, $parentIdentifier, array $additionalInformation, \TYPO3\CMS\Core\Resource\Driver\DriverInterface $driver) {
$returnCode = TRUE;
@@ -102,7 +102,7 @@ class FileExtensionFilter {
* Checks whether a file is allowed according to the criteria defined in the class variables ($this->allowedFileExtensions etc.)
*
* @param \TYPO3\CMS\Core\Resource\FileInterface $file
- * @return boolean
+ * @return bool
*/
protected function isAllowed($fileName) {
$result = TRUE;
diff --git a/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php b/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
index e81d6cbcdff5..a118a2c12810 100644
--- a/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
+++ b/typo3/sysext/core/Classes/Resource/Filter/FileNameFilter.php
@@ -38,7 +38,7 @@ class FileNameFilter {
* @param string $parentIdentifier
* @param array $additionalInformation Additional information (driver dependent) about the inspected item
* @param \TYPO3\CMS\Core\Resource\Driver\DriverInterface $driverInstance
- * @return boolean|integer -1 if the file should not be included in a listing
+ * @return bool|int -1 if the file should not be included in a listing
*/
static public function filterHiddenFilesAndFolders($itemName, $itemIdentifier, $parentIdentifier, array $additionalInformation, \TYPO3\CMS\Core\Resource\Driver\DriverInterface $driverInstance) {
// Only apply the filter if you want to hide the hidden files
@@ -53,7 +53,7 @@ class FileNameFilter {
* Gets the info whether the hidden files are also displayed currently
*
* @static
- * @return boolean
+ * @return bool
*/
static public function getShowHiddenFilesAndFolders() {
return self::$showHiddenFilesAndFolders;
@@ -64,7 +64,7 @@ class FileNameFilter {
*
* @static
* @param bool $showHiddenFilesAndFolders
- * @return boolean
+ * @return bool
*/
static public function setShowHiddenFilesAndFolders($showHiddenFilesAndFolders) {
return self::$showHiddenFilesAndFolders = (bool) $showHiddenFilesAndFolders;
diff --git a/typo3/sysext/core/Classes/Resource/Folder.php b/typo3/sysext/core/Classes/Resource/Folder.php
index 6b091424328b..5e1a0ec7e2ff 100644
--- a/typo3/sysext/core/Classes/Resource/Folder.php
+++ b/typo3/sysext/core/Classes/Resource/Folder.php
@@ -194,7 +194,7 @@ class Folder implements FolderInterface {
* @param array $filterMethods
* @param bool $recursive
*
- * @return integer
+ * @return int
*/
public function getFileCount(array $filterMethods = array(), $recursive = FALSE) {
return count($this->storage->getFileIdentifiersInFolder($this->identifier, TRUE, $recursive));
@@ -272,7 +272,7 @@ class Folder implements FolderInterface {
* Deletes this folder from its storage. This also means that this object becomes useless.
*
* @param bool $deleteRecursively
- * @return boolean TRUE if deletion succeeded
+ * @return bool TRUE if deletion succeeded
*/
public function delete($deleteRecursively = TRUE) {
return $this->storage->deleteFolder($this, $deleteRecursively);
@@ -326,7 +326,7 @@ class Folder implements FolderInterface {
* Checks if a file exists in this folder
*
* @param string $name
- * @return boolean
+ * @return bool
*/
public function hasFile($name) {
return $this->storage->hasFileInFolder($name, $this);
@@ -336,7 +336,7 @@ class Folder implements FolderInterface {
* Checks if a folder exists in this folder.
*
* @param string $name
- * @return boolean
+ * @return bool
*/
public function hasFolder($name) {
return $this->storage->hasFolderInFolder($name, $this);
@@ -346,7 +346,7 @@ class Folder implements FolderInterface {
* Check if a file operation (= action) is allowed on this folder
*
* @param string $action Action that can be read, write or delete
- * @return boolean
+ * @return bool
*/
public function checkActionPermission($action) {
return $this->getStorage()->checkFolderActionPermission($action, $this);
@@ -437,7 +437,7 @@ class Folder implements FolderInterface {
/**
* Returns the role of this folder (if any). See FolderInterface::ROLE_* constants for possible values.
*
- * @return integer
+ * @return int
*/
public function getRole() {
return $this->storage->getRole($this);
diff --git a/typo3/sysext/core/Classes/Resource/FolderInterface.php b/typo3/sysext/core/Classes/Resource/FolderInterface.php
index e3af41c9d11d..eaba05ec9c43 100644
--- a/typo3/sysext/core/Classes/Resource/FolderInterface.php
+++ b/typo3/sysext/core/Classes/Resource/FolderInterface.php
@@ -51,7 +51,7 @@ interface FolderInterface extends ResourceInterface
* Checks if a folder exists in this folder.
*
* @param string $name
- * @return boolean
+ * @return bool
*/
public function hasFolder($name);
@@ -59,7 +59,7 @@ interface FolderInterface extends ResourceInterface
* Checks if a file exists in this folder
*
* @param string $name
- * @return boolean
+ * @return bool
*/
public function hasFile($name);
@@ -74,7 +74,7 @@ interface FolderInterface extends ResourceInterface
/**
* Deletes this folder from its storage. This also means that this object becomes useless.
*
- * @return boolean TRUE if deletion succeeded
+ * @return bool TRUE if deletion succeeded
*/
public function delete();
diff --git a/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php b/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
index c1e59bc791e5..c63085aa64f0 100644
--- a/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
+++ b/typo3/sysext/core/Classes/Resource/InaccessibleFolder.php
@@ -87,7 +87,7 @@ class InaccessibleFolder extends Folder {
* @param array $filterMethods
* @param bool $recursive
*
- * @return integer
+ * @return int
*/
public function getFileCount(array $filterMethods = array(), $recursive = FALSE) {
$this->throwInaccessibleException();
@@ -155,7 +155,7 @@ class InaccessibleFolder extends Folder {
* Deletes this folder from its storage. This also means that this object becomes useless.
*
* @param bool $deleteRecursively
- * @return boolean TRUE if deletion succeeded
+ * @return bool TRUE if deletion succeeded
*/
public function delete($deleteRecursively = TRUE) {
$this->throwInaccessibleException();
@@ -209,7 +209,7 @@ class InaccessibleFolder extends Folder {
* Checks if a file exists in this folder
*
* @param string $name
- * @return boolean
+ * @return bool
*/
public function hasFile($name) {
$this->throwInaccessibleException();
@@ -219,7 +219,7 @@ class InaccessibleFolder extends Folder {
* Checks if a folder exists in this folder.
*
* @param string $name
- * @return boolean
+ * @return bool
*/
public function hasFolder($name) {
$this->throwInaccessibleException();
diff --git a/typo3/sysext/core/Classes/Resource/Index/ExtractorInterface.php b/typo3/sysext/core/Classes/Resource/Index/ExtractorInterface.php
index f0ea17256182..7575e44942a6 100644
--- a/typo3/sysext/core/Classes/Resource/Index/ExtractorInterface.php
+++ b/typo3/sysext/core/Classes/Resource/Index/ExtractorInterface.php
@@ -51,7 +51,7 @@ interface ExtractorInterface {
*
* Should be between 1 and 100, 100 is more important than 1
*
- * @return integer
+ * @return int
*/
public function getPriority();
@@ -59,7 +59,7 @@ interface ExtractorInterface {
* Returns the execution priority of the extraction Service
* Should be between 1 and 100, 100 means runs as first service, 1 runs at last service
*
- * @return integer
+ * @return int
*/
public function getExecutionPriority();
@@ -67,7 +67,7 @@ interface ExtractorInterface {
* Checks if the given file can be processed by this Extractor
*
* @param Resource\File $file
- * @return boolean
+ * @return bool
*/
public function canProcess(Resource\File $file);
diff --git a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
index 3efd1b91698c..1a20cfca8f3c 100644
--- a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
+++ b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
@@ -215,7 +215,7 @@ class FileIndexRepository implements SingletonInterface {
*
* @param array $data
*
- * @return integer
+ * @return int
*/
protected function insertRecord(array $data) {
$data = array_intersect_key($data, array_flip($this->fields));
@@ -229,7 +229,7 @@ class FileIndexRepository implements SingletonInterface {
* Checks if a file is indexed
*
* @param File $file
- * @return boolean
+ * @return bool
*/
public function hasIndexRecord(File $file) {
return $this->getDatabaseConnection()->exec_SELECTcountRows('uid', $this->table, $this->getWhereClauseForFile($file)) >= 1;
diff --git a/typo3/sysext/core/Classes/Resource/ProcessedFile.php b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
index 6ec1d8220b10..a5c275ed29ca 100644
--- a/typo3/sysext/core/Classes/Resource/ProcessedFile.php
+++ b/typo3/sysext/core/Classes/Resource/ProcessedFile.php
@@ -194,7 +194,7 @@ class ProcessedFile extends AbstractFile {
/**
* Returns TRUE if this file is indexed
*
- * @return boolean
+ * @return bool
*/
public function isIndexed() {
// Processed files are never indexed; instead you might be looking for isPersisted()
@@ -204,7 +204,7 @@ class ProcessedFile extends AbstractFile {
/**
* Checks whether the ProcessedFile already has an entry in sys_file_processedfile table
*
- * @return boolean
+ * @return bool
*/
public function isPersisted() {
return is_array($this->properties) && array_key_exists('uid', $this->properties) && $this->properties['uid'] > 0;
@@ -213,7 +213,7 @@ class ProcessedFile extends AbstractFile {
/**
* Checks whether the ProcessedFile Object is newly created
*
- * @return boolean
+ * @return bool
*/
public function isNew() {
return !$this->isPersisted();
@@ -223,7 +223,7 @@ class ProcessedFile extends AbstractFile {
* Checks whether the object since last reconstitution, and therefore
* needs persistence again
*
- * @return boolean
+ * @return bool
*/
public function isUpdated() {
return $this->updated;
@@ -254,7 +254,7 @@ class ProcessedFile extends AbstractFile {
/**
* Returns TRUE if this file is already processed.
*
- * @return boolean
+ * @return bool
*/
public function isProcessed() {
return ($this->isPersisted() && !$this->needsReprocessing()) || $this->updated;
@@ -359,7 +359,7 @@ class ProcessedFile extends AbstractFile {
/**
* Returns TRUE if this file has not been changed during processing (i.e., we just deliver the original file)
*
- * @return boolean
+ * @return bool
*/
protected function isUnchanged() {
return $this->identifier == NULL || $this->identifier === $this->originalFile->getIdentifier();
@@ -376,7 +376,7 @@ class ProcessedFile extends AbstractFile {
}
/**
- * @return boolean
+ * @return bool
*/
public function usesOriginalFile() {
return $this->isUnchanged();
@@ -385,7 +385,7 @@ class ProcessedFile extends AbstractFile {
/**
* Returns TRUE if the original file of this file changed and the file should be processed again.
*
- * @return boolean
+ * @return bool
*/
public function isOutdated() {
return $this->needsReprocessing();
@@ -395,7 +395,7 @@ class ProcessedFile extends AbstractFile {
* Delete processed file
*
* @param bool $force
- * @return boolean
+ * @return bool
*/
public function delete($force = FALSE) {
if (!$force && $this->isUnchanged()) {
@@ -433,7 +433,7 @@ class ProcessedFile extends AbstractFile {
/**
* Checks if the ProcessedFile needs reprocessing
*
- * @return boolean
+ * @return bool
*/
public function needsReprocessing() {
$fileMustBeRecreated = FALSE;
diff --git a/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php b/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php
index 547323030d9f..5500bf601e46 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/AbstractTask.php
@@ -179,14 +179,14 @@ abstract class AbstractTask implements TaskInterface {
* are given, within the boundaries and don't conflict with each other.
*
* @param array $configuration
- * @return boolean
+ * @return bool
*/
abstract protected function isValidConfiguration(array $configuration);
/**
* Returns TRUE if this task has been executed, no matter if the execution was successful.
*
- * @return boolean
+ * @return bool
*/
public function isExecuted() {
return $this->executed;
@@ -207,7 +207,7 @@ abstract class AbstractTask implements TaskInterface {
/**
* Returns TRUE if this task has been successfully executed. Only call this method if the task has been processed
* at all.
- * @return boolean
+ * @return bool
* @throws \LogicException If the task has not been executed already
*/
public function isSuccessful() {
diff --git a/typo3/sysext/core/Classes/Resource/Processing/ImageCropScaleMaskTask.php b/typo3/sysext/core/Classes/Resource/Processing/ImageCropScaleMaskTask.php
index 3e90c637210a..d27bf5ca085e 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/ImageCropScaleMaskTask.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/ImageCropScaleMaskTask.php
@@ -43,7 +43,7 @@ class ImageCropScaleMaskTask extends AbstractGraphicalTask {
* are given, within the boundaries and don't conflict with each other.
*
* @param array $configuration
- * @return boolean
+ * @return bool
*/
protected function isValidConfiguration(array $configuration) {
// TODO: Implement isValidConfiguration() method.
diff --git a/typo3/sysext/core/Classes/Resource/Processing/ImagePreviewTask.php b/typo3/sysext/core/Classes/Resource/Processing/ImagePreviewTask.php
index 869047c7ca66..80c7554701f9 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/ImagePreviewTask.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/ImagePreviewTask.php
@@ -45,7 +45,7 @@ class ImagePreviewTask extends AbstractGraphicalTask {
* are given, within the boundaries and don't conflict with each other.
*
* @param array $configuration
- * @return boolean
+ * @return bool
*/
protected function isValidConfiguration(array $configuration) {
/**
@@ -60,7 +60,7 @@ class ImagePreviewTask extends AbstractGraphicalTask {
* Note: This does not indicate if the concrete ProcessedFile attached to this task has to be (re)processed.
* This check is done in ProcessedFile::isOutdated(). TODO isOutdated()/needsReprocessing()?
*
- * @return boolean
+ * @return bool
*/
public function fileNeedsProcessing() {
// TODO: Implement fileNeedsProcessing() method.
diff --git a/typo3/sysext/core/Classes/Resource/Processing/LocalImageProcessor.php b/typo3/sysext/core/Classes/Resource/Processing/LocalImageProcessor.php
index 7426cedb77fa..f8d9cc451a92 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/LocalImageProcessor.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/LocalImageProcessor.php
@@ -39,7 +39,7 @@ class LocalImageProcessor implements ProcessorInterface {
* Returns TRUE if this processor can process the given task.
*
* @param TaskInterface $task
- * @return boolean
+ * @return bool
*/
public function canProcessTask(TaskInterface $task) {
$canProcessTask = $task->getType() === 'Image';
diff --git a/typo3/sysext/core/Classes/Resource/Processing/ProcessorInterface.php b/typo3/sysext/core/Classes/Resource/Processing/ProcessorInterface.php
index c6e651456c83..4b22de1b003a 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/ProcessorInterface.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/ProcessorInterface.php
@@ -23,7 +23,7 @@ interface ProcessorInterface {
* Returns TRUE if this processor can process the given task.
*
* @param TaskInterface $task
- * @return boolean
+ * @return bool
*/
public function canProcessTask(TaskInterface $task);
diff --git a/typo3/sysext/core/Classes/Resource/Processing/TaskInterface.php b/typo3/sysext/core/Classes/Resource/Processing/TaskInterface.php
index 615c01ccc9e8..3306aefd638b 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/TaskInterface.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/TaskInterface.php
@@ -97,14 +97,14 @@ interface TaskInterface {
* Note: This does not indicate if the concrete ProcessedFile attached to this task has to be (re)processed.
* This check is done in ProcessedFile::isOutdated(). TODO isOutdated()/needsReprocessing()?
*
- * @return boolean
+ * @return bool
*/
public function fileNeedsProcessing();
/**
* Returns TRUE if this task has been executed, no matter if the execution was successful.
*
- * @return boolean
+ * @return bool
*/
public function isExecuted();
@@ -121,7 +121,7 @@ interface TaskInterface {
* Returns TRUE if this task has been successfully executed. Only call this method if the task has been processed
* at all.
*
- * @return boolean
+ * @return bool
* @throws \LogicException If the task has not been executed already
*/
public function isSuccessful();
diff --git a/typo3/sysext/core/Classes/Resource/ResourceCompressor.php b/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
index 05ac6e8096f2..58bb19cf112d 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceCompressor.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
* Compressor
* This merges and compresses CSS and JavaScript files of the TYPO3 Backend.
*
- * @author Steffen Gebert <steffen@steffen-gebert.de>
+ * @author Steffen Gebert <steffen@steffen-gebert.de>
*/
class ResourceCompressor {
@@ -577,7 +577,7 @@ class ResourceCompressor {
*
* @param string $filename Filename
* @param array $baseDirectories Base directories
- * @return boolean File belongs to a base directory or not
+ * @return bool File belongs to a base directory or not
*/
protected function checkBaseDirectory($filename, array $baseDirectories) {
foreach ($baseDirectories as $baseDirectory) {
diff --git a/typo3/sysext/core/Classes/Resource/ResourceFactory.php b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
index 1d3f43a66f18..26dc09dea47b 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceFactory.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
@@ -189,7 +189,7 @@ class ResourceFactory implements ResourceFactoryInterface, \TYPO3\CMS\Core\Singl
*
* @param string $localPath
*
- * @return integer
+ * @return int
*/
protected function findBestMatchingStorageByLocalPath(&$localPath) {
if ($this->localDriverStorageCache === NULL) {
diff --git a/typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php b/typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php
index 2d65e0be4726..00ac2b255d9c 100644
--- a/typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/FrontendContentAdapterService.php
@@ -183,7 +183,7 @@ class FrontendContentAdapterService {
* @param string $fieldName
* @param string $table
* @param array $row
- * @return boolean
+ * @return bool
*/
static protected function fieldIsInType($fieldName, $table, array $row) {
$fieldConfiguration = static::$migrateFields[$table][$fieldName];
diff --git a/typo3/sysext/core/Classes/Resource/Service/IndexerService.php b/typo3/sysext/core/Classes/Resource/Service/IndexerService.php
index 6adc2b7d29e4..291df725de0e 100644
--- a/typo3/sysext/core/Classes/Resource/Service/IndexerService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/IndexerService.php
@@ -175,7 +175,7 @@ class IndexerService implements \TYPO3\CMS\Core\SingletonInterface {
* currently this is done in a simple way, however could be changed to be more performant
*
* @param \TYPO3\CMS\Core\Resource\Folder $folder
- * @return integer The number of indexed files.
+ * @return int The number of indexed files.
*/
public function indexFilesInFolder(\TYPO3\CMS\Core\Resource\Folder $folder) {
$numberOfIndexedFiles = 0;
diff --git a/typo3/sysext/core/Classes/Resource/StorageRepository.php b/typo3/sysext/core/Classes/Resource/StorageRepository.php
index 7fd4c9f95cd5..558210e8c980 100644
--- a/typo3/sysext/core/Classes/Resource/StorageRepository.php
+++ b/typo3/sysext/core/Classes/Resource/StorageRepository.php
@@ -184,7 +184,7 @@ class StorageRepository extends AbstractRepository {
* @param string $pathType
* @param string $description
* @param bool $default set to default storage
- * @return integer uid of the inserted record
+ * @return int uid of the inserted record
*/
public function createLocalStorage($name, $basePath, $pathType, $description = '', $default = FALSE) {
$caseSensitive = $this->testCaseSensitivity($pathType === 'relative' ? PATH_site . $basePath : $basePath);
@@ -238,7 +238,7 @@ class StorageRepository extends AbstractRepository {
* Test if the local filesystem is case sensitive
*
* @param string $absolutePath
- * @return boolean
+ * @return bool
*/
protected function testCaseSensitivity($absolutePath) {
$caseSensitive = TRUE;
diff --git a/typo3/sysext/core/Classes/Service/AbstractService.php b/typo3/sysext/core/Classes/Service/AbstractService.php
index 29fbab4d162e..40fd5b8a5df2 100644
--- a/typo3/sysext/core/Classes/Service/AbstractService.php
+++ b/typo3/sysext/core/Classes/Service/AbstractService.php
@@ -178,7 +178,7 @@ abstract class AbstractService {
/**
* Returns the last error number from the error stack.
*
- * @return integer|boolean Error number (or TRUE if no error)
+ * @return int|bool Error number (or TRUE if no error)
*/
public function getLastError() {
// Means all is ok - no error
@@ -246,7 +246,7 @@ abstract class AbstractService {
* check the availability of external programs
*
* @param string $progList Comma list of programs 'perl,python,pdftotext'
- * @return boolean Return FALSE if one program was not found
+ * @return bool Return FALSE if one program was not found
*/
public function checkExec($progList) {
$ret = TRUE;
@@ -371,7 +371,7 @@ abstract class AbstractService {
/**
* Delete registered temporary files.
*
- * @return void
+ * @return void
*/
public function unlinkTempFiles() {
foreach ($this->tempFiles as $absFile) {
@@ -491,7 +491,7 @@ abstract class AbstractService {
* The class have to do a strict check if the service is available.
* example: check if the perl interpreter is available which is needed to run an extern perl script.
*
- * @return boolean TRUE if the service is available
+ * @return bool TRUE if the service is available
*/
public function init() {
// look in makeInstanceService()
diff --git a/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php b/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
index a9ababe9deb8..c66c51b46e2e 100644
--- a/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
+++ b/typo3/sysext/core/Classes/TimeTracker/NullTimeTracker.php
@@ -121,7 +121,7 @@ class NullTimeTracker {
* Gets a microtime value as milliseconds value.
*
* @param float $microtime The microtime value - if not set the current time is used
- * @return integer The microtime value as milliseconds value
+ * @return int The microtime value as milliseconds value
*/
public function getMilliseconds($microtime = NULL) {
diff --git a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
index 46e6e052779a..bbc2f85fcac2 100644
--- a/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
+++ b/typo3/sysext/core/Classes/TimeTracker/TimeTracker.php
@@ -230,7 +230,7 @@ class TimeTracker {
* Gets a microtime value as milliseconds value.
*
* @param float $microtime The microtime value - if not set the current time is used
- * @return integer The microtime value as milliseconds value
+ * @return int The microtime value as milliseconds value
*/
public function getMilliseconds($microtime = NULL) {
if (!isset($microtime)) {
@@ -243,7 +243,7 @@ class TimeTracker {
* Gets the difference between a given microtime value and the starting time as milliseconds.
*
* @param float $microtime The microtime value - if not set the current time is used
- * @return integer The difference between a given microtime value and starting time as milliseconds
+ * @return int The difference between a given microtime value and starting time as milliseconds
*/
public function getDifferenceToStarttime($microtime = NULL) {
return $this->getMilliseconds($microtime) - $this->starttime;
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
index d1c12c97bccb..760d0e65739b 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/AbstractTableConfigurationTreeDataProvider.php
@@ -100,7 +100,7 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
/**
* Gets the expamdAll
*
- * @return boolean
+ * @return bool
*/
public function getExpandAll() {
return $this->expandAll;
@@ -119,7 +119,7 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
/**
* Gets the levelMaximum
*
- * @return integer
+ * @return int
*/
public function getLevelMaximum() {
return $this->levelMaximum;
@@ -129,7 +129,7 @@ abstract class AbstractTableConfigurationTreeDataProvider extends \TYPO3\CMS\Bac
* Gets the expanded state of a given node
*
* @param \TYPO3\CMS\Backend\Tree\TreeNode $node
- * @return boolean
+ * @return bool
*/
protected function isExpanded(\TYPO3\CMS\Backend\Tree\TreeNode $node) {
return $this->getExpandAll() || \TYPO3\CMS\Core\Utility\GeneralUtility::inList($this->expandedList, $node->getId());
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
index caa8eb44b8b6..0a10166cc83c 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
@@ -159,7 +159,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
/**
* Gets the lookup mode
*
- * @return integer
+ * @return int
*/
public function getLookupMode() {
return $this->lookupMode;
@@ -197,7 +197,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
/**
* Gets the root uid
*
- * @return integer
+ * @return int
*/
public function getRootUid() {
return $this->rootUid;
@@ -418,7 +418,7 @@ class DatabaseTreeDataProvider extends \TYPO3\CMS\Core\Tree\TableConfiguration\A
*
* @param string $fieldName the name of the field to be queried
* @param int $queryId the uid to search for
- * @return integer[] all uids found
+ * @return int[] all uids found
*/
protected function listFieldQuery($fieldName, $queryId) {
$records = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid', $this->getTableName(), $GLOBALS['TYPO3_DB']->listQuery($fieldName, (int)$queryId, $this->getTableName()) . ((int)$queryId == 0 ? ' OR ' . $fieldName . ' = \'\'' : ''));
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
index 42a3270ee57a..b57177edb8ae 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeNode.php
@@ -58,7 +58,7 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode {
/**
* Gets the expand state
*
- * @return boolean
+ * @return bool
*/
public function getExpanded() {
return $this->expanded;
@@ -77,7 +77,7 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode {
/**
* Gets the selectable property
*
- * @return boolean
+ * @return bool
*/
public function getSelectable() {
return $this->selectable;
@@ -96,7 +96,7 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode {
/**
* Gets the select state
*
- * @return boolean
+ * @return bool
*/
public function getSelected() {
return $this->selected;
@@ -105,7 +105,7 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode {
/**
* Gets the hasChildren property
*
- * @return boolean
+ * @return bool
*/
public function hasChildren() {
return $this->hasChildren;
@@ -130,7 +130,7 @@ class DatabaseTreeNode extends \TYPO3\CMS\Backend\Tree\TreeRepresentationNode {
* 0 if its equal
*
* @param \TYPO3\CMS\Backend\Tree\TreeNode $other
- * @return integer see description above
+ * @return int see description above
*/
public function compareTo($other) {
if ($this->equals($other)) {
diff --git a/typo3/sysext/core/Classes/Type/Enumeration.php b/typo3/sysext/core/Classes/Type/Enumeration.php
index c9d193ac10cb..2db43faecb10 100644
--- a/typo3/sysext/core/Classes/Type/Enumeration.php
+++ b/typo3/sysext/core/Classes/Type/Enumeration.php
@@ -139,7 +139,7 @@ abstract class Enumeration implements TypeInterface {
* Check if the value on this enum is a valid value for the enum
*
* @param mixed $value
- * @return boolean
+ * @return bool
*/
protected function isValid($value) {
$value = (string) $value;
@@ -185,7 +185,7 @@ abstract class Enumeration implements TypeInterface {
* Compare if the value of the current object value equals the given value
*
* @param mixed $value default
- * @return boolean
+ * @return bool
*/
public function equals($value) {
$value = static::cast($value);
diff --git a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
index 37acce27edae..4d3fbc11f5d2 100644
--- a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
+++ b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
@@ -1161,7 +1161,7 @@ class TypoScriptParser {
* @param int $strlen The number of chars LEFT on this line before the end is reached.
* @return void
* @access private
- * @see parse()
+ * @see parse()
*/
public function regHighLight($code, $pointer, $strlen = -1) {
if ($strlen === -1) {
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index 7d46906feb48..dfebd16bde2e 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -195,7 +195,7 @@ class TemplateService {
protected $processIncludesHasBeenRun = FALSE;
/**
- * @return boolean
+ * @return bool
*/
public function getProcessExtensionStatics() {
return $this->processExtensionStatics;
@@ -1264,7 +1264,7 @@ class TemplateService {
* Returns the level of the given page in the rootline - Multiple pages can be given by separating the UIDs by comma.
*
* @param string $list A list of UIDs for which the rootline-level should get returned
- * @return integer The level in the rootline. If more than one page was given the lowest level will get returned.
+ * @return int The level in the rootline. If more than one page was given the lowest level will get returned.
*/
public function getRootlineLevel($list) {
$idx = 0;
diff --git a/typo3/sysext/core/Classes/Utility/ArrayUtility.php b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
index b809ea1aa4fb..f38774a937d6 100644
--- a/typo3/sysext/core/Classes/Utility/ArrayUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ArrayUtility.php
@@ -90,7 +90,7 @@ class ArrayUtility {
* @param array $array Given array
* @param string $path Path to test, 'foo/bar/foobar'
* @param string $delimiter Delimeter for path, default /
- * @return boolean TRUE if path exists in array
+ * @return bool TRUE if path exists in array
*/
static public function isValidPath(array $array, $path, $delimiter = '/') {
$isValid = TRUE;
diff --git a/typo3/sysext/core/Classes/Utility/CommandUtility.php b/typo3/sysext/core/Classes/Utility/CommandUtility.php
index c8dcbb13a05f..4124bae398d0 100644
--- a/typo3/sysext/core/Classes/Utility/CommandUtility.php
+++ b/typo3/sysext/core/Classes/Utility/CommandUtility.php
@@ -149,7 +149,7 @@ class CommandUtility {
*
* @param string $cmd The command that should be executed. eg: "convert"
* @param string $handler Executer for the command. eg: "perl"
- * @return boolean FALSE if cmd is not found, or -1 if the handler is not found
+ * @return bool FALSE if cmd is not found, or -1 if the handler is not found
*/
public static function checkCommand($cmd, $handler = '') {
if (!self::init()) {
@@ -282,7 +282,7 @@ class CommandUtility {
/**
* Initializes this class
*
- * @return boolean
+ * @return bool
*/
protected static function init() {
if ($GLOBALS['TYPO3_CONF_VARS']['BE']['disable_exec_function']) {
diff --git a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
index a497df95e74b..a46d5b740a57 100644
--- a/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
+++ b/typo3/sysext/core/Classes/Utility/ExtensionManagementUtility.php
@@ -100,7 +100,7 @@ class ExtensionManagementUtility {
*
* @param string $key Extension key to test
* @param bool $exitOnError If $exitOnError is TRUE and the extension is not loaded the function will die with an error message
- * @return boolean
+ * @return bool
* @throws \BadFunctionCallException
*/
static public function isLoaded($key, $exitOnError = FALSE) {
@@ -1197,7 +1197,7 @@ class ExtensionManagementUtility {
* @param string $serviceType Type of service
* @param string $serviceKey Specific key of the service
* @param array $serviceDetails Information about the service
- * @return boolean Service availability
+ * @return bool Service availability
*/
static public function isServiceAvailable($serviceType, $serviceKey, $serviceDetails) {
// If the service depends on external programs - check if they exists
diff --git a/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php b/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
index 77342e32f6c4..0c6119ed63ce 100644
--- a/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/BasicFileUtility.php
@@ -29,7 +29,7 @@ use TYPO3\CMS\Core\Utility\PathUtility;
* (fetched via BE_USERS->getFileStorages()), as all functions should be
* found there (in a cleaner manner).
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class BasicFileUtility {
/**
@@ -128,9 +128,9 @@ class BasicFileUtility {
* Example:
* $basicff->init(array(), $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']);
*
- * @param array Not in use anymore
- * @param array Array with information about allowed and denied file extensions. Typically passed: $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']
- * @return void
+ * @param array Not in use anymore
+ * @param array Array with information about allowed and denied file extensions. Typically passed: $GLOBALS['TYPO3_CONF_VARS']['BE']['fileExtensions']
+ * @return void
* @see typo3/init.php
*/
public function init($mounts, $f_ext) {
@@ -163,8 +163,8 @@ class BasicFileUtility {
*
* ) logic is reversed because of handling by functions in TYPO3\CMS\Filelist\FileList
*
- * @param string Filepath to existing file. Should probably be absolute. Filefunctions are performed on this value.
- * @return array Information about the file in the filepath
+ * @param string Filepath to existing file. Should probably be absolute. Filefunctions are performed on this value.
+ * @return array Information about the file in the filepath
* @deprecated since TYPO3 6.0. Please use corresponding TYPO3\\CMS\\Core\\Resource\\ResourceStorage (fetched via BE_USERS->getFileStorages())
*/
public function getTotalFileInfo($wholePath) {
@@ -184,9 +184,9 @@ class BasicFileUtility {
/**
* Checks if a $iconkey (fileextension) is allowed according to $this->f_ext.
*
- * @param string The extension to check, eg. "php" or "html" etc.
- * @param string Either "webspage" or "ftpspace" - points to a key in $this->f_ext
- * @return boolean TRUE if file extension is allowed.
+ * @param string The extension to check, eg. "php" or "html" etc.
+ * @param string Either "webspage" or "ftpspace" - points to a key in $this->f_ext
+ * @return bool TRUE if file extension is allowed.
* @todo Deprecate, but still in use by checkIfAllowed()
* @deprecated but still in use in the Core. Don't use in your extensions!
*/
@@ -221,8 +221,8 @@ class BasicFileUtility {
/**
* Returns TRUE if you can operate of ANY file ('*') in the space $theDest is in ('webspace' / 'ftpspace')
*
- * @param string Absolute path
- * @return boolean
+ * @param string Absolute path
+ * @return bool
* @todo Deprecate: but still in use by through func_unzip in ExtendedFileUtility
* @deprecated but still in use in the Core. Don't use in your extensions!
*/
@@ -239,8 +239,8 @@ class BasicFileUtility {
* Checks if $this->webPath (should be TYPO3_DOCUMENT_ROOT) is in the first part of $path
* Returns TRUE also if $this->init is not set or if $path is empty...
*
- * @param string Absolute path to check
- * @return boolean
+ * @param string Absolute path to check
+ * @return bool
* @todo Deprecate, but still in use by DataHandler
* @deprecated but still in use in the Core. Don't use in your extensions!
*/
@@ -259,10 +259,10 @@ class BasicFileUtility {
* If the filename is given, check it against the TYPO3_CONF_VARS[BE][fileDenyPattern] +
* Checks if the $ext fileextension is allowed in the path $theDest (this is based on whether $theDest is below the $this->webPath)
*
- * @param string File extension, eg. "php" or "html
- * @param string Absolute path for which to test
- * @param string Filename to check against TYPO3_CONF_VARS[BE][fileDenyPattern]
- * @return boolean TRUE if extension/filename is allowed
+ * @param string File extension, eg. "php" or "html
+ * @param string Absolute path for which to test
+ * @param string Filename to check against TYPO3_CONF_VARS[BE][fileDenyPattern]
+ * @return bool TRUE if extension/filename is allowed
* @todo Deprecate, but still in use by DataHandler
* @deprecated but still in use in the Core. Don't use in your extensions!
*/
@@ -273,8 +273,8 @@ class BasicFileUtility {
/**
* Returns TRUE if the input filename string is shorter than $this->maxInputNameLen.
*
- * @param string Filename, eg "somefile.html
- * @return boolean
+ * @param string Filename, eg "somefile.html
+ * @return bool
* @deprecated since TYPO3 6.0. Please use corresponding TYPO3\\CMS\\Core\\Resource\\ResourceStorage (fetched via BE_USERS->getFileStorages())
*/
public function checkFileNameLen($fileName) {
@@ -286,8 +286,8 @@ class BasicFileUtility {
/**
* Cleans $theDir for slashes in the end of the string and returns the new path, if it exists on the server.
*
- * @param string Directory path to check
- * @return string Returns the cleaned up directory name if OK, otherwise FALSE.
+ * @param string Directory path to check
+ * @return string Returns the cleaned up directory name if OK, otherwise FALSE.
* @todo Deprecate: but still in use by getUniqueName (used by DataHandler)
* @deprecated but still in use in the Core. Don't use in your extensions!
*/
@@ -305,9 +305,9 @@ class BasicFileUtility {
/**
* Wrapper for \TYPO3\CMS\Core\Utility\GeneralUtility::validPathStr()
*
- * @param string Filepath to evaluate
- * @return boolean TRUE, if no '//', '..' or '\' is in the $theFile
- * @see \TYPO3\CMS\Core\Utility\GeneralUtility::validPathStr()
+ * @param string Filepath to evaluate
+ * @return bool TRUE, if no '//', '..' or '\' is in the $theFile
+ * @see \TYPO3\CMS\Core\Utility\GeneralUtility::validPathStr()
* @deprecated since TYPO3 6.0. Use GeneralUtility::validPathStr() instead
*/
public function isPathValid($theFile) {
@@ -321,10 +321,10 @@ class BasicFileUtility {
* If $theFile exists in $theDest (directory) the file have numbers appended up to $this->maxNumber. Hereafter a unique string will be appended.
* This function is used by fx. TCEmain when files are attached to records and needs to be uniquely named in the uploads/* folders
*
- * @param string The input filename to check
- * @param string The directory for which to return a unique filename for $theFile. $theDest MUST be a valid directory. Should be absolute.
- * @param bool If set the filename is returned with the path prepended without checking whether it already existed!
- * @return string The destination absolute filepath (not just the name!) of a unique filename/foldername in that path.
+ * @param string The input filename to check
+ * @param string The directory for which to return a unique filename for $theFile. $theDest MUST be a valid directory. Should be absolute.
+ * @param bool If set the filename is returned with the path prepended without checking whether it already existed!
+ * @return string The destination absolute filepath (not just the name!) of a unique filename/foldername in that path.
* @see \TYPO3\CMS\Core\DataHandling\DataHandler::checkValue()
* @todo Deprecate, but still in use by the Core (DataHandler...)
* @deprecated but still in use in the Core. Don't use in your extensions!
@@ -376,8 +376,8 @@ class BasicFileUtility {
* Checks if $thePath is a path under one of the paths in $this->mounts
* See comment in the header of this class.
*
- * @param string $thePath MUST HAVE a trailing '/' in order to match correctly with the mounts
- * @return string The key to the first mount found, otherwise nothing is returned.
+ * @param string $thePath MUST HAVE a trailing '/' in order to match correctly with the mounts
+ * @return string The key to the first mount found, otherwise nothing is returned.
* @see init()
* @todo: deprecate this function, now done in the Storage object. But still in use by impexp and ElementBrowser
* @deprecated but still in use in the Core. Don't use in your extensions!
@@ -395,7 +395,7 @@ class BasicFileUtility {
/**
* Find first web folder (relative to PATH_site.'fileadmin') in filemounts array
*
- * @return string The key to the first mount inside PATH_site."fileadmin" found, otherwise nothing is returned.
+ * @return string The key to the first mount inside PATH_site."fileadmin" found, otherwise nothing is returned.
* @todo: deprecate this function. But still in use by impexp
* @deprecated but still in use in the Core. Don't use in your extensions!
*/
@@ -414,8 +414,8 @@ class BasicFileUtility {
* Removes filemount part of a path, thus blinding the position.
* Takes a path, $thePath, and removes the part of the path which equals the filemount.
*
- * @param string $thePath is a path which MUST be found within one of the internally set filemounts, $this->mounts
- * @return string The processed input path
+ * @param string $thePath is a path which MUST be found within one of the internally set filemounts, $this->mounts
+ * @return string The processed input path
* @deprecated since TYPO3 6.0. No replacement
*/
public function blindPath($thePath) {
@@ -434,7 +434,7 @@ class BasicFileUtility {
* Find temporary folder
* Finds the first $this->tempFN ('_temp_' usually) -folder in the internal array of filemounts, $this->mounts
*
- * @return string Returns the path if found, otherwise nothing if error.
+ * @return string Returns the path if found, otherwise nothing if error.
* @deprecated since TYPO3 6.0. No replacement
*/
public function findTempFolder() {
@@ -470,8 +470,8 @@ class BasicFileUtility {
/**
* Converts any double slashes (//) to a single slash (/)
*
- * @param string Input value
- * @return string Returns the converted string
+ * @param string Input value
+ * @return string Returns the converted string
* @deprecated since TYPO3 6.0, no replacement
*/
public function rmDoubleSlash($string) {
@@ -482,8 +482,8 @@ class BasicFileUtility {
/**
* Returns a string which has a slash '/' appended if it doesn't already have that slash
*
- * @param string Input string
- * @return string Output string with a slash in the end (if not already there)
+ * @param string Input string
+ * @return string Output string with a slash in the end (if not already there)
* @todo Deprecate, but still in use by is_webpath, used by DataHandler
* @deprecated but still in use in the Core. Don't use in your extensions!
*/
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
index dbcfc542d9ee..0162ed2e191d 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
@@ -374,7 +374,7 @@ class ExtendedFileUtility extends BasicFileUtility {
* Deleting files and folders (action=4)
*
* @param array $cmds $cmds['data'] is the file/folder to delete
- * @return boolean Returns TRUE upon success
+ * @return bool Returns TRUE upon success
*/
public function func_delete($cmds) {
$result = FALSE;
@@ -811,7 +811,7 @@ class ExtendedFileUtility extends BasicFileUtility {
* Editing textfiles or folders (action=9)
*
* @param array $cmds $cmds['data'] is the new content. $cmds['target'] is the target (file or dir)
- * @return boolean Returns TRUE on success
+ * @return bool Returns TRUE on success
*/
public function func_edit($cmds) {
if (!$this->isInit) {
@@ -949,7 +949,7 @@ class ExtendedFileUtility extends BasicFileUtility {
* This is permitted only if the user has fullAccess or if the file resides
*
* @param array $cmds $cmds['data'] is the zip-file. $cmds['target'] is the target directory. If not set we'll default to the same directory as the file is in.
- * @return boolean Returns TRUE on success
+ * @return bool Returns TRUE on success
*/
public function func_unzip($cmds) {
if (!$this->isInit || $this->dont_use_exec_commands) {
diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
index 330fceb8edb6..9d1982e65c43 100644
--- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php
+++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php
@@ -388,7 +388,7 @@ class GeneralUtility {
*
* @param string $baseIP Is the current remote IP address for instance, typ. REMOTE_ADDR
* @param string $list Is a comma-list of IP-addresses to match with. *-wildcard allowed instead of number, plus leaving out parts in the IP number is accepted as wildcard (eg. 192.168.*.* equals 192.168). If list is "*" no check is done and the function returns TRUE immediately. An empty list always returns FALSE.
- * @return boolean TRUE if an IP-mask from $list matches $baseIP
+ * @return bool TRUE if an IP-mask from $list matches $baseIP
*/
static public function cmpIP($baseIP, $list) {
$list = trim($list);
@@ -409,7 +409,7 @@ class GeneralUtility {
*
* @param string $baseIP Is the current remote IP address for instance, typ. REMOTE_ADDR
* @param string $list Is a comma-list of IP-addresses to match with. *-wildcard allowed instead of number, plus leaving out parts in the IP number is accepted as wildcard (eg. 192.168.*.* equals 192.168), could also contain IPv6 addresses
- * @return boolean TRUE if an IP-mask from $list matches $baseIP
+ * @return bool TRUE if an IP-mask from $list matches $baseIP
*/
static public function cmpIPv4($baseIP, $list) {
$IPpartsReq = explode('.', $baseIP);
@@ -455,7 +455,7 @@ class GeneralUtility {
*
* @param string $baseIP Is the current remote IP address for instance
* @param string $list Is a comma-list of IPv6 prefixes, could also contain IPv4 addresses
- * @return boolean TRUE If an baseIP matches any prefix
+ * @return bool TRUE If an baseIP matches any prefix
*/
static public function cmpIPv6($baseIP, $list) {
// Policy default: Deny connection
@@ -605,7 +605,7 @@ class GeneralUtility {
* Possible format are IPv4 and IPv6.
*
* @param string $ip IP address to be tested
- * @return boolean TRUE if $ip is either of IPv4 or IPv6 format.
+ * @return bool TRUE if $ip is either of IPv4 or IPv6 format.
*/
static public function validIP($ip) {
return filter_var($ip, FILTER_VALIDATE_IP) !== FALSE;
@@ -617,7 +617,7 @@ class GeneralUtility {
* Example for possible format: 10.0.45.99
*
* @param string $ip IP address to be tested
- * @return boolean TRUE if $ip is of IPv4 format.
+ * @return bool TRUE if $ip is of IPv4 format.
*/
static public function validIPv4($ip) {
return filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== FALSE;
@@ -629,7 +629,7 @@ class GeneralUtility {
* Example for possible format: 43FB::BB3F:A0A0:0 | ::1
*
* @param string $ip IP address to be tested
- * @return boolean TRUE if $ip is of IPv6 format.
+ * @return bool TRUE if $ip is of IPv6 format.
*/
static public function validIPv6($ip) {
return filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== FALSE;
@@ -640,7 +640,7 @@ class GeneralUtility {
*
* @param string $baseHost A hostname or an IPv4/IPv6-address (will by reverse-resolved; typically REMOTE_ADDR)
* @param string $list A comma-list of domain names to match with. *-wildcard allowed but cannot be part of a string, so it must match the full host name (eg. myhost.*.com => correct, myhost.*domain.com => wrong)
- * @return boolean TRUE if a domain name mask from $list matches $baseIP
+ * @return bool TRUE if a domain name mask from $list matches $baseIP
*/
static public function cmpFQDN($baseHost, $list) {
$baseHost = trim($baseHost);
@@ -706,7 +706,7 @@ class GeneralUtility {
* Scheme, hostname and (optional) port of the given URL are compared.
*
* @param string $url URL to compare with the TYPO3 request host
- * @return boolean Whether the URL matches the TYPO3 request host
+ * @return bool Whether the URL matches the TYPO3 request host
*/
static public function isOnCurrentHost($url) {
return stripos($url . '/', self::getIndpEnv('TYPO3_REQUEST_HOST') . '/') === 0;
@@ -718,7 +718,7 @@ class GeneralUtility {
*
* @param string $list Comma-separated list of items (string)
* @param string $item Item to check for
- * @return boolean TRUE if $item is in $list
+ * @return bool TRUE if $item is in $list
*/
static public function inList($list, $item) {
return strpos(',' . $list . ',', ',' . $item . ',') !== FALSE;
@@ -775,7 +775,7 @@ class GeneralUtility {
* Notice that this function compares branches, not versions (4.0.1 would be > 4.0.0 although they use the same compat_version)
*
* @param string $verNumberStr Minimum branch number required (format x.y / e.g. "4.0" NOT "4.0.0"!)
- * @return boolean Returns TRUE if this setup is compatible with the provided version number
+ * @return bool Returns TRUE if this setup is compatible with the provided version number
* @todo Still needs a function to convert versions to branches
*/
static public function compat_version($verNumberStr) {
@@ -791,7 +791,7 @@ class GeneralUtility {
* Makes a positive integer hash out of the first 7 chars from the md5 hash of the input
*
* @param string $str String to md5-hash
- * @return integer Returns 28bit integer-hash
+ * @return int Returns 28bit integer-hash
*/
static public function md5int($str) {
return hexdec(substr(md5($str), 0, 7));
@@ -940,7 +940,7 @@ class GeneralUtility {
*
* @param string $str Full string to check
* @param string $partStr Reference string which must be found as the "first part" of the full string
- * @return boolean TRUE if $partStr was found to be equal to the first part of $str
+ * @return bool TRUE if $partStr was found to be equal to the first part of $str
*/
static public function isFirstPartOfStr($str, $partStr) {
return $partStr != '' && strpos((string) $str, (string) $partStr, 0) === 0;
@@ -986,7 +986,7 @@ class GeneralUtility {
* Returns microtime input to milliseconds
*
* @param string $microtime Microtime
- * @return integer Microtime input string converted to an integer (milliseconds)
+ * @return int Microtime input string converted to an integer (milliseconds)
*/
static public function convertMicrotime($microtime) {
$parts = explode(' ', $microtime);
@@ -1094,7 +1094,7 @@ class GeneralUtility {
* rest together again.
*
* @param string $email Input string to evaluate
- * @return boolean Returns TRUE if the $email address (input string) is valid
+ * @return bool Returns TRUE if the $email address (input string) is valid
*/
static public function validEmail($email) {
// Early return in case input is not a string
@@ -1124,7 +1124,7 @@ class GeneralUtility {
* TODO: 4.3 should have additional configuration variable, which is combined
* by || with the rest in this function.
*
- * @return boolean TRUE if mail() does not accept recipient name
+ * @return bool TRUE if mail() does not accept recipient name
*/
static public function isBrokenEmailEnvironment() {
return TYPO3_OS == 'WIN' || FALSE !== strpos(ini_get('sendmail_path'), 'mini_sendmail');
@@ -1387,7 +1387,7 @@ class GeneralUtility {
* http://tools.ietf.org/html/rfc3986#appendix-A
*
* @param string $url The URL to be validated
- * @return boolean Whether the given URL is valid
+ * @return bool Whether the given URL is valid
*/
static public function isValidUrl($url) {
$parsedUrl = parse_url($url);
@@ -1437,7 +1437,7 @@ class GeneralUtility {
*
* @param array $in_array One-dimensional array of items
* @param string $item Item to check for
- * @return boolean TRUE if $item is in the one-dimensional array $in_array
+ * @return bool TRUE if $item is in the one-dimensional array $in_array
*/
static public function inArray(array $in_array, $item) {
foreach ($in_array as $val) {
@@ -1850,7 +1850,7 @@ class GeneralUtility {
* Sorts an array by key recursive - uses natural sort order (aAbB-zZ)
*
* @param array $array array to be sorted recursively, passed by reference
- * @return boolean TRUE if param is an array
+ * @return bool TRUE if param is an array
*/
static public function naturalKeySortRecursive(&$array) {
if (!is_array($array)) {
@@ -2600,7 +2600,7 @@ Connection: close
* @param string $file Filepath to write to
* @param string $content Content to write
* @param bool $changePermissions If TRUE, permissions are forced to be set
- * @return boolean TRUE if the file was successfully opened and written to.
+ * @return bool TRUE if the file was successfully opened and written to.
*/
static public function writeFile($file, $content, $changePermissions = FALSE) {
if (!@is_file($file)) {
@@ -2747,7 +2747,7 @@ Connection: close
* and group ownership according to $GLOBALS['TYPO3_CONF_VARS']['BE']['createGroup']
*
* @param string $newFolder Absolute path to folder, see PHP mkdir() function. Removes trailing slash internally.
- * @return boolean TRUE if @mkdir went well!
+ * @return bool TRUE if @mkdir went well!
*/
static public function mkdir($newFolder) {
$result = @mkdir($newFolder, octdec($GLOBALS['TYPO3_CONF_VARS']['BE']['folderCreateMask']));
@@ -2818,7 +2818,7 @@ Connection: close
*
* @param string $path Absolute path to folder, see PHP rmdir() function. Removes trailing slash internally.
* @param bool $removeNonEmpty Allow deletion of non-empty directories
- * @return boolean TRUE if @rmdir went well!
+ * @return bool TRUE if @rmdir went well!
*/
static public function rmdir($path, $removeNonEmpty = FALSE) {
$OK = FALSE;
@@ -2858,7 +2858,7 @@ Connection: close
*
* @param string $directory The directory to be renamed and flushed
* @param bool $keepOriginalDirectory Whether to only empty the directory and not remove it
- * @return boolean Whether the action was successful
+ * @return bool Whether the action was successful
*/
static public function flushDirectory($directory, $keepOriginalDirectory = FALSE) {
$result = FALSE;
@@ -3077,7 +3077,7 @@ Connection: close
* the maxFileSize, usually for the TCA values.
*
* @param int $localLimit the number of Kilobytes (!) that should be used as
- * @return integer The maximum size of uploads that are allowed (measured in kilobytes)
+ * @return int The maximum size of uploads that are allowed (measured in kilobytes)
*/
static public function getMaxUploadFileSize($localLimit = 0) {
// Don't allow more than the global max file size at all
@@ -3099,7 +3099,7 @@ Connection: close
* Gets the bytes value from a measurement string like "100k".
*
* @param string $measurement The measurement (e.g. "100k")
- * @return integer The bytes value (e.g. 102400)
+ * @return int The bytes value (e.g. 102400)
*/
static public function getBytesFromSizeMeasurement($measurement) {
$bytes = doubleval($measurement);
@@ -3116,7 +3116,7 @@ Connection: close
/**
* Retrieves the maximum path length that is valid in the current environment.
*
- * @return integer The maximum available path length
+ * @return int The maximum available path length
*/
static public function getMaximumPathLength() {
return PHP_MAXPATHLEN;
@@ -3591,7 +3591,7 @@ Connection: close
/**
* Gets the unixtime as milliseconds.
*
- * @return integer The unixtime as milliseconds
+ * @return int The unixtime as milliseconds
*/
static public function milliseconds() {
return round(microtime(TRUE) * 1000);
@@ -3753,7 +3753,7 @@ Connection: close
* So it's compatible with the UNIX style path strings valid for TYPO3 internally.
*
* @param string $theFile File path to evaluate
- * @return boolean TRUE, $theFile is allowed path string, FALSE otherwise
+ * @return bool TRUE, $theFile is allowed path string, FALSE otherwise
* @see http://php.net/manual/en/security.filesystem.nullbytes.php
* @todo Possible improvement: Should it rawurldecode the string first to check if any of these characters is encoded?
*/
@@ -3766,7 +3766,7 @@ Connection: close
* Checks if the $path is absolute or relative (detecting either '/' or 'x:/' as first part of string) and returns TRUE if so.
*
* @param string $path File path to evaluate
- * @return boolean
+ * @return bool
*/
static public function isAbsPath($path) {
return $path[0] === '/' || TYPO3_OS === 'WIN' && (strpos($path, ':/') === 1 || strpos($path, ':\\') === 1);
@@ -3776,7 +3776,7 @@ Connection: close
* Returns TRUE if the path is absolute, without backpath '..' and within the PATH_site OR within the lockRootPath
*
* @param string $path File path to evaluate
- * @return boolean
+ * @return bool
*/
static public function isAllowedAbsPath($path) {
$lockRootPath = $GLOBALS['TYPO3_CONF_VARS']['BE']['lockRootPath'];
@@ -3792,7 +3792,7 @@ Connection: close
* allways filter on [[:cntrl:]].
*
* @param string $filename File path to evaluate
- * @return boolean
+ * @return bool
*/
static public function verifyFilenameAgainstDenyPattern($filename) {
$pattern = '/[[:cntrl:]]/';
@@ -3868,7 +3868,7 @@ Connection: close
*
* @param string $source Source file, absolute path
* @param string $destination Destination file, absolute path
- * @return boolean Returns TRUE if the file was moved.
+ * @return bool Returns TRUE if the file was moved.
* @coauthor Dennis Petersen <fessor@software.dk>
* @see upload_to_tempfile()
*/
@@ -3910,7 +3910,7 @@ Connection: close
* Use this after upload_to_tempfile() or tempnam() from this class!
*
* @param string $uploadedTempFileName Filepath for a file in PATH_site."typo3temp/". Must be absolute.
- * @return boolean Returns TRUE if the file was unlink()'ed
+ * @return bool Returns TRUE if the file was unlink()'ed
* @see upload_to_tempfile(), tempnam()
*/
static public function unlink_tempfile($uploadedTempFileName) {
@@ -3984,7 +3984,7 @@ Connection: close
* Responds on input localization setting value whether the page it comes from should be hidden if no translation exists or not.
*
* @param int $l18n_cfg_fieldValue Value from "l18n_cfg" field of a page record
- * @return boolean TRUE if the page should be hidden
+ * @return bool TRUE if the page should be hidden
*/
static public function hideIfNotTranslated($l18n_cfg_fieldValue) {
if ($GLOBALS['TYPO3_CONF_VARS']['FE']['hidePagesIfNotTranslatedByDefault']) {
@@ -3999,7 +3999,7 @@ Connection: close
* pages in the default language
*
* @param int $localizationConfiguration
- * @return boolean
+ * @return bool
*/
static public function hideIfDefaultLanguage($localizationConfiguration) {
return $localizationConfiguration & 1;
@@ -4407,7 +4407,7 @@ Connection: close
* Checks if a class has a configured implementation
*
* @param string $className
- * @return boolean
+ * @return bool
*/
static protected function classHasImplementation($className) {
// If we are early in the bootstrap, the configuration might not yet be present
@@ -4825,7 +4825,7 @@ Connection: close
* Function to compensate for FreeType2 96 dpi
*
* @param int $font_size Fontsize for freetype function call
- * @return integer Compensated fontsize based on $GLOBALS['TYPO3_CONF_VARS']['GFX']['TTFdpi']
+ * @return int Compensated fontsize based on $GLOBALS['TYPO3_CONF_VARS']['GFX']['TTFdpi']
*/
static public function freetypeDpiComp($font_size) {
$dpi = (int)$GLOBALS['TYPO3_CONF_VARS']['GFX']['TTFdpi'];
diff --git a/typo3/sysext/core/Classes/Utility/MathUtility.php b/typo3/sysext/core/Classes/Utility/MathUtility.php
index 9e33876e4b68..e61ece2894d1 100644
--- a/typo3/sysext/core/Classes/Utility/MathUtility.php
+++ b/typo3/sysext/core/Classes/Utility/MathUtility.php
@@ -27,7 +27,7 @@ class MathUtility {
* @param int $min Lower limit
* @param int $max Higher limit
* @param int $defaultValue Default value if input is FALSE.
- * @return integer The input value forced into the boundaries of $min and $max
+ * @return int The input value forced into the boundaries of $min and $max
*/
static public function forceIntegerInRange($theInt, $min, $max = 2000000000, $defaultValue = 0) {
// Returns $theInt as an integer in the integerspace from $min to $max
@@ -50,7 +50,7 @@ class MathUtility {
* Returns $theInt if it is greater than zero, otherwise returns zero.
*
* @param int $theInt Integer string to process
- * @return integer
+ * @return int
*/
static public function convertToPositiveInteger($theInt) {
$theInt = (int)$theInt;
@@ -67,7 +67,7 @@ class MathUtility {
*
* @see http://php.net/manual/en/language.types.integer.php#language.types.integer.casting.from-other
* @param mixed $var Any input variable to test
- * @return boolean Returns TRUE if string is an integer
+ * @return bool Returns TRUE if string is an integer
*/
static public function canBeInterpretedAsInteger($var) {
if ($var === '' || is_object($var) || is_array($var)) {
@@ -83,7 +83,7 @@ class MathUtility {
*
* @see http://www.php.net/manual/en/language.types.float.php, section "Formally" for the notation
* @param mixed $var Any input variable to test
- * @return boolean Returns TRUE if string is a float
+ * @return bool Returns TRUE if string is a float
*/
static public function canBeInterpretedAsFloat($var) {
$pattern_lnum = '[0-9]+';
@@ -102,7 +102,7 @@ class MathUtility {
* Calculates the input by +,-,*,/,%,^ with priority to + and -
*
* @param string $string Input string, eg "123 + 456 / 789 - 4
- * @return integer Calculated value. Or error string.
+ * @return int Calculated value. Or error string.
* @see \TYPO3\CMS\Core\Utility\MathUtility::calculateWithParentheses()
*/
static public function calculateWithPriorityToAdditionAndSubtraction($string) {
@@ -160,7 +160,7 @@ class MathUtility {
* Calculates the input with parenthesis levels
*
* @param string $string Input string, eg "(123 + 456) / 789 - 4
- * @return integer Calculated value. Or error string.
+ * @return int Calculated value. Or error string.
* @see calculateWithPriorityToAdditionAndSubtraction(), \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::stdWrap()
*/
static public function calculateWithParentheses($string) {
@@ -190,7 +190,7 @@ class MathUtility {
* @param int $value Integer value to check
* @param int $minimum Lower boundary of the range
* @param int $maximum Upper boundary of the range
- * @return boolean
+ * @return bool
*/
static public function isIntegerInRange($value, $minimum, $maximum) {
$value = filter_var($value, FILTER_VALIDATE_INT, array(
diff --git a/typo3/sysext/core/Classes/Utility/OpcodeCacheUtility.php b/typo3/sysext/core/Classes/Utility/OpcodeCacheUtility.php
index 344b3a914464..a69bb9fb8e40 100644
--- a/typo3/sysext/core/Classes/Utility/OpcodeCacheUtility.php
+++ b/typo3/sysext/core/Classes/Utility/OpcodeCacheUtility.php
@@ -174,7 +174,7 @@ class OpcodeCacheUtility {
*
* @param string $system The cache system to test (APC, ...)
*
- * @return boolean The calculated value from array or FALSE if cache system not exists.
+ * @return bool The calculated value from array or FALSE if cache system not exists.
* @internal Do not rely on this function. Will be removed if PHP5.4 is minimum requirement.
*/
static public function getCanInvalidate($system) {
diff --git a/typo3/sysext/core/Classes/Utility/PathUtility.php b/typo3/sysext/core/Classes/Utility/PathUtility.php
index 1ece2a1cbd3a..dba5f0fd4d05 100644
--- a/typo3/sysext/core/Classes/Utility/PathUtility.php
+++ b/typo3/sysext/core/Classes/Utility/PathUtility.php
@@ -184,7 +184,7 @@ class PathUtility {
* Checks if the $path is absolute or relative (detecting either '/' or 'x:/' as first part of string) and returns TRUE if so.
*
* @param string $path File path to evaluate
- * @return boolean
+ * @return bool
*/
static public function isAbsolutePath($path) {
// On Windows also a path starting with a drive letter is absolute: X:/
diff --git a/typo3/sysext/core/Classes/Utility/PhpOptionsUtility.php b/typo3/sysext/core/Classes/Utility/PhpOptionsUtility.php
index 310c0326de96..978574545100 100644
--- a/typo3/sysext/core/Classes/Utility/PhpOptionsUtility.php
+++ b/typo3/sysext/core/Classes/Utility/PhpOptionsUtility.php
@@ -24,7 +24,7 @@ class PhpOptionsUtility {
/**
* Check if php sql.safe_mode is enabled
*
- * @return boolean TRUE if sql.safe_mode is enabled, FALSE if disabled
+ * @return bool TRUE if sql.safe_mode is enabled, FALSE if disabled
* @deprecated since 6.2, will be removed two versions later
*/
static public function isSqlSafeModeEnabled() {
@@ -35,7 +35,7 @@ class PhpOptionsUtility {
/**
* Check if php session.auto_start is enabled
*
- * @return boolean TRUE if session.auto_start is enabled, FALSE if disabled
+ * @return bool TRUE if session.auto_start is enabled, FALSE if disabled
*/
static public function isSessionAutoStartEnabled() {
return self::getIniValueBoolean('session.auto_start');
@@ -45,7 +45,7 @@ class PhpOptionsUtility {
* Cast a on/off php ini value to boolean
*
* @param string $configOption
- * @return boolean TRUE if the given option is enabled, FALSE if disabled
+ * @return bool TRUE if the given option is enabled, FALSE if disabled
*/
static public function getIniValueBoolean($configOption) {
return filter_var(ini_get($configOption), FILTER_VALIDATE_BOOLEAN, array(FILTER_REQUIRE_SCALAR, FILTER_NULL_ON_FAILURE));
diff --git a/typo3/sysext/core/Classes/Utility/RootlineUtility.php b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
index 5b3dee156406..ae5236332cca 100644
--- a/typo3/sysext/core/Classes/Utility/RootlineUtility.php
+++ b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
@@ -330,7 +330,7 @@ class RootlineUtility {
* describes a relation which is not stored as CSV in the record
*
* @param array $configuration TCA configuration to check
- * @return boolean TRUE, if it describes a non-CSV relation
+ * @return bool TRUE, if it describes a non-CSV relation
*/
protected function columnHasRelationToResolve(array $configuration) {
$configuration = $configuration['config'];
@@ -388,7 +388,7 @@ class RootlineUtility {
* Checks whether the current Page is a Mounted Page
* (according to the MP-URL-Parameter)
*
- * @return boolean
+ * @return bool
*/
public function isMountedPage() {
return in_array($this->pageUid, array_keys($this->parsedMountPointParameters));
diff --git a/typo3/sysext/core/Classes/Utility/StringUtility.php b/typo3/sysext/core/Classes/Utility/StringUtility.php
index 6cae670605b4..2640be311baa 100644
--- a/typo3/sysext/core/Classes/Utility/StringUtility.php
+++ b/typo3/sysext/core/Classes/Utility/StringUtility.php
@@ -29,7 +29,7 @@ class StringUtility {
* @param string $haystack Full string to check
* @param string $needle Reference string which must be found as the "last part" of the full string
* @throws \InvalidArgumentException
- * @return boolean TRUE if $needle was found to be equal to the last part of $str
+ * @return bool TRUE if $needle was found to be equal to the last part of $str
* @deprecated since 6.3 - will be removed two versions later, use beginsWith() instead
*/
static public function isLastPartOfString($haystack, $needle) {
@@ -58,7 +58,7 @@ class StringUtility {
* @param string $haystack Full string to check
* @param string $needle Reference string which must be found as the "first part" of the full string
* @throws \InvalidArgumentException
- * @return boolean TRUE if $needle was found to be equal to the first part of $haystack
+ * @return bool TRUE if $needle was found to be equal to the first part of $haystack
*/
static public function beginsWith($haystack, $needle) {
// Sanitize $haystack and $needle
@@ -86,7 +86,7 @@ class StringUtility {
* @param string $haystack Full string to check
* @param string $needle Reference string which must be found as the "last part" of the full string
* @throws \InvalidArgumentException
- * @return boolean TRUE if $needle was found to be equal to the last part of $haystack
+ * @return bool TRUE if $needle was found to be equal to the last part of $haystack
*/
static public function endsWith($haystack, $needle) {
// Sanitize $haystack and $needle
diff --git a/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php b/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
index b8bc971a3d98..fa39fc82f928 100644
--- a/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
+++ b/typo3/sysext/core/Classes/Utility/VersionNumberUtility.php
@@ -24,7 +24,7 @@ class VersionNumberUtility {
* Returns an integer from a three part version number, eg '4.12.3' -> 4012003
*
* @param string $versionNumber Version number on format x.x.x
- * @return integer Integer version of version number (where each part can count to 999)
+ * @return int Integer version of version number (where each part can count to 999)
*/
static public function convertVersionNumberToInteger($versionNumber) {
$versionParts = explode('.', $versionNumber);
diff --git a/typo3/sysext/core/Classes/Versioning/VersionState.php b/typo3/sysext/core/Classes/Versioning/VersionState.php
index 993ff35e22c1..c49b62b4cf61 100644
--- a/typo3/sysext/core/Classes/Versioning/VersionState.php
+++ b/typo3/sysext/core/Classes/Versioning/VersionState.php
@@ -72,7 +72,7 @@ class VersionState extends \TYPO3\CMS\Core\Type\Enumeration {
const MOVE_POINTER = 4;
/**
- * @return boolean
+ * @return bool
*/
public function indicatesPlaceholder() {
return (int)$this->__toString() > self::DEFAULT_STATE;
diff --git a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php
index 47d5a19be347..f9d3bf81707e 100644
--- a/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php
+++ b/typo3/sysext/core/Tests/Functional/DataHandling/IRRE/AbstractTestCase.php
@@ -111,7 +111,7 @@ abstract class AbstractTestCase extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
/**
* Simulates executing commands by using t3lib_TCEmain.
*
- * @param array $elements The cmdmap to be delivered to DataHandler
+ * @param array $elements The cmdmap to be delivered to DataHandler
* @return \TYPO3\CMS\Core\DataHandling\DataHandler
*/
protected function simulateCommandByStructure(array $elements) {
@@ -152,7 +152,7 @@ abstract class AbstractTestCase extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
}
/**
- * @param array $itemArray
+ * @param array $itemArray
* @return array
*/
protected function getElementsByItemArray(array $itemArray) {
@@ -371,9 +371,9 @@ abstract class AbstractTestCase extends \TYPO3\CMS\Core\Tests\FunctionalTestCase
}
/**
- * @param array $assertion
- * @param array $elements
- * @return boolean
+ * @param array $assertion
+ * @param array $elements
+ * @return bool
*/
protected function executeAssertionOnElements(array $assertion, array $elements) {
if (!empty($assertion['tableName'])) {
diff --git a/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php b/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
index 32ecfe23e69c..eaa416b8a7cd 100644
--- a/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
+++ b/typo3/sysext/core/Tests/FunctionalTestCaseBootstrapUtility.php
@@ -576,7 +576,7 @@ class FunctionalTestCaseBootstrapUtility {
*
* @param string $path Absolute path to folder, see PHP rmdir() function. Removes trailing slash internally.
* @param bool $removeNonEmpty Allow deletion of non-empty directories
- * @return boolean TRUE if @rmdir went well!
+ * @return bool TRUE if @rmdir went well!
*/
protected function rmdir($path, $removeNonEmpty = FALSE) {
$OK = FALSE;
@@ -620,7 +620,7 @@ class FunctionalTestCaseBootstrapUtility {
*
* @param string $file Filepath to write to
* @param string $content Content to write
- * @return boolean TRUE if the file was successfully opened and written to.
+ * @return bool TRUE if the file was successfully opened and written to.
*/
protected function writeFile($file, $content) {
if ($fd = fopen($file, 'wb')) {
diff --git a/typo3/sysext/core/Tests/Unit/RegistryTest.php b/typo3/sysext/core/Tests/Unit/RegistryTest.php
index 23d4eeed49a4..1066b48a2f10 100644
--- a/typo3/sysext/core/Tests/Unit/RegistryTest.php
+++ b/typo3/sysext/core/Tests/Unit/RegistryTest.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Core\Tests\Unit;
/**
* Testcase for TYPO3\CMS\Core\Registry
*
- * @author Bastian Waidelich <bastian@typo3.org>
+ * @author Bastian Waidelich <bastian@typo3.org>
*/
class RegistryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/Fixtures/LocalDriverFilenameFilter.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/Fixtures/LocalDriverFilenameFilter.php
index 3fd07b58f686..e87f422307c0 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/Fixtures/LocalDriverFilenameFilter.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/Fixtures/LocalDriverFilenameFilter.php
@@ -27,7 +27,7 @@ class LocalDriverFilenameFilter {
* @param string $parentIdentifier
* @param array $additionalInformation
* @param \TYPO3\CMS\Core\Resource\Driver\AbstractDriver $driverInstance
- * @return boolean|integer
+ * @return bool|int
*/
static public function filterFilename($itemName, $itemIdentifier, $parentIdentifier, array $additionalInformation, \TYPO3\CMS\Core\Resource\Driver\AbstractDriver $driverInstance) {
if ($itemName == 'fileA' || $itemName == 'folderA/') {
diff --git a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
index e16229bb12c1..74c1fcd66513 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
@@ -49,7 +49,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* Helper method to test for an existing internet connection.
* Some tests are skipped if there is no working uplink.
*
- * @return boolean $isConnected
+ * @return bool $isConnected
*/
public function isConnected() {
$isConnected = FALSE;
@@ -3588,7 +3588,7 @@ class GeneralUtilityTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
/**
* Data provider for ImageMagick shell commands
*
- * @see explodeAndUnquoteImageMagickCommands
+ * @see explodeAndUnquoteImageMagickCommands
*/
public function imageMagickCommandsDataProvider() {
return array(
diff --git a/typo3/sysext/dbal/Classes/Controller/ModuleController.php b/typo3/sysext/dbal/Classes/Controller/ModuleController.php
index 2ac27bc49d79..5194c330db71 100644
--- a/typo3/sysext/dbal/Classes/Controller/ModuleController.php
+++ b/typo3/sysext/dbal/Classes/Controller/ModuleController.php
@@ -19,8 +19,8 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
/**
* Script class; Backend module for DBAL extension
*
- * @author Kasper Skårhøj <kasper@typo3.com>
- * @author Karsten Dambekalns <karsten@typo3.org>
+ * @author Kasper Skårhøj <kasper@typo3.com>
+ * @author Karsten Dambekalns <karsten@typo3.org>
*/
class ModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
@@ -32,7 +32,7 @@ class ModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
/**
* Adds items to the ->MOD_MENU array. Used for the function menu selector.
*
- * @return void
+ * @return void
*/
public function menuConfig() {
$this->MOD_MENU = array(
@@ -48,7 +48,7 @@ class ModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
/**
* Main function of the module. Write the content to $this->content
*
- * @return void
+ * @return void
*/
public function main() {
$this->thisScript = BackendUtility::getModuleUrl($this->MCONF['name']);
diff --git a/typo3/sysext/dbal/Classes/Database/AdodbPreparedStatement.php b/typo3/sysext/dbal/Classes/Database/AdodbPreparedStatement.php
index 7d75013df5c4..95204df18211 100644
--- a/typo3/sysext/dbal/Classes/Database/AdodbPreparedStatement.php
+++ b/typo3/sysext/dbal/Classes/Database/AdodbPreparedStatement.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
* Notice: Extends \TYPO3\CMS\Dbal\Database\DatabaseConnection to be able to access
* protected properties solely (thus would be a "friend" class in C++).
*
- * @author Xavier Perseguers <xavier@typo3.org>
+ * @author Xavier Perseguers <xavier@typo3.org>
*/
class AdodbPreparedStatement extends \TYPO3\CMS\Dbal\Database\DatabaseConnection {
@@ -68,7 +68,7 @@ class AdodbPreparedStatement extends \TYPO3\CMS\Dbal\Database\DatabaseConnection
/**
* Prepares an SQL statement for execution.
*
- * @return boolean TRUE on success or FALSE on failure
+ * @return bool TRUE on success or FALSE on failure
*/
public function prepare() {
// TODO: actually prepare the query with ADOdb, if supported by the underlying DBMS
@@ -91,7 +91,7 @@ class AdodbPreparedStatement extends \TYPO3\CMS\Dbal\Database\DatabaseConnection
* @param string $types
* @param mixed $var1 The number of variables and length of string types must match the parameters in the statement.
* @param mixed $_ [optional]
- * @return boolean TRUE on success or FALSE on failure
+ * @return bool TRUE on success or FALSE on failure
* @see \mysqli_stmt::bind_param()
*/
public function bind_param($types, $var1, $_ = NULL) {
@@ -119,7 +119,7 @@ class AdodbPreparedStatement extends \TYPO3\CMS\Dbal\Database\DatabaseConnection
/**
* Resets a prepared statement.
*
- * @return boolean TRUE on success or FALSE on failure
+ * @return bool TRUE on success or FALSE on failure
*/
public function reset() {
return TRUE;
@@ -128,7 +128,7 @@ class AdodbPreparedStatement extends \TYPO3\CMS\Dbal\Database\DatabaseConnection
/**
* Executes a prepared query.
*
- * @return boolean TRUE on success or FALSE on failure
+ * @return bool TRUE on success or FALSE on failure
*/
public function execute() {
$queryParts = $this->queryComponents['queryParts'];
@@ -220,7 +220,7 @@ class AdodbPreparedStatement extends \TYPO3\CMS\Dbal\Database\DatabaseConnection
* Seeks to an arbitrary row in statement result set.
*
* @param int $offset Must be between zero and the total number of rows minus one
- * @return boolean TRUE on success or FALSE on failure
+ * @return bool TRUE on success or FALSE on failure
*/
public function data_seek($offset) {
return $this->databaseConnection->sql_data_seek($this->recordSet, $offset);
@@ -229,7 +229,7 @@ class AdodbPreparedStatement extends \TYPO3\CMS\Dbal\Database\DatabaseConnection
/**
* Closes a prepared statement.
*
- * @return boolean TRUE on success or FALSE on failure
+ * @return bool TRUE on success or FALSE on failure
*/
public function close() {
return $this->databaseConnection->sql_free_result($this->recordSet);
diff --git a/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php b/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
index 97604c1b4bff..d987da70bebe 100644
--- a/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
+++ b/typo3/sysext/dbal/Classes/Database/DatabaseConnection.php
@@ -19,9 +19,9 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* TYPO3 database abstraction layer
*
- * @author Kasper Skårhøj <kasper@typo3.com>
- * @author Karsten Dambekalns <k.dambekalns@fishfarm.de>
- * @author Xavier Perseguers <xavier@typo3.org>
+ * @author Kasper Skårhøj <kasper@typo3.com>
+ * @author Karsten Dambekalns <k.dambekalns@fishfarm.de>
+ * @author Xavier Perseguers <xavier@typo3.org>
*/
class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
@@ -608,7 +608,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
* @param string $where WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
* @param array $fields_values Field values as key=>value pairs. Values will be escaped internally. Typically you would fill an array like "$updateFields" with 'fieldname'=>'value' and pass it to this function as argument.
* @param bool $no_quote_fields See fullQuoteArray()
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function exec_UPDATEquery($table, $where, $fields_values, $no_quote_fields = FALSE) {
$pt = $this->debug ? GeneralUtility::milliseconds() : 0;
@@ -691,7 +691,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
*
* @param string $table Database tablename
* @param string $where WHERE clause, eg. "uid=1". NOTICE: You must escape values in this argument with $this->fullQuoteStr() yourself!
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function exec_DELETEquery($table, $where) {
$pt = $this->debug ? GeneralUtility::milliseconds() : 0;
@@ -751,7 +751,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
* @param string $groupBy Optional GROUP BY field(s), if none, supply blank string.
* @param string $orderBy Optional ORDER BY field(s), if none, supply blank string.
* @param string $limit Optional LIMIT value ([begin,]max), if none, supply blank string.
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function exec_SELECTquery($select_fields, $from_table, $where_clause, $groupBy = '', $orderBy = '', $limit = '') {
$pt = $this->debug ? GeneralUtility::milliseconds() : 0;
@@ -1493,7 +1493,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
*
* @param string $query The query to execute
* @param array $queryComponents The components of the query to execute
- * @return boolean|\mysqli_statement|\TYPO3\CMS\Dbal\Database\AdodbPreparedStatement
+ * @return bool|\mysqli_statement|\TYPO3\CMS\Dbal\Database\AdodbPreparedStatement
* @throws \RuntimeException
* @internal This method may only be called by \TYPO3\CMS\Core\Database\PreparedStatement
*/
@@ -1825,7 +1825,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
/**
* Quotes field names in a SQL ORDER BY clause according to DB rules
*
- * @param array $orderBy The parsed ORDER BY clause to quote
+ * @param array $orderBy The parsed ORDER BY clause to quote
* @return array
* @see quoteOrderBy()
*/
@@ -2099,7 +2099,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
/**
* Returns the error number on the last query() execution
*
- * @return integer MySQLi error number
+ * @return int MySQLi error number
*/
public function sql_errno() {
$output = 0;
@@ -2121,7 +2121,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
* Returns the number of selected rows.
*
* @param bool|\mysqli_result|object $res MySQLi result object / DBAL object
- * @return integer Number of resulting rows
+ * @return int Number of resulting rows
*/
public function sql_num_rows($res) {
if ($res === FALSE) {
@@ -2318,7 +2318,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
/**
* Get the ID generated from the previous INSERT operation
*
- * @return integer The uid of the last inserted record.
+ * @return int The uid of the last inserted record.
*/
public function sql_insert_id() {
$output = 0;
@@ -2339,7 +2339,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
/**
* Returns the number of rows affected by the last INSERT, UPDATE or DELETE query
*
- * @return integer Number of rows affected by last query
+ * @return int Number of rows affected by last query
*/
public function sql_affected_rows() {
$output = 0;
@@ -2466,7 +2466,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
* using exec_SELECTquery() and similar methods instead.
*
* @param string $query Query to execute
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function sql_query($query) {
$globalConfig = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dbal']);
@@ -2508,7 +2508,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
* @param string $host Deprecated since 6.1, will be removed in two versions. Database host IP/domain[:port]
* @param string $username Deprecated since 6.1, will be removed in two versions. Username to connect with.
* @param string $password Deprecated since 6.1, will be removed in two versions. Password to connect with.
- * @return boolean|void
+ * @return bool|void
* @throws \RuntimeException
*/
public function sql_pconnect($host = NULL, $username = NULL, $password = NULL) {
@@ -2857,7 +2857,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
*
* @param string $query Query to execute
* @throws \InvalidArgumentException
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function admin_query($query) {
$parsedQuery = $this->SQLparser->parseSQL($query);
@@ -3131,7 +3131,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
/**
* Checks whether the DBAL is currently inside an operation running on the "native" DB handler (i.e. MySQL)
*
- * @return bool TRUE if running on "native" DB handler (i.e. MySQL)
+ * @return bool TRUE if running on "native" DB handler (i.e. MySQL)
*/
public function runningNative() {
return (string)$this->handlerCfg[$this->lastHandlerKey]['type'] === 'native';
@@ -3141,7 +3141,7 @@ class DatabaseConnection extends \TYPO3\CMS\Core\Database\DatabaseConnection {
* Checks whether the ADOdb handler is running with a driver that contains the argument
*
* @param string $driver Driver name, matched with strstr().
- * @return bool True if running with the given driver
+ * @return bool True if running with the given driver
*/
public function runningADOdbDriver($driver) {
return strpos($this->handlerCfg[$this->lastHandlerKey]['config']['driver'], $driver) !== FALSE;
diff --git a/typo3/sysext/dbal/Classes/Database/SqlParser.php b/typo3/sysext/dbal/Classes/Database/SqlParser.php
index 22d16fb8499d..b9dbcfbd1596 100644
--- a/typo3/sysext/dbal/Classes/Database/SqlParser.php
+++ b/typo3/sysext/dbal/Classes/Database/SqlParser.php
@@ -18,9 +18,9 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* PHP SQL engine / server
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @author Karsten Dambekalns <karsten@typo3.org>
- * @author Xavier Perseguers <xavier@typo3.org>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Karsten Dambekalns <karsten@typo3.org>
+ * @author Xavier Perseguers <xavier@typo3.org>
*/
class SqlParser extends \TYPO3\CMS\Core\Database\SqlParser {
@@ -114,10 +114,10 @@ class SqlParser extends \TYPO3\CMS\Core\Database\SqlParser {
* Compiles a "SELECT [output] FROM..:" field list based on input array (made with ->parseFieldList())
* Can also compile field lists for ORDER BY and GROUP BY.
*
- * @param array $selectFields Array of select fields, (made with ->parseFieldList())
- * @param bool $compileComments Whether comments should be compiled
- * @param bool $functionMapping Whether function mapping should take place
- * @return string Select field string
+ * @param array $selectFields Array of select fields, (made with ->parseFieldList())
+ * @param bool $compileComments Whether comments should be compiled
+ * @param bool $functionMapping Whether function mapping should take place
+ * @return string Select field string
* @see parseFieldList()
*/
public function compileFieldList($selectFields, $compileComments = TRUE, $functionMapping = TRUE) {
@@ -168,9 +168,9 @@ class SqlParser extends \TYPO3\CMS\Core\Database\SqlParser {
/**
* Compiles a CASE ... WHEN flow-control construct based on input array (made with ->parseCaseStatement())
*
- * @param array $components Array of case components, (made with ->parseCaseStatement())
- * @param bool $functionMapping Whether function mapping should take place
- * @return string case when string
+ * @param array $components Array of case components, (made with ->parseCaseStatement())
+ * @param bool $functionMapping Whether function mapping should take place
+ * @return string case when string
* @see parseCaseStatement()
*/
protected function compileCaseStatement(array $components, $functionMapping = TRUE) {
@@ -208,8 +208,8 @@ class SqlParser extends \TYPO3\CMS\Core\Database\SqlParser {
* This method overrides the method from \TYPO3\CMS\Core\Database\SqlParser because
* the input string is already properly escaped.
*
- * @param string $str Input string
- * @return string Output string
+ * @param string $str Input string
+ * @return string Output string
*/
protected function compileAddslashes($str) {
return $str;
@@ -259,8 +259,8 @@ class SqlParser extends \TYPO3\CMS\Core\Database\SqlParser {
/**
* Compiles a CREATE TABLE statement from components array
*
- * @param array $components Array of SQL query components
- * @return array array with SQL CREATE TABLE/INDEX command(s)
+ * @param array $components Array of SQL query components
+ * @return array array with SQL CREATE TABLE/INDEX command(s)
* @see parseCREATETABLE()
*/
public function compileCREATETABLE($components) {
@@ -352,8 +352,8 @@ class SqlParser extends \TYPO3\CMS\Core\Database\SqlParser {
/**
* Compile field definition
*
- * @param array $fieldCfg Field definition parts
- * @return string Field definition string
+ * @param array $fieldCfg Field definition parts
+ * @return string Field definition string
*/
public function compileFieldCfg($fieldCfg) {
$cfg = '';
@@ -429,7 +429,7 @@ class SqlParser extends \TYPO3\CMS\Core\Database\SqlParser {
* Checks if the submitted feature index contains a default value definition and the default value
*
* @param array $featureIndex A feature index as produced by parseFieldDef()
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Core\Database\SqlParser::parseFieldDef()
*/
public function checkEmptyDefaultValue($featureIndex) {
diff --git a/typo3/sysext/dbal/Classes/QueryCache.php b/typo3/sysext/dbal/Classes/QueryCache.php
index d16c27435627..d09de5b408cc 100644
--- a/typo3/sysext/dbal/Classes/QueryCache.php
+++ b/typo3/sysext/dbal/Classes/QueryCache.php
@@ -23,8 +23,8 @@ class QueryCache {
/**
* Returns a proper cache key.
*
- * @param mixed $config
- * @return void
+ * @param mixed $config
+ * @return void
*/
static public function getCacheKey($config) {
if (is_array($config)) {
diff --git a/typo3/sysext/dbal/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/dbal/Classes/RecordList/DatabaseRecordList.php
index a5465dd08ee8..992d6740f8d6 100644
--- a/typo3/sysext/dbal/Classes/RecordList/DatabaseRecordList.php
+++ b/typo3/sysext/dbal/Classes/RecordList/DatabaseRecordList.php
@@ -17,8 +17,8 @@ namespace TYPO3\CMS\Dbal\RecordList;
/**
* Child class for rendering of Web > List (not the final class)
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @author Karsten Dambekalns <k.dambekalns@fishfarm.de>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Karsten Dambekalns <k.dambekalns@fishfarm.de>
*/
class DatabaseRecordList extends \TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList {
@@ -28,8 +28,8 @@ class DatabaseRecordList extends \TYPO3\CMS\Recordlist\RecordList\DatabaseRecord
* DBAL specific: no LIKE for numeric fields, in this case "uid" (breaks on Oracle)
* no LIKE for BLOB fields, skip
*
- * @param string Table, in which the fields are being searched.
- * @return string Returns part of WHERE-clause for searching, if applicable.
+ * @param string Table, in which the fields are being searched.
+ * @return string Returns part of WHERE-clause for searching, if applicable.
*/
public function makeSearchString($table) {
// Make query, only if table is valid and a search string is actually defined:
diff --git a/typo3/sysext/dbal/mod1/index.php b/typo3/sysext/dbal/mod1/index.php
index b99e96076b3d..c1a8289c7af8 100644
--- a/typo3/sysext/dbal/mod1/index.php
+++ b/typo3/sysext/dbal/mod1/index.php
@@ -15,8 +15,8 @@
/**
* Module 'DBAL Debug' for the 'dbal' extension.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @author Karsten Dambekalns <karsten@typo3.org>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Karsten Dambekalns <karsten@typo3.org>
*/
$LANG->includeLLFile('EXT:dbal/mod1/locallang.xlf');
$BE_USER->modAccess($MCONF, 1);
diff --git a/typo3/sysext/documentation/Classes/Service/DocumentationService.php b/typo3/sysext/documentation/Classes/Service/DocumentationService.php
index 5705284c417c..f063e8382fbb 100644
--- a/typo3/sysext/documentation/Classes/Service/DocumentationService.php
+++ b/typo3/sysext/documentation/Classes/Service/DocumentationService.php
@@ -93,7 +93,7 @@ class DocumentationService {
* @param string $key
* @param string $version
* @param string $language
- * @return boolean TRUE if fetch succeeded, otherwise FALSE
+ * @return bool TRUE if fetch succeeded, otherwise FALSE
*/
public function fetchNearestDocument($url, $key, $version = 'latest', $language = 'default') {
// In case we could not find a working combination
@@ -151,7 +151,7 @@ class DocumentationService {
* @param string $key
* @param string $version
* @param string $language
- * @return boolean TRUE if fetch succeeded, otherwise FALSE
+ * @return bool TRUE if fetch succeeded, otherwise FALSE
*/
public function fetchDocument($url, $key, $version = 'latest', $language = 'default') {
$result = FALSE;
@@ -265,7 +265,7 @@ class DocumentationService {
* @param string $file path to zip file
* @param string $path path to extract to
* @throws \TYPO3\CMS\Documentation\Exception\Document
- * @return boolean
+ * @return bool
*/
protected function unzipDocumentPackage($file, $path) {
$zip = zip_open($file);
diff --git a/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php b/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
index 8ada6112a731..728b01cf5e52 100644
--- a/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
+++ b/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
@@ -116,7 +116,7 @@ class BackendConfigurationManager extends \TYPO3\CMS\Extbase\Configuration\Abstr
* Returns the page uid of the current page.
* If no page is selected, we'll return the uid of the first root page.
*
- * @return integer current page id. If no page is selected current root page id is returned
+ * @return int current page id. If no page is selected current root page id is returned
*/
protected function getCurrentPageId() {
if ($this->currentPageId !== NULL) {
diff --git a/typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php b/typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php
index 0396b481d51f..7ed5dcce6861 100644
--- a/typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php
+++ b/typo3/sysext/extbase/Classes/Configuration/ConfigurationManager.php
@@ -123,7 +123,7 @@ class ConfigurationManager implements \TYPO3\CMS\Extbase\Configuration\Configura
* Do not use it in your custom code!
*
* @param string $featureName
- * @return boolean
+ * @return bool
*/
public function isFeatureEnabled($featureName) {
$configuration = $this->getConfiguration(self::CONFIGURATION_TYPE_FRAMEWORK);
diff --git a/typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php b/typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php
index e8ea85ca5573..906c65f3150d 100644
--- a/typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php
+++ b/typo3/sysext/extbase/Classes/Configuration/ConfigurationManagerInterface.php
@@ -67,7 +67,7 @@ interface ConfigurationManagerInterface extends \TYPO3\CMS\Core\SingletonInterfa
* Do not use it in your custom code!
*
* @param string $featureName
- * @return boolean
+ * @return bool
*/
public function isFeatureEnabled($featureName);
}
diff --git a/typo3/sysext/extbase/Classes/Core/Bootstrap.php b/typo3/sysext/extbase/Classes/Core/Bootstrap.php
index 8f51ae7b054d..3d7e3af6c412 100644
--- a/typo3/sysext/extbase/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/extbase/Classes/Core/Bootstrap.php
@@ -219,7 +219,7 @@ class Bootstrap implements \TYPO3\CMS\Extbase\Core\BootstrapInterface {
}
/**
- * @return boolean
+ * @return bool
*/
protected function isInCliMode() {
return (defined('TYPO3_cliMode') && TYPO3_cliMode);
diff --git a/typo3/sysext/extbase/Classes/Core/ModuleRunner.php b/typo3/sysext/extbase/Classes/Core/ModuleRunner.php
index ad2e29c96a30..69aeb8ba687c 100644
--- a/typo3/sysext/extbase/Classes/Core/ModuleRunner.php
+++ b/typo3/sysext/extbase/Classes/Core/ModuleRunner.php
@@ -31,7 +31,7 @@ class ModuleRunner implements ModuleRunnerInterface {
*
* @param string $moduleSignature
* @throws \RuntimeException
- * @return boolean TRUE, if the request request could be dispatched
+ * @return bool TRUE, if the request request could be dispatched
* @see run()
*/
public function callModule($moduleSignature) {
diff --git a/typo3/sysext/extbase/Classes/Core/ModuleRunnerInterface.php b/typo3/sysext/extbase/Classes/Core/ModuleRunnerInterface.php
index aa009dc53ceb..9ce8bae94542 100644
--- a/typo3/sysext/extbase/Classes/Core/ModuleRunnerInterface.php
+++ b/typo3/sysext/extbase/Classes/Core/ModuleRunnerInterface.php
@@ -23,7 +23,7 @@ interface ModuleRunnerInterface {
*
* @param string $moduleSignature
* @throws \RuntimeException
- * @return boolean TRUE, if the request request could be dispatched
+ * @return bool TRUE, if the request request could be dispatched
* @see run()
*/
public function callModule($moduleSignature);
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php b/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
index a9c39e5d4922..62011591806b 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/BackendUser.php
@@ -88,7 +88,7 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Checks whether this user is an administrator.
*
- * @return boolean whether this user is an administrator
+ * @return bool whether this user is an administrator
*/
public function getIsAdministrator() {
return $this->isAdministrator;
@@ -107,7 +107,7 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Checks whether this user is disabled.
*
- * @return boolean whether this user is disabled
+ * @return bool whether this user is disabled
*/
public function getIsDisabled() {
return $this->isDisabled;
@@ -203,7 +203,7 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
*
* This function takes the "disabled" flag, the start date/time and the end date/time into account.
*
- * @return boolean whether this user is currently activated
+ * @return bool whether this user is currently activated
*/
public function isActivated() {
return !$this->getIsDisabled() && $this->isActivatedViaStartDateAndTime() && $this->isActivatedViaEndDateAndTime();
@@ -212,7 +212,7 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Checks whether this user is activated as far as the start date and time is concerned.
*
- * @return boolean whether this user is activated as far as the start date and time is concerned
+ * @return bool whether this user is activated as far as the start date and time is concerned
*/
protected function isActivatedViaStartDateAndTime() {
if ($this->getStartDateAndTime() === NULL) {
@@ -225,7 +225,7 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Checks whether this user is activated as far as the end date and time is concerned.
*
- * @return boolean whether this user is activated as far as the end date and time is concerned
+ * @return bool whether this user is activated as far as the end date and time is concerned
*/
protected function isActivatedViaEndDateAndTime() {
if ($this->getEndDateAndTime() === NULL) {
@@ -248,7 +248,7 @@ class BackendUser extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Checks whether the IP lock for this user is disabled.
*
- * @return boolean whether the IP lock for this user is disabled
+ * @return bool whether the IP lock for this user is disabled
*/
public function getIpLockIsDisabled() {
return $this->ipLockIsDisabled;
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php b/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
index 4d55ca6bf14e..ec5ac839a476 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/BackendUserGroup.php
@@ -347,7 +347,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Getter for workspace permission
*
- * @return boolean
+ * @return bool
*/
public function getWorkspacePermission() {
return $this->workspacePermission;
@@ -385,7 +385,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Getter for file operation permissions
*
- * @return integer
+ * @return int
*/
public function getFileOperationPermissions() {
return $this->fileOperationPermissions;
@@ -395,7 +395,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
* Check if file operations like upload, copy, move, delete, rename, new and
* edit files is allowed.
*
- * @return boolean
+ * @return bool
*/
public function isFileOperationAllowed() {
return $this->isPermissionSet(self::FILE_OPPERATIONS);
@@ -414,7 +414,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Check if it is allowed to unzip files.
*
- * @return boolean
+ * @return bool
*/
public function isFileUnzipAllowed() {
return $this->isPermissionSet(self::FILE_UNZIP);
@@ -433,7 +433,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Check if folder operations like move, delete, rename, and new are allowed.
*
- * @return boolean
+ * @return bool
*/
public function isDirectoryOperationAllowed() {
return $this->isPermissionSet(self::DIRECTORY_OPPERATIONS);
@@ -452,7 +452,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Check if it is allowed to copy folders.
*
- * @return boolean
+ * @return bool
*/
public function isDirectoryCopyAllowed() {
return $this->isPermissionSet(self::DIRECTORY_COPY);
@@ -471,7 +471,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Check if it is allowed to remove folders recursively.
*
- * @return boolean
+ * @return bool
*/
public function isDirectoryRemoveRecursivelyAllowed() {
return $this->isPermissionSet(self::DIRECTORY_REMOVE_RECURSIVELY);
@@ -519,7 +519,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Getter for hide in list
*
- * @return boolean
+ * @return bool
*/
public function getHideInList() {
return $this->hideInList;
@@ -547,7 +547,7 @@ class BackendUserGroup extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
* Helper method for checking the permissions bitwise.
*
* @param int $permission
- * @return boolean
+ * @return bool
*/
protected function isPermissionSet($permission) {
return ($this->fileOperationPermissions & $permission) == $permission;
diff --git a/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php b/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
index 95d303c83c3f..d63b912c6bb1 100644
--- a/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
+++ b/typo3/sysext/extbase/Classes/Domain/Model/FileMount.php
@@ -95,7 +95,7 @@ class FileMount extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Getter for the is absolute path of the file mount.
*
- * @return boolean
+ * @return bool
*/
public function getIsAbsolutePath() {
return $this->isAbsolutePath;
diff --git a/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php b/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
index a5d71c307fb8..85f3c895fe85 100644
--- a/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
+++ b/typo3/sysext/extbase/Classes/DomainObject/AbstractDomainObject.php
@@ -74,7 +74,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
/**
* Getter for uid.
*
- * @return integer the uid or NULL if none set yet.
+ * @return int the uid or NULL if none set yet.
*/
public function getUid() {
if ($this->uid !== NULL) {
@@ -101,7 +101,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
/**
* Getter for the pid.
*
- * @return integer The pid or NULL if none set yet.
+ * @return int The pid or NULL if none set yet.
*/
public function getPid() {
if ($this->pid === NULL) {
@@ -116,7 +116,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
*
* @param string $propertyName
* @param mixed $propertyValue
- * @return boolean
+ * @return bool
*/
public function _setProperty($propertyName, $propertyValue) {
if ($this->_hasProperty($propertyName)) {
@@ -155,7 +155,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
* Returns the property value of the given property name. Only for internal use.
*
* @param string $propertyName
- * @return boolean TRUE bool true if the property exists, FALSE if it doesn't exist or NULL in case of an error.
+ * @return bool TRUE bool true if the property exists, FALSE if it doesn't exist or NULL in case of an error.
*/
public function _hasProperty($propertyName) {
return property_exists($this, $propertyName);
@@ -164,7 +164,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
/**
* Returns TRUE if the object is new (the uid was not set, yet). Only for internal use
*
- * @return boolean
+ * @return bool
*/
public function _isNew() {
return $this->uid === NULL;
@@ -243,7 +243,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
*
* @param string $propertyName An optional name of a property to be checked if its value is dirty
* @throws \TYPO3\CMS\Extbase\Persistence\Generic\Exception\TooDirtyException
- * @return boolean
+ * @return bool
*/
public function _isDirty($propertyName = NULL) {
if ($this->uid !== NULL && $this->_getCleanProperty('uid') !== NULL && $this->uid != $this->_getCleanProperty('uid')) {
@@ -269,7 +269,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
*
* @param mixed $previousValue
* @param mixed $currentValue
- * @return boolean
+ * @return bool
*/
protected function isPropertyDirty($previousValue, $currentValue) {
// In case it is an object and it implements the ObjectMonitoringInterface, we call _isDirty() instead of a simple comparison of objects.
@@ -292,7 +292,7 @@ abstract class AbstractDomainObject implements DomainObjectInterface, \TYPO3\CMS
/**
* Returns TRUE if the object has been clonesd, cloned, FALSE otherwise.
*
- * @return boolean TRUE if the object has been cloned
+ * @return bool TRUE if the object has been cloned
*/
public function _isClone() {
return $this->_isClone;
diff --git a/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php b/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
index ab1b11559074..72e794450e60 100644
--- a/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
+++ b/typo3/sysext/extbase/Classes/DomainObject/DomainObjectInterface.php
@@ -26,7 +26,7 @@ interface DomainObjectInterface {
/**
* Getter for uid.
*
- * @return integer The uid or NULL if none set yet.
+ * @return int The uid or NULL if none set yet.
*/
public function getUid();
@@ -41,14 +41,14 @@ interface DomainObjectInterface {
/**
* Getter for the pid.
*
- * @return integer The pid or NULL if none set yet.
+ * @return int The pid or NULL if none set yet.
*/
public function getPid();
/**
* Returns TRUE if the object is new (the uid was not set, yet). Only for internal use
*
- * @return boolean
+ * @return bool
*/
public function _isNew();
diff --git a/typo3/sysext/extbase/Classes/Error/Result.php b/typo3/sysext/extbase/Classes/Error/Result.php
index 305146f10b07..02a54764fa05 100644
--- a/typo3/sysext/extbase/Classes/Error/Result.php
+++ b/typo3/sysext/extbase/Classes/Error/Result.php
@@ -281,7 +281,7 @@ class Result {
/**
* Does the current Result object have Notices, Errors or Warnings? (Recursively)
*
- * @return boolean
+ * @return bool
*/
public function hasMessages() {
return $this->errorsExist || $this->noticesExist || $this->warningsExist;
@@ -309,7 +309,7 @@ class Result {
*
* @param string $propertyName
* @param string $checkerMethodName
- * @return boolean
+ * @return bool
*/
protected function hasProperty($propertyName, $checkerMethodName) {
if (count($this->{$propertyName}) > 0) {
@@ -326,7 +326,7 @@ class Result {
/**
* Does the current Result object have Errors? (Recursively)
*
- * @return boolean
+ * @return bool
* @api
*/
public function hasErrors() {
@@ -336,7 +336,7 @@ class Result {
/**
* Does the current Result object have Warnings? (Recursively)
*
- * @return boolean
+ * @return bool
* @api
*/
public function hasWarnings() {
@@ -346,7 +346,7 @@ class Result {
/**
* Does the current Result object have Notices? (Recursively)
*
- * @return boolean
+ * @return bool
* @api
*/
public function hasNotices() {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/Command.php b/typo3/sysext/extbase/Classes/Mvc/Cli/Command.php
index 0b83e53dc9ec..6398d7f250d4 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/Command.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/Command.php
@@ -151,7 +151,7 @@ class Command {
/**
* Returns TRUE if this command expects required and/or optional arguments, otherwise FALSE
*
- * @return boolean
+ * @return bool
*/
public function hasArguments() {
return count($this->getCommandMethodReflection()->getParameters()) > 0;
@@ -188,7 +188,7 @@ class Command {
* Internall commands are still accessible through the regular command line interface, but should not be used
* by users.
*
- * @return boolean
+ * @return bool
*/
public function isInternal() {
return $this->getCommandMethodReflection()->isTaggedWith('internal');
@@ -199,7 +199,7 @@ class Command {
*
* Note that neither this method nor the @flushesCaches annotation is currently part of the official API.
*
- * @return boolean
+ * @return bool
*/
public function isFlushingCaches() {
return $this->getCommandMethodReflection()->isTaggedWith('flushesCaches');
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/CommandManager.php b/typo3/sysext/extbase/Classes/Mvc/Cli/CommandManager.php
index 28a8158284a6..9b720d7350a0 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/CommandManager.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/CommandManager.php
@@ -146,7 +146,7 @@ class CommandManager implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param Command $command
* @param string $commandIdentifier command identifier in the format foo:bar:baz (all lower case)
- * @return boolean TRUE if the specified command identifier matches this commands identifier
+ * @return bool TRUE if the specified command identifier matches this commands identifier
*/
protected function commandMatchesIdentifier(Command $command, $commandIdentifier) {
$commandIdentifierParts = explode(':', $command->getCommandIdentifier());
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php b/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
index 10d4fcba47b4..e12420220bb2 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/Request.php
@@ -107,7 +107,7 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface {
* The dispatcher will try to dispatch the request again if it has not been
* addressed yet.
*
- * @return boolean TRUE if this request has been disptached successfully
+ * @return bool TRUE if this request has been disptached successfully
*/
public function isDispatched() {
return $this->dispatched;
@@ -223,7 +223,7 @@ class Request implements \TYPO3\CMS\Extbase\Mvc\RequestInterface {
* Checks if an argument of the given name exists (is set)
*
* @param string $argumentName Name of the argument to check
- * @return boolean TRUE if the argument is set, otherwise FALSE
+ * @return bool TRUE if the argument is set, otherwise FALSE
*/
public function hasArgument($argumentName) {
return isset($this->arguments[$argumentName]);
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/RequestHandler.php b/typo3/sysext/extbase/Classes/Mvc/Cli/RequestHandler.php
index 7356f10ca915..71336ad5a3c2 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/RequestHandler.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/RequestHandler.php
@@ -66,7 +66,7 @@ class RequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestHandlerInterface {
/**
* This request handler can handle any command line request.
*
- * @return boolean If the request is a command line request, TRUE otherwise FALSE
+ * @return bool If the request is a command line request, TRUE otherwise FALSE
*/
public function canHandleRequest() {
return $this->environmentService->isEnvironmentInCliMode();
@@ -76,7 +76,7 @@ class RequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestHandlerInterface {
* Returns the priority - how eager the handler is to actually handle the
* request.
*
- * @return integer The priority of the request handler.
+ * @return int The priority of the request handler.
*/
public function getPriority() {
return 100;
diff --git a/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php b/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
index 7969ffad8366..b495e4db53d8 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Cli/Response.php
@@ -43,7 +43,7 @@ class Response extends \TYPO3\CMS\Extbase\Mvc\Response {
/**
* Rets the numerical exit code which should be returned when exiting this application.
*
- * @return integer
+ * @return int
* @api
*/
public function getExitCode() {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
index 3cb10aeee5e5..fd8d5efa27ba 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/AbstractController.php
@@ -178,7 +178,7 @@ abstract class AbstractController implements ControllerInterface {
* method.
*
* @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The current request
- * @return boolean TRUE if this request type is supported, otherwise FALSE
+ * @return bool TRUE if this request type is supported, otherwise FALSE
* @api
*/
public function canProcessRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request) {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php b/typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php
index 370076a33a65..bac72b8ce47d 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/Argument.php
@@ -170,7 +170,7 @@ class Argument {
/**
* Returns TRUE if this argument is required
*
- * @return boolean TRUE if this argument is required
+ * @return bool TRUE if this argument is required
* @api
*/
public function isRequired() {
@@ -272,7 +272,7 @@ class Argument {
}
/**
- * @return boolean TRUE if the argument is valid, FALSE otherwise
+ * @return bool TRUE if the argument is valid, FALSE otherwise
* @api
*/
public function isValid() {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php b/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
index 1518b8d079b6..11e6c7d213b7 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
@@ -92,7 +92,7 @@ class Arguments extends \ArrayObject {
* Returns whether the requested index exists
*
* @param mixed $offset Offset
- * @return boolean
+ * @return bool
*/
public function offsetExists($offset) {
$translatedOffset = $this->translateToLongArgumentName($offset);
@@ -166,7 +166,7 @@ class Arguments extends \ArrayObject {
* Checks if an argument with the specified name exists
*
* @param string $argumentName Name of the argument to check for
- * @return boolean TRUE if such an argument exists, otherwise FALSE
+ * @return bool TRUE if such an argument exists, otherwise FALSE
* @see offsetExists()
*/
public function hasArgument($argumentName) {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
index 472479149166..f2f585cc0ba4 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/CommandController.php
@@ -84,7 +84,7 @@ class CommandController implements CommandControllerInterface {
* Checks if the current request type is supported by the controller.
*
* @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The current request
- * @return boolean TRUE if this request type is supported, otherwise FALSE
+ * @return bool TRUE if this request type is supported, otherwise FALSE
*/
public function canProcessRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request) {
return $request instanceof \TYPO3\CMS\Extbase\Mvc\Cli\Request;
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerInterface.php b/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerInterface.php
index 56f3c430f952..e9c8c2f92886 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerInterface.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/ControllerInterface.php
@@ -24,7 +24,7 @@ interface ControllerInterface {
* Checks if the current request type is supported by the controller.
*
* @param \TYPO3\CMS\Extbase\Mvc\RequestInterface $request The current request
- * @return boolean TRUE if this request type is supported, otherwise FALSE
+ * @return bool TRUE if this request type is supported, otherwise FALSE
* @api
*/
public function canProcessRequest(\TYPO3\CMS\Extbase\Mvc\RequestInterface $request);
diff --git a/typo3/sysext/extbase/Classes/Mvc/Request.php b/typo3/sysext/extbase/Classes/Mvc/Request.php
index 02f7f639c312..510cb0f784ba 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Request.php
@@ -129,7 +129,7 @@ class Request implements RequestInterface {
* The dispatcher will try to dispatch the request again if it has not been
* addressed yet.
*
- * @return boolean TRUE if this request has been disptached sucessfully
+ * @return bool TRUE if this request has been disptached sucessfully
* @api
*/
public function isDispatched() {
@@ -465,7 +465,7 @@ class Request implements RequestInterface {
*
* @param string $argumentName Name of the argument to check
*
- * @return boolean TRUE if the argument is set, otherwise FALSE
+ * @return bool TRUE if the argument is set, otherwise FALSE
* @api
*/
public function hasArgument($argumentName) {
diff --git a/typo3/sysext/extbase/Classes/Mvc/RequestHandlerInterface.php b/typo3/sysext/extbase/Classes/Mvc/RequestHandlerInterface.php
index 45fc1c011abe..200f9288fac2 100644
--- a/typo3/sysext/extbase/Classes/Mvc/RequestHandlerInterface.php
+++ b/typo3/sysext/extbase/Classes/Mvc/RequestHandlerInterface.php
@@ -31,7 +31,7 @@ interface RequestHandlerInterface {
/**
* Checks if the request handler can handle the current request.
*
- * @return boolean TRUE if it can handle the request, otherwise FALSE
+ * @return bool TRUE if it can handle the request, otherwise FALSE
* @api
*/
public function canHandleRequest();
@@ -41,7 +41,7 @@ interface RequestHandlerInterface {
* request. An integer > 0 means "I want to handle this request" where
* "100" is default. "0" means "I am a fallback solution".
*
- * @return integer The priority of the request handler
+ * @return int The priority of the request handler
* @api
*/
public function getPriority();
diff --git a/typo3/sysext/extbase/Classes/Mvc/RequestInterface.php b/typo3/sysext/extbase/Classes/Mvc/RequestInterface.php
index 46b6ae7c7e02..2ac3b3349a5d 100644
--- a/typo3/sysext/extbase/Classes/Mvc/RequestInterface.php
+++ b/typo3/sysext/extbase/Classes/Mvc/RequestInterface.php
@@ -36,7 +36,7 @@ interface RequestInterface {
* The dispatcher will try to dispatch the request again if it has not been
* addressed yet.
*
- * @return boolean TRUE if this request has been disptached successfully
+ * @return bool TRUE if this request has been disptached successfully
* @api
*/
public function isDispatched();
@@ -85,7 +85,7 @@ interface RequestInterface {
* Checks if an argument of the given name exists (is set)
*
* @param string $argumentName Name of the argument to check
- * @return boolean TRUE if the argument is set, otherwise FALSE
+ * @return bool TRUE if the argument is set, otherwise FALSE
* @api
*/
public function hasArgument($argumentName);
diff --git a/typo3/sysext/extbase/Classes/Mvc/View/AbstractView.php b/typo3/sysext/extbase/Classes/Mvc/View/AbstractView.php
index adbb24e65d4b..499833295a3d 100644
--- a/typo3/sysext/extbase/Classes/Mvc/View/AbstractView.php
+++ b/typo3/sysext/extbase/Classes/Mvc/View/AbstractView.php
@@ -79,7 +79,7 @@ abstract class AbstractView implements \TYPO3\CMS\Extbase\Mvc\View\ViewInterface
* contexts. Override this method if that is not the case.
*
* @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext
- * @return boolean TRUE if the view has something useful to display, otherwise FALSE
+ * @return bool TRUE if the view has something useful to display, otherwise FALSE
* @api
*/
public function canRender(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext) {
diff --git a/typo3/sysext/extbase/Classes/Mvc/View/EmptyView.php b/typo3/sysext/extbase/Classes/Mvc/View/EmptyView.php
index e95aaa969c7b..605276d09994 100644
--- a/typo3/sysext/extbase/Classes/Mvc/View/EmptyView.php
+++ b/typo3/sysext/extbase/Classes/Mvc/View/EmptyView.php
@@ -56,7 +56,7 @@ class EmptyView implements \TYPO3\CMS\Extbase\Mvc\View\ViewInterface {
* This view can be used in any case.
*
* @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext
- * @return boolean TRUE
+ * @return bool TRUE
* @api
*/
public function canRender(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext) {
diff --git a/typo3/sysext/extbase/Classes/Mvc/View/ViewInterface.php b/typo3/sysext/extbase/Classes/Mvc/View/ViewInterface.php
index fd560585dc1e..bc90f77eb7db 100644
--- a/typo3/sysext/extbase/Classes/Mvc/View/ViewInterface.php
+++ b/typo3/sysext/extbase/Classes/Mvc/View/ViewInterface.php
@@ -52,7 +52,7 @@ interface ViewInterface {
* Tells if the view implementation can render the view for the given context.
*
* @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext
- * @return boolean TRUE if the view has something useful to display, otherwise FALSE
+ * @return bool TRUE if the view has something useful to display, otherwise FALSE
* @api
*/
public function canRender(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext);
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/AbstractRequestHandler.php b/typo3/sysext/extbase/Classes/Mvc/Web/AbstractRequestHandler.php
index 0871d24a699c..7dae13dc5f2b 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/AbstractRequestHandler.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/AbstractRequestHandler.php
@@ -45,7 +45,7 @@ abstract class AbstractRequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestH
/**
* This request handler can handle any web request.
*
- * @return boolean If the request is a web request, TRUE otherwise FALSE
+ * @return bool If the request is a web request, TRUE otherwise FALSE
*/
public function canHandleRequest() {
return TRUE;
@@ -55,7 +55,7 @@ abstract class AbstractRequestHandler implements \TYPO3\CMS\Extbase\Mvc\RequestH
* Returns the priority - how eager the handler is to actually handle the
* request.
*
- * @return integer The priority of the request handler.
+ * @return int The priority of the request handler.
*/
public function getPriority() {
return 100;
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/BackendRequestHandler.php b/typo3/sysext/extbase/Classes/Mvc/Web/BackendRequestHandler.php
index e70d6eec0476..9469b3c734c8 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/BackendRequestHandler.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/BackendRequestHandler.php
@@ -34,7 +34,7 @@ class BackendRequestHandler extends AbstractRequestHandler {
/**
* This request handler can handle a web request invoked by the backend.
*
- * @return boolean If we are in backend mode TRUE otherwise FALSE
+ * @return bool If we are in backend mode TRUE otherwise FALSE
*/
public function canHandleRequest() {
return $this->environmentService->isEnvironmentInBackendMode() && !$this->environmentService->isEnvironmentInCliMode();
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/FrontendRequestHandler.php b/typo3/sysext/extbase/Classes/Mvc/Web/FrontendRequestHandler.php
index 86a035263457..c6c859a8c4ba 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/FrontendRequestHandler.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/FrontendRequestHandler.php
@@ -57,7 +57,7 @@ class FrontendRequestHandler extends AbstractRequestHandler {
/**
* This request handler can handle any web request.
*
- * @return boolean If the request is a web request, TRUE otherwise FALSE
+ * @return bool If the request is a web request, TRUE otherwise FALSE
*/
public function canHandleRequest() {
return $this->environmentService->isEnvironmentInFrontendMode();
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Request.php b/typo3/sysext/extbase/Classes/Mvc/Web/Request.php
index cb5927ff961d..f472b0918922 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Request.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Request.php
@@ -144,7 +144,7 @@ class Request extends \TYPO3\CMS\Extbase\Mvc\Request {
* Return whether the current request is a cached request or not.
*
* @api (v4 only)
- * @return boolean the caching status.
+ * @return bool the caching status.
*/
public function isCached() {
return $this->isCached;
diff --git a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
index b51ae959bfd7..1e59b7a6e2c3 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Web/Routing/UriBuilder.php
@@ -231,7 +231,7 @@ class UriBuilder {
}
/**
- * @return boolean
+ * @return bool
* @api
*/
public function getCreateAbsoluteUri() {
@@ -270,7 +270,7 @@ class UriBuilder {
}
/**
- * @return boolean
+ * @return bool
* @api
*/
public function getAddQueryString() {
@@ -353,7 +353,7 @@ class UriBuilder {
}
/**
- * @return boolean
+ * @return bool
* @api
*/
public function getLinkAccessRestrictedPages() {
@@ -375,7 +375,7 @@ class UriBuilder {
/**
* returns $this->targetPageUid.
*
- * @return integer
+ * @return int
* @api
*/
public function getTargetPageUid() {
@@ -395,7 +395,7 @@ class UriBuilder {
}
/**
- * @return integer
+ * @return int
*/
public function getTargetPageType() {
return $this->targetPageType;
@@ -415,7 +415,7 @@ class UriBuilder {
}
/**
- * @return boolean
+ * @return bool
* @api
*/
public function getNoCache() {
@@ -436,7 +436,7 @@ class UriBuilder {
}
/**
- * @return boolean
+ * @return bool
* @api
*/
public function getUseCacheHash() {
diff --git a/typo3/sysext/extbase/Classes/Object/Container/ClassInfo.php b/typo3/sysext/extbase/Classes/Object/Container/ClassInfo.php
index 19a1b4af4554..81481fbfbadc 100644
--- a/typo3/sysext/extbase/Classes/Object/Container/ClassInfo.php
+++ b/typo3/sysext/extbase/Classes/Object/Container/ClassInfo.php
@@ -129,7 +129,7 @@ class ClassInfo {
/**
* Asserts if the class is a singleton or not.
*
- * @return boolean
+ * @return bool
*/
public function getIsSingleton() {
return $this->isSingleton;
@@ -138,7 +138,7 @@ class ClassInfo {
/**
* Asserts if the class is initializeable with initializeObject.
*
- * @return boolean
+ * @return bool
*/
public function getIsInitializeable() {
return $this->isInitializeable;
@@ -147,14 +147,14 @@ class ClassInfo {
/**
* Asserts if the class has Dependency Injection methods
*
- * @return boolean
+ * @return bool
*/
public function hasInjectMethods() {
return count($this->injectMethods) > 0;
}
/**
- * @return boolean
+ * @return bool
*/
public function hasInjectProperties() {
return count($this->injectProperties) > 0;
diff --git a/typo3/sysext/extbase/Classes/Object/Container/ClassInfoCache.php b/typo3/sysext/extbase/Classes/Object/Container/ClassInfoCache.php
index 7bd3789150d4..3f9d88ae6041 100644
--- a/typo3/sysext/extbase/Classes/Object/Container/ClassInfoCache.php
+++ b/typo3/sysext/extbase/Classes/Object/Container/ClassInfoCache.php
@@ -41,7 +41,7 @@ class ClassInfoCache {
* checks if cacheentry exists for id
*
* @param string $id
- * @return boolean
+ * @return bool
*/
public function has($id) {
return isset($this->level1Cache[$id]) || $this->level2Cache->has($id);
diff --git a/typo3/sysext/extbase/Classes/Object/Container/ClassInfoFactory.php b/typo3/sysext/extbase/Classes/Object/Container/ClassInfoFactory.php
index b37e3ab33234..897c08d33a31 100644
--- a/typo3/sysext/extbase/Classes/Object/Container/ClassInfoFactory.php
+++ b/typo3/sysext/extbase/Classes/Object/Container/ClassInfoFactory.php
@@ -126,7 +126,7 @@ class ClassInfoFactory {
* This method checks if given method can be used for injection
*
* @param string $methodName
- * @return boolean
+ * @return bool
*/
private function isNameOfInjectMethod($methodName) {
if (
@@ -143,7 +143,7 @@ class ClassInfoFactory {
* This method is used to determine if a class is a singleton or not.
*
* @param string $classname
- * @return boolean
+ * @return bool
*/
private function getIsSingleton($classname) {
return in_array('TYPO3\\CMS\\Core\\SingletonInterface', class_implements($classname));
@@ -154,7 +154,7 @@ class ClassInfoFactory {
* method initializeObject.
*
* @param string $classname
- * @return boolean
+ * @return bool
*/
private function getIsInitializeable($classname) {
return method_exists($classname, 'initializeObject');
diff --git a/typo3/sysext/extbase/Classes/Object/Container/Container.php b/typo3/sysext/extbase/Classes/Object/Container/Container.php
index ce3359e8917b..062fe7da59f7 100644
--- a/typo3/sysext/extbase/Classes/Object/Container/Container.php
+++ b/typo3/sysext/extbase/Classes/Object/Container/Container.php
@@ -317,7 +317,7 @@ class Container implements \TYPO3\CMS\Core\SingletonInterface {
/**
* @param string $className
*
- * @return boolean
+ * @return bool
*/
public function isSingleton($className) {
return $this->getClassInfo($className)->getIsSingleton();
@@ -326,7 +326,7 @@ class Container implements \TYPO3\CMS\Core\SingletonInterface {
/**
* @param string $className
*
- * @return boolean
+ * @return bool
*/
public function isPrototype($className) {
return !$this->isSingleton($className);
diff --git a/typo3/sysext/extbase/Classes/Object/ObjectManager.php b/typo3/sysext/extbase/Classes/Object/ObjectManager.php
index 9892b1e06161..acc6b32e94fd 100644
--- a/typo3/sysext/extbase/Classes/Object/ObjectManager.php
+++ b/typo3/sysext/extbase/Classes/Object/ObjectManager.php
@@ -71,7 +71,7 @@ class ObjectManager implements ObjectManagerInterface {
* Returns TRUE if an object with the given name is registered
*
* @param string $objectName Name of the object
- * @return boolean TRUE if the object has been registered, otherwise FALSE
+ * @return bool TRUE if the object has been registered, otherwise FALSE
*/
public function isRegistered($objectName) {
return class_exists($objectName, TRUE);
@@ -100,7 +100,7 @@ class ObjectManager implements ObjectManagerInterface {
* Returns the scope of the specified object.
*
* @param string $objectName The object name
- * @return integer One of the Container::SCOPE_ constants
+ * @return int One of the Container::SCOPE_ constants
* @throws \TYPO3\CMS\Extbase\Object\Container\Exception\UnknownObjectException
* @api
*/
diff --git a/typo3/sysext/extbase/Classes/Object/ObjectManagerException.php b/typo3/sysext/extbase/Classes/Object/ObjectManagerException.php
index 033927068c4c..381d83e57baf 100644
--- a/typo3/sysext/extbase/Classes/Object/ObjectManagerException.php
+++ b/typo3/sysext/extbase/Classes/Object/ObjectManagerException.php
@@ -68,7 +68,7 @@ class ObjectManagerException implements \TYPO3\CMS\Extbase\Object\ObjectManagerI
* Returns TRUE if an object with the given name is registered
*
* @param string $objectName Name of the object
- * @return boolean TRUE if the object has been registered, otherwise FALSE
+ * @return bool TRUE if the object has been registered, otherwise FALSE
*/
public function isRegistered($objectName) {
return class_exists($objectName, TRUE);
diff --git a/typo3/sysext/extbase/Classes/Object/ObjectManagerInterface.php b/typo3/sysext/extbase/Classes/Object/ObjectManagerInterface.php
index 8b67704b05dc..a9be27d5f203 100644
--- a/typo3/sysext/extbase/Classes/Object/ObjectManagerInterface.php
+++ b/typo3/sysext/extbase/Classes/Object/ObjectManagerInterface.php
@@ -22,7 +22,7 @@ interface ObjectManagerInterface extends \TYPO3\CMS\Core\SingletonInterface {
* Returns TRUE if an object with the given name is registered
*
* @param string $objectName Name of the object
- * @return boolean TRUE if the object has been registered, otherwise FALSE
+ * @return bool TRUE if the object has been registered, otherwise FALSE
*/
public function isRegistered($objectName);
@@ -62,7 +62,7 @@ interface ObjectManagerInterface extends \TYPO3\CMS\Core\SingletonInterface {
* Returns the scope of the specified object.
*
* @param string $objectName The object name
- * @return integer One of the Container::SCOPE_ constants
+ * @return int One of the Container::SCOPE_ constants
*/
public function getScope($objectName);
}
diff --git a/typo3/sysext/extbase/Classes/Object/ObjectManagerInterfaceException.php b/typo3/sysext/extbase/Classes/Object/ObjectManagerInterfaceException.php
index af18a0de006f..b3d347d1cf61 100644
--- a/typo3/sysext/extbase/Classes/Object/ObjectManagerInterfaceException.php
+++ b/typo3/sysext/extbase/Classes/Object/ObjectManagerInterfaceException.php
@@ -22,7 +22,7 @@ interface ObjectManagerInterfaceException extends \TYPO3\CMS\Core\SingletonInter
* Returns TRUE if an object with the given name is registered
*
* @param string $objectName Name of the object
- * @return boolean TRUE if the object has been registered, otherwise FALSE
+ * @return bool TRUE if the object has been registered, otherwise FALSE
*/
public function isRegistered($objectName);
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
index 47dd9476978f..68ebf10b7aa1 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Backend.php
@@ -156,7 +156,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
* Returns the number of records matching the query.
*
* @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
- * @return integer
+ * @return int
* @api
*/
public function getObjectCountByQuery(\TYPO3\CMS\Extbase\Persistence\QueryInterface $query) {
@@ -240,7 +240,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
* Checks if the given object has ever been persisted.
*
* @param object $object The object to check
- * @return boolean TRUE if the object is new, FALSE if the object exists in the repository
+ * @return bool TRUE if the object is new, FALSE if the object exists in the repository
*/
public function isNewObject($object) {
return $this->getIdentifierByObject($object) === NULL;
@@ -401,7 +401,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
* Checks, if the property value is lazy loaded and was not initialized
*
* @param mixed $propertyValue The property value
- * @return boolean
+ * @return bool
*/
protected function propertyValueIsLazyLoaded($propertyValue) {
if ($propertyValue instanceof \TYPO3\CMS\Extbase\Persistence\Generic\LazyLoadingProxy) {
@@ -688,7 +688,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
* @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject The parent object
* @param string $propertyName The name of the parent object's property where the related objects are stored in
* @param int $sortingPosition Defaults to NULL
- * @return integer The uid of the inserted row
+ * @return int The uid of the inserted row
*/
protected function insertRelationInRelationtable(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $propertyName, $sortingPosition = NULL) {
$dataMap = $this->dataMapper->getDataMap(get_class($parentObject));
@@ -770,7 +770,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
* @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $relatedObject The related object
* @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject The parent object
* @param string $parentPropertyName The name of the parent object's property where the related objects are stored in
- * @return boolean
+ * @return bool
*/
protected function deleteRelationFromRelationtable(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $relatedObject, \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $parentObject, $parentPropertyName) {
$dataMap = $this->dataMapper->getDataMap(get_class($parentObject));
@@ -847,7 +847,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
*
* @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object The object to be updated
* @param array $row Row to be stored
- * @return boolean
+ * @return bool
*/
protected function updateObject(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object, array $row) {
$dataMap = $this->dataMapper->getDataMap(get_class($object));
@@ -1014,7 +1014,7 @@ class Backend implements \TYPO3\CMS\Extbase\Persistence\Generic\BackendInterface
* - If there is no such TypoScript configuration, it uses the first value of The "storagePid" taken for reading records.
*
* @param \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object
- * @return integer the storage Page ID where the object should be stored
+ * @return int the storage Page ID where the object should be stored
*/
protected function determineStoragePageIdForNewRecord(\TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object = NULL) {
$frameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK);
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php b/typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php
index 2c9a174c1a9a..68efd3a2f8e8 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/BackendInterface.php
@@ -83,7 +83,7 @@ interface BackendInterface {
* Checks if the given object has ever been persisted.
*
* @param object $object The object to check
- * @return boolean TRUE if the object is new, FALSE if the object exists in the repository
+ * @return bool TRUE if the object is new, FALSE if the object exists in the repository
*/
public function isNewObject($object);
@@ -91,7 +91,7 @@ interface BackendInterface {
* Returns the number of records matching the query.
*
* @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
- * @return integer
+ * @return int
* @api
*/
public function getObjectCountByQuery(\TYPO3\CMS\Extbase\Persistence\QueryInterface $query);
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/IdentityMap.php b/typo3/sysext/extbase/Classes/Persistence/Generic/IdentityMap.php
index 9508f52b65bc..7a2924fbb6d1 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/IdentityMap.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/IdentityMap.php
@@ -33,7 +33,7 @@ class IdentityMap implements \TYPO3\CMS\Core\SingletonInterface {
* Checks whether the given object is known to the identity map
*
* @param object $object
- * @return boolean
+ * @return bool
* @deprecated since 6.1, will be removed two versions later, use the persistence session instead
*/
public function hasObject($object) {
@@ -45,7 +45,7 @@ class IdentityMap implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $uuid
* @param string $className
- * @return boolean
+ * @return bool
* @deprecated since 6.1, will be removed two versions later, use the persistence session instead
*/
public function hasIdentifier($uuid, $className) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
index 4ab1207a3f84..515959cb1e93 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
@@ -121,7 +121,7 @@ class LazyLoadingProxy implements \Iterator, \TYPO3\CMS\Extbase\Persistence\Gene
* Magic isset call implementation.
*
* @param string $propertyName The name of the property to check
- * @return boolean
+ * @return bool
*/
public function __isset($propertyName) {
$realInstance = $this->_loadRealInstance();
@@ -162,7 +162,7 @@ class LazyLoadingProxy implements \Iterator, \TYPO3\CMS\Extbase\Persistence\Gene
/**
* Returns the current key storage array
*
- * @return integer
+ * @return int
*/
public function key() {
$realInstance = $this->_loadRealInstance();
@@ -192,7 +192,7 @@ class LazyLoadingProxy implements \Iterator, \TYPO3\CMS\Extbase\Persistence\Gene
/**
* Checks if the array pointer of the storage points to a valid position
*
- * @return boolean
+ * @return bool
*/
public function valid() {
return $this->current() !== FALSE;
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
index 4ba522f469a9..ec03d742f7e0 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
@@ -64,7 +64,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
/**
* Returns the state of the initialization
*
- * @return boolean
+ * @return bool
*/
public function isInitialized() {
return $this->isInitialized;
@@ -104,7 +104,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
}
/**
- * @return boolean
+ * @return bool
*/
protected function isStorageAlreadyMemorizedInParentCleanState() {
return $this->parentObject->_getCleanProperty($this->propertyName) === $this;
@@ -134,7 +134,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
/**
* @param object $object The object to look for.
- * @return boolean
+ * @return bool
*
* @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::contains
*/
@@ -147,7 +147,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
* Counts the elements in the storage array
*
* @throws Exception
- * @return integer The number of elements in the ObjectStorage
+ * @return int The number of elements in the ObjectStorage
*/
public function count() {
$columnMap = $this->dataMapper->getDataMap(get_class($this->parentObject))->getColumnMap($this->propertyName);
@@ -204,7 +204,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
/**
* @param object $object The object to look for.
- * @return boolean
+ * @return bool
*
* @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::offsetExists
*/
@@ -266,7 +266,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
}
/**
- * @return boolean
+ * @return bool
*
* @see \TYPO3\CMS\Extbase\Persistence\ObjectStorage::valid
*/
@@ -287,7 +287,7 @@ class LazyObjectStorage extends \TYPO3\CMS\Extbase\Persistence\ObjectStorage imp
/**
* @param mixed $object
- * @return integer|NULL
+ * @return int|NULL
*/
public function getPosition($object) {
$this->initialize();
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php
index 2b0084ac3fa1..89f5a19c246c 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMap.php
@@ -238,7 +238,7 @@ class DataMap {
* Returns TRUE if the property is persistable (configured in $TCA)
*
* @param string $propertyName The property name
- * @return boolean TRUE if the property is persistable (configured in $TCA)
+ * @return bool TRUE if the property is persistable (configured in $TCA)
*/
public function isPersistableProperty($propertyName) {
return isset($this->columnMaps[$propertyName]);
@@ -480,7 +480,7 @@ class DataMap {
}
/**
- * @return boolean
+ * @return bool
*/
public function getIsStatic() {
return $this->isStatic;
@@ -494,7 +494,7 @@ class DataMap {
}
/**
- * @return boolean
+ * @return bool
*/
public function getRootLevel() {
return $this->rootLevel;
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
index eee8eb1c34d8..b52f70a803f0 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Mapper/DataMapper.php
@@ -455,7 +455,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param DomainObjectInterface $parentObject
* @param string $propertyName
- * @return boolean TRUE if the property is mapped
+ * @return bool TRUE if the property is mapped
*/
protected function propertyMapsByForeignKey(DomainObjectInterface $parentObject, $propertyName) {
$columnMap = $this->getDataMap(get_class($parentObject))->getColumnMap($propertyName);
@@ -509,7 +509,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
* @param DomainObjectInterface $parentObject The object instance this proxy is part of
* @param string $propertyName The name of the proxied property in it's parent
* @param mixed $fieldValue The raw field value.
- * @return integer
+ * @return int
*/
public function countRelated(DomainObjectInterface $parentObject, $propertyName, $fieldValue = '') {
$query = $this->getPreparedQuery($parentObject, $propertyName, $fieldValue);
@@ -522,7 +522,7 @@ class DataMapper implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $className The property name
* @param string $propertyName The property name
- * @return boolean TRUE if the property is persistable (configured in $TCA)
+ * @return bool TRUE if the property is persistable (configured in $TCA)
*/
public function isPersistableProperty($className, $propertyName) {
$dataMap = $this->getDataMap($className);
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php b/typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
index 423d47d30b18..4f38c835dbd8 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
@@ -84,7 +84,7 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
* Returns the number of records matching the query.
*
* @param QueryInterface $query
- * @return integer
+ * @return int
* @api
*/
public function getObjectCountByQuery(QueryInterface $query) {
@@ -255,7 +255,7 @@ class PersistenceManager implements \TYPO3\CMS\Extbase\Persistence\PersistenceMa
* Checks if the given object has ever been persisted.
*
* @param object $object The object to check
- * @return boolean TRUE if the object is new, FALSE if the object exists in the persistence session
+ * @return bool TRUE if the object is new, FALSE if the object exists in the persistence session
* @api
*/
public function isNewObject($object) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/PropertyType.php b/typo3/sysext/extbase/Classes/Persistence/Generic/PropertyType.php
index d95d47f9520c..a9e2a9b1ac4e 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/PropertyType.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/PropertyType.php
@@ -264,7 +264,7 @@ class PropertyType {
* Returns the numeric constant value of the type with the specified name.
*
* @param string $name The name of the property type
- * @return integer The numeric constant value
+ * @return int The numeric constant value
*/
static public function valueFromName($name) {
switch ($name) {
@@ -320,7 +320,7 @@ class PropertyType {
* name as returned by gettype().
*
* @param string $type
- * @return integer
+ * @return int
*/
static public function valueFromType($type) {
switch (strtolower($type)) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
index 070faee68046..d1e1a795d905 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
@@ -267,7 +267,7 @@ class Query implements QueryInterface {
/**
* Returns the maximum size of the result set to limit.
*
- * @return integer
+ * @return int
* @api
*/
public function getLimit() {
@@ -294,7 +294,7 @@ class Query implements QueryInterface {
/**
* Returns the start offset of the result set.
*
- * @return integer
+ * @return int
* @api
*/
public function getOffset() {
@@ -546,7 +546,7 @@ class Query implements QueryInterface {
/**
* Returns the query result count.
*
- * @return integer The query result count
+ * @return int The query result count
* @api
*/
public function count() {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php b/typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php
index 2e03b63cc5dc..fad437fa7e5e 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/QueryResult.php
@@ -100,7 +100,7 @@ class QueryResult implements QueryResultInterface {
/**
* Returns the number of objects in the result
*
- * @return integer The number of matching objects
+ * @return int The number of matching objects
* @api
*/
public function count() {
@@ -127,7 +127,7 @@ class QueryResult implements QueryResultInterface {
* but it isn't very useful as the offset has to be an integer
*
* @param mixed $offset
- * @return boolean
+ * @return bool
* @see ArrayAccess::offsetExists()
*/
public function offsetExists($offset) {
@@ -207,7 +207,7 @@ class QueryResult implements QueryResultInterface {
}
/**
- * @return boolean
+ * @return bool
* @see Iterator::valid()
*/
public function valid() {
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php b/typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php
index 3f32608dc520..3b07a1010705 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/QuerySettingsInterface.php
@@ -30,7 +30,7 @@ interface QuerySettingsInterface {
/**
* Returns the state, if the storage page should be respected for the query.
*
- * @return boolean TRUE, if the storage page should be respected; otherwise FALSE.
+ * @return bool TRUE, if the storage page should be respected; otherwise FALSE.
*/
public function getRespectStoragePage();
@@ -62,7 +62,7 @@ interface QuerySettingsInterface {
/**
* Returns the state, if a and language overlay should be performed.
*
- * @return boolean TRUE, if a and language overlay should be performed; otherwise FALSE.
+ * @return bool TRUE, if a and language overlay should be performed; otherwise FALSE.
*/
public function getRespectSysLanguage();
@@ -98,7 +98,7 @@ interface QuerySettingsInterface {
public function setLanguageUid($languageUid);
/**
- * @return integer
+ * @return int
*/
public function getLanguageUid();
@@ -120,7 +120,7 @@ interface QuerySettingsInterface {
* If TRUE, all enable fields are ignored. If--in addition to this--enableFieldsToBeIgnored is set, only fields specified there are ignored.
* If FALSE, all enable fields are taken into account, regardless of the enableFieldsToBeIgnored setting.
*
- * @return boolean
+ * @return bool
* @see getEnableFieldsToBeIgnored()
*/
public function getIgnoreEnableFields();
@@ -158,7 +158,7 @@ interface QuerySettingsInterface {
/**
* Returns if the query should return objects that are deleted.
*
- * @return boolean
+ * @return bool
*/
public function getIncludeDeleted();
@@ -174,7 +174,7 @@ interface QuerySettingsInterface {
/**
* Returns the state, if the QueryResult should be returned unmapped.
*
- * @return boolean TRUE, if the QueryResult should be returned unmapped; otherwise FALSE.
+ * @return bool TRUE, if the QueryResult should be returned unmapped; otherwise FALSE.
* @deprecated since Extbase 6.2, will be removed two versions later
*/
public function getReturnRawQueryResult();
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Session.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Session.php
index 11ccedddd189..b128725d429f 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Session.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Session.php
@@ -113,7 +113,7 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface {
* Tells whether the given object is a reconstituted entity.
*
* @param object $entity
- * @return boolean
+ * @return bool
*/
public function isReconstitutedEntity($entity) {
return $this->reconstitutedEntities->contains($entity);
@@ -125,7 +125,7 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface {
* Checks whether the given object is known to the identity map
*
* @param object $object
- * @return boolean
+ * @return bool
* @api
*/
public function hasObject($object) {
@@ -137,7 +137,7 @@ class Session implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $identifier
* @param string $className
- * @return boolean
+ * @return bool
*/
public function hasIdentifier($identifier, $className) {
return isset($this->identifierMap[strtolower($className)][$identifier]);
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/BackendInterface.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/BackendInterface.php
index 0dd3ff5cc193..24b629c4d7fa 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/BackendInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/BackendInterface.php
@@ -24,7 +24,7 @@ interface BackendInterface {
* @param string $tableName The database table name
* @param array $fieldValues The fieldValues to insert
* @param bool $isRelation TRUE if we are currently inserting into a relation table, FALSE by default
- * @return integer the UID of the inserted row
+ * @return int the UID of the inserted row
*/
public function addRow($tableName, array $fieldValues, $isRelation = FALSE);
@@ -43,7 +43,7 @@ interface BackendInterface {
*
* @param string $tableName The database relation table name
* @param array $fieldValues The fieldValues to be updated
- * @return boolean
+ * @return bool
*/
public function updateRelationTableRow($tableName, array $fieldValues);
@@ -71,7 +71,7 @@ interface BackendInterface {
* Returns the number of items matching the query.
*
* @param \TYPO3\CMS\Extbase\Persistence\QueryInterface $query
- * @return integer
+ * @return int
* @api
*/
public function getObjectCountByQuery(\TYPO3\CMS\Extbase\Persistence\QueryInterface $query);
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
index 9c9fa0f9be9d..3c52e61e456e 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbBackend.php
@@ -120,7 +120,7 @@ class Typo3DbBackend implements BackendInterface, \TYPO3\CMS\Core\SingletonInter
* @param string $tableName The database table name
* @param array $fieldValues The row to be inserted
* @param bool $isRelation TRUE if we are currently inserting into a relation table, FALSE by default
- * @return integer The uid of the inserted row
+ * @return int The uid of the inserted row
*/
public function addRow($tableName, array $fieldValues, $isRelation = FALSE) {
if (isset($fieldValues['uid'])) {
@@ -431,7 +431,7 @@ class Typo3DbBackend implements BackendInterface, \TYPO3\CMS\Core\SingletonInter
*
* @param QueryInterface $query
* @throws Exception\BadConstraintException
- * @return integer The number of matching tuples
+ * @return int The number of matching tuples
*/
public function getObjectCountByQuery(QueryInterface $query) {
if ($query->getConstraint() instanceof Qom\Statement) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php b/typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php
index 81f844e02a8b..81562d9d1633 100644
--- a/typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/ObjectMonitoringInterface.php
@@ -32,7 +32,7 @@ interface ObjectMonitoringInterface {
/**
* Returns TRUE if the properties were modified after reconstitution
*
- * @return boolean
+ * @return bool
*/
public function _isDirty();
}
diff --git a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
index 830d821e55ad..7c3fc380fbc1 100644
--- a/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/ObjectStorage.php
@@ -90,7 +90,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
/**
* Checks if the array pointer of the storage points to a valid position.
*
- * @return boolean
+ * @return bool
*/
public function valid() {
return current($this->storage) !== FALSE;
@@ -129,7 +129,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
/**
* Returns the number of objects in the storage.
*
- * @return integer The number of objects in the storage.
+ * @return int The number of objects in the storage.
*/
public function count() {
return count($this->storage);
@@ -154,7 +154,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
* Checks whether an object exists in the storage.
*
* @param object $object The object to look for.
- * @return boolean
+ * @return bool
*/
public function offsetExists($object) {
return isset($this->storage[spl_object_hash($object)]);
@@ -192,7 +192,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
* Checks if the storage contains a specific object.
*
* @param object $object The object to look for.
- * @return boolean
+ * @return bool
*/
public function contains($object) {
return $this->offsetExists($object);
@@ -312,7 +312,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
/**
* Returns TRUE if the storage was modified after reconstitution.
*
- * @return boolean
+ * @return bool
*/
public function _isDirty() {
return $this->isModified;
@@ -322,7 +322,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
* Returns TRUE if an object is added, then removed and added at a different position
*
* @param mixed $object
- * @return boolean
+ * @return bool
*/
public function isRelationDirty($object) {
return (isset($this->addedObjectsPositions[spl_object_hash($object)])
@@ -332,7 +332,7 @@ class ObjectStorage implements \Countable, \Iterator, \ArrayAccess, ObjectMonito
/**
* @param mixed $object
- * @return integer|NULL
+ * @return int|NULL
*/
public function getPosition($object) {
if (!isset($this->addedObjectsPositions[spl_object_hash($object)])) {
diff --git a/typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php b/typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php
index 26adce3b95a2..9e15699d9c9c 100644
--- a/typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/PersistenceManagerInterface.php
@@ -41,7 +41,7 @@ interface PersistenceManagerInterface {
* Checks if the given object has ever been persisted.
*
* @param object $object The object to check
- * @return boolean TRUE if the object is new, FALSE if the object exists in the repository
+ * @return bool TRUE if the object is new, FALSE if the object exists in the repository
* @api
*/
public function isNewObject($object);
@@ -78,7 +78,7 @@ interface PersistenceManagerInterface {
* Returns the number of records matching the query.
*
* @param QueryInterface $query
- * @return integer
+ * @return int
* @deprecated since Extbase 6.0, will be removed in Extbase 7.0. It is deprecated only in the interface to be more
* in sync with Flow in future and will stay in Generic Persistence.
* @api
diff --git a/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php b/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
index 760022d89769..e4eb9da79710 100644
--- a/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/QueryInterface.php
@@ -339,7 +339,7 @@ interface QueryInterface {
/**
* Returns the query result count.
*
- * @return integer The query result count
+ * @return int The query result count
* @api
*/
public function count();
@@ -359,7 +359,7 @@ interface QueryInterface {
/**
* Returns the maximum size of the result set to limit.
*
- * @return integer
+ * @return int
* @api
*/
public function getLimit();
@@ -367,7 +367,7 @@ interface QueryInterface {
/**
* Returns the start offset of the result set.
*
- * @return integer
+ * @return int
* @api
*/
public function getOffset();
@@ -385,7 +385,7 @@ interface QueryInterface {
* It matches if the multivalued property contains no values or is NULL.
*
* @param string $propertyName The name of the multivalued property to compare against
- * @return boolean
+ * @return bool
* @throws \TYPO3\CMS\Extbase\Persistence\Exception\InvalidQueryException if used on a single-valued property
* @api
*/
diff --git a/typo3/sysext/extbase/Classes/Persistence/Repository.php b/typo3/sysext/extbase/Classes/Persistence/Repository.php
index 3078307bc3b8..c2d781c60f58 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Repository.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Repository.php
@@ -149,7 +149,7 @@ class Repository implements RepositoryInterface, \TYPO3\CMS\Core\SingletonInterf
/**
* Returns the total number objects of this repository.
*
- * @return integer The object count
+ * @return int The object count
* @api
*/
public function countAll() {
diff --git a/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php b/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
index bbe5b19d2ad8..d42dbc7f6e91 100644
--- a/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
+++ b/typo3/sysext/extbase/Classes/Persistence/RepositoryInterface.php
@@ -57,7 +57,7 @@ interface RepositoryInterface {
/**
* Returns the total number objects of this repository.
*
- * @return integer The object count
+ * @return int The object count
* @api
*/
public function countAll();
diff --git a/typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php b/typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
index ae69ba4bb055..260be4e6885c 100644
--- a/typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
+++ b/typo3/sysext/extbase/Classes/Property/PropertyMappingConfiguration.php
@@ -108,7 +108,7 @@ class PropertyMappingConfiguration implements PropertyMappingConfigurationInterf
* - else, return FALSE.
*
* @param string $propertyName
- * @return boolean TRUE if the given propertyName should be mapped, FALSE otherwise.
+ * @return bool TRUE if the given propertyName should be mapped, FALSE otherwise.
* @api
*/
public function shouldMap($propertyName) {
@@ -131,7 +131,7 @@ class PropertyMappingConfiguration implements PropertyMappingConfigurationInterf
* Check if the given $propertyName should be skipped during mapping.
*
* @param string $propertyName
- * @return boolean
+ * @return bool
* @api
*/
public function shouldSkip($propertyName) {
@@ -215,7 +215,7 @@ class PropertyMappingConfiguration implements PropertyMappingConfigurationInterf
* Whether unknown (unconfigured) properties should be skipped during
* mapping, instead if causing an error.
*
- * @return boolean
+ * @return bool
* @api
*/
public function shouldSkipUnknownProperties() {
diff --git a/typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationInterface.php b/typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationInterface.php
index ed43ad23dae1..5e7674b05654 100644
--- a/typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationInterface.php
+++ b/typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationInterface.php
@@ -32,7 +32,7 @@ interface PropertyMappingConfigurationInterface {
* returns TRUE if the given propertyName should be mapped, FALSE otherwise.
*
* @param string $propertyName
- * @return boolean
+ * @return bool
* @api
*/
public function shouldSkip($propertyName);
@@ -41,7 +41,7 @@ interface PropertyMappingConfigurationInterface {
* Whether unknown (unconfigured) properties should be skipped during
* mapping, instead if causing an error.
*
- * @return boolean
+ * @return bool
* @api
*/
public function shouldSkipUnknownProperties();
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php
index 41be4c39b249..a70645901c7c 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractTypeConverter.php
@@ -100,7 +100,7 @@ abstract class AbstractTypeConverter implements \TYPO3\CMS\Extbase\Property\Type
/**
* Return the priority of this TypeConverter. TypeConverters with a high priority are chosen before low priority.
*
- * @return integer
+ * @return int
* @api
*/
public function getPriority() {
@@ -112,7 +112,7 @@ abstract class AbstractTypeConverter implements \TYPO3\CMS\Extbase\Property\Type
*
* @param mixed $source the source data
* @param string $targetType the type to convert to.
- * @return boolean TRUE if this TypeConverter can convert from $source to $targetType, FALSE otherwise.
+ * @return bool TRUE if this TypeConverter can convert from $source to $targetType, FALSE otherwise.
* @api
*/
public function canConvertFrom($source, $targetType) {
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/ArrayConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/ArrayConverter.php
index 897047d596bf..a28f7bb30c40 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/ArrayConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/ArrayConverter.php
@@ -47,7 +47,7 @@ class ArrayConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\AbstractT
*
* @param mixed $source
* @param string $targetType
- * @return boolean
+ * @return bool
*/
public function canConvertFrom($source, $targetType) {
return is_string($source) && $source === '' || is_array($source);
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/BooleanConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/BooleanConverter.php
index 71601cb74bba..7dd98031c271 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/BooleanConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/BooleanConverter.php
@@ -49,7 +49,7 @@ class BooleanConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstrac
* @param string $targetType
* @param array $convertedChildProperties
* @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration
- * @return boolean
+ * @return bool
* @api
*/
public function convertFrom($source, $targetType, array $convertedChildProperties = array(), \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration = NULL) {
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/CoreTypeConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/CoreTypeConverter.php
index a274c0f2d1b3..5d193d131018 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/CoreTypeConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/CoreTypeConverter.php
@@ -49,7 +49,7 @@ class CoreTypeConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstra
/**
* @param mixed $source
* @param string $targetType
- * @return boolean
+ * @return bool
*/
public function canConvertFrom($source, $targetType) {
return TypeHandlingUtility::isCoreType($targetType);
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
index 8b88d50442ab..640e302f1c18 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/DateTimeConverter.php
@@ -95,7 +95,7 @@ class DateTimeConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstra
*
* @param string $source
* @param string $targetType
- * @return boolean
+ * @return bool
*/
public function canConvertFrom($source, $targetType) {
if (!is_callable(array($targetType, 'createFromFormat'))) {
@@ -172,7 +172,7 @@ class DateTimeConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstra
* Returns whether date information (day, month, year) are present as keys in $source.
*
* @param array $source
- * @return boolean
+ * @return bool
*/
protected function isDatePartKeysProvided(array $source) {
return isset($source['day']) && ctype_digit($source['day'])
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
index bead3cbd8b4d..885a2ec08ed9 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/IntegerConverter.php
@@ -49,7 +49,7 @@ class IntegerConverter extends \TYPO3\CMS\Extbase\Property\TypeConverter\Abstrac
* @param string $targetType
* @param array $convertedChildProperties
* @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration
- * @return integer|\TYPO3\CMS\Extbase\Error\Error
+ * @return int|\TYPO3\CMS\Extbase\Error\Error
* @api
*/
public function convertFrom($source, $targetType, array $convertedChildProperties = array(), \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration = NULL) {
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php
index eb78ab9bc64f..0a8f88678557 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectConverter.php
@@ -75,7 +75,7 @@ class ObjectConverter extends AbstractTypeConverter implements \TYPO3\CMS\Core\S
*
* @param mixed $source
* @param string $targetType
- * @return boolean
+ * @return bool
*/
public function canConvertFrom($source, $targetType) {
return !is_subclass_of($targetType, 'TYPO3\\CMS\\Extbase\\DomainObject\\AbstractDomainObject');
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/PersistentObjectConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/PersistentObjectConverter.php
index 93e11754d68f..87268a8c3b47 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/PersistentObjectConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/PersistentObjectConverter.php
@@ -72,7 +72,7 @@ class PersistentObjectConverter extends ObjectConverter {
*
* @param mixed $source
* @param string $targetType
- * @return boolean
+ * @return bool
*/
public function canConvertFrom($source, $targetType) {
return is_subclass_of($targetType, 'TYPO3\\CMS\\Extbase\\DomainObject\\AbstractDomainObject');
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverterInterface.php b/typo3/sysext/extbase/Classes/Property/TypeConverterInterface.php
index ac018524305e..2b214e18f239 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverterInterface.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverterInterface.php
@@ -61,7 +61,7 @@ interface TypeConverterInterface {
/**
* Return the priority of this TypeConverter. TypeConverters with a high priority are chosen before low priority.
*
- * @return integer
+ * @return int
* @api
*/
public function getPriority();
@@ -72,7 +72,7 @@ interface TypeConverterInterface {
*
* @param mixed $source the source data
* @param string $targetType the type to convert to.
- * @return boolean TRUE if this TypeConverter can convert from $source to $targetType, FALSE otherwise.
+ * @return bool TRUE if this TypeConverter can convert from $source to $targetType, FALSE otherwise.
* @api
*/
public function canConvertFrom($source, $targetType);
diff --git a/typo3/sysext/extbase/Classes/Reflection/ClassReflection.php b/typo3/sysext/extbase/Classes/Reflection/ClassReflection.php
index 91e019d05fca..1b4b0db98ec6 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ClassReflection.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ClassReflection.php
@@ -133,7 +133,7 @@ class ClassReflection extends \ReflectionClass {
* the specified tag
*
* @param string $tag Tag name to check for
- * @return boolean TRUE if such a tag has been defined, otherwise FALSE
+ * @return bool TRUE if such a tag has been defined, otherwise FALSE
*/
public function isTaggedWith($tag) {
$result = $this->getDocCommentParser()->isTaggedWith($tag);
diff --git a/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php b/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
index 24d6793a585a..8454c85cedf1 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ClassSchema.php
@@ -145,7 +145,7 @@ class ClassSchema {
/**
* Returns the model type of the class this schema is referring to.
*
- * @return integer The model type, one of the MODELTYPE_* constants.
+ * @return int The model type, one of the MODELTYPE_* constants.
*/
public function getModelType() {
return $this->modelType;
@@ -166,7 +166,7 @@ class ClassSchema {
* Whether the class is an aggregate root and therefore accessible through
* a repository.
*
- * @return boolean TRUE if it is managed
+ * @return bool TRUE if it is managed
*/
public function isAggregateRoot() {
return $this->aggregateRoot;
@@ -176,7 +176,7 @@ class ClassSchema {
* If the class schema has a certain property.
*
* @param string $propertyName Name of the property
- * @return boolean
+ * @return bool
*/
public function hasProperty($propertyName) {
return array_key_exists($propertyName, $this->properties);
diff --git a/typo3/sysext/extbase/Classes/Reflection/DocCommentParser.php b/typo3/sysext/extbase/Classes/Reflection/DocCommentParser.php
index 22e6d7cbf88b..2af47433fa72 100644
--- a/typo3/sysext/extbase/Classes/Reflection/DocCommentParser.php
+++ b/typo3/sysext/extbase/Classes/Reflection/DocCommentParser.php
@@ -79,7 +79,7 @@ class DocCommentParser {
* Checks if a tag with the given name exists
*
* @param string $tagName The tag name to check for
- * @return boolean TRUE the tag exists, otherwise FALSE
+ * @return bool TRUE the tag exists, otherwise FALSE
*/
public function isTaggedWith($tagName) {
return isset($this->tags[$tagName]);
diff --git a/typo3/sysext/extbase/Classes/Reflection/MethodReflection.php b/typo3/sysext/extbase/Classes/Reflection/MethodReflection.php
index 528adf3f44ed..6923dffd9b7c 100644
--- a/typo3/sysext/extbase/Classes/Reflection/MethodReflection.php
+++ b/typo3/sysext/extbase/Classes/Reflection/MethodReflection.php
@@ -52,7 +52,7 @@ class MethodReflection extends \ReflectionMethod {
* the specified tag
*
* @param string $tag Tag name to check for
- * @return boolean TRUE if such a tag has been defined, otherwise FALSE
+ * @return bool TRUE if such a tag has been defined, otherwise FALSE
*/
public function isTaggedWith($tag) {
$result = $this->getDocCommentParser()->isTaggedWith($tag);
diff --git a/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php b/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php
index c83354187875..11afa43c8cc6 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ObjectAccess.php
@@ -175,7 +175,7 @@ class ObjectAccess {
* @param bool $forceDirectAccess directly access property using reflection(!)
*
* @throws \InvalidArgumentException in case $object was not an object or $propertyName was not a string
- * @return boolean TRUE if the property could be set, FALSE otherwise
+ * @return bool TRUE if the property could be set, FALSE otherwise
*/
static public function setProperty(&$subject, $propertyName, $propertyValue, $forceDirectAccess = FALSE) {
if (is_array($subject)) {
@@ -282,7 +282,7 @@ class ObjectAccess {
* @param string $propertyName Name of the property to check
*
* @throws \InvalidArgumentException
- * @return boolean
+ * @return bool
*/
static public function isPropertySettable($object, $propertyName) {
if (!is_object($object)) {
@@ -303,7 +303,7 @@ class ObjectAccess {
* @param string $propertyName Name of the property to check
*
* @throws \InvalidArgumentException
- * @return boolean
+ * @return bool
*/
static public function isPropertyGettable($object, $propertyName) {
if (!is_object($object)) {
diff --git a/typo3/sysext/extbase/Classes/Reflection/PropertyReflection.php b/typo3/sysext/extbase/Classes/Reflection/PropertyReflection.php
index dffbd41c928e..330ee2293585 100644
--- a/typo3/sysext/extbase/Classes/Reflection/PropertyReflection.php
+++ b/typo3/sysext/extbase/Classes/Reflection/PropertyReflection.php
@@ -28,7 +28,7 @@ class PropertyReflection extends \ReflectionProperty {
* the specified tag
*
* @param string $tag Tag name to check for
- * @return boolean TRUE if such a tag has been defined, otherwise FALSE
+ * @return bool TRUE if such a tag has been defined, otherwise FALSE
*/
public function isTaggedWith($tag) {
$result = $this->getDocCommentParser()->isTaggedWith($tag);
diff --git a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
index edcbecff1bfe..e9726c205826 100644
--- a/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
+++ b/typo3/sysext/extbase/Classes/Reflection/ReflectionService.php
@@ -173,7 +173,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Returns whether the Reflection Service is initialized.
*
- * @return boolean true if the Reflection Service is initialized, otherwise false
+ * @return bool true if the Reflection Service is initialized, otherwise false
*/
public function isInitialized() {
return $this->initialized;
@@ -257,7 +257,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $className Name of the class containing the method
* @param string $methodName Name of the method
- * @return boolean
+ * @return bool
*/
public function hasMethod($className, $methodName) {
try {
@@ -351,7 +351,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
* reflection information is available.
*
* @param string $className Name of the class
- * @return boolean If the class is reflected by this service
+ * @return bool If the class is reflected by this service
*/
public function isClassReflected($className) {
return isset($this->reflectedClassNames[$className]);
@@ -362,7 +362,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $className Name of the class
* @param string $tag Tag to check for
- * @return boolean TRUE if the class is tagged with $tag, otherwise FALSE
+ * @return bool TRUE if the class is tagged with $tag, otherwise FALSE
*/
public function isClassTaggedWith($className, $tag) {
if ($this->initialized === FALSE) {
@@ -383,7 +383,7 @@ class ReflectionService implements \TYPO3\CMS\Core\SingletonInterface {
* @param string $className Name of the class
* @param string $propertyName Name of the property
* @param string $tag Tag to check for
- * @return boolean TRUE if the class property is tagged with $tag, otherwise FALSE
+ * @return bool TRUE if the class property is tagged with $tag, otherwise FALSE
*/
public function isPropertyTaggedWith($className, $propertyName, $tag) {
if (!isset($this->reflectedClassNames[$className])) {
diff --git a/typo3/sysext/extbase/Classes/Scheduler/FieldProvider.php b/typo3/sysext/extbase/Classes/Scheduler/FieldProvider.php
index 2f8d5a70b385..125b0ee78d60 100644
--- a/typo3/sysext/extbase/Classes/Scheduler/FieldProvider.php
+++ b/typo3/sysext/extbase/Classes/Scheduler/FieldProvider.php
@@ -82,7 +82,7 @@ class FieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInter
*
* @param array &$submittedData
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule
- * @return boolean
+ * @return bool
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule) {
return TRUE;
@@ -93,7 +93,7 @@ class FieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldProviderInter
*
* @param array $submittedData
* @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task
- * @return boolean
+ * @return bool
*/
public function saveAdditionalFields(array $submittedData, \TYPO3\CMS\Scheduler\Task\AbstractTask $task) {
$task->setCommandIdentifier($submittedData['task_extbase']['action']);
diff --git a/typo3/sysext/extbase/Classes/Scheduler/Task.php b/typo3/sysext/extbase/Classes/Scheduler/Task.php
index 6fbd16c3e1c2..527808d170b7 100644
--- a/typo3/sysext/extbase/Classes/Scheduler/Task.php
+++ b/typo3/sysext/extbase/Classes/Scheduler/Task.php
@@ -85,7 +85,7 @@ class Task extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Function execute from the Scheduler
*
- * @return boolean TRUE on successful execution, FALSE on error
+ * @return bool TRUE on successful execution, FALSE on error
*/
public function execute() {
try {
diff --git a/typo3/sysext/extbase/Classes/Security/Cryptography/HashService.php b/typo3/sysext/extbase/Classes/Security/Cryptography/HashService.php
index e479d9c53908..02b4cc0babfd 100644
--- a/typo3/sysext/extbase/Classes/Security/Cryptography/HashService.php
+++ b/typo3/sysext/extbase/Classes/Security/Cryptography/HashService.php
@@ -58,7 +58,7 @@ class HashService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $string The string which should be validated
* @param string $hmac The hash of the string
- * @return boolean TRUE if string and hash fit together, FALSE otherwise.
+ * @return bool TRUE if string and hash fit together, FALSE otherwise.
*/
public function validateHmac($string, $hmac) {
return $this->generateHmac($string) === $hmac;
diff --git a/typo3/sysext/extbase/Classes/Service/EnvironmentService.php b/typo3/sysext/extbase/Classes/Service/EnvironmentService.php
index 6f090467db06..3e8dab958f54 100644
--- a/typo3/sysext/extbase/Classes/Service/EnvironmentService.php
+++ b/typo3/sysext/extbase/Classes/Service/EnvironmentService.php
@@ -21,7 +21,7 @@ class EnvironmentService implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Detects if TYPO3_MODE is defined and its value is "FE"
*
- * @return boolean
+ * @return bool
*/
public function isEnvironmentInFrontendMode() {
return (defined('TYPO3_MODE') && TYPO3_MODE === 'FE') ?: FALSE;
@@ -30,7 +30,7 @@ class EnvironmentService implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Detects if TYPO3_MODE is defined and its value is "BE"
*
- * @return boolean
+ * @return bool
*/
public function isEnvironmentInBackendMode() {
return (defined('TYPO3_MODE') && TYPO3_MODE === 'BE') ?: FALSE;
@@ -39,7 +39,7 @@ class EnvironmentService implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Detects if we are running a script from the command line.
*
- * @return boolean
+ * @return bool
*/
public function isEnvironmentInCliMode() {
return $this->isEnvironmentInBackendMode() && defined('TYPO3_cliMode') && TYPO3_cliMode === TRUE;
diff --git a/typo3/sysext/extbase/Classes/Service/ExtensionService.php b/typo3/sysext/extbase/Classes/Service/ExtensionService.php
index 6cff82b8bd7e..2a32b637c443 100644
--- a/typo3/sysext/extbase/Classes/Service/ExtensionService.php
+++ b/typo3/sysext/extbase/Classes/Service/ExtensionService.php
@@ -109,7 +109,7 @@ class ExtensionService implements \TYPO3\CMS\Core\SingletonInterface {
* @param string $pluginName Name of the target plugin
* @param string $controllerName Name of the target controller
* @param string $actionName Name of the action to be called
- * @return boolean TRUE if the specified plugin action is cacheable, otherwise FALSE
+ * @return bool TRUE if the specified plugin action is cacheable, otherwise FALSE
*/
public function isActionCacheable($extensionName, $pluginName, $controllerName, $actionName) {
$frameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK, $extensionName, $pluginName);
@@ -129,7 +129,7 @@ class ExtensionService implements \TYPO3\CMS\Core\SingletonInterface {
* @param string $extensionName name of the extension to retrieve the target PID for
* @param string $pluginName name of the plugin to retrieve the target PID for
* @throws \TYPO3\CMS\Extbase\Exception
- * @return integer uid of the target page or NULL if target page could not be determined
+ * @return int uid of the target page or NULL if target page could not be determined
*/
public function getTargetPidByPlugin($extensionName, $pluginName) {
$frameworkConfiguration = $this->configurationManager->getConfiguration(\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK, $extensionName, $pluginName);
@@ -187,7 +187,7 @@ class ExtensionService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $extensionName name of the extension that has defined the target page type
* @param string $format The format for which to look up the page type
- * @return integer Page type number for target page
+ * @return int Page type number for target page
*/
public function getTargetPageTypeByFormat($extensionName, $format) {
$targetPageType = 0;
diff --git a/typo3/sysext/extbase/Classes/Utility/ArrayUtility.php b/typo3/sysext/extbase/Classes/Utility/ArrayUtility.php
index 59433f0e18c1..779b4869982d 100644
--- a/typo3/sysext/extbase/Classes/Utility/ArrayUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/ArrayUtility.php
@@ -123,7 +123,7 @@ class ArrayUtility {
* Returns TRUE if the given array contains elements of varying types
*
* @param array $array
- * @return boolean
+ * @return bool
* @api
*/
static public function containsMultipleTypes(array $array) {
@@ -245,7 +245,7 @@ class ArrayUtility {
*
* @param array &$array the array to sort
* @param int $sortFlags may be used to modify the sorting behavior using these values (see http://www.php.net/manual/en/function.sort.php)
- * @return boolean TRUE on success, FALSE on failure
+ * @return bool TRUE on success, FALSE on failure
* @see asort()
* @api
*/
diff --git a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
index 51ba12be9d0c..a6664415521b 100644
--- a/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/DebuggerUtility.php
@@ -187,7 +187,7 @@ class DebuggerUtility {
* Checks if a given object or property should be excluded/filtered
*
* @param object $value An ReflectionProperty or other Object
- * @return boolean TRUE if the given object should be filtered
+ * @return bool TRUE if the given object should be filtered
*/
static protected function isBlacklisted($value) {
$result = FALSE;
@@ -203,7 +203,7 @@ class DebuggerUtility {
* Checks if a given object was already rendered.
*
* @param object $object
- * @return boolean TRUE if the given object was already rendered
+ * @return bool TRUE if the given object was already rendered
*/
static protected function isAlreadyRendered($object) {
return self::$renderedObjects->contains($object);
diff --git a/typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php b/typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php
index 9845062ee900..9d22593bccba 100644
--- a/typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php
+++ b/typo3/sysext/extbase/Classes/Utility/TypeHandlingUtility.php
@@ -87,7 +87,7 @@ class TypeHandlingUtility {
* Returns TRUE if the $type is a literal.
*
* @param string $type
- * @return boolean
+ * @return bool
*/
static public function isLiteral($type) {
return preg_match(self::LITERAL_TYPE_PATTERN, $type) === 1;
@@ -97,7 +97,7 @@ class TypeHandlingUtility {
* Returns TRUE if the $type is a simple type.
*
* @param string $type
- * @return boolean
+ * @return bool
*/
static public function isSimpleType($type) {
return in_array(self::normalizeType($type), array('array', 'string', 'float', 'integer', 'boolean'), TRUE);
@@ -117,7 +117,7 @@ class TypeHandlingUtility {
* Returns TRUE if the $type is a collection type.
*
* @param string $type
- * @return boolean
+ * @return bool
*/
static public function isCollectionType($type) {
if (in_array($type, self::$collectionTypes, TRUE)) {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
index 4145413c2613..4820fae6bc41 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractCompositeValidator.php
@@ -112,7 +112,7 @@ abstract class AbstractCompositeValidator implements ObjectValidatorInterface, \
/**
* Returns the number of validators contained in this conjunction.
*
- * @return integer The number of validators
+ * @return int The number of validators
* @api
*/
public function count() {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
index 7b45a218e9b9..5e63d3bfb5e2 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/AbstractValidator.php
@@ -133,7 +133,7 @@ abstract class AbstractValidator implements ValidatorInterface {
/**
* @param mixed $value
- * @return boolean TRUE if the given $value is NULL or an empty string ('')
+ * @return bool TRUE if the given $value is NULL or an empty string ('')
*/
final protected function isEmpty($value) {
return $value === NULL || $value === '';
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/BooleanValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/BooleanValidator.php
index 46c4ae60a1e2..0e48210b772a 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/BooleanValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/BooleanValidator.php
@@ -40,7 +40,7 @@ class BooleanValidator extends AbstractValidator {
* tests and actual usage. This makes the validator loose but still keeping functionality.
*
* @param mixed $value The value that should be validated
- * @return boolean TRUE if the value is within the range, otherwise FALSE
+ * @return bool TRUE if the value is within the range, otherwise FALSE
*/
public function isValid($value) {
// see comment above, check if expectation is NULL, then nothing to do!
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php
index 56b802024c43..88e510aa9a3d 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/DateTimeValidator.php
@@ -27,7 +27,7 @@ class DateTimeValidator extends AbstractValidator {
* If at least one error occurred, the result is FALSE.
*
* @param mixed $value The value that should be validated
- * @return boolean TRUE if the value is valid, FALSE if an error occurred
+ * @return bool TRUE if the value is valid, FALSE if an error occurred
*/
public function isValid($value) {
$this->result->clear();
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
index 8927260e0a6c..f62436269f44 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/EmailAddressValidator.php
@@ -42,7 +42,7 @@ class EmailAddressValidator extends AbstractValidator {
* Checking syntax of input email address
*
* @param string $emailAddress Input string to evaluate
- * @return boolean Returns TRUE if the $email address (input string) is valid
+ * @return bool Returns TRUE if the $email address (input string) is valid
*/
protected function validEmail($emailAddress) {
return \TYPO3\CMS\Core\Utility\GeneralUtility::validEmail($emailAddress);
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
index b8dc2a5ac59b..6a98d0a049e8 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
@@ -112,7 +112,7 @@ class GenericObjectValidator extends AbstractValidator implements ObjectValidato
* Checks the given object can be validated by the validator implementation
*
* @param object $object The object to be checked
- * @return boolean TRUE if the given value is an object
+ * @return bool TRUE if the given value is an object
* @api
*/
public function canValidate($object) {
@@ -136,7 +136,7 @@ class GenericObjectValidator extends AbstractValidator implements ObjectValidato
/**
* @param object $object
- * @return boolean
+ * @return bool
*/
protected function isValidatedAlready($object) {
if ($this->validatedInstancesContainer === NULL) {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
index e94d42861941..e853a54d9797 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/NotEmptyValidator.php
@@ -35,7 +35,7 @@ class NotEmptyValidator extends AbstractValidator {
* If at least one error occurred, the result is FALSE.
*
* @param mixed $value The value that should be validated
- * @return boolean TRUE if the value is valid, FALSE if an error occurred
+ * @return bool TRUE if the value is valid, FALSE if an error occurred
*/
public function isValid($value) {
if ($value === NULL) {
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php
index 7711c3bc257b..b548b53ca928 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/NumberValidator.php
@@ -27,7 +27,7 @@ class NumberValidator extends AbstractValidator {
* If at least one error occurred, the result is FALSE.
*
* @param mixed $value The value that should be validated
- * @return boolean TRUE if the value is valid, FALSE if an error occurred
+ * @return bool TRUE if the value is valid, FALSE if an error occurred
*/
public function isValid($value) {
if (!is_numeric($value)) {
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/ArrayAccessClass.php b/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/ArrayAccessClass.php
index 8009e5db1f55..207784543452 100644
--- a/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/ArrayAccessClass.php
+++ b/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/ArrayAccessClass.php
@@ -31,7 +31,7 @@ class ArrayAccessClass implements \ArrayAccess {
/**
* @param mixed $offset
- * @return boolean
+ * @return bool
*/
public function offsetExists($offset) {
return array_key_exists($offset, $this->array);
diff --git a/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithGettersAndSetters.php b/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithGettersAndSetters.php
index 05e72baa1157..ce0b32ed6131 100644
--- a/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithGettersAndSetters.php
+++ b/typo3/sysext/extbase/Tests/Unit/Reflection/Fixture/DummyClassWithGettersAndSetters.php
@@ -93,7 +93,7 @@ class DummyClassWithGettersAndSetters {
}
/**
- * @return boolean
+ * @return bool
*/
public function isBooleanProperty() {
return $this->booleanProperty;
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
index 38a413a1a824..d4b671cc18cf 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/ConfigurationItem.php
@@ -194,7 +194,7 @@ class ConfigurationItem extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getHighlight() {
return $this->highlight;
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
index 2b49b09ce2ae..5eee1cb4bc4e 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
@@ -195,7 +195,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getCategory() {
return $this->category;
@@ -219,7 +219,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
* Fallback to 4 - 'misc' in case string is not found or integer ist out of range.
*
* @param string|int $category Category string or integer
- * @return integer Valid category index
+ * @return int Valid category index
*/
public function getCategoryIndexFromStringOrNumber($category) {
$categoryIndex = 4;
@@ -291,7 +291,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getState() {
return $this->state;
@@ -398,7 +398,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return boolean
+ * @return bool
*/
public function getCurrentVersion() {
return $this->currentVersion;
@@ -517,7 +517,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getIntegerVersion() {
return $this->integerVersion;
@@ -532,7 +532,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getReviewState() {
return $this->reviewState;
@@ -547,7 +547,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getPosition() {
return $this->position;
@@ -561,7 +561,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer
+ * @return int
*/
public function getAlldownloadcounter() {
return $this->alldownloadcounter;
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
index 2854e595e440..f3283e18703b 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Mirrors.php
@@ -99,7 +99,7 @@ class Mirrors extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
*
* @access public
* @return array multidimensional array with mirrors and their properties
- * @see $mirrors, setMirrors()
+ * @see $mirrors, setMirrors()
*/
public function getMirrors() {
return $this->mirrors;
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php
index 0a31b67d789e..5fa7479c9e4b 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Repository.php
@@ -196,7 +196,7 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
* Method returns extension count
*
* @access public
- * @return integer count of read extensions
+ * @return int count of read extensions
*/
public function getExtensionCount() {
return $this->extensionCount;
@@ -232,7 +232,7 @@ class Repository extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
* object has been registered to this repository.
*
* @access public
- * @return boolean TRUE, if a repository mirrors object has been registered, otherwise FALSE
+ * @return bool TRUE, if a repository mirrors object has been registered, otherwise FALSE
* @see $mirrors, addMirrors(), getMirrors(), removeMirrors()
*/
public function hasMirrors() {
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
index b364ddcc93c5..5f837a997206 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
@@ -61,7 +61,7 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
/**
* Count all extensions
*
- * @return integer
+ * @return int
*/
public function countAll() {
$query = $this->createQuery();
@@ -249,7 +249,7 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
* @param string $extensionKey
* @param int $lowestVersion
* @param int $highestVersion
- * @return integer
+ * @return int
*/
public function countByVersionRangeAndExtensionKey($extensionKey, $lowestVersion = 0, $highestVersion = 0) {
return $this->findByVersionRangeAndExtensionKeyOrderedByVersion($extensionKey, $lowestVersion, $highestVersion)->count();
diff --git a/typo3/sysext/extensionmanager/Classes/Task/UpdateExtensionListTask.php b/typo3/sysext/extensionmanager/Classes/Task/UpdateExtensionListTask.php
index 06bb264c47b8..c9be1ca3a307 100644
--- a/typo3/sysext/extensionmanager/Classes/Task/UpdateExtensionListTask.php
+++ b/typo3/sysext/extensionmanager/Classes/Task/UpdateExtensionListTask.php
@@ -24,7 +24,7 @@ class UpdateExtensionListTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Public method, called by scheduler.
*
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function execute() {
// Throws exceptions if something went wrong
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
index df5033ced0be..8010b7259185 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/DependencyUtility.php
@@ -165,7 +165,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param Dependency $dependency
* @throws Exception\UnresolvedTypo3DependencyException
- * @return boolean
+ * @return bool
*/
protected function checkTypo3Dependency(Dependency $dependency) {
$lowerCaseIdentifier = strtolower($dependency->getIdentifier());
@@ -196,7 +196,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param Dependency $dependency
* @throws Exception\UnresolvedPhpDependencyException
- * @return boolean
+ * @return bool
*/
protected function checkPhpDependency(Dependency $dependency) {
$lowerCaseIdentifier = strtolower($dependency->getIdentifier());
@@ -232,7 +232,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
* @todo handle exceptions / markForUpload
* @param Dependency $dependency
* @throws Exception\MissingVersionDependencyException
- * @return boolean
+ * @return bool
*/
protected function checkExtensionDependency(Dependency $dependency) {
$extensionKey = $dependency->getIdentifier();
@@ -286,7 +286,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
* (the local extension storage)
*
* @param string $extensionKey
- * @return boolean
+ * @return bool
*/
protected function getExtensionFromInExtensionRepository($extensionKey) {
if ($this->localExtensionStorage !== '' && is_dir($this->localExtensionStorage)) {
@@ -351,7 +351,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
/**
* @param string $extensionKey
- * @return boolean
+ * @return bool
*/
protected function isDependentExtensionLoaded($extensionKey) {
return ExtensionManagementUtility::isLoaded($extensionKey);
@@ -359,7 +359,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
/**
* @param Dependency $dependency
- * @return boolean
+ * @return bool
*/
protected function isLoadedVersionCompatible(Dependency $dependency) {
$extensionVersion = ExtensionManagementUtility::getExtensionVersion($dependency->getIdentifier());
@@ -369,7 +369,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
/**
* @param string $version
* @param Dependency $dependency
- * @return boolean
+ * @return bool
*/
protected function isVersionCompatible($version, Dependency $dependency) {
if (!($dependency->getLowestVersion() === '') && version_compare($version, $dependency->getLowestVersion()) === -1) {
@@ -386,7 +386,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
* (not necessarily installed, but present in system)
*
* @param string $extensionKey
- * @return boolean
+ * @return bool
*/
protected function isDependentExtensionAvailable($extensionKey) {
$this->setAvailableExtensions();
@@ -397,7 +397,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
* Checks whether the available version is compatible
*
* @param Dependency $dependency
- * @return boolean
+ * @return bool
*/
protected function isAvailableVersionCompatible(Dependency $dependency) {
$this->setAvailableExtensions();
@@ -409,7 +409,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
* Checks whether a ter extension with $extensionKey exists
*
* @param string $extensionKey
- * @return boolean
+ * @return bool
*/
protected function isExtensionDownloadableFromTer($extensionKey) {
return $this->extensionRepository->countByExtensionKey($extensionKey) > 0;
@@ -419,7 +419,7 @@ class DependencyUtility implements \TYPO3\CMS\Core\SingletonInterface {
* Checks whether a compatible version of the extension exists in TER
*
* @param Dependency $dependency
- * @return boolean
+ * @return bool
*/
protected function isDownloadableVersionCompatible(Dependency $dependency) {
$versions = $this->getLowestAndHighestIntegerVersions($dependency);
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
index 31c8c3931be6..25cb7862e66c 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/FileHandlingUtility.php
@@ -216,7 +216,7 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface {
* Wrapper method for directory existance check
*
* @param string $directory
- * @return boolean
+ * @return bool
*/
protected function directoryExists($directory) {
return is_dir($directory);
@@ -294,7 +294,7 @@ class FileHandlingUtility implements \TYPO3\CMS\Core\SingletonInterface {
* Is the given path a valid path for extension installation
*
* @param string $path the absolute (!) path in question
- * @return boolean
+ * @return bool
*/
public function isValidExtensionPath($path) {
$allowedPaths = Extension::returnAllowedInstallPaths();
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
index 3a4abb588bd1..cd6e8df43e5b 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Importer/ExtensionListUtility.php
@@ -135,7 +135,7 @@ class ExtensionListUtility implements \SplObserver {
*
* @param string $localExtensionListFile absolute path to extension list xml.gz
* @param int $repositoryUid UID of repository when inserting records into DB
- * @return integer total number of imported extension versions
+ * @return int total number of imported extension versions
*/
public function import($localExtensionListFile, $repositoryUid = NULL) {
if (!is_null($repositoryUid) && is_int($repositoryUid)) {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
index 4f763809b9ff..ad6e83cce95c 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/InstallUtility.php
@@ -141,7 +141,7 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface {
* Wrapper function to check for loaded extensions
*
* @param string $extensionKey
- * @return boolean TRUE if extension is loaded
+ * @return bool TRUE if extension is loaded
*/
public function isLoaded($extensionKey) {
return $this->packageManager->isPackageActive($extensionKey);
@@ -172,7 +172,7 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface {
* Checks if an extension is available in the system
*
* @param $extensionKey
- * @return boolean
+ * @return bool
*/
public function isAvailable($extensionKey) {
return $this->packageManager->isPackageAvailable($extensionKey);
@@ -400,7 +400,7 @@ class InstallUtility implements \TYPO3\CMS\Core\SingletonInterface {
*
* @internal
* @param \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extensionData
- * @return boolean
+ * @return bool
*/
public function isUpdateAvailable(\TYPO3\CMS\Extensionmanager\Domain\Model\Extension $extensionData) {
$isUpdateAvailable = FALSE;
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
index b985704a5774..fb1f097fc043 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractExtensionXmlParser.php
@@ -208,7 +208,7 @@ abstract class AbstractExtensionXmlParser extends AbstractXmlParser {
*
* @access public
* @return string e-mail address of extension author
- * @see $authoremail, getAll()
+ * @see $authoremail, getAll()
*/
public function getAuthoremail() {
return $this->authoremail;
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php
index 762b1fc3c96e..9d267f642119 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/AbstractXmlParser.php
@@ -88,7 +88,7 @@ abstract class AbstractXmlParser implements \SplSubject {
* Method tries to load the extension if necessary and possible.
*
* @access public
- * @return boolean TRUE, if PHP extension is available, otherwise FALSE
+ * @return bool TRUE, if PHP extension is available, otherwise FALSE
*/
public function isAvailable() {
$isAvailable = TRUE;
@@ -112,7 +112,7 @@ abstract class AbstractXmlParser implements \SplSubject {
/**
* Create required parser
*
- * @return void
+ * @return void
*/
abstract protected function createParser();
}
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
index 40bef36660d7..36f250ff049d 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPullParser.php
@@ -22,8 +22,8 @@ namespace TYPO3\CMS\Extensionmanager\Utility\Parser;
* Depends on PHP ext/xmlreader which should be available
* with PHP >= 5.1.0.
*
- * @author Marcus Krause <marcus#exp2010@t3sec.info>
- * @author Steffen Kamper <info@sk-typo3.de>
+ * @author Marcus Krause <marcus#exp2010@t3sec.info>
+ * @author Steffen Kamper <info@sk-typo3.de>
* @since 2010-02-09
*/
class ExtensionXmlPullParser extends AbstractExtensionXmlParser {
@@ -38,7 +38,7 @@ class ExtensionXmlPullParser extends AbstractExtensionXmlParser {
/**
* Create required parser
*
- * @return void
+ * @return void
*/
protected function createParser() {
$this->objXml = new \XMLReader();
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
index 0e5868d56e7a..b21ff15ca01e 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/ExtensionXmlPushParser.php
@@ -49,7 +49,7 @@ class ExtensionXmlPushParser extends AbstractExtensionXmlParser {
/**
* Create required parser
*
- * @return void
+ * @return void
*/
protected function createParser() {
$this->objXml = xml_parser_create();
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
index 3584ab5e0da4..b2158f386a64 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPullParser.php
@@ -37,7 +37,7 @@ class MirrorXmlPullParser extends AbstractMirrorXmlParser {
/**
* Create required parser
*
- * @return void
+ * @return void
*/
protected function createParser() {
$this->objXml = new \XMLReader();
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
index e11433c6c61f..cc976159740e 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Parser/MirrorXmlPushParser.php
@@ -44,7 +44,7 @@ class MirrorXmlPushParser extends AbstractMirrorXmlParser {
/**
* Create required parser
*
- * @return void
+ * @return void
*/
protected function createParser() {
$this->objXml = xml_parser_create();
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
index b12384a4b2c4..3d26e7959de7 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/Repository/Helper.php
@@ -235,7 +235,7 @@ class Helper implements \TYPO3\CMS\Core\SingletonInterface {
* @access public
* @see Tx_Extensionmanager_Utility_Repository_Helper::PROBLEM_NO_VERSIONS_IN_DATABASE,
* @throws \TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException
- * @return integer "0" if everything is perfect, otherwise bitmask with problems
+ * @return int "0" if everything is perfect, otherwise bitmask with problems
*/
public function isExtListUpdateNecessary() {
$updateNecessity = 0;
@@ -262,7 +262,7 @@ class Helper implements \TYPO3\CMS\Core\SingletonInterface {
* Method updates TYPO3 database with up-to-date
* extension version records.
*
- * @return boolean TRUE if the extension list was successfully update, FALSE if no update necessary
+ * @return bool TRUE if the extension list was successfully update, FALSE if no update necessary
* @see isExtListUpdateNecessary()
*/
public function updateExtList() {
diff --git a/typo3/sysext/extensionmanager/Classes/Utility/UpdateScriptUtility.php b/typo3/sysext/extensionmanager/Classes/Utility/UpdateScriptUtility.php
index 9c40fd374d23..5321d317d351 100644
--- a/typo3/sysext/extensionmanager/Classes/Utility/UpdateScriptUtility.php
+++ b/typo3/sysext/extensionmanager/Classes/Utility/UpdateScriptUtility.php
@@ -86,7 +86,7 @@ class UpdateScriptUtility {
* Does not check if some update is needed.
*
* @param string $extensionKey Extension key
- * @return boolean True, if there is some update script
+ * @return bool True, if there is some update script
*/
public function checkUpdateScriptExists($extensionKey) {
$updateScriptFileExists = FALSE;
diff --git a/typo3/sysext/feedit/Classes/FrontendEditPanel.php b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
index a9bfebfefcb0..378a3c504bba 100644
--- a/typo3/sysext/feedit/Classes/FrontendEditPanel.php
+++ b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
@@ -241,7 +241,7 @@ class FrontendEditPanel {
* @param string $string The string to wrap in a link, typ. and image used as button in the edit panel.
* @param string $url The URL of the link. Should be absolute if supposed to work with <base> path set.
* @return string A <a> tag wrapped string.
- * @see editPanelLinkWrap()
+ * @see editPanelLinkWrap()
*/
protected function editPanelLinkWrap_doWrap($string, $url) {
$onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=close.html') . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
@@ -253,7 +253,7 @@ class FrontendEditPanel {
*
* @param string $table The table name
* @param array $row The data record
- * @return boolean
+ * @return bool
*/
protected function isDisabled($table, array $row) {
$status = FALSE;
diff --git a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
index 525d558ce563..519b61a36f64 100644
--- a/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
+++ b/typo3/sysext/felogin/Classes/Controller/FrontendLoginController.php
@@ -953,7 +953,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
* and belongs to the current TYPO3 installation.
*
* @param string $url URL to be checked
- * @return boolean Whether the URL belongs to the current TYPO3 installation
+ * @return bool Whether the URL belongs to the current TYPO3 installation
*/
protected function isInCurrentDomain($url) {
return GeneralUtility::isOnCurrentHost($url) && GeneralUtility::isFirstPartOfStr($url, GeneralUtility::getIndpEnv('TYPO3_SITE_URL'));
@@ -964,7 +964,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
* in the sys_domain database table.
*
* @param string $url Absolute URL which needs to be checked
- * @return boolean Whether the URL is considered to be local
+ * @return bool Whether the URL is considered to be local
*/
protected function isInLocalDomain($url) {
$result = FALSE;
@@ -995,7 +995,7 @@ class FrontendLoginController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
* current TYPO3 installation.
*
* @param string $url URL which needs to be checked
- * @return boolean Whether the URL is considered to be relative
+ * @return bool Whether the URL is considered to be relative
*/
protected function isRelativeUrl($url) {
$parsedUrl = @parse_url($url);
diff --git a/typo3/sysext/filelist/Classes/FileList.php b/typo3/sysext/filelist/Classes/FileList.php
index f23e546256ec..b6e4557ac1dd 100644
--- a/typo3/sysext/filelist/Classes/FileList.php
+++ b/typo3/sysext/filelist/Classes/FileList.php
@@ -675,7 +675,7 @@ class FileList extends \TYPO3\CMS\Backend\RecordList\AbstractRecordList {
* Returns TRUE if $ext is an image-extension according to $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext']
*
* @param string $ext File extension
- * @return boolean
+ * @return bool
*/
public function isImage($ext) {
return GeneralUtility::inList($GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext'], strtolower($ext));
diff --git a/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php b/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
index bb50fc2496e9..04a347a72e20 100644
--- a/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
+++ b/typo3/sysext/fluid/Classes/Core/Compiler/AbstractCompiledTemplate.php
@@ -71,14 +71,14 @@ abstract class AbstractCompiledTemplate implements \TYPO3\CMS\Fluid\Core\Parser\
}
/**
- * @return boolean
+ * @return bool
*/
public function isCompilable() {
return FALSE;
}
/**
- * @return boolean
+ * @return bool
*/
public function isCompiled() {
return TRUE;
diff --git a/typo3/sysext/fluid/Classes/Core/Compiler/TemplateCompiler.php b/typo3/sysext/fluid/Classes/Core/Compiler/TemplateCompiler.php
index 1b637b90dcd4..61483e4f06fd 100644
--- a/typo3/sysext/fluid/Classes/Core/Compiler/TemplateCompiler.php
+++ b/typo3/sysext/fluid/Classes/Core/Compiler/TemplateCompiler.php
@@ -40,7 +40,7 @@ class TemplateCompiler implements \TYPO3\CMS\Core\SingletonInterface {
/**
* @param string $identifier
- * @return boolean
+ * @return bool
*/
public function has($identifier) {
$identifier = $this->sanitizeIdentifier($identifier);
diff --git a/typo3/sysext/fluid/Classes/Core/Parser/ParsedTemplateInterface.php b/typo3/sysext/fluid/Classes/Core/Parser/ParsedTemplateInterface.php
index aab18c9d41d0..0532402e7bd6 100644
--- a/typo3/sysext/fluid/Classes/Core/Parser/ParsedTemplateInterface.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/ParsedTemplateInterface.php
@@ -47,7 +47,7 @@ interface ParsedTemplateInterface {
* Returns TRUE if the current template has a template defined via <f:layout name="..." />
*
* @see getLayoutName()
- * @return boolean
+ * @return bool
*/
public function hasLayout();
@@ -55,12 +55,12 @@ interface ParsedTemplateInterface {
* If the template contains constructs which prevent the compiler from compiling the template
* correctly, isCompilable() will return FALSE.
*
- * @return boolean TRUE if the template can be compiled
+ * @return bool TRUE if the template can be compiled
*/
public function isCompilable();
/**
- * @return boolean TRUE if the template is already compiled, FALSE otherwise
+ * @return bool TRUE if the template is already compiled, FALSE otherwise
*/
public function isCompiled();
}
diff --git a/typo3/sysext/fluid/Classes/Core/Parser/ParsingState.php b/typo3/sysext/fluid/Classes/Core/Parser/ParsingState.php
index 12d2db74c9b9..09e974cb69fd 100644
--- a/typo3/sysext/fluid/Classes/Core/Parser/ParsingState.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/ParsingState.php
@@ -114,7 +114,7 @@ class ParsingState implements \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterfa
/**
* Count the size of the node stack
*
- * @return integer Number of elements on the node stack (i.e. number of currently open Fluid tags)
+ * @return int Number of elements on the node stack (i.e. number of currently open Fluid tags)
*/
public function countNodeStack() {
return count($this->nodeStack);
@@ -149,7 +149,7 @@ class ParsingState implements \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterfa
* Returns TRUE if the current template has a template defined via <f:layout name="..." />
*
* @see getLayoutName()
- * @return boolean
+ * @return bool
*/
public function hasLayout() {
return $this->layoutNameNode !== NULL;
@@ -176,7 +176,7 @@ class ParsingState implements \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterfa
}
/**
- * @return boolean
+ * @return bool
*/
public function isCompilable() {
return $this->compilable;
@@ -190,7 +190,7 @@ class ParsingState implements \TYPO3\CMS\Fluid\Core\Parser\ParsedTemplateInterfa
}
/**
- * @return boolean
+ * @return bool
*/
public function isCompiled() {
return FALSE;
diff --git a/typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/BooleanNode.php b/typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/BooleanNode.php
index 6700efef67c9..f9773fcf476c 100644
--- a/typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/BooleanNode.php
+++ b/typo3/sysext/fluid/Classes/Core/Parser/SyntaxTree/BooleanNode.php
@@ -185,7 +185,7 @@ class BooleanNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
/**
* @param \TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext
- * @return boolean the boolean value
+ * @return bool the boolean value
*/
public function evaluate(\TYPO3\CMS\Fluid\Core\Rendering\RenderingContextInterface $renderingContext) {
if ($this->comparator !== NULL) {
@@ -213,7 +213,7 @@ class BooleanNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
* @param string $comparator
* @param mixed $evaluatedLeftSide
* @param mixed $evaluatedRightSide
- * @return boolean TRUE if comparison of left and right side using the comparator emit TRUE, false otherwise
+ * @return bool TRUE if comparison of left and right side using the comparator emit TRUE, false otherwise
* @throws \TYPO3\CMS\Fluid\Core\Parser\Exception
*/
static public function evaluateComparator($comparator, $evaluatedLeftSide, $evaluatedRightSide) {
@@ -268,7 +268,7 @@ class BooleanNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
*
* @param mixed $evaluatedLeftSide
* @param mixed $evaluatedRightSide
- * @return boolean TRUE if the operands can be compared using arithmetic operators, FALSE otherwise.
+ * @return bool TRUE if the operands can be compared using arithmetic operators, FALSE otherwise.
*/
static protected function isComparable($evaluatedLeftSide, $evaluatedRightSide) {
if ((is_null($evaluatedLeftSide) || is_string($evaluatedLeftSide))
@@ -312,7 +312,7 @@ class BooleanNode extends \TYPO3\CMS\Fluid\Core\Parser\SyntaxTree\AbstractNode {
* Must be public and static as it is used from inside cached templates.
*
* @param mixed $value Value to be converted to boolean
- * @return boolean
+ * @return bool
*/
static public function convertToBoolean($value) {
if (is_bool($value)) {
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
index 07564b44dac1..950e33fc245c 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/AbstractViewHelper.php
@@ -147,7 +147,7 @@ abstract class AbstractViewHelper {
*
* THIS METHOD MIGHT CHANGE WITHOUT NOTICE; NO PUBLIC API!
*
- * @return boolean
+ * @return bool
*/
public function isEscapingInterceptorEnabled() {
return $this->escapingInterceptorEnabled;
@@ -426,7 +426,7 @@ abstract class AbstractViewHelper {
* Tests if the given $argumentName is set, and not NULL.
*
* @param string $argumentName
- * @return boolean TRUE if $argumentName is found, FALSE otherwise
+ * @return bool TRUE if $argumentName is found, FALSE otherwise
* @api
*/
protected function hasArgument($argumentName) {
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/ArgumentDefinition.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/ArgumentDefinition.php
index 7cd677199995..6bd210f8d909 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/ArgumentDefinition.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/ArgumentDefinition.php
@@ -107,7 +107,7 @@ class ArgumentDefinition {
/**
* Get the optionality of the argument
*
- * @return boolean TRUE if argument is optional
+ * @return bool TRUE if argument is optional
*/
public function isRequired() {
return $this->required;
@@ -125,7 +125,7 @@ class ArgumentDefinition {
/**
* TRUE if it is a method parameter
*
- * @return boolean TRUE if it's a method parameter
+ * @return bool TRUE if it's a method parameter
*/
public function isMethodParameter() {
return $this->isMethodParameter;
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/Arguments.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/Arguments.php
index 03aa87f49679..cfcc095c3f2c 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/Arguments.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/Arguments.php
@@ -48,7 +48,7 @@ class Arguments implements \ArrayAccess {
* Checks if a given key exists in the array
*
* @param string $key Key to check
- * @return boolean true if exists
+ * @return bool true if exists
*/
public function offsetExists($key) {
return array_key_exists($key, $this->arguments);
@@ -90,7 +90,7 @@ class Arguments implements \ArrayAccess {
* Checks if an argument with the specified name exists
*
* @param string $argumentName Name of the argument to check for
- * @return boolean TRUE if such an argument exists, otherwise FALSE
+ * @return bool TRUE if such an argument exists, otherwise FALSE
* @see offsetExists()
*/
public function hasArgument($argumentName) {
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
index d2407974fa80..a85a2302554d 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/TagBuilder.php
@@ -104,7 +104,7 @@ class TagBuilder {
/**
* Returns TRUE if tag contains content, otherwise FALSE
*
- * @return boolean TRUE if tag contains text, otherwise FALSE
+ * @return bool TRUE if tag contains text, otherwise FALSE
* @api
*/
public function hasContent() {
@@ -129,7 +129,7 @@ class TagBuilder {
* Returns TRUE if the tag has an attribute with the given name
*
* @param string $attributeName name of the attribute
- * @return boolean TRUE if the tag has an attribute with the given name, otherwise FALSE
+ * @return bool TRUE if the tag has an attribute with the given name, otherwise FALSE
* @api
*/
public function hasAttribute($attributeName) {
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/TemplateVariableContainer.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/TemplateVariableContainer.php
index c9b6123f1709..80d177777e5b 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/TemplateVariableContainer.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/TemplateVariableContainer.php
@@ -122,7 +122,7 @@ class TemplateVariableContainer implements \ArrayAccess {
* Checks if this property exists in the VariableContainer.
*
* @param string $identifier
- * @return boolean TRUE if $identifier exists, FALSE otherwise
+ * @return bool TRUE if $identifier exists, FALSE otherwise
* @api
*/
public function exists($identifier) {
@@ -167,7 +167,7 @@ class TemplateVariableContainer implements \ArrayAccess {
* Checks if this property exists in the VariableContainer.
*
* @param string $identifier
- * @return boolean TRUE if $identifier exists, FALSE otherwise
+ * @return bool TRUE if $identifier exists, FALSE otherwise
*/
public function offsetExists($identifier) {
return $this->exists($identifier);
diff --git a/typo3/sysext/fluid/Classes/Core/ViewHelper/ViewHelperVariableContainer.php b/typo3/sysext/fluid/Classes/Core/ViewHelper/ViewHelperVariableContainer.php
index 34f2f86d920a..bce8cf9f187c 100644
--- a/typo3/sysext/fluid/Classes/Core/ViewHelper/ViewHelperVariableContainer.php
+++ b/typo3/sysext/fluid/Classes/Core/ViewHelper/ViewHelperVariableContainer.php
@@ -87,7 +87,7 @@ class ViewHelperVariableContainer {
*
* @param string $viewHelperName The ViewHelper Class name (Fully qualified, like \TYPO3\CMS\Fluid\ViewHelpers\ForViewHelper)
* @param string $key Key of the data
- * @return boolean TRUE if a value for the given ViewHelperName / Key is stored, FALSE otherwise.
+ * @return bool TRUE if a value for the given ViewHelperName / Key is stored, FALSE otherwise.
* @api
*/
public function exists($viewHelperName, $key) {
diff --git a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php
index 98946f7e7c3f..9e81fb355006 100644
--- a/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php
+++ b/typo3/sysext/fluid/Classes/Core/Widget/WidgetRequestHandler.php
@@ -62,7 +62,7 @@ class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHan
}
/**
- * @return boolean TRUE if it is an AJAX widget request
+ * @return bool TRUE if it is an AJAX widget request
*/
public function canHandleRequest() {
$rawGetArguments = \TYPO3\CMS\Core\Utility\GeneralUtility::_GET();
@@ -72,7 +72,7 @@ class WidgetRequestHandler extends \TYPO3\CMS\Extbase\Mvc\Web\AbstractRequestHan
/**
* This request handler has a higher priority than the default request handler.
*
- * @return integer
+ * @return int
*/
public function getPriority() {
return 200;
diff --git a/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php b/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
index 670888ed078d..38142c682414 100644
--- a/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
+++ b/typo3/sysext/fluid/Classes/View/AbstractTemplateView.php
@@ -380,7 +380,7 @@ abstract class AbstractTemplateView implements \TYPO3\CMS\Extbase\Mvc\View\ViewI
/**
* Get the current rendering type.
*
- * @return integer one of RENDERING_* constants
+ * @return int one of RENDERING_* constants
*/
protected function getCurrentRenderingType() {
$currentRendering = end($this->renderingStack);
@@ -414,7 +414,7 @@ abstract class AbstractTemplateView implements \TYPO3\CMS\Extbase\Mvc\View\ViewI
* contexts. Override this method if that is not the case.
*
* @param \TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext Controller context which is available inside the view
- * @return boolean TRUE if the view has something useful to display, otherwise FALSE
+ * @return bool TRUE if the view has something useful to display, otherwise FALSE
* @api
*/
public function canRender(\TYPO3\CMS\Extbase\Mvc\Controller\ControllerContext $controllerContext) {
diff --git a/typo3/sysext/fluid/Classes/View/StandaloneView.php b/typo3/sysext/fluid/Classes/View/StandaloneView.php
index 429779dd7e2b..f1d615ac9ace 100644
--- a/typo3/sysext/fluid/Classes/View/StandaloneView.php
+++ b/typo3/sysext/fluid/Classes/View/StandaloneView.php
@@ -276,7 +276,7 @@ class StandaloneView extends AbstractTemplateView {
/**
* Checks whether a template can be resolved for the current request
*
- * @return boolean
+ * @return bool
* @api
*/
public function hasTemplate() {
diff --git a/typo3/sysext/fluid/Classes/View/TemplateView.php b/typo3/sysext/fluid/Classes/View/TemplateView.php
index ac30e12d8649..97927a9235ba 100644
--- a/typo3/sysext/fluid/Classes/View/TemplateView.php
+++ b/typo3/sysext/fluid/Classes/View/TemplateView.php
@@ -481,7 +481,7 @@ class TemplateView extends AbstractTemplateView {
* Checks whether a template can be resolved for the current request context.
*
* @param ControllerContext $controllerContext Controller context which is available inside the view
- * @return boolean
+ * @return bool
* @api
*/
public function canRender(ControllerContext $controllerContext) {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php
index e29a8773076c..1f0f01daeb5c 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/Security/IfHasRoleViewHelper.php
@@ -82,7 +82,7 @@ class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractCondi
* Determines whether the currently logged in BE user belongs to the specified usergroup
*
* @param string $role The usergroup (either the usergroup uid or its title)
- * @return boolean TRUE if the currently logged in BE user belongs to $role
+ * @return bool TRUE if the currently logged in BE user belongs to $role
*/
protected function backendUserHasRole($role) {
if (!is_array($GLOBALS['BE_USER']->userGroups)) {
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/CountViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/CountViewHelper.php
index 13bb8cc41610..9759fd19edf6 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/CountViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/CountViewHelper.php
@@ -43,7 +43,7 @@ class CountViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelpe
* Counts the items of a given property.
*
* @param array $subject The array or \Countable to be counted
- * @return integer The number of elements
+ * @return int The number of elements
* @throws \TYPO3\CMS\Fluid\Core\ViewHelper\Exception
* @api
*/
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
index b3746d83bcac..ab2d4c4ad9b7 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/AbstractFormFieldViewHelper.php
@@ -127,7 +127,7 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper {
/**
* Checks if a property mapping error has occurred in the last request.
*
- * @return boolean TRUE if a mapping error occurred, FALSE otherwise
+ * @return bool TRUE if a mapping error occurred, FALSE otherwise
*/
protected function hasMappingErrorOccurred() {
return $this->controllerContext->getRequest()->getOriginalRequest() !== NULL;
@@ -190,7 +190,7 @@ abstract class AbstractFormFieldViewHelper extends AbstractFormViewHelper {
/**
* Internal method which checks if we should evaluate a domain object or just output arguments['name'] and arguments['value']
*
- * @return boolean TRUE if we should evaluate the domain object, FALSE otherwise.
+ * @return bool TRUE if we should evaluate the domain object, FALSE otherwise.
*/
protected function isObjectAccessorMode() {
return $this->hasArgument('property') && $this->viewHelperVariableContainer->exists('TYPO3\\CMS\\Fluid\\ViewHelpers\\FormViewHelper', 'formObjectName');
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
index a925244935f3..7cbd416069c7 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Form/SelectViewHelper.php
@@ -201,7 +201,7 @@ class SelectViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Form\AbstractFormFie
* Render the option tags.
*
* @param mixed $value Value to check for
- * @return boolean TRUE if the value should be marked a s selected; FALSE otherwise
+ * @return bool TRUE if the value should be marked a s selected; FALSE otherwise
*/
protected function isSelected($value) {
$selectedValue = $this->getSelectedValue();
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php
index 03c43bbc8f90..1981daacad53 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Security/IfHasRoleViewHelper.php
@@ -82,7 +82,7 @@ class IfHasRoleViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractCondi
* Determines whether the currently logged in FE user belongs to the specified usergroup
*
* @param string $role The usergroup (either the usergroup uid or its title)
- * @return boolean TRUE if the currently logged in FE user belongs to $role
+ * @return bool TRUE if the currently logged in FE user belongs to $role
*/
protected function frontendUserHasRole($role) {
if (!isset($GLOBALS['TSFE']) || !$GLOBALS['TSFE']->loginUser) {
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/UserDomainClass.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/UserDomainClass.php
index bb49bb58f82e..60927a7949c7 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/UserDomainClass.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Fixtures/UserDomainClass.php
@@ -38,7 +38,7 @@ class UserDomainClass {
/**
* Return the ID
*
- * @return integer ID
+ * @return int ID
*/
public function getId() {
return $this->id;
diff --git a/typo3/sysext/form/Classes/Controller/FormController.php b/typo3/sysext/form/Classes/Controller/FormController.php
index 5063c34b8b84..ac5de96f64c6 100644
--- a/typo3/sysext/form/Classes/Controller/FormController.php
+++ b/typo3/sysext/form/Classes/Controller/FormController.php
@@ -141,7 +141,7 @@ class FormController {
* when data has been submitted but the validation rules do not fit
* or when the user returns from the confirmation screen.
*
- * @return boolean TRUE when form needs to be shown
+ * @return bool TRUE when form needs to be shown
*/
protected function showForm() {
$show = FALSE;
@@ -181,7 +181,7 @@ class FormController {
* the confirmation screen has been configured in TypoScript
* and the confirmation screen has not been submitted
*
- * @return boolean TRUE when confirmation screen needs to be shown
+ * @return bool TRUE when confirmation screen needs to be shown
*/
protected function showConfirmation() {
$show = FALSE;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Additional/AdditionalAdditionalElement.php b/typo3/sysext/form/Classes/Domain/Model/Additional/AdditionalAdditionalElement.php
index 2392a1168632..cc9e73c599aa 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Additional/AdditionalAdditionalElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Additional/AdditionalAdditionalElement.php
@@ -67,7 +67,7 @@ class AdditionalAdditionalElement {
* Returns TRUE if set, FALSE if not set.
*
* @param string $key Name of the additional
- * @return boolean
+ * @return bool
*/
public function additionalIsSet($key) {
return isset($this->additional[$key]);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
index ce27f4c38a00..91e72113cf6e 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/AttributesAttribute.php
@@ -114,7 +114,7 @@ class AttributesAttribute {
* Returns TRUE if attribute is set
*
* @param string $key The name of the attribute
- * @return boolean
+ * @return bool
*/
public function hasAttribute($key) {
return isset($this->attributes[$key]);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/ColsAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/ColsAttribute.php
index 21e44b724916..93c93c8283c5 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/ColsAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/ColsAttribute.php
@@ -33,7 +33,7 @@ class ColsAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttri
* User agents may wrap visible text lines to keep long lines visible
* without the need for scrolling.
*
- * @return integer Attribute value
+ * @return int Attribute value
*/
public function getValue() {
$value = (int)$this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/MaxlengthAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/MaxlengthAttribute.php
index e9aaf869531d..e415d5f52e68 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/MaxlengthAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/MaxlengthAttribute.php
@@ -32,7 +32,7 @@ class MaxlengthAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\Abstract
* in which case the user agent should offer a scrolling mechanism.
* The default value for this attribute is an unlimited number.
*
- * @return integer Attribute value
+ * @return int Attribute value
*/
public function getValue() {
$value = (int)$this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/RowsAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/RowsAttribute.php
index e6b3f4ddc337..a63018a28d55 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/RowsAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/RowsAttribute.php
@@ -32,7 +32,7 @@ class RowsAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttri
* through the contents of the control when the contents extend
* beyond the visible area.
*
- * @return integer Attribute value
+ * @return int Attribute value
*/
public function getValue() {
$value = (int)$this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/SizeAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/SizeAttribute.php
index 54e8047b2eb7..b2763ec3e573 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/SizeAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/SizeAttribute.php
@@ -31,7 +31,7 @@ class SizeAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractAttri
* has the value "text" or "password".
* In that case, its value refers to the (integer) number of characters.
*
- * @return integer Attribute value
+ * @return int Attribute value
*/
public function getValue() {
$value = (int)$this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Attribute/TabindexAttribute.php b/typo3/sysext/form/Classes/Domain/Model/Attribute/TabindexAttribute.php
index dc3ce1f90702..eba7b744875a 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Attribute/TabindexAttribute.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Attribute/TabindexAttribute.php
@@ -56,7 +56,7 @@ class TabindexAttribute extends \TYPO3\CMS\Form\Domain\Model\Attribute\AbstractA
* in reverse. When the end (or beginning) of the tabbing order is reached,
* user agents may circle back to the beginning (or end).
*
- * @return integer Attribute value
+ * @return int Attribute value
*/
public function getValue() {
$attribute = (int)$this->value;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Content.php b/typo3/sysext/form/Classes/Domain/Model/Content.php
index efb1dab4d91a..51e06536cb09 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Content.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Content.php
@@ -55,7 +55,7 @@ class Content {
/**
* Returns the uid
*
- * @return integer The uid
+ * @return int The uid
*/
public function getUid() {
return $this->uid;
@@ -74,7 +74,7 @@ class Content {
/**
* Returns the page id
*
- * @return integer The page id
+ * @return int The page id
*/
public function getPageId() {
return $this->pageId;
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
index 87066e77799a..dc659639ff50 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/AbstractElement.php
@@ -222,7 +222,7 @@ abstract class AbstractElement {
/**
* Check to see if this element accepts the parent name instead of its own
*
- * @return boolean
+ * @return bool
*/
public function acceptsParentName() {
return $this->acceptsParentName;
@@ -263,7 +263,7 @@ abstract class AbstractElement {
/**
* Check if element has attributes which are allowed
*
- * @return boolean TRUE if there is a list of allowed attributes
+ * @return bool TRUE if there is a list of allowed attributes
*/
public function hasAllowedAttributes() {
return empty($this->allowedAttributes) === FALSE;
@@ -272,7 +272,7 @@ abstract class AbstractElement {
/**
* Check if element has additionals which are allowed
*
- * @return boolean TRUE if there is a list of allowed additionals
+ * @return bool TRUE if there is a list of allowed additionals
*/
public function hasAllowedAdditionals() {
return empty($this->allowedAdditional) === FALSE;
@@ -300,7 +300,7 @@ abstract class AbstractElement {
* Returns TRUE if attribute is set
*
* @param string $key The name of the attribute
- * @return boolean
+ * @return bool
*/
public function hasAttribute($key) {
return $this->attributes->hasAttribute($key);
@@ -443,7 +443,7 @@ abstract class AbstractElement {
* Check if additional exists
*
* @param string $key Name of the additional
- * @return boolean
+ * @return bool
*/
public function additionalIsSet($key) {
return $this->additional->additionalIsSet($key);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Element/FileuploadElement.php b/typo3/sysext/form/Classes/Domain/Model/Element/FileuploadElement.php
index 1ff69782b182..18ecd5a1f21a 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Element/FileuploadElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Element/FileuploadElement.php
@@ -75,7 +75,7 @@ class FileuploadElement extends \TYPO3\CMS\Form\Domain\Model\Element\AbstractEle
/**
* Gets the file size.
*
- * @return integer
+ * @return int
*/
public function getSize() {
$uploadData = $this->requestHandler->get($this->name);
diff --git a/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php b/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php
index 63e9d63e7dd7..f2a130a84fa7 100644
--- a/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php
+++ b/typo3/sysext/form/Classes/Domain/Model/Json/AbstractJsonElement.php
@@ -82,7 +82,7 @@ class AbstractJsonElement {
/**
* Check if child elements are allowed within this element
*
- * @return boolean TRUE if allowed
+ * @return bool TRUE if allowed
*/
public function childElementsAllowed() {
return $this->childElementsAllowed;
diff --git a/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php b/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php
index 1ec8ddffd29c..0f63340a3f31 100644
--- a/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php
+++ b/typo3/sysext/form/Classes/Domain/Repository/ContentRepository.php
@@ -26,7 +26,7 @@ class ContentRepository {
*
* Using the GET or POST variable 'P'
*
- * @return boolean|\TYPO3\CMS\Form\Domain\Model\Content if found, FALSE if not
+ * @return bool|\TYPO3\CMS\Form\Domain\Model\Content if found, FALSE if not
*/
public function getRecord() {
$record = FALSE;
@@ -59,7 +59,7 @@ class ContentRepository {
/**
* Check if the referenced record exists
*
- * @return boolean TRUE if record exists, FALSE if not
+ * @return bool TRUE if record exists, FALSE if not
*/
public function hasRecord() {
return $this->getRecord() !== FALSE;
@@ -68,7 +68,7 @@ class ContentRepository {
/**
* Convert and save the incoming data of the FORM wizard
*
- * @return boolean TRUE if succeeded, FALSE if not
+ * @return bool TRUE if succeeded, FALSE if not
*/
public function save() {
$json = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('configuration');
diff --git a/typo3/sysext/form/Classes/ElementCounter.php b/typo3/sysext/form/Classes/ElementCounter.php
index d0f6d90fe40f..ef67b090f62f 100644
--- a/typo3/sysext/form/Classes/ElementCounter.php
+++ b/typo3/sysext/form/Classes/ElementCounter.php
@@ -31,7 +31,7 @@ class ElementCounter implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Raise the element counter by one
*
- * @return integer
+ * @return int
*/
public function getElementId() {
$elementId = $this->elementCounter;
diff --git a/typo3/sysext/form/Classes/Request.php b/typo3/sysext/form/Classes/Request.php
index 8fd4ee2bffce..9d0bc6085db4 100644
--- a/typo3/sysext/form/Classes/Request.php
+++ b/typo3/sysext/form/Classes/Request.php
@@ -133,7 +133,7 @@ class Request implements \TYPO3\CMS\Core\SingletonInterface {
* Check to see if a property is set
*
* @param string $key Parameter to look for
- * @return boolean
+ * @return bool
*/
public function has($key) {
switch (TRUE) {
@@ -151,7 +151,7 @@ class Request implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Check to see if there is a request
*
- * @return boolean
+ * @return bool
*/
public function hasRequest() {
switch (TRUE) {
diff --git a/typo3/sysext/form/Classes/Utility/ValidatorUtility.php b/typo3/sysext/form/Classes/Utility/ValidatorUtility.php
index f24f52331da4..26e9d9f50fb9 100644
--- a/typo3/sysext/form/Classes/Utility/ValidatorUtility.php
+++ b/typo3/sysext/form/Classes/Utility/ValidatorUtility.php
@@ -106,7 +106,7 @@ class ValidatorUtility implements \TYPO3\CMS\Core\SingletonInterface {
* When a rule has breakOnError set and the rule does not validate,
* the check for the remaining rules will stop and method returns FALSE
*
- * @return boolean True if all rules validate
+ * @return bool True if all rules validate
*/
public function isValid() {
$prefix = $this->getPrefix();
@@ -155,7 +155,7 @@ class ValidatorUtility implements \TYPO3\CMS\Core\SingletonInterface {
* Returns TRUE when a form object has a message
*
* @param string $name Name of the form object
- * @return boolean
+ * @return bool
*/
public function hasMessage($name) {
if (isset($this->messages[$this->getPrefix()][$name])) {
@@ -187,7 +187,7 @@ class ValidatorUtility implements \TYPO3\CMS\Core\SingletonInterface {
* Returns TRUE when a form object has an error
*
* @param string $name Name of the form object
- * @return boolean
+ * @return bool
*/
public function hasErrors($name) {
if (isset($this->errors[$this->getPrefix()][$name])) {
diff --git a/typo3/sysext/form/Classes/Validation/AbstractValidator.php b/typo3/sysext/form/Classes/Validation/AbstractValidator.php
index baad04bcb1f3..93852b1f699d 100644
--- a/typo3/sysext/form/Classes/Validation/AbstractValidator.php
+++ b/typo3/sysext/form/Classes/Validation/AbstractValidator.php
@@ -222,7 +222,7 @@ abstract class AbstractValidator implements \TYPO3\CMS\Form\Validation\Validator
/**
* Returns TRUE when message needs to be displayed
*
- * @return boolean
+ * @return bool
*/
public function messageMustBeDisplayed() {
return $this->showMessage;
diff --git a/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php b/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php
index 172d6336c3c4..ea36a0240769 100644
--- a/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php
+++ b/typo3/sysext/form/Classes/Validation/AlphabeticValidator.php
@@ -48,7 +48,7 @@ class AlphabeticValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php b/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php
index 04d89b955668..7ff0be1b0525 100644
--- a/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php
+++ b/typo3/sysext/form/Classes/Validation/AlphanumericValidator.php
@@ -41,7 +41,7 @@ class AlphanumericValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/BetweenValidator.php b/typo3/sysext/form/Classes/Validation/BetweenValidator.php
index 106f4f10dae6..6f143ae607de 100644
--- a/typo3/sysext/form/Classes/Validation/BetweenValidator.php
+++ b/typo3/sysext/form/Classes/Validation/BetweenValidator.php
@@ -56,7 +56,7 @@ class BetweenValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator impl
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/DateValidator.php b/typo3/sysext/form/Classes/Validation/DateValidator.php
index 77a64810d9ce..6cdbe41d8188 100644
--- a/typo3/sysext/form/Classes/Validation/DateValidator.php
+++ b/typo3/sysext/form/Classes/Validation/DateValidator.php
@@ -41,7 +41,7 @@ class DateValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/DigitValidator.php b/typo3/sysext/form/Classes/Validation/DigitValidator.php
index 16ad1c6d357d..90952c437575 100644
--- a/typo3/sysext/form/Classes/Validation/DigitValidator.php
+++ b/typo3/sysext/form/Classes/Validation/DigitValidator.php
@@ -24,7 +24,7 @@ class DigitValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/EmailValidator.php b/typo3/sysext/form/Classes/Validation/EmailValidator.php
index 3dd644e5cf4c..a1f7b3060bcb 100644
--- a/typo3/sysext/form/Classes/Validation/EmailValidator.php
+++ b/typo3/sysext/form/Classes/Validation/EmailValidator.php
@@ -24,7 +24,7 @@ class EmailValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/EqualsValidator.php b/typo3/sysext/form/Classes/Validation/EqualsValidator.php
index 6af6201a80b3..4cc67a3a8f86 100644
--- a/typo3/sysext/form/Classes/Validation/EqualsValidator.php
+++ b/typo3/sysext/form/Classes/Validation/EqualsValidator.php
@@ -41,7 +41,7 @@ class EqualsValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/FileAllowedTypesValidator.php b/typo3/sysext/form/Classes/Validation/FileAllowedTypesValidator.php
index df4ec6882408..dd8e8b387fd8 100644
--- a/typo3/sysext/form/Classes/Validation/FileAllowedTypesValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FileAllowedTypesValidator.php
@@ -42,7 +42,7 @@ class FileAllowedTypesValidator extends \TYPO3\CMS\Form\Validation\AbstractValid
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php b/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php
index 3e6c6f2399d8..11b54ce669a4 100644
--- a/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FileMaximumSizeValidator.php
@@ -42,7 +42,7 @@ class FileMaximumSizeValidator extends \TYPO3\CMS\Form\Validation\AbstractValida
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php b/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php
index 6ee447c6df18..27cf793e145d 100644
--- a/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FileMinimumSizeValidator.php
@@ -41,7 +41,7 @@ class FileMinimumSizeValidator extends \TYPO3\CMS\Form\Validation\AbstractValida
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/FloatValidator.php b/typo3/sysext/form/Classes/Validation/FloatValidator.php
index af63523f9023..03b5ead1be80 100644
--- a/typo3/sysext/form/Classes/Validation/FloatValidator.php
+++ b/typo3/sysext/form/Classes/Validation/FloatValidator.php
@@ -24,7 +24,7 @@ class FloatValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/GreaterThanValidator.php b/typo3/sysext/form/Classes/Validation/GreaterThanValidator.php
index 24dace7cdfe4..5c90c83e0bd4 100644
--- a/typo3/sysext/form/Classes/Validation/GreaterThanValidator.php
+++ b/typo3/sysext/form/Classes/Validation/GreaterThanValidator.php
@@ -41,7 +41,7 @@ class GreaterThanValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/InArrayValidator.php b/typo3/sysext/form/Classes/Validation/InArrayValidator.php
index 7fc5140e51c9..0f7d75e5b4ce 100644
--- a/typo3/sysext/form/Classes/Validation/InArrayValidator.php
+++ b/typo3/sysext/form/Classes/Validation/InArrayValidator.php
@@ -48,7 +48,7 @@ class InArrayValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/IntegerValidator.php b/typo3/sysext/form/Classes/Validation/IntegerValidator.php
index 6a59406fa9b8..f72cf744fadc 100644
--- a/typo3/sysext/form/Classes/Validation/IntegerValidator.php
+++ b/typo3/sysext/form/Classes/Validation/IntegerValidator.php
@@ -24,7 +24,7 @@ class IntegerValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/IpValidator.php b/typo3/sysext/form/Classes/Validation/IpValidator.php
index d35db44b4e99..c10da1b723c9 100644
--- a/typo3/sysext/form/Classes/Validation/IpValidator.php
+++ b/typo3/sysext/form/Classes/Validation/IpValidator.php
@@ -24,7 +24,7 @@ class IpValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/LengthValidator.php b/typo3/sysext/form/Classes/Validation/LengthValidator.php
index 05a018938061..c9ff540db296 100644
--- a/typo3/sysext/form/Classes/Validation/LengthValidator.php
+++ b/typo3/sysext/form/Classes/Validation/LengthValidator.php
@@ -56,7 +56,7 @@ class LengthValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/LessthanValidator.php b/typo3/sysext/form/Classes/Validation/LessthanValidator.php
index 66f9c647dc7a..bc23f878cf1a 100644
--- a/typo3/sysext/form/Classes/Validation/LessthanValidator.php
+++ b/typo3/sysext/form/Classes/Validation/LessthanValidator.php
@@ -41,7 +41,7 @@ class LessthanValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/RegExpValidator.php b/typo3/sysext/form/Classes/Validation/RegExpValidator.php
index c6a0099d17ae..4fb35e7f25cd 100644
--- a/typo3/sysext/form/Classes/Validation/RegExpValidator.php
+++ b/typo3/sysext/form/Classes/Validation/RegExpValidator.php
@@ -41,7 +41,7 @@ class RegExpValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/RequiredValidator.php b/typo3/sysext/form/Classes/Validation/RequiredValidator.php
index ce60595b53b9..93cf4a845341 100644
--- a/typo3/sysext/form/Classes/Validation/RequiredValidator.php
+++ b/typo3/sysext/form/Classes/Validation/RequiredValidator.php
@@ -24,7 +24,7 @@ class RequiredValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/UriValidator.php b/typo3/sysext/form/Classes/Validation/UriValidator.php
index c4f993956741..bac7203ee192 100644
--- a/typo3/sysext/form/Classes/Validation/UriValidator.php
+++ b/typo3/sysext/form/Classes/Validation/UriValidator.php
@@ -24,7 +24,7 @@ class UriValidator extends \TYPO3\CMS\Form\Validation\AbstractValidator {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
* @see \TYPO3\CMS\Form\Validation\ValidatorInterface::isValid()
*/
public function isValid() {
diff --git a/typo3/sysext/form/Classes/Validation/ValidatorInterface.php b/typo3/sysext/form/Classes/Validation/ValidatorInterface.php
index e1f84fc2e4d2..0e99af13b211 100644
--- a/typo3/sysext/form/Classes/Validation/ValidatorInterface.php
+++ b/typo3/sysext/form/Classes/Validation/ValidatorInterface.php
@@ -39,7 +39,7 @@ interface ValidatorInterface {
/**
* Returns TRUE if submitted value validates according to rule
*
- * @return boolean
+ * @return bool
*/
public function isValid();
@@ -84,7 +84,7 @@ interface ValidatorInterface {
/**
* Returns TRUE when message needs to be displayed
*
- * @return boolean
+ * @return bool
*/
public function messageMustBeDisplayed();
diff --git a/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php
index 4434db9bfcdc..10bdeec4101d 100644
--- a/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Confirmation/Element/AbstractElementView.php
@@ -65,7 +65,7 @@ abstract class AbstractElementView {
* @param \DOMDocument $dom
* @param \DOMNode $reference Current XML structure
* @param bool $emptyElement
- * @return boolean
+ * @return bool
*/
protected function parseXML(\DOMDocument $dom, \DOMNode $reference, $emptyElement = FALSE) {
$node = $reference->firstChild;
@@ -350,7 +350,7 @@ abstract class AbstractElementView {
* if TRUE the element does not need a element wrap
* like <li>element</li>
*
- * @return boolean
+ * @return bool
*/
public function noWrap() {
return $this->noWrap;
diff --git a/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php b/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php
index 1db231979264..66567860d0ba 100644
--- a/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Form/Element/AbstractElementView.php
@@ -68,7 +68,7 @@ abstract class AbstractElementView {
* Determines whether the model is expected in this object.
*
* @param \TYPO3\CMS\Form\Domain\Model\Element\AbstractElement $model
- * @return boolean
+ * @return bool
*/
protected function isValidModel(\TYPO3\CMS\Form\Domain\Model\Element\AbstractElement $model) {
return is_a($model, $this->getExpectedModelName($model));
@@ -406,7 +406,7 @@ abstract class AbstractElementView {
* if TRUE the element does not need a element wrap
* like <li>element</li>
*
- * @return boolean
+ * @return bool
*/
public function noWrap() {
return $this->noWrap;
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 613a8d57be29..737767b46159 100644
--- a/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php
+++ b/typo3/sysext/form/Classes/View/Mail/Html/Element/AbstractElementView.php
@@ -65,7 +65,7 @@ abstract class AbstractElementView {
* @param \DOMDocument $dom
* @param \DOMNode $reference Current XML structure
* @param bool $emptyElement
- * @return boolean
+ * @return bool
*/
protected function parseXML(\DOMDocument $dom, \DOMNode $reference, $emptyElement = FALSE) {
$node = $reference->firstChild;
@@ -351,7 +351,7 @@ abstract class AbstractElementView {
* if TRUE the element does not need a element wrap
* like <li>element</li>
*
- * @return boolean
+ * @return bool
*/
public function noWrap() {
return $this->noWrap;
diff --git a/typo3/sysext/form/Tests/Unit/Validation/Helper.php b/typo3/sysext/form/Tests/Unit/Validation/Helper.php
index 9ca11b3fe901..268b590aadd8 100644
--- a/typo3/sysext/form/Tests/Unit/Validation/Helper.php
+++ b/typo3/sysext/form/Tests/Unit/Validation/Helper.php
@@ -63,7 +63,7 @@ class Helper extends \TYPO3\CMS\Core\Tests\UnitTestCase {
* Checks whether a value for $key has been stored.
*
* @param string $key the key to check, must not be empty
- * @return boolean whether a value for $key has been stored.
+ * @return bool whether a value for $key has been stored.
*/
public function has($key) {
return isset($this->mockData[$key]);
diff --git a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
index 2ec06dedf8ad..14ce0e3b6703 100644
--- a/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
+++ b/typo3/sysext/frontend/Classes/Authentication/FrontendUserAuthentication.php
@@ -187,7 +187,7 @@ class FrontendUserAuthentication extends \TYPO3\CMS\Core\Authentication\Abstract
/**
* Determine whether a session cookie needs to be set (lifetime=0)
*
- * @return boolean
+ * @return bool
* @internal
*/
public function isSetSessionCookie() {
@@ -198,7 +198,7 @@ class FrontendUserAuthentication extends \TYPO3\CMS\Core\Authentication\Abstract
/**
* Determine whether a non-session cookie needs to be set (lifetime>0)
*
- * @return boolean
+ * @return bool
* @internal
*/
public function isRefreshTimeBasedCookie() {
@@ -258,7 +258,7 @@ class FrontendUserAuthentication extends \TYPO3\CMS\Core\Authentication\Abstract
* and which groups are also allowed in the current domain.
* It also accumulates the TSconfig for the fe_user/fe_groups in ->TSdataArray
*
- * @return integer Returns the number of usergroups for the frontend users (if the internal user record exists and the usergroup field contains a value)
+ * @return int Returns the number of usergroups for the frontend users (if the internal user record exists and the usergroup field contains a value)
*/
public function fetchGroupData() {
$this->TSdataArray = array();
@@ -599,7 +599,7 @@ class FrontendUserAuthentication extends \TYPO3\CMS\Core\Authentication\Abstract
* This calls the parent function but additionally tries to look up the session ID in the "fe_session_data" table.
*
* @param int $id Claimed Session ID
- * @return boolean Returns TRUE if a corresponding session was found in the database
+ * @return bool Returns TRUE if a corresponding session was found in the database
*/
public function isExistingSessionRecord($id) {
// Perform check in parent function
diff --git a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
index b6cf6c340d64..9cc5bd81100c 100644
--- a/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
+++ b/typo3/sysext/frontend/Classes/Configuration/TypoScript/ConditionMatching/ConditionMatcher.php
@@ -30,7 +30,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
* Evaluates a TypoScript condition given as input, eg. "[browser=net][...(other conditions)...]"
*
* @param string $string The condition to match against its criterias.
- * @return boolean Whether the condition matched
+ * @return bool Whether the condition matched
* @see \TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::parse()
* @throws \TYPO3\CMS\Core\Configuration\TypoScript\Exception\InvalidTypoScriptConditionException
*/
@@ -137,7 +137,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
/**
* Determines the current page Id.
*
- * @return integer The current page Id
+ * @return int The current page Id
*/
protected function determinePageId() {
return (int)$GLOBALS['TSFE']->id;
@@ -165,7 +165,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
/**
* Get the id of the current user.
*
- * @return integer The id of the current user
+ * @return int The id of the current user
*/
protected function getUserId() {
$userId = $GLOBALS['TSFE']->fe_user->user['uid'];
@@ -175,7 +175,7 @@ class ConditionMatcher extends \TYPO3\CMS\Core\Configuration\TypoScript\Conditio
/**
* Determines if a user is logged in.
*
- * @return boolean Determines if a user is logged in
+ * @return bool Determines if a user is logged in
*/
protected function isUserLoggedIn() {
$userLoggedIn = FALSE;
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index 2fc8fc158c8d..abccf7d68ba0 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -3403,7 +3403,7 @@ class ContentObjectRenderer {
* Implements the stdWrap "numRows" property
*
* @param array $conf TypoScript properties for the property (see link to "numRows")
- * @return integer The number of rows found by the select (FALSE on error)
+ * @return int The number of rows found by the select (FALSE on error)
* @access private
* @see stdWrap()
*/
@@ -3449,7 +3449,7 @@ class ContentObjectRenderer {
* Implements the "if" function in TYPO3 TypoScript
*
* @param array $conf TypoScript properties defining what to compare
- * @return boolean
+ * @return bool
* @see HMENU(), CASEFUNC(), IMAGE(), COLUMN(), stdWrap(), _parseFunc()
*/
public function checkIf($conf) {
@@ -4268,7 +4268,7 @@ class ContentObjectRenderer {
* Performs basic mathematical evaluation of the input string. Does NOT take parathesis and operator precedence into account! (for that, see \TYPO3\CMS\Core\Utility\MathUtility::calculateWithPriorityToAdditionAndSubtraction())
*
* @param string $val The string to evaluate. Example: "3+4*10/5" will generate "35". Only integer numbers can be used.
- * @return integer The result (might be a float if you did a division of the numbers).
+ * @return int The result (might be a float if you did a division of the numbers).
* @see \TYPO3\CMS\Core\Utility\MathUtility::calculateWithPriorityToAdditionAndSubtraction()
*/
public function calc($val) {
@@ -5524,7 +5524,7 @@ class ContentObjectRenderer {
*
* @param int $key The integer to transform
* @param array $arr array in which the key should be found.
- * @return integer The processed integer key value.
+ * @return int The processed integer key value.
* @access private
* @see getData()
*/
@@ -6693,7 +6693,7 @@ class ContentObjectRenderer {
* @param string $senderAddress "From" email address
* @param string $senderName Optional "From" name
* @param string $replyTo Optional "Reply-To" header email address.
- * @return boolean Returns TRUE if sent
+ * @return bool Returns TRUE if sent
*/
public function sendNotifyEmail($message, $recipients, $cc, $senderAddress, $senderName = '', $replyTo = '') {
$result = FALSE;
@@ -6932,7 +6932,7 @@ class ContentObjectRenderer {
* Includes resources if the config property 'includeLibs' is set.
*
* @param array $config TypoScript configuration
- * @return boolean Whether a configuration for including libs was found and processed
+ * @return bool Whether a configuration for including libs was found and processed
*/
public function includeLibs(array $config) {
$librariesIncluded = FALSE;
@@ -6959,7 +6959,7 @@ class ContentObjectRenderer {
*
* @param string $className The name of the PHP class to be checked
* @param array $config TypoScript configuration (naturally of a USER or COA cObject)
- * @return boolean Whether the class is available
+ * @return bool Whether the class is available
* @link http://forge.typo3.org/issues/19510
* @TODO This method was introduced in TYPO3 4.3 and can be removed if the autoload was integrated
*/
@@ -7125,7 +7125,7 @@ class ContentObjectRenderer {
* @param array $feUserRow The array of the fe_user which is evaluated, typ. $GLOBALS['TSFE']->fe_user->user
* @param string $allowedGroups Commalist of the only fe_groups uids which may edit the record. If not set, then the usergroup field of the fe_user is used.
* @param bool $feEditSelf TRUE, if the fe_user may edit his own fe_user record.
- * @return boolean
+ * @return bool
* @see user_feAdmin
*/
public function DBmayFEUserEdit($table, $row, $feUserRow, $allowedGroups = '', $feEditSelf = 0) {
@@ -7832,7 +7832,7 @@ class ContentObjectRenderer {
* Checks if a page UID is available due to enableFields() AND the list of bad doktype numbers ($this->checkPid_badDoktypeList)
*
* @param int $uid Page UID to test
- * @return boolean TRUE if OK
+ * @return bool TRUE if OK
* @access private
* @see getWhere(), checkPidArray()
*/
@@ -7976,7 +7976,7 @@ class ContentObjectRenderer {
*
* @param string $table The table name
* @param array $row The data record
- * @return boolean
+ * @return bool
* @access private
* @see editPanelPreviewBorder()
*/
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index fef2dead6d56..7edb8b119ce7 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -137,7 +137,7 @@ class AbstractMenuContentObject {
* @param array $conf The TypoScript configuration for the HMENU cObject
* @param int $menuNumber Menu number; 1,2,3. Should probably be '1'
* @param string $objSuffix Submenu Object suffix. This offers submenus a way to use alternative configuration for specific positions in the menu; By default "1 = TMENU" would use "1." for the TMENU configuration, but if this string is set to eg. "a" then "1a." would be used for configuration instead (while "1 = " is still used for the overall object definition of "TMENU")
- * @return boolean Returns TRUE on success
+ * @return bool Returns TRUE on success
* @see \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::HMENU()
*/
public function start(&$tmpl, &$sys_page, $id, $conf, $menuNumber, $objSuffix = '') {
@@ -866,7 +866,7 @@ class AbstractMenuContentObject {
* @param array $data Array of menu items
* @param array $banUidArray Array of page uids which are to be excluded
* @param bool $spacer If set, then the page is a spacer.
- * @return boolean Returns TRUE if the page can be safely included.
+ * @return bool Returns TRUE if the page can be safely included.
*/
public function filterMenuPages(&$data, $banUidArray, $spacer) {
$includePage = TRUE;
@@ -1419,7 +1419,7 @@ class AbstractMenuContentObject {
*
* @param int $uid Page uid to evaluate.
* @param string $MPvar MPvar for the current position of item.
- * @return boolean TRUE if page with $uid is active
+ * @return bool TRUE if page with $uid is active
* @access private
* @see subMenu()
*/
@@ -1439,7 +1439,7 @@ class AbstractMenuContentObject {
*
* @param int $uid Page uid to evaluate.
* @param string $MPvar MPvar for the current position of item.
- * @return boolean TRUE if page with $uid is active
+ * @return bool TRUE if page with $uid is active
* @access private
*/
public function isActive($uid, $MPvar = '') {
@@ -1458,7 +1458,7 @@ class AbstractMenuContentObject {
*
* @param int $uid Page uid to evaluate.
* @param string $MPvar MPvar for the current position of item.
- * @return boolean TRUE if page $uid = $GLOBALS['TSFE']->id
+ * @return bool TRUE if page $uid = $GLOBALS['TSFE']->id
* @access private
*/
public function isCurrent($uid, $MPvar = '') {
@@ -1473,7 +1473,7 @@ class AbstractMenuContentObject {
* Used by the item states "IFSUB", "ACTIFSUB" and "CURIFSUB" to check if there is a submenu
*
* @param int $uid Page uid for which to search for a submenu
- * @return boolean Returns TRUE if there was a submenu with items found
+ * @return bool Returns TRUE if there was a submenu with items found
* @access private
*/
public function isSubMenu($uid) {
@@ -1522,7 +1522,7 @@ class AbstractMenuContentObject {
*
* @param string $kind The item state to evaluate (SPC, IFSUB, ACT etc... but no xxxRO states of course)
* @param int $key Key pointing to menu item from ->menuArr
- * @return boolean True (integer!=0) if match, otherwise FALSE (=0, zero)
+ * @return bool True (integer!=0) if match, otherwise FALSE (=0, zero)
* @access private
* @see procesItemStates()
*/
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuFilterPagesHookInterface.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuFilterPagesHookInterface.php
index 1aff04371f8d..e8f3e4748544 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuFilterPagesHookInterface.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuFilterPagesHookInterface.php
@@ -27,7 +27,7 @@ interface AbstractMenuFilterPagesHookInterface {
* @param array $banUidArray Array of page uids which are to be excluded
* @param bool $spacer If set, then the page is a spacer.
* @param \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject $obj The menu object
- * @return boolean Returns TRUE if the page can be safely included.
+ * @return bool Returns TRUE if the page can be safely included.
*/
public function processFilter(array &$data, array $banUidArray, $spacer, \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject $obj);
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php
index 5b1920c84f29..57d54c903e94 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/ImageMenuContentObject.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Frontend\ContentObject\Menu;
/**
* ImageMap based menus
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class ImageMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/SearchResultContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/SearchResultContentObject.php
index 9ca55f24dd53..0100f18c4632 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/SearchResultContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/SearchResultContentObject.php
@@ -327,7 +327,7 @@ class SearchResultContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstra
*
* @param string $in This is the code-line defining the tables/fields to search. Syntax: '[table1].[field1]-[field2]-[field3] : [table2].[field1]-[field2]'
* @return array An array where the values is "[table].[field]" strings to search
- * @see register_tables_and_columns()
+ * @see register_tables_and_columns()
*/
public function explodeCols($in) {
$theArray = explode(':', $in);
@@ -442,7 +442,7 @@ class SearchResultContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstra
* Sets $this->queryParts
*
* @param string $endClause Some extra conditions that the search must match.
- * @return boolean Returns TRUE no matter what - sweet isn't it!
+ * @return bool Returns TRUE no matter what - sweet isn't it!
* @access private
* @see \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::SEARCHRESULT()
*/
@@ -583,7 +583,7 @@ class SearchResultContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstra
/**
* Counts the results and sets the result in $this->res_count
*
- * @return boolean TRUE, if $this->query was found
+ * @return bool TRUE, if $this->query was found
*/
public function count_query() {
if (is_array($this->queryParts)) {
@@ -596,7 +596,7 @@ class SearchResultContentObject extends \TYPO3\CMS\Frontend\ContentObject\Abstra
/**
* Executes the search, sets result pointer in $this->result
*
- * @return boolean TRUE, if $this->query was set and query performed
+ * @return bool TRUE, if $this->query was set and query performed
*/
public function execute_query() {
if (is_array($this->queryParts)) {
diff --git a/typo3/sysext/frontend/Classes/Controller/DataSubmissionController.php b/typo3/sysext/frontend/Classes/Controller/DataSubmissionController.php
index bfa0bc455573..3d5bb48e78d0 100644
--- a/typo3/sysext/frontend/Classes/Controller/DataSubmissionController.php
+++ b/typo3/sysext/frontend/Classes/Controller/DataSubmissionController.php
@@ -241,7 +241,7 @@ class DataSubmissionController {
/**
* Sends the actual mail and handles autorespond message
*
- * @return boolean
+ * @return bool
*/
public function sendTheMail() {
// Sending the mail requires the recipient and message to be set.
diff --git a/typo3/sysext/frontend/Classes/Controller/ExtDirectEidController.php b/typo3/sysext/frontend/Classes/Controller/ExtDirectEidController.php
index 962768949248..c09720169d92 100644
--- a/typo3/sysext/frontend/Classes/Controller/ExtDirectEidController.php
+++ b/typo3/sysext/frontend/Classes/Controller/ExtDirectEidController.php
@@ -45,7 +45,7 @@ class ExtDirectEidController {
/**
* Returns TRUE if the associated action in _GET is allowed.
*
- * @return boolean
+ * @return bool
*/
public function actionIsAllowed() {
if (!in_array(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('action'), array('route', 'getAPI'))) {
diff --git a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
index 60cb09fe7323..49354d4321af 100644
--- a/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
@@ -319,7 +319,7 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
*
* @param int $pageId Page id to select for.
* @param int $sysLang Sys language uid
- * @return integer Number of content elements from the PID where the language is set to a certain value.
+ * @return int Number of content elements from the PID where the language is set to a certain value.
*/
public function getContentElementCount($pageId, $sysLang) {
$count = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows('uid', 'tt_content', 'pid=' . (int)$pageId . ' AND sys_language_uid=' . (int)$sysLang . BackendUtility::deleteClause('tt_content') . BackendUtility::versioningPlaceholderClause('tt_content'));
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index c35a3785d292..5e93d24b55a4 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -1087,7 +1087,7 @@ class TypoScriptFrontendController {
/**
* Checking if a user is logged in or a group constellation different from "0,-1"
*
- * @return boolean TRUE if either a login user is found (array fe_user->user) OR if the gr_list is set to something else than '0,-1' (could be done even without a user being logged in!)
+ * @return bool TRUE if either a login user is found (array fe_user->user) OR if the gr_list is set to something else than '0,-1' (could be done even without a user being logged in!)
*/
public function isUserOrGroupSet() {
return is_array($this->fe_user->user) || $this->gr_list !== '0,-1';
@@ -1131,7 +1131,7 @@ class TypoScriptFrontendController {
/**
* Checks if a backend user is logged in
*
- * @return boolean whether a backend user is logged in
+ * @return bool whether a backend user is logged in
*/
public function isBackendUserLoggedIn() {
return (bool)$this->beUserLogin;
@@ -1328,7 +1328,7 @@ class TypoScriptFrontendController {
* Checks if the page is hidden in the active workspace.
* If it is hidden, preview flags will be set.
*
- * @return boolean
+ * @return bool
*/
protected function determineIdIsHiddenPage() {
$field = \TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->id) ? 'uid' : 'alias';
@@ -1653,7 +1653,7 @@ class TypoScriptFrontendController {
/**
* Checks the current rootline for defined sections.
*
- * @return boolean
+ * @return bool
* @access private
*/
public function checkRootlineForIncludeSection() {
@@ -1696,7 +1696,7 @@ class TypoScriptFrontendController {
*
* @param array $row The page record to evaluate (needs fields: hidden, starttime, endtime, fe_group)
* @param bool $bypassGroupCheck Bypass group-check
- * @return boolean TRUE, if record is viewable.
+ * @return bool TRUE, if record is viewable.
* @see TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer::getTreeList(), checkPagerecordForIncludeSection()
*/
public function checkEnableFields($row, $bypassGroupCheck = FALSE) {
@@ -1720,7 +1720,7 @@ class TypoScriptFrontendController {
*
* @param array $row The page record to evaluate (needs field: fe_group)
* @param mixed $groupList List of group id's (comma list or array). Default is $this->gr_list
- * @return boolean TRUE, if group access is granted.
+ * @return bool TRUE, if group access is granted.
* @access private
*/
public function checkPageGroupAccess($row, $groupList = NULL) {
@@ -1738,7 +1738,7 @@ class TypoScriptFrontendController {
* Checks page record for include section
*
* @param array $row The page record to evaluate (needs fields: extendToSubpages + hidden, starttime, endtime, fe_group)
- * @return boolean Returns TRUE if either extendToSubpages is not checked or if the enableFields does not disable the page record.
+ * @return bool Returns TRUE if either extendToSubpages is not checked or if the enableFields does not disable the page record.
* @access private
* @see checkEnableFields(), TYPO3\\CMS\\Frontend\\ContentObject\\ContentObjectRenderer::getTreeList(), checkRootlineForIncludeSection()
*/
@@ -1749,7 +1749,7 @@ class TypoScriptFrontendController {
/**
* Checks if logins are allowed in the current branch of the page tree. Traverses the full root line and returns TRUE if logins are OK, otherwise FALSE (and then the login user must be unset!)
*
- * @return boolean returns TRUE if logins are OK, otherwise FALSE (and then the login user must be unset!)
+ * @return bool returns TRUE if logins are OK, otherwise FALSE (and then the login user must be unset!)
*/
public function checkIfLoginAllowedInBranch() {
// Initialize:
@@ -1865,7 +1865,7 @@ class TypoScriptFrontendController {
* Looking up a domain record based on HTTP_HOST
*
* @param bool $recursive If set, it looks "recursively" meaning that a domain like "123.456.typo3.com" would find a domain record like "typo3.com" if "123.456.typo3.com" or "456.typo3.com" did not exist.
- * @return integer Returns the page id of the page where the domain record was found.
+ * @return int Returns the page id of the page where the domain record was found.
* @access private
*/
public function findDomainRecord($recursive = FALSE) {
@@ -1915,7 +1915,7 @@ class TypoScriptFrontendController {
* Checks whether the pageUnavailableHandler should be used. To be used, pageUnavailable_handling must be set
* and devIPMask must not match the current visitor's IP address.
*
- * @return boolean TRUE/FALSE whether the pageUnavailable_handler should be used.
+ * @return bool TRUE/FALSE whether the pageUnavailable_handler should be used.
*/
public function checkPageUnavailableHandler() {
if (
@@ -2329,7 +2329,7 @@ class TypoScriptFrontendController {
* Will not be called if re-generation of page happens by other reasons (for instance that the page is not in cache yet!)
* Also, a backend user MUST be logged in for the shift-reload to be detected due to DoS-attack-security reasons.
*
- * @return boolean If shift-reload in client browser has been clicked, disable getting cached page (and regenerate it).
+ * @return bool If shift-reload in client browser has been clicked, disable getting cached page (and regenerate it).
*/
public function headerNoCache() {
$disableAcquireCacheData = FALSE;
@@ -3054,7 +3054,7 @@ class TypoScriptFrontendController {
* Returns TRUE if the page should be generated
* That is if jumpurl is not set and the cacheContentFlag is not set.
*
- * @return boolean
+ * @return bool
*/
public function isGeneratePage() {
return !$this->cacheContentFlag && !$this->jumpurl;
@@ -3223,7 +3223,7 @@ class TypoScriptFrontendController {
*
* @param \TYPO3\CMS\Core\Locking\Locker $lockObj Reference to a locking object
* @param string $key String to identify the lock in the system
- * @return boolean Returns TRUE if the lock could be obtained, FALSE otherwise (= process had to wait for existing lock to be released)
+ * @return bool Returns TRUE if the lock could be obtained, FALSE otherwise (= process had to wait for existing lock to be released)
* @see releasePageGenerationLock()
*/
public function acquirePageGenerationLock(&$lockObj, $key) {
@@ -3257,7 +3257,7 @@ class TypoScriptFrontendController {
* Release the page generation lock
*
* @param \TYPO3\CMS\Core\Locking\Locker $lockObj Reference to a locking object
- * @return boolean Returns TRUE on success, FALSE otherwise
+ * @return bool Returns TRUE on success, FALSE otherwise
* @see acquirePageGenerationLock()
*/
public function releasePageGenerationLock(&$lockObj) {
@@ -3566,7 +3566,7 @@ class TypoScriptFrontendController {
/**
* Determines if there are any INTincScripts to include
*
- * @return boolean Returns TRUE if scripts are found (and not jumpurl)
+ * @return bool Returns TRUE if scripts are found (and not jumpurl)
*/
public function isINTincScript() {
return is_array($this->config['INTincScript']) && !$this->jumpurl;
@@ -3599,7 +3599,7 @@ class TypoScriptFrontendController {
* Determines if content should be outputted.
* Outputting content is done only if jumpUrl is NOT set.
*
- * @return boolean Returns TRUE if $this->jumpurl is not set.
+ * @return bool Returns TRUE if $this->jumpurl is not set.
*/
public function isOutputting() {
// Initialize by status of jumpUrl:
@@ -3737,7 +3737,7 @@ class TypoScriptFrontendController {
* There can be no USER_INT objects on the page ("isINTincScript()") because they implicitly indicate dynamic content
* There can be no logged in user because user sessions are based on a cookie and thereby does not offer client caching a chance to know if the user is logged in. Actually, there will be a reverse problem here; If a page will somehow change when a user is logged in he may not see it correctly if the non-login version sent a cache-header! So do NOT use cache headers in page sections where user logins change the page content. (unless using such as realurl to apply a prefix in case of login sections)
*
- * @return boolean
+ * @return bool
*/
public function isStaticCacheble() {
$doCache = !$this->no_cache && !$this->isINTincScript() && !$this->isUserOrGroupSet();
@@ -3997,7 +3997,7 @@ class TypoScriptFrontendController {
* Checks if a PHPfile may be included.
*
* @param string $incFile Relative path to php file
- * @return boolean Returns TRUE if $GLOBALS['TYPO3_CONF_VARS']['FE']['noPHPscriptInclude'] is not set OR if the file requested for inclusion is found in one of the allowed paths.
+ * @return bool Returns TRUE if $GLOBALS['TYPO3_CONF_VARS']['FE']['noPHPscriptInclude'] is not set OR if the file requested for inclusion is found in one of the allowed paths.
* @see \TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject::includeMakeMenu()
*/
public function checkFileInclude($incFile) {
@@ -4164,7 +4164,7 @@ class TypoScriptFrontendController {
/**
* Returns TRUE if workspace preview is enabled
*
- * @return boolean Returns TRUE if workspace preview is enabled
+ * @return bool Returns TRUE if workspace preview is enabled
*/
public function doWorkspacePreview() {
return $this->workspacePreview !== 0;
@@ -4398,7 +4398,7 @@ class TypoScriptFrontendController {
/**
* Get the cache timeout for the current page.
*
- * @return integer The cache timeout for the current page.
+ * @return int The cache timeout for the current page.
*/
public function get_cache_timeout() {
/** @var $runtimeCache \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend */
@@ -4627,7 +4627,7 @@ class TypoScriptFrontendController {
/**
* Calculates page cache timeout according to the records with starttime/endtime on the page.
*
- * @return integer Page cache timeout or PHP_INT_MAX if cannot be determined
+ * @return int Page cache timeout or PHP_INT_MAX if cannot be determined
*/
protected function calculatePageCacheTimeout() {
$result = PHP_INT_MAX;
@@ -4677,7 +4677,7 @@ class TypoScriptFrontendController {
* @param string $tableDef Table definition (format tablename:pid)
* @param int $now "Now" time value
* @throws \InvalidArgumentException
- * @return integer Value of the next start/stop time or PHP_INT_MAX if not found
+ * @return int Value of the next start/stop time or PHP_INT_MAX if not found
* @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::calculatePageCacheTimeout()
*/
protected function getFirstTimeValueForRecord($tableDef, $now) {
diff --git a/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php b/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
index 7e304939f4da..b93db801a70e 100644
--- a/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
+++ b/typo3/sysext/frontend/Classes/Hooks/TreelistCacheUpdateHooks.php
@@ -162,7 +162,7 @@ class TreelistCacheUpdateHooks {
* Checks whether the change requires an update of the treelist cache
*
* @param array $updatedFields Array of changed fields
- * @return boolean TRUE if the treelist cache needs to be updated, FALSE if no update to the cache is required
+ * @return bool TRUE if the treelist cache needs to be updated, FALSE if no update to the cache is required
*/
protected function requiresUpdate(array $updatedFields) {
$requiresUpdate = FALSE;
diff --git a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
index 4c2e39e99295..3b2ca6ceeaad 100644
--- a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
+++ b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
@@ -725,7 +725,7 @@ class GifBuilder extends \TYPO3\CMS\Core\Imaging\GraphicalFunctions {
* Calculates the value concerning the dimensions of objects.
*
* @param string $string The string to be calculated (e.g. "[20.h]+13")
- * @return integer The calculated value (e.g. "23")
+ * @return int The calculated value (e.g. "23")
* @see calcOffset()
*/
protected function calculateValue($string) {
@@ -789,7 +789,7 @@ class GifBuilder extends \TYPO3\CMS\Core\Imaging\GraphicalFunctions {
* Calculates the maximum of a set of values defined like "[10.h],[20.h],1000"
*
* @param string $string The string to be used to calculate the maximum (e.g. "[10.h],[20.h],1000")
- * @return integer The maxium value of the given comma separated and calculated values
+ * @return int The maxium value of the given comma separated and calculated values
*/
protected function calculateMaximum($string) {
$parts = GeneralUtility::trimExplode(',', $this->calcOffset($string), TRUE);
diff --git a/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProvider.php b/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProvider.php
index b7592b7b7d07..44607a9170a9 100644
--- a/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProvider.php
+++ b/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProvider.php
@@ -78,7 +78,7 @@ class MediaWizardProvider implements MediaWizardProviderInterface {
***********************************************/
/**
* @param string $url
- * @return boolean
+ * @return bool
* @see MediaWizardProviderInterface::canHandle
*/
public function canHandle($url) {
diff --git a/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProviderInterface.php b/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProviderInterface.php
index 3cfc2cf42527..851dd1a90796 100644
--- a/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProviderInterface.php
+++ b/typo3/sysext/frontend/Classes/MediaWizard/MediaWizardProviderInterface.php
@@ -24,7 +24,7 @@ interface MediaWizardProviderInterface {
* Tells the calling party if we can handle the URL passed to the constructor
*
* @param string $url URL to be handled
- * @return boolean
+ * @return bool
*/
public function canHandle($url);
diff --git a/typo3/sysext/frontend/Classes/Page/CacheHashCalculator.php b/typo3/sysext/frontend/Classes/Page/CacheHashCalculator.php
index abe2b0fcf144..2ace2f3d86c8 100644
--- a/typo3/sysext/frontend/Classes/Page/CacheHashCalculator.php
+++ b/typo3/sysext/frontend/Classes/Page/CacheHashCalculator.php
@@ -78,7 +78,7 @@ class CacheHashCalculator implements \TYPO3\CMS\Core\SingletonInterface {
* Checks whether a parameter of the given $queryString requires cHash calculation
*
* @param string $queryString
- * @return boolean
+ * @return bool
*/
public function doParametersRequireCacheHash($queryString) {
if (empty($this->requireCacheHashPresenceParameters)) {
@@ -149,7 +149,7 @@ class CacheHashCalculator implements \TYPO3\CMS\Core\SingletonInterface {
* stristr check added to avoid bad performance
*
* @param string $key
- * @return boolean
+ * @return bool
*/
protected function isAdminPanelParameter($key) {
return stristr($key, 'TSFE_ADMIN_PANEL') !== FALSE && preg_match('/TSFE_ADMIN_PANEL\\[.*?\\]/', $key);
@@ -159,7 +159,7 @@ class CacheHashCalculator implements \TYPO3\CMS\Core\SingletonInterface {
* Checks whether the given parameter is a core parameter
*
* @param string $key
- * @return boolean
+ * @return bool
*/
protected function isCoreParameter($key) {
return \TYPO3\CMS\Core\Utility\GeneralUtility::inList('id,type,no_cache,cHash,MP,ftu', $key);
@@ -169,7 +169,7 @@ class CacheHashCalculator implements \TYPO3\CMS\Core\SingletonInterface {
* Checks whether the given parameter should be exluded from cHash calculation
*
* @param string $key
- * @return boolean
+ * @return bool
*/
protected function isExcludedParameter($key) {
return in_array($key, $this->excludedParameters);
@@ -179,7 +179,7 @@ class CacheHashCalculator implements \TYPO3\CMS\Core\SingletonInterface {
* Checks whether the given parameter is an exclusive parameter for cHash calculation
*
* @param string $key
- * @return boolean
+ * @return bool
*/
protected function isInCachedParametersWhiteList($key) {
return in_array($key, $this->cachedParametersWhiteList);
@@ -188,7 +188,7 @@ class CacheHashCalculator implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Checks whether cachedParametersWhiteList parameters are configured
*
- * @return boolean
+ * @return bool
*/
protected function hasCachedParametersWhiteList() {
return !empty($this->cachedParametersWhiteList);
diff --git a/typo3/sysext/frontend/Classes/Page/PageGenerator.php b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
index f9d66194ee88..87c92bfa1d6d 100644
--- a/typo3/sysext/frontend/Classes/Page/PageGenerator.php
+++ b/typo3/sysext/frontend/Classes/Page/PageGenerator.php
@@ -1051,7 +1051,7 @@ class PageGenerator {
*
* @param string $haystack The string in which to find $needle
* @param string $needle The string to find in $haystack
- * @return boolean Returns TRUE if $needle matches or is found in $haystack
+ * @return bool Returns TRUE if $needle matches or is found in $haystack
*/
static public function isAllowedLinkVarValue($haystack, $needle) {
$OK = FALSE;
diff --git a/typo3/sysext/frontend/Classes/Page/PageRepository.php b/typo3/sysext/frontend/Classes/Page/PageRepository.php
index 013ff6e39309..c355cd2ec79f 100644
--- a/typo3/sysext/frontend/Classes/Page/PageRepository.php
+++ b/typo3/sysext/frontend/Classes/Page/PageRepository.php
@@ -281,7 +281,7 @@ class PageRepository {
* Returns a pagerow for the page with alias $alias
*
* @param string $alias The alias to look up the page uid for.
- * @return integer Returns page uid (integer) if found, otherwise 0 (zero)
+ * @return int Returns page uid (integer) if found, otherwise 0 (zero)
* @see \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController::checkAndSetAlias(), ContentObjectRenderer::typoLink()
*/
public function getPageIdFromAlias($alias) {
@@ -1172,7 +1172,7 @@ class PageRepository {
*
* @param string $table Table name
* @param array $row Row (passed by reference) - only online records...
- * @return boolean TRUE if overlay is made.
+ * @return bool TRUE if overlay is made.
* @see \TYPO3\CMS\Backend\Utility\BackendUtility::movePlhOl()
*/
public function movePlhOL($table, &$row) {
@@ -1287,8 +1287,8 @@ class PageRepository {
/**
* Checks if user has access to workspace.
*
- * @param int $wsid Workspace ID
- * @return boolean <code>TRUE</code> if has access
+ * @param int $wsid Workspace ID
+ * @return bool <code>TRUE</code> if has access
*/
public function checkWorkspaceAccess($wsid) {
if (!$GLOBALS['BE_USER'] || !\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('workspaces')) {
@@ -1360,7 +1360,7 @@ class PageRepository {
* @param string $table TCA tablename
* @param string $field TCA fieldname
* @param mixed $value Current value of the field
- * @return boolean Returns TRUE if a given record field needs to be overlaid
+ * @return bool Returns TRUE if a given record field needs to be overlaid
*/
protected function shouldFieldBeOverlaid($table, $field, $value) {
$l10n_mode = isset($GLOBALS['TCA'][$table]['columns'][$field]['l10n_mode'])
@@ -1386,4 +1386,4 @@ class PageRepository {
return $shouldFieldBeOverlaid;
}
-}
+}
\ No newline at end of file
diff --git a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
index 1360eeca1dbf..1009aee377d5 100644
--- a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
+++ b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
@@ -1136,7 +1136,7 @@ class AbstractPlugin {
*
* @param string $fList List of fields (keys from piVars) to evaluate on
* @param int $lowerThan Limit for the values.
- * @return boolean Returns TRUE (1) if conditions are met.
+ * @return bool Returns TRUE (1) if conditions are met.
*/
public function pi_isOnlyFields($fList, $lowerThan = -1) {
$lowerThan = $lowerThan == -1 ? $this->pi_lowerThan : $lowerThan;
@@ -1158,7 +1158,7 @@ class AbstractPlugin {
* This is an advanced form of evaluation of whether a URL should be cached or not.
*
* @param array $inArray An array with piVars values to evaluate
- * @return boolean Returns TRUE (1) if conditions are met.
+ * @return bool Returns TRUE (1) if conditions are met.
* @see pi_linkTP_keepPIvars()
*/
public function pi_autoCache($inArray) {
diff --git a/typo3/sysext/frontend/Classes/View/AdminPanelView.php b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
index 3a618e7406aa..427e2f5c343f 100644
--- a/typo3/sysext/frontend/Classes/View/AdminPanelView.php
+++ b/typo3/sysext/frontend/Classes/View/AdminPanelView.php
@@ -107,7 +107,7 @@ class AdminPanelView {
* Checks if a Admin Panel section ("module") is available for the user. If so, TRUE is returned.
*
* @param string $key The module key, eg. "edit", "preview", "info" etc.
- * @return boolean
+ * @return bool
*/
public function isAdminModuleEnabled($key) {
$result = FALSE;
@@ -198,7 +198,7 @@ class AdminPanelView {
* Returns TRUE if admin panel module is open
*
* @param string $key Module key
- * @return boolean TRUE, if the admin panel is open for the specified admin panel module key.
+ * @return bool TRUE, if the admin panel is open for the specified admin panel module key.
*/
public function isAdminModuleOpen($key) {
return $GLOBALS['BE_USER']->uc['TSFE_adminConfig']['display_top'] && $GLOBALS['BE_USER']->uc['TSFE_adminConfig']['display_' . $key];
diff --git a/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php b/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
index f79d773028dc..e4072ae48775 100644
--- a/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
@@ -76,7 +76,7 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
/**
* Tests whether a condition matches Internet Explorer 7 on Windows.
*
- * @return void
+ * @return void
* @test
*/
public function conditionMatchesInternetExplorer7Windows() {
@@ -88,7 +88,7 @@ class ConditionMatcherTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
/**
* Tests whether a condition does not match Internet Explorer 7 on Windows.
*
- * @return void
+ * @return void
* @test
*/
public function conditionDoesNotMatchInternetExplorer7Windows() {
diff --git a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
index 02efc5165ff5..864401c8815e 100644
--- a/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
+++ b/typo3/sysext/impexp/Classes/Controller/ImportExportController.php
@@ -1257,7 +1257,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
* Gets the default folder path for temporary uploads,
* e.g. 'fileadmin/user_uploads/_temp_/importexport/'
*
- * @return boolean|string Path or FALSE otherwise
+ * @return bool|string Path or FALSE otherwise
* @deprecated since TYPO3 CMS 6.2, will be removed two versions later - use getDefaultImportExportFolder() instead
*/
public function userTempFolder() {
diff --git a/typo3/sysext/impexp/Classes/ImportExport.php b/typo3/sysext/impexp/Classes/ImportExport.php
index a6feb0d902e9..9668e4c4ea83 100644
--- a/typo3/sysext/impexp/Classes/ImportExport.php
+++ b/typo3/sysext/impexp/Classes/ImportExport.php
@@ -1430,7 +1430,7 @@ class ImportExport {
/**
* Returns TRUE if the output should be compressed.
*
- * @return boolean TRUE if compression is possible AND requested.
+ * @return bool TRUE if compression is possible AND requested.
*/
public function doOutputCompress() {
return $this->compress && !$this->dontCompress;
@@ -2849,7 +2849,7 @@ class ImportExport {
* @param string $fileName Absolute filename inside PATH_site to write to
* @param string $fileID File ID from import memory
* @param bool $bypassMountCheck Bypasses the checking against filemounts - only for RTE files!
- * @return boolean Returns TRUE if it went well. Notice that the content of the file is read again, and md5 from import memory is validated.
+ * @return bool Returns TRUE if it went well. Notice that the content of the file is read again, and md5 from import memory is validated.
*/
public function writeFileVerify($fileName, $fileID, $bypassMountCheck = FALSE) {
$fileProcObj = $this->getFileProcObj();
@@ -3034,7 +3034,7 @@ class ImportExport {
* Returns TRUE if directory exists and if it doesn't it will create directory and return TRUE if that succeeded.
*
* @param string $dirPrefix Directory to create. Having a trailing slash. Must be in fileadmin/. Relative to PATH_site
- * @return boolean TRUE, if directory exists (was created)
+ * @return bool TRUE, if directory exists (was created)
*/
public function checkOrCreateDir($dirPrefix) {
// Split dir path and remove first directory (which should be "fileadmin")
@@ -3103,7 +3103,7 @@ class ImportExport {
*
* @param string $filename Filename, absolute
* @param bool $all If set, all information is loaded (header, records and files). Otherwise the default is to read only the header information
- * @return boolean TRUE if the operation went well
+ * @return bool TRUE if the operation went well
*/
public function loadFile($filename, $all = FALSE) {
if (!@is_file($filename)) {
@@ -3818,7 +3818,7 @@ class ImportExport {
*
* @param string $checkTable Table name to check
* @param int $doktype doktype value.
- * @return boolean TRUE if OK
+ * @return bool TRUE if OK
*/
public function checkDokType($checkTable, $doktype) {
global $PAGES_TYPES;
@@ -3917,7 +3917,7 @@ class ImportExport {
* Returns TRUE if the input table name is to be regarded as a static relation (that is, not exported etc).
*
* @param string $table Table name
- * @return boolean TRUE, if table is marked static
+ * @return bool TRUE, if table is marked static
*/
public function isTableStatic($table) {
if (is_array($GLOBALS['TCA'][$table])) {
@@ -3930,7 +3930,7 @@ class ImportExport {
* Returns TRUE if the input table name is to be included as relation
*
* @param string $table Table name
- * @return boolean TRUE, if table is marked static
+ * @return bool TRUE, if table is marked static
*/
public function inclRelation($table) {
return is_array($GLOBALS['TCA'][$table])
@@ -3943,7 +3943,7 @@ class ImportExport {
*
* @param string $table Table name
* @param int $uid UID value
- * @return boolean TRUE, if table is marked static
+ * @return bool TRUE, if table is marked static
*/
public function isExcluded($table, $uid) {
return (bool)$this->excludeMap[$table . ':' . $uid];
@@ -3953,7 +3953,7 @@ class ImportExport {
* Returns TRUE if soft reference should be included in exported file.
*
* @param string $tokenID Token ID for soft reference
- * @return boolean TRUE if softreference media should be included
+ * @return bool TRUE if softreference media should be included
*/
public function includeSoftref($tokenID) {
return $tokenID && !GeneralUtility::inList('exclude,editable', $this->softrefCfg[$tokenID]['mode']);
@@ -3963,7 +3963,7 @@ class ImportExport {
* Checking if a PID is in the webmounts of the user
*
* @param int $pid Page ID to check
- * @return boolean TRUE if OK
+ * @return bool TRUE if OK
*/
public function checkPID($pid) {
if (!isset($this->checkPID_cache[$pid])) {
@@ -3977,7 +3977,7 @@ class ImportExport {
*
* @param string $table Table name
* @param int $uid Uid or record
- * @return boolean TRUE if the position of the record should be updated to match the one in the import structure
+ * @return bool TRUE if the position of the record should be updated to match the one in the import structure
*/
public function dontIgnorePid($table, $uid) {
return $this->import_mode[$table . ':' . $uid] !== 'ignore_pid' && (!$this->global_ignore_pid || $this->import_mode[$table . ':' . $uid] === 'respect_pid');
diff --git a/typo3/sysext/impexp/Tests/Functional/Import/AbstractImportTestCase.php b/typo3/sysext/impexp/Tests/Functional/Import/AbstractImportTestCase.php
index 9c87e827850b..4a3292ec90da 100644
--- a/typo3/sysext/impexp/Tests/Functional/Import/AbstractImportTestCase.php
+++ b/typo3/sysext/impexp/Tests/Functional/Import/AbstractImportTestCase.php
@@ -68,7 +68,7 @@ abstract class AbstractImportTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
/**
* Test if the local filesystem is case sensitive
*
- * @return boolean
+ * @return bool
*/
protected function isCaseSensitiveFilesystem() {
$caseSensitive = TRUE;
diff --git a/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php b/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
index 59e11d6c6ff1..e1281825c98f 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/IndexedPagesController.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Indexing class for TYPO3 frontend
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionModule {
@@ -61,7 +61,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Initialize menu array internally
*
- * @return void
+ * @return void
*/
public function modMenu() {
global $LANG;
@@ -84,7 +84,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Produces main content of the module
*
- * @return string HTML output
+ * @return string HTML output
*/
public function main() {
// Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
@@ -166,7 +166,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Produces a table with indexing information for each page.
*
- * @return string HTML output
+ * @return string HTML output
*/
public function drawTableOfIndexedPages() {
global $BACK_PATH;
@@ -202,9 +202,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Create information table row for a page regarding indexing information.
*
- * @param array Data array for this page
- * @param string HTML content for first column (page tree icon etc.)
- * @return string HTML code. (table row)
+ * @param array Data array for this page
+ * @param string HTML content for first column (page tree icon etc.)
+ * @return string HTML code. (table row)
*/
public function indexed_info($data, $firstColContent) {
// Query:
@@ -271,10 +271,10 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Render a single row of information about a indexing entry.
*
- * @param array Row from query (combined phash table with sections etc).
- * @param bool Set if grouped to previous result; the icon of the element is not shown again.
- * @param array Array of index_grlist records.
- * @return array Array of table rows.
+ * @param array Row from query (combined phash table with sections etc).
+ * @param bool Set if grouped to previous result; the icon of the element is not shown again.
+ * @param array Array of index_grlist records.
+ * @return array Array of table rows.
* @see indexed_info()
*/
public function printPhashRow($row, $grouping = 0, $extraGrListRows) {
@@ -386,7 +386,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Creates the header row for the table
*
- * @return string HTML string (table row)
+ * @return string HTML string (table row)
*/
public function printPhashRowHeader() {
$lines = array();
@@ -437,7 +437,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Returns the number of columns depending on display type of list
*
- * @return integer Number of columns in list:
+ * @return int Number of columns in list:
*/
public function returnNumberOfColumns() {
switch ($this->pObj->MOD_SETTINGS['type']) {
@@ -460,8 +460,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Showing details for a particular phash row
*
- * @param int phash value to display details for.
- * @return string HTML content
+ * @param int phash value to display details for.
+ * @return string HTML content
*/
public function showDetailsForPhash($phash) {
$content = '';
@@ -517,11 +517,11 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Create table with list of words from $ftrows
*
- * @param array Array of records selected from index_rel/index_words
- * @param string Header string to show before table.
- * @param bool If set, the stopWord checkboxes will be shown in the word list. Only for admins. (because it is a global setting, not per-site).
- * @param array The page record from which to load the keywords, if any.
- * @return string HTML table
+ * @param array Array of records selected from index_rel/index_words
+ * @param string Header string to show before table.
+ * @param bool If set, the stopWord checkboxes will be shown in the word list. Only for admins. (because it is a global setting, not per-site).
+ * @param array The page record from which to load the keywords, if any.
+ * @return string HTML table
*/
public function listWords($ftrows, $header, $stopWordBoxes = FALSE, $page = '') {
// Prepare keywords:
@@ -562,9 +562,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Displays table of metaphone groups larger than 1
*
- * @param array Result from word selection (index_rel/index_words)
- * @param string Header string
- * @return string HTML table
+ * @param array Result from word selection (index_rel/index_words)
+ * @param string Header string
+ * @return string HTML table
*/
public function listMetaphoneStat($ftrows, $header) {
$trows = '';
@@ -596,9 +596,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Wraps input string in a link that will display details for the word. Eg. which other pages has the word, metaphone associations etc.
*
- * @param string String to wrap, possibly a title or so.
- * @param int wid value to show details for
- * @return string Wrapped string
+ * @param string String to wrap, possibly a title or so.
+ * @param int wid value to show details for
+ * @return string Wrapped string
*/
public function linkWordDetails($string, $wid) {
return '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('wid' => $wid, 'phash' => ''))) . '">' . $string . '</a>';
@@ -607,9 +607,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Wraps input string in a link to see more details for metaphone value
*
- * @param string String to wrap
- * @param int Metaphone value
- * @return string Wrapped string
+ * @param string String to wrap
+ * @param int Metaphone value
+ * @return string Wrapped string
*/
public function linkMetaPhoneDetails($string, $metaphone) {
return '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('metaphone' => $metaphone, 'wid' => '', 'phash' => ''))) . '">' . $string . '</a>';
@@ -618,8 +618,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Creates message for flag value
*
- * @param int Flags integer
- * @return string Message string
+ * @param int Flags integer
+ * @return string Message string
*/
public function flagsMsg($flags) {
if ($flags > 0) {
@@ -635,8 +635,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Show details for words
*
- * @param int Word ID (wid)
- * @return string HTML content
+ * @param int Word ID (wid)
+ * @return string HTML content
*/
public function showDetailsForWord($wid) {
// Select references to this word
@@ -678,8 +678,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Show details for metaphone value
*
- * @param int Metaphone integer hash
- * @return string HTML content
+ * @param int Metaphone integer hash
+ * @return string HTML content
*/
public function showDetailsForMetaphone($metaphone) {
// Finding top-20 on frequency for this phash:
@@ -720,9 +720,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Creates icon which clears indexes for a certain list of phash values.
*
- * @param string List of phash integers
- * @param string Alt-text for the garbage bin icon.
- * @return string HTML img-tag with link around.
+ * @param string List of phash integers
+ * @param string Alt-text for the garbage bin icon.
+ * @return string HTML img-tag with link around.
*/
public function printRemoveIndexed($phash, $alt) {
return '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('deletePhash' => $phash))) . '" title="' . htmlspecialchars($alt) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-edit-delete') . '</a>';
@@ -731,9 +731,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Button for re-indexing of documents
*
- * @param array phash table result row.
- * @param string Title attribute text for icon
- * @return string HTML content; Icon wrapped in link.
+ * @param array phash table result row.
+ * @param string Title attribute text for icon
+ * @return string HTML content; Icon wrapped in link.
*/
public function printReindex($resultRow, $alt) {
if ($resultRow['item_type'] && $resultRow['item_type'] !== '0') {
@@ -744,9 +744,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Wraps input string in a link that will display details for the phash value set.
*
- * @param string String to wrap, possibly a title or so.
- * @param int phash value to show details for
- * @return string Wrapped string
+ * @param string String to wrap, possibly a title or so.
+ * @param int phash value to show details for
+ * @return string Wrapped string
*/
public function linkDetails($string, $phash) {
return '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('phash' => $phash))) . '">' . $string . '</a>';
@@ -755,7 +755,7 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Creates link back to listing
*
- * @return string Link back to list
+ * @return string Link back to list
*/
public function linkList() {
return '<br /><a href="' . htmlspecialchars(BackendUtility::getModuleUrl('web_info', array('id' => $this->pObj->id))) . '">Back to list.</a><br />';
@@ -764,9 +764,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Wraps input string in a link that will display details for the phash value set.
*
- * @param string String to wrap, possibly a title or so.
- * @param int phash value to show details for
- * @return string Wrapped string
+ * @param string String to wrap, possibly a title or so.
+ * @param int phash value to show details for
+ * @return string Wrapped string
*/
public function showPageDetails($string, $id) {
return '<a href="' . htmlspecialchars(BackendUtility::getModuleUrl('web_info', array('id' => $id, 'SET' => array('depth' => 0, 'type' => 1)))) . '">' . $string . '</a>';
@@ -775,8 +775,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Prints the gr_lists attached to a indexed entry.
*
- * @param array Array of index_grlist records
- * @return string HTML code.
+ * @param array Array of index_grlist records
+ * @return string HTML code.
*/
public function printExtraGrListRows($extraGrListRows) {
if (count($extraGrListRows)) {
@@ -791,8 +791,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Print path for indexing
*
- * @param array Result row with content from index_section
- * @return string Rootline information
+ * @param array Result row with content from index_section
+ * @return string Rootline information
*/
public function printRootlineInfo($row) {
$uidCollection = array();
@@ -821,9 +821,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Return icon for file extension
*
- * @param string File extension / item type
- * @param string Title attribute value in icon.
- * @return string <img> tag for icon
+ * @param string File extension / item type
+ * @param string Title attribute value in icon.
+ * @return string <img> tag for icon
*/
public function makeItemTypeIcon($it, $alt = '') {
if (!isset($this->iconFileNameCache[$it])) {
@@ -850,9 +850,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Re-indexing files/records attached to a page.
*
- * @param int Phash value
- * @param int The page uid for the section record (file/url could appear more than one place you know...)
- * @return string HTML content
+ * @param int Phash value
+ * @param int The page uid for the section record (file/url could appear more than one place you know...)
+ * @return string HTML content
*/
public function reindexPhash($phash, $pageId) {
// Query:
@@ -891,8 +891,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
* Get rootline for closest TypoScript template root.
* Algorithm same as used in Web > Template, Object browser
*
- * @param int The page id to traverse rootline back from
- * @return array Array where the root lines uid values are found.
+ * @param int The page id to traverse rootline back from
+ * @return array Array where the root lines uid values are found.
*/
public function getUidRootLineForClosestTemplate($id) {
$tmpl = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\ExtendedTemplateService');
@@ -921,9 +921,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Removes ALL data regarding a certain list of indexed phash-row
*
- * @param string List of phash integers
- * @param bool If set, page cache is cleared as well.
- * @return void
+ * @param string List of phash integers
+ * @param bool If set, page cache is cleared as well.
+ * @return void
*/
public function removeIndexedPhashRow($phashList, $clearPageCache = 1) {
// FIXME: This is only a workaround
@@ -963,9 +963,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Returns an array with gr_list records for a phash
*
- * @param int phash integer to look up on
- * @param string gr_list string to filter OUT of the result (first occurence)
- * @return array Array of records from index_grlist table
+ * @param int phash integer to look up on
+ * @param string gr_list string to filter OUT of the result (first occurence)
+ * @return array Array of records from index_grlist table
*/
public function getGrListEntriesForPhash($phash, $gr_list) {
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'index_grlist', 'phash=' . (int)$phash);
@@ -984,8 +984,8 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Setting / Unsetting stopwords
*
- * @param array Array of stop-words WIDs with 0/1 to set / unset
- * @return void
+ * @param array Array of stop-words WIDs with 0/1 to set / unset
+ * @return void
*/
public function processStopWords($stopWords) {
if ($GLOBALS['BE_USER']->isAdmin()) {
@@ -1002,9 +1002,9 @@ class IndexedPagesController extends \TYPO3\CMS\Backend\Module\AbstractFunctionM
/**
* Setting / Unsetting keywords in page header
*
- * @param array Page keywords as keys in array with value 0 or 1 for set or unset.
- * @param int The page uid of the header where the keywords are to be set.
- * @return void
+ * @param array Page keywords as keys in array with value 0 or 1 for set or unset.
+ * @param int The page uid of the header where the keywords are to be set.
+ * @return void
*/
public function processPageKeywords($pageKeywords, $pageUid) {
// Get pages current keywords
diff --git a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
index 3e676b77ea05..90dee0d085de 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/IndexingStatisticsController.php
@@ -32,7 +32,7 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
/**
* Calls showStats to generate output.
*
- * @return string html table with results from showStats()
+ * @return string html table with results from showStats()
*/
public function main() {
// Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
@@ -49,7 +49,7 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
* Generates html table containing the statistics.
* Calls listSeveralStats 3 times, for all statistics, statistics of the last 30 days and statistics of the last 24 hours.
*
- * @return string html table with results
+ * @return string html table with results
*/
public function showStats() {
$conf['words'] = 50;
@@ -81,10 +81,10 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
/**
* Generates html table with title and several statistics
*
- * @param string title for statistic, like 'Last 30 days' or 'Last 24 hours'
- * @param string add where for sql query
- * @param array configuration: words = max words for results, bid = pageid
- * @return string html table with results
+ * @param string title for statistic, like 'Last 30 days' or 'Last 24 hours'
+ * @param string add where for sql query
+ * @param array configuration: words = max words for results, bid = pageid
+ * @return string html table with results
*/
public function listSeveralStats($title, $addwhere, $conf) {
global $LANG;
@@ -134,11 +134,11 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
* Generates a list of Page-uid's from $id. List does not include $id itself
* The only pages excluded from the list are deleted pages.
*
- * @param int Start page id
- * @param int Depth to traverse down the page tree.
- * @param int $begin is an optional integer that determines at which level in the tree to start collecting uid's. Zero means 'start right away', 1 = 'next level and out'
- * @param string Perms clause
- * @return string Returns the list with a comma in the end (if any pages selected!)
+ * @param int Start page id
+ * @param int Depth to traverse down the page tree.
+ * @param int $begin is an optional integer that determines at which level in the tree to start collecting uid's. Zero means 'start right away', 1 = 'next level and out'
+ * @param string Perms clause
+ * @return string Returns the list with a comma in the end (if any pages selected!)
*/
public function extGetTreeList($id, $depth, $begin = 0, $perms_clause) {
return GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\FrontendBackendUserAuthentication')->extGetTreeList($id, $depth, $begin, $perms_clause);
@@ -147,8 +147,8 @@ class IndexingStatisticsController extends \TYPO3\CMS\Backend\Module\AbstractFun
/**
* Returns an object reference to the hook object if any
*
- * @param string Name of the function you want to call / hook key
- * @return object Hook object, if any. Otherwise NULL.
+ * @param string Name of the function you want to call / hook key
+ * @return object Hook object, if any. Otherwise NULL.
* @author Kasper Skårhøj
*/
public function hookRequest($functionName) {
diff --git a/typo3/sysext/indexed_search/Classes/Controller/ModuleController.php b/typo3/sysext/indexed_search/Classes/Controller/ModuleController.php
index c7c495973c0d..d771c199657f 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/ModuleController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/ModuleController.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
/**
* Backend module providing boring statistics of the index-tables.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class ModuleController {
@@ -66,7 +66,7 @@ class ModuleController {
/**
* Initialization
*
- * @return void
+ * @return void
*/
public function init() {
$this->MCONF = $GLOBALS['MCONF'];
@@ -91,7 +91,7 @@ class ModuleController {
* If empty string it's just a variable, that'll be saved.
* Values NOT in this array will not be saved in the settings-array for the module.
*
- * @return void
+ * @return void
*/
public function menuConfig() {
$this->MOD_MENU = array(
@@ -108,7 +108,7 @@ class ModuleController {
/**
* Main function to generate the content
*
- * @return void
+ * @return void
*/
public function main() {
$this->content = $this->doc->header('Indexing Engine Statistics');
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
index 081404d39d18..70c9cf5a1317 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
@@ -22,9 +22,9 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
* Creates a searchform for indexed search. Indexing must be enabled
* for this to make sense.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @author Christian Jul Jensen <christian@typo3.com>
- * @author Benjamin Mack <benni@typo3.org>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Christian Jul Jensen <christian@typo3.com>
+ * @author Benjamin Mack <benni@typo3.org>
*/
class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController {
@@ -646,11 +646,11 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
/**
* Write statistics information to database for the search operation
*
- * @param array search params
- * @param array Search Word array
- * @param int Number of hits
- * @param int Milliseconds the search took
- * @return void
+ * @param array search params
+ * @param array Search Word array
+ * @param int Number of hits
+ * @param int Milliseconds the search took
+ * @return void
*/
protected function writeSearchStat($searchParams, $searchWords, $count, $pt) {
$insertFields = array(
@@ -1275,7 +1275,7 @@ class SearchController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionControlle
* Returns if an item type is a multipage item type
*
* @param string $item_type Item type
- * @return boolean TRUE if multipage capable
+ * @return bool TRUE if multipage capable
*/
protected function multiplePagesType($item_type) {
return is_object($this->externalParsers[$item_type]) && $this->externalParsers[$item_type]->isMultiplePageExtension($item_type);
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
index 42cd0dedf656..27ab3882d08c 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchFormController.php
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
* Creates a searchform for indexed search. Indexing must be enabled
* for this to make sense.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
@@ -104,9 +104,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Main function, called from TypoScript as a USER_INT object.
*
- * @param string Content input, ignore (just put blank string)
- * @param array TypoScript configuration of the plugin!
- * @return string HTML code for the search form / result display.
+ * @param string Content input, ignore (just put blank string)
+ * @param array TypoScript configuration of the plugin!
+ * @return string HTML code for the search form / result display.
*/
public function main($content, $conf) {
// Initialize:
@@ -128,7 +128,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Initialize internal variables, especially selector box values for the search form and search words
*
- * @return void
+ * @return void
*/
public function initialize() {
global $TYPO3_CONF_VARS;
@@ -338,8 +338,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
*
* $defOp is the default operator. 1=OR, 0=AND
*
- * @param bool If TRUE, the default operator will be OR, not AND
- * @return array Returns array with search words if any found
+ * @param bool If TRUE, the default operator will be OR, not AND
+ * @return array Returns array with search words if any found
*/
public function getSearchWords($defOp) {
// Shorten search-word string to max 200 bytes (does NOT take multibyte charsets into account - but never mind, shortening the string here is only a run-away feature!)
@@ -371,8 +371,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
* Post-process the search word array so it will match the words that was indexed (including case-folding if any)
* If any words are splitted into multiple words (eg. CJK will be!) the operator of the main word will remain.
*
- * @param array Search word array
- * @return array Search word array, processed through lexer
+ * @param array Search word array
+ * @return array Search word array, processed through lexer
*/
public function procSearchWordsByLexer($SWArr) {
// Init output variable:
@@ -403,8 +403,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Performs the search, the display and writing stats
*
- * @param array Search words in array, see ->getSearchWords() for details
- * @return string HTML for result display.
+ * @param array Search words in array, see ->getSearchWords() for details
+ * @return string HTML for result display.
*/
public function doSearch($sWArr) {
// Find free index uid:
@@ -557,8 +557,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Gets a SQL result pointer to traverse for the search records.
*
- * @param array Search words
- * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+ * @param array Search words
+ * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
* @return pointer
*/
public function getResultRows_SQLpointer($sWArr, $freeIndexUid = -1) {
@@ -579,10 +579,10 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Compiles the HTML display of the incoming array of result rows.
*
- * @param array Search words array (for display of text describing what was searched for)
- * @param array Array with result rows, count, first row.
- * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
- * @return string HTML content to display result.
+ * @param array Search words array (for display of text describing what was searched for)
+ * @param array Array with result rows, count, first row.
+ * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+ * @return string HTML content to display result.
*/
public function getDisplayResults($sWArr, $resData, $freeIndexUid = -1) {
// Perform display of result rows array:
@@ -624,9 +624,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
* Takes the array with resultrows as input and returns the result-HTML-code
* Takes the "group" var into account: Makes a "section" or "flat" display.
*
- * @param array Result rows
- * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
- * @return string HTML
+ * @param array Result rows
+ * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+ * @return string HTML
*/
public function compileResult($resultRows, $freeIndexUid = -1) {
$content = '';
@@ -715,8 +715,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
* Returns a COMPLETE list of phash-integers matching the search-result composed of the search-words in the sWArr array.
* The list of phash integers are unsorted and should be used for subsequent selection of index_phash records for display of the result.
*
- * @param array Search word array
- * @return string List of integers
+ * @param array Search word array
+ * @return string List of integers
*/
public function getPhashList($sWArr) {
// Initialize variables:
@@ -804,9 +804,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns a query which selects the search-word from the word/rel tables.
*
- * @param string WHERE clause selecting the word from phash
- * @param string Additional AND clause in the end of the query.
- * @return pointer SQL result pointer
+ * @param string WHERE clause selecting the word from phash
+ * @param string Additional AND clause in the end of the query.
+ * @return pointer SQL result pointer
*/
public function execPHashListQuery($wordSel, $plusQ = '') {
return $GLOBALS['TYPO3_DB']->exec_SELECTquery('IR.phash', 'index_words IW,
@@ -876,7 +876,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns AND statement for selection of section in database. (rootlevel 0-2 + page_id)
*
- * @return string AND clause for selection of section in database.
+ * @return string AND clause for selection of section in database.
*/
public function sectionTableWhere() {
$out = $this->wholeSiteIdList < 0 ? '' : ' AND ISEC.rl0 IN (' . $this->wholeSiteIdList . ')';
@@ -923,7 +923,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns AND statement for selection of media type
*
- * @return string AND statement for selection of media type
+ * @return string AND statement for selection of media type
*/
public function mediaTypeWhere() {
switch ((string) $this->piVars['media']) {
@@ -948,7 +948,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns AND statement for selection of langauge
*
- * @return string AND statement for selection of langauge
+ * @return string AND statement for selection of langauge
*/
public function languageWhere() {
if ($this->piVars['lang'] >= 0) {
@@ -960,8 +960,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Where-clause for free index-uid value.
*
- * @param int Free Index UID value to limit search to.
- * @return string WHERE SQL clause part.
+ * @param int Free Index UID value to limit search to.
+ * @return string WHERE SQL clause part.
*/
public function freeIndexUidWhere($freeIndexUid) {
if ($freeIndexUid >= 0) {
@@ -999,9 +999,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Execute final query, based on phash integer list. The main point is sorting the result in the right order.
*
- * @param string List of phash integers which match the search.
- * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
- * @return pointer Query result pointer
+ * @param string List of phash integers which match the search.
+ * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+ * @return pointer Query result pointer
*/
public function execFinalQuery($list, $freeIndexUid = -1) {
// Setting up methods of filtering results based on page types, access, etc.
@@ -1102,8 +1102,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
* Checking if the resume can be shown for the search result (depending on whether the rights are OK)
* ? Should it also check for gr_list "0,-1"?
*
- * @param array Result row array.
- * @return boolean Returns TRUE if resume can safely be shown
+ * @param array Result row array.
+ * @return bool Returns TRUE if resume can safely be shown
*/
public function checkResume($row) {
// If the record is indexed by an indexing configuration, just show it.
@@ -1153,8 +1153,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
* Check if the record is still available or if it has been deleted meanwhile.
* Currently this works for files only, since extending it to page content would cause a lot of overhead.
*
- * @param array Result row array
- * @return boolean Returns TRUE if record is still available
+ * @param array Result row array
+ * @return bool Returns TRUE if record is still available
*/
public function checkExistance($row) {
$recordExists = TRUE;
@@ -1171,8 +1171,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns "DESC" or "" depending on the settings of the incoming highest/lowest result order (piVars['desc']
*
- * @param bool If TRUE, inverse the order which is defined by piVars['desc']
- * @return string " DESC" or
+ * @param bool If TRUE, inverse the order which is defined by piVars['desc']
+ * @return string " DESC" or
*/
public function isDescending($inverse = FALSE) {
$desc = $this->piVars['desc'];
@@ -1185,10 +1185,10 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Write statistics information to database for the search operation
*
- * @param array Search Word array
- * @param int Number of hits
- * @param int Milliseconds the search took
- * @return void
+ * @param array Search Word array
+ * @param int Number of hits
+ * @param int Milliseconds the search took
+ * @return void
*/
public function writeSearchStat($sWArr, $count, $pt) {
$insertFields = array(
@@ -1228,8 +1228,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Make search form HTML
*
- * @param array Value/Labels pairs for search form selector boxes.
- * @return string Search form HTML
+ * @param array Value/Labels pairs for search form selector boxes.
+ * @return string Search form HTML
*/
public function makeSearchForm($optValues) {
$html = $this->cObj->getSubpart($this->templateCode, '###SEARCH_FORM###');
@@ -1355,9 +1355,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Function, rendering selector box values.
*
- * @param string Current value
- * @param array Array with the options as key=>value pairs
- * @return string <options> imploded.
+ * @param string Current value
+ * @param array Array with the options as key=>value pairs
+ * @return string <options> imploded.
*/
public function renderSelectBoxValues($value, $optValues) {
if (is_array($optValues)) {
@@ -1377,7 +1377,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Print the searching rules
*
- * @return string Rules for the search
+ * @return string Rules for the search
*/
public function printRules() {
if ($this->conf['show.']['rules']) {
@@ -1415,10 +1415,10 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns the section header of the search result.
*
- * @param string ID for the section (used for anchor link)
- * @param string Section title with linked wrapped around
- * @param int Number of results in section
- * @return string HTML output
+ * @param string ID for the section (used for anchor link)
+ * @param string Section title with linked wrapped around
+ * @param int Number of results in section
+ * @return string HTML output
*/
public function makeSectionHeader($id, $sectionTitleLinked, $countResultRows) {
$html = $this->cObj->getSubpart($this->templateCode, '###SECTION_HEADER###');
@@ -1433,9 +1433,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* This prints a single result row, including a recursive call for subrows.
*
- * @param array Search result row
- * @param int 1=Display only header (for sub-rows!), 2=nothing at all
- * @return string HTML code
+ * @param array Search result row
+ * @param int 1=Display only header (for sub-rows!), 2=nothing at all
+ * @return string HTML code
*/
public function printResultRow($row, $headerOnly = 0) {
// Get template content:
@@ -1563,9 +1563,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Preparing template data for the result row output
*
- * @param array Result row
- * @param bool If set, display only header of result (for sub-results)
- * @return array Array with data to insert in result row template
+ * @param array Result row
+ * @param bool If set, display only header of result (for sub-results)
+ * @return array Array with data to insert in result row template
*/
public function prepareResultRowTemplateData($row, $headerOnly) {
// Initialize:
@@ -1620,8 +1620,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns a string that tells which search words are searched for.
*
- * @param array Array of search words
- * @return string HTML telling what is searched for.
+ * @param array Array of search words
+ * @return string HTML telling what is searched for.
*/
public function tellUsWhatIsSeachedFor($sWArr) {
// Init:
@@ -1652,8 +1652,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Wraps the search words in the search-word list display (from ->tellUsWhatIsSeachedFor())
*
- * @param string search word to wrap (in local charset!)
- * @return string Search word wrapped in <span> tag.
+ * @param string search word to wrap (in local charset!)
+ * @return string Search word wrapped in <span> tag.
*/
public function wrapSW($str) {
return '"<span' . $this->pi_classParam('sw') . '>' . htmlspecialchars($str) . '</span>"';
@@ -1662,10 +1662,10 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Makes a selector box
*
- * @param string Name of selector box
- * @param string Current value
- * @param array Array of options in the selector box (value => label pairs)
- * @return string HTML of selector box
+ * @param string Name of selector box
+ * @param string Current value
+ * @param array Array of options in the selector box (value => label pairs)
+ * @return string HTML of selector box
*/
public function renderSelectBox($name, $value, $optValues) {
if (is_array($optValues)) {
@@ -1686,10 +1686,10 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
* Used to make the link for the result-browser.
* Notice how the links must resubmit the form after setting the new pointer-value in a hidden formfield.
*
- * @param string String to wrap in <a> tag
- * @param int Pointer value
- * @param string List of integers pointing to free indexing configurations to search. -1 represents no filtering, 0 represents TYPO3 pages only, any number above zero is a uid of an indexing configuration!
- * @return string Input string wrapped in <a> tag with onclick event attribute set.
+ * @param string String to wrap in <a> tag
+ * @param int Pointer value
+ * @param string List of integers pointing to free indexing configurations to search. -1 represents no filtering, 0 represents TYPO3 pages only, any number above zero is a uid of an indexing configuration!
+ * @return string Input string wrapped in <a> tag with onclick event attribute set.
*/
public function makePointerSelector_link($str, $p, $freeIndexUid) {
$onclick = 'document.getElementById(\'' . $this->prefixId . '_pointer\').value=\'' . $p . '\';' . 'document.getElementById(\'' . $this->prefixId . '_freeIndexUid\').value=\'' . rawurlencode($freeIndexUid) . '\';' . 'document.getElementById(\'' . $this->prefixId . '\').submit();return false;';
@@ -1699,10 +1699,10 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Return icon for file extension
*
- * @param string File extension / item type
- * @param string Title attribute value in icon.
- * @param array TypoScript configuration specifically for search result.
- * @return string <img> tag for icon
+ * @param string File extension / item type
+ * @param string Title attribute value in icon.
+ * @param array TypoScript configuration specifically for search result.
+ * @return string <img> tag for icon
*/
public function makeItemTypeIcon($it, $alt = '', $specRowConf) {
// Build compound key if item type is 0, iconRendering is not used
@@ -1744,8 +1744,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Return the rating-HTML code for the result row. This makes use of the $this->firstRow
*
- * @param array Result row array
- * @return string String showing ranking value
+ * @param array Result row array
+ * @return string String showing ranking value
*/
public function makeRating($row) {
switch ((string) $this->piVars['order']) {
@@ -1791,10 +1791,10 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns the resume for the search-result.
*
- * @param array Search result row
- * @param bool If noMarkup is FALSE, then the index_fulltext table is used to select the content of the page, split it with regex to display the search words in the text.
- * @param int String length
- * @return string HTML string ...
+ * @param array Search result row
+ * @param bool If noMarkup is FALSE, then the index_fulltext table is used to select the content of the page, split it with regex to display the search words in the text.
+ * @param int String length
+ * @return string HTML string ...
*/
public function makeDescription($row, $noMarkup = 0, $lgd = 180) {
if ($row['show_resume']) {
@@ -1828,8 +1828,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Marks up the search words from $this->sWarr in the $str with a color.
*
- * @param string Text in which to find and mark up search words. This text is assumed to be UTF-8 like the search words internally is.
- * @return string Processed content.
+ * @param string Text in which to find and mark up search words. This text is assumed to be UTF-8 like the search words internally is.
+ * @return string Processed content.
*/
public function markupSWpartsOfString($str) {
// Init:
@@ -1897,8 +1897,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns the title of the search result row
*
- * @param array Result row
- * @return string Title from row
+ * @param array Result row
+ * @return string Title from row
*/
public function makeTitle($row) {
$add = '';
@@ -1918,9 +1918,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns the info-string in the bottom of the result-row display (size, dates, path)
*
- * @param array Result row
- * @param array Template array to modify
- * @return array Modified template array
+ * @param array Result row
+ * @param array Template array to modify
+ * @return array Modified template array
*/
public function makeInfo($row, $tmplArray) {
$tmplArray['size'] = GeneralUtility::formatSize($row['item_size']);
@@ -1950,8 +1950,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns configuration from TypoScript for result row based on ID / location in page tree!
*
- * @param array Result row
- * @return array Configuration array
+ * @param array Result row
+ * @return array Configuration array
*/
public function getSpecialConfigForRow($row) {
$pathId = $row['data_page_id'] ?: $row['page_id'];
@@ -1973,8 +1973,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns the HTML code for language indication.
*
- * @param array Result row
- * @return string HTML code for result row.
+ * @param array Result row
+ * @return string HTML code for result row.
*/
public function makeLanguageIndication($row) {
// If search result is a TYPO3 page:
@@ -1992,8 +1992,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
* Returns the HTML code for the locking symbol.
* NOTICE: Requires a call to ->getPathFromPageId() first in order to work (done in ->makeInfo() by calling that first)
*
- * @param int Page id for which to find answer
- * @return string <img> tag if access is limited.
+ * @param int Page id for which to find answer
+ * @return string <img> tag if access is limited.
*/
public function makeAccessIndication($id) {
if (is_array($this->fe_groups_required[$id]) && count($this->fe_groups_required[$id])) {
@@ -2004,11 +2004,11 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Links the $str to page $id
*
- * @param int Page id
- * @param string Title String to link
- * @param array Result row
- * @param array Additional parameters for marking up seach words
- * @return string <A> tag wrapped title string.
+ * @param int Page id
+ * @param string Title String to link
+ * @param array Result row
+ * @param array Additional parameters for marking up seach words
+ * @return string <A> tag wrapped title string.
*/
public function linkPage($id, $str, $row = array(), $markUpSwParams = array()) {
// Parameters for link:
@@ -2052,9 +2052,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns the path to the page $id
*
- * @param int Page ID
- * @param string MP variable content.
- * @return string Root line for result.
+ * @param int Page ID
+ * @param string MP variable content.
+ * @return string Root line for result.
*/
public function getRootLine($id, $pathMP = '') {
$identStr = $id . '|' . $pathMP;
@@ -2067,8 +2067,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Gets the first sys_domain record for the page, $id
*
- * @param int Page id
- * @return string Domain name
+ * @param int Page id
+ * @return string Domain name
*/
public function getFirstSysDomainRecordForPage($id) {
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('domainName', 'sys_domain', 'pid=' . (int)$id . $this->cObj->enableFields('sys_domain'), '', 'sorting');
@@ -2079,9 +2079,9 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns the path to the page $id
*
- * @param int Page ID
- * @param string MP variable content
- * @return string Path
+ * @param int Page ID
+ * @param string MP variable content
+ * @return string Path
*/
public function getPathFromPageId($id, $pathMP = '') {
$identStr = $id . '|' . $pathMP;
@@ -2125,8 +2125,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Return the menu of pages used for the selector.
*
- * @param int Page ID for which to return menu
- * @return array Menu items (for making the section selector box)
+ * @param int Page ID for which to return menu
+ * @return array Menu items (for making the section selector box)
*/
public function getMenu($id) {
if ($this->conf['show.']['LxALLtypes']) {
@@ -2145,8 +2145,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns if an item type is a multipage item type
*
- * @param string Item type
- * @return boolean TRUE if multipage capable
+ * @param string Item type
+ * @return bool TRUE if multipage capable
*/
public function multiplePagesType($item_type) {
return is_object($this->external_parsers[$item_type]) && $this->external_parsers[$item_type]->isMultiplePageExtension($item_type);
@@ -2155,8 +2155,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Converts the input string from utf-8 to the backend charset.
*
- * @param string String to convert (utf-8)
- * @return string Converted string (backend charset if different from utf-8)
+ * @param string String to convert (utf-8)
+ * @return string Converted string (backend charset if different from utf-8)
*/
public function utf8_to_currentCharset($str) {
return $GLOBALS['TSFE']->csConv($str, 'utf-8');
@@ -2165,8 +2165,8 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Returns an object reference to the hook object if any
*
- * @param string Name of the function you want to call / hook key
- * @return object Hook object, if any. Otherwise NULL.
+ * @param string Name of the function you want to call / hook key
+ * @return object Hook object, if any. Otherwise NULL.
*/
public function hookRequest($functionName) {
global $TYPO3_CONF_VARS;
@@ -2196,7 +2196,7 @@ class SearchFormController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
/**
* Obtains search form target pid from the TypoScript configuration
*
- * @return integer
+ * @return int
*/
protected function getSearchFormActionPidFromTS() {
$result = 0;
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
index 48fca58aa825..fc7a4c31b9a5 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
@@ -16,9 +16,9 @@ namespace TYPO3\CMS\IndexedSearch\Domain\Repository;
/**
* Index search abstraction to search through the index
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @author Christian Jul Jensen <christian@typo3.com>
- * @author Benjamin Mack <benni@typo3.org>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Christian Jul Jensen <christian@typo3.com>
+ * @author Benjamin Mack <benni@typo3.org>
*/
class IndexSearchRepository {
@@ -124,7 +124,7 @@ class IndexSearchRepository {
*
* @param array $searchWords Search word array
* @param int $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
- * @return boolean|array FALSE if no result, otherwise an array with keys for first row, result rows and total number of results found.
+ * @return bool|array FALSE if no result, otherwise an array with keys for first row, result rows and total number of results found.
*/
public function doSearch($searchWords, $freeIndexUid = -1) {
// Getting SQL result pointer:
@@ -214,7 +214,7 @@ class IndexSearchRepository {
*
* @param array $searchWords Search words
* @param int $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
- * @return boolean|pointer
+ * @return bool|pointer
*/
protected function getResultRows_SQLpointer($searchWords, $freeIndexUid = -1) {
// This SEARCHES for the searchwords in $searchWords AND returns a
@@ -339,9 +339,9 @@ class IndexSearchRepository {
/**
* Returns a query which selects the search-word from the word/rel tables.
*
- * @param string WHERE clause selecting the word from phash
- * @param string Additional AND clause in the end of the query.
- * @return pointer SQL result pointer
+ * @param string WHERE clause selecting the word from phash
+ * @param string Additional AND clause in the end of the query.
+ * @return pointer SQL result pointer
*/
protected function execPHashListQuery($wordSel, $additionalWhereClause = '') {
return $GLOBALS['TYPO3_DB']->exec_SELECTquery('IR.phash', 'index_words IW,
@@ -358,7 +358,7 @@ class IndexSearchRepository {
*
* @param string the search word
* @param int constant from this class to see if the wildcard should be left and/or right of the search string
- * @return pointer SQL result pointer
+ * @return pointer SQL result pointer
*/
protected function searchWord($sWord, $mode) {
$wildcard_left = $mode & self::WILDCARD_LEFT ? '%' : '';
@@ -372,7 +372,7 @@ class IndexSearchRepository {
* Search for one distinct word
*
* @param string the search word
- * @return pointer SQL result pointer
+ * @return pointer SQL result pointer
*/
protected function searchDistinct($sWord) {
$wSel = 'IW.wid=' . $this->md5inthash($sWord);
@@ -384,7 +384,7 @@ class IndexSearchRepository {
* Search for a sentence
*
* @param string the search word
- * @return pointer SQL result pointer
+ * @return pointer SQL result pointer
*/
protected function searchSentence($sWord) {
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('ISEC.phash', 'index_section ISEC, index_fulltext IFT', 'IFT.fulltextdata LIKE \'%' . $GLOBALS['TYPO3_DB']->quoteStr($sWord, 'index_fulltext') . '%\' AND
@@ -397,7 +397,7 @@ class IndexSearchRepository {
* Search for a metaphone word
*
* @param string the search word
- * @return pointer SQL result pointer
+ * @return pointer SQL result pointer
*/
protected function searchMetaphone($sWord) {
$wSel = 'IW.metaphone=' . $sWord;
@@ -407,7 +407,7 @@ class IndexSearchRepository {
/**
* Returns AND statement for selection of section in database. (rootlevel 0-2 + page_id)
*
- * @return string AND clause for selection of section in database.
+ * @return string AND clause for selection of section in database.
*/
protected function sectionTableWhere() {
$whereClause = '';
@@ -454,7 +454,7 @@ class IndexSearchRepository {
/**
* Returns AND statement for selection of media type
*
- * @return string AND statement for selection of media type
+ * @return string AND statement for selection of media type
*/
public function mediaTypeWhere() {
$whereClause = '';
@@ -482,7 +482,7 @@ class IndexSearchRepository {
/**
* Returns AND statement for selection of langauge
*
- * @return string AND statement for selection of langauge
+ * @return string AND statement for selection of langauge
*/
public function languageWhere() {
// -1 is the same as ALL language.
@@ -494,8 +494,8 @@ class IndexSearchRepository {
/**
* Where-clause for free index-uid value.
*
- * @param int Free Index UID value to limit search to.
- * @return string WHERE SQL clause part.
+ * @param int Free Index UID value to limit search to.
+ * @return string WHERE SQL clause part.
*/
public function freeIndexUidWhere($freeIndexUid) {
$freeIndexUid = (int)$freeIndexUid;
@@ -535,9 +535,9 @@ class IndexSearchRepository {
/**
* Execute final query, based on phash integer list. The main point is sorting the result in the right order.
*
- * @param string List of phash integers which match the search.
- * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
- * @return pointer Query result pointer
+ * @param string List of phash integers which match the search.
+ * @param int Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
+ * @return pointer Query result pointer
*/
protected function execFinalQuery($list, $freeIndexUid = -1) {
// Setting up methods of filtering results
@@ -634,7 +634,7 @@ class IndexSearchRepository {
* ? Should it also check for gr_list "0,-1"?
*
* @param array $row Result row array.
- * @return boolean Returns TRUE if resume can safely be shown
+ * @return bool Returns TRUE if resume can safely be shown
*/
protected function checkResume($row) {
// If the record is indexed by an indexing configuration, just show it.
@@ -706,9 +706,9 @@ class IndexSearchRepository {
* Simply calls \TYPO3\CMS\Frontend\Page\PageRepository::enableFields() BUT will send the show_hidden flag along!
* This means this function will work in conjunction with the preview facilities of the frontend engine/Admin Panel.
*
- * @param string The table for which to get the where clause
- * @param bool If set, then you want NOT to filter out hidden records. Otherwise hidden record are filtered based on the current preview settings.
- * @return string The part of the where clause on the form " AND [fieldname]=0 AND ...". Eg. " AND hidden=0 AND starttime < 123345567
+ * @param string The table for which to get the where clause
+ * @param bool If set, then you want NOT to filter out hidden records. Otherwise hidden record are filtered based on the current preview settings.
+ * @return string The part of the where clause on the form " AND [fieldname]=0 AND ...". Eg. " AND hidden=0 AND starttime < 123345567
* @see \TYPO3\CMS\Frontend\Page\PageRepository::enableFields()
*/
protected function enableFields($table) {
@@ -718,8 +718,8 @@ class IndexSearchRepository {
/**
* Returns if an item type is a multipage item type
*
- * @param string Item type
- * @return boolean TRUE if multipage capable
+ * @param string Item type
+ * @return bool TRUE if multipage capable
*/
protected function multiplePagesType($itemType) {
return is_object($this->externalParsers[$itemType]) && $this->externalParsers[$itemType]->isMultiplePageExtension($itemType);
@@ -732,7 +732,7 @@ class IndexSearchRepository {
* or PHP-versions which has varying output from the hexdec function.
*
* @param string $str String to hash
- * @return integer Integer intepretation of the md5 hash of input string.
+ * @return int Integer intepretation of the md5 hash of input string.
*/
protected function md5inthash($str) {
return \TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::md5inthash($str);
@@ -744,7 +744,7 @@ class IndexSearchRepository {
* functionality like indexed_search_mysql.
*
* @param string $table_list Comma-separated list of tables
- * @return boolean TRUE if given tables are enabled
+ * @return bool TRUE if given tables are enabled
*/
protected function isTableUsed($table_list) {
return \TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed($table_list);
diff --git a/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php
index 9ff3ae14e1d7..1c8afd5bda3c 100644
--- a/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Example/CrawlerHook.php
@@ -17,14 +17,14 @@ namespace TYPO3\CMS\IndexedSearch\Example;
/**
* Index search crawler hook example
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class CrawlerHook {
/**
* Function is called when an indexing session starts according to the time intervals set for the indexing configuration.
*
- * @return string Return a text string for the first, initiating queue entry for the crawler.
+ * @return string Return a text string for the first, initiating queue entry for the crawler.
*/
public function initMessage() {
return 'Start of Custom Example Indexing session!';
@@ -35,12 +35,12 @@ class CrawlerHook {
* 1) Carry out actual indexing of content (one or more items)
* 2) Add one or more new entries into the crawlers queue so we are called again (another instance) for further indexing in the session (optional of course, if all indexing is done, we add no new entries)
*
- * @param array Indexing Configuration Record (the record which holds the information that lead to this indexing session...)
- * @param array Session data variable. Passed by reference. Changed content is saved and passed back upon next instance in the session.
- * @param array Params array from the queue entry.
- * @param object Grant Parent Object (from "crawler" extension)
- * @param object Parent Object (from "indexed_search" extension)
- * @return void
+ * @param array Indexing Configuration Record (the record which holds the information that lead to this indexing session...)
+ * @param array Session data variable. Passed by reference. Changed content is saved and passed back upon next instance in the session.
+ * @param array Params array from the queue entry.
+ * @param object Grant Parent Object (from "crawler" extension)
+ * @param object Parent Object (from "indexed_search" extension)
+ * @return void
*/
public function indexOperation($cfgRec, &$session_data, $params, &$pObj) {
// Init session data array if not already:
diff --git a/typo3/sysext/indexed_search/Classes/Example/PluginHook.php b/typo3/sysext/indexed_search/Classes/Example/PluginHook.php
index bc977686c169..b4c02ccb369c 100644
--- a/typo3/sysext/indexed_search/Classes/Example/PluginHook.php
+++ b/typo3/sysext/indexed_search/Classes/Example/PluginHook.php
@@ -16,14 +16,14 @@ namespace TYPO3\CMS\IndexedSearch\Example;
/**
* Index search frontend example hook
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
/**
* Index search frontend - EXAMPLE hook for alternative searching / display etc.
* Hooks are configured in ext_localconf.php as key => hook-reference pairs in $TYPO3_CONF_VARS['EXTCONF']['indexed_search']['pi1_hooks']. See example in ext_localconf.php for "indexed_search"
* Each hook must have an entry, the key must match the hook-key in class.tx_indexed_search.php and generally the key equals the function name in the hook object (a convension used)
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class PluginHook {
@@ -40,7 +40,7 @@ class PluginHook {
* This hook is activated by this key / value pair in ext_localconf.php
* 'initialize_postProc' => 'EXT:indexed_search/example/class.pihook.php:&tx_indexedsearch_pihook',
*
- * @return void
+ * @return void
*/
public function initialize_postProc() {
$this->pObj->optValues['order'] = array_reverse($this->pObj->optValues['order']);
@@ -49,8 +49,8 @@ class PluginHook {
/**
* Providing an alternative search algorithm!
*
- * @param array Array of search words
- * @return array Array of first row, result rows, count
+ * @param array Array of search words
+ * @return array Array of first row, result rows, count
*/
public function getResultRows($sWArr) {
@@ -60,10 +60,10 @@ class PluginHook {
* Example of how the content displayed in the result rows can be post processed before rendered into HTML.
* This example simply shows how the description field is wrapped in italics and the path is hidden by setting it blank.
*
- * @param array Template Content (generated from result row) being processed.
- * @param array Result row
- * @param bool If set, the result row is a sub-row.
- * @return array Template Content returned.
+ * @param array Template Content (generated from result row) being processed.
+ * @param array Result row
+ * @param bool If set, the result row is a sub-row.
+ * @return array Template Content returned.
*/
public function prepareResultRowTemplateData_postProc($tmplContent, $row, $headerOnly) {
$tmplContent['description'] = '<em>' . $tmplContent['description'] . '</em>';
diff --git a/typo3/sysext/indexed_search/Classes/FileContentParser.php b/typo3/sysext/indexed_search/Classes/FileContentParser.php
index cbbab9dcc974..b412492ecfa0 100644
--- a/typo3/sysext/indexed_search/Classes/FileContentParser.php
+++ b/typo3/sysext/indexed_search/Classes/FileContentParser.php
@@ -16,14 +16,14 @@ namespace TYPO3\CMS\IndexedSearch;
/**
* External standard parsers for indexed_search
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
* @coauthor Olivier Simah <noname_paris@yahoo.fr>
*/
/**
* External standard parsers for indexed_search
* MUST RETURN utf-8 content!
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class FileContentParser {
@@ -55,8 +55,8 @@ class FileContentParser {
/**
* Initialize external parser for parsing content.
*
- * @param string File extension
- * @return boolean Returns TRUE if extension is supported/enabled, otherwise FALSE.
+ * @param string File extension
+ * @return bool Returns TRUE if extension is supported/enabled, otherwise FALSE.
*/
public function initParser($extension) {
// Then read indexer-config and set if appropriate:
@@ -214,8 +214,8 @@ class FileContentParser {
* Initialize external parser for backend modules
* Doesn't evaluate if parser is configured right - more like returning POSSIBLE supported extensions (for showing icons etc) in backend and frontend plugin
*
- * @param string File extension to initialize for.
- * @return boolean Returns TRUE if the extension is supported and enabled, otherwise FALSE.
+ * @param string File extension to initialize for.
+ * @return bool Returns TRUE if the extension is supported and enabled, otherwise FALSE.
*/
public function softInit($extension) {
switch ($extension) {
@@ -267,8 +267,8 @@ class FileContentParser {
/**
* Return title of entry in media type selector box.
*
- * @param string File extension
- * @return string String with label value of entry in media type search selector box (frontend plugin).
+ * @param string File extension
+ * @return string String with label value of entry in media type search selector box (frontend plugin).
*/
public function searchTypeMediaTitle($extension) {
// Read indexer-config
@@ -384,8 +384,8 @@ class FileContentParser {
/**
* Returns TRUE if the input extension (item_type) is a potentially a multi-page extension
*
- * @param string Extension / item_type string
- * @return boolean Return TRUE if multi-page
+ * @param string Extension / item_type string
+ * @return bool Return TRUE if multi-page
*/
public function isMultiplePageExtension($extension) {
// Switch on file extension:
@@ -399,9 +399,9 @@ class FileContentParser {
/**
* Wraps the "splitLabel function" of the language object.
*
- * @param string $reference: Reference/key of the label
- * @param bool $useHtmlSpecialChar: Convert special chars to HTML entities (default: FALSE)
- * @return string The label of the reference/key to be fetched
+ * @param string $reference: Reference/key of the label
+ * @param bool $useHtmlSpecialChar: Convert special chars to HTML entities (default: FALSE)
+ * @return string The label of the reference/key to be fetched
*/
protected function sL($reference, $useHtmlSpecialChar = FALSE) {
return $this->langObject->sL($reference, $useHtmlSpecialChar);
@@ -697,8 +697,8 @@ class FileContentParser {
/**
* Analysing PDF info into a useable format.
*
- * @param array Array of PDF content, coming from the pdfinfo tool
- * @return array Result array
+ * @param array Array of PDF content, coming from the pdfinfo tool
+ * @return array Result array
* @access private
* @see fileContentParts()
*/
@@ -718,8 +718,8 @@ class FileContentParser {
/**
* Removes some strange char(12) characters and line breaks that then to occur in the end of the string from external files.
*
- * @param string String to clean up
- * @return string String
+ * @param string String to clean up
+ * @return string String
*/
public function removeEndJunk($string) {
return trim(preg_replace('/[' . LF . chr(12) . ']*$/', '', $string));
@@ -733,8 +733,8 @@ class FileContentParser {
/**
* Return icon for file extension
*
- * @param string File extension, lowercase.
- * @return string Relative file reference, resolvable by \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName()
+ * @param string File extension, lowercase.
+ * @return string Relative file reference, resolvable by \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName()
*/
public function getIcon($extension) {
if ($extension == 'htm') {
diff --git a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
index ffbaefe76f3f..6f5f8d48c873 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/CrawlerHook.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Crawler hook for indexed search. Works with the "crawler" extension
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class CrawlerHook {
@@ -50,8 +50,8 @@ class CrawlerHook {
* This function is asked for each instance of the crawler and we must check if something is timed to happen and if so put entry(s) in the crawlers log to start processing.
* In reality we select indexing configurations and evaluate if any of them needs to run.
*
- * @param object Parent object (tx_crawler lib)
- * @return void
+ * @param object Parent object (tx_crawler lib)
+ * @return void
*/
public function crawler_init(&$pObj) {
// Select all indexing configuration which are waiting to be activated:
@@ -156,9 +156,9 @@ class CrawlerHook {
/**
* Call back function for execution of a log element
*
- * @param array Params from log element. Must contain $params['indexConfigUid']
- * @param object Parent object (tx_crawler lib)
- * @return array Result array
+ * @param array Params from log element. Must contain $params['indexConfigUid']
+ * @param object Parent object (tx_crawler lib)
+ * @return array Result array
*/
public function crawler_execute($params, &$pObj) {
// Indexer configuration ID must exist:
@@ -213,11 +213,11 @@ class CrawlerHook {
/**
* Indexing records from a table
*
- * @param array Indexing Configuration Record
- * @param array Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
- * @param array Parameters from the log queue.
- * @param object Parent object (from "crawler" extension!)
- * @return void
+ * @param array Indexing Configuration Record
+ * @param array Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
+ * @param array Parameters from the log queue.
+ * @param object Parent object (from "crawler" extension!)
+ * @return void
*/
public function crawler_execute_type1($cfgRec, &$session_data, $params, &$pObj) {
if ($cfgRec['table2index'] && isset($GLOBALS['TCA'][$cfgRec['table2index']])) {
@@ -257,11 +257,11 @@ class CrawlerHook {
/**
* Indexing files from fileadmin
*
- * @param array Indexing Configuration Record
- * @param array Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
- * @param array Parameters from the log queue.
- * @param object Parent object (from "crawler" extension!)
- * @return void
+ * @param array Indexing Configuration Record
+ * @param array Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
+ * @param array Parameters from the log queue.
+ * @param object Parent object (from "crawler" extension!)
+ * @return void
*/
public function crawler_execute_type2($cfgRec, &$session_data, $params, &$pObj) {
// Prepare path, making it absolute and checking:
@@ -318,11 +318,11 @@ class CrawlerHook {
/**
* Indexing External URLs
*
- * @param array Indexing Configuration Record
- * @param array Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
- * @param array Parameters from the log queue.
- * @param object Parent object (from "crawler" extension!)
- * @return void
+ * @param array Indexing Configuration Record
+ * @param array Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
+ * @param array Parameters from the log queue.
+ * @param object Parent object (from "crawler" extension!)
+ * @return void
*/
public function crawler_execute_type3($cfgRec, &$session_data, $params, &$pObj) {
// Init session data array if not already:
@@ -358,11 +358,11 @@ class CrawlerHook {
/**
* Page tree indexing type
*
- * @param array Indexing Configuration Record
- * @param array Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
- * @param array Parameters from the log queue.
- * @param object Parent object (from "crawler" extension!)
- * @return void
+ * @param array Indexing Configuration Record
+ * @param array Session data for the indexing session spread over multiple instances of the script. Passed by reference so changes hereto will be saved for the next call!
+ * @param array Parameters from the log queue.
+ * @param object Parent object (from "crawler" extension!)
+ * @return void
*/
public function crawler_execute_type4($cfgRec, &$session_data, $params, &$pObj) {
// Base page uid:
@@ -406,7 +406,7 @@ class CrawlerHook {
/**
* Look up all old index configurations which are finished and needs to be reset and done
*
- * @return void
+ * @return void
*/
public function cleanUpOldRunningConfigurations() {
// Lookup running index configurations:
@@ -443,10 +443,10 @@ class CrawlerHook {
/**
* Check if an input URL are allowed to be indexed. Depends on whether it is already present in the url log.
*
- * @param string URL string to check
- * @param array Array of already indexed URLs (input url is looked up here and must not exist already)
- * @param string Base URL of the indexing process (input URL must be "inside" the base URL!)
- * @return string Returls the URL if OK, otherwise FALSE
+ * @param string URL string to check
+ * @param array Array of already indexed URLs (input url is looked up here and must not exist already)
+ * @param string Base URL of the indexing process (input URL must be "inside" the base URL!)
+ * @return string Returls the URL if OK, otherwise FALSE
*/
public function checkUrl($url, $urlLog, $baseUrl) {
$url = preg_replace('/\\/\\/$/', '/', $url);
@@ -463,12 +463,12 @@ class CrawlerHook {
/**
* Indexing External URL
*
- * @param string URL, http://....
- * @param int Page id to relate indexing to.
- * @param array Rootline array to relate indexing to
- * @param int Configuration UID
- * @param int Set ID value
- * @return array URLs found on this page
+ * @param string URL, http://....
+ * @param int Page id to relate indexing to.
+ * @param array Rootline array to relate indexing to
+ * @param int Configuration UID
+ * @param int Set ID value
+ * @return array URLs found on this page
*/
public function indexExtUrl($url, $pageId, $rl, $cfgUid, $setId) {
// Index external URL:
@@ -511,10 +511,10 @@ class CrawlerHook {
/**
* Indexing Single Record
*
- * @param array Record to index
- * @param array Configuration Record
- * @param array Rootline array to relate indexing to
- * @return void
+ * @param array Record to index
+ * @param array Configuration Record
+ * @param array Rootline array to relate indexing to
+ * @return void
*/
public function indexSingleRecord($r, $cfgRec, $rl = NULL) {
// Init:
@@ -543,7 +543,7 @@ class CrawlerHook {
/**
* Include indexer class.
*
- * @return void
+ * @return void
* @deprecated since 6.2 will be removed two version later. Rely on autoloading of the indexer class.
*/
public function loadIndexerClass() {
@@ -554,8 +554,8 @@ class CrawlerHook {
* Get rootline for closest TypoScript template root.
* Algorithm same as used in Web > Template, Object browser
*
- * @param int The page id to traverse rootline back from
- * @return array Array where the root lines uid values are found.
+ * @param int The page id to traverse rootline back from
+ * @return array Array where the root lines uid values are found.
*/
public function getUidRootLineForClosestTemplate($id) {
global $TYPO3_CONF_VARS;
@@ -579,8 +579,8 @@ class CrawlerHook {
/**
* Generate the unix time stamp for next visit.
*
- * @param array Index configuration record
- * @return integer The next time stamp
+ * @param array Index configuration record
+ * @return int The next time stamp
*/
public function generateNextIndexingTime($cfgRec) {
$currentTime = $GLOBALS['EXEC_TIME'];
@@ -604,9 +604,9 @@ class CrawlerHook {
/**
* Checks if $url has any of the URls in the $url_deny "list" in it and if so, returns TRUE.
*
- * @param string URL to test
- * @param string String where URLs are separated by line-breaks; If any of these strings is the first part of $url, the function returns TRUE (to indicate denial of decend)
- * @return boolean TRUE if there is a matching URL (hence, do not index!)
+ * @param string URL to test
+ * @param string String where URLs are separated by line-breaks; If any of these strings is the first part of $url, the function returns TRUE (to indicate denial of decend)
+ * @return bool TRUE if there is a matching URL (hence, do not index!)
*/
public function checkDeniedSuburls($url, $url_deny) {
if (trim($url_deny)) {
@@ -624,9 +624,9 @@ class CrawlerHook {
/**
* Adding entry in queue for Hook
*
- * @param array Configuration record
- * @param string Title/URL
- * @return void
+ * @param array Configuration record
+ * @param string Title/URL
+ * @return void
*/
public function addQueueEntryForHook($cfgRec, $title) {
$nparams = array(
@@ -641,8 +641,8 @@ class CrawlerHook {
/**
* Deletes all data stored by indexed search for a given page
*
- * @param int Uid of the page to delete all pHash
- * @return void
+ * @param int Uid of the page to delete all pHash
+ * @return void
*/
public function deleteFromIndex($id) {
// Lookup old phash rows:
@@ -668,12 +668,12 @@ class CrawlerHook {
/**
* TCEmain hook function for on-the-fly indexing of database records
*
- * @param string TCEmain command
- * @param string Table name
- * @param string Record ID. If new record its a string pointing to index inside \TYPO3\CMS\Core\DataHandling\DataHandler::substNEWwithIDs
- * @param mixed Target value (ignored)
- * @param object Reference to tcemain calling object
- * @return void
+ * @param string TCEmain command
+ * @param string Table name
+ * @param string Record ID. If new record its a string pointing to index inside \TYPO3\CMS\Core\DataHandling\DataHandler::substNEWwithIDs
+ * @param mixed Target value (ignored)
+ * @param object Reference to tcemain calling object
+ * @return void
*/
public function processCmdmap_preProcess($command, $table, $id, $value, $pObj) {
// Clean up the index
@@ -685,12 +685,12 @@ class CrawlerHook {
/**
* TCEmain hook function for on-the-fly indexing of database records
*
- * @param string Status "new" or "update
- * @param string Table name
- * @param string Record ID. If new record its a string pointing to index inside \TYPO3\CMS\Core\DataHandling\DataHandler::substNEWwithIDs
- * @param array Field array of updated fields in the operation
- * @param object Reference to tcemain calling object
- * @return void
+ * @param string Status "new" or "update
+ * @param string Table name
+ * @param string Record ID. If new record its a string pointing to index inside \TYPO3\CMS\Core\DataHandling\DataHandler::substNEWwithIDs
+ * @param array Field array of updated fields in the operation
+ * @param object Reference to tcemain calling object
+ * @return void
*/
public function processDatamap_afterDatabaseOperations($status, $table, $id, $fieldArray, $pObj) {
// Check if any fields are actually updated:
diff --git a/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php b/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
index 2095a473d274..5f10cac0c993 100644
--- a/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
+++ b/typo3/sysext/indexed_search/Classes/Hook/TypoScriptFrontendHook.php
@@ -16,16 +16,16 @@ namespace TYPO3\CMS\IndexedSearch\Hook;
/**
* Hooks for \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController (TSFE).
*
- * @author Oliver Hader <oliver@typo3.org>
+ * @author Oliver Hader <oliver@typo3.org>
*/
class TypoScriptFrontendHook {
/**
* Frontend hook: If the page is not being re-generated this is our chance to force it to be (because re-generation of the page is required in order to have the indexer called!)
*
- * @param array Parameters from frontend
- * @param object TSFE object (reference under PHP5)
- * @return void
+ * @param array Parameters from frontend
+ * @param object TSFE object (reference under PHP5)
+ * @return void
*/
public function headerNoCache(array &$params, $ref) {
// Requirements are that the crawler is loaded, a crawler session is running and re-indexing requested as processing instruction:
diff --git a/typo3/sysext/indexed_search/Classes/Indexer.php b/typo3/sysext/indexed_search/Classes/Indexer.php
index ffbefb1318a3..7f4665bb9c2f 100644
--- a/typo3/sysext/indexed_search/Classes/Indexer.php
+++ b/typo3/sysext/indexed_search/Classes/Indexer.php
@@ -19,12 +19,12 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* This class is a search indexer for TYPO3
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
/**
* Indexing class for TYPO3 frontend
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class Indexer {
@@ -138,8 +138,8 @@ class Indexer {
/**
* Parent Object (TSFE) Initialization
*
- * @param object Parent Object (frontend TSFE object), passed by reference
- * @return void
+ * @param object Parent Object (frontend TSFE object), passed by reference
+ * @return void
*/
public function hook_indexContent(&$pObj) {
// Indexer configuration from Extension Manager interface:
@@ -233,14 +233,14 @@ class Indexer {
/**
* Initializing the "combined ID" of the page (phash) being indexed (or for which external media is attached)
*
- * @param int The page uid, &id=
- * @param int The page type, &type=
- * @param int sys_language uid, typically &L=
- * @param string The MP variable (Mount Points), &MP=
- * @param array Rootline array of only UIDs.
- * @param array Array of GET variables to register with this indexing
- * @param bool If set, calculates a cHash value from the $cHash_array. Probably you will not do that since such cases are indexed through the frontend and the idea of this interface is to index non-cachable pages from the backend!
- * @return void
+ * @param int The page uid, &id=
+ * @param int The page type, &type=
+ * @param int sys_language uid, typically &L=
+ * @param string The MP variable (Mount Points), &MP=
+ * @param array Rootline array of only UIDs.
+ * @param array Array of GET variables to register with this indexing
+ * @param bool If set, calculates a cHash value from the $cHash_array. Probably you will not do that since such cases are indexed through the frontend and the idea of this interface is to index non-cachable pages from the backend!
+ * @return void
*/
public function backend_initIndexer($id, $type, $sys_language_uid, $MP, $uidRL, $cHash_array = array(), $createCHash = FALSE) {
// Setting up internal configuration from config array:
@@ -287,9 +287,9 @@ class Indexer {
/**
* Sets the free-index uid. Can be called right after backend_initIndexer()
*
- * @param int Free index UID
- * @param int Set id - an integer identifying the "set" of indexing operations.
- * @return void
+ * @param int Free index UID
+ * @param int Set id - an integer identifying the "set" of indexing operations.
+ * @return void
*/
public function backend_setFreeIndexUid($freeIndexUid, $freeIndexSetId = 0) {
$this->conf['freeIndexUid'] = $freeIndexUid;
@@ -299,15 +299,15 @@ class Indexer {
/**
* Indexing records as the content of a TYPO3 page.
*
- * @param string Title equivalent
- * @param string Keywords equivalent
- * @param string Description equivalent
- * @param string The main content to index
- * @param string The charset of the title, keyword, description and body-content. MUST BE VALID, otherwise nothing is indexed!
- * @param int Last modification time, in seconds
- * @param int The creation date of the content, in seconds
- * @param int The record UID that the content comes from (for registration with the indexed rows)
- * @return void
+ * @param string Title equivalent
+ * @param string Keywords equivalent
+ * @param string Description equivalent
+ * @param string The main content to index
+ * @param string The charset of the title, keyword, description and body-content. MUST BE VALID, otherwise nothing is indexed!
+ * @param int Last modification time, in seconds
+ * @param int The creation date of the content, in seconds
+ * @param int The record UID that the content comes from (for registration with the indexed rows)
+ * @return void
*/
public function backend_indexAsTYPO3Page($title, $keywords, $description, $content, $charset, $mtime, $crdate = 0, $recordUid = 0) {
// Content of page:
@@ -347,7 +347,7 @@ class Indexer {
/**
* Initializes the object. $this->conf MUST be set with proper values prior to this call!!!
*
- * @return void
+ * @return void
*/
public function init() {
global $TYPO3_CONF_VARS;
@@ -393,7 +393,7 @@ class Indexer {
/**
* Initialize external parsers
*
- * @return void
+ * @return void
* @access private
* @see init()
*/
@@ -419,7 +419,7 @@ class Indexer {
/**
* Start indexing of the TYPO3 page
*
- * @return void
+ * @return void
*/
public function indexTypo3PageContent() {
$check = $this->checkMtimeTstamp($this->conf['mtime'], $this->hash['phash']);
@@ -495,8 +495,8 @@ class Indexer {
/**
* Splits HTML content and returns an associative array, with title, a list of metatags, and a list of words in the body.
*
- * @param string HTML content to index. To some degree expected to be made by TYPO3 (ei. splitting the header by ":")
- * @return array Array of content, having keys "title", "body", "keywords" and "description" set.
+ * @param string HTML content to index. To some degree expected to be made by TYPO3 (ei. splitting the header by ":")
+ * @return array Array of content, having keys "title", "body", "keywords" and "description" set.
* @see splitRegularContent()
*/
public function splitHTMLContent($content) {
@@ -547,8 +547,8 @@ class Indexer {
/**
* Extract the charset value from HTML meta tag.
*
- * @param string HTML content
- * @return string The charset value if found.
+ * @param string HTML content
+ * @return string The charset value if found.
*/
public function getHTMLcharset($content) {
if (preg_match('/<meta[[:space:]]+[^>]*http-equiv[[:space:]]*=[[:space:]]*["\']CONTENT-TYPE["\'][^>]*>/i', $content, $reg)) {
@@ -561,9 +561,9 @@ class Indexer {
/**
* Converts a HTML document to utf-8
*
- * @param string HTML content, any charset
- * @param string Optional charset (otherwise extracted from HTML)
- * @return string Converted HTML
+ * @param string HTML content, any charset
+ * @param string Optional charset (otherwise extracted from HTML)
+ * @return string Converted HTML
*/
public function convertHTMLToUtf8($content, $charset = '') {
// Find charset:
@@ -583,12 +583,12 @@ class Indexer {
* the tag removed in the two passed variables. Returns FALSE if no match found. ie. useful for finding
* <title> of document or removing <script>-sections
*
- * @param string String to search in
- * @param string Tag name, eg. "script
- * @param string Passed by reference: Content inside found tag
- * @param string Passed by reference: Content after found tag
- * @param string Passed by reference: Attributes of the found tag.
- * @return boolean Returns FALSE if tag was not found, otherwise TRUE.
+ * @param string String to search in
+ * @param string Tag name, eg. "script
+ * @param string Passed by reference: Content inside found tag
+ * @param string Passed by reference: Content after found tag
+ * @param string Passed by reference: Attributes of the found tag.
+ * @return bool Returns FALSE if tag was not found, otherwise TRUE.
*/
public function embracingTags($string, $tagName, &$tagContent, &$stringAfter, &$paramList) {
$endTag = '</' . $tagName . '>';
@@ -615,8 +615,8 @@ class Indexer {
/**
* Removes content that shouldn't be indexed according to TYPO3SEARCH-tags.
*
- * @param string HTML Content, passed by reference
- * @return boolean Returns TRUE if a TYPOSEARCH_ tag was found, otherwise FALSE.
+ * @param string HTML Content, passed by reference
+ * @return bool Returns TRUE if a TYPOSEARCH_ tag was found, otherwise FALSE.
*/
public function typoSearchTags(&$body) {
$expBody = preg_split('/\\<\\!\\-\\-[\\s]?TYPO3SEARCH_/', $body);
@@ -642,8 +642,8 @@ class Indexer {
/**
* Extract links (hrefs) from HTML content and if indexable media is found, it is indexed.
*
- * @param string HTML content
- * @return void
+ * @param string HTML content
+ * @return void
*/
public function extractLinks($content) {
// Get links:
@@ -748,8 +748,8 @@ class Indexer {
/**
* Extracts the "base href" from content string.
*
- * @param string Content to analyze
- * @return string The base href or an empty string if not found
+ * @param string Content to analyze
+ * @return string The base href or an empty string if not found
*/
public function extractBaseHref($html) {
$href = '';
@@ -778,8 +778,8 @@ class Indexer {
/**
* Index External URLs HTML content
*
- * @param string URL, eg. "http://typo3.org/
- * @return void
+ * @param string URL, eg. "http://typo3.org/
+ * @return void
* @see indexRegularDocument()
*/
public function indexExternalUrl($externalUrl) {
@@ -808,9 +808,9 @@ class Indexer {
/**
* Getting HTTP request headers of URL
*
- * @param string The URL
- * @param int Timeout (seconds?)
- * @return mixed If no answer, returns FALSE. Otherwise an array where HTTP headers are keys
+ * @param string The URL
+ * @param int Timeout (seconds?)
+ * @return mixed If no answer, returns FALSE. Otherwise an array where HTTP headers are keys
*/
public function getUrlHeaders($url) {
// Try to get the headers only
@@ -960,7 +960,7 @@ class Indexer {
* Checks if URL is relative.
*
* @param string $url
- * @return boolean
+ * @return bool
*/
static protected function isRelativeURL($url) {
$urlParts = @parse_url($url);
@@ -971,7 +971,7 @@ class Indexer {
* Checks if the path points to the file inside the web site
*
* @param string $filePath
- * @return boolean
+ * @return bool
*/
static protected function isAllowedLocalFile($filePath) {
$filePath = GeneralUtility::resolveBackPath($filePath);
@@ -988,11 +988,11 @@ class Indexer {
/**
* Indexing a regular document given as $file (relative to PATH_site, local file)
*
- * @param string Relative Filename, relative to PATH_site. It can also be an absolute path as long as it is inside the lockRootPath (validated with \TYPO3\CMS\Core\Utility\GeneralUtility::isAbsPath()). Finally, if $contentTmpFile is set, this value can be anything, most likely a URL
- * @param bool If set, indexing is forced (despite content hashes, mtime etc).
- * @param string Temporary file with the content to read it from (instead of $file). Used when the $file is a URL.
- * @param string File extension for temporary file.
- * @return void
+ * @param string Relative Filename, relative to PATH_site. It can also be an absolute path as long as it is inside the lockRootPath (validated with \TYPO3\CMS\Core\Utility\GeneralUtility::isAbsPath()). Finally, if $contentTmpFile is set, this value can be anything, most likely a URL
+ * @param bool If set, indexing is forced (despite content hashes, mtime etc).
+ * @param string Temporary file with the content to read it from (instead of $file). Used when the $file is a URL.
+ * @param string File extension for temporary file.
+ * @return void
*/
public function indexRegularDocument($file, $force = FALSE, $contentTmpFile = '', $altExtension = '') {
// Init
@@ -1095,10 +1095,10 @@ class Indexer {
* Reads the content of an external file being indexed.
* The content from the external parser MUST be returned in utf-8!
*
- * @param string File extension, eg. "pdf", "doc" etc.
- * @param string Absolute filename of file (must exist and be validated OK before calling function)
- * @param string Pointer to section (zero for all other than PDF which will have an indication of pages into which the document should be splitted.)
- * @return array Standard content array (title, description, keywords, body keys)
+ * @param string File extension, eg. "pdf", "doc" etc.
+ * @param string Absolute filename of file (must exist and be validated OK before calling function)
+ * @param string Pointer to section (zero for all other than PDF which will have an indication of pages into which the document should be splitted.)
+ * @return array Standard content array (title, description, keywords, body keys)
*/
public function readFileContent($fileExtension, $absoluteFileName, $sectionPointer) {
$contentArray = NULL;
@@ -1112,9 +1112,9 @@ class Indexer {
/**
* Creates an array with pointers to divisions of document.
*
- * @param string File extension
- * @param string Absolute filename (must exist and be validated OK before calling function)
- * @return array Array of pointers to sections that the document should be divided into
+ * @param string File extension
+ * @param string Absolute filename (must exist and be validated OK before calling function)
+ * @return array Array of pointers to sections that the document should be divided into
*/
public function fileContentParts($ext, $absFile) {
$cParts = array(0);
@@ -1128,8 +1128,8 @@ class Indexer {
/**
* Splits non-HTML content (from external files for instance)
*
- * @param string Input content (non-HTML) to index.
- * @return array Array of content, having the key "body" set (plus "title", "description" and "keywords", but empty)
+ * @param string Input content (non-HTML) to index.
+ * @return array Array of content, having the key "body" set (plus "title", "description" and "keywords", but empty)
* @see splitHTMLContent()
*/
public function splitRegularContent($content) {
@@ -1146,9 +1146,9 @@ class Indexer {
/**
* Convert character set and HTML entities in the value of input content array keys
*
- * @param array Standard content array
- * @param string Charset of the input content (converted to utf-8)
- * @return void
+ * @param array Standard content array
+ * @param string Charset of the input content (converted to utf-8)
+ * @return void
*/
public function charsetEntity2utf8(&$contentArr, $charset) {
// Convert charset if necessary
@@ -1166,8 +1166,8 @@ class Indexer {
/**
* Processing words in the array from split*Content -functions
*
- * @param array Array of content to index, see splitHTMLContent() and splitRegularContent()
- * @return array Content input array modified so each key is not a unique array of words
+ * @param array Array of content to index, see splitHTMLContent() and splitRegularContent()
+ * @return array Content input array modified so each key is not a unique array of words
*/
public function processWordsInArrays($contentArr) {
// split all parts to words
@@ -1185,8 +1185,8 @@ class Indexer {
/**
* Extracts the sample description text from the content array.
*
- * @param array Content array
- * @return string Description string
+ * @param array Content array
+ * @return string Description string
*/
public function bodyDescription($contentArr) {
// Setting description
@@ -1202,8 +1202,8 @@ class Indexer {
/**
* Analyzes content to use for indexing,
*
- * @param array Standard content array: an array with the keys title,keywords,description and body, which all contain an array of words.
- * @return array Index Array (whatever that is...)
+ * @param array Standard content array: an array with the keys title,keywords,description and body, which all contain an array of words.
+ * @return array Index Array (whatever that is...)
*/
public function indexAnalyze($content) {
$indexArr = array();
@@ -1218,11 +1218,11 @@ class Indexer {
/**
* Calculates relevant information for headercontent
*
- * @param array Index array, passed by reference
- * @param array Standard content array
- * @param string Key from standard content array
- * @param int Bit-wise priority to type
- * @return void
+ * @param array Index array, passed by reference
+ * @param array Standard content array
+ * @param string Key from standard content array
+ * @param int Bit-wise priority to type
+ * @return void
*/
public function analyzeHeaderinfo(&$retArr, $content, $key, $offset) {
foreach ($content[$key] as $val) {
@@ -1250,9 +1250,9 @@ class Indexer {
/**
* Calculates relevant information for bodycontent
*
- * @param array Index array, passed by reference
- * @param array Standard content array
- * @return void
+ * @param array Index array, passed by reference
+ * @param array Standard content array
+ * @return void
*/
public function analyzeBody(&$retArr, $content) {
foreach ($content['body'] as $key => $val) {
@@ -1280,9 +1280,9 @@ class Indexer {
/**
* Creating metaphone based hash from input word
*
- * @param string Word to convert
- * @param bool If set, returns the raw metaphone value (not hashed)
- * @return mixed Metaphone hash integer (or raw value, string)
+ * @param string Word to convert
+ * @param bool If set, returns the raw metaphone value (not hashed)
+ * @return mixed Metaphone hash integer (or raw value, string)
*/
public function metaphone($word, $returnRawMetaphoneValue = FALSE) {
if (is_object($this->metaphoneObj)) {
@@ -1310,7 +1310,7 @@ class Indexer {
/**
* Updates db with information about the page (TYPO3 page, not external media)
*
- * @return void
+ * @return void
*/
public function submitPage() {
// Remove any current data for this phash:
@@ -1384,9 +1384,9 @@ class Indexer {
/**
* Stores gr_list in the database.
*
- * @param int Search result record phash
- * @param int Actual phash of current content
- * @return void
+ * @param int Search result record phash
+ * @param int Actual phash of current content
+ * @return void
* @see update_grlist()
*/
public function submit_grlist($hash, $phash_x) {
@@ -1406,9 +1406,9 @@ class Indexer {
* Stores section
* $hash and $hash_t3 are the same for TYPO3 pages, but different when it is external files.
*
- * @param int phash of TYPO3 parent search result record
- * @param int phash of the file indexation search record
- * @return void
+ * @param int phash of TYPO3 parent search result record
+ * @param int phash of the file indexation search record
+ * @return void
*/
public function submit_section($hash, $hash_t3) {
$fields = array(
@@ -1425,8 +1425,8 @@ class Indexer {
/**
* Removes records for the indexed page, $phash
*
- * @param int phash value to flush
- * @return void
+ * @param int phash value to flush
+ * @return void
*/
public function removeOldIndexedPages($phash) {
// Removing old registrations for all tables. Because the pages are TYPO3 pages there can be nothing else than 1-1 relations here.
@@ -1450,16 +1450,16 @@ class Indexer {
/**
* Updates db with information about the file
*
- * @param array Array with phash and phash_grouping keys for file
- * @param string File name
- * @param array Array of "cHashParams" for files: This is for instance the page index for a PDF file (other document types it will be a zero)
- * @param string File extension determining the type of media.
- * @param int Modification time of file.
- * @param int Creation time of file.
- * @param int Size of file in bytes
- * @param int Content HASH value.
- * @param array Standard content array (using only title and body for a file)
- * @return void
+ * @param array Array with phash and phash_grouping keys for file
+ * @param string File name
+ * @param array Array of "cHashParams" for files: This is for instance the page index for a PDF file (other document types it will be a zero)
+ * @param string File extension determining the type of media.
+ * @param int Modification time of file.
+ * @param int Creation time of file.
+ * @param int Size of file in bytes
+ * @param int Content HASH value.
+ * @param array Standard content array (using only title and body for a file)
+ * @return void
*/
public function submitFilePage($hash, $file, $subinfo, $ext, $mtime, $ctime, $size, $content_md5h, $contentParts) {
// Find item Type:
@@ -1526,8 +1526,8 @@ class Indexer {
/**
* Stores file gr_list for a file IF it does not exist already
*
- * @param int phash value of file
- * @return void
+ * @param int phash value of file
+ * @return void
*/
public function submitFile_grlist($hash) {
// Testing if there is a gr_list record for a non-logged in user and if so, there is no need to place another one.
@@ -1542,8 +1542,8 @@ class Indexer {
/**
* Stores file section for a file IF it does not exist
*
- * @param int phash value of file
- * @return void
+ * @param int phash value of file
+ * @return void
*/
public function submitFile_section($hash) {
// Testing if there is already a section
@@ -1558,8 +1558,8 @@ class Indexer {
/**
* Removes records for the indexed page, $phash
*
- * @param int phash value to flush
- * @return void
+ * @param int phash value to flush
+ * @return void
*/
public function removeOldIndexedFiles($phash) {
// Removing old registrations for tables.
@@ -1580,9 +1580,9 @@ class Indexer {
* Check the mtime / tstamp of the currently indexed page/file (based on phash)
* Return positive integer if the page needs to be indexed
*
- * @param int mtime value to test against limits and indexed page (usually this is the mtime of the cached document)
- * @param int "phash" used to select any already indexed page to see what its mtime is.
- * @return integer Result integer: Generally: <0 = No indexing, >0 = Do indexing (see $this->reasons): -2) Min age was NOT exceeded and so indexing cannot occur. -1) mtime matched so no need to reindex page. 0) N/A 1) Max age exceeded, page must be indexed again. 2) mtime of indexed page doesn't match mtime given for current content and we must index page. 3) No mtime was set, so we will index... 4) No indexed page found, so of course we will index.
+ * @param int mtime value to test against limits and indexed page (usually this is the mtime of the cached document)
+ * @param int "phash" used to select any already indexed page to see what its mtime is.
+ * @return int Result integer: Generally: <0 = No indexing, >0 = Do indexing (see $this->reasons): -2) Min age was NOT exceeded and so indexing cannot occur. -1) mtime matched so no need to reindex page. 0) N/A 1) Max age exceeded, page must be indexed again. 2) mtime of indexed page doesn't match mtime given for current content and we must index page. 3) No mtime was set, so we will index... 4) No indexed page found, so of course we will index.
*/
public function checkMtimeTstamp($mtime, $phash) {
if (!\TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed('index_phash')) {
@@ -1635,7 +1635,7 @@ class Indexer {
/**
* Check content hash in phash table
*
- * @return mixed Returns TRUE if the page needs to be indexed (that is, there was no result), otherwise the phash value (in an array) of the phash record to which the grlist_record should be related!
+ * @return mixed Returns TRUE if the page needs to be indexed (that is, there was no result), otherwise the phash value (in an array) of the phash record to which the grlist_record should be related!
*/
public function checkContentHash() {
// With this query the page will only be indexed if it's content is different from the same "phash_grouping" -page.
@@ -1653,9 +1653,9 @@ class Indexer {
* Check content hash for external documents
* Returns TRUE if the document needs to be indexed (that is, there was no result)
*
- * @param int phash value to check (phash_grouping)
- * @param int Content hash to check
- * @return boolean Returns TRUE if the document needs to be indexed (that is, there was no result)
+ * @param int phash value to check (phash_grouping)
+ * @param int Content hash to check
+ * @return bool Returns TRUE if the document needs to be indexed (that is, there was no result)
*/
public function checkExternalDocContentHash($hashGr, $content_md5h) {
$result = TRUE;
@@ -1669,8 +1669,8 @@ class Indexer {
/**
* Checks if a grlist record has been set for the phash value input (looking at the "real" phash of the current content, not the linked-to phash of the common search result page)
*
- * @param int Phash integer to test.
- * @return boolean
+ * @param int Phash integer to test.
+ * @return bool
*/
public function is_grlist_set($phash_x) {
$result = FALSE;
@@ -1684,9 +1684,9 @@ class Indexer {
/**
* Check if an grlist-entry for this hash exists and if not so, write one.
*
- * @param int phash of the search result that should be found
- * @param int The real phash of the current content. The two values are different when a page with userlogin turns out to contain the exact same content as another already indexed version of the page; This is the whole reason for the grlist table in fact...
- * @return void
+ * @param int phash of the search result that should be found
+ * @param int The real phash of the current content. The two values are different when a page with userlogin turns out to contain the exact same content as another already indexed version of the page; This is the whole reason for the grlist table in fact...
+ * @return void
* @see submit_grlist()
*/
public function update_grlist($phash, $phash_x) {
@@ -1702,9 +1702,9 @@ class Indexer {
/**
* Update tstamp for a phash row.
*
- * @param int phash value
- * @param int If set, update the mtime field to this value.
- * @return void
+ * @param int phash value
+ * @param int If set, update the mtime field to this value.
+ * @return void
*/
public function updateTstamp($phash, $mtime = 0) {
if (\TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed('index_phash')) {
@@ -1721,8 +1721,8 @@ class Indexer {
/**
* Update SetID of the index_phash record.
*
- * @param int phash value
- * @return void
+ * @param int phash value
+ * @return void
*/
public function updateSetId($phash) {
if (\TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed('index_phash')) {
@@ -1736,9 +1736,9 @@ class Indexer {
/**
* Update parsetime for phash row.
*
- * @param int phash value.
- * @param int Parsetime value to set.
- * @return void
+ * @param int phash value.
+ * @param int Parsetime value to set.
+ * @return void
*/
public function updateParsetime($phash, $parsetime) {
if (\TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed('index_phash')) {
@@ -1752,7 +1752,7 @@ class Indexer {
/**
* Update section rootline for the page
*
- * @return void
+ * @return void
*/
public function updateRootline() {
if (\TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed('index_section')) {
@@ -1766,8 +1766,8 @@ class Indexer {
* Adding values for root-line fields.
* rl0, rl1 and rl2 are standard. A hook might add more.
*
- * @param array Field array, passed by reference
- * @return void
+ * @param array Field array, passed by reference
+ * @return void
*/
public function getRootLineFields(array &$fieldArray) {
$fieldArray['rl0'] = (int)$this->conf['rootline_uids'][0];
@@ -1784,7 +1784,7 @@ class Indexer {
* Removes any indexed pages with userlogins which has the same contentHash
* NOT USED anywhere inside this class!
*
- * @return void
+ * @return void
*/
public function removeLoginpagesWithContentHash() {
if (\TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed('index_phash') && \TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed('index_grlist')) {
@@ -1804,7 +1804,7 @@ class Indexer {
/**
* Includes the crawler class
*
- * @return void
+ * @return void
*/
public function includeCrawlerClass() {
GeneralUtility::requireOnce(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('crawler') . 'class.tx_crawler_lib.php');
@@ -1854,9 +1854,9 @@ class Indexer {
/**
* Submits RELATIONS between words and phash
*
- * @param array Word list array
- * @param int phash value
- * @return void
+ * @param array Word list array
+ * @param int phash value
+ * @return void
*/
public function submitWords($wordList, $phash) {
if (\TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility::isTableUsed('index_rel')) {
@@ -1887,7 +1887,7 @@ class Indexer {
* and back.
*
* @param double Frequency
- * @return integer Frequency in range.
+ * @return int Frequency in range.
*/
public function freqMap($freq) {
$mapFactor = $this->freqMax * 100 * $this->freqRange;
@@ -1908,7 +1908,7 @@ class Indexer {
/**
* Get search hash, T3 pages
*
- * @return void
+ * @return void
*/
public function setT3Hashes() {
// Set main array:
@@ -1929,9 +1929,9 @@ class Indexer {
/**
* Get search hash, external files
*
- * @param string File name / path which identifies it on the server
- * @param array Additional content identifying the (subpart of) content. For instance; PDF files are divided into groups of pages for indexing.
- * @return array Array with "phash_grouping" and "phash" inside.
+ * @param string File name / path which identifies it on the server
+ * @param array Additional content identifying the (subpart of) content. For instance; PDF files are divided into groups of pages for indexing.
+ * @return array Array with "phash_grouping" and "phash" inside.
*/
public function setExtHashes($file, $subinfo = array()) {
// Set main array:
@@ -1955,9 +1955,9 @@ class Indexer {
/**
* Push function wrapper for TT logging
*
- * @param string Title to set
- * @param string Key (?)
- * @return void
+ * @param string Title to set
+ * @param string Key (?)
+ * @return void
*/
public function log_push($msg, $key) {
if (is_object($GLOBALS['TT'])) {
@@ -1968,7 +1968,7 @@ class Indexer {
/**
* Pull function wrapper for TT logging
*
- * @return void
+ * @return void
*/
public function log_pull() {
if (is_object($GLOBALS['TT'])) {
@@ -1979,9 +1979,9 @@ class Indexer {
/**
* Set log message function wrapper for TT logging
*
- * @param string Message to set
- * @param int Error number
- * @return void
+ * @param string Message to set
+ * @param int Error number
+ * @return void
*/
public function log_setTSlogMessage($msg, $errorNum = 0) {
if (is_object($GLOBALS['TT'])) {
diff --git a/typo3/sysext/indexed_search/Classes/Lexer.php b/typo3/sysext/indexed_search/Classes/Lexer.php
index 619e1ebe1058..648c99a8f3a7 100644
--- a/typo3/sysext/indexed_search/Classes/Lexer.php
+++ b/typo3/sysext/indexed_search/Classes/Lexer.php
@@ -16,13 +16,13 @@ namespace TYPO3\CMS\IndexedSearch;
/**
* Lexer for indexed_search
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
/**
* Lexer class for indexed_search
* A lexer splits the text into words
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class Lexer {
@@ -59,7 +59,7 @@ class Lexer {
/**
* Constructor: Initializes the charset class
*
- * @return void
+ * @return void
*/
public function __construct() {
$this->csObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Charset\\CharsetConverter');
@@ -69,8 +69,8 @@ class Lexer {
* Splitting string into words.
* Used for indexing, can also be used to find words in query.
*
- * @param string String with UTF-8 content to process.
- * @return array Array of words in utf-8
+ * @param string String with UTF-8 content to process.
+ * @return array Array of words in utf-8
*/
public function split2Words($wordString) {
// Reset debug string:
@@ -109,11 +109,11 @@ class Lexer {
* Add word to word-array
* This function should be used to make sure CJK sequences are split up in the right way
*
- * @param array Array of accumulated words
- * @param string Complete Input string from where to extract word
- * @param int Start position of word in input string
- * @param int The Length of the word string from start position
- * @return void
+ * @param array Array of accumulated words
+ * @param string Complete Input string from where to extract word
+ * @param int Start position of word in input string
+ * @param int The Length of the word string from start position
+ * @return void
*/
public function addWords(&$words, &$wordString, $start, $len) {
// Get word out of string:
@@ -157,9 +157,9 @@ class Lexer {
/**
* Get the first word in a given utf-8 string (initial non-letters will be skipped)
*
- * @param string Input string (reference)
- * @param int Starting position in input string
- * @return array 0: start, 1: len or FALSE if no word has been found
+ * @param string Input string (reference)
+ * @param int Starting position in input string
+ * @return array 0: start, 1: len or FALSE if no word has been found
*/
public function get_word(&$str, $pos = 0) {
$len = 0;
@@ -180,10 +180,10 @@ class Lexer {
/**
* See if a character is a letter (or a string of letters or non-letters).
*
- * @param string Input string (reference)
- * @param int Byte-length of character sequence (reference, return value)
- * @param int Starting position in input string
- * @return boolean letter (or word) found
+ * @param string Input string (reference)
+ * @param int Byte-length of character sequence (reference, return value)
+ * @param int Starting position in input string
+ * @return bool letter (or word) found
*/
public function utf8_is_letter(&$str, &$len, $pos = 0) {
global $cs;
@@ -251,8 +251,8 @@ class Lexer {
/**
* Determine the type of character
*
- * @param int Unicode number to evaluate
- * @return array Type of char; index-0: the main type: num, alpha or CJK (Chinese / Japanese / Korean)
+ * @param int Unicode number to evaluate
+ * @return array Type of char; index-0: the main type: num, alpha or CJK (Chinese / Japanese / Korean)
*/
public function charType($cp) {
// Numeric?
@@ -274,11 +274,11 @@ class Lexer {
/**
* Converts a UTF-8 multibyte character to a UNICODE codepoint
*
- * @param string UTF-8 multibyte character string (reference)
- * @param int The length of the character (reference, return value)
- * @param int Starting position in input string
- * @param bool If set, then a hex. number is returned
- * @return integer UNICODE codepoint
+ * @param string UTF-8 multibyte character string (reference)
+ * @param int The length of the character (reference, return value)
+ * @param int Starting position in input string
+ * @param bool If set, then a hex. number is returned
+ * @return int UNICODE codepoint
*/
public function utf8_ord(&$str, &$len, $pos = 0, $hex = FALSE) {
$ord = ord($str[$pos]);
diff --git a/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php b/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
index a9c1ed946d36..08dcd9e3085f 100644
--- a/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
+++ b/typo3/sysext/indexed_search/Classes/Utility/IndexedSearchUtility.php
@@ -29,7 +29,7 @@ class IndexedSearchUtility {
* like indexed_search_mysql.
*
* @param string $tableName Table name to check
- * @return boolean True if the given table is used
+ * @return bool True if the given table is used
*/
static public function isTableUsed($tableName) {
$tableList = $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['use_tables'];
@@ -41,7 +41,7 @@ class IndexedSearchUtility {
* Using 7 instead of 8 just because that makes the integers lower than 32 bit (28 bit) and so they do not interfere with UNSIGNED integers or PHP-versions which has varying output from the hexdec function.
*
* @param string $stringToHash String to hash
- * @return integer Integer intepretation of the md5 hash of input string.
+ * @return int Integer intepretation of the md5 hash of input string.
*/
static public function md5inthash($stringToHash) {
return hexdec(substr(md5($stringToHash), 0, 7));
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php
index 992eb3f6a8d5..f12ca3eecece 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingResultsViewHelper.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers;
/**
* renders the header of the results page
*
- * @author Benjamin Mack <benni@typo3.org>
+ * @author Benjamin Mack <benni@typo3.org>
*/
class PageBrowsingResultsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
diff --git a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
index 64af42a9943d..34a1081aba8a 100644
--- a/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
+++ b/typo3/sysext/indexed_search/Classes/ViewHelpers/PageBrowsingViewHelper.php
@@ -19,7 +19,7 @@ namespace TYPO3\CMS\IndexedSearch\ViewHelpers;
* so this is a cleaner "pi_browsebox" but not a real page browser
* functionality
*
- * @author Benjamin Mack <benni@typo3.org>
+ * @author Benjamin Mack <benni@typo3.org>
*/
class PageBrowsingViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper {
diff --git a/typo3/sysext/indexed_search/class.crawler.php b/typo3/sysext/indexed_search/class.crawler.php
index 81036b81d19e..9d5f04f3b735 100644
--- a/typo3/sysext/indexed_search/class.crawler.php
+++ b/typo3/sysext/indexed_search/class.crawler.php
@@ -15,7 +15,7 @@
/**
* Crawler hook for indexed search. Works with the "crawler" extension
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
// To make sure the backend charset is available:
if (!is_object($GLOBALS['LANG'])) {
diff --git a/typo3/sysext/indexed_search_mysql/Classes/Hook/MysqlFulltextIndexHook.php b/typo3/sysext/indexed_search_mysql/Classes/Hook/MysqlFulltextIndexHook.php
index 0d0fe247c57e..c17b2a6020d6 100644
--- a/typo3/sysext/indexed_search_mysql/Classes/Hook/MysqlFulltextIndexHook.php
+++ b/typo3/sysext/indexed_search_mysql/Classes/Hook/MysqlFulltextIndexHook.php
@@ -16,7 +16,7 @@ namespace TYPO3\CMS\IndexedSearchMysql\Hook;
/**
* Class that hooks into Indexed Search and replaces standard SQL queries with MySQL fulltext index queries.
*
- * @author Michael Stucki <michael@typo3.org>
+ * @author Michael Stucki <michael@typo3.org>
*/
class MysqlFulltextIndexHook {
@@ -35,7 +35,7 @@ class MysqlFulltextIndexHook {
*
* @param array $searchWordsArray Search words
* @param int $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
public function getResultRows_SQLpointer($searchWordsArray, $freeIndexUid = -1) {
// Build the search string, detect which fulltext index to use, and decide whether boolean search is needed or not
@@ -136,7 +136,7 @@ class MysqlFulltextIndexHook {
*
* @param array $searchData Array with search string, boolean indicator, and fulltext index reference
* @param int $freeIndexUid Pointer to which indexing configuration you want to search in. -1 means no filtering. 0 means only regular indexed content.
- * @return boolean|\mysqli_result|object MySQLi result object / DBAL object
+ * @return bool|\mysqli_result|object MySQLi result object / DBAL object
*/
protected function execFinalQuery_fulltext($searchData, $freeIndexUid = -1) {
// Setting up methods of filtering results based on page types, access, etc.
diff --git a/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php b/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php
index 6e01032ae702..a2e998f96fec 100644
--- a/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/AbstractCustomPreset.php
@@ -37,7 +37,7 @@ abstract class AbstractCustomPreset extends AbstractPreset {
/**
* Whether custom preset is active is set by feature
*
- * @return boolean TRUE if custom preset is active
+ * @return bool TRUE if custom preset is active
*/
public function isActive() {
return $this->isActive;
@@ -60,7 +60,7 @@ abstract class AbstractCustomPreset extends AbstractPreset {
/**
* Custom configuration is always available
*
- * @return boolean TRUE
+ * @return bool TRUE
*/
public function isAvailable() {
return TRUE;
diff --git a/typo3/sysext/install/Classes/Configuration/AbstractPreset.php b/typo3/sysext/install/Classes/Configuration/AbstractPreset.php
index fe1dfc14d601..37b7d68a5ba5 100644
--- a/typo3/sysext/install/Classes/Configuration/AbstractPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/AbstractPreset.php
@@ -58,7 +58,7 @@ abstract class AbstractPreset implements PresetInterface {
/**
* Wrapper for isAvailable, used in fluid
*
- * @return boolean TRUE if preset is available
+ * @return bool TRUE if preset is available
*/
public function getIsAvailable() {
return $this->isAvailable();
@@ -67,7 +67,7 @@ abstract class AbstractPreset implements PresetInterface {
/**
* Check is preset is currently active on the system
*
- * @return boolean TRUE if preset is active
+ * @return bool TRUE if preset is active
*/
public function isActive() {
$isActive = TRUE;
@@ -88,7 +88,7 @@ abstract class AbstractPreset implements PresetInterface {
/**
* Wrapper for isActive, used in fluid
*
- * @return boolean TRUE if preset is active
+ * @return bool TRUE if preset is active
*/
public function getIsActive() {
return $this->isActive();
@@ -106,7 +106,7 @@ abstract class AbstractPreset implements PresetInterface {
/**
* Get priority of preset
*
- * @return integer Priority, usually between 0 and 100
+ * @return int Priority, usually between 0 and 100
*/
public function getPriority() {
return $this->priority;
diff --git a/typo3/sysext/install/Classes/Configuration/Charset/CoreInternalPreset.php b/typo3/sysext/install/Classes/Configuration/Charset/CoreInternalPreset.php
index 7430387141c3..79f81643fcbf 100644
--- a/typo3/sysext/install/Classes/Configuration/Charset/CoreInternalPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Charset/CoreInternalPreset.php
@@ -42,7 +42,7 @@ class CoreInternalPreset extends Configuration\AbstractPreset {
/**
* Internal core handling is always available
*
- * @return boolean TRUE
+ * @return bool TRUE
*/
public function isAvailable() {
return TRUE;
diff --git a/typo3/sysext/install/Classes/Configuration/Charset/IconvPreset.php b/typo3/sysext/install/Classes/Configuration/Charset/IconvPreset.php
index a3b802597e3f..6ab2e99c3822 100644
--- a/typo3/sysext/install/Classes/Configuration/Charset/IconvPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Charset/IconvPreset.php
@@ -42,7 +42,7 @@ class IconvPreset extends Configuration\AbstractPreset {
/**
* Check if iconv PHP module is loaded
*
- * @return boolean TRUE if iconv PHP module is loaded
+ * @return bool TRUE if iconv PHP module is loaded
*/
public function isAvailable() {
$result = FALSE;
diff --git a/typo3/sysext/install/Classes/Configuration/Charset/MbstringPreset.php b/typo3/sysext/install/Classes/Configuration/Charset/MbstringPreset.php
index 4c02a0fb7317..b5c15a4ba508 100644
--- a/typo3/sysext/install/Classes/Configuration/Charset/MbstringPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Charset/MbstringPreset.php
@@ -42,7 +42,7 @@ class MbstringPreset extends Configuration\AbstractPreset {
/**
* Check if mbstring PHP module is loaded
*
- * @return boolean TRUE if mbstring PHP module is loaded
+ * @return bool TRUE if mbstring PHP module is loaded
*/
public function isAvailable() {
$result = FALSE;
diff --git a/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php b/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
index 77e3dcfe0456..95ef8ab4f787 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/DevelopmentPreset.php
@@ -50,7 +50,7 @@ class DevelopmentPreset extends Configuration\AbstractPreset {
/**
* Development preset is always available
*
- * @return boolean TRUE if mbstring PHP module is loaded
+ * @return bool TRUE if mbstring PHP module is loaded
*/
public function isAvailable() {
return TRUE;
@@ -60,7 +60,7 @@ class DevelopmentPreset extends Configuration\AbstractPreset {
* If context is set to development, priority
* of this preset is raised.
*
- * @return integer Priority of preset
+ * @return int Priority of preset
*/
public function getPriority() {
$context = \TYPO3\CMS\Core\Utility\GeneralUtility::getApplicationContext();
diff --git a/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php b/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
index ebb07ca7b980..f1dd3d40bff5 100644
--- a/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Context/ProductionPreset.php
@@ -48,7 +48,7 @@ class ProductionPreset extends Configuration\AbstractPreset {
/**
* Production preset is always available
*
- * @return boolean TRUE if mbstring PHP module is loaded
+ * @return bool TRUE if mbstring PHP module is loaded
*/
public function isAvailable() {
return TRUE;
@@ -58,7 +58,7 @@ class ProductionPreset extends Configuration\AbstractPreset {
* If context is set to production, priority
* of this preset is raised.
*
- * @return integer Priority of preset
+ * @return int Priority of preset
*/
public function getPriority() {
$context = \TYPO3\CMS\Core\Utility\GeneralUtility::getApplicationContext();
diff --git a/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ApcPreset.php b/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ApcPreset.php
index 5e229f013edb..12c2fb8878ea 100644
--- a/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ApcPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/ApcPreset.php
@@ -49,7 +49,7 @@ class ApcPreset extends Configuration\AbstractPreset {
* APC preset is available if extension is loaded, if APC has ~100MB
* memory and if ~5MB are free.
*
- * @return boolean TRUE
+ * @return bool TRUE
*/
public function isAvailable() {
$result = FALSE;
diff --git a/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/DatabasePreset.php b/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/DatabasePreset.php
index 923a2a921363..b77a7a9b1f88 100644
--- a/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/DatabasePreset.php
+++ b/typo3/sysext/install/Classes/Configuration/ExtbaseObjectCache/DatabasePreset.php
@@ -48,7 +48,7 @@ class DatabasePreset extends Configuration\AbstractPreset {
/**
* Database preset is always available
*
- * @return boolean TRUE
+ * @return bool TRUE
*/
public function isAvailable() {
return TRUE;
diff --git a/typo3/sysext/install/Classes/Configuration/Image/AbstractImagePreset.php b/typo3/sysext/install/Classes/Configuration/Image/AbstractImagePreset.php
index a030b95cf1a4..0d06b5128029 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/AbstractImagePreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/AbstractImagePreset.php
@@ -54,7 +54,7 @@ abstract class AbstractImagePreset extends Configuration\AbstractPreset {
* Check is preset is currently active on the system.
* Overwrites parent method to ignore im_path and im_path_lzw settings
*
- * @return boolean TRUE if preset is active
+ * @return bool TRUE if preset is active
*/
public function isActive() {
$isActive = TRUE;
@@ -75,7 +75,7 @@ abstract class AbstractImagePreset extends Configuration\AbstractPreset {
/**
* Find out if GraphicsMagick is available
*
- * @return boolean TRUE if GraphicsMagick executable is found in path
+ * @return bool TRUE if GraphicsMagick executable is found in path
*/
public function isAvailable() {
$searchPaths = $this->getSearchPaths();
diff --git a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
index 759f0f10f17e..73b7bda04726 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/GraphicsMagickPreset.php
@@ -60,7 +60,7 @@ class GraphicsMagickPreset extends AbstractImagePreset implements Configuration\
* Search for GraphicsMagick executables in given paths.
*
* @param array $searchPaths List of pathes to search for
- * @return boolean TRUE if graphics magick was found in path
+ * @return bool TRUE if graphics magick was found in path
*/
protected function findGraphicsMagickInPaths(array $searchPaths) {
$result = FALSE;
diff --git a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
index 263b93cbf344..08394efcfb8b 100644
--- a/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
+++ b/typo3/sysext/install/Classes/Configuration/Image/ImageMagick6Preset.php
@@ -60,7 +60,7 @@ class ImageMagick6Preset extends AbstractImagePreset implements Configuration\Pr
* Search for GraphicsMagick executables in given paths.
*
* @param array $searchPaths List of paths to search for
- * @return boolean TRUE if graphics magick was found in path
+ * @return bool TRUE if graphics magick was found in path
*/
protected function findImageMagick6InPaths(array $searchPaths) {
$result = FALSE;
diff --git a/typo3/sysext/install/Classes/Configuration/PresetInterface.php b/typo3/sysext/install/Classes/Configuration/PresetInterface.php
index 2bb5c58e4a6e..df4a615e0e47 100644
--- a/typo3/sysext/install/Classes/Configuration/PresetInterface.php
+++ b/typo3/sysext/install/Classes/Configuration/PresetInterface.php
@@ -33,28 +33,28 @@ interface PresetInterface {
/**
* Check if preset is available on the system
*
- * @return boolean TRUE if preset is available
+ * @return bool TRUE if preset is available
*/
public function isAvailable();
/**
* Wrapper for isAvailable, used in fluid
*
- * @return boolean TRUE if preset is available
+ * @return bool TRUE if preset is available
*/
public function getIsAvailable();
/**
* Check is preset is currently active on the system
*
- * @return boolean TRUE if preset is active
+ * @return bool TRUE if preset is active
*/
public function isActive();
/**
* Wrapper for isActive, used in fluid
*
- * @return boolean TRUE if preset is active
+ * @return bool TRUE if preset is active
*/
public function getIsActive();
@@ -68,7 +68,7 @@ interface PresetInterface {
/**
* Get priority of preset
*
- * @return integer Priority, usually between 0 and 100
+ * @return int Priority, usually between 0 and 100
*/
public function getPriority();
diff --git a/typo3/sysext/install/Classes/Controller/AbstractController.php b/typo3/sysext/install/Classes/Controller/AbstractController.php
index 76015879cfc6..0b11d2edac59 100644
--- a/typo3/sysext/install/Classes/Controller/AbstractController.php
+++ b/typo3/sysext/install/Classes/Controller/AbstractController.php
@@ -344,7 +344,7 @@ class AbstractController {
* First installation is in progress, if LocalConfiguration does not exist,
* or if isInitialInstallationInProgress is not set or FALSE.
*
- * @return boolean TRUE if installation is in progress
+ * @return bool TRUE if installation is in progress
*/
protected function isInitialInstallationInProgress() {
/** @var \TYPO3\CMS\Core\Configuration\ConfigurationManager $configurationManager */
@@ -441,7 +441,7 @@ class AbstractController {
/**
* Return TRUE if dbal and adodb extension is loaded.
*
- * @return boolean TRUE if dbal and adodb is loaded
+ * @return bool TRUE if dbal and adodb is loaded
*/
protected function isDbalEnabled() {
if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('adodb')
diff --git a/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php b/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php
index 595ca96007dd..500f32f2785e 100644
--- a/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php
+++ b/typo3/sysext/install/Classes/Controller/Action/AbstractAction.php
@@ -187,7 +187,7 @@ abstract class AbstractAction implements ActionInterface {
/**
* Return TRUE if dbal and adodb extension is loaded
*
- * @return boolean TRUE if dbal and adodb is loaded
+ * @return bool TRUE if dbal and adodb is loaded
*/
protected function isDbalEnabled() {
if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('adodb')
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseConnect.php b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseConnect.php
index d58633a7e677..26dddd9a6369 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseConnect.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseConnect.php
@@ -192,7 +192,7 @@ class DatabaseConnect extends AbstractStepAction {
* Step needs to be executed if database connection is not successful.
*
* @throws \TYPO3\CMS\Install\Controller\Exception\RedirectException
- * @return boolean
+ * @return bool
*/
public function needsExecution() {
if ($this->isConnectSuccessful() && $this->isConfigurationComplete()) {
@@ -244,7 +244,7 @@ class DatabaseConnect extends AbstractStepAction {
/**
* Render connect port and label
*
- * @return integer Configured or default port
+ * @return int Configured or default port
*/
protected function getConfiguredOrDefaultPort() {
$configuredPort = (int)$this->getConfiguredPort();
@@ -277,7 +277,7 @@ class DatabaseConnect extends AbstractStepAction {
/**
* Test connection with given credentials
*
- * @return boolean TRUE if connect was successful
+ * @return bool TRUE if connect was successful
*/
protected function isConnectSuccessful() {
/** @var $databaseConnection \TYPO3\CMS\Core\Database\DatabaseConnection */
@@ -310,7 +310,7 @@ class DatabaseConnect extends AbstractStepAction {
* - 'host' is mandatory and must not be empty
* - 'port' OR 'socket' is mandatory, but may be empty
*
- * @return boolean TRUE if host is set
+ * @return bool TRUE if host is set
*/
protected function isHostConfigured() {
$hostConfigured = TRUE;
@@ -332,7 +332,7 @@ class DatabaseConnect extends AbstractStepAction {
* - 'port' OR 'socket' is mandatory, but may be empty
* - 'username' and 'password' are mandatory, but may be empty
*
- * @return boolean TRUE if required settings are present
+ * @return bool TRUE if required settings are present
*/
protected function isConfigurationComplete() {
$configurationComplete = $this->isHostConfigured();
@@ -402,7 +402,7 @@ class DatabaseConnect extends AbstractStepAction {
* Test if a unix domain socket can be opened. This does not
* authenticate but only tests if a connect is successful.
*
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
protected function isConnectionWithUnixDomainSocketPossible() {
$result = FALSE;
@@ -622,7 +622,7 @@ class DatabaseConnect extends AbstractStepAction {
/**
* Returns configured port. Gets port from host value if port is not yet set.
*
- * @return integer
+ * @return int
*/
protected function getConfiguredPort() {
$host = isset($GLOBALS['TYPO3_CONF_VARS']['DB']['host']) ? $GLOBALS['TYPO3_CONF_VARS']['DB']['host'] : '';
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseData.php b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseData.php
index 840f1ebeded8..792f2adf18f6 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseData.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseData.php
@@ -74,7 +74,7 @@ class DatabaseData extends AbstractStepAction {
/**
* Step needs to be executed if there are no tables in database
*
- * @return boolean
+ * @return bool
*/
public function needsExecution() {
$result = FALSE;
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
index 7952f82267f5..a7ecbb2dd238 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/DatabaseSelect.php
@@ -92,7 +92,7 @@ class DatabaseSelect extends AbstractStepAction {
* Step needs to be executed if database is not set or can
* not be selected.
*
- * @return boolean
+ * @return bool
*/
public function needsExecution() {
$this->initializeDatabaseConnection();
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/DefaultConfiguration.php b/typo3/sysext/install/Classes/Controller/Action/Step/DefaultConfiguration.php
index ff08bcbc15aa..83156736f7a6 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/DefaultConfiguration.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/DefaultConfiguration.php
@@ -71,7 +71,7 @@ class DefaultConfiguration extends AbstractStepAction {
/**
* Step needs to be executed if 'isInitialInstallationInProgress' is set to TRUE in LocalConfiguration
*
- * @return boolean
+ * @return bool
*/
public function needsExecution() {
$result = FALSE;
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/EnvironmentAndFolders.php b/typo3/sysext/install/Classes/Controller/Action/Step/EnvironmentAndFolders.php
index 609ee4191006..91a2beb8f201 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/EnvironmentAndFolders.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/EnvironmentAndFolders.php
@@ -74,7 +74,7 @@ class EnvironmentAndFolders extends AbstractStepAction {
/**
* Step needs to be executed if LocalConfiguration file does not exist.
*
- * @return boolean
+ * @return bool
*/
public function needsExecution() {
if (@is_file(PATH_typo3conf . 'LocalConfiguration.php')) {
diff --git a/typo3/sysext/install/Classes/Controller/Action/Step/StepInterface.php b/typo3/sysext/install/Classes/Controller/Action/Step/StepInterface.php
index 40888bbe823d..a990e8257718 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Step/StepInterface.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Step/StepInterface.php
@@ -30,7 +30,7 @@ interface StepInterface {
/**
* Whether this step must be executed
*
- * @return boolean TRUE if this step needs to be executed
+ * @return bool TRUE if this step needs to be executed
*/
public function needsExecution();
diff --git a/typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php b/typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php
index d1861ec0ec16..6857ac25a93c 100644
--- a/typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php
+++ b/typo3/sysext/install/Classes/Controller/Action/Tool/TestSetup.php
@@ -639,7 +639,7 @@ class TestSetup extends Action\AbstractAction {
/**
* Find out if ImageMagick or GraphicsMagick is enabled and set up
*
- * @return boolean TRUE if enabled and path is set
+ * @return bool TRUE if enabled and path is set
*/
protected function isImageMagickEnabledAndConfigured() {
$enabled = $GLOBALS['TYPO3_CONF_VARS']['GFX']['im'];
diff --git a/typo3/sysext/install/Classes/Database/DatabaseConnectionMock.php b/typo3/sysext/install/Classes/Database/DatabaseConnectionMock.php
index fb302878f6aa..130005d4a714 100644
--- a/typo3/sysext/install/Classes/Database/DatabaseConnectionMock.php
+++ b/typo3/sysext/install/Classes/Database/DatabaseConnectionMock.php
@@ -32,7 +32,7 @@ class DatabaseConnectionMock {
/**
* Insert row mock
*
- * @return boolean TRUE
+ * @return bool TRUE
*/
public function exec_INSERTquery() {
return TRUE;
diff --git a/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php b/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
index 58b15c77f2f9..52373e4077f9 100644
--- a/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/AbstractNode.php
@@ -105,7 +105,7 @@ abstract class AbstractNode {
/**
* Current node is writable if parent is writable
*
- * @return boolean TRUE if parent is writable
+ * @return bool TRUE if parent is writable
*/
public function isWritable() {
return $this->getParent()->isWritable();
@@ -116,7 +116,7 @@ abstract class AbstractNode {
* Returns TRUE if it is there, even if it is only a link.
* Does not check the type!
*
- * @return boolean
+ * @return bool
*/
protected function exists() {
if (@is_link($this->getAbsolutePath())) {
@@ -157,7 +157,7 @@ abstract class AbstractNode {
/**
* Checks if current permission are identical to target permission
*
- * @return boolean
+ * @return bool
*/
protected function isPermissionCorrect() {
if ($this->isWindowsOs()) {
@@ -183,7 +183,7 @@ abstract class AbstractNode {
/**
* Returns TRUE if OS is windows
*
- * @return boolean TRUE on windows
+ * @return bool TRUE on windows
*/
protected function isWindowsOs() {
if (TYPO3_OS === 'WIN') {
diff --git a/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php b/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
index 7cd5dceed004..7d9a83d5a7c3 100644
--- a/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/DirectoryNode.php
@@ -82,7 +82,7 @@ class DirectoryNode extends AbstractNode implements NodeInterface {
/**
* Create a test file and delete again if directory exists
*
- * @return boolean TRUE if test file creation was successful
+ * @return bool TRUE if test file creation was successful
*/
public function isWritable() {
$result = TRUE;
@@ -240,7 +240,7 @@ class DirectoryNode extends AbstractNode implements NodeInterface {
/**
* Create a test file and delete again - helper for isWritable
*
- * @return boolean TRUE if test file creation was successful
+ * @return bool TRUE if test file creation was successful
*/
protected function canFileBeCreated() {
$testFileName = uniqid('installToolTest_', TRUE);
@@ -254,7 +254,7 @@ class DirectoryNode extends AbstractNode implements NodeInterface {
/**
* Checks if not is a directory
*
- * @return boolean True if node is a directory
+ * @return bool True if node is a directory
*/
protected function isDirectory() {
$path = $this->getAbsolutePath();
diff --git a/typo3/sysext/install/Classes/FolderStructure/FileNode.php b/typo3/sysext/install/Classes/FolderStructure/FileNode.php
index 5cdcceb966d8..095e462dab27 100644
--- a/typo3/sysext/install/Classes/FolderStructure/FileNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/FileNode.php
@@ -235,7 +235,7 @@ class FileNode extends AbstractNode implements NodeInterface {
* Compare current file content with target file content
*
* @throws Exception If file does not exist
- * @return boolean TRUE if current and target file content are identical
+ * @return bool TRUE if current and target file content are identical
*/
protected function isContentCorrect() {
$absolutePath = $this->getAbsolutePath();
@@ -293,7 +293,7 @@ class FileNode extends AbstractNode implements NodeInterface {
/**
* Checks if not is a file
*
- * @return boolean
+ * @return bool
*/
protected function isFile() {
$path = $this->getAbsolutePath();
diff --git a/typo3/sysext/install/Classes/FolderStructure/LinkNode.php b/typo3/sysext/install/Classes/FolderStructure/LinkNode.php
index 27bf55b0484a..79841dafbb1e 100644
--- a/typo3/sysext/install/Classes/FolderStructure/LinkNode.php
+++ b/typo3/sysext/install/Classes/FolderStructure/LinkNode.php
@@ -142,7 +142,7 @@ class LinkNode extends AbstractNode implements NodeInterface {
* Find out if node is a link
*
* @throws Exception\InvalidArgumentException
- * @return boolean TRUE if node is a link
+ * @return bool TRUE if node is a link
*/
protected function isLink() {
if (!$this->exists()) {
@@ -158,7 +158,7 @@ class LinkNode extends AbstractNode implements NodeInterface {
* Checks if the real link target is identical to given target
*
* @throws Exception\InvalidArgumentException
- * @return boolean TRUE if target is correct
+ * @return bool TRUE if target is correct
*/
protected function isTargetCorrect() {
if (!$this->exists()) {
diff --git a/typo3/sysext/install/Classes/FolderStructure/NodeInterface.php b/typo3/sysext/install/Classes/FolderStructure/NodeInterface.php
index 44cb7f537ebe..d08285929377 100644
--- a/typo3/sysext/install/Classes/FolderStructure/NodeInterface.php
+++ b/typo3/sysext/install/Classes/FolderStructure/NodeInterface.php
@@ -51,7 +51,7 @@ interface NodeInterface {
/**
* Check if node is writable - can be created and permission can be fixed
*
- * @return boolean TRUE if node is writable
+ * @return bool TRUE if node is writable
*/
public function isWritable();
diff --git a/typo3/sysext/install/Classes/Report/InstallStatusReport.php b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
index 378636593c23..6161c2ba0de1 100644
--- a/typo3/sysext/install/Classes/Report/InstallStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
@@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
/**
* Provides an installation status report
*
- * @author Ingo Renner <ingo@typo3.org>
+ * @author Ingo Renner <ingo@typo3.org>
*/
class InstallStatusReport implements \TYPO3\CMS\Reports\StatusProviderInterface {
diff --git a/typo3/sysext/install/Classes/Service/ContextService.php b/typo3/sysext/install/Classes/Service/ContextService.php
index 985c8c465843..ac76be6ad8b8 100644
--- a/typo3/sysext/install/Classes/Service/ContextService.php
+++ b/typo3/sysext/install/Classes/Service/ContextService.php
@@ -36,7 +36,7 @@ class ContextService {
/**
* Is the install tool running in the backend?
*
- * @return boolean
+ * @return bool
*/
public function isBackendContext() {
return $this->backendContext;
@@ -45,7 +45,7 @@ class ContextService {
/**
* Is the install tool running as a standalone application?
*
- * @return boolean
+ * @return bool
*/
public function isStandaloneContext() {
return !$this->backendContext;
@@ -54,7 +54,7 @@ class ContextService {
/**
* Is the install tool running as a standalone application?
*
- * @return boolean
+ * @return bool
*/
public function getContextString() {
return ( $this->isBackendContext() ? 'backend' : 'standalone' );
diff --git a/typo3/sysext/install/Classes/Service/CoreUpdateService.php b/typo3/sysext/install/Classes/Service/CoreUpdateService.php
index 10d8b3848cda..38fef8ca67ce 100644
--- a/typo3/sysext/install/Classes/Service/CoreUpdateService.php
+++ b/typo3/sysext/install/Classes/Service/CoreUpdateService.php
@@ -78,7 +78,7 @@ class CoreUpdateService {
/**
* Check if this installation wants to enable the core updater
*
- * @return boolean
+ * @return bool
*/
public function isCoreUpdateEnabled() {
$coreUpdateDisabled = getenv('TYPO3_DISABLE_CORE_UPDATER') ?: (getenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER') ?: FALSE);
@@ -119,7 +119,7 @@ class CoreUpdateService {
/**
* Wrapper method for CoreVersionService
*
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function updateVersionMatrix() {
$success = TRUE;
@@ -142,7 +142,7 @@ class CoreUpdateService {
/**
* Check if an update is possible at all
*
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function checkPreConditions() {
$success = TRUE;
@@ -232,7 +232,7 @@ class CoreUpdateService {
* Download the specified version
*
* @param string $version A version to download
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function downloadVersion($version) {
$downloadUri = $this->downloadBaseUri . $version;
@@ -274,7 +274,7 @@ class CoreUpdateService {
* Verify checksum of downloaded version
*
* @param string $version A downloaded version to check
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function verifyFileChecksum($version) {
$fileLocation = $this->getDownloadTarGzTargetPath($version);
@@ -313,7 +313,7 @@ class CoreUpdateService {
* Unpack a downloaded core
*
* @param string $version A version to unpack
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function unpackVersion($version) {
$fileLocation = $this->downloadTargetPath . $version . '.tar.gz';
@@ -361,7 +361,7 @@ class CoreUpdateService {
* Move an unpacked core to its final destination
*
* @param string $version A version to move
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function moveVersion($version) {
$downloadedCoreLocation = $this->downloadTargetPath . 'typo3_src-' . $version;
@@ -401,7 +401,7 @@ class CoreUpdateService {
* Activate a core version
*
* @param string $version A version to activate
- * @return boolean TRUE on success
+ * @return bool TRUE on success
*/
public function activateVersion($version) {
$newCoreLocation = @realPath($this->currentCoreLocation . '/../') . '/typo3_src-' . $version;
diff --git a/typo3/sysext/install/Classes/Service/CoreVersionService.php b/typo3/sysext/install/Classes/Service/CoreVersionService.php
index 68d276bb692f..d5e8fae0de86 100644
--- a/typo3/sysext/install/Classes/Service/CoreVersionService.php
+++ b/typo3/sysext/install/Classes/Service/CoreVersionService.php
@@ -78,7 +78,7 @@ class CoreVersionService {
* Development git checkout versions always end with '-dev'. They are
* not "released" as such and can not be updated.
*
- * @return boolean FALSE If some development version is installed
+ * @return bool FALSE If some development version is installed
*/
public function isInstalledVersionAReleasedVersion() {
$version = $this->getInstalledVersion();
@@ -121,7 +121,7 @@ class CoreVersionService {
/**
* Returns TRUE if a younger patch level release exists in version matrix.
*
- * @return boolean TRUE if younger patch release is exists
+ * @return bool TRUE if younger patch release is exists
*/
public function isYoungerPatchReleaseAvailable() {
$result = FALSE;
@@ -136,7 +136,7 @@ class CoreVersionService {
/**
* Returns TRUE if a younger patch level release exists in version matrix that may be a development release.
*
- * @return boolean TRUE if younger patch release is exists
+ * @return bool TRUE if younger patch release is exists
*/
public function isYoungerPatchDevelopmentReleaseAvailable() {
$result = FALSE;
@@ -151,7 +151,7 @@ class CoreVersionService {
/**
* Returns TRUE if an upgrade from current version is security relevant
*
- * @return boolean TRUE if there is a pending security update
+ * @return bool TRUE if there is a pending security update
*/
public function isUpdateSecurityRelevant() {
$result = FALSE;
@@ -281,7 +281,7 @@ class CoreVersionService {
*
* @param $version String to check in version matrix, eg. 6.2.0alpha3 or 6.2.2
* @throws Exception\CoreVersionServiceException
- * @return integer Timestamp of release
+ * @return int Timestamp of release
*/
protected function getReleaseTimestampOfVersion($version) {
$minorVersion = $this->getMinorVersion($version);
diff --git a/typo3/sysext/install/Classes/Service/EnableFileService.php b/typo3/sysext/install/Classes/Service/EnableFileService.php
index c32eb305f93f..37a05c6712f6 100644
--- a/typo3/sysext/install/Classes/Service/EnableFileService.php
+++ b/typo3/sysext/install/Classes/Service/EnableFileService.php
@@ -47,7 +47,7 @@ class EnableFileService {
/**
* Creates the INSTALL_TOOL_ENABLE file
*
- * @return boolean
+ * @return bool
*/
static public function createInstallToolEnableFile() {
$installEnableFilePath = self::getInstallToolEnableFilePath();
@@ -64,7 +64,7 @@ class EnableFileService {
/**
* Removes the INSTALL_TOOL_ENABLE file
*
- * @return boolean
+ * @return bool
*/
static public function removeInstallToolEnableFile() {
return unlink(self::getInstallToolEnableFilePath());
@@ -73,7 +73,7 @@ class EnableFileService {
/**
* Removes the FIRST_INSTALL file
*
- * @return boolean
+ * @return bool
*/
static public function removeFirstInstallFile() {
return unlink(self::getFirstInstallFilePath());
@@ -91,7 +91,7 @@ class EnableFileService {
/**
* Checks if the install tool file exists
*
- * @return boolean
+ * @return bool
*/
static public function checkInstallToolEnableFile() {
if (!self::installToolEnableFileExists()) {
diff --git a/typo3/sysext/install/Classes/Service/SessionService.php b/typo3/sysext/install/Classes/Service/SessionService.php
index c27c44c613fb..35411777ae32 100644
--- a/typo3/sysext/install/Classes/Service/SessionService.php
+++ b/typo3/sysext/install/Classes/Service/SessionService.php
@@ -176,7 +176,7 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Checks whether we already have an active session.
*
- * @return boolean TRUE if there is an active session, FALSE otherwise
+ * @return bool TRUE if there is an active session, FALSE otherwise
*/
public function hasSession() {
return ($_SESSION['active'] === TRUE);
@@ -232,7 +232,7 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Check if we have an already authorized session
*
- * @return boolean TRUE if this session has been authorized before (by a correct password)
+ * @return bool TRUE if this session has been authorized before (by a correct password)
*/
public function isAuthorized() {
if (!$_SESSION['authorized']) {
@@ -250,7 +250,7 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface {
* Useful only right after a FALSE "isAuthorized" to see if this is the
* reason for not being authorized anymore.
*
- * @return boolean TRUE if an authorized session exists, but is expired
+ * @return bool TRUE if an authorized session exists, but is expired
*/
public function isExpired() {
if (!$_SESSION['authorized']) {
@@ -330,7 +330,7 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $savePath
* @param string $sessionName
- * @return boolean
+ * @return bool
*/
public function open($savePath, $sessionName) {
return TRUE;
@@ -339,7 +339,7 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Close function. See @session_set_save_handler
*
- * @return boolean
+ * @return bool
*/
public function close() {
return TRUE;
@@ -361,7 +361,7 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $id The session id
* @param string $sessionData The data to be stored
- * @return boolean
+ * @return bool
*/
public function write($id, $sessionData) {
$sessionFile = $this->getSessionFile($id);
@@ -383,7 +383,7 @@ class SessionService implements \TYPO3\CMS\Core\SingletonInterface {
* Garbage collect session info. See @session_set_save_handler
*
* @param int $maxLifeTime The setting of session.gc_maxlifetime
- * @return boolean
+ * @return bool
*/
public function gc($maxLifeTime) {
$sessionSavePath = $this->getSessionSavePath();
diff --git a/typo3/sysext/install/Classes/SystemEnvironment/Check.php b/typo3/sysext/install/Classes/SystemEnvironment/Check.php
index 73bb580d978a..dd1c782b11b0 100644
--- a/typo3/sysext/install/Classes/SystemEnvironment/Check.php
+++ b/typo3/sysext/install/Classes/SystemEnvironment/Check.php
@@ -1384,7 +1384,7 @@ class Check {
* Validate a given IP address.
*
* @param string $ip IP address to be tested
- * @return boolean
+ * @return bool
*/
protected function isValidIp($ip) {
return filter_var($ip, FILTER_VALIDATE_IP) !== FALSE;
@@ -1393,7 +1393,7 @@ class Check {
/**
* Test if this instance runs on windows OS
*
- * @return boolean TRUE if operating system is windows
+ * @return bool TRUE if operating system is windows
*/
protected function isWindowsOs() {
$windowsOs = FALSE;
@@ -1406,7 +1406,7 @@ class Check {
/**
* Helper method to find out if suhosin extension is loaded
*
- * @return boolean TRUE if suhosin PHP extension is loaded
+ * @return bool TRUE if suhosin PHP extension is loaded
*/
protected function isSuhosinLoadedAndActive() {
$suhosinLoaded = FALSE;
@@ -1447,7 +1447,7 @@ class Check {
* Helper method to get the bytes value from a measurement string like "100k".
*
* @param string $measurement The measurement (e.g. "100k")
- * @return integer The bytes value (e.g. 102400)
+ * @return int The bytes value (e.g. 102400)
*/
protected function getBytesFromSizeMeasurement($measurement) {
$bytes = doubleval($measurement);
diff --git a/typo3/sysext/install/Classes/Updates/AbstractUpdate.php b/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
index eafa31076f8f..7757e06d1635 100644
--- a/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/AbstractUpdate.php
@@ -105,7 +105,7 @@ abstract class AbstractUpdate {
* layer that some update wizards don't have a second parameter
* thus, it evaluates everything already
*
- * @return boolean If the wizard should be shown at all on the overview page
+ * @return bool If the wizard should be shown at all on the overview page
* @see checkForUpdate()
*/
public function shouldRenderWizard() {
@@ -120,7 +120,7 @@ abstract class AbstractUpdate {
* this feature is cool if you want to tell the user that the update wizard
* is working fine, just as output (useful for the character set / utf8 wizard)
*
- * @return boolean If the wizard should render the Next() button on the overview page
+ * @return bool If the wizard should render the Next() button on the overview page
* @see checkForUpdate()
*/
public function shouldRenderNextButton() {
@@ -134,7 +134,7 @@ abstract class AbstractUpdate {
* Check if given table exists
*
* @param string $table
- * @return boolean
+ * @return bool
*/
public function checkIfTableExists($table) {
$databaseTables = $GLOBALS['TYPO3_DB']->admin_get_tables();
@@ -148,7 +148,7 @@ abstract class AbstractUpdate {
* Checks whether updates are required.
*
* @param string &$description The description for the update
- * @return boolean Whether an update is required (TRUE) or not (FALSE)
+ * @return bool Whether an update is required (TRUE) or not (FALSE)
*/
abstract public function checkForUpdate(&$description);
@@ -157,7 +157,7 @@ abstract class AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean Whether everything went smoothly or not
+ * @return bool Whether everything went smoothly or not
*/
abstract public function performUpdate(array &$dbQueries, &$customMessages);
@@ -193,7 +193,7 @@ abstract class AbstractUpdate {
/**
* Checks if this wizard has been "done" before
*
- * @return boolean TRUE if wizard has been done before, FALSE otherwise
+ * @return bool TRUE if wizard has been done before, FALSE otherwise
*/
protected function isWizardDone() {
$wizardClassName = get_class($this);
diff --git a/typo3/sysext/install/Classes/Updates/BackendUserStartModuleUpdate.php b/typo3/sysext/install/Classes/Updates/BackendUserStartModuleUpdate.php
index dc6b8a71842c..a8b52c01eb1a 100644
--- a/typo3/sysext/install/Classes/Updates/BackendUserStartModuleUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/BackendUserStartModuleUpdate.php
@@ -30,7 +30,7 @@ class BackendUserStartModuleUpdate extends AbstractUpdate {
* Checks if an update is needed
*
* @param string &$description The description for the update
- * @return boolean Whether an update is needed (TRUE) or not (FALSE)
+ * @return bool Whether an update is needed (TRUE) or not (FALSE)
*/
public function checkForUpdate(&$description) {
$backendUsersCount = $this->getDatabaseConnection()->exec_SELECTcountRows('uid', 'be_users');
@@ -48,7 +48,7 @@ class BackendUserStartModuleUpdate extends AbstractUpdate {
*
* @param array &$databaseQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean
+ * @return bool
*/
public function performUpdate(array &$databaseQueries, &$customMessages) {
$backendUsers = $this->getDatabaseConnection()->exec_SELECTgetRows('uid,uc', 'be_users', '1=1');
diff --git a/typo3/sysext/install/Classes/Updates/CompatVersionUpdate.php b/typo3/sysext/install/Classes/Updates/CompatVersionUpdate.php
index 42d9ccab871d..a7b0fc5f50fe 100644
--- a/typo3/sysext/install/Classes/Updates/CompatVersionUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/CompatVersionUpdate.php
@@ -31,7 +31,7 @@ class CompatVersionUpdate extends AbstractUpdate {
* Function which checks if update is needed. Called in the beginning of an update process.
*
* @param string &$description Pointer to description for the update
- * @return boolean TRUE if update is needs to be performed, FALSE otherwise.
+ * @return bool TRUE if update is needs to be performed, FALSE otherwise.
*/
public function checkForUpdate(&$description) {
if (!$this->compatVersionIsCurrent()) {
@@ -130,7 +130,7 @@ class CompatVersionUpdate extends AbstractUpdate {
* Checks if user input is valid
*
* @param string Pointer to output custom messages
- * @return boolean TRUE if user input is correct, then the update is performed. When FALSE, return to getUserInput
+ * @return bool TRUE if user input is correct, then the update is performed. When FALSE, return to getUserInput
*/
public function checkUserInput(&$customMessages) {
if ($this->compatVersionIsCurrent()) {
@@ -161,7 +161,7 @@ class CompatVersionUpdate extends AbstractUpdate {
*
* @param array $dbQueries where to insert all DB queries made, so they can be shown to the user if wanted
* @param string $customMessages to output custom messages
- * @return boolean TRUE if update succeeded, FALSE otherwise
+ * @return bool TRUE if update succeeded, FALSE otherwise
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$customMessages = '';
@@ -178,7 +178,7 @@ class CompatVersionUpdate extends AbstractUpdate {
/**
* Checks if compatibility version is set to current version
*
- * @return boolean TRUE if compat version is equal the current version
+ * @return bool TRUE if compat version is equal the current version
*/
protected function compatVersionIsCurrent() {
if (TYPO3_branch != $GLOBALS['TYPO3_CONF_VARS']['SYS']['compat_version']) {
diff --git a/typo3/sysext/install/Classes/Updates/ExtensionManagerTables.php b/typo3/sysext/install/Classes/Updates/ExtensionManagerTables.php
index 12931c38c0ed..3f5e2ea3c87e 100644
--- a/typo3/sysext/install/Classes/Updates/ExtensionManagerTables.php
+++ b/typo3/sysext/install/Classes/Updates/ExtensionManagerTables.php
@@ -66,7 +66,7 @@ class ExtensionManagerTables extends AbstractUpdate {
* Checks if an update is needed
*
* @param string &$description The description for the update
- * @return boolean Whether an update is needed (TRUE) or not (FALSE)
+ * @return bool Whether an update is needed (TRUE) or not (FALSE)
*/
public function checkForUpdate(&$description) {
$result = FALSE;
@@ -96,7 +96,7 @@ class ExtensionManagerTables extends AbstractUpdate {
/**
* @param mixed &$customMessages Custom messages
*
- * @return boolean
+ * @return bool
*/
protected function hasError(&$customMessages) {
$result = FALSE;
@@ -113,7 +113,7 @@ class ExtensionManagerTables extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean Whether it worked (TRUE) or not (FALSE)
+ * @return bool Whether it worked (TRUE) or not (FALSE)
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$result = FALSE;
diff --git a/typo3/sysext/install/Classes/Updates/FileIdentifierHashUpdate.php b/typo3/sysext/install/Classes/Updates/FileIdentifierHashUpdate.php
index 56d7d32d0913..5cbc8098dd62 100644
--- a/typo3/sysext/install/Classes/Updates/FileIdentifierHashUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/FileIdentifierHashUpdate.php
@@ -68,7 +68,7 @@ class FileIdentifierHashUpdate extends AbstractUpdate {
* Checks if an update is needed.
*
* @param string &$description The description for the update
- * @return boolean TRUE if an update is needed, FALSE otherwise
+ * @return bool TRUE if an update is needed, FALSE otherwise
*/
public function checkForUpdate(&$description) {
$description = 'Add file identifier hash to sys_file records, where it is missing. Additionally upgrade storage configurations.';
@@ -92,7 +92,7 @@ class FileIdentifierHashUpdate extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean TRUE on success, FALSE on error
+ * @return bool TRUE on success, FALSE on error
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$this->init();
@@ -218,7 +218,7 @@ class FileIdentifierHashUpdate extends AbstractUpdate {
* Test if the local filesystem is case sensitive
*
* @param $absolutePath
- * @return boolean
+ * @return bool
*/
protected function testCaseSensitivity($absolutePath) {
$caseSensitive = TRUE;
diff --git a/typo3/sysext/install/Classes/Updates/FilePermissionUpdate.php b/typo3/sysext/install/Classes/Updates/FilePermissionUpdate.php
index b19ea8693ac0..76a149cac1b5 100644
--- a/typo3/sysext/install/Classes/Updates/FilePermissionUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/FilePermissionUpdate.php
@@ -40,7 +40,7 @@ class FilePermissionUpdate extends AbstractUpdate {
* Checks if an update is needed
*
* @param string &$description The description for the update
- * @return boolean TRUE if an update is needed, FALSE otherwise
+ * @return bool TRUE if an update is needed, FALSE otherwise
*/
public function checkForUpdate(&$description) {
$description = 'There are backend users and backend groups with specified file permissions.' .
@@ -84,7 +84,7 @@ class FilePermissionUpdate extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean TRUE on success, FALSE on error
+ * @return bool TRUE on success, FALSE on error
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
// First perform all add update statements to database
diff --git a/typo3/sysext/install/Classes/Updates/FileTableSplittingUpdate.php b/typo3/sysext/install/Classes/Updates/FileTableSplittingUpdate.php
index 62cc184340e2..48914d562ff3 100644
--- a/typo3/sysext/install/Classes/Updates/FileTableSplittingUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/FileTableSplittingUpdate.php
@@ -37,7 +37,7 @@ class FileTableSplittingUpdate extends AbstractUpdate {
* Checks if an update is needed
*
* @param string &$description The description for the update
- * @return boolean Whether an update is needed (TRUE) or not (FALSE)
+ * @return bool Whether an update is needed (TRUE) or not (FALSE)
*/
public function checkForUpdate(&$description) {
$result = FALSE;
@@ -67,7 +67,7 @@ class FileTableSplittingUpdate extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean Whether it worked (TRUE) or not (FALSE)
+ * @return bool Whether it worked (TRUE) or not (FALSE)
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
diff --git a/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php b/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php
index 01afe3b072b9..11c6cac756a6 100644
--- a/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/FilemountUpdateWizard.php
@@ -72,7 +72,7 @@ class FilemountUpdateWizard extends AbstractUpdate {
* Checks if an update is needed.
*
* @param string &$description The description for the update
- * @return boolean TRUE if an update is needed, FALSE otherwise
+ * @return bool TRUE if an update is needed, FALSE otherwise
*/
public function checkForUpdate(&$description) {
$description = 'Migrate all filemounts to be based on file abstraction layer storages.';
@@ -89,7 +89,7 @@ class FilemountUpdateWizard extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean TRUE on success, FALSE on error
+ * @return bool TRUE on success, FALSE on error
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$this->init();
diff --git a/typo3/sysext/install/Classes/Updates/InitUpdateWizard.php b/typo3/sysext/install/Classes/Updates/InitUpdateWizard.php
index 3a6ac96dc85a..de83df3f1875 100644
--- a/typo3/sysext/install/Classes/Updates/InitUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/InitUpdateWizard.php
@@ -43,7 +43,7 @@ class InitUpdateWizard extends AbstractUpdate {
* Checks if an update is needed
*
* @param string &$description The description for the update
- * @return boolean TRUE if an update is needed, FALSE otherwise
+ * @return bool TRUE if an update is needed, FALSE otherwise
*/
public function checkForUpdate(&$description) {
$description = 'Create the database tables which are required for the File Abstraction Layer in order to work. Do this as the first step for all further wizards related to FAL.';
@@ -55,7 +55,7 @@ class InitUpdateWizard extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean TRUE on success, FALSE on error
+ * @return bool TRUE on success, FALSE on error
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$updates = $this->getRequiredUpdates();
diff --git a/typo3/sysext/install/Classes/Updates/MediaFlexformUpdate.php b/typo3/sysext/install/Classes/Updates/MediaFlexformUpdate.php
index 27463efb3b13..1630418bbe67 100644
--- a/typo3/sysext/install/Classes/Updates/MediaFlexformUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/MediaFlexformUpdate.php
@@ -29,7 +29,7 @@ class MediaFlexformUpdate extends AbstractUpdate {
*
* @param string &$description The description for the update
* @param int &$showUpdate 0=dont show update; 1=show update and next button; 2=only show description
- * @return boolean
+ * @return bool
*/
public function checkForUpdate(&$description, &$showUpdate = 0) {
$mediaElements = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows('*', 'tt_content', 'CType = "media" AND pi_flexform LIKE "%<sheet index=\\"sDEF\\">%"');
@@ -48,7 +48,7 @@ class MediaFlexformUpdate extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean Whether the updated was made or not
+ * @return bool Whether the updated was made or not
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$rows = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
diff --git a/typo3/sysext/install/Classes/Updates/ReferenceIntegrityUpdateWizard.php b/typo3/sysext/install/Classes/Updates/ReferenceIntegrityUpdateWizard.php
index 610564641fd1..cca37b2897aa 100644
--- a/typo3/sysext/install/Classes/Updates/ReferenceIntegrityUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/ReferenceIntegrityUpdateWizard.php
@@ -36,7 +36,7 @@ class ReferenceIntegrityUpdateWizard extends AbstractUpdate {
* Checks if an update is needed
*
* @param string &$description The description for the update
- * @return boolean TRUE if an update is needed, FALSE otherwise
+ * @return bool TRUE if an update is needed, FALSE otherwise
*/
public function checkForUpdate(&$description) {
$description = 'Checks if there are file references that are on the root level. ' .
@@ -50,7 +50,7 @@ class ReferenceIntegrityUpdateWizard extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean TRUE on success, FALSE on error
+ * @return bool TRUE on success, FALSE on error
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$updates = $this->getRequiredUpdates();
diff --git a/typo3/sysext/install/Classes/Updates/RootTemplateUpdate.php b/typo3/sysext/install/Classes/Updates/RootTemplateUpdate.php
index 696db3283e08..0c9b007b439d 100644
--- a/typo3/sysext/install/Classes/Updates/RootTemplateUpdate.php
+++ b/typo3/sysext/install/Classes/Updates/RootTemplateUpdate.php
@@ -29,7 +29,7 @@ class RootTemplateUpdate extends AbstractUpdate implements InstallerProcessInter
*
* @param string &$description The description for the update
* @param int &$showUpdate 0=dont show update; 1=show update and next button; 2=only show description
- * @return boolean
+ * @return bool
*/
public function checkForUpdate(&$description, &$showUpdate = 0) {
$pages = $this->findRootLevelPages();
@@ -50,7 +50,7 @@ class RootTemplateUpdate extends AbstractUpdate implements InstallerProcessInter
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean Whether the updated was made or not
+ * @return bool Whether the updated was made or not
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$now = time();
diff --git a/typo3/sysext/install/Classes/Updates/RteFileLinksUpdateWizard.php b/typo3/sysext/install/Classes/Updates/RteFileLinksUpdateWizard.php
index afa218937d65..b430fd254eed 100644
--- a/typo3/sysext/install/Classes/Updates/RteFileLinksUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/RteFileLinksUpdateWizard.php
@@ -89,7 +89,7 @@ class RteFileLinksUpdateWizard extends AbstractUpdate {
* Checks if an update is needed
*
* @param string $description The description for the update
- * @return boolean TRUE if an update is needed, FALSE otherwise
+ * @return bool TRUE if an update is needed, FALSE otherwise
*/
public function checkForUpdate(&$description) {
$description = 'This update wizard goes through all file links in all rich-text fields and changes them to FAL references.';
@@ -120,7 +120,7 @@ class RteFileLinksUpdateWizard extends AbstractUpdate {
*
* @param array $dbQueries queries done in this update
* @param mixed $customMessages custom messages
- * @return boolean TRUE on success, FALSE on error
+ * @return bool TRUE on success, FALSE on error
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$this->init();
diff --git a/typo3/sysext/install/Classes/Updates/RteMagicImagesUpdateWizard.php b/typo3/sysext/install/Classes/Updates/RteMagicImagesUpdateWizard.php
index 03bd5c016bda..182186cd757a 100644
--- a/typo3/sysext/install/Classes/Updates/RteMagicImagesUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/RteMagicImagesUpdateWizard.php
@@ -77,7 +77,7 @@ class RteMagicImagesUpdateWizard extends AbstractUpdate {
* Checks if an update is needed
*
* @param string $description The description for the update
- * @return boolean TRUE if an update is needed, FALSE otherwise
+ * @return bool TRUE if an update is needed, FALSE otherwise
*/
public function checkForUpdate(&$description) {
$description = 'This update wizard goes through all magic images, located in "' . htmlspecialchars($this->oldPrefix) . '", and moves the files to fileadmin/_migrated/RTE/.';
@@ -110,7 +110,7 @@ class RteMagicImagesUpdateWizard extends AbstractUpdate {
*
* @param array $dbQueries queries done in this update
* @param mixed $customMessages custom messages
- * @return boolean TRUE on success, FALSE on error
+ * @return bool TRUE on success, FALSE on error
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$this->init();
diff --git a/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php b/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php
index 38389a39775b..92df947b02e3 100644
--- a/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php
@@ -108,7 +108,7 @@ class TceformsUpdateWizard extends AbstractUpdate {
* Checks if an update is needed
*
* @param string &$description The description for the update
- * @return boolean TRUE if an update is needed, FALSE otherwise
+ * @return bool TRUE if an update is needed, FALSE otherwise
*/
public function checkForUpdate(&$description) {
$description = 'This update wizard goes through all files that are referenced in the tt_content.image and '
@@ -145,7 +145,7 @@ class TceformsUpdateWizard extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean TRUE on success, FALSE on error
+ * @return bool TRUE on success, FALSE on error
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
if ($this->versionNumber < 6000000) {
diff --git a/typo3/sysext/install/Classes/Updates/TruncateSysFileProcessedFileTable.php b/typo3/sysext/install/Classes/Updates/TruncateSysFileProcessedFileTable.php
index 773a431ba1fc..a598fdd73b7e 100644
--- a/typo3/sysext/install/Classes/Updates/TruncateSysFileProcessedFileTable.php
+++ b/typo3/sysext/install/Classes/Updates/TruncateSysFileProcessedFileTable.php
@@ -28,7 +28,7 @@ class TruncateSysFileProcessedFileTable extends AbstractUpdate {
* Checks whether updates are required.
*
* @param string &$description The description for the update
- * @return boolean Whether an update is required (TRUE) or not (FALSE)
+ * @return bool Whether an update is required (TRUE) or not (FALSE)
*/
public function checkForUpdate(&$description) {
if ($this->isWizardDone() || !$this->checkIfTableExists('sys_file_processedfile')) {
@@ -44,7 +44,7 @@ class TruncateSysFileProcessedFileTable extends AbstractUpdate {
*
* @param array &$databaseQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean Whether everything went smoothly or not
+ * @return bool Whether everything went smoothly or not
*/
public function performUpdate(array &$databaseQueries, &$customMessages) {
$GLOBALS['TYPO3_DB']->exec_TRUNCATEquery('sys_file_processedfile');
diff --git a/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php b/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php
index 4eb56dc097e9..54b108973923 100644
--- a/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php
+++ b/typo3/sysext/install/Classes/Updates/TtContentUploadsUpdateWizard.php
@@ -81,7 +81,7 @@ class TtContentUploadsUpdateWizard extends AbstractUpdate {
* Checks if an update is needed
*
* @param string &$description The description for the update
- * @return boolean TRUE if an update is needed, FALSE otherwise
+ * @return bool TRUE if an update is needed, FALSE otherwise
*/
public function checkForUpdate(&$description) {
$updateNeeded = FALSE;
@@ -115,7 +115,7 @@ class TtContentUploadsUpdateWizard extends AbstractUpdate {
*
* @param array &$dbQueries Queries done in this update
* @param mixed &$customMessages Custom messages
- * @return boolean TRUE on success, FALSE on error
+ * @return bool TRUE on success, FALSE on error
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$this->init();
diff --git a/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php
index 26644199eb1d..6e41d70104c4 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/File/ExistsViewHelper.php
@@ -33,7 +33,7 @@ class ExistsViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelp
* Check if given file is a regular file
*
* @param string $file Absolute path
- * @return boolean
+ * @return bool
*/
public function render($file) {
$result = FALSE;
diff --git a/typo3/sysext/install/Classes/ViewHelpers/File/ImageDimensionViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/File/ImageDimensionViewHelper.php
index ba9d4528794f..5d4daa57c8f1 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/File/ImageDimensionViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/File/ImageDimensionViewHelper.php
@@ -33,7 +33,7 @@ class ImageDimensionViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\Abstract
*
* @param string $dimension Either width or height
* @throws \TYPO3\CMS\Install\ViewHelpers\Exception
- * @return integer width or height
+ * @return int width or height
*/
public function render($dimension = 'width') {
if ($dimension !== 'width' && $dimension !== 'height') {
diff --git a/typo3/sysext/install/Classes/ViewHelpers/File/SizeViewHelper.php b/typo3/sysext/install/Classes/ViewHelpers/File/SizeViewHelper.php
index 835838d87c75..444632c53b03 100644
--- a/typo3/sysext/install/Classes/ViewHelpers/File/SizeViewHelper.php
+++ b/typo3/sysext/install/Classes/ViewHelpers/File/SizeViewHelper.php
@@ -35,7 +35,7 @@ class SizeViewHelper extends \TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper
*
* @param bool $format If true, file size will be formatted
* @throws \TYPO3\CMS\Install\ViewHelpers\Exception
- * @return integer File size
+ * @return int File size
*/
public function render($format = TRUE) {
$absolutePathToFile = $this->renderChildren();
diff --git a/typo3/sysext/lang/Classes/Domain/Model/Extension.php b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
index 5d023a2763b2..509909f637ce 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/Extension.php
@@ -155,7 +155,7 @@ class Extension extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Getter for the version
*
- * @return integer interpretion of the extension version
+ * @return int interpretion of the extension version
*/
public function getVersion() {
return $this->version;
diff --git a/typo3/sysext/lang/Classes/Domain/Model/Language.php b/typo3/sysext/lang/Classes/Domain/Model/Language.php
index bc04d78c421e..9838b0ec2926 100644
--- a/typo3/sysext/lang/Classes/Domain/Model/Language.php
+++ b/typo3/sysext/lang/Classes/Domain/Model/Language.php
@@ -99,7 +99,7 @@ class Language extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
/**
* Getter for the selected
*
- * @return boolean
+ * @return bool
*/
public function getSelected() {
return $this->selected;
diff --git a/typo3/sysext/lang/Classes/Service/UpdateTranslationService.php b/typo3/sysext/lang/Classes/Service/UpdateTranslationService.php
index 5eb0a46ab950..cf93a231508a 100644
--- a/typo3/sysext/lang/Classes/Service/UpdateTranslationService.php
+++ b/typo3/sysext/lang/Classes/Service/UpdateTranslationService.php
@@ -94,7 +94,7 @@ class UpdateTranslationService {
*
* @param string $extensionKey The extension key
* @param string $locale Locale to return
- * @return integer Translation state
+ * @return int Translation state
*/
protected function getTranslationStateForExtension($extensionKey, $locale) {
if (empty($extensionKey) || empty($locale)) {
@@ -159,7 +159,7 @@ class UpdateTranslationService {
*
* @param string $extensionKey The extension key
* @param string $locale Locale to update
- * @return integer Translation state
+ * @return int Translation state
*/
protected function updateTranslationForExtension($extensionKey, $locale) {
if (empty($extensionKey) || empty($locale)) {
diff --git a/typo3/sysext/lang/Classes/Utility/Connection/Ter.php b/typo3/sysext/lang/Classes/Utility/Connection/Ter.php
index 7ea5764c10fe..555936d6e65d 100644
--- a/typo3/sysext/lang/Classes/Utility/Connection/Ter.php
+++ b/typo3/sysext/lang/Classes/Utility/Connection/Ter.php
@@ -122,7 +122,7 @@ class Ter extends \TYPO3\CMS\Extensionmanager\Utility\Connection\TerUtility {
* @param string $extensionKey The extension key to install the translations for
* @param string $language Language code of translation to fetch
* @param string $mirrorUrl Mirror URL to fetch data from
- * @return boolean TRUE on success, error string on fauilure
+ * @return bool TRUE on success, error string on fauilure
*/
public function updateTranslation($extensionKey, $language, $mirrorUrl) {
$result = FALSE;
@@ -182,7 +182,7 @@ class Ter extends \TYPO3\CMS\Extensionmanager\Utility\Connection\TerUtility {
* @param string $file path to zip file
* @param string $path path to extract to
* @throws \TYPO3\CMS\Lang\Exception\Lang
- * @return boolean
+ * @return bool
*/
protected function unzipTranslationFile($file, $path) {
$zip = zip_open($file);
diff --git a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
index f500a44cabd1..cbb96c469349 100644
--- a/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
+++ b/typo3/sysext/linkvalidator/Classes/LinkAnalyzer.php
@@ -105,7 +105,7 @@ class LinkAnalyzer {
*
* @param array $searchField List of fields in which to search for links
* @param string $pid List of comma separated page uids in which to search for links
- * @return void
+ * @return void
*/
public function init(array $searchField, $pid) {
$this->searchFields = $searchField;
@@ -412,7 +412,7 @@ class LinkAnalyzer {
* Check if rootline contains a hidden page
*
* @param array $pageInfo Array with uid, title, hidden, extendToSubpages from pages table
- * @return boolean TRUE if rootline contains a hidden page, FALSE if not
+ * @return bool TRUE if rootline contains a hidden page, FALSE if not
*/
public function getRootLineIsHidden(array $pageInfo) {
$hidden = FALSE;
diff --git a/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php b/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php
index 859682833ea1..f36894e28a30 100644
--- a/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php
+++ b/typo3/sysext/linkvalidator/Classes/Linktype/ExternalLinktype.php
@@ -50,7 +50,7 @@ class ExternalLinktype extends \TYPO3\CMS\Linkvalidator\Linktype\AbstractLinktyp
* @param string $url The URL to check
* @param array $softRefEntry The soft reference entry which builds the context of that URL
* @param \TYPO3\CMS\Linkvalidator\LinkAnalyzer $reference Parent instance
- * @return boolean TRUE on success or FALSE on error
+ * @return bool TRUE on success or FALSE on error
*/
public function checkLink($url, $softRefEntry, $reference) {
$errorParams = array();
diff --git a/typo3/sysext/linkvalidator/Classes/Linktype/FileLinktype.php b/typo3/sysext/linkvalidator/Classes/Linktype/FileLinktype.php
index 202b0fc1777a..1bce39828569 100644
--- a/typo3/sysext/linkvalidator/Classes/Linktype/FileLinktype.php
+++ b/typo3/sysext/linkvalidator/Classes/Linktype/FileLinktype.php
@@ -28,7 +28,7 @@ class FileLinktype extends \TYPO3\CMS\Linkvalidator\Linktype\AbstractLinktype {
* @param string $url Url to check
* @param array $softRefEntry The soft reference entry which builds the context of the url
* @param \TYPO3\CMS\Linkvalidator\LinkAnalyzer $reference Parent instance
- * @return boolean TRUE on success or FALSE on error
+ * @return bool TRUE on success or FALSE on error
*/
public function checkLink($url, $softRefEntry, $reference) {
if (!@file_exists((PATH_site . rawurldecode($url)))) {
diff --git a/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php b/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php
index 2e8ee7425985..90dfe02ba0f9 100644
--- a/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php
+++ b/typo3/sysext/linkvalidator/Classes/Linktype/InternalLinktype.php
@@ -69,7 +69,7 @@ class InternalLinktype extends \TYPO3\CMS\Linkvalidator\Linktype\AbstractLinktyp
* @param string $url Url to check as page-id or page-id#anchor (if anchor is present)
* @param array $softRefEntry: The soft reference entry which builds the context of that url
* @param \TYPO3\CMS\Linkvalidator\LinkAnalyzer $reference Parent instance
- * @return boolean TRUE on success or FALSE on error
+ * @return bool TRUE on success or FALSE on error
*/
public function checkLink($url, $softRefEntry, $reference) {
$anchor = '';
@@ -113,7 +113,7 @@ class InternalLinktype extends \TYPO3\CMS\Linkvalidator\Linktype\AbstractLinktyp
* Checks a given page uid for validity
*
* @param string $page Page uid to check
- * @return boolean TRUE on success or FALSE on error
+ * @return bool TRUE on success or FALSE on error
*/
protected function checkPage($page) {
$row = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow('uid, title, deleted, hidden, starttime, endtime', 'pages', 'uid = ' . (int)$page);
@@ -143,7 +143,7 @@ class InternalLinktype extends \TYPO3\CMS\Linkvalidator\Linktype\AbstractLinktyp
*
* @param string $page Uid of the page to which the link is pointing
* @param string $anchor Uid of the content element to check
- * @return boolean TRUE on success or FALSE on error
+ * @return bool TRUE on success or FALSE on error
*/
protected function checkContent($page, $anchor) {
// Get page ID on which the content element in fact is located
diff --git a/typo3/sysext/linkvalidator/Classes/Linktype/LinkHandler.php b/typo3/sysext/linkvalidator/Classes/Linktype/LinkHandler.php
index 7f6401be4a52..6c366c57c02b 100644
--- a/typo3/sysext/linkvalidator/Classes/Linktype/LinkHandler.php
+++ b/typo3/sysext/linkvalidator/Classes/Linktype/LinkHandler.php
@@ -33,7 +33,7 @@ class LinkHandler extends \TYPO3\CMS\Linkvalidator\Linktype\AbstractLinktype {
* @param string $url Url to check
* @param array $softRefEntry The soft reference entry which builds the context of that url
* @param \TYPO3\CMS\Linkvalidator\LinkAnalyzer $reference Parent instance
- * @return boolean TRUE on success or FALSE on error
+ * @return bool TRUE on success or FALSE on error
*/
public function checkLink($url, $softRefEntry, $reference) {
$response = TRUE;
diff --git a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
index eabb336057ec..3d55dcf0dd8e 100644
--- a/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
+++ b/typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
@@ -699,7 +699,7 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
/**
* Determines whether the current user is an admin
*
- * @return boolean Whether the current user is admin
+ * @return bool Whether the current user is admin
*/
protected function isCurrentUserAdmin() {
return (bool) $GLOBALS['BE_USER']->user['admin'];
diff --git a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
index 2bc2d96594ac..aaff6d63c8ab 100644
--- a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
+++ b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTask.php
@@ -131,7 +131,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Get the value of the protected property emailOnBrokenLinkOnly
*
- * @return boolean Whether to send an email, if new broken links were found
+ * @return bool Whether to send an email, if new broken links were found
*/
public function getEmailOnBrokenLinkOnly() {
return $this->emailOnBrokenLinkOnly;
@@ -150,7 +150,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Get the value of the protected property page
*
- * @return integer UID of the start page for this task
+ * @return int UID of the start page for this task
*/
public function getPage() {
return $this->page;
@@ -169,7 +169,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Get the value of the protected property depth
*
- * @return integer Level of pages the task should check
+ * @return int Level of pages the task should check
*/
public function getDepth() {
return $this->depth;
@@ -226,7 +226,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Function execute from the Scheduler
*
- * @return boolean TRUE on successful execution, FALSE on error
+ * @return bool TRUE on successful execution, FALSE on error
* @throws \InvalidArgumentException if the email template file can not be read
*/
public function execute() {
@@ -383,7 +383,7 @@ class ValidatorTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
*
* @param string $pageSections Content of page section
* @param array $modTsConfig TSconfig array
- * @return boolean TRUE if mail was sent, FALSE if or not
+ * @return bool TRUE if mail was sent, FALSE if or not
* @throws \Exception if required modTsConfig settings are missing
*/
protected function reportEmail($pageSections, array $modTsConfig) {
diff --git a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
index 0a23fb1f72b9..f1cc415dd511 100644
--- a/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/linkvalidator/Classes/Task/ValidatorTaskAdditionalFieldProvider.php
@@ -180,7 +180,7 @@ class ValidatorTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\Addit
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the BE module of the Scheduler
- * @return boolean TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
+ * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule) {
$isValid = TRUE;
diff --git a/typo3/sysext/lowlevel/Classes/CleanerCommand.php b/typo3/sysext/lowlevel/Classes/CleanerCommand.php
index b8a7b43cc177..9301078fff9f 100644
--- a/typo3/sysext/lowlevel/Classes/CleanerCommand.php
+++ b/typo3/sysext/lowlevel/Classes/CleanerCommand.php
@@ -159,7 +159,7 @@ NOW Running --AUTOFIX on result. OK?' . ($this->cli_isArg('--dryrun') ? ' (--dry
/**
* Checks reference index
*
- * @return boolean TRUE if reference index was OK (either OK, updated or ignored)
+ * @return bool TRUE if reference index was OK (either OK, updated or ignored)
*/
public function cli_referenceIndexCheck() {
// Reference index option:
diff --git a/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php b/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php
index 9c3db9a4a83f..ccfa580f2fb2 100644
--- a/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php
+++ b/typo3/sysext/opendocs/Classes/Controller/OpendocsController.php
@@ -49,7 +49,7 @@ class OpendocsController implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookIn
/**
* Checks whether the user has access to this toolbar item
*
- * @return boolean TRUE if user has access, FALSE if not
+ * @return bool TRUE if user has access, FALSE if not
*/
public function checkAccess() {
$conf = $GLOBALS['BE_USER']->getTSConfig('backendToolbarItem.tx_opendocs.disabled');
diff --git a/typo3/sysext/openid/Classes/OpenidEid.php b/typo3/sysext/openid/Classes/OpenidEid.php
index 25d468b88642..8f30381476d3 100644
--- a/typo3/sysext/openid/Classes/OpenidEid.php
+++ b/typo3/sysext/openid/Classes/OpenidEid.php
@@ -20,14 +20,14 @@ use TYPO3\CMS\Core\Utility\HttpUtility;
/**
* This class is the OpenID return script for the TYPO3 Frontend.
*
- * @author Dmitry Dulepov <dmitry@typo3.org>
+ * @author Dmitry Dulepov <dmitry@typo3.org>
*/
class OpenidEid {
/**
* Processes eID request.
*
- * @return void
+ * @return void
*/
public function main() {
// Due to the nature of OpenID (redrections, etc) we need to force user
diff --git a/typo3/sysext/openid/Classes/OpenidModuleSetup.php b/typo3/sysext/openid/Classes/OpenidModuleSetup.php
index 72055cf1c4b1..37ff9822e62e 100644
--- a/typo3/sysext/openid/Classes/OpenidModuleSetup.php
+++ b/typo3/sysext/openid/Classes/OpenidModuleSetup.php
@@ -27,7 +27,7 @@ class OpenidModuleSetup {
* Checks weather BE user has access to change its OpenID identifier
*
* @param array $config: Configuration of the field
- * @return boolean Whether it is allowed to modify the given field
+ * @return bool Whether it is allowed to modify the given field
*/
public function accessLevelCheck(array $config) {
$setupConfig = $GLOBALS['BE_USER']->getTSConfigProp('setup.fields');
diff --git a/typo3/sysext/openid/Classes/OpenidService.php b/typo3/sysext/openid/Classes/OpenidService.php
index d96a9c54d17f..119b50eeafa1 100644
--- a/typo3/sysext/openid/Classes/OpenidService.php
+++ b/typo3/sysext/openid/Classes/OpenidService.php
@@ -95,7 +95,7 @@ class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
* - GMP or BCMATH PHP extensions are installed and functional
* - set_include_path() PHP function is available
*
- * @return boolean TRUE if service is available
+ * @return bool TRUE if service is available
*/
public function init() {
$available = FALSE;
@@ -141,7 +141,7 @@ class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
*
* @param array $loginData Credentials that are submitted and potentially modified by other services
* @param string $passwordTransmissionStrategy Keyword of how the password has been hashed or encrypted before submission
- * @return boolean
+ * @return bool
*/
public function processLoginData(array &$loginData, $passwordTransmissionStrategy) {
$isProcessed = FALSE;
@@ -212,7 +212,7 @@ class OpenidService extends \TYPO3\CMS\Core\Service\AbstractService {
* Authenticates user using OpenID.
*
* @param array $userRecord User record
- * @return integer Code that shows if user is really authenticated.
+ * @return int Code that shows if user is really authenticated.
*/
public function authUser(array $userRecord) {
$result = 100;
diff --git a/typo3/sysext/openid/Classes/OpenidStore.php b/typo3/sysext/openid/Classes/OpenidStore.php
index 89a74209c568..53aad377889a 100644
--- a/typo3/sysext/openid/Classes/OpenidStore.php
+++ b/typo3/sysext/openid/Classes/OpenidStore.php
@@ -63,7 +63,7 @@ class OpenidStore extends \Auth_OpenID_OpenIDStore {
/**
* Removes all expired associations.
*
- * @return integer A number of removed associations
+ * @return int A number of removed associations
*/
public function cleanupAssociations() {
$where = sprintf('expires<=%d', time());
@@ -105,7 +105,7 @@ class OpenidStore extends \Auth_OpenID_OpenIDStore {
*
* @param string $serverUrl Server URL
* @param string $handle Association handle (optional)
- * @return boolean TRUE if the association existed
+ * @return bool TRUE if the association existed
*/
public function removeAssociation($serverUrl, $handle) {
$where = sprintf('server_url=%s AND assoc_handle=%s', $this->databaseConnection->fullQuoteStr($serverUrl, self::ASSOCIATION_TABLE_NAME), $this->databaseConnection->fullQuoteStr($handle, self::ASSOCIATION_TABLE_NAME));
@@ -130,7 +130,7 @@ class OpenidStore extends \Auth_OpenID_OpenIDStore {
* @param string $serverUrl Server URL
* @param int $timestamp Time stamp
* @param string $salt Nonce value
- * @return boolean TRUE if nonce was not used before anc can be used now
+ * @return bool TRUE if nonce was not used before anc can be used now
*/
public function useNonce($serverUrl, $timestamp, $salt) {
$result = FALSE;
@@ -163,7 +163,7 @@ class OpenidStore extends \Auth_OpenID_OpenIDStore {
*
* @param string $serverUrl Server URL
* @param \Auth_OpenID_Association $association OpenID association
- * @return boolean
+ * @return bool
*/
protected function doesAssociationExist($serverUrl, $association) {
$where = sprintf('server_url=%s AND assoc_handle=%s AND expires>%d', $this->databaseConnection->fullQuoteStr($serverUrl, self::ASSOCIATION_TABLE_NAME), $this->databaseConnection->fullQuoteStr($association->handle, self::ASSOCIATION_TABLE_NAME), time());
diff --git a/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php b/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
index 080dc3cb1796..c6af98706cb5 100644
--- a/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
+++ b/typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
@@ -273,7 +273,7 @@ class PermissionModuleController {
/**
* Create the panel of buttons for submitting the form or otherwise perform operations.
*
- * @return array all available buttons as an assoc. array
+ * @return array all available buttons as an assoc. array
*/
protected function getButtons() {
$buttons = array(
diff --git a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
index bce85ce3186c..34788ad9ad73 100644
--- a/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
@@ -2251,7 +2251,7 @@ class ElementBrowser {
* Verifies that a path is a web-folder:
*
* @param string $folder Absolute filepath
- * @return boolean If the input path is found in PATH_site then it returns TRUE.
+ * @return bool If the input path is found in PATH_site then it returns TRUE.
* @deprecated since 6.2 - will be removed two versions later without replacement
*/
public function isWebFolder($folder) {
@@ -2264,7 +2264,7 @@ class ElementBrowser {
* Checks, if a path is within the mountpoints of the backend user
*
* @param string $folder Absolute filepath
- * @return boolean If the input path is found in the backend users filemounts, then return TRUE.
+ * @return bool If the input path is found in the backend users filemounts, then return TRUE.
* @deprecated since 6.2 - will be removed two versions later without replacement
*/
public function checkFolder($folder) {
@@ -2617,7 +2617,7 @@ class ElementBrowser {
* and are coming from the system and not from an external abuse.
*
* @param bool $handleFlexformSections Whether to handle flexform sections differently
- * @return boolean Whether the submitted field change functions are valid
+ * @return bool Whether the submitted field change functions are valid
*/
protected function areFieldChangeFunctionsValid($handleFlexformSections = FALSE) {
$result = FALSE;
diff --git a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
index 54673206748b..89bb9fa379b8 100644
--- a/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/ElementBrowserFramesetController.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Script Class, putting the frameset together.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class ElementBrowserFramesetController {
diff --git a/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php b/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
index 6de190b536f3..920faaf669b2 100644
--- a/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
+++ b/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php
@@ -27,9 +27,9 @@ class DeletedRecordsController {
/**
* Transforms the rows for the deleted Records into the Array View necessary for ExtJS Ext.data.ArrayReader
*
- * @param array $rows Array with table as key and array with all deleted rows
- * @param int $totalDeleted: Number of deleted records in total, for PagingToolbar
- * @return string JSON Array
+ * @param array $rows Array with table as key and array with all deleted rows
+ * @param int $totalDeleted: Number of deleted records in total, for PagingToolbar
+ * @return string JSON Array
*/
public function transform($deletedRowsArray, $totalDeleted) {
$total = 0;
@@ -62,4 +62,4 @@ class DeletedRecordsController {
return json_encode($jsonArray);
}
-}
+}
\ No newline at end of file
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
index 170274b09f06..0b08fa2608f8 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerAjaxController.php
@@ -19,8 +19,8 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Controller class for the 'recycler' extension. Handles the AJAX Requests
*
- * @author Julian Kleinhans <typo3@kj187.de>
- * @author Erik Frister <erik_frister@otq-solutions.com>
+ * @author Julian Kleinhans <typo3@kj187.de>
+ * @author Erik Frister <erik_frister@otq-solutions.com>
*/
class RecyclerAjaxController {
@@ -139,9 +139,9 @@ class RecyclerAjaxController {
/**
* Sets data in the session of the current backend user.
*
- * @param string $identifier: The identifier to be used to set the data
- * @param string $data: The data to be stored in the session
- * @return void
+ * @param string $identifier: The identifier to be used to set the data
+ * @param string $data: The data to be stored in the session
+ * @return void
*/
protected function setDataInSession($identifier, $data) {
$GLOBALS['BE_USER']->uc['tx_recycler'][$identifier] = $data;
diff --git a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
index 0547f005343c..6fd977f2d508 100644
--- a/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
+++ b/typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
@@ -21,7 +21,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
/**
* Module 'Recycler' for the 'recycler' extension.
*
- * @author Julian Kleinhans <typo3@kj187.de>
+ * @author Julian Kleinhans <typo3@kj187.de>
*/
class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
@@ -56,7 +56,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Initializes the Module
*
- * @return void
+ * @return void
*/
public function initialize() {
parent::init();
@@ -87,7 +87,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Renders the content of the module.
*
- * @return void
+ * @return void
*/
public function render() {
$this->content .= $this->doc->header($GLOBALS['LANG']->getLL('title'));
@@ -105,7 +105,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Flushes the rendered content to browser.
*
- * @return void
+ * @return void
*/
public function flush() {
$content = $this->doc->moduleBody($this->pageRecord, $this->getDocHeaderButtons(), $this->getTemplateMarkers());
@@ -119,7 +119,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Determines whether the current user is admin.
*
- * @return boolean Whether the current user is admin
+ * @return bool Whether the current user is admin
*/
protected function isCurrentUserAdmin() {
return (bool) $GLOBALS['BE_USER']->user['admin'];
@@ -128,7 +128,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Loads data in the HTML head section (e.g. JavaScript or stylesheet information).
*
- * @return void
+ * @return void
*/
protected function loadHeaderData() {
// Load CSS Stylesheets:
@@ -152,7 +152,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Gets the JavaScript configuration for the Ext JS interface.
*
- * @return array The JavaScript configuration
+ * @return array The JavaScript configuration
*/
protected function getJavaScriptConfiguration() {
$configuration = array(
@@ -173,7 +173,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Gets the labels to be used in JavaScript in the Ext JS interface.
*
- * @return array The labels to be used in JavaScript
+ * @return array The labels to be used in JavaScript
*/
protected function getJavaScriptLabels() {
$coreLabels = array(
@@ -196,10 +196,10 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Gets labels to be used in JavaScript fetched from the current locallang file.
*
- * @param string $selectionPrefix: Prefix to select the correct labels (default: 'js.')
- * @param string $stripFromSelectionName: Sub-prefix to be removed from label names in the result (default: '')
- * @return array Labels to be used in JavaScript of the current locallang file
- * @todo Check, whether this method can be moved in a generic way to $GLOBALS['LANG']
+ * @param string $selectionPrefix: Prefix to select the correct labels (default: 'js.')
+ * @param string $stripFromSelectionName: Sub-prefix to be removed from label names in the result (default: '')
+ * @return array Labels to be used in JavaScript of the current locallang file
+ * @todo Check, whether this method can be moved in a generic way to $GLOBALS['LANG']
*/
protected function getJavaScriptLabelsFromLocallang($selectionPrefix = 'js.', $stripFromSelectionName = '') {
$extraction = array();
@@ -219,7 +219,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Gets the buttons that shall be rendered in the docHeader.
*
- * @return array Available buttons for the docHeader
+ * @return array Available buttons for the docHeader
*/
protected function getDocHeaderButtons() {
$buttons = array(
@@ -235,7 +235,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Gets the button to set a new shortcut in the backend (if current user is allowed to).
*
- * @return string HTML representation of the shortcut button
+ * @return string HTML representation of the shortcut button
*/
protected function getShortcutButton() {
$result = '';
@@ -248,7 +248,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Gets the filled markers that are used in the HTML template.
*
- * @return array The filled marker array
+ * @return array The filled marker array
*/
protected function getTemplateMarkers() {
$markers = array(
@@ -262,7 +262,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Gets the function menu selector for this backend module.
*
- * @return string The HTML representation of the function menu selector
+ * @return string The HTML representation of the function menu selector
*/
protected function getFunctionMenu() {
return BackendUtility::getFuncMenu(0, 'SET[function]', $this->MOD_SETTINGS['function'], $this->MOD_MENU['function']);
@@ -271,9 +271,9 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
/**
* Gets data from the session of the current backend user.
*
- * @param string $identifier: The identifier to be used to get the data
- * @param string $default: The default date to be used if nothing was found in the session
- * @return string The accordant data in the session of the current backend user
+ * @param string $identifier: The identifier to be used to get the data
+ * @param string $default: The default date to be used if nothing was found in the session
+ * @return string The accordant data in the session of the current backend user
*/
protected function getDataFromSession($identifier, $default = NULL) {
$sessionData = &$GLOBALS['BE_USER']->uc['tx_recycler'];
@@ -285,4 +285,4 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
return $data;
}
-}
+}
\ No newline at end of file
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
index 1d439b5cb1b8..f54f3171629c 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Recycler\Domain\Model;
/**
* Model class for the 'recycler' extension.
*
- * @author Julian Kleinhans <typo3@kj187.de>
+ * @author Julian Kleinhans <typo3@kj187.de>
*/
class DeletedRecords {
@@ -72,11 +72,11 @@ class DeletedRecords {
* Load all deleted rows from $table
* If table is not set, it iterates the TCA tables
*
- * @param int $id: UID from selected page
- * @param string $table: Tablename
- * @param int $depth: How many levels recursive
- * @param int $limit: MySQL LIMIT
- * @param string $filter: Filter text
+ * @param int $id: UID from selected page
+ * @param string $table: Tablename
+ * @param int $depth: How many levels recursive
+ * @param int $limit: MySQL LIMIT
+ * @param string $filter: Filter text
* @return recycler_model_delRecords
*/
public function loadData($id, $table, $depth, $limit = '', $filter = '') {
@@ -107,11 +107,11 @@ class DeletedRecords {
/**
* Find the total count of deleted records
*
- * @param int $id: UID from record
- * @param string $table: Tablename from record
- * @param int $depth: How many levels recursive
- * @param string $filter: Filter text
- * @return void
+ * @param int $id: UID from record
+ * @param string $table: Tablename from record
+ * @param int $depth: How many levels recursive
+ * @param string $filter: Filter text
+ * @return void
*/
public function getTotalCount($id, $table, $depth, $filter) {
$deletedRecords = $this->loadData($id, $table, $depth, '', $filter)->getDeletedRows();
@@ -125,12 +125,12 @@ class DeletedRecords {
/**
* Set all deleted rows
*
- * @param int $id: UID from record
- * @param string $table: Tablename from record
- * @param int $depth: How many levels recursive
- * @param array $ctrl: TCA CTRL Array
- * @param string $filter: Filter text
- * @return void
+ * @param int $id: UID from record
+ * @param string $table: Tablename from record
+ * @param int $depth: How many levels recursive
+ * @param array $ctrl: TCA CTRL Array
+ * @param string $filter: Filter text
+ * @return void
*/
protected function setData($id = 0, $table, $depth, $tcaCtrl, $filter) {
$id = (int)$id;
@@ -240,9 +240,9 @@ class DeletedRecords {
/**
* Checks whether the current backend user has access to the given records.
*
- * @param string $table: Name of the table
- * @param array $rows: Record row
- * @return void
+ * @param string $table: Name of the table
+ * @param array $rows: Record row
+ * @return void
*/
protected function checkRecordAccess($table, array $rows) {
foreach ($rows as $key => $row) {
@@ -256,9 +256,9 @@ class DeletedRecords {
* Escapes a value to be used for like in a database query.
* There is a special handling for the characters '%' and '_'.
*
- * @param string $value: The value to be escaped for like conditions
- * @param string $tableName: The name of the table the query should be used for
- * @return string The escaped value to be used for like conditions
+ * @param string $value: The value to be escaped for like conditions
+ * @param string $tableName: The name of the table the query should be used for
+ * @return string The escaped value to be used for like conditions
*/
protected function escapeValueForLike($value, $tableName) {
return $GLOBALS['TYPO3_DB']->escapeStrForLike($GLOBALS['TYPO3_DB']->quoteStr($value, $tableName), $tableName);
@@ -270,8 +270,8 @@ class DeletedRecords {
/**
* Delete element from any table
*
- * @param string $recordArray: Representation of the records
- * @return void
+ * @param string $recordArray: Representation of the records
+ * @return void
*/
public function deleteData($recordsArray) {
$recordsArray = json_decode($recordsArray);
@@ -294,9 +294,9 @@ class DeletedRecords {
* Undelete records
* If $recursive is TRUE all records below the page uid would be undelete too
*
- * @param string $recordArray: Representation of the records
- * @param bool $recursive: TRUE/FALSE
- * @return boolean
+ * @param string $recordArray: Representation of the records
+ * @param bool $recursive: TRUE/FALSE
+ * @return bool
*/
public function undeleteData($recordsArray, $recursive = FALSE) {
$result = FALSE;
@@ -335,9 +335,9 @@ class DeletedRecords {
/**
* Set deleted rows
*
- * @param string $table: Tablename
- * @param array $row: Deleted record row
- * @return void
+ * @param string $table: Tablename
+ * @param array $row: Deleted record row
+ * @return void
*/
public function setDeletedRows($table, array $row) {
$this->deletedRows[$table][] = $row;
@@ -349,7 +349,7 @@ class DeletedRecords {
/**
* Get deleted Rows
*
- * @return array $this->deletedRows: Array with all deleted rows from TCA
+ * @return array $this->deletedRows: Array with all deleted rows from TCA
*/
public function getDeletedRows() {
return $this->deletedRows;
@@ -358,7 +358,7 @@ class DeletedRecords {
/**
* Get table
*
- * @return array $this->table: Array with table from TCA
+ * @return array $this->table: Array with table from TCA
*/
public function getTable() {
return $this->table;
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
index 638b9d185b6c..0674d0ae200f 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/Tables.php
@@ -17,18 +17,18 @@ namespace TYPO3\CMS\Recycler\Domain\Model;
/**
* Model class for the 'recycler' extension.
*
- * @author Julian Kleinhans <typo3@kj187.de>
+ * @author Julian Kleinhans <typo3@kj187.de>
*/
class Tables {
/**
* Get tables for menu example
*
- * @param string $format: Return format (example: json)
- * @param bool $withAllOption: 0 no, 1 return tables with a "all" option
- * @param int $id: UID from selected page
- * @param int $depth: How many levels recursive
- * @return string The tables to be displayed
+ * @param string $format: Return format (example: json)
+ * @param bool $withAllOption: 0 no, 1 return tables with a "all" option
+ * @param int $id: UID from selected page
+ * @param int $depth: How many levels recursive
+ * @return string The tables to be displayed
*/
public function getTables($format, $withAllOption = 0, $startUid, $depth = 0) {
$deletedRecordsTotal = 0;
diff --git a/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php b/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
index d308b6b5d3d1..a884af56a5bf 100644
--- a/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
+++ b/typo3/sysext/recycler/Classes/Utility/RecyclerUtility.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
/**
* Helper class for the 'recycler' extension.
*
- * @author Julian Kleinhans <typo3@kj187.de>
+ * @author Julian Kleinhans <typo3@kj187.de>
*/
class RecyclerUtility {
@@ -34,7 +34,7 @@ class RecyclerUtility {
*
* @param string $table The table to check access for
* @param string $row Record array
- * @return boolean Returns TRUE is the user has access, or FALSE if not
+ * @return bool Returns TRUE is the user has access, or FALSE if not
*/
static public function checkAccess($table, $row) {
// Checking if the user has permissions? (Only working as a precaution, because the final permission check is always down in TCE. But it's good to notify the user on beforehand...)
@@ -68,11 +68,11 @@ class RecyclerUtility {
* Each part of the path will be limited to $titleLimit characters
* Deleted pages are filtered out.
*
- * @param int Page uid for which to create record path
- * @param string $clause is additional where clauses, eg.
- * @param int Title limit
- * @param int Title limit of Full title (typ. set to 1000 or so)
- * @return mixed Path of record (string) OR array with short/long title if $fullTitleLimit is set.
+ * @param int Page uid for which to create record path
+ * @param string $clause is additional where clauses, eg.
+ * @param int Title limit
+ * @param int Title limit of Full title (typ. set to 1000 or so)
+ * @return mixed Path of record (string) OR array with short/long title if $fullTitleLimit is set.
*/
static public function getRecordPath($uid, $clause = '', $titleLimit = 1000, $fullTitleLimit = 0) {
$loopCheck = 100;
@@ -111,8 +111,8 @@ class RecyclerUtility {
/**
* Gets the name of the field with the information whether a record is deleted.
*
- * @param string $tableName: Name of the table to get the deleted field for
- * @return string Name of the field with the information whether a record is deleted
+ * @param string $tableName: Name of the table to get the deleted field for
+ * @return string Name of the field with the information whether a record is deleted
*/
static public function getDeletedField($tableName) {
$TCA = self::getTableTCA($tableName);
@@ -124,8 +124,8 @@ class RecyclerUtility {
/**
* Gets the TCA of the table used in the current context.
*
- * @param string $tableName: Name of the table to get TCA for
- * @return mixed TCA of the table used in the current context (array)
+ * @param string $tableName: Name of the table to get TCA for
+ * @return mixed TCA of the table used in the current context (array)
*/
static public function getTableTCA($tableName) {
$TCA = FALSE;
@@ -138,7 +138,7 @@ class RecyclerUtility {
/**
* Gets the current backend charset.
*
- * @return string The current backend charset
+ * @return string The current backend charset
*/
static public function getCurrentCharset() {
return $GLOBALS['LANG']->csConvObj->parse_charset($GLOBALS['LANG']->charSet);
@@ -147,7 +147,7 @@ class RecyclerUtility {
/**
* Determines whether the current charset is not UTF-8
*
- * @return boolean Whether the current charset is not UTF-8
+ * @return bool Whether the current charset is not UTF-8
*/
static public function isNotUtf8Charset() {
return self::getCurrentCharset() !== 'utf-8';
@@ -156,8 +156,8 @@ class RecyclerUtility {
/**
* Gets an UTF-8 encoded string (only if the current charset is not UTF-8!).
*
- * @param string $string: String to be converted to UTF-8 if required
- * @return string UTF-8 encoded string
+ * @param string $string: String to be converted to UTF-8 if required
+ * @return string UTF-8 encoded string
*/
static public function getUtf8String($string) {
if (self::isNotUtf8Charset()) {
diff --git a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
index 437f3032c010..2c5019624d46 100644
--- a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
@@ -89,7 +89,7 @@ class ConfigurationStatus implements \TYPO3\CMS\Reports\StatusProviderInterface
/**
* Checks whether memcached is configured, if that's the case we assume it's also used.
*
- * @return boolean TRUE if memcached is used, FALSE otherwise.
+ * @return bool TRUE if memcached is used, FALSE otherwise.
*/
protected function isMemcachedUsed() {
$memcachedUsed = FALSE;
diff --git a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
index bf2ce682d7d4..3e13a15ffbd8 100644
--- a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
@@ -139,7 +139,7 @@ class SecurityStatus implements \TYPO3\CMS\Reports\StatusProviderInterface {
/**
* Checks whether memcached is configured, if that's the case we assume it's also used.
*
- * @return boolean TRUE if memcached is used, FALSE otherwise.
+ * @return bool TRUE if memcached is used, FALSE otherwise.
*/
protected function isMemcachedUsed() {
$memcachedUsed = FALSE;
diff --git a/typo3/sysext/reports/Classes/Report/Status/Status.php b/typo3/sysext/reports/Classes/Report/Status/Status.php
index 7aabdb3a7177..bdc7f2ae3682 100644
--- a/typo3/sysext/reports/Classes/Report/Status/Status.php
+++ b/typo3/sysext/reports/Classes/Report/Status/Status.php
@@ -87,7 +87,7 @@ class Status implements \TYPO3\CMS\Reports\ReportInterface {
* Determines the highest severity from the given statuses.
*
* @param array $statusCollection An array of \TYPO3\CMS\Reports\Status objects.
- * @return integer The highest severity found from the statuses.
+ * @return int The highest severity found from the statuses.
*/
public function getHighestSeverity(array $statusCollection) {
$highestSeverity = \TYPO3\CMS\Reports\Status::NOTICE;
diff --git a/typo3/sysext/reports/Classes/Status.php b/typo3/sysext/reports/Classes/Status.php
index 4328b5fb3411..09f5567ea94b 100644
--- a/typo3/sysext/reports/Classes/Status.php
+++ b/typo3/sysext/reports/Classes/Status.php
@@ -94,7 +94,7 @@ class Status {
/**
* Gets the status' severity
*
- * @return integer
+ * @return int
*/
public function getSeverity() {
return $this->severity;
diff --git a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
index 9b3268d6ecd4..810272bec8d7 100644
--- a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
+++ b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTaskNotificationEmailField.php
@@ -69,7 +69,7 @@ class SystemStatusUpdateTaskNotificationEmailField implements \TYPO3\CMS\Schedul
*
* @param array $submittedData An array containing the data submitted by the add/edit task form
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
- * @return boolean TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
+ * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule) {
$validInput = TRUE;
diff --git a/typo3/sysext/rsaauth/Classes/Backend/PhpBackend.php b/typo3/sysext/rsaauth/Classes/Backend/PhpBackend.php
index a6e4f16ca076..9eb7c03209a6 100644
--- a/typo3/sysext/rsaauth/Classes/Backend/PhpBackend.php
+++ b/typo3/sysext/rsaauth/Classes/Backend/PhpBackend.php
@@ -105,7 +105,7 @@ class PhpBackend extends \TYPO3\CMS\Rsaauth\Backend\AbstractBackend {
* Extracts the exponent from the OpenSSL CSR
*
* @param string $data The result of openssl_csr_export()
- * @return integer The exponent as a number
+ * @return int The exponent as a number
*/
protected function extractExponent($data) {
$index = strpos($data, 'Exponent: ');
diff --git a/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php b/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php
index 59fe05135dd4..1bc294927116 100644
--- a/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php
+++ b/typo3/sysext/rsaauth/Classes/Hook/UserSetupHook.php
@@ -87,7 +87,7 @@ class UserSetupHook {
/**
* Rsa is available if loginSecurityLevel is set and rsa backend is working.
*
- * @return boolean
+ * @return bool
*/
protected function isRsaAvailable() {
return trim($GLOBALS['TYPO3_CONF_VARS']['BE']['loginSecurityLevel']) === 'rsa' && \TYPO3\CMS\Rsaauth\Backend\BackendFactory::getBackend() !== NULL;
diff --git a/typo3/sysext/rsaauth/Classes/Keypair.php b/typo3/sysext/rsaauth/Classes/Keypair.php
index 42f5fc6a4e94..f085acef7e43 100644
--- a/typo3/sysext/rsaauth/Classes/Keypair.php
+++ b/typo3/sysext/rsaauth/Classes/Keypair.php
@@ -45,7 +45,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Checks if this key pair already has been provided with all data.
*
- * @return boolean
+ * @return bool
*/
public function isReady() {
return $this->hasExponent() && $this->hasPrivateKey() && $this->hasPublicKeyModulus();
@@ -54,7 +54,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Retrieves the exponent.
*
- * @return integer the exponent
+ * @return int the exponent
*/
public function getExponent() {
return $this->exponent;
@@ -82,7 +82,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Checks whether an exponent already has been set.
*
- * @return boolean
+ * @return bool
*/
protected function hasExponent() {
return $this->getExponent() !== 0;
@@ -119,7 +119,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Checks whether a private key already has been set.
*
- * @return boolean
+ * @return bool
*/
protected function hasPrivateKey() {
return $this->getPrivateKey() !== '';
@@ -128,7 +128,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Retrieves the public key modulus
*
- * @return integer the public key modulus
+ * @return int the public key modulus
*/
public function getPublicKeyModulus() {
return $this->publicKeyModulus;
@@ -156,7 +156,7 @@ class Keypair implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Checks whether a public key modulus already has been set.
*
- * @return boolean
+ * @return bool
*/
protected function hasPublicKeyModulus() {
return $this->getPublicKeyModulus() !== 0;
diff --git a/typo3/sysext/rsaauth/Classes/RsaAuthService.php b/typo3/sysext/rsaauth/Classes/RsaAuthService.php
index d862eacd3cce..95bca6b9ab38 100644
--- a/typo3/sysext/rsaauth/Classes/RsaAuthService.php
+++ b/typo3/sysext/rsaauth/Classes/RsaAuthService.php
@@ -63,7 +63,7 @@ class RsaAuthService extends \TYPO3\CMS\Sv\AuthenticationService {
*
* @param array $loginData Credentials that are submitted and potentially modified by other services
* @param string $passwordTransmissionStrategy Keyword of how the password has been hashed or encrypted before submission
- * @return boolean
+ * @return bool
*/
public function processLoginData(array &$loginData, $passwordTransmissionStrategy) {
$isProcessed = FALSE;
@@ -98,7 +98,7 @@ class RsaAuthService extends \TYPO3\CMS\Sv\AuthenticationService {
/**
* Initializes the service.
*
- * @return boolean
+ * @return bool
*/
public function init() {
$available = parent::init();
diff --git a/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php b/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
index 042b0b0cee18..ade332272df8 100644
--- a/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
+++ b/typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Script class for the Element Browser window.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
@@ -162,7 +162,7 @@ class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Get the RTE configuration from Page TSConfig
*
- * @return array RTE configuration array
+ * @return array RTE configuration array
*/
protected function getRTEConfig() {
$RTEtsConfigParts = explode(':', $this->RTEtsConfigParams);
@@ -174,8 +174,8 @@ class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Get the configuration of the button
*
- * @param string $buttonName: the name of the button
- * @return array the configuration array of the image button
+ * @param string $buttonName: the name of the button
+ * @return array the configuration array of the image button
*/
protected function getButtonConfig($buttonName) {
return is_array($this->thisConfig['buttons.']) && is_array($this->thisConfig['buttons.'][$buttonName . '.'])
@@ -186,7 +186,7 @@ class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Initialize the current or default values of the link attributes
*
- * @return void
+ * @return void
*/
protected function initLinkAttributes() {
// Initializing the title value
@@ -269,7 +269,7 @@ class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Provide the additional parameters to be included in the template body tag
*
- * @return string the body tag additions
+ * @return string the body tag additions
*/
public function getBodyTagAdditions() {
$bodyTagAdditions = array();
@@ -285,7 +285,7 @@ class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Generate JS code to be used on the link insert/modify dialogue
*
- * @return string the generated JS code
+ * @return string the generated JS code
*/
public function getJSCode() {
// BEGIN accumulation of header JavaScript:
@@ -868,7 +868,7 @@ class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Return html code for the class selector
*
- * @return string the html code to be added to the form
+ * @return string the html code to be added to the form
*/
public function addClassSelector() {
$selectClass = '';
@@ -951,8 +951,8 @@ class BrowseLinks extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Localize a string using the language of the content element rather than the language of the BE interface
*
- * @param string string: the label to be localized
- * @return string Localized string.
+ * @param string string: the label to be localized
+ * @return string Localized string.
*/
public function getLLContent($string) {
return $this->contentLanguageService->sL($string);
diff --git a/typo3/sysext/rtehtmlarea/Classes/ContentParser.php b/typo3/sysext/rtehtmlarea/Classes/ContentParser.php
index 975b66110a6d..36eba7e0e4c9 100644
--- a/typo3/sysext/rtehtmlarea/Classes/ContentParser.php
+++ b/typo3/sysext/rtehtmlarea/Classes/ContentParser.php
@@ -19,7 +19,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Content parsing for htmlArea RTE
*
- * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*/
class ContentParser {
@@ -123,8 +123,8 @@ class ContentParser {
* Modify incoming HTMLparser config in an attempt to keep span tags with id
* Such tags are used by the RTE in order to restore the cursor position when the cleaning operation is completed.
*
- * @param array $HTMLparserConfig: incoming HTMLParser configuration (wil be modified)
- * @return void
+ * @param array $HTMLparserConfig: incoming HTMLParser configuration (wil be modified)
+ * @return void
*/
protected function keepSpanTagsWithId(&$HTMLparserConfig) {
// Allow span tag
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/AccessibilityLinkController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/AccessibilityLinkController.php
index 41c5117b0b07..511232b61b68 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/AccessibilityLinkController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/AccessibilityLinkController.php
@@ -50,9 +50,9 @@ class AccessibilityLinkController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlu
/**
* Remove accessibility icon when no link was rendered, called from TypoScript
*
- * @param string Content input. Not used, ignore.
+ * @param string Content input. Not used, ignore.
* @param array TypoScript configuration
- * @return string HTML output.
+ * @return string HTML output.
* @access private
*/
public function removeAccessibilityIcon ($content, $conf) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
index 948891c22769..f6ddc3ebc4b7 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/BrowseLinksController.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Rtehtmlarea\Controller;
/**
* Script class for the Element Browser window.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class BrowseLinksController {
@@ -37,7 +37,7 @@ class BrowseLinksController {
/**
* Main function, rendering the element browser in RTE mode.
*
- * @return void
+ * @return void
*/
public function main() {
// Setting alternative web browsing mounts (ONLY local to browse_links.php this script so they stay "read-only")
@@ -92,7 +92,7 @@ class BrowseLinksController {
/**
* Print module content
*
- * @return void
+ * @return void
*/
public function printContent() {
echo $this->content;
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/CustomAttributeController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/CustomAttributeController.php
index 2cb4da070af7..b6ac2e53c3e0 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/CustomAttributeController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/CustomAttributeController.php
@@ -54,9 +54,9 @@ class CustomAttributeController extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugi
/**
* Rendering the "data-htmlarea-clickenlarge" custom attribute, called from TypoScript
*
- * @param string Content input. Not used, ignore.
- * @param array TypoScript configuration
- * @return string HTML output.
+ * @param string Content input. Not used, ignore.
+ * @param array TypoScript configuration
+ * @return string HTML output.
* @access private
*/
public function render_clickenlarge($content, $conf) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php
index 055e0e0dfa91..eac467615b6c 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/FrontendRteController.php
@@ -85,17 +85,17 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
/**
* Draws the RTE as an iframe
*
- * @param object Reference to parent object, which is an instance of the TCEforms.
- * @param string The table name
- * @param string The field name
- * @param array The current row from which field is being rendered
- * @param array Array of standard content for rendering form fields from TCEforms. See TCEforms for details on this. Includes for instance the value and the form field name, java script actions and more.
- * @param array "special" configuration - what is found at position 4 in the types configuration of a field from record, parsed into an array.
- * @param array Configuration for RTEs; A mix between TSconfig and otherwise. Contains configuration for display, which buttons are enabled, additional transformation information etc.
- * @param string Record "type" field value.
- * @param string Relative path for images/links in RTE; this is used when the RTE edits content from static files where the path of such media has to be transformed forth and back!
- * @param int PID value of record (true parent page id)
- * @return string HTML code for RTE!
+ * @param object Reference to parent object, which is an instance of the TCEforms.
+ * @param string The table name
+ * @param string The field name
+ * @param array The current row from which field is being rendered
+ * @param array Array of standard content for rendering form fields from TCEforms. See TCEforms for details on this. Includes for instance the value and the form field name, java script actions and more.
+ * @param array "special" configuration - what is found at position 4 in the types configuration of a field from record, parsed into an array.
+ * @param array Configuration for RTEs; A mix between TSconfig and otherwise. Contains configuration for display, which buttons are enabled, additional transformation information etc.
+ * @param string Record "type" field value.
+ * @param string Relative path for images/links in RTE; this is used when the RTE edits content from static files where the path of such media has to be transformed forth and back!
+ * @param int PID value of record (true parent page id)
+ * @return string HTML code for RTE!
*/
public function drawRTE(&$parentObject, $table, $field, $row, $PA, $specConf, $thisConfig, $RTEtypeVal, $RTErelPath, $thePidValue) {
global $TSFE, $TYPO3_CONF_VARS, $TYPO3_DB;
@@ -254,11 +254,11 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
/**
* Add style sheet file to document header
*
- * @param string $key: some key identifying the style sheet
- * @param string $href: uri to the style sheet file
- * @param string $title: value for the title attribute of the link element
- * @param string $relation: value for the rel attribute of the link element
- * @return void
+ * @param string $key: some key identifying the style sheet
+ * @param string $href: uri to the style sheet file
+ * @param string $title: value for the title attribute of the link element
+ * @param string $relation: value for the rel attribute of the link element
+ * @return void
*/
protected function addStyleSheet($key, $href, $title = '', $relation = 'stylesheet') {
$this->pageRenderer->addCssFile($href, $relation, 'screen', $title);
@@ -268,10 +268,10 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
* Return the JS-Code for copy the HTML-Code from the editor in the hidden input field.
* This is for submit function from the form.
*
- * @param int $RTEcounter: The index number of the RTE editing area.
- * @param string $form: the name of the form
- * @param string $textareaId: the id of the textarea
- * @return string the JS-Code
+ * @param int $RTEcounter: The index number of the RTE editing area.
+ * @param string $form: the name of the form
+ * @param string $textareaId: the id of the textarea
+ * @return string the JS-Code
*/
public function setSaveRTE($RTEcounter, $form, $textareaId) {
return '
@@ -301,8 +301,8 @@ class FrontendRteController extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaBase {
/**
* Wrap input string in CDATA enclosure
*
- * @param string $string: input to be wrapped
- * @return string wrapped string
+ * @param string $string: input to be wrapped
+ * @return string wrapped string
*/
public function wrapCDATA($string) {
return implode(LF, array(
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
index 5e424f4be024..7887ad9de80e 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/SelectImageController.php
@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Rtehtmlarea\Controller;
/**
* Script class for the Element Browser window.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class SelectImageController {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php b/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
index 4b3413ffca3c..e5256bcef8a6 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Controller/SpellCheckingController.php
@@ -146,7 +146,7 @@ class SpellCheckingController {
/**
* Main class of Spell Checker plugin for Typo3 CMS
*
- * @return string content produced by the plugin
+ * @return string content produced by the plugin
*/
public function main() {
$this->csConvObj = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Charset\\CharsetConverter');
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/AboutEditor.php b/typo3/sysext/rtehtmlarea/Classes/Extension/AboutEditor.php
index 4de2b089d68c..29b65f7ddf3a 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/AboutEditor.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/AboutEditor.php
@@ -53,8 +53,8 @@ class AboutEditor extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Acronym.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Acronym.php
index b7fcc69b14ef..554f79725dc5 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Acronym.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Acronym.php
@@ -64,8 +64,8 @@ class Acronym extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return tranformed content
*
- * @param string $content: The content that is about to be sent to the RTE
- * @return string the transformed content
+ * @param string $content: The content that is about to be sent to the RTE
+ * @return string the transformed content
*/
public function transformContent($content) {
// <abbr> was not supported by IE before verison 7
@@ -79,8 +79,8 @@ class Acronym extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
@@ -106,7 +106,7 @@ class Acronym extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return an acronym array for the Acronym plugin
*
- * @return string acronym Javascript array
+ * @return string acronym Javascript array
*/
public function buildJSAcronymArray($languageUid) {
$button = 'acronym';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php b/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
index 547fb00df3fd..3be6c09636ce 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/BlockElements.php
@@ -88,8 +88,8 @@ class BlockElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/CharacterMap.php b/typo3/sysext/rtehtmlarea/Classes/Extension/CharacterMap.php
index d4bd54ad5071..8e691848cf47 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/CharacterMap.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/CharacterMap.php
@@ -54,8 +54,8 @@ class CharacterMap extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/ContextMenu.php b/typo3/sysext/rtehtmlarea/Classes/Extension/ContextMenu.php
index 8003584ef25c..1892e051d0df 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/ContextMenu.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/ContextMenu.php
@@ -56,8 +56,8 @@ class ContextMenu extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($editorId) {
$registerRTEinJavascriptString = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/CopyPaste.php b/typo3/sysext/rtehtmlarea/Classes/Extension/CopyPaste.php
index 4bac1a4c562c..b154ee833abe 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/CopyPaste.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/CopyPaste.php
@@ -73,8 +73,8 @@ class CopyPaste extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
@@ -96,8 +96,8 @@ class CopyPaste extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return an updated array of toolbar enabled buttons
*
- * @param array $show: array of toolbar elements that will be enabled, unless modified here
- * @return array toolbar button array, possibly updated
+ * @param array $show: array of toolbar elements that will be enabled, unless modified here
+ * @return array toolbar button array, possibly updated
*/
public function applyToolbarConstraints($show) {
// Remove some buttons
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultClean.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultClean.php
index 786fbc9f6dda..923b23d4a72e 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultClean.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultClean.php
@@ -57,8 +57,8 @@ class DefaultClean extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
@@ -78,8 +78,8 @@ class DefaultClean extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
* Return an updated array of toolbar enabled buttons
* Force inclusion of hidden button cleanword
*
- * @param array $show: array of toolbar elements that will be enabled, unless modified here
- * @return array toolbar button array, possibly updated
+ * @param array $show: array of toolbar elements that will be enabled, unless modified here
+ * @return array toolbar button array, possibly updated
*/
public function applyToolbarConstraints($show) {
return array_unique(array_merge($show, \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->pluginButtons)));
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultImage.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultImage.php
index 4ae369ea4b6a..be0660b1373b 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultImage.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultImage.php
@@ -59,8 +59,8 @@ class DefaultImage extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
index 0efd42eddcbd..3b3b58298556 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultInline.php
@@ -58,8 +58,8 @@ class DefaultInline extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
@@ -70,8 +70,8 @@ class DefaultInline extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return tranformed content
*
- * @param string $content: The content that is about to be sent to the RTE
- * @return string the transformed content
+ * @param string $content: The content that is about to be sent to the RTE
+ * @return string the transformed content
*/
public function transformContent($content) {
// Change the strong and em tags for gecko browsers
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultLink.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultLink.php
index f0479f704d5a..0befc40be751 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultLink.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefaultLink.php
@@ -54,8 +54,8 @@ class DefaultLink extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/DefinitionList.php b/typo3/sysext/rtehtmlarea/Classes/Extension/DefinitionList.php
index a6a0e2b829c7..a09332134d66 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/DefinitionList.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/DefinitionList.php
@@ -65,8 +65,8 @@ class DefinitionList extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
@@ -77,8 +77,8 @@ class DefinitionList extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return an updated array of toolbar enabled buttons
*
- * @param array $show: array of toolbar elements that will be enabled, unless modified here
- * @return array toolbar button array, possibly updated
+ * @param array $show: array of toolbar elements that will be enabled, unless modified here
+ * @return array toolbar button array, possibly updated
*/
public function applyToolbarConstraints($show) {
$blockElementsButtons = 'formatblock, indent, outdent, blockquote, insertparagraphbefore, insertparagraphafter, left, center, right, justifyfull, orderedlist, unorderedlist';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/EditElement.php b/typo3/sysext/rtehtmlarea/Classes/Extension/EditElement.php
index 08e7a973b7dc..b4cb813baa5a 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/EditElement.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/EditElement.php
@@ -56,8 +56,8 @@ class EditElement extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/FindReplace.php b/typo3/sysext/rtehtmlarea/Classes/Extension/FindReplace.php
index ca09a1ed71e8..dcd535cc8598 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/FindReplace.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/FindReplace.php
@@ -53,8 +53,8 @@ class FindReplace extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php b/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
index d1a2b12fabeb..939a724129f0 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/InlineElements.php
@@ -130,8 +130,8 @@ class InlineElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/InsertSmiley.php b/typo3/sysext/rtehtmlarea/Classes/Extension/InsertSmiley.php
index 88e0a4e83860..573f8ecab328 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/InsertSmiley.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/InsertSmiley.php
@@ -53,8 +53,8 @@ class InsertSmiley extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php
index 13eaf99f260c..037c434c826c 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Language.php
@@ -63,8 +63,8 @@ class Language extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$button = 'language';
@@ -96,7 +96,7 @@ class Language extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
* and where the value are the name of the language in the current language
* Note: we exclude sacred and constructed languages
*
- * @return array An array of names of languages
+ * @return array An array of names of languages
*/
public function getLanguages() {
$nameArray = array();
@@ -136,8 +136,8 @@ class Language extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return an updated array of toolbar enabled buttons
*
- * @param array $show: array of toolbar elements that will be enabled, unless modified here
- * @return array toolbar button array, possibly updated
+ * @param array $show: array of toolbar elements that will be enabled, unless modified here
+ * @return array toolbar button array, possibly updated
*/
public function applyToolbarConstraints($show) {
if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('static_info_tables')) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php b/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php
index 514bb82dedb9..f0e2db98f2c1 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/MicroDataSchema.php
@@ -53,8 +53,8 @@ class MicroDataSchema extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Plaintext.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Plaintext.php
index d724e866397a..a6eae101c146 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Plaintext.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Plaintext.php
@@ -59,8 +59,8 @@ class Plaintext extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
@@ -80,8 +80,8 @@ class Plaintext extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return an updated array of toolbar enabled buttons
*
- * @param array $show: array of toolbar elements that will be enabled, unless modified here
- * @return array toolbar button array, possibly updated
+ * @param array $show: array of toolbar elements that will be enabled, unless modified here
+ * @return array toolbar button array, possibly updated
*/
public function applyToolbarConstraints($show) {
$removeButtons = array();
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/RemoveFormat.php b/typo3/sysext/rtehtmlarea/Classes/Extension/RemoveFormat.php
index 92e4f4784c2d..0d6f58d16389 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/RemoveFormat.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/RemoveFormat.php
@@ -53,8 +53,8 @@ class RemoveFormat extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php b/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php
index 5b4f72a8ee1f..e87f53bb2e16 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/SelectFont.php
@@ -89,8 +89,8 @@ class SelectFont extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
@@ -107,9 +107,9 @@ class SelectFont extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return Javascript configuration of font faces
*
- * @param int $RTEcounter: The index number of the current RTE editing area within the form.
- * @param string $buttonId: button id
- * @return string Javascript configuration of font faces
+ * @param int $RTEcounter: The index number of the current RTE editing area within the form.
+ * @param string $buttonId: button id
+ * @return string Javascript configuration of font faces
*/
protected function buildJSFontItemsConfig($RTEcounter, $buttonId) {
$configureRTEInJavascriptString = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php
index 4a482915505f..73926b676388 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Spellchecker.php
@@ -61,8 +61,8 @@ class Spellchecker extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$button = 'spellcheck';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/TableOperations.php b/typo3/sysext/rtehtmlarea/Classes/Extension/TableOperations.php
index a3ca896bae88..5e0d7536d83c 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/TableOperations.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/TableOperations.php
@@ -88,8 +88,8 @@ class TableOperations extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
@@ -131,8 +131,8 @@ class TableOperations extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return an updated array of toolbar enabled buttons
*
- * @param array $show: array of toolbar elements that will be enabled, unless modified here
- * @return array toolbar button array, possibly updated
+ * @param array $show: array of toolbar elements that will be enabled, unless modified here
+ * @return array toolbar button array, possibly updated
*/
public function applyToolbarConstraints($show) {
// We will not allow any table operations button if the table button is not enabled
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/TextIndicator.php b/typo3/sysext/rtehtmlarea/Classes/Extension/TextIndicator.php
index 6c1dfc8b40a8..3b33c74ddd3a 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/TextIndicator.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/TextIndicator.php
@@ -53,8 +53,8 @@ class TextIndicator extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php
index dacff21cb4d1..e87e358f1ace 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Color.php
@@ -58,8 +58,8 @@ class Typo3Color extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
// Process colors configuration
@@ -70,8 +70,8 @@ class Typo3Color extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return Javascript configuration of colors
*
- * @param int $RTEcounter: The index number of the current RTE editing area within the form.
- * @return string Javascript configuration of colors
+ * @param int $RTEcounter: The index number of the current RTE editing area within the form.
+ * @return string Javascript configuration of colors
*/
public function buildJSColorsConfig($RTEcounter) {
if ($this->htmlAreaRTE->is_FE()) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3HtmlParser.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3HtmlParser.php
index 023cdfdc1171..b74974204c5e 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3HtmlParser.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3HtmlParser.php
@@ -57,8 +57,8 @@ class Typo3HtmlParser extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
@@ -80,8 +80,8 @@ class Typo3HtmlParser extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
* Return an updated array of toolbar enabled buttons
* Force inclusion of hidden button cleanword
*
- * @param array $show: array of toolbar elements that will be enabled, unless modified here
- * @return array toolbar button array, possibly updated
+ * @param array $show: array of toolbar elements that will be enabled, unless modified here
+ * @return array toolbar button array, possibly updated
*/
public function applyToolbarConstraints($show) {
return array_unique(array_merge($show, \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->pluginButtons)));
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Image.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Image.php
index baa4e5627ae2..fe4b5f39c17b 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Image.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Image.php
@@ -61,8 +61,8 @@ class Typo3Image extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Link.php b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Link.php
index a0b07eaac781..06f40e0955c8 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Link.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/Typo3Link.php
@@ -63,8 +63,8 @@ class Typo3Link extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
@@ -94,7 +94,7 @@ class Typo3Link extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return a JS array for special anchor classes
*
- * @return string classesAnchor array definition
+ * @return string classesAnchor array definition
*/
public function buildJSClassesAnchorArray() {
global $LANG;
@@ -133,8 +133,8 @@ class Typo3Link extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return an updated array of toolbar enabled buttons
*
- * @param array $show: array of toolbar elements that will be enabled, unless modified here
- * @return array toolbar button array, possibly updated
+ * @param array $show: array of toolbar elements that will be enabled, unless modified here
+ * @return array toolbar button array, possibly updated
*/
public function applyToolbarConstraints($show) {
// We will not allow unlink if link is not enabled
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/UndoRedo.php b/typo3/sysext/rtehtmlarea/Classes/Extension/UndoRedo.php
index 0a2ce10f8241..dede86cedd74 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/UndoRedo.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/UndoRedo.php
@@ -54,8 +54,8 @@ class UndoRedo extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Extension/UserElements.php b/typo3/sysext/rtehtmlarea/Classes/Extension/UserElements.php
index 5e56fceac43d..f7bd17038fae 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Extension/UserElements.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Extension/UserElements.php
@@ -53,8 +53,8 @@ class UserElements extends \TYPO3\CMS\Rtehtmlarea\RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins, in this case, JS configuration of block elements
*/
public function buildJavascriptConfiguration($RTEcounter) {
$registerRTEinJavascriptString = '';
diff --git a/typo3/sysext/rtehtmlarea/Classes/FolderTree.php b/typo3/sysext/rtehtmlarea/Classes/FolderTree.php
index f3e0cb7701bd..9cc0f5af338e 100644
--- a/typo3/sysext/rtehtmlarea/Classes/FolderTree.php
+++ b/typo3/sysext/rtehtmlarea/Classes/FolderTree.php
@@ -6,7 +6,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
* Base extension class which generates the folder tree.
* Used directly by the RTE.
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class FolderTree extends \localFolderTree {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Hook/Install/DeprecatedRteProperties.php b/typo3/sysext/rtehtmlarea/Classes/Hook/Install/DeprecatedRteProperties.php
index 5a432284710e..3458e1321d82 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Hook/Install/DeprecatedRteProperties.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Hook/Install/DeprecatedRteProperties.php
@@ -74,8 +74,8 @@ class DeprecatedRteProperties extends \TYPO3\CMS\Install\Updates\AbstractUpdate
/**
* Function which checks if update is needed. Called in the beginning of an update process.
*
- * @param string pointer to description for the update
- * @return boolean TRUE if update is needs to be performed, FALSE otherwise.
+ * @param string pointer to description for the update
+ * @return bool TRUE if update is needs to be performed, FALSE otherwise.
*/
public function checkForUpdate(&$description) {
$result = FALSE;
@@ -134,9 +134,9 @@ class DeprecatedRteProperties extends \TYPO3\CMS\Install\Updates\AbstractUpdate
/**
* Performs the update itself
*
- * @param array pointer where to insert all DB queries made, so they can be shown to the user if wanted
- * @param string pointer to output custom messages
- * @return boolean TRUE if update succeeded, FALSE otherwise
+ * @param array pointer where to insert all DB queries made, so they can be shown to the user if wanted
+ * @param string pointer to output custom messages
+ * @return bool TRUE if update succeeded, FALSE otherwise
*/
public function performUpdate(array &$dbQueries, &$customMessages) {
$customMessages = '';
@@ -173,9 +173,9 @@ class DeprecatedRteProperties extends \TYPO3\CMS\Install\Updates\AbstractUpdate
/**
* Gets the pages with deprecated RTE properties in TSConfig column
*
- * @param array pointer where to insert all DB queries made, so they can be shown to the user if wanted
- * @param string pointer to output custom messages
- * @return array uid and inclusion string for the pages with deprecated RTE properties in TSConfig column
+ * @param array pointer where to insert all DB queries made, so they can be shown to the user if wanted
+ * @param string pointer to output custom messages
+ * @return array uid and inclusion string for the pages with deprecated RTE properties in TSConfig column
*/
protected function getPagesWithDeprecatedRteProperties(&$dbQueries, &$customMessages) {
$fields = 'uid, TSconfig';
@@ -200,8 +200,8 @@ class DeprecatedRteProperties extends \TYPO3\CMS\Install\Updates\AbstractUpdate
/**
* Gets the pages with updateable deprecated RTE properties in TSConfig column
*
- * @param array $pages: reference to pages with deprecated property
- * @return array uid and inclusion string for the pages with deprecated RTE properties in TSConfig column
+ * @param array $pages: reference to pages with deprecated property
+ * @return array uid and inclusion string for the pages with deprecated RTE properties in TSConfig column
*/
protected function findUpdateablePagesWithDeprecatedRteProperties(&$pages) {
foreach ($pages as $index => $page) {
@@ -220,9 +220,9 @@ class DeprecatedRteProperties extends \TYPO3\CMS\Install\Updates\AbstractUpdate
/**
* updates the pages records with updateable Page TSconfig properties
*
- * @param array pages records to update, fetched by getTemplates() and filtered by
- * @param array pointer where to insert all DB queries made, so they can be shown to the user if wanted
- * @param string pointer to output custom messages
+ * @param array pages records to update, fetched by getTemplates() and filtered by
+ * @param array pointer where to insert all DB queries made, so they can be shown to the user if wanted
+ * @param string pointer to output custom messages
*/
protected function updatePages($pages, &$dbQueries, &$customMessages) {
foreach ($pages as $page) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/Hook/SoftReferenceHook.php b/typo3/sysext/rtehtmlarea/Classes/Hook/SoftReferenceHook.php
index 4328d5995d95..2a98fc4d278b 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Hook/SoftReferenceHook.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Hook/SoftReferenceHook.php
@@ -52,9 +52,9 @@ class SoftReferenceHook extends \TYPO3\CMS\Core\Database\SoftReferenceIndex {
* Finding image tags with data-htmlarea-file-uid attribute in the content.
* All images that have an data-htmlarea-file-uid attribute will be returned with an info text
*
- * @param string The input content to analyse
- * @param array Parameters set for the softref parser key in TCA/columns
- * @return array Result array on positive matches, see description above. Otherwise FALSE
+ * @param string The input content to analyse
+ * @param array Parameters set for the softref parser key in TCA/columns
+ * @return array Result array on positive matches, see description above. Otherwise FALSE
*/
public function findRef_rtehtmlarea_images($content, $spParams) {
$retVal = FALSE;
diff --git a/typo3/sysext/rtehtmlarea/Classes/PageTree.php b/typo3/sysext/rtehtmlarea/Classes/PageTree.php
index 7d3f2d6bea2e..a0bd6d21b6f0 100644
--- a/typo3/sysext/rtehtmlarea/Classes/PageTree.php
+++ b/typo3/sysext/rtehtmlarea/Classes/PageTree.php
@@ -20,23 +20,23 @@ namespace TYPO3\CMS\Rtehtmlarea;
*
* Adapted for htmlArea RTE by Stanislas Rolland
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*/
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Class which generates the page tree
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
*/
class PageTree extends \localPageTree {
/**
* Create the page navigation tree in HTML
*
- * @param array Tree array
- * @return string HTML output.
+ * @param array Tree array
+ * @return string HTML output.
*/
public function printTree($treeArr = '') {
$titleLen = (int)$GLOBALS['BE_USER']->uc['titleLen'];
diff --git a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaApi.php b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaApi.php
index 97d1641a2be0..fbf7a9bc2824 100644
--- a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaApi.php
+++ b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaApi.php
@@ -74,8 +74,8 @@ abstract class RteHtmlAreaApi {
/**
* Returns TRUE if the plugin is available and correctly initialized
*
- * @param object Reference to parent object, which is an instance of the htmlArea RTE
- * @return boolean TRUE if this plugin object should be made available in the current environment and is correctly initialized
+ * @param object Reference to parent object, which is an instance of the htmlArea RTE
+ * @return bool TRUE if this plugin object should be made available in the current environment and is correctly initialized
*/
public function main($parentObject) {
global $TYPO3_CONF_VARS, $LANG, $TSFE;
@@ -110,7 +110,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns a modified toolbar order string
*
- * @return string a modified tollbar order list
+ * @return string a modified tollbar order list
*/
public function addButtonsToToolbar() {
//Add only buttons not yet in the default toolbar order
@@ -121,7 +121,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns the path to the skin component (button icons) that should be added to linked stylesheets
*
- * @return string path to the skin (css) file
+ * @return string path to the skin (css) file
*/
public function getPathToSkin() {
global $TYPO3_CONF_VARS;
@@ -135,8 +135,8 @@ abstract class RteHtmlAreaApi {
/**
* Return JS configuration of the htmlArea plugins registered by the extension
*
- * @param int Relative id of the RTE editing area in the form
- * @return string JS configuration for registered plugins
+ * @param int Relative id of the RTE editing area in the form
+ * @return string JS configuration for registered plugins
*/
public function buildJavascriptConfiguration($RTEcounter) {
global $TSFE, $LANG;
@@ -156,7 +156,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns the extension key
*
- * @return string the extension key
+ * @return string the extension key
*/
public function getExtensionKey() {
return $this->extensionKey;
@@ -165,7 +165,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns the path to the plugin directory, if any
*
- * @return string the full path to the plugin directory
+ * @return string the full path to the plugin directory
*/
public function getPathToPluginDirectory() {
return $this->relativePathToPluginDirectory ? $this->htmlAreaRTE->httpTypo3Path . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extensionKey) . $this->relativePathToPluginDirectory : '';
@@ -174,7 +174,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns a boolean indicating whether the plugin adds buttons or not to the toolbar
*
- * @return boolean
+ * @return bool
*/
public function addsButtons() {
return $this->pluginAddsButtons;
@@ -183,7 +183,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns the list of buttons implemented by the plugin
*
- * @return string the list of buttons implemented by the plugin
+ * @return string the list of buttons implemented by the plugin
*/
public function getPluginButtons() {
return $this->pluginButtons;
@@ -192,7 +192,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns the list of toolbar labels implemented by the plugin
*
- * @return string the list of labels implemented by the plugin
+ * @return string the list of labels implemented by the plugin
*/
public function getPluginLabels() {
return $this->pluginLabels;
@@ -201,7 +201,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns the conversion array from TYPO3 button names to htmlArea button names
*
- * @return array the conversion array from TYPO3 button names to htmlArea button names
+ * @return array the conversion array from TYPO3 button names to htmlArea button names
*/
public function getConvertToolbarForHtmlAreaArray() {
return $this->convertToolbarForHtmlAreaArray;
@@ -210,7 +210,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns TRUE if the extension requires the PageTSConfig Classes configuration
*
- * @return boolean TRUE if the extension requires the PageTSConfig Classes configuration
+ * @return bool TRUE if the extension requires the PageTSConfig Classes configuration
*/
public function requiresClassesConfiguration() {
return $this->requiresClassesConfiguration;
@@ -219,7 +219,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns TRUE if the plugin requires synchronous load
*
- * @return boolean TRUE if the plugin requires synchronous load
+ * @return bool TRUE if the plugin requires synchronous load
*/
public function requiresSynchronousLoad() {
return $this->requiresSynchronousLoad;
@@ -228,8 +228,8 @@ abstract class RteHtmlAreaApi {
/**
* Sets the plugin to require synchronous load or not
*
- * @param bool $value: the boolean value to set
- * @return void
+ * @param bool $value: the boolean value to set
+ * @return void
*/
public function setSynchronousLoad($value = TRUE) {
$this->requiresSynchronousLoad = $value;
@@ -238,7 +238,7 @@ abstract class RteHtmlAreaApi {
/**
* Returns the list of plugins required by the plugin
*
- * @return string the list of plugins required by the plugin
+ * @return string the list of plugins required by the plugin
*/
public function getRequiredPlugins() {
return $this->requiredPlugins;
diff --git a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
index 0c49205af70e..4005108647c3 100644
--- a/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
+++ b/typo3/sysext/rtehtmlarea/Classes/RteHtmlAreaBase.php
@@ -21,8 +21,8 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* A RTE using the htmlArea editor
*
- * @author Philipp Borgmann <philipp.borgmann@gmx.de>
- * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
+ * @author Philipp Borgmann <philipp.borgmann@gmx.de>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*/
class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
@@ -244,7 +244,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
* Returns TRUE if the RTE is available. Here you check if the browser requirements are met.
* If there are reasons why the RTE cannot be displayed you simply enter them as text in ->errorLog
*
- * @return boolean TRUE if this RTE object offers an RTE in the current browser environment
+ * @return bool TRUE if this RTE object offers an RTE in the current browser environment
*/
public function isAvailable() {
$this->client = $this->clientInfo();
@@ -504,7 +504,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Add links to content style sheets to document header
*
- * @return void
+ * @return void
*/
protected function addPageStyle() {
$contentCssFileNames = $this->getContentCssFileNames();
@@ -547,7 +547,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Add links to skin style sheet(s) to document header
*
- * @return void
+ * @return void
*/
protected function addSkin() {
// Get skin file name from Page TSConfig if any
@@ -574,11 +574,11 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Add style sheet file to document header
*
- * @param string $key: some key identifying the style sheet
- * @param string $href: uri to the style sheet file
- * @param string $title: value for the title attribute of the link element
- * @param string $relation: value for the rel attribute of the link element
- * @return void
+ * @param string $key: some key identifying the style sheet
+ * @param string $href: uri to the style sheet file
+ * @param string $title: value for the title attribute of the link element
+ * @param string $relation: value for the rel attribute of the link element
+ * @return void
*/
protected function addStyleSheet($key, $href, $title = '', $relation = 'stylesheet') {
// If it was not known that an RTE-enabled would be created when the page was first created, the css would not be added to head
@@ -592,7 +592,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Initialize toolbar configuration and enable registered plugins
*
- * @return void
+ * @return void
*/
protected function initializeToolbarConfiguration() {
// Enable registred plugins
@@ -883,12 +883,12 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Return the Javascript code for configuring the RTE
*
- * @param int $RTEcounter: The index number of the current RTE editing area within the form.
- * @param string $table: The table that includes this RTE (optional, necessary for IRRE).
- * @param string $uid: The uid of that table that includes this RTE (optional, necessary for IRRE).
- * @param string $field: The field of that record that includes this RTE (optional).
- * @param string $textAreaId ID of the textarea, to have a unigue number for the editor
- * @return string the Javascript code for configuring the RTE
+ * @param int $RTEcounter: The index number of the current RTE editing area within the form.
+ * @param string $table: The table that includes this RTE (optional, necessary for IRRE).
+ * @param string $uid: The uid of that table that includes this RTE (optional, necessary for IRRE).
+ * @param string $field: The field of that record that includes this RTE (optional).
+ * @param string $textAreaId ID of the textarea, to have a unigue number for the editor
+ * @return string the Javascript code for configuring the RTE
*/
public function registerRTEinJS($RTEcounter, $table = '', $uid = '', $field = '', $textAreaId = '') {
$configureRTEInJavascriptString = '
@@ -1023,8 +1023,8 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Return TRUE, if the plugin can be loaded
*
- * @param string $pluginId: The identification string of the plugin
- * @return boolean TRUE if the plugin can be loaded
+ * @param string $pluginId: The identification string of the plugin
+ * @return bool TRUE if the plugin can be loaded
*/
public function isPluginEnabled($pluginId) {
return in_array($pluginId, $this->pluginEnabledArray);
@@ -1033,7 +1033,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Build the default content style sheet
*
- * @return string Style sheet
+ * @return string Style sheet
* @deprecated since TYPO3 6.0, will be removed in TYPO3 6.2
*/
public function buildStyleSheet() {
@@ -1044,8 +1044,8 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Return Javascript configuration of classes
*
- * @param int $RTEcounter: The index number of the current RTE editing area within the form.
- * @return string Javascript configuration of classes
+ * @param int $RTEcounter: The index number of the current RTE editing area within the form.
+ * @return string Javascript configuration of classes
*/
public function buildJSClassesConfig($RTEcounter) {
// Include JS arrays of configured classes
@@ -1109,8 +1109,8 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
* Unquote regular expression values
* Replace empty arrays with empty objects
*
- * @param array $conf: Page TSConfig configuration array
- * @return string nested JS array definition
+ * @param array $conf: Page TSConfig configuration array
+ * @return string nested JS array definition
*/
public function buildNestedJSArray($conf) {
$convertedConf = GeneralUtility::removeDotsFromTS($conf);
@@ -1120,7 +1120,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Return a Javascript localization array for htmlArea RTE
*
- * @return string Javascript localization array
+ * @return string Javascript localization array
*/
public function buildJSMainLangArray() {
$JSLanguageArray = 'HTMLArea.I18N = new Object();' . LF;
@@ -1143,12 +1143,12 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Writes contents in a file in typo3temp/rtehtmlarea directory and returns the file name
*
- * @param string $sourceFileName: The name of the file from which the contents should be extracted
- * @param string $label: A label to insert at the beginning of the name of the file
- * @param string $fileExtension: The file extension of the file, defaulting to 'js'
- * @param string $contents: The contents to write into the file if no $sourceFileName is provided
- * @param bool $concatenate Not used anymore
- * @return string The name of the file writtten to typo3temp/rtehtmlarea
+ * @param string $sourceFileName: The name of the file from which the contents should be extracted
+ * @param string $label: A label to insert at the beginning of the name of the file
+ * @param string $fileExtension: The file extension of the file, defaulting to 'js'
+ * @param string $contents: The contents to write into the file if no $sourceFileName is provided
+ * @param bool $concatenate Not used anymore
+ * @return string The name of the file writtten to typo3temp/rtehtmlarea
*/
public function writeTemporaryFile($sourceFileName = '', $label, $fileExtension = 'js', $contents = '', $concatenate = FALSE) {
if ($sourceFileName) {
@@ -1181,8 +1181,8 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Return a file name containing the main JS language array for HTMLArea
*
- * @param int $RTEcounter: The index number of the current RTE editing area within the form.
- * @return string filename
+ * @param int $RTEcounter: The index number of the current RTE editing area within the form.
+ * @return string filename
*/
public function buildJSMainLangFile($RTEcounter) {
$contents = $this->buildJSMainLangArray() . LF;
@@ -1195,8 +1195,8 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Return a Javascript localization array for the plugin
*
- * @param string $plugin: identification string of the plugin
- * @return string Javascript localization array
+ * @param string $plugin: identification string of the plugin
+ * @return string Javascript localization array
*/
public function buildJSLangArray($plugin) {
$extensionKey = is_object($this->registeredPlugins[$plugin]) ? $this->registeredPlugins[$plugin]->getExtensionKey() : $this->ID;
@@ -1276,8 +1276,8 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Localize a string using the language of the content element rather than the language of the BE interface
*
- * @param string string: the label to be localized
- * @return string Localized string.
+ * @param string string: the label to be localized
+ * @return string Localized string.
*/
public function getLLContent($string) {
return GeneralUtility::quoteJSvalue($this->contentLanguageService->sL($string));
@@ -1341,11 +1341,11 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
* Return the Javascript code for copying the HTML code from the editor into the hidden input field.
* This is for submit function of the form.
*
- * @param int $RTEcounter: The index number of the current RTE editing area within the form.
- * @param string $formName: the name of the form
- * @param string $textareaId: the id of the textarea
- * @param string $textareaName: the name of the textarea
- * @return string Javascript code
+ * @param int $RTEcounter: The index number of the current RTE editing area within the form.
+ * @param string $formName: the name of the form
+ * @param string $textareaId: the id of the textarea
+ * @param string $textareaName: the name of the textarea
+ * @return string Javascript code
*/
public function setSaveRTE($RTEcounter, $formName, $textareaId, $textareaName) {
return 'if (RTEarea["' . $textareaId . '"]) { document.' . $formName . '["' . $textareaName . '"].value = RTEarea["' . $textareaId . '"].editor.getHTML(); } else { OK = 0; };';
@@ -1355,10 +1355,10 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
* Return the Javascript code for copying the HTML code from the editor into the hidden input field.
* This is for submit function of the form.
*
- * @param int $RTEcounter: The index number of the current RTE editing area within the form.
- * @param string $formName: the name of the form
- * @param string $textareaId: the id of the textarea
- * @return string Javascript code
+ * @param int $RTEcounter: The index number of the current RTE editing area within the form.
+ * @param string $formName: the name of the form
+ * @param string $textareaId: the id of the textarea
+ * @return string Javascript code
*/
public function setDeleteRTE($RTEcounter, $formName, $textareaId) {
return 'if (RTEarea["' . $textareaId . '"]) { RTEarea["' . $textareaId . '"].deleted = true;}';
@@ -1367,7 +1367,7 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Return TRUE if we are in the FE, but not in the FE editing feature of BE.
*
- * @return boolean
+ * @return bool
*/
public function is_FE() {
return is_object($GLOBALS['TSFE']) && !$this->isFrontendEditActive() && TYPO3_MODE == 'FE';
@@ -1385,8 +1385,8 @@ class RteHtmlAreaBase extends \TYPO3\CMS\Backend\Rte\AbstractRte {
/**
* Client Browser Information
*
- * @param string $userAgent: The useragent string, \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('HTTP_USER_AGENT')
- * @return array Contains keys "useragent", "browser", "version", "system
+ * @param string $userAgent: The useragent string, \TYPO3\CMS\Core\Utility\GeneralUtility::getIndpEnv('HTTP_USER_AGENT')
+ * @return array Contains keys "useragent", "browser", "version", "system
*/
public function clientInfo($userAgent = '') {
if (!$userAgent) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
index adcca9f32812..68b549d366c4 100644
--- a/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
+++ b/typo3/sysext/rtehtmlarea/Classes/SelectImage.php
@@ -20,7 +20,7 @@ use TYPO3\CMS\Core\Resource;
/**
* Script Class
*
- * @author Kasper Skårhøj <kasper@typo3.com>
+ * @author Kasper Skårhøj <kasper@typo3.com>
*/
class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
@@ -142,7 +142,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Provide the additional parameters to be included in the template body tag
*
- * @return string the body tag additions
+ * @return string the body tag additions
*/
public function getBodyTagAdditions() {
return 'onload="initEventListeners();"';
@@ -151,7 +151,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Get the path to the folder where RTE images are stored
*
- * @return string the path to the folder where RTE images are stored
+ * @return string the path to the folder where RTE images are stored
* @deprecated since 6.2, will be removed in two versions
*/
protected function getRTEImageStorageDir() {
@@ -162,7 +162,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Insert the image in the editing area
*
- * @return void
+ * @return void
*/
protected function insertImage() {
$table = htmlspecialchars(GeneralUtility::_GP('table'));
@@ -226,10 +226,10 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
* Insert a plain image
*
* @param \TYPO3\CMS\Core\Resource\File $fileObject: the image file
- * @param string $altText: text for the alt attribute of the image
- * @param string $titleText: text for the title attribute of the image
- * @param string $additionalParams: text representing more HTML attributes to be added on the img tag
- * @return void
+ * @param string $altText: text for the alt attribute of the image
+ * @param string $titleText: text for the title attribute of the image
+ * @param string $additionalParams: text representing more HTML attributes to be added on the img tag
+ * @return void
*/
public function insertPlainImage(Resource\File $fileObject, $altText = '', $titleText = '', $additionalParams = '') {
$width = $fileObject->getProperty('width');
@@ -251,13 +251,13 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Echo the HTML page and JS that will insert the image
*
- * @param string $url: the url of the image
- * @param int $width: the width of the image
- * @param int $height: the height of the image
- * @param string $altText: text for the alt attribute of the image
- * @param string $titleText: text for the title attribute of the image
- * @param string $additionalParams: text representing more html attributes to be added on the img tag
- * @return void
+ * @param string $url: the url of the image
+ * @param int $width: the width of the image
+ * @param int $height: the height of the image
+ * @param string $altText: text for the alt attribute of the image
+ * @param string $titleText: text for the title attribute of the image
+ * @param string $additionalParams: text representing more html attributes to be added on the img tag
+ * @return void
*/
protected function imageInsertJS($url, $width, $height, $altText = '', $titleText = '', $additionalParams = '') {
echo '
@@ -287,10 +287,10 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Generate JS code to be used on the image insert/modify dialogue
*
- * @param string $act: the action to be performed
- * @param string $editorNo: the number of the RTE instance on the page
- * @param string $sys_language_content: the language of the content element
- * @return string the generated JS code
+ * @param string $act: the action to be performed
+ * @param string $editorNo: the number of the RTE instance on the page
+ * @param string $sys_language_content: the language of the content element
+ * @return string the generated JS code
*/
public function getJSCode($act, $editorNo, $sys_language_content) {
$removedProperties = array();
@@ -836,7 +836,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Initializes the configuration variables
*
- * @return void
+ * @return void
*/
public function initConfiguration() {
$this->thisConfig = $this->getRTEConfig();
@@ -849,7 +849,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Get the path of the image to be inserted or modified
*
- * @return string path to the image
+ * @return string path to the image
*/
protected function getImgPath() {
$RTEtsConfigParts = explode(':', $this->RTEtsConfigParams);
@@ -859,7 +859,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Get the configuration of the image button
*
- * @return array the configuration array of the image button
+ * @return array the configuration array of the image button
*/
protected function getButtonConfig() {
return is_array($this->thisConfig['buttons.']) && is_array($this->thisConfig['buttons.']['image.']) ? $this->thisConfig['buttons.']['image.'] : array();
@@ -915,7 +915,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Get the default image class
*
- * @return string the default class, if any
+ * @return string the default class, if any
*/
protected function getDefaultClass() {
$defaultClass = '';
@@ -930,7 +930,7 @@ class SelectImage extends \TYPO3\CMS\Recordlist\Browser\ElementBrowser {
/**
* Set variables for maximum plain image dimensions
*
- * @return void
+ * @return void
*/
protected function setMaximumPlainImageDimensions() {
if (is_array($this->buttonConfig['options.']) && is_array($this->buttonConfig['options.']['plain.'])) {
diff --git a/typo3/sysext/rtehtmlarea/Classes/User.php b/typo3/sysext/rtehtmlarea/Classes/User.php
index f69665497918..f7c5aa2f9396 100644
--- a/typo3/sysext/rtehtmlarea/Classes/User.php
+++ b/typo3/sysext/rtehtmlarea/Classes/User.php
@@ -19,8 +19,8 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* User defined content for htmlArea RTE
*
- * @author Kasper Skårhøj <kasper@typo3.com>
- * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
+ * @author Kasper Skårhøj <kasper@typo3.com>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*/
class User {
diff --git a/typo3/sysext/rtehtmlarea/mod3/index.php b/typo3/sysext/rtehtmlarea/mod3/index.php
index 321afeb66544..1ac681402270 100644
--- a/typo3/sysext/rtehtmlarea/mod3/index.php
+++ b/typo3/sysext/rtehtmlarea/mod3/index.php
@@ -18,8 +18,8 @@
*
* Adapted for htmlArea RTE by Stanislas Rolland
*
- * @author Kasper Skårhøj <kasperYYYY@typo3.com>
- * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*/
// Make instance:
diff --git a/typo3/sysext/rtehtmlarea/mod4/index.php b/typo3/sysext/rtehtmlarea/mod4/index.php
index fe62df477382..4c7681f25900 100644
--- a/typo3/sysext/rtehtmlarea/mod4/index.php
+++ b/typo3/sysext/rtehtmlarea/mod4/index.php
@@ -14,8 +14,8 @@
/**
* Displays image selector for the RTE
*
- * @author Kasper Skårhøj <kasper@typo3.com>
- * @author Stanislas Rolland <typo3(arobas)jbr.ca>
+ * @author Kasper Skårhøj <kasper@typo3.com>
+ * @author Stanislas Rolland <typo3(arobas)jbr.ca>
*/
// Make instance:
diff --git a/typo3/sysext/rtehtmlarea/mod5/index.php b/typo3/sysext/rtehtmlarea/mod5/index.php
index b53991261f68..95815b47d666 100644
--- a/typo3/sysext/rtehtmlarea/mod5/index.php
+++ b/typo3/sysext/rtehtmlarea/mod5/index.php
@@ -14,8 +14,8 @@
/**
* User defined content for htmlArea RTE
*
- * @author Kasper Skårhøj <kasper@typo3.com>
- * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
+ * @author Kasper Skårhøj <kasper@typo3.com>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*/
// Make instance:
diff --git a/typo3/sysext/rtehtmlarea/mod6/index.php b/typo3/sysext/rtehtmlarea/mod6/index.php
index bf108fc5af3b..90c19def3dfa 100644
--- a/typo3/sysext/rtehtmlarea/mod6/index.php
+++ b/typo3/sysext/rtehtmlarea/mod6/index.php
@@ -14,7 +14,7 @@
/**
* Content parsing for htmlArea RTE
*
- * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*/
// Make instance:
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php
index 13bc6e230c6f..d0b8a5b2b39a 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/AbstractSalt.php
@@ -90,7 +90,7 @@ abstract class AbstractSalt {
* length of a byte string.
*
* @param int $byteLength Length of bytes to calculate in base64 chars
- * @return integer Required length of base64 characters
+ * @return int Required length of base64 characters
*/
protected function getLengthBase64FromBytes($byteLength) {
// Calculates bytes in bits in base64
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
index 2b7dfab6e1cd..2d8e7abbcfff 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/BlowfishSalt.php
@@ -100,7 +100,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
* Parses the log2 iteration count from a stored hash or setting string.
*
* @param string $setting Complete hash or a hash's setting string or to get log2 iteration count from
- * @return integer Used hashcount for given hash string
+ * @return int Used hashcount for given hash string
*/
protected function getCountLog2($setting) {
$countLog2 = NULL;
@@ -116,7 +116,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
/**
* Method returns log2 number of iterations for password stretching.
*
- * @return integer log2 number of iterations for password stretching
+ * @return int log2 number of iterations for password stretching
* @see HASH_COUNT
* @see $hashCount
* @see setHashCount()
@@ -128,7 +128,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
/**
* Method returns maximum allowed log2 number of iterations for password stretching.
*
- * @return integer Maximum allowed log2 number of iterations for password stretching
+ * @return int Maximum allowed log2 number of iterations for password stretching
* @see MAX_HASH_COUNT
* @see $maxHashCount
* @see setMaxHashCount()
@@ -140,7 +140,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
/**
* Returns whether all prerequisites for the hashing methods are matched
*
- * @return boolean Method available
+ * @return bool Method available
*/
public function isAvailable() {
return CRYPT_BLOWFISH;
@@ -149,7 +149,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
/**
* Method returns minimum allowed log2 number of iterations for password stretching.
*
- * @return integer Minimum allowed log2 number of iterations for password stretching
+ * @return int Minimum allowed log2 number of iterations for password stretching
* @see MIN_HASH_COUNT
* @see $minHashCount
* @see setMinHashCount()
@@ -164,7 +164,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
* Overwrites {@link Md5Salt::getSaltLength()}
* with Blowfish specifics.
*
- * @return integer Length of a Blowfish salt in bytes
+ * @return int Length of a Blowfish salt in bytes
*/
public function getSaltLength() {
return self::$saltLengthBlowfish;
@@ -191,7 +191,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
* HASH_COUNT.
*
* @param string $saltedPW Salted hash to check if it needs an update
- * @return boolean TRUE if salted hash needs an update, otherwise FALSE
+ * @return bool TRUE if salted hash needs an update, otherwise FALSE
*/
public function isHashUpdateNeeded($saltedPW) {
// Check whether this was an updated password.
@@ -210,7 +210,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
* Blowfish specifics.
*
* @param string $salt String to check
- * @return boolean TRUE if it's valid salt, otherwise FALSE
+ * @return bool TRUE if it's valid salt, otherwise FALSE
*/
public function isValidSalt($salt) {
$isValid = ($skip = FALSE);
@@ -239,7 +239,7 @@ class BlowfishSalt extends \TYPO3\CMS\Saltedpasswords\Salt\Md5Salt {
* Method determines if a given string is a valid salted hashed password.
*
* @param string $saltedPW String to check
- * @return boolean TRUE if it's valid salted hashed password, otherwise FALSE
+ * @return bool TRUE if it's valid salted hashed password, otherwise FALSE
*/
public function isValidSaltedPW($saltedPW) {
$isValid = FALSE;
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php b/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php
index 9733e1f05acb..1b5d93956c4b 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/Md5Salt.php
@@ -73,7 +73,7 @@ class Md5Salt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements \T
*
* @param string $plainPW plain-text password to compare with salted hash
* @param string $saltedHashPW salted hash to compare plain-text password with
- * @return boolean TRUE, if plain-text password matches the salted hash, otherwise FALSE
+ * @return bool TRUE, if plain-text password matches the salted hash, otherwise FALSE
*/
public function checkPassword($plainPW, $saltedHashPW) {
$isCorrect = FALSE;
@@ -129,7 +129,7 @@ class Md5Salt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements \T
/**
* Returns whether all prerequisites for the hashing methods are matched
*
- * @return boolean Method available
+ * @return bool Method available
*/
public function isAvailable() {
return CRYPT_MD5;
@@ -138,7 +138,7 @@ class Md5Salt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements \T
/**
* Returns length of a MD5 salt in bytes.
*
- * @return integer Length of a MD5 salt in bytes
+ * @return int Length of a MD5 salt in bytes
*/
public function getSaltLength() {
return self::$saltLengthMD5;
@@ -172,7 +172,7 @@ class Md5Salt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements \T
* with class ext_update.
*
* @param string $passString Salted hash to check if it needs an update
- * @return boolean TRUE if salted hash needs an update, otherwise FALSE
+ * @return bool TRUE if salted hash needs an update, otherwise FALSE
*/
public function isHashUpdateNeeded($passString) {
return FALSE;
@@ -182,7 +182,7 @@ class Md5Salt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements \T
* Method determines if a given string is a valid salt
*
* @param string $salt String to check
- * @return boolean TRUE if it's valid salt, otherwise FALSE
+ * @return bool TRUE if it's valid salt, otherwise FALSE
*/
public function isValidSalt($salt) {
$isValid = ($skip = FALSE);
@@ -211,7 +211,7 @@ class Md5Salt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements \T
* Method determines if a given string is a valid salted hashed password.
*
* @param string $saltedPW String to check
- * @return boolean TRUE if it's valid salted hashed password, otherwise FALSE
+ * @return bool TRUE if it's valid salted hashed password, otherwise FALSE
*/
public function isValidSaltedPW($saltedPW) {
$isValid = FALSE;
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php b/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
index 8a520909b5b4..ca6e8676bd58 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/PhpassSalt.php
@@ -114,7 +114,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
*
* @param string $plainPW Plain-text password to compare with salted hash
* @param string $saltedHashPW Salted hash to compare plain-text password with
- * @return boolean TRUE, if plain-text password matches the salted hash, otherwise FALSE
+ * @return bool TRUE, if plain-text password matches the salted hash, otherwise FALSE
*/
public function checkPassword($plainPW, $saltedHashPW) {
$hash = $this->cryptPassword($plainPW, $saltedHashPW);
@@ -124,7 +124,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
/**
* Returns whether all prerequisites for the hashing methods are matched
*
- * @return boolean Method available
+ * @return bool Method available
*/
public function isAvailable() {
return TRUE;
@@ -172,7 +172,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
* Parses the log2 iteration count from a stored hash or setting string.
*
* @param string $setting Complete hash or a hash's setting string or to get log2 iteration count from
- * @return integer Used hashcount for given hash string
+ * @return int Used hashcount for given hash string
*/
protected function getCountLog2($setting) {
return strpos($this->getItoa64(), $setting[strlen($this->getSetting())]);
@@ -197,7 +197,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
/**
* Method returns log2 number of iterations for password stretching.
*
- * @return integer log2 number of iterations for password stretching
+ * @return int log2 number of iterations for password stretching
* @see HASH_COUNT
* @see $hashCount
* @see setHashCount()
@@ -236,7 +236,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
/**
* Method returns maximum allowed log2 number of iterations for password stretching.
*
- * @return integer Maximum allowed log2 number of iterations for password stretching
+ * @return int Maximum allowed log2 number of iterations for password stretching
* @see MAX_HASH_COUNT
* @see $maxHashCount
* @see setMaxHashCount()
@@ -248,7 +248,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
/**
* Method returns minimum allowed log2 number of iterations for password stretching.
*
- * @return integer Minimum allowed log2 number of iterations for password stretching
+ * @return int Minimum allowed log2 number of iterations for password stretching
* @see MIN_HASH_COUNT
* @see $minHashCount
* @see setMinHashCount()
@@ -260,7 +260,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
/**
* Returns length of a Blowfish salt in bytes.
*
- * @return integer Length of a Blowfish salt in bytes
+ * @return int Length of a Blowfish salt in bytes
*/
public function getSaltLength() {
return self::$saltLengthPhpass;
@@ -285,7 +285,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
* with class ext_update.
*
* @param string $passString Salted hash to check if it needs an update
- * @return boolean TRUE if salted hash needs an update, otherwise FALSE
+ * @return bool TRUE if salted hash needs an update, otherwise FALSE
*/
public function isHashUpdateNeeded($passString) {
// Check whether this was an updated password.
@@ -300,7 +300,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
* Method determines if a given string is a valid salt.
*
* @param string $salt String to check
- * @return boolean TRUE if it's valid salt, otherwise FALSE
+ * @return bool TRUE if it's valid salt, otherwise FALSE
*/
public function isValidSalt($salt) {
$isValid = ($skip = FALSE);
@@ -329,7 +329,7 @@ class PhpassSalt extends \TYPO3\CMS\Saltedpasswords\Salt\AbstractSalt implements
* Method determines if a given string is a valid salted hashed password.
*
* @param string $saltedPW String to check
- * @return boolean TRUE if it's valid salted hashed password, otherwise FALSE
+ * @return bool TRUE if it's valid salted hashed password, otherwise FALSE
*/
public function isValidSaltedPW($saltedPW) {
$isValid = FALSE;
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php b/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php
index 558672f16b79..bce55299daf3 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/SaltFactory.php
@@ -108,7 +108,7 @@ class SaltFactory {
*
* @param string $saltedHash
* @param string $mode (optional) The TYPO3 mode (FE or BE) saltedpasswords shall be used for
- * @return boolean TRUE, if salting hashing method has been found, otherwise FALSE
+ * @return bool TRUE, if salting hashing method has been found, otherwise FALSE
*/
static public function determineSaltingHashingMethod($saltedHash, $mode = TYPO3_MODE) {
$registeredMethods = static::getRegisteredSaltedHashingMethods();
diff --git a/typo3/sysext/saltedpasswords/Classes/Salt/SaltInterface.php b/typo3/sysext/saltedpasswords/Classes/Salt/SaltInterface.php
index bb3300d4e046..87ac4c49812b 100644
--- a/typo3/sysext/saltedpasswords/Classes/Salt/SaltInterface.php
+++ b/typo3/sysext/saltedpasswords/Classes/Salt/SaltInterface.php
@@ -28,21 +28,21 @@ interface SaltInterface {
*
* @param string $plainPW plain-text password to compare with salted hash
* @param string $saltedHashPW Salted hash to compare plain-text password with
- * @return boolean TRUE, if plaintext password is correct, otherwise FALSE
+ * @return bool TRUE, if plaintext password is correct, otherwise FALSE
*/
public function checkPassword($plainPW, $saltedHashPW);
/**
* Returns length of required salt.
*
- * @return integer Length of required salt
+ * @return int Length of required salt
*/
public function getSaltLength();
/**
* Returns whether all prequesites for the hashing methods are matched
*
- * @return boolean Method available
+ * @return bool Method available
*/
public function isAvailable();
@@ -65,7 +65,7 @@ interface SaltInterface {
* with class ext_update.
*
* @param string $passString Salted hash to check if it needs an update
- * @return boolean TRUE if salted hash needs an update, otherwise FALSE
+ * @return bool TRUE if salted hash needs an update, otherwise FALSE
*/
public function isHashUpdateNeeded($passString);
@@ -73,7 +73,7 @@ interface SaltInterface {
* Method determines if a given string is a valid salt
*
* @param string $salt String to check
- * @return boolean TRUE if it's valid salt, otherwise FALSE
+ * @return bool TRUE if it's valid salt, otherwise FALSE
*/
public function isValidSalt($salt);
@@ -81,7 +81,7 @@ interface SaltInterface {
* Method determines if a given string is a valid salted hashed password.
*
* @param string $saltedPW String to check
- * @return boolean TRUE if it's valid salted hashed password, otherwise FALSE
+ * @return bool TRUE if it's valid salted hashed password, otherwise FALSE
*/
public function isValidSaltedPW($saltedPW);
diff --git a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
index 8c2ea1e2f310..37a91147f089 100644
--- a/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
+++ b/typo3/sysext/saltedpasswords/Classes/SaltedPasswordService.php
@@ -76,7 +76,7 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
* following prerequesties are fulfilled:
* - loginSecurityLevel of according TYPO3_MODE is set to normal
*
- * @return boolean TRUE if service is available
+ * @return bool TRUE if service is available
*/
public function init() {
$available = FALSE;
@@ -99,7 +99,7 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
* @param array $user User data array
* @param array $loginData Login data array
* @param string $passwordCompareStrategy Password compare strategy
- * @return boolean TRUE if login data matched
+ * @return bool TRUE if login data matched
*/
public function compareUident(array $user, array $loginData, $passwordCompareStrategy = '') {
$validPasswd = FALSE;
@@ -168,7 +168,7 @@ class SaltedPasswordService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
* - 200 - the service was able to authenticate the user
*
* @param array Array containing FE user data of the logged user.
- * @return integer Authentication statuscode, one of 0,100 and 200
+ * @return int Authentication statuscode, one of 0,100 and 200
*/
public function authUser(array $user) {
$OK = 100;
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
index c2f827ac3219..59c63d966fa1 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateFieldProvider.php
@@ -88,7 +88,7 @@ class BulkUpdateFieldProvider implements \TYPO3\CMS\Scheduler\AdditionalFieldPro
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
+ * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$result = TRUE;
diff --git a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
index e7beda27636f..a6040453c23f 100644
--- a/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
+++ b/typo3/sysext/saltedpasswords/Classes/Task/BulkUpdateTask.php
@@ -55,7 +55,7 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Execute task
*
- * @return boolean
+ * @return bool
*/
public function execute() {
$processedAllRecords = TRUE;
@@ -166,7 +166,7 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
* If a password does not start with M or C determine if a password is already a usual salted hash.
*
* @param string $password Password
- * @return boolean TRUE if password is a salted hash
+ * @return bool TRUE if password is a salted hash
*/
protected function isSaltedHash($password) {
$isSaltedHash = FALSE;
@@ -185,7 +185,7 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
* Checks if a given password is a md5 hash, the default for be_user records before saltedpasswords.
*
* @param string $password The password to test
- * @return boolean TRUE if password is md5
+ * @return bool TRUE if password is md5
*/
protected function isMd5Password($password) {
return (bool) preg_match('/[0-9abcdef]{32,32}/i', $password);
@@ -235,7 +235,7 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Get if it can deactivate self
*
- * @return boolean TRUE if task shall deactivate itself, FALSE otherwise
+ * @return bool TRUE if task shall deactivate itself, FALSE otherwise
*/
public function getCanDeactivateSelf() {
return $this->canDeactivateSelf;
@@ -254,7 +254,7 @@ class BulkUpdateTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Get number of records
*
- * @return integer The number of records
+ * @return int The number of records
*/
public function getNumberOfRecords() {
return $this->numberOfRecords;
diff --git a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
index 48f452c7a2b1..5f2f6a2248cd 100644
--- a/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
+++ b/typo3/sysext/saltedpasswords/Classes/Utility/ExtensionManagerConfigurationUtility.php
@@ -231,7 +231,7 @@ system! Please check your configuration.';
/**
* Checks if rsaauth is able to obtain a backend
*
- * @return boolean
+ * @return bool
*/
protected function isRsaAuthBackendAvailable() {
/**
diff --git a/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php b/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
index 1901f6e45c99..ccbf204c5fb6 100644
--- a/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
+++ b/typo3/sysext/saltedpasswords/Classes/Utility/SaltedPasswordsUtility.php
@@ -31,7 +31,7 @@ class SaltedPasswordsUtility {
* Calculates number of backend users, who have no saltedpasswords
* protection.
*
- * @return integer
+ * @return int
*/
static public function getNumberOfBackendUsersWithInsecurePassword() {
$userCount = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows(
@@ -115,7 +115,7 @@ class SaltedPasswordsUtility {
* indeed used in the TYPO3_MODE.
*
* @param string $mode (optional) The TYPO3 mode (FE or BE) saltedpasswords shall be used for
- * @return boolean TRUE, if salted password hashes are used in the TYPO3_MODE, otherwise FALSE
+ * @return bool TRUE, if salted password hashes are used in the TYPO3_MODE, otherwise FALSE
*/
static public function isUsageEnabled($mode = TYPO3_MODE) {
// Login Security Level Recognition
diff --git a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
index 9ea4a84dd87a..b98d4d1821da 100644
--- a/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
+++ b/typo3/sysext/scheduler/Classes/AdditionalFieldProviderInterface.php
@@ -36,7 +36,7 @@ interface AdditionalFieldProviderInterface {
*
* @param array $submittedData An array containing the data submitted by the add/edit task form
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule Reference to the scheduler backend module
- * @return boolean TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
+ * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $schedulerModule);
diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index 98f118118345..d799ce0b27ff 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -241,7 +241,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
* It will differentiate between a non-existing user and an existing,
* but disabled user (as per enable fields)
*
- * @return integer -1 If user doesn't exist, 0 If user exist but not enabled, 1 If user exists and is enabled
+ * @return int -1 If user doesn't exist, 0 If user exist but not enabled, 1 If user exists and is enabled
*/
protected function checkSchedulerUser() {
$schedulerUserStatus = -1;
@@ -1289,7 +1289,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
/**
* Checks the submitted data and performs some pre-processing on it
*
- * @return boolean TRUE if everything was ok, FALSE otherwise
+ * @return bool TRUE if everything was ok, FALSE otherwise
*/
protected function preprocessData() {
$result = TRUE;
@@ -1382,7 +1382,7 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
* Otherwise an exception is thrown
*
* @param string $string String to check
- * @return integer Unix timestamp
+ * @return int Unix timestamp
* @throws \InvalidArgumentException
*/
public function checkDate($string) {
diff --git a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
index e63eaaccbdb5..f58e84d0b232 100644
--- a/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
+++ b/typo3/sysext/scheduler/Classes/CronCommand/CronCommand.php
@@ -112,7 +112,7 @@ class CronCommand {
* Get next timestamp
*
* @api
- * @return integer Unix timestamp
+ * @return int Unix timestamp
*/
public function getTimestamp() {
return $this->timestamp;
@@ -132,7 +132,7 @@ class CronCommand {
* Determine if current timestamp matches minute and hour cron command restriction.
*
* @param int $timestamp to test
- * @return boolean TRUE if cron command conditions are met
+ * @return bool TRUE if cron command conditions are met
*/
protected function minuteAndHourMatchesCronCommand($timestamp) {
$minute = (int)date('i', $timestamp);
@@ -149,7 +149,7 @@ class CronCommand {
* cron command restriction
*
* @param int $timestamp to test
- * @return boolean TRUE if cron command conditions are met
+ * @return bool TRUE if cron command conditions are met
*/
protected function dayMatchesCronCommand($timestamp) {
$dayOfMonth = date('j', $timestamp);
@@ -180,7 +180,7 @@ class CronCommand {
*
* @param string $commandExpression: cron command
* @param int $numberToMatch: number to look up
- * @return boolean TRUE if number is in list
+ * @return bool TRUE if number is in list
*/
protected function isInCommandList($commandExpression, $numberToMatch) {
$inList = FALSE;
@@ -202,7 +202,7 @@ class CronCommand {
* This shortens and lengthens the length of a day by one hour.
*
* @param int $timestamp Unix timestamp
- * @return integer Number of seconds of day
+ * @return int Number of seconds of day
*/
protected function numberOfSecondsInDay($timestamp) {
$now = mktime(0, 0, 0, date('n', $timestamp), date('j', $timestamp), date('Y', $timestamp));
@@ -216,7 +216,7 @@ class CronCommand {
* Round a timestamp down to full minute.
*
* @param int $timestamp Unix timestamp
- * @return integer Rounded timestamp
+ * @return int Rounded timestamp
*/
protected function roundTimestamp($timestamp) {
return mktime(date('H', $timestamp), date('i', $timestamp), 0, date('n', $timestamp), date('j', $timestamp), date('Y', $timestamp));
diff --git a/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php b/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php
index 24388c79cee4..f4a25d1ab6d1 100644
--- a/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php
+++ b/typo3/sysext/scheduler/Classes/CronCommand/NormalizeCommand.php
@@ -311,7 +311,7 @@ class NormalizeCommand {
*
* @throws \InvalidArgumentException If month string can not be converted to integer
* @param string $month Month representation
- * @return integer month integer representation between 1 and 12
+ * @return int month integer representation between 1 and 12
*/
static protected function normalizeMonth($month) {
$timestamp = strtotime('2010-' . $month . '-01');
@@ -328,7 +328,7 @@ class NormalizeCommand {
*
* @throws \InvalidArgumentException If weekday string can not be converted
* @param string $weekday Weekday representation
- * @return integer weekday integer representation between 1 and 7
+ * @return int weekday integer representation between 1 and 7
*/
static protected function normalizeWeekday($weekday) {
$normalizedWeekday = FALSE;
diff --git a/typo3/sysext/scheduler/Classes/Example/SleepTask.php b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
index 62dd5fb522f9..225b575bf8bc 100644
--- a/typo3/sysext/scheduler/Classes/Example/SleepTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/SleepTask.php
@@ -33,7 +33,7 @@ class SleepTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
* Function executed from the Scheduler.
* Goes to sleep ;-)
*
- * @return boolean
+ * @return bool
*/
public function execute() {
$time = 10;
diff --git a/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
index f1e747754d47..557fab831dc0 100644
--- a/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Example/SleepTaskAdditionalFieldProvider.php
@@ -63,7 +63,7 @@ class SleepTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\Additiona
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
+ * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$submittedData['sleepTime'] = (int)$submittedData['sleepTime'];
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTask.php b/typo3/sysext/scheduler/Classes/Example/TestTask.php
index 95f95efeb8be..ec76d7bca38c 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTask.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTask.php
@@ -32,7 +32,7 @@ class TestTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
* Function executed from the Scheduler.
* Sends an email
*
- * @return boolean
+ * @return bool
*/
public function execute() {
$success = FALSE;
diff --git a/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
index e8360f207140..860f3c7d4e51 100644
--- a/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Example/TestTaskAdditionalFieldProvider.php
@@ -63,7 +63,7 @@ class TestTaskAdditionalFieldProvider implements \TYPO3\CMS\Scheduler\Additional
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
+ * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$submittedData['email'] = trim($submittedData['email']);
diff --git a/typo3/sysext/scheduler/Classes/Execution.php b/typo3/sysext/scheduler/Classes/Execution.php
index 17e11819a982..7338ca5b011b 100644
--- a/typo3/sysext/scheduler/Classes/Execution.php
+++ b/typo3/sysext/scheduler/Classes/Execution.php
@@ -83,7 +83,7 @@ class Execution {
/**
* This method is used to get the start date
*
- * @return integer Start date (timestamp)
+ * @return int Start date (timestamp)
*/
public function getStart() {
return $this->start;
@@ -102,7 +102,7 @@ class Execution {
/**
* This method is used to get the end date
*
- * @return integer End date (timestamp)
+ * @return int End date (timestamp)
*/
public function getEnd() {
return $this->end;
@@ -121,7 +121,7 @@ class Execution {
/**
* This method is used to get the interval
*
- * @return integer Interval (in seconds)
+ * @return int Interval (in seconds)
*/
public function getInterval() {
return $this->interval;
@@ -140,7 +140,7 @@ class Execution {
/**
* This method is used to get the multiple execution flag
*
- * @return boolean TRUE if concurrent executions are allowed, FALSE otherwise
+ * @return bool TRUE if concurrent executions are allowed, FALSE otherwise
*/
public function getMultiple() {
return $this->multiple;
@@ -175,7 +175,7 @@ class Execution {
* Upon next execution, this flag is set to FALSE.
*
* @param bool $isNewSingleExecution Is newly created single execution?
- * @return void
+ * @return void
* @see \TYPO3\CMS\Scheduler\Execution::getNextExecution()
*/
public function setIsNewSingleExecution($isNewSingleExecution) {
@@ -185,7 +185,7 @@ class Execution {
/**
* Get whether this is a newly created single execution
*
- * @return boolean Is newly created single execution?
+ * @return bool Is newly created single execution?
*/
public function getIsNewSingleExecution() {
return $this->isNewSingleExecution;
@@ -197,7 +197,7 @@ class Execution {
/**
* This method gets or calculates the next execution date
*
- * @return integer Timestamp of the next execution
+ * @return int Timestamp of the next execution
* @throws \OutOfBoundsException
*/
public function getNextExecution() {
@@ -238,7 +238,7 @@ class Execution {
/**
* Calculates the next execution from a cron command
*
- * @return integer Next execution (timestamp)
+ * @return int Next execution (timestamp)
*/
public function getNextCronExecution() {
/** @var $cronCmd \TYPO3\CMS\Scheduler\CronCommand\CronCommand */
@@ -250,7 +250,7 @@ class Execution {
/**
* Checks if the schedule for a task is started or not
*
- * @return boolean TRUE if the schedule is already active, FALSE otherwise
+ * @return bool TRUE if the schedule is already active, FALSE otherwise
*/
public function isStarted() {
return $this->start < time();
@@ -259,7 +259,7 @@ class Execution {
/**
* Checks if the schedule for a task is passed or not
*
- * @return boolean TRUE if the schedule is not active anymore, FALSE otherwise
+ * @return bool TRUE if the schedule is not active anymore, FALSE otherwise
*/
public function isEnded() {
if (empty($this->end)) {
diff --git a/typo3/sysext/scheduler/Classes/Scheduler.php b/typo3/sysext/scheduler/Classes/Scheduler.php
index 47cc86b01cc6..c66d35670e52 100644
--- a/typo3/sysext/scheduler/Classes/Scheduler.php
+++ b/typo3/sysext/scheduler/Classes/Scheduler.php
@@ -50,7 +50,7 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
* Adds a task to the pool
*
* @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task The object representing the task to add
- * @return boolean TRUE if the task was successfully added, FALSE otherwise
+ * @return bool TRUE if the task was successfully added, FALSE otherwise
*/
public function addTask(\TYPO3\CMS\Scheduler\Task\AbstractTask $task) {
$taskUid = $task->getTaskUid();
@@ -119,7 +119,7 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
* It is expected to return FALSE if the task was barred from running or if it was not saved properly
*
* @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task The task to execute
- * @return boolean Whether the task was saved successfully to the database or not
+ * @return bool Whether the task was saved successfully to the database or not
*/
public function executeTask(\TYPO3\CMS\Scheduler\Task\AbstractTask $task) {
// Trigger the saving of the task, as this will calculate its next execution time
@@ -189,7 +189,7 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
* TODO: find a way to actually kill the existing jobs
*
* @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task The object representing the task to delete
- * @return boolean TRUE if task was successfully deleted, FALSE otherwise
+ * @return bool TRUE if task was successfully deleted, FALSE otherwise
*/
public function removeTask(\TYPO3\CMS\Scheduler\Task\AbstractTask $task) {
$taskUid = $task->getTaskUid();
@@ -208,7 +208,7 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
* Updates a task in the pool
*
* @param \TYPO3\CMS\Scheduler\Task\AbstractTask $task Scheduler task object
- * @return boolean False if submitted task was not of proper class
+ * @return bool False if submitted task was not of proper class
*/
public function saveTask(\TYPO3\CMS\Scheduler\Task\AbstractTask $task) {
$taskUid = $task->getTaskUid();
@@ -357,7 +357,7 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
* This test checks whether the unserialized object is of the right (parent) class or not.
*
* @param object $task The object to test
- * @return boolean TRUE if object is a task, FALSE otherwise
+ * @return bool TRUE if object is a task, FALSE otherwise
*/
public function isValidTaskObject($task) {
return $task instanceof \TYPO3\CMS\Scheduler\Task\AbstractTask;
@@ -383,7 +383,7 @@ class Scheduler implements \TYPO3\CMS\Core\SingletonInterface {
* Schedule the next run of scheduler
* For the moment only the "at"-daemon is used, and only if it is enabled
*
- * @return boolean Successfully scheduled next execution using "at"-daemon
+ * @return bool Successfully scheduled next execution using "at"-daemon
* @see tx_scheduler::fetchTask()
*/
public function scheduleNextSchedulerRunUsingAtDaemon() {
diff --git a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
index 8f654551ae7f..61690a8ea000 100644
--- a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
@@ -88,7 +88,7 @@ abstract class AbstractTask {
* to be handled and logged by the client implementations.
* Should return TRUE on successful execution, FALSE on error.
*
- * @return boolean Returns TRUE on successful execution, FALSE on error
+ * @return bool Returns TRUE on successful execution, FALSE on error
*/
abstract public function execute();
@@ -117,7 +117,7 @@ abstract class AbstractTask {
/**
* This method returns the unique id of the task
*
- * @return integer The id of the task
+ * @return int The id of the task
*/
public function getTaskUid() {
return $this->taskUid;
@@ -153,7 +153,7 @@ abstract class AbstractTask {
/**
* This method returns the disable status of the task
*
- * @return boolean TRUE if task is disabled, FALSE otherwise
+ * @return bool TRUE if task is disabled, FALSE otherwise
*/
public function isDisabled() {
return $this->disabled;
@@ -186,7 +186,7 @@ abstract class AbstractTask {
/**
* This method returns the task group (uid) of the task
*
- * @return integer Uid of task group
+ * @return int Uid of task group
*/
public function getTaskGroup() {
return $this->taskGroup;
@@ -205,7 +205,7 @@ abstract class AbstractTask {
/**
* This method returns the timestamp corresponding to the next execution time of the task
*
- * @return integer Timestamp of next execution
+ * @return int Timestamp of next execution
*/
public function getExecutionTime() {
return $this->executionTime;
@@ -319,7 +319,7 @@ abstract class AbstractTask {
/**
* Returns the timestamp for next due execution of the task
*
- * @return integer Date and time of the next execution as a timestamp
+ * @return int Date and time of the next execution as a timestamp
*/
public function getNextDueExecution() {
// NOTE: this call may throw an exception, but we let it bubble up
@@ -329,7 +329,7 @@ abstract class AbstractTask {
/**
* Returns TRUE if several runs of the task are allowed concurrently
*
- * @return boolean TRUE if concurrent executions are allowed, FALSE otherwise
+ * @return bool TRUE if concurrent executions are allowed, FALSE otherwise
*/
public function areMultipleExecutionsAllowed() {
return $this->execution->getMultiple();
@@ -338,7 +338,7 @@ abstract class AbstractTask {
/**
* Returns TRUE if an instance of the task is already running
*
- * @return boolean TRUE if an instance is already running, FALSE otherwise
+ * @return bool TRUE if an instance is already running, FALSE otherwise
*/
public function isExecutionRunning() {
$isRunning = FALSE;
@@ -362,7 +362,7 @@ abstract class AbstractTask {
* This method adds current execution to the execution list
* It also logs the execution time and mode
*
- * @return integer Execution id
+ * @return int Execution id
*/
public function markExecution() {
$queryArr = array(
@@ -401,7 +401,7 @@ abstract class AbstractTask {
*
* @param int $executionID Id of the execution to remove.
* @param \Exception $failure An exception to signal a failed execution
- * @return void
+ * @return void
*/
public function unmarkExecution($executionID, \Exception $failure = NULL) {
// Get the executions for the task
@@ -444,7 +444,7 @@ abstract class AbstractTask {
/**
* Clears all marked executions
*
- * @return boolean TRUE if the clearing succeeded, FALSE otherwise
+ * @return bool TRUE if the clearing succeeded, FALSE otherwise
*/
public function unmarkAllExecutions() {
// Set the serialized executions field to empty
@@ -457,7 +457,7 @@ abstract class AbstractTask {
/**
* Saves the details of the task to the database.
*
- * @return boolean
+ * @return bool
*/
public function save() {
return $this->scheduler->saveTask($this);
@@ -476,7 +476,7 @@ abstract class AbstractTask {
/**
* Removes the task totally from the system.
*
- * @return void
+ * @return void
*/
public function remove() {
$this->scheduler->removeTask($this);
diff --git a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
index 6b658b31f57b..413e9ef72191 100644
--- a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionAdditionalFieldProvider.php
@@ -62,7 +62,7 @@ class CachingFrameworkGarbageCollectionAdditionalFieldProvider implements \TYPO3
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
+ * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$validData = TRUE;
diff --git a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php
index 54f57b2aed46..3082e6f101d7 100644
--- a/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/CachingFrameworkGarbageCollectionTask.php
@@ -36,7 +36,7 @@ class CachingFrameworkGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\Ab
/**
* Execute garbage collection, called by scheduler.
*
- * @return boolean
+ * @return bool
*/
public function execute() {
// Global sub-array with all configured caches
diff --git a/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php b/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php
index a21ce75b6ab8..3945a8db7989 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileIndexingTask.php
@@ -73,7 +73,7 @@ class FileIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Hardcode disabled state
*
- * @return boolean TRUE if task is disabled, FALSE otherwise
+ * @return bool TRUE if task is disabled, FALSE otherwise
*/
public function isDisabled() {
return TRUE;
@@ -82,7 +82,7 @@ class FileIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Function execute from the Scheduler
*
- * @return boolean TRUE on successful execution, FALSE on error
+ * @return bool TRUE on successful execution, FALSE on error
*/
public function execute() {
return FALSE;
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
index 967bdbfb5ad8..052402ab43db 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
@@ -97,7 +97,7 @@ class FileStorageExtractionAdditionalFieldProvider implements \TYPO3\CMS\Schedul
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean True if validation was ok (or selected class is not relevant), false otherwise
+ * @return bool True if validation was ok (or selected class is not relevant), false otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
if (
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php
index 348193327e66..328b43ef2d61 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionTask.php
@@ -36,7 +36,7 @@ class FileStorageExtractionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Function execute from the Scheduler
*
- * @return boolean TRUE on successful execution, FALSE on error
+ * @return bool TRUE on successful execution, FALSE on error
*/
public function execute() {
$success = FALSE;
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
index 25a7bb98ae28..3c59d40d8b93 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
@@ -72,7 +72,7 @@ class FileStorageIndexingAdditionalFieldProvider implements \TYPO3\CMS\Scheduler
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean True if validation was ok (or selected class is not relevant), false otherwise
+ * @return bool True if validation was ok (or selected class is not relevant), false otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$value = $submittedData['scheduler_fileStorageIndexing_storage'];
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
index 34780b004bda..8effee71de18 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingTask.php
@@ -29,7 +29,7 @@ class FileStorageIndexingTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
/**
* Function execute from the Scheduler
*
- * @return boolean TRUE on successful execution, FALSE on error
+ * @return bool TRUE on successful execution, FALSE on error
*/
public function execute() {
$success = FALSE;
diff --git a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
index 955c95d63755..7c200522a417 100644
--- a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionAdditionalFieldProvider.php
@@ -66,7 +66,7 @@ class RecyclerGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Sch
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
+ * @return bool TRUE if validation was ok (or selected class is not relevant), FALSE otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$result = TRUE;
diff --git a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
index 01d6be5820b2..c6d8c9bc4bde 100644
--- a/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/RecyclerGarbageCollectionTask.php
@@ -43,7 +43,7 @@ class RecyclerGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTa
/**
* Cleanup recycled files, called by scheduler.
*
- * @return boolean TRUE if task run was successful
+ * @return bool TRUE if task run was successful
* @throws \BadMethodCallException
*/
public function execute() {
@@ -69,7 +69,7 @@ class RecyclerGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTa
* @throws \RuntimeException If folders are not found or files can not be deleted
* @param string $directory Path to the directory
* @param int $timestamp Timestamp of the last file modification
- * @return boolean TRUE if success
+ * @return bool TRUE if success
*/
protected function cleanupRecycledFiles($directory, $timestamp) {
$directory = \TYPO3\CMS\Core\Utility\GeneralUtility::getFileAbsFileName($directory);
diff --git a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
index 8b62c35aea7b..93ca5a06428f 100644
--- a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionAdditionalFieldProvider.php
@@ -172,7 +172,7 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean True if validation was ok (or selected class is not relevant), false otherwise
+ * @return bool True if validation was ok (or selected class is not relevant), false otherwise
*/
public function validateAdditionalFields(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$validData = $this->validateAllTablesAdditionalField($submittedData, $parentObject);
@@ -186,7 +186,7 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean True if data is valid
+ * @return bool True if data is valid
*/
public function validateAllTablesAdditionalField(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$validData = FALSE;
@@ -203,7 +203,7 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean True if table exists in configuration, false otherwise
+ * @return bool True if table exists in configuration, false otherwise
*/
public function validateTableAdditionalField(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$validData = FALSE;
@@ -221,7 +221,7 @@ class TableGarbageCollectionAdditionalFieldProvider implements \TYPO3\CMS\Schedu
*
* @param array $submittedData Reference to the array containing the data submitted by the user
* @param \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject Reference to the calling object (Scheduler's BE module)
- * @return boolean True if validation was ok (or selected class is not relevant), false otherwise
+ * @return bool True if validation was ok (or selected class is not relevant), false otherwise
*/
public function validateNumberOfDaysAdditionalField(array &$submittedData, \TYPO3\CMS\Scheduler\Controller\SchedulerModuleController $parentObject) {
$validData = FALSE;
diff --git a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
index 306aeec63a46..06b063cfbf1c 100644
--- a/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/TableGarbageCollectionTask.php
@@ -46,7 +46,7 @@ class TableGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
* Execute garbage collection, called by scheduler.
*
* @throws \RuntimeException If configured table was not cleaned up
- * @return boolean TRUE if task run was successful
+ * @return bool TRUE if task run was successful
*/
public function execute() {
$tableConfigurations = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['scheduler']['tasks']['TYPO3\\CMS\\Scheduler\\Task\\TableGarbageCollectionTask']['options']['tables'];
@@ -69,7 +69,7 @@ class TableGarbageCollectionTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask
* @throws \RuntimeException If table configuration is broken
* @param string $table The table to handle
* @param array $configuration Clean up configuration
- * @return boolean TRUE if cleanup was successful
+ * @return bool TRUE if cleanup was successful
*/
protected function handleTable($table, array $configuration) {
if (!empty($configuration['expireField'])) {
diff --git a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
index 4664757638ab..b3570014177d 100644
--- a/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
+++ b/typo3/sysext/setup/Classes/Controller/SetupModuleController.php
@@ -697,7 +697,7 @@ class SetupModuleController {
* Returns access check (currently only "admin" is supported)
*
* @param array $config Configuration of the field, access mode is defined in key 'access'
- * @return boolean Whether it is allowed to modify the given field
+ * @return bool Whether it is allowed to modify the given field
*/
protected function checkAccess(array $config) {
$access = $config['access'];
diff --git a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
index 2bfc26e8c213..f419e9430547 100644
--- a/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
+++ b/typo3/sysext/sv/Classes/AbstractAuthenticationService.php
@@ -97,7 +97,7 @@ class AbstractAuthenticationService extends \TYPO3\CMS\Core\Service\AbstractServ
* @param array $user User data array
* @param array $loginData Login data array
* @param string $passwordCompareStrategy Password compare strategy
- * @return boolean TRUE if login data matched
+ * @return bool TRUE if login data matched
*/
public function compareUident(array $user, array $loginData, $passwordCompareStrategy = '') {
if ($this->authInfo['loginType'] === 'BE') {
diff --git a/typo3/sysext/sv/Classes/AuthenticationService.php b/typo3/sysext/sv/Classes/AuthenticationService.php
index 2c1d4dc5f7a5..e25bce3d8fc2 100644
--- a/typo3/sysext/sv/Classes/AuthenticationService.php
+++ b/typo3/sysext/sv/Classes/AuthenticationService.php
@@ -27,7 +27,7 @@ class AuthenticationService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
*
* @param array $loginData Credentials that are submitted and potentially modified by other services
* @param string $passwordTransmissionStrategy Keyword of how the password has been hashed or encrypted before submission
- * @return boolean
+ * @return bool
*/
public function processLoginData(array &$loginData, $passwordTransmissionStrategy) {
$isProcessed = TRUE;
@@ -90,8 +90,7 @@ class AuthenticationService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
* Authenticate a user (Check various conditions for the user that might invalidate its authentication, eg. password match, domain, IP, etc.)
*
* @param array $user Data of user.
- *
- * @return integer >= 200: User authenticated successfully.
+ * @return int >= 200: User authenticated successfully.
* No more checking is needed by other auth services.
* >= 100: User not authenticated; this service is not responsible.
* Other auth services will be asked.
@@ -227,4 +226,4 @@ class AuthenticationService extends \TYPO3\CMS\Sv\AbstractAuthenticationService
}
}
-}
+}
\ No newline at end of file
diff --git a/typo3/sysext/sv/Classes/Report/ServicesListReport.php b/typo3/sysext/sv/Classes/Report/ServicesListReport.php
index f7fe28998135..767663cd90ee 100644
--- a/typo3/sysext/sv/Classes/Report/ServicesListReport.php
+++ b/typo3/sysext/sv/Classes/Report/ServicesListReport.php
@@ -221,7 +221,7 @@ class ServicesListReport implements \TYPO3\CMS\Reports\ReportInterface {
*
* @param array $a First service to compare
* @param array $b Second service to compare
- * @return integer 1, 0 or -1 if a is smaller, equal or greater than b, respectively
+ * @return int 1, 0 or -1 if a is smaller, equal or greater than b, respectively
*/
protected function sortServices(array $a, array $b) {
$result = 0;
diff --git a/typo3/sysext/sys_action/Classes/ActionTask.php b/typo3/sysext/sys_action/Classes/ActionTask.php
index 9a19907c06af..d2301ca5dba0 100644
--- a/typo3/sysext/sys_action/Classes/ActionTask.php
+++ b/typo3/sysext/sys_action/Classes/ActionTask.php
@@ -413,7 +413,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
*
* @param array $record Current action record
* @param array $vars POST vars
- * @return integer Id of the new/updated user
+ * @return int Id of the new/updated user
*/
protected function saveNewBackendUser($record, $vars) {
// Check if the db mount is a page the current user is allowed to.);
@@ -545,7 +545,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
* Check if a page is inside the rootline the current user can see
*
* @param int $pageId Id of the the page to be checked
- * @return boolean Access to the page
+ * @return bool Access to the page
*/
protected function checkRootline($pageId) {
$access = FALSE;
diff --git a/typo3/sysext/sys_action/Classes/ActionToolbarMenu.php b/typo3/sysext/sys_action/Classes/ActionToolbarMenu.php
index 4466885a29ad..9a2e28a2a12b 100644
--- a/typo3/sysext/sys_action/Classes/ActionToolbarMenu.php
+++ b/typo3/sysext/sys_action/Classes/ActionToolbarMenu.php
@@ -152,7 +152,7 @@ class ActionToolbarMenu implements \TYPO3\CMS\Backend\Toolbar\ToolbarItemHookInt
/**
* Checks if user has access to the sys action menu
*
- * @return boolean TRUE if the user has access, FALSE otherwise
+ * @return bool TRUE if the user has access, FALSE otherwise
*/
public function checkAccess() {
// Taskcenter is enabled for everybody
diff --git a/typo3/sysext/sys_note/Classes/Core/Bootstrap.php b/typo3/sysext/sys_note/Classes/Core/Bootstrap.php
index 1d152248e955..82edbf49244a 100644
--- a/typo3/sysext/sys_note/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/sys_note/Classes/Core/Bootstrap.php
@@ -79,7 +79,7 @@ class Bootstrap {
* This mechanism should increase the performance of the hooked backend modules heavily.
*
* @param array $arguments Arguments for the extbase plugin
- * @return boolean
+ * @return bool
*/
protected function expectOutput(array $arguments = array()) {
// no pids set
diff --git a/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php b/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
index 22d074ab3412..562a750c2473 100644
--- a/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
+++ b/typo3/sysext/sys_note/Classes/Domain/Model/SysNote.php
@@ -132,7 +132,7 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return boolean $personal
+ * @return bool $personal
*/
public function getPersonal() {
return $this->personal;
@@ -147,7 +147,7 @@ class SysNote extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
}
/**
- * @return integer $category
+ * @return int $category
*/
public function getCategory() {
return $this->category;
diff --git a/typo3/sysext/t3editor/Classes/Hook/FileEditHook.php b/typo3/sysext/t3editor/Classes/Hook/FileEditHook.php
index 018051563a15..5ba6835604d1 100644
--- a/typo3/sysext/t3editor/Classes/Hook/FileEditHook.php
+++ b/typo3/sysext/t3editor/Classes/Hook/FileEditHook.php
@@ -103,7 +103,7 @@ class FileEditHook {
* @param array $parameters
* @param mixed $pObj
*
- * @return boolean TRUE if successful
+ * @return bool TRUE if successful
*/
public function save($parameters, $pObj) {
$savingsuccess = FALSE;
diff --git a/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php b/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
index 01be09385c06..669716ffa721 100644
--- a/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
+++ b/typo3/sysext/t3editor/Classes/Hook/TypoScriptTemplateInfoHook.php
@@ -87,7 +87,7 @@ class TypoScriptTemplateInfoHook {
/**
* Process saving request like in class.tstemplateinfo.php (TCE processing)
*
- * @return boolean TRUE if successful
+ * @return bool TRUE if successful
*/
public function save($parameters, $pObj) {
$savingsuccess = FALSE;
diff --git a/typo3/sysext/t3editor/Classes/T3editor.php b/typo3/sysext/t3editor/Classes/T3editor.php
index 54b8d217d990..b2ea0a77328b 100644
--- a/typo3/sysext/t3editor/Classes/T3editor.php
+++ b/typo3/sysext/t3editor/Classes/T3editor.php
@@ -141,7 +141,7 @@ class T3editor implements \TYPO3\CMS\Core\SingletonInterface {
}
/**
- * @return boolean TRUE if the t3editor is enabled
+ * @return bool TRUE if the t3editor is enabled
*/
public function isEnabled() {
return $this->_isEnabled;
diff --git a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
index 16da2e5f71be..6012f9119eec 100644
--- a/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
+++ b/typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
@@ -329,7 +329,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
*
* @param string $extKey Extension key
* @param string $taskClass Name of the task
- * @return boolean Access to the task allowed or not
+ * @return bool Access to the task allowed or not
*/
protected function checkAccess($extKey, $taskClass) {
// Check if task is blinded with TsConfig (taskcenter.<extkey>.<taskName>
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
index 9a2c4b40b46c..a280f24eb2ad 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TemplateAnalyzerModuleFunctionController.php
@@ -57,7 +57,7 @@ class TemplateAnalyzerModuleFunctionController extends \TYPO3\CMS\Backend\Module
*
* @param int $pageId
* @param int $template_uid
- * @return integer
+ * @return int
*/
public function initialize_editor($pageId, $template_uid = 0) {
// Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
index 621257070b78..b97a2e568c0d 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateConstantEditorModuleFunctionController.php
@@ -31,7 +31,7 @@ class TypoScriptTemplateConstantEditorModuleFunctionController extends \TYPO3\CM
*
* @param int $pageId
* @param int $template_uid
- * @return integer
+ * @return int
*/
public function initialize_editor($pageId, $template_uid = 0) {
// Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
index 2648444be216..36c086a16706 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateInformationModuleFunctionController.php
@@ -74,7 +74,7 @@ class TypoScriptTemplateInformationModuleFunctionController extends AbstractFunc
*
* @param int $pageId The uid of the current page
* @param int $template_uid: The uid of the template record to be rendered (only if more than one template on the current page)
- * @return boolean Returns TRUE if a template record was found, otherwise FALSE
+ * @return bool Returns TRUE if a template record was found, otherwise FALSE
*/
public function initialize_editor($pageId, $template_uid = 0) {
// Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
index fb03a0a7ce38..53e558b85380 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
@@ -157,7 +157,7 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController extends \TYPO3\CMS
*
* @param int $pageId
* @param int $template_uid
- * @return integer
+ * @return int
*/
public function initialize_editor($pageId, $template_uid = 0) {
// Initializes the module. Done in this function because we may need to re-initialize if data is submitted!
diff --git a/typo3/sysext/version/Classes/Controller/VersionModuleController.php b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
index c32df01423e3..922645a393b9 100644
--- a/typo3/sysext/version/Classes/Controller/VersionModuleController.php
+++ b/typo3/sysext/version/Classes/Controller/VersionModuleController.php
@@ -452,7 +452,7 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
*
* @param string $table Table name
* @param int $uid Record uid
- * @return integer Number of versions for record, FALSE if none.
+ * @return int Number of versions for record, FALSE if none.
*/
public function lookForOwnVersions($table, $uid) {
$versions = BackendUtility::selectVersionsOfRecord($table, $uid, 'uid');
diff --git a/typo3/sysext/version/Classes/DataHandler/CommandMap.php b/typo3/sysext/version/Classes/DataHandler/CommandMap.php
index 0ea04709c881..24e8a4842dae 100644
--- a/typo3/sysext/version/Classes/DataHandler/CommandMap.php
+++ b/typo3/sysext/version/Classes/DataHandler/CommandMap.php
@@ -604,7 +604,7 @@ class CommandMap {
* Callback to get the liveId of an dependent element.
*
* @param ElementEntity $element
- * @return integer
+ * @return int
*/
protected function getElementLiveIdCallback(ElementEntity $element) {
return $element->getDataValue('liveId');
@@ -614,7 +614,7 @@ class CommandMap {
* Callback to get the real id of an dependent element.
*
* @param ElementEntity $element
- * @return integer
+ * @return int
*/
protected function getElementIdCallback(ElementEntity $element) {
return $element->getId();
diff --git a/typo3/sysext/version/Classes/Dependency/ElementEntity.php b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
index d77654f3f203..a64b0e7ce01c 100644
--- a/typo3/sysext/version/Classes/Dependency/ElementEntity.php
+++ b/typo3/sysext/version/Classes/Dependency/ElementEntity.php
@@ -123,7 +123,7 @@ class ElementEntity {
/**
* Gets the id.
*
- * @return integer
+ * @return int
*/
public function getId() {
return $this->id;
@@ -263,7 +263,7 @@ class ElementEntity {
/**
* Determines whether there are child or parent references.
*
- * @return boolean
+ * @return bool
*/
public function hasReferences() {
return count($this->getChildren()) > 0 || count($this->getParents()) > 0;
diff --git a/typo3/sysext/version/Classes/Hook/PreviewHook.php b/typo3/sysext/version/Classes/Hook/PreviewHook.php
index 232edc6a2f90..e83cd8622dfb 100644
--- a/typo3/sysext/version/Classes/Hook/PreviewHook.php
+++ b/typo3/sysext/version/Classes/Hook/PreviewHook.php
@@ -261,7 +261,7 @@ class PreviewHook implements \TYPO3\CMS\Core\SingletonInterface {
* a preview link is valid, based on the TSconfig value "options.workspaces.previewLinkTTLHours"
* by default, it's 48hs
*
- * @return integer The hours as a number
+ * @return int The hours as a number
*/
public function getPreviewLinkLifetime() {
$ttlHours = (int)$GLOBALS['BE_USER']->getTSConfigVal('options.workspaces.previewLinkTTLHours');
diff --git a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
index e8f556f922a5..011e80e9e422 100644
--- a/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
+++ b/typo3/sysext/workspaces/Classes/Controller/PreviewController.php
@@ -164,7 +164,7 @@ class PreviewController extends AbstractController {
* Evaluate the activate state based on given $stageArray.
*
* @param array $stageArray
- * @return boolean
+ * @return bool
*/
protected function isInvalidStage($stageArray) {
return !(is_array($stageArray) && count($stageArray) > 0);
diff --git a/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php b/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php
index 562e2db793a2..7b819423168e 100644
--- a/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php
+++ b/typo3/sysext/workspaces/Classes/Domain/Model/CombinedRecord.php
@@ -136,7 +136,7 @@ class CombinedRecord {
/**
* Gets the id of the live-record.
*
- * @return integer
+ * @return int
*/
public function getLiveId() {
return $this->getLiveRecord()->getUid();
@@ -145,7 +145,7 @@ class CombinedRecord {
/**
* Gets the id of version-record.
*
- * @return integer
+ * @return int
*/
public function getVersiondId() {
return $this->getVersionRecord()->getUid();
diff --git a/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php b/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
index 1b74d953e9bc..b32c5d7b52f0 100644
--- a/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
+++ b/typo3/sysext/workspaces/Classes/Domain/Model/DatabaseRecord.php
@@ -92,7 +92,7 @@ class DatabaseRecord {
/**
* Gets the id of the database record row.
*
- * @return integer
+ * @return int
*/
public function getUid() {
return $this->uid;
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php b/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
index fa61090662ab..976217e7ec39 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/AbstractHandler.php
@@ -23,7 +23,7 @@ abstract class AbstractHandler {
/**
* Gets the current workspace ID.
*
- * @return integer The current workspace ID
+ * @return int The current workspace ID
*/
protected function getCurrentWorkspace() {
return $this->getWorkspaceService()->getCurrentWorkspace();
@@ -63,7 +63,7 @@ abstract class AbstractHandler {
* interpreted as integer value.
*
* @param stdClass $parameters
- * @return integer|NULL
+ * @return int|NULL
*/
protected function validateLanguageParameter(\stdClass $parameters) {
$language = NULL;
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php b/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
index 17d1d2bd3529..f51e1f13733e 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/ActionHandler.php
@@ -795,7 +795,7 @@ class ActionHandler extends AbstractHandler {
/**
* @param int $workspaceId
- * @return integer Id of the original workspace
+ * @return int Id of the original workspace
* @throws \TYPO3\CMS\Core\Exception
*/
protected function setTemporaryWorkspace($workspaceId) {
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php b/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
index 55c3a395aaa9..ad4274e55a97 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/MassActionHandler.php
@@ -123,7 +123,7 @@ class MassActionHandler extends AbstractHandler {
* @param int $workspace
* @param bool $swap
* @param int $language
- * @return integer
+ * @return int
*/
protected function initPublishData($workspace, $swap, $language = NULL) {
// workspace might be -98 a.k.a "All Workspaces but that's save here
@@ -145,7 +145,7 @@ class MassActionHandler extends AbstractHandler {
*
* @param int $workspace
* @param int $language
- * @return integer
+ * @return int
*/
protected function initFlushData($workspace, $language = NULL) {
// workspace might be -98 a.k.a "All Workspaces but that's save here
@@ -166,7 +166,7 @@ class MassActionHandler extends AbstractHandler {
* Processes the data.
*
* @param int $workspace
- * @return integer
+ * @return int
*/
protected function processData($workspace) {
$processData = $GLOBALS['BE_USER']->getSessionData('workspaceMassAction');
diff --git a/typo3/sysext/workspaces/Classes/ExtDirect/WorkspaceSelectorToolbarItem.php b/typo3/sysext/workspaces/Classes/ExtDirect/WorkspaceSelectorToolbarItem.php
index 20587e51c521..444c3f624375 100644
--- a/typo3/sysext/workspaces/Classes/ExtDirect/WorkspaceSelectorToolbarItem.php
+++ b/typo3/sysext/workspaces/Classes/ExtDirect/WorkspaceSelectorToolbarItem.php
@@ -50,7 +50,7 @@ class WorkspaceSelectorToolbarItem implements \TYPO3\CMS\Backend\Toolbar\Toolbar
/**
* Checks whether the user has access to this toolbar item
*
- * @return boolean TRUE if user has access, FALSE if not
+ * @return bool TRUE if user has access, FALSE if not
*/
public function checkAccess() {
if (!\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('workspaces')) {
diff --git a/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php b/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php
index 50b471ecd15b..3c3dfa8cdcc2 100644
--- a/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php
@@ -66,7 +66,7 @@ class BackendUtilityHook implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param array $params
* @param \TYPO3\CMS\Backend\Controller\EditDocumentController $form
- * @return boolean
+ * @return bool
*/
public function makeEditForm_accessCheck($params, &$form) {
if ($GLOBALS['BE_USER']->workspace !== 0 && $GLOBALS['TCA'][$params['table']]['ctrl']['versioningWS']) {
diff --git a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
index d04664f8406d..80dd2d3b3e3a 100644
--- a/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/DataHandlerHook.php
@@ -50,7 +50,7 @@ class DataHandlerHook {
* executed
*
* @param \TYPO3\CMS\Core\DataHandling\DataHandler $tcemainObj reference to the main tcemain object
- * @return void
+ * @return void
*/
public function processCmdmap_afterFinish(\TYPO3\CMS\Core\DataHandling\DataHandler $tcemainObj) {
$this->flushWorkspaceCacheEntriesByWorkspaceId($tcemainObj->BE_USER->workspace);
diff --git a/typo3/sysext/workspaces/Classes/Service/AutoPublishService.php b/typo3/sysext/workspaces/Classes/Service/AutoPublishService.php
index 7f7897972f47..d437942bd4fd 100644
--- a/typo3/sysext/workspaces/Classes/Service/AutoPublishService.php
+++ b/typo3/sysext/workspaces/Classes/Service/AutoPublishService.php
@@ -27,7 +27,7 @@ class AutoPublishService {
* It searches for workspaces whose publication date is in the past
* and publishes them
*
- * @return void
+ * @return void
*/
public function autoPublishWorkspaces() {
global $TYPO3_CONF_VARS;
diff --git a/typo3/sysext/workspaces/Classes/Service/GridDataService.php b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
index 2852bf2ef139..9ab9053a43f9 100644
--- a/typo3/sysext/workspaces/Classes/Service/GridDataService.php
+++ b/typo3/sysext/workspaces/Classes/Service/GridDataService.php
@@ -299,7 +299,7 @@ class GridDataService {
*
* @param array $versions All records uids etc. First key is table name, second key incremental integer. Records are associative arrays with uid and t3ver_oid fields. The pid of the online record is found as "livepid" the pid of the offline record is found in "wspid
* @param string $filterTxt The given filter text from the grid.
- * @return boolean TRUE if cache entry was successfully fetched from cache and content put to $this->dataArray
+ * @return bool TRUE if cache entry was successfully fetched from cache and content put to $this->dataArray
*/
protected function getDataArrayFromCache(array $versions, $filterTxt) {
$cacheEntry = FALSE;
@@ -375,7 +375,7 @@ class GridDataService {
*
* @param array $a First value
* @param array $b Second value
- * @return integer
+ * @return int
*/
protected function intSort(array $a, array $b) {
if (!$this->isSortable($a, $b)) {
@@ -405,7 +405,7 @@ class GridDataService {
*
* @param string $a First value
* @param string $b Second value
- * @return integer
+ * @return int
*/
protected function stringSort($a, $b) {
if (!$this->isSortable($a, $b)) {
@@ -451,7 +451,7 @@ class GridDataService {
*
* @param string $filterText
* @param array $versionArray
- * @return boolean
+ * @return bool
*/
protected function isFilterTextInVisibleColumns($filterText, array $versionArray) {
if (is_array($GLOBALS['BE_USER']->uc['moduleData']['Workspaces'][$GLOBALS['BE_USER']->workspace]['columns'])) {
@@ -535,7 +535,7 @@ class GridDataService {
*
* @param string $table Name of the table
* @param array $record Database record
- * @return integer
+ * @return int
*/
protected function getLanguageValue($table, array $record) {
$languageValue = 0;
diff --git a/typo3/sysext/workspaces/Classes/Service/StagesService.php b/typo3/sysext/workspaces/Classes/Service/StagesService.php
index 494798e299ac..7db672880db5 100644
--- a/typo3/sysext/workspaces/Classes/Service/StagesService.php
+++ b/typo3/sysext/workspaces/Classes/Service/StagesService.php
@@ -67,7 +67,7 @@ class StagesService {
/**
* Getter for current workspace id
*
- * @return integer Current workspace id
+ * @return int Current workspace id
*/
public function getWorkspaceId() {
return $this->getBackendUser()->workspace;
@@ -255,7 +255,7 @@ class StagesService {
/**
* Check if given workspace has custom staging activated
*
- * @return boolean
+ * @return bool
* @deprecated since TYPO3 6.2, will be removed two versions later
* not used anymore in the TYPO3 CMS Core
*/
@@ -306,7 +306,7 @@ class StagesService {
* Gets next stage in process for given stage id
*
* @param int $stageId Id of the stage to fetch the next one for
- * @return integer The next stage Id
+ * @return int The next stage Id
* @throws \InvalidArgumentException
*/
public function getNextStage($stageId) {
@@ -373,7 +373,7 @@ class StagesService {
* Get next stage in process for given stage id
*
* @param int $stageId Id of the stage to fetch the previous one for
- * @return integer The previous stage Id
+ * @return int The previous stage Id
* @throws \InvalidArgumentException
*/
public function getPrevStage($stageId) {
@@ -641,7 +641,7 @@ class StagesService {
* Check if the user has access to the previous stage, relative to the given stage
*
* @param int $stageId
- * @return boolean
+ * @return bool
*/
public function isPrevStageAllowedForUser($stageId) {
$isAllowed = FALSE;
@@ -663,7 +663,7 @@ class StagesService {
* Check if the user has access to the next stage, relative to the given stage
*
* @param int $stageId
- * @return boolean
+ * @return bool
*/
public function isNextStageAllowedForUser($stageId) {
$isAllowed = FALSE;
@@ -683,7 +683,7 @@ class StagesService {
/**
* @param $stageId
- * @return boolean
+ * @return bool
*/
protected function isStageAllowedForUser($stageId) {
$cacheKey = $this->getWorkspaceId() . '_' . $stageId;
@@ -701,7 +701,7 @@ class StagesService {
* Determines whether a stage Id is valid.
*
* @param int $stageId The stage Id to be checked
- * @return boolean
+ * @return bool
*/
public function isValid($stageId) {
$isValid = FALSE;
@@ -724,7 +724,7 @@ class StagesService {
* 2 = notify all responsible users (all users are checked and nothing can be changed during stage change)
*
* @param int $stageId Stage id to return the notification mode for
- * @return integer
+ * @return int
* @throws \InvalidArgumentException
*/
public function getNotificationMode($stageId) {
diff --git a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
index 0a0c721dd067..5f213363d106 100644
--- a/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
+++ b/typo3/sysext/workspaces/Classes/Service/WorkspaceService.php
@@ -60,7 +60,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
/**
* Gets the current workspace ID.
*
- * @return integer The current workspace ID
+ * @return int The current workspace ID
*/
public function getCurrentWorkspace() {
$workspaceId = $GLOBALS['BE_USER']->workspace;
@@ -432,7 +432,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param string $table Name of the table
* @param array $record Record row to be checked
- * @return boolean
+ * @return bool
*/
protected function isLanguageAccessibleForCurrentUser($table, array $record) {
$languageUid = 0;
@@ -448,7 +448,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
* Trivial check to see if the user already migrated his workspaces
* to the new style (either manually or with the migrator scripts)
*
- * @return boolean
+ * @return bool
*/
static public function isOldStyleWorkspaceUsed() {
$oldStyleWorkspaceIsUsed = FALSE;
@@ -470,7 +470,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param int $id Primary key of the page to check
* @param int $language Language for which to check the page
- * @return boolean
+ * @return bool
*/
static public function isNewPage($id, $language = 0) {
$isNewPage = FALSE;
@@ -551,7 +551,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @param int $pageUid
* @param int $workspaceUid
- * @return boolean
+ * @return bool
*/
public function canCreatePreviewLink($pageUid, $workspaceUid) {
$result = TRUE;
@@ -624,7 +624,7 @@ class WorkspaceService implements \TYPO3\CMS\Core\SingletonInterface {
*
* @throws \InvalidArgumentException
* @param int $uid
- * @return integer
+ * @return int
*/
public function getLivePageUid($uid) {
if (!isset($this->pageCache[$uid])) {
diff --git a/typo3/sysext/workspaces/Classes/Task/AutoPublishTask.php b/typo3/sysext/workspaces/Classes/Task/AutoPublishTask.php
index 431a3c1d1bbd..ef71a222c954 100644
--- a/typo3/sysext/workspaces/Classes/Task/AutoPublishTask.php
+++ b/typo3/sysext/workspaces/Classes/Task/AutoPublishTask.php
@@ -27,7 +27,7 @@ class AutoPublishTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
* Call on the workspace logic to publish workspaces whose publication date
* is in the past
*
- * @return boolean
+ * @return bool
*/
public function execute() {
$autopubObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Workspaces\\Service\\AutoPublishService');
diff --git a/typo3/sysext/workspaces/Classes/Task/CleanupPreviewLinkTask.php b/typo3/sysext/workspaces/Classes/Task/CleanupPreviewLinkTask.php
index ce89634e7f68..a2819dc2e3ec 100644
--- a/typo3/sysext/workspaces/Classes/Task/CleanupPreviewLinkTask.php
+++ b/typo3/sysext/workspaces/Classes/Task/CleanupPreviewLinkTask.php
@@ -25,7 +25,7 @@ class CleanupPreviewLinkTask extends \TYPO3\CMS\Scheduler\Task\AbstractTask {
* Cleanup old preview links.
* endtime < $GLOBALS['EXEC_TIME']
*
- * @return boolean
+ * @return bool
*/
public function execute() {
$GLOBALS['TYPO3_DB']->exec_DELETEquery('sys_preview', 'endtime < ' . (int)$GLOBALS['EXEC_TIME']);
--
GitLab