[TASK] Prepare core tests for phpunit v8 32/60732/7
authorAnja Leichsenring <anja.leichsenring@typo3.com>
Sat, 11 May 2019 18:07:52 +0000 (20:07 +0200)
committerAndreas Fernandez <a.fernandez@scripting-base.de>
Wed, 15 May 2019 06:53:35 +0000 (08:53 +0200)
Resolves: #88335
Releases: master, 9.5
Change-Id: I40569702c9cec50aa9150c666488c7a71c28b47b
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60732
Tested-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
408 files changed:
typo3/sysext/adminpanel/Tests/Unit/Modules/PreviewModuleTest.php
typo3/sysext/adminpanel/Tests/Unit/Service/ConfigurationServiceTest.php
typo3/sysext/backend/Tests/Functional/Controller/FormInlineAjaxControllerTest.php
typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/EditRecordViewHelperTest.php
typo3/sysext/backend/Tests/Functional/ViewHelpers/Link/NewRecordViewHelperTest.php
typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/EditRecordViewHelperTest.php
typo3/sysext/backend/Tests/Functional/ViewHelpers/Uri/NewRecordViewHelperTest.php
typo3/sysext/backend/Tests/Unit/Configuration/BackendUserConfigurationTest.php
typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
typo3/sysext/backend/Tests/Unit/Controller/File/ThumbnailControllerTest.php
typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php
typo3/sysext/backend/Tests/Unit/Form/Container/PaletteAndSingleContainerTest.php
typo3/sysext/backend/Tests/Unit/Form/Element/InputDateTimeElementTest.php
typo3/sysext/backend/Tests/Unit/Form/Element/InputHiddenElementTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataCompilerTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/FlexFormSegmentTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/OnTheFlyTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/SiteConfigurationTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaDatabaseRecordTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaInputPlaceholderRecordTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataGroup/TcaSelectTreeAjaxFieldDataTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseDefaultLanguagePageRowTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEditRowTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEffectivePidTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseLanguageRowsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabasePageLanguageOverlayRowsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseParentPageRowTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordOverrideValuesTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordTypeValueTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRowDefaultValuesTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUniqueUidNewRowTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseUserPermissionCheckTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InitializeProcessedTcaTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/InlineOverrideChildTcaTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/PageTsConfigMergedTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/ParentPageTcaTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/SiteDatabaseEditRowTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaCheckboxItemsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsOverridesTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsProcessPlaceholdersTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaColumnsRemoveUnusedTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexPrepareTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaFlexProcessTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineIsOnSymmetricSideTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaInlineTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRadioItemsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaRecordTitleTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaSelectItemsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/TcaTypesShowitemTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/UserTsConfigTest.php
typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php
typo3/sysext/backend/Tests/Unit/Http/RouteDispatcherTest.php
typo3/sysext/backend/Tests/Unit/Module/ModuleLoaderTest.php
typo3/sysext/backend/Tests/Unit/View/BackendLayout/DataProviderCollectionTest.php
typo3/sysext/backend/Tests/Unit/View/BackendLayoutViewTest.php
typo3/sysext/backend/Tests/UnitDeprecated/Form/FormDataProvider/TcaFlexPrepareTest.php
typo3/sysext/belog/Tests/Unit/Domain/Model/ConstraintTest.php
typo3/sysext/belog/Tests/Unit/Domain/Model/LogEntryTest.php
typo3/sysext/beuser/Tests/Unit/Controller/BackendUserControllerTest.php
typo3/sysext/beuser/Tests/Unit/Domain/Model/BackendUserTest.php
typo3/sysext/beuser/Tests/Unit/Domain/Model/DemandTest.php
typo3/sysext/core/Tests/Functional/Authentication/AuthenticationServiceTest.php
typo3/sysext/core/Tests/Functional/Cache/Backend/MemcachedBackendTest.php
typo3/sysext/core/Tests/Functional/Cache/Backend/RedisBackendTest.php
typo3/sysext/core/Tests/Functional/Category/Collection/CategoryCollectionTest.php
typo3/sysext/core/Tests/Functional/Collection/RecordCollectionRepositoryTest.php
typo3/sysext/core/Tests/Functional/DataHandling/AbstractDataHandlerActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTest.php
typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/GetUniqueTranslationTest.php
typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/HookTest.php
typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/SpecialLanguagesTest.php
typo3/sysext/core/Tests/Functional/DataHandling/DataResolving/PlainDataResolverTest.php
typo3/sysext/core/Tests/Functional/DataHandling/FAL/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/Group/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/DataHandling/Regular/CheckValueTest.php
typo3/sysext/core/Tests/Functional/DataHandling/Regular/CheckValueTestForCheckboxes.php
typo3/sysext/core/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
typo3/sysext/core/Tests/Functional/DataHandling/Regular/MultiSiteTest.php
typo3/sysext/core/Tests/Functional/DataHandling/Select/AbstractActionTestCase.php
typo3/sysext/core/Tests/Functional/Database/Schema/SchemaMigratorTest.php
typo3/sysext/core/Tests/Functional/IO/PharStreamWrapperInterceptorTest.php
typo3/sysext/core/Tests/Functional/Imaging/ImageMagickFileTest.php
typo3/sysext/core/Tests/Functional/Page/PageRendererTest.php
typo3/sysext/core/Tests/Functional/Resource/ResourceStorageTest.php
typo3/sysext/core/Tests/Functional/Session/Backend/DatabaseSessionBackendTest.php
typo3/sysext/core/Tests/Functional/Session/Backend/RedisSessionBackendTest.php
typo3/sysext/core/Tests/Functional/Session/SessionManagerTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/FileBackendTest.php
typo3/sysext/core/Tests/Unit/Category/CategoryRegistryTest.php
typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
typo3/sysext/core/Tests/Unit/Console/CommandRegistryTest.php
typo3/sysext/core/Tests/Unit/Core/SystemEnvironmentBuilderTest.php
typo3/sysext/core/Tests/Unit/Crypto/PasswordHashing/Argon2iPasswordHashTest.php
typo3/sysext/core/Tests/Unit/Crypto/PasswordHashing/BcryptPasswordHashTest.php
typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
typo3/sysext/core/Tests/Unit/DataHandling/Localization/StateTest.php
typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Expression/ExpressionBuilderTest.php
typo3/sysext/core/Tests/Unit/Database/Query/Restriction/AbstractRestrictionTestCase.php
typo3/sysext/core/Tests/Unit/Database/RelationHandlerTest.php
typo3/sysext/core/Tests/Unit/Database/Schema/ConnectionMigratorTest.php
typo3/sysext/core/Tests/Unit/Database/Schema/DefaultTcaSchemaSqliteTest.php
typo3/sysext/core/Tests/Unit/Database/Schema/DefaultTcaSchemaTest.php
typo3/sysext/core/Tests/Unit/Database/Schema/Parser/TableBuilderTest.php
typo3/sysext/core/Tests/Unit/Database/Schema/Types/EnumTypeTest.php
typo3/sysext/core/Tests/Unit/Database/Schema/Types/SetTypeTest.php
typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
typo3/sysext/core/Tests/Unit/ExpressionLanguage/ResolverTest.php
typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
typo3/sysext/core/Tests/Unit/FormProtection/FormProtectionFactoryTest.php
typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
typo3/sysext/core/Tests/Unit/Html/HtmlParserTest.php
typo3/sysext/core/Tests/Unit/Http/MessageTest.php
typo3/sysext/core/Tests/Unit/Http/RequestTest.php
typo3/sysext/core/Tests/Unit/Http/ResponseTest.php
typo3/sysext/core/Tests/Unit/Http/ServerRequestTest.php
typo3/sysext/core/Tests/Unit/Http/StreamTest.php
typo3/sysext/core/Tests/Unit/Http/UploadedFileTest.php
typo3/sysext/core/Tests/Unit/Imaging/DimensionTest.php
typo3/sysext/core/Tests/Unit/Imaging/IconFactoryTest.php
typo3/sysext/core/Tests/Unit/Imaging/IconProvider/BitmapIconProviderTest.php
typo3/sysext/core/Tests/Unit/Imaging/IconProvider/FontawesomeIconProviderTest.php
typo3/sysext/core/Tests/Unit/Imaging/IconProvider/SvgIconProviderTest.php
typo3/sysext/core/Tests/Unit/Imaging/IconRegistryTest.php
typo3/sysext/core/Tests/Unit/Imaging/IconTest.php
typo3/sysext/core/Tests/Unit/Imaging/ImageManipulation/CropVariantTest.php
typo3/sysext/core/Tests/Unit/Localization/LocalizationFactoryTest.php
typo3/sysext/core/Tests/Unit/Localization/Parser/LocallangXmlParserTest.php
typo3/sysext/core/Tests/Unit/Localization/Parser/XliffParserTest.php
typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php
typo3/sysext/core/Tests/Unit/Log/LogRecordTest.php
typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionProcessorTest.php
typo3/sysext/core/Tests/Unit/Mail/MailMessageTest.php
typo3/sysext/core/Tests/Unit/Mail/MailerTest.php
typo3/sysext/core/Tests/Unit/Mail/TransportFactoryTest.php
typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
typo3/sysext/core/Tests/Unit/Messaging/Renderer/BootstrapRendererTest.php
typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
typo3/sysext/core/Tests/Unit/Package/PackageTest.php
typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
typo3/sysext/core/Tests/Unit/Resource/Collection/FileCollectionRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractDriverTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractHierarchicalFilesystemDriverTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/DriverRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
typo3/sysext/core/Tests/Unit/Resource/FileTest.php
typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
typo3/sysext/core/Tests/Unit/Resource/OnlineMedia/Helpers/VimeoHelperTest.php
typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
typo3/sysext/core/Tests/Unit/Resource/Repository/AbstractRepositoryTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorIntegrationTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
typo3/sysext/core/Tests/Unit/Routing/Aspect/AspectFactoryTest.php
typo3/sysext/core/Tests/Unit/Routing/Enhancer/VariableProcessorTest.php
typo3/sysext/core/Tests/Unit/Service/MarkerBasedTemplateServiceTest.php
typo3/sysext/core/Tests/Unit/Session/Backend/RedisSessionBackendTest.php
typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/TreeDataProviderFactoryTest.php
typo3/sysext/core/Tests/Unit/TypoScript/Parser/TypoScriptParserTest.php
typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
typo3/sysext/core/Tests/Unit/Utility/DebugUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/StringUtilityTest.php
typo3/sysext/core/Tests/Unit/ViewHelpers/IconForRecordViewHelperTest.php
typo3/sysext/core/Tests/Unit/ViewHelpers/IconViewHelperTest.php
typo3/sysext/core/Tests/UnitDeprecated/Compatibility/PublicPropertyDeprecationTraitTest.php
typo3/sysext/extbase/Classes/Persistence/Generic/PersistenceManager.php
typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerTest.php
typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ControllerArgumentsMappingTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/AddTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/CountTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/EnableFieldsTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/Generic/Mapper/DataMapperTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/InTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/IsDirtyTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/OperatorTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/QueryLocalizedDataTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/QueryParserTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/TranslatedContentTest.php
typo3/sysext/extbase/Tests/Functional/Persistence/TranslationTest.php
typo3/sysext/extbase/Tests/Functional/Validation/ValidatorResolverTest.php
typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserGroupTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/BackendUserTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/CategoryTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FileMountTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserGroupTest.php
typo3/sysext/extbase/Tests/Unit/Domain/Model/FrontendUserTest.php
typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ArgumentTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/View/JsonViewTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Web/CacheHashEnforcerTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbBackendTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Typo3QuerySettingsTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Property/PropertyMappingConfigurationTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ArrayConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/BooleanConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/DateTimeConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/FloatConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/IntegerConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/StringConverterTest.php
typo3/sysext/extbase/Tests/Unit/Reflection/ObjectAccessTest.php
typo3/sysext/extbase/Tests/Unit/Security/Cryptography/HashServiceTest.php
typo3/sysext/extbase/Tests/Unit/Service/CacheServiceTest.php
typo3/sysext/extbase/Tests/Unit/Service/ExtensionServiceTest.php
typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php
typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
typo3/sysext/extbase/Tests/Unit/Utility/DebuggerUtilityTest.php
typo3/sysext/extbase/Tests/Unit/Utility/ExtensionUtilityTest.php
typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/FloatValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/IntegerValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/NotEmptyValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/NumberValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/TextValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/UrlValidatorTest.php
typo3/sysext/extbase/Tests/UnitDeprecated/Reflection/ObjectAccessTest.php
typo3/sysext/extbase/Tests/UnitDeprecated/Utility/ExtensionUtilityTest.php
typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/EmConfUtilityTest.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/ListUtilityTest.php
typo3/sysext/felogin/Tests/Unit/Controller/FrontendLoginControllerTest.php
typo3/sysext/felogin/Tests/Unit/Validation/RedirectUrlValidatorTest.php
typo3/sysext/fluid/Tests/Functional/View/TemplatesPathsTest.php
typo3/sysext/fluid/Tests/Functional/ViewHelpers/TypolinkViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/Core/Rendering/RenderingContextTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetContextTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestBuilderTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/WidgetRequestHandlerTest.php
typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/LinkViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfAuthenticatedViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/Security/IfHasRoleViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/UriViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/CObjectViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/FlashMessagesViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/ButtonViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/CheckboxViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/FormFieldViewHelperBaseTestcase.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/HiddenViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/PasswordViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/RadioViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SubmitViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextareaViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/TextfieldViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/UploadViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/FormViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/BytesViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CaseViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CurrencyViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesDecodeViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/HtmlentitiesViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/Nl2brViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/NumberViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/PaddingViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/StripTagsViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/UrlencodeViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/ImageViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/EmailViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/ExternalViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/PageViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfAuthenticatedViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Security/IfHasRoleViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/EmailViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/ExternalViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/PageViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
typo3/sysext/form/Tests/Functional/Hooks/FormFileExtensionUpdateTest.php
typo3/sysext/form/Tests/Unit/Controller/FormEditorControllerTest.php
typo3/sysext/form/Tests/Unit/Controller/FormFrontendControllerTest.php
typo3/sysext/form/Tests/Unit/Domain/Configuration/FormDefinitionValidationServiceTest.php
typo3/sysext/form/Tests/Unit/Domain/FormElements/SectionTest.php
typo3/sysext/form/Tests/Unit/Hooks/DataStructureIdentifierHookTest.php
typo3/sysext/form/Tests/Unit/Mvc/Configuration/InheritancesResolverServiceTest.php
typo3/sysext/form/Tests/Unit/Mvc/Property/PropertyMappingConfigurationTest.php
typo3/sysext/form/Tests/Unit/Mvc/Property/TypeConverter/FormDefinitionArrayConverterTest.php
typo3/sysext/form/Tests/Unit/Service/TranslationServiceTest.php
typo3/sysext/form/Tests/Unit/ViewHelpers/Form/DatePickerViewHelperTest.php
typo3/sysext/frontend/Tests/Functional/ContentObject/ContentObjectRendererTest.php
typo3/sysext/frontend/Tests/Functional/Controller/TypoScriptFrontendControllerTest.php
typo3/sysext/frontend/Tests/Functional/Page/PageRepositoryTest.php
typo3/sysext/frontend/Tests/Functional/Rendering/LocalizedContentRenderingTest.php
typo3/sysext/frontend/Tests/Functional/Rendering/LocalizedSiteContentRenderingTest.php
typo3/sysext/frontend/Tests/Functional/Rendering/TitleTagRenderingTest.php
typo3/sysext/frontend/Tests/Functional/Rendering/UriPrefixRenderingTest.php
typo3/sysext/frontend/Tests/Functional/SiteHandling/EnhancerLinkGeneratorTest.php
typo3/sysext/frontend/Tests/Functional/SiteHandling/EnhancerSiteRequestTest.php
typo3/sysext/frontend/Tests/Functional/SiteHandling/LinkGeneratorTest.php
typo3/sysext/frontend/Tests/Functional/SiteHandling/PlainRequestTest.php
typo3/sysext/frontend/Tests/Functional/SiteHandling/SiteRequestTest.php
typo3/sysext/frontend/Tests/Functional/SiteHandling/SlugLinkGeneratorTest.php
typo3/sysext/frontend/Tests/Functional/SiteHandling/SlugSiteRequestTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/ContentDataProcessorTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/AbstractMenuContentObjectTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/Menu/MenuContentObjectFactoryTest.php
typo3/sysext/frontend/Tests/Unit/Controller/ErrorControllerTest.php
typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
typo3/sysext/frontend/Tests/Unit/Middleware/PageResolverTest.php
typo3/sysext/frontend/Tests/Unit/Middleware/SiteBaseRedirectResolverTest.php
typo3/sysext/frontend/Tests/Unit/Middleware/SiteResolverTest.php
typo3/sysext/frontend/Tests/Unit/Page/CacheHashCalculatorTest.php
typo3/sysext/frontend/Tests/Unit/Page/PageRepositoryTest.php
typo3/sysext/frontend/Tests/Unit/Plugin/AbstractPluginTest.php
typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php
typo3/sysext/frontend/Tests/Unit/Service/TypoLinkCodecServiceTest.php
typo3/sysext/frontend/Tests/Unit/Typolink/AbstractTypolinkBuilderTest.php
typo3/sysext/impexp/Tests/Functional/AbstractImportExportTestCase.php
typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentTest.php
typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentWithImagesTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
typo3/sysext/install/Tests/Unit/UpgradeAnalysis/DocumentationFileTest.php
typo3/sysext/install/Tests/Unit/ViewHelpers/Format/PhpErrorCodeViewHelperTest.php
typo3/sysext/lowlevel/Tests/Unit/Utility/ArrayBrowserTest.php
typo3/sysext/opendocs/Tests/Unit/Service/OpenDocumentServiceTest.php
typo3/sysext/recordlist/Tests/Unit/RecordList/DatabaseRecordListTest.php
typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php
typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php
typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php
typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
typo3/sysext/redirects/Tests/Unit/Service/RedirectServiceTest.php
typo3/sysext/reports/Tests/Unit/Report/ServicesListReportTest.php
typo3/sysext/reports/Tests/Unit/Report/Status/Typo3StatusTest.php
typo3/sysext/scheduler/Tests/Unit/CronCommand/CronCommandTest.php
typo3/sysext/scheduler/Tests/Unit/CronCommand/NormalizeCommandTest.php
typo3/sysext/seo/Tests/Functional/HrefLang/HrefLangGeneratorTest.php
typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapIndexTest.php
typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapPagesTest.php
typo3/sysext/seo/Tests/Functional/XmlSitemap/XmlSitemapRecordsTest.php
typo3/sysext/seo/Tests/Unit/XmlSitemap/PagesXmlSitemapDataProviderTest.php
typo3/sysext/t3editor/Tests/Unit/Registry/AddonRegistryTest.php
typo3/sysext/t3editor/Tests/Unit/Registry/ModeRegistryTest.php
typo3/sysext/workspaces/Tests/Functional/ActionHandler/ActionHandlerTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/FAL/AbstractActionTestCase.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/Group/AbstractActionTestCase.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/AbstractActionTestCase.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Modify/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/Publish/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/CSV/PublishAll/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/AbstractActionTestCase.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Modify/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/Publish/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/IRRE/ForeignField/PublishAll/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/ManyToMany/AbstractActionTestCase.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/AbstractActionTestCase.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Modify/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/Publish/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/Regular/PublishAll/ActionTest.php
typo3/sysext/workspaces/Tests/Functional/DataHandling/Select/AbstractActionTestCase.php
typo3/sysext/workspaces/Tests/Functional/Service/WorkspaceServiceTest.php
typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceStageVisibleFieldsTest.php
typo3/sysext/workspaces/Tests/Functional/Tca/WorkspaceVisibleFieldsTest.php

index ca87cbc..adbb720 100644 (file)
@@ -24,7 +24,7 @@ class PreviewModuleTest extends UnitTestCase
                 (new \DateTime('2018-01-01 12:00:00 UTC'))->getTimestamp(),
             ],
             'timestamp' => [
-                (new \DateTime('2018-01-01 12:00:15 UTC'))->getTimestamp(),
+                (string)(new \DateTime('2018-01-01 12:00:15 UTC'))->getTimestamp(),
                 (int)(new \DateTime('2018-01-01 12:00:15 UTC'))->getTimestamp(),
                 (int)(new \DateTime('2018-01-01 12:00:00 UTC'))->getTimestamp(),
             ],
index 9825d04..7753a2a 100644 (file)
@@ -18,7 +18,7 @@ class ConfigurationServiceTest extends UnitTestCase
      */
     protected $beUserProphecy;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->beUserProphecy = $this->prophesize(BackendUserAuthentication::class);
index 0e54d0c..eb97d9e 100644 (file)
@@ -41,7 +41,7 @@ class FormInlineAjaxControllerTest extends FunctionalTestCase
     /**
      * Sets up this test case.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
index aeea623..3945a8f 100644 (file)
@@ -34,8 +34,8 @@ class EditRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Link/EditRecordViewHelper/WithUidAndTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[a_table][42]=edit', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[a_table][42]=edit', $result);
     }
 
     /**
@@ -47,8 +47,8 @@ class EditRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Link/EditRecordViewHelper/InlineWithUidAndTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[b_table][21]=edit', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[b_table][21]=edit', $result);
     }
 
     /**
@@ -60,9 +60,9 @@ class EditRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Link/EditRecordViewHelper/WithUidTableAndReturnUrl.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[c_table][43]=edit', $result);
-        $this->assertContains('returnUrl=foo/bar', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[c_table][43]=edit', $result);
+        $this->assertStringContainsString('returnUrl=foo/bar', $result);
     }
 
     /**
index 1c4bfa1..99a6c26 100644 (file)
@@ -34,8 +34,8 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Link/NewRecordViewHelper/WithPidAndTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[a_table][17]=new', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[a_table][17]=new', $result);
     }
 
     /**
@@ -47,8 +47,8 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Link/NewRecordViewHelper/WithTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[a_table][0]=new', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[a_table][0]=new', $result);
     }
 
     /**
@@ -60,8 +60,8 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Link/NewRecordViewHelper/InlineWithPidAndTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[b_table][17]=new', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[b_table][17]=new', $result);
     }
 
     /**
@@ -73,9 +73,9 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Link/NewRecordViewHelper/WithPidTableAndReturnUrl.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[c_table][17]=new', $result);
-        $this->assertContains('returnUrl=foo/bar', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[c_table][17]=new', $result);
+        $this->assertStringContainsString('returnUrl=foo/bar', $result);
     }
 
     /**
@@ -87,8 +87,8 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Link/NewRecordViewHelper/WithNegativeUid.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[c_table][-11]=new', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[c_table][-11]=new', $result);
     }
 
     /**
index bfcf0bd..61451df 100644 (file)
@@ -34,8 +34,8 @@ class EditRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Uri/EditRecordViewHelper/WithUidAndTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[a_table][42]=edit', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[a_table][42]=edit', $result);
     }
 
     /**
@@ -47,8 +47,8 @@ class EditRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Uri/EditRecordViewHelper/InlineWithUidAndTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[b_table][21]=edit', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[b_table][21]=edit', $result);
     }
 
     /**
@@ -60,9 +60,9 @@ class EditRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Uri/EditRecordViewHelper/WithUidTableAndReturnUrl.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[c_table][43]=edit', $result);
-        $this->assertContains('returnUrl=foo/bar', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[c_table][43]=edit', $result);
+        $this->assertStringContainsString('returnUrl=foo/bar', $result);
     }
 
     /**
index 82f5915..b15a18e 100644 (file)
@@ -34,8 +34,8 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Uri/NewRecordViewHelper/WithPidAndTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[a_table][17]=new', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[a_table][17]=new', $result);
     }
 
     /**
@@ -47,8 +47,8 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Uri/NewRecordViewHelper/WithTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[a_table][0]=new', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[a_table][0]=new', $result);
     }
 
     /**
@@ -60,8 +60,8 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Uri/NewRecordViewHelper/InlineWithPidAndTable.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[b_table][17]=new', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[b_table][17]=new', $result);
     }
 
     /**
@@ -73,9 +73,9 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Uri/NewRecordViewHelper/WithPidTableAndReturnUrl.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[c_table][17]=new', $result);
-        $this->assertContains('returnUrl=foo/bar', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[c_table][17]=new', $result);
+        $this->assertStringContainsString('returnUrl=foo/bar', $result);
     }
 
     /**
@@ -87,8 +87,8 @@ class NewRecordViewHelperTest extends FunctionalTestCase
         $view->setTemplatePathAndFilename('EXT:backend/Tests/Functional/ViewHelpers/Fixtures/Uri/NewRecordViewHelper/WithNegativeUid.html');
         $result = urldecode($view->render());
 
-        $this->assertContains('route=/record/edit', $result);
-        $this->assertContains('edit[c_table][-11]=new', $result);
+        $this->assertStringContainsString('route=/record/edit', $result);
+        $this->assertStringContainsString('edit[c_table][-11]=new', $result);
     }
 
     /**
index 5dc55ae..fad943e 100644 (file)
@@ -37,7 +37,7 @@ class BackendUserConfigurationTest extends UnitTestCase
     /**
      * Set up this testcase
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         /** @var BackendUserAuthentication|\Prophecy\Prophecy\ObjectProphecy */
         $this->backendUser = $this->prophesize(BackendUserAuthentication::class);
index ee3414d..9090d7f 100644 (file)
@@ -57,7 +57,7 @@ class FileControllerTest extends UnitTestCase
     /**
      * Sets up this test case.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->fileResourceMock = $this->getMockBuilder(\TYPO3\CMS\Core\Resource\File::class)
             ->setMethods(['toArray', 'getModificationTime', 'getExtension'])
index 6044fc9..f6f26e2 100644 (file)
@@ -41,7 +41,7 @@ class ThumbnailControllerTest extends UnitTestCase
         ],
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']
             = '4408d27a916d51e624b69af3554f516dbab61037a9f7b9fd6f81b4d3bedeccb6';
index ec06f91..47c2033 100644 (file)
@@ -52,7 +52,7 @@ class LoginControllerTest extends UnitTestCase
     /**
      * @throws \InvalidArgumentException
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->loginControllerMock = $this->getAccessibleMock(LoginController::class, ['dummy'], [], '', false);
     }
index 78b1fa3..ffc1823 100644 (file)
@@ -82,7 +82,7 @@ class PaletteAndSingleContainerTest extends UnitTestCase
         $nodeFactoryProphecy->create($expectedChildDataArray)->willReturn($singleFieldContainerProphecy->reveal());
         $containerResult = (new PaletteAndSingleContainer($nodeFactoryProphecy->reveal(), $input))->render();
         // Expect label is in answer HTML
-        $this->assertContains($labelReference, $containerResult['html']);
+        $this->assertStringContainsString($labelReference, $containerResult['html']);
     }
 
     /**
@@ -140,7 +140,7 @@ class PaletteAndSingleContainerTest extends UnitTestCase
         $nodeFactoryProphecy->create($expectedChildDataArray)->willReturn($singleFieldContainerProphecy->reveal());
         $containerResult = (new PaletteAndSingleContainer($nodeFactoryProphecy->reveal(), $input))->render();
         // Expect label is in answer HTML
-        $this->assertContains($labelReference, $containerResult['html']);
+        $this->assertStringContainsString($labelReference, $containerResult['html']);
     }
 
     /**
@@ -199,6 +199,6 @@ class PaletteAndSingleContainerTest extends UnitTestCase
         $nodeFactoryProphecy->create($expectedChildDataArray)->willReturn($singleFieldContainerProphecy->reveal());
         $containerResult = (new PaletteAndSingleContainer($nodeFactoryProphecy->reveal(), $input))->render();
         // Expect label is in answer HTML
-        $this->assertContains($labelReferenceFieldArray, $containerResult['html']);
+        $this->assertStringContainsString($labelReferenceFieldArray, $containerResult['html']);
     }
 }
index a949395..d6f6afa 100644 (file)
@@ -41,7 +41,7 @@ class InputDateTimeElementTest extends UnitTestCase
      * current timezone setting, set it to UTC explicitly and reconstitute it
      * again in tearDown()
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->timezoneBackup = date_default_timezone_get();
     }
@@ -49,7 +49,7 @@ class InputDateTimeElementTest extends UnitTestCase
     /**
      * Tear down
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         date_default_timezone_set($this->timezoneBackup);
         parent::tearDown();
@@ -133,6 +133,6 @@ class InputDateTimeElementTest extends UnitTestCase
         $GLOBALS['LANG'] = $languageService->reveal();
         $subject = new InputDateTimeElement($nodeFactoryProphecy->reveal(), $data);
         $result = $subject->render();
-        $this->assertContains('<input type="hidden" name="myItemFormElName" value="' . $expectedOutput . '" />', $result['html']);
+        $this->assertStringContainsString('<input type="hidden" name="myItemFormElName" value="' . $expectedOutput . '" />', $result['html']);
     }
 }
index c61738a..5c331cf 100644 (file)
@@ -37,8 +37,8 @@ class InputHiddenElementTest extends UnitTestCase
         $subject->_set('data', $data);
         $result = $subject->render();
         $additionalHiddenFieldsResult = array_pop($result['additionalHiddenFields']);
-        $this->assertContains('name="foo"', $additionalHiddenFieldsResult);
-        $this->assertContains('value="bar"', $additionalHiddenFieldsResult);
-        $this->assertContains('type="hidden"', $additionalHiddenFieldsResult);
+        $this->assertStringContainsString('name="foo"', $additionalHiddenFieldsResult);
+        $this->assertStringContainsString('value="bar"', $additionalHiddenFieldsResult);
+        $this->assertStringContainsString('type="hidden"', $additionalHiddenFieldsResult);
     }
 }
index 4c4f4a2..f1099ef 100644 (file)
@@ -35,7 +35,7 @@ class FormDataCompilerTest extends UnitTestCase
      */
     protected $formDataGroupProphecy;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->formDataGroupProphecy = $this->prophesize(FormDataGroupInterface::class);
         $this->subject = new FormDataCompiler($this->formDataGroupProphecy->reveal());
index 5654746..e154080 100644 (file)
@@ -32,7 +32,7 @@ class FlexFormSegmentTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new FlexFormSegment();
     }
index a0b7316..7906f4b 100644 (file)
@@ -31,7 +31,7 @@ class OnTheFlyTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new OnTheFly();
     }
index 079b94d..12d2ec1 100644 (file)
@@ -34,7 +34,7 @@ class SiteConfigurationTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new SiteConfigurationDataGroup();
     }
index 488e696..962ee43 100644 (file)
@@ -32,7 +32,7 @@ class TcaDatabaseRecordTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new TcaDatabaseRecord();
     }
index b4029e0..6361da8 100644 (file)
@@ -32,7 +32,7 @@ class TcaInputPlaceholderRecordTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new TcaInputPlaceholderRecord();
     }
index 90a7863..eed4287 100644 (file)
@@ -32,7 +32,7 @@ class TcaSelectTreeAjaxFieldDataTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new TcaSelectTreeAjaxFieldData();
     }
index b9aab4e..2e75149 100644 (file)
@@ -28,7 +28,7 @@ class DatabaseDefaultLanguagePageRowTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $GLOBALS['TCA']['pages']['ctrl']['transOrigPointerField'] = 'l10n_parent';
         $this->subject = $this->getMockBuilder(DatabaseDefaultLanguagePageRow::class)
index 322f567..5a062ba 100644 (file)
@@ -28,7 +28,7 @@ class DatabaseEditRowTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = $this->getMockBuilder(DatabaseEditRow::class)
             ->setMethods(['getDatabaseRow'])
index fea331c..a64cd5b 100644 (file)
@@ -27,7 +27,7 @@ class DatabaseEffectivePidTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new DatabaseEffectivePid();
     }
index e4ca0d5..23e6aff 100644 (file)
@@ -37,7 +37,7 @@ class DatabaseLanguageRowsTest extends UnitTestCase
      */
     protected $beUserProphecy;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->beUserProphecy = $this->prophesize(BackendUserAuthentication::class);
         $GLOBALS['BE_USER'] = $this->beUserProphecy;
index 6328aba..7af03e9 100644 (file)
@@ -27,7 +27,7 @@ class DatabasePageLanguageOverlayRowsTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = $this->getMockBuilder(DatabasePageLanguageOverlayRows::class)
             ->setMethods(['getDatabaseRows'])
index 6de0b30..2b1e1f3 100644 (file)
@@ -27,7 +27,7 @@ class DatabaseParentPageRowTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = $this->getMockBuilder(DatabaseParentPageRow::class)
             ->setMethods(['getDatabaseRow'])
index c2980d7..b50386f 100644 (file)
@@ -27,7 +27,7 @@ class DatabaseRecordOverrideValuesTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new DatabaseRecordOverrideValues();
     }
index 07b8c72..ed457aa 100644 (file)
@@ -27,7 +27,7 @@ class DatabaseRecordTypeValueTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = $this->getMockBuilder(DatabaseRecordTypeValue::class)
             ->setMethods(['getDatabaseRow'])
index fc59787..06006fb 100644 (file)
@@ -27,8 +27,9 @@ class DatabaseRowDefaultValuesTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new DatabaseRowDefaultValues();
     }
 
index 108cc03..7f51642 100644 (file)
@@ -27,8 +27,9 @@ class DatabaseUniqueUidNewRowTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new DatabaseUniqueUidNewRow();
     }
 
index e9594e5..204c649 100644 (file)
@@ -38,8 +38,9 @@ class DatabaseUserPermissionCheckTest extends UnitTestCase
      */
     protected $beUserProphecy;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->beUserProphecy = $this->prophesize(BackendUserAuthentication::class);
         $GLOBALS['BE_USER'] = $this->beUserProphecy->reveal();
         $GLOBALS['BE_USER']->user['uid'] = 42;
index 31fc50b..88c8538 100644 (file)
@@ -27,8 +27,9 @@ class InitializeProcessedTcaTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new InitializeProcessedTca();
     }
 
index 16fcd23..345ca63 100644 (file)
@@ -27,8 +27,9 @@ class InlineOverrideChildTcaTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new InlineOverrideChildTca();
     }
 
index 0ea0d3e..3b01ccc 100644 (file)
@@ -27,8 +27,9 @@ class PageTsConfigMergedTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new PageTsConfigMerged();
     }
 
index 258afc2..784f9d8 100644 (file)
@@ -27,8 +27,9 @@ class ParentPageTcaTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new ParentPageTca();
     }
 
index 5b3d62b..942e212 100644 (file)
@@ -30,7 +30,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class SiteDatabaseEditRowTest extends UnitTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         $this->backupEnvironment = true;
         parent::setUp();
index 3ea9d26..424b6ae 100644 (file)
@@ -32,7 +32,7 @@ class TcaCheckboxItemsTest extends UnitTestCase
     /**
      * Tear down
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         GeneralUtility::purgeInstances();
         parent::tearDown();
index 18cd0b8..89bda1e 100644 (file)
@@ -27,8 +27,9 @@ class TcaColumnsOverridesTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new TcaColumnsOverrides();
     }
 
index b1e6356..9b3b64e 100644 (file)
@@ -27,8 +27,9 @@ class TcaColumnsProcessPlaceholdersTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new TcaColumnsProcessPlaceholders();
     }
 
index 33a408f..ffd364f 100644 (file)
@@ -27,8 +27,9 @@ class TcaColumnsRemoveUnusedTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new TcaColumnsRemoveUnused();
     }
 
index bacd136..cc6ab22 100644 (file)
@@ -27,8 +27,9 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class TcaFlexPrepareTest extends UnitTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         // Suppress cache foo in xml helpers of GeneralUtility
         /** @var CacheManager|ObjectProphecy $cacheManagerProphecy */
         $cacheManagerProphecy = $this->prophesize(CacheManager::class);
@@ -37,7 +38,7 @@ class TcaFlexPrepareTest extends UnitTestCase
         $cacheManagerProphecy->getCache(Argument::cetera())->willReturn($cacheFrontendProphecy->reveal());
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         GeneralUtility::purgeInstances();
         parent::tearDown();
index 04fc7cc..576ee91 100644 (file)
@@ -33,8 +33,9 @@ class TcaFlexProcessTest extends UnitTestCase
      */
     protected $backendUserProphecy;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         /** @var BackendUserAuthentication|ObjectProphecy backendUserProphecy */
         $this->backendUserProphecy = $this->prophesize(BackendUserAuthentication::class);
         $GLOBALS['BE_USER'] = $this->backendUserProphecy->reveal();
index 7b3ec75..d9f2386 100644 (file)
@@ -30,8 +30,9 @@ class TcaInlineIsOnSymmetricSideTest extends UnitTestCase
     /**
      * Initializes the mock object.
      */
-    public function setUp()
+    public function setUp(): void
     {
+        parent::setUp();
         $this->subject = new TcaInlineIsOnSymmetricSide();
     }
 
index fc8ae00..a1b4e03 100644 (file)
@@ -29,8 +29,9 @@ class TcaInlineTest extends UnitTestCase
      */
     protected $beUserProphecy;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->beUserProphecy = $this->prophesize(BackendUserAuthentication::class);
         $GLOBALS['BE_USER'] = $this->beUserProphecy->reveal();
     }
index 5f24979..b64e4a7 100644 (file)
@@ -32,7 +32,7 @@ class TcaRadioItemsTest extends UnitTestCase
     /**
      * Tear down
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         GeneralUtility::purgeInstances();
         parent::tearDown();
index 5c56fde..f7001cb 100644 (file)
@@ -30,13 +30,14 @@ class TcaRecordTitleTest extends UnitTestCase
      */
     protected $timeZone;
 
-    public function setUp()
+    public function setUp(): void
     {
+        parent::setUp();
         $this->timeZone = date_default_timezone_get();
         date_default_timezone_set('UTC');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         date_default_timezone_set($this->timeZone);
         parent::tearDown();
index a3a814b..3cbaa01 100644 (file)
@@ -48,8 +48,9 @@ class TcaSelectItemsTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         // Default LANG prophecy just returns incoming value as label if calling ->sL()
         $languageServiceProphecy = $this->prophesize(LanguageService::class);
         $languageServiceProphecy->loadSingleTableDescription(Argument::cetera())->willReturn(null);
@@ -70,7 +71,7 @@ class TcaSelectItemsTest extends UnitTestCase
     /**
      * Tear down
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         GeneralUtility::purgeInstances();
         parent::tearDown();
index 85288fa..ed57112 100644 (file)
@@ -27,8 +27,9 @@ class TcaTypesShowitemTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new TcaTypesShowitem();
     }
 
index 8bc7f31..7496018 100644 (file)
@@ -28,8 +28,9 @@ class UserTsConfigTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new UserTsConfig();
     }
 
index 43bebfa..abf3702 100644 (file)
@@ -35,7 +35,7 @@ class InlineStackProcessorTest extends UnitTestCase
     /**
      * Set up
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $cacheManagerProphecy = $this->prophesize(CacheManager::class);
index d267151..8280bad 100644 (file)
@@ -34,7 +34,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class RouteDispatcherTest extends UnitTestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         FormProtectionFactory::purgeInstances();
         GeneralUtility::purgeInstances();
index 7060c5c..f60be64 100644 (file)
@@ -22,8 +22,9 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class ModuleLoaderTest extends UnitTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['LANG'] = new \stdClass();
         $GLOBALS['LANG']->lang = 'it';
     }
index 6982bb5..9c9c503 100644 (file)
@@ -29,8 +29,9 @@ class DataProviderCollectionTest extends UnitTestCase
     /**
      * Sets up this test case.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->dataProviderCollection = new \TYPO3\CMS\Backend\View\BackendLayout\DataProviderCollection();
     }
 
index 9405bda..dc3cf75 100644 (file)
@@ -29,8 +29,9 @@ class BackendLayoutViewTest extends UnitTestCase
     /**
      * Sets up this test case.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->backendLayoutView = $this->getAccessibleMock(
             \TYPO3\CMS\Backend\View\BackendLayoutView::class,
             ['getPage', 'getRootLine'],
index 74af15f..662645b 100644 (file)
@@ -42,8 +42,9 @@ class TcaFlexPrepareTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         // Suppress cache foo in xml helpers of GeneralUtility
         /** @var CacheManager|ObjectProphecy $cacheManagerProphecy */
         $cacheManagerProphecy = $this->prophesize(CacheManager::class);
@@ -57,7 +58,7 @@ class TcaFlexPrepareTest extends UnitTestCase
     /**
      * Tear down
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         GeneralUtility::purgeInstances();
         parent::tearDown();
index dc80431..06ae44a 100644 (file)
@@ -26,8 +26,9 @@ class ConstraintTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new \TYPO3\CMS\Belog\Domain\Model\Constraint();
     }
 
index 174e20e..8de5d86 100644 (file)
@@ -26,8 +26,9 @@ class LogEntryTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new \TYPO3\CMS\Belog\Domain\Model\LogEntry();
     }
 
index ca74128..8b2791a 100644 (file)
@@ -29,8 +29,9 @@ class BackendUserControllerTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['BE_USER'] = $this->createMock(BackendUserAuthentication::class);
         $GLOBALS['BE_USER']->uc = [
             'recentSwitchedToUsers' => []
index bb00d1f..8fdbdea 100644 (file)
@@ -26,8 +26,9 @@ class BackendUserTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new \TYPO3\CMS\Beuser\Domain\Model\BackendUser();
     }
 
index 7278f05..d1c7710 100644 (file)
@@ -26,8 +26,9 @@ class DemandTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new \TYPO3\CMS\Beuser\Domain\Model\Demand();
     }
 
index 7ce5271..265d3d0 100644 (file)
@@ -28,7 +28,7 @@ class AuthenticationServiceTest extends \TYPO3\TestingFramework\Core\Functional\
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->subject = new AuthenticationService();
         $this->subject->setLogger(new NullLogger());
@@ -54,11 +54,8 @@ class AuthenticationServiceTest extends \TYPO3\TestingFramework\Core\Functional\
             'enable_clause' => '',
             'username_column' => 'username',
         ];
-        $expected = [
-            'username' => 'test1',
-            'deleted' => 0
-        ];
         $result = $this->subject->getUser();
-        $this->assertArraySubset($expected, $result);
+        $this->assertSame('test1', $result['username']);
+        $this->assertSame(0, (int)$result['deleted']);
     }
 }
index c03545b..9c77fec 100644 (file)
@@ -27,7 +27,7 @@ class MemcachedBackendTest extends FunctionalTestCase
     /**
      * Sets up this test case
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         // Note this functional does NOT call parent::setUp() since it does
         // not need a full blown instance and database
index 3378503..2002b87 100644 (file)
@@ -32,8 +32,9 @@ class RedisBackendTest extends FunctionalTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+
         // Note this functional does NOT call parent::setUp() since it does
         // not need a full blown instance and database
         if (!getenv('typo3TestingRedisHost')) {
index 7b59b59..5d58d8e 100644 (file)
@@ -37,7 +37,7 @@ class CategoryCollectionTest extends FunctionalTestCase
     /**
      * Sets up this test suite.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->collectionRecord = [
@@ -94,7 +94,7 @@ class CategoryCollectionTest extends FunctionalTestCase
         $method = new \ReflectionMethod(CategoryCollection::class, 'getCollectedRecords');
         $method->setAccessible(true);
         $records = $method->invoke($subject);
-        $this->assertInternalType('array', $records);
+        $this->assertIsArray($records);
         $this->assertEmpty($records);
     }
 
index fda931d..2d12dd5 100644 (file)
@@ -38,7 +38,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\TestingFramework\Core\Functi
     /**
      * Sets up this test case.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -48,7 +48,7 @@ class RecordCollectionRepositoryTest extends \TYPO3\TestingFramework\Core\Functi
         $this->testTableName = $this->getUniqueId('tx_testtable');
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 
index 4f79634..4185358 100644 (file)
@@ -80,7 +80,7 @@ abstract class AbstractDataHandlerActionTestCase extends FunctionalTestCase
      */
     protected $backendUser;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -92,7 +92,7 @@ abstract class AbstractDataHandlerActionTestCase extends FunctionalTestCase
         Bootstrap::initializeLanguageObject();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         $this->assertErrorLogEntries();
         unset($this->actionService);
index da2737d..4be8f4e 100644 (file)
@@ -25,7 +25,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
  */
 class GetUniqueTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
index 9681a23..0cc63fb 100644 (file)
@@ -18,7 +18,7 @@ class GetUniqueTranslationTest extends AbstractDataHandlerActionTestCase
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->importScenarioDataSet('LiveDefaultPages');
index a111261..ea3f43e 100644 (file)
@@ -43,7 +43,7 @@ class HookTest extends AbstractDataHandlerActionTestCase
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/DataHandler/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->importScenarioDataSet('LiveDefaultPages');
@@ -56,7 +56,7 @@ class HookTest extends AbstractDataHandlerActionTestCase
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][__CLASS__] = HookFixture::class;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 
index ef59361..757c6fb 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\CMS\Core\Tests\Functional\DataHandling\AbstractDataHandlerActionTestCa
  */
 class SpecialLanguagesTest extends AbstractDataHandlerActionTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->backendUser->workspace = 0;
index c728166..50850f5 100644 (file)
@@ -23,7 +23,7 @@ class PlainDataResolverTest extends AbstractDataHandlerActionTestCase
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/DataResolving/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->importScenarioDataSet('Pages');
index 4b7467a..74165b0 100644 (file)
@@ -47,7 +47,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/FAL/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->importScenarioDataSet('LiveDefaultPages');
index 2ce08ce..d7ec994 100644 (file)
@@ -39,7 +39,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Group/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->testExtensionsToLoad[] = 'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler';
 
index 39d0664..41e1a0e 100644 (file)
@@ -44,7 +44,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/IRRE/CSV/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->importScenarioDataSet('LiveDefaultPages');
index 41bef5a..814ab5c 100644 (file)
@@ -235,7 +235,7 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\IRRE\CSV\
         $this->assertAssertionDataSet('deletePage');
 
         $response = $this->getFrontendResponse(self::VALUE_PageId, 0, 0, 0, false);
-        $this->assertContains('PageNotFoundException', $response->getError());
+        $this->assertStringContainsString('PageNotFoundException', $response->getError());
     }
 
     /**
index 40b4804..ae682c0 100644 (file)
@@ -49,7 +49,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/IRRE/ForeignField/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->importScenarioDataSet('LiveDefaultPages');
index 6631bcc..f969b78 100644 (file)
@@ -298,7 +298,7 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\IRRE\Fore
         $this->assertAssertionDataSet('deletePage');
 
         $response = $this->getFrontendResponse(self::VALUE_PageId, 0, 0, 0, false);
-        $this->assertContains('PageNotFoundException', $response->getError());
+        $this->assertStringContainsString('PageNotFoundException', $response->getError());
     }
 
     /**
index 07aa2e7..5a0e89c 100644 (file)
@@ -42,7 +42,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/ManyToMany/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->importScenarioDataSet('LiveDefaultPages');
index 612ead8..8cc48c7 100644 (file)
@@ -39,7 +39,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->importScenarioDataSet('LiveDefaultPages');
index 2442fd3..ccd0ea5 100644 (file)
@@ -14,7 +14,7 @@ class CheckValueTest extends AbstractDataHandlerActionTestCase
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->testExtensionsToLoad[] = 'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler';
 
index c37da7a..6124fcc 100644 (file)
@@ -28,7 +28,7 @@ class CheckValueTestForCheckboxes extends AbstractDataHandlerActionTestCase
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->testExtensionsToLoad[] = 'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler';
 
index 08d49f4..3714975 100644 (file)
@@ -452,7 +452,7 @@ class ActionTest extends \TYPO3\CMS\Core\Tests\Functional\DataHandling\Regular\A
         $this->assertAssertionDataSet('deletePage');
 
         $response = $this->getFrontendResponse(self::VALUE_PageId, 0, 0, 0, false);
-        $this->assertContains('PageNotFoundException', $response->getError());
+        $this->assertStringContainsString('PageNotFoundException', $response->getError());
     }
 
     /**
index 925e48d..d5fe222 100644 (file)
@@ -40,7 +40,7 @@ class MultiSiteTest extends AbstractDataHandlerActionTestCase
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Regular/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
index 6eae4b4..d20d271 100644 (file)
@@ -38,7 +38,7 @@ abstract class AbstractActionTestCase extends \TYPO3\CMS\Core\Tests\Functional\D
      */
     protected $scenarioDataSetDirectory = 'typo3/sysext/core/Tests/Functional/DataHandling/Select/DataSet/';
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->testExtensionsToLoad[] = 'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_datahandler';
 
index bc3c208..77a8948 100644 (file)
@@ -59,7 +59,7 @@ class SchemaMigratorTest extends FunctionalTestCase
     /**
      * Sets up this test suite.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->subject = GeneralUtility::makeInstance(SchemaMigrator::class);
@@ -72,7 +72,7 @@ class SchemaMigratorTest extends FunctionalTestCase
     /**
      * Tears down this test suite.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
 
index 339af0a..5f4d8df 100644 (file)
@@ -30,7 +30,7 @@ class PharStreamWrapperInterceptorTest extends FunctionalTestCase
         'typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_resources/bundle.phar' => 'fileadmin/bundle.phar',
     ];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (!in_array('phar', stream_get_wrappers())) {
@@ -71,7 +71,7 @@ class PharStreamWrapperInterceptorTest extends FunctionalTestCase
     {
         $path = $this->instancePath . '/' . $path;
         $handle = opendir('phar://' . $path);
-        self::assertInternalType('resource', $handle);
+        self::assertIsResource($handle);
     }
 
     /**
@@ -290,7 +290,7 @@ class PharStreamWrapperInterceptorTest extends FunctionalTestCase
     {
         $allowedPath = $this->instancePath . '/typo3conf/ext/test_resources/bundle.phar';
         $handle = fopen('phar://' . $allowedPath . '/Resources/content.txt', 'r');
-        self::assertInternalType('resource', $handle);
+        self::assertIsResource($handle);
     }
 
     /**
index 29aacf6..0047b6d 100644 (file)
@@ -31,7 +31,7 @@ class ImageMagickFileTest extends FunctionalTestCase
      */
     private $directory;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -52,7 +52,7 @@ class ImageMagickFileTest extends FunctionalTestCase
         $this->directory = vfsStream::setup('root', null, $structure);
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->directory);
         parent::tearDown();
index afaf111..0ab898a 100644 (file)
@@ -90,28 +90,28 @@ class PageRendererTest extends \TYPO3\TestingFramework\Core\Functional\Functiona
 
         $renderedString = $subject->render();
 
-        $this->assertContains($expectedPrologueString, $renderedString);
-        $this->assertContains($expectedTitleString, $renderedString);
-        $this->assertContains($expectedCharsetString, $renderedString);
-        $this->assertContains($expectedFavouriteIconPartOne, $renderedString);
-        $this->assertContains($expectedBaseUrlString, $renderedString);
-        $this->assertContains($expectedInlineCommentString, $renderedString);
-        $this->assertContains($expectedHeaderData, $renderedString);
+        $this->assertStringContainsString($expectedPrologueString, $renderedString);
+        $this->assertStringContainsString($expectedTitleString, $renderedString);
+        $this->assertStringContainsString($expectedCharsetString, $renderedString);
+        $this->assertStringContainsString($expectedFavouriteIconPartOne, $renderedString);
+        $this->assertStringContainsString($expectedBaseUrlString, $renderedString);
+        $this->assertStringContainsString($expectedInlineCommentString, $renderedString);
+        $this->assertStringContainsString($expectedHeaderData, $renderedString);
         $this->assertRegExp($expectedJsLibraryRegExp, $renderedString);
         $this->assertRegExp($expectedJsFileRegExp, $renderedString);
-        $this->assertContains($expectedJsInlineCodeString, $renderedString);
-        $this->assertContains($expectedCssFileString, $renderedString);
-        $this->assertContains($expectedCssInlineBlockOnTopString, $renderedString);
-        $this->assertContains($expectedBodyContent, $renderedString);
-        $this->assertContains('<meta property="og:type" content="foobar" />', $renderedString);
-        $this->assertContains('<meta name="author" content="foobar" />', $renderedString);
-        $this->assertContains('<meta http-equiv="refresh" content="5" />', $renderedString);
-        $this->assertContains('<meta name="dc.author" content="&lt;evil tag&gt;" />', $renderedString);
-        $this->assertNotContains('<meta name="randomtag" content="foobar">', $renderedString);
-        $this->assertNotContains('<meta name="randomtag" content="foobar" />', $renderedString);
-        $this->assertContains('<meta name="generator" content="TYPO3 CMS" />', $renderedString);
-        $this->assertContains('<meta property="og:image" content="/path/to/image1.jpg" />', $renderedString);
-        $this->assertContains('<meta property="og:image" content="/path/to/image2.jpg" />', $renderedString);
+        $this->assertStringContainsString($expectedJsInlineCodeString, $renderedString);
+        $this->assertStringContainsString($expectedCssFileString, $renderedString);
+        $this->assertStringContainsString($expectedCssInlineBlockOnTopString, $renderedString);
+        $this->assertStringContainsString($expectedBodyContent, $renderedString);
+        $this->assertStringContainsString('<meta property="og:type" content="foobar" />', $renderedString);
+        $this->assertStringContainsString('<meta name="author" content="foobar" />', $renderedString);
+        $this->assertStringContainsString('<meta http-equiv="refresh" content="5" />', $renderedString);
+        $this->assertStringContainsString('<meta name="dc.author" content="&lt;evil tag&gt;" />', $renderedString);
+        $this->assertStringNotContainsString('<meta name="randomtag" content="foobar">', $renderedString);
+        $this->assertStringNotContainsString('<meta name="randomtag" content="foobar" />', $renderedString);
+        $this->assertStringContainsString('<meta name="generator" content="TYPO3 CMS" />', $renderedString);
+        $this->assertStringContainsString('<meta property="og:image" content="/path/to/image1.jpg" />', $renderedString);
+        $this->assertStringContainsString('<meta property="og:image" content="/path/to/image2.jpg" />', $renderedString);
     }
 
     /**
@@ -165,13 +165,13 @@ class PageRendererTest extends \TYPO3\TestingFramework\Core\Functional\Functiona
 
         $renderedString = $subject->render(PageRenderer::PART_FOOTER);
 
-        $this->assertContains($expectedFooterData, $renderedString);
+        $this->assertStringContainsString($expectedFooterData, $renderedString);
         $this->assertRegExp($expectedJsFooterLibraryRegExp, $renderedString);
         $this->assertRegExp($expectedJsFooterRegExp, $renderedString);
-        $this->assertContains($expectedJsFooterInlineCodeString, $renderedString);
-        $this->assertContains($expectedInlineLabelReturnValue, $renderedString);
-        $this->assertContains($expectedLanguageLabel1, $renderedString);
-        $this->assertContains($expectedLanguageLabel2, $renderedString);
-        $this->assertContains($expectedInlineSettingsReturnValue, $renderedString);
+        $this->assertStringContainsString($expectedJsFooterInlineCodeString, $renderedString);
+        $this->assertStringContainsString($expectedInlineLabelReturnValue, $renderedString);
+        $this->assertStringContainsString($expectedLanguageLabel1, $renderedString);
+        $this->assertStringContainsString($expectedLanguageLabel2, $renderedString);
+        $this->assertStringContainsString($expectedInlineSettingsReturnValue, $renderedString);
     }
 }
index b7dd6d5..ab4b395 100644 (file)
@@ -29,12 +29,13 @@ use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
  */
 class ResourceStorageTest extends FunctionalTestCase
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         // cleanup manually created folders
         foreach (glob(Environment::getPublicPath() . '/fileadmin/*') as $folderToRemove) {
             GeneralUtility::rmdir($folderToRemove, true);
         }
+        parent::tearDown();
     }
 
     /**
index 84899e4..44dab09 100644 (file)
@@ -43,7 +43,7 @@ class DatabaseSessionBackendTest extends FunctionalTestCase
     /**
      * Set configuration for DatabaseSessionBackend
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -73,7 +73,8 @@ class DatabaseSessionBackendTest extends FunctionalTestCase
         $expected = array_merge($this->testSessionRecord, ['ses_tstamp' => $GLOBALS['EXEC_TIME']]);
 
         $this->assertEquals($record, $expected);
-        $this->assertArraySubset($expected, $this->subject->get('randomSessionId'));
+        $this->assertSame($expected['ses_data'], $this->subject->get('randomSessionId')['ses_data']);
+        $this->assertSame($expected['ses_userid'], (int)$this->subject->get('randomSessionId')['ses_userid']);
     }
 
     /**
@@ -86,7 +87,8 @@ class DatabaseSessionBackendTest extends FunctionalTestCase
         $expected = array_merge($this->testSessionRecord, ['ses_anonymous' => 1, 'ses_tstamp' => $GLOBALS['EXEC_TIME']]);
 
         $this->assertEquals($record, $expected);
-        $this->assertArraySubset($expected, $this->subject->get('randomSessionId'));
+        $this->assertSame($expected['ses_data'], $this->subject->get('randomSessionId')['ses_data']);
+        $this->assertSame($expected['ses_userid'], (int)$this->subject->get('randomSessionId')['ses_userid']);
     }
 
     /**
@@ -115,7 +117,8 @@ class DatabaseSessionBackendTest extends FunctionalTestCase
         $expectedMergedData = array_merge($this->testSessionRecord, $updateData);
         $this->subject->update('randomSessionId', $updateData);
         $fetchedRecord = $this->subject->get('randomSessionId');
-        $this->assertArraySubset($expectedMergedData, $fetchedRecord);
+        $this->assertSame($expectedMergedData['ses_data'], $fetchedRecord['ses_data']);
+        $this->assertSame($expectedMergedData['ses_userid'], (int)$fetchedRecord['ses_userid']);
     }
 
     /**
@@ -200,15 +203,19 @@ class DatabaseSessionBackendTest extends FunctionalTestCase
         $this->subject->set('anonymousSession', $anonymousSession);
 
         // Assert that we set authenticated session correctly
-        $this->assertArraySubset(
-            $authenticatedSession,
-            $this->subject->get('authenticatedSession')
+        $this->assertSame(
+            $authenticatedSession['ses_data'],
+            $this->subject->get('authenticatedSession')['ses_data']
+        );
+        $this->assertSame(
+            $authenticatedSession['ses_userid'],
+            (int)$this->subject->get('authenticatedSession')['ses_userid']
         );
 
         // assert that we set anonymous session correctly
-        $this->assertArraySubset(
-            $anonymousSession,
-            $this->subject->get('anonymousSession')
+        $this->assertSame(
+            $anonymousSession['ses_data'],
+            $this->subject->get('anonymousSession')['ses_data']
         );
 
         // Run the garbage collection
@@ -217,9 +224,13 @@ class DatabaseSessionBackendTest extends FunctionalTestCase
         $this->subject->collectGarbage(60, 10);
 
         // Authenticated session should still be there
-        $this->assertArraySubset(
-            $authenticatedSession,
-            $this->subject->get('authenticatedSession')
+        $this->assertSame(
+            $authenticatedSession['ses_data'],
+            $this->subject->get('authenticatedSession')['ses_data']
+        );
+        $this->assertSame(
+            $authenticatedSession['ses_userid'],
+            (int)$this->subject->get('authenticatedSession')['ses_userid']
         );
 
         // Non-authenticated session should be removed
@@ -240,6 +251,6 @@ class DatabaseSessionBackendTest extends FunctionalTestCase
         $sessionId = 'randomSessionId';
         $this->subject->set($sessionId, $this->testSessionRecord);
         $this->subject->update($sessionId, []);
-        $this->assertArraySubset($updatedRecord, $this->subject->get($sessionId));
+        $this->assertSame($updatedRecord['ses_data'], $this->subject->get($sessionId)['ses_data']);
     }
 }
index 8fa48e3..fac2098 100644 (file)
@@ -46,7 +46,7 @@ class RedisSessionBackendTest extends FunctionalTestCase
     /**
      * Set configuration for RedisSessionBackend
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
@@ -109,7 +109,8 @@ class RedisSessionBackendTest extends FunctionalTestCase
         $expected = array_merge($this->testSessionRecord, ['ses_tstamp' => $GLOBALS['EXEC_TIME']]);
 
         $this->assertEquals($record, $expected);
-        $this->assertArraySubset($expected, $this->subject->get('randomSessionId'));
+        $result = $this->subject->get('randomSessionId');
+        $this->assertSame($expected, $result);
     }
 
     /**
@@ -122,7 +123,7 @@ class RedisSessionBackendTest extends FunctionalTestCase
         $expected = array_merge($this->testSessionRecord, ['ses_anonymous' => 1, 'ses_tstamp' => $GLOBALS['EXEC_TIME']]);
 
         $this->assertEquals($record, $expected);
-        $this->assertArraySubset($expected, $this->subject->get('randomSessionId'));
+        $this->assertSame($expected, $this->subject->get('randomSessionId'));
     }
 
     /**
@@ -151,7 +152,7 @@ class RedisSessionBackendTest extends FunctionalTestCase
         $expectedMergedData = array_merge($this->testSessionRecord, $updateData);
         $this->subject->update('randomSessionId', $updateData);
         $fetchedRecord = $this->subject->get('randomSessionId');
-        $this->assertArraySubset($expectedMergedData, $fetchedRecord);
+        $this->assertSame($expectedMergedData, $fetchedRecord);
     }
 
     /**
@@ -235,15 +236,19 @@ class RedisSessionBackendTest extends FunctionalTestCase
         $this->subject->set('anonymousSession', $anonymousSession);
 
         // Assert that we set authenticated session correctly
-        $this->assertArraySubset(
-            $authenticatedSession,
-            $this->subject->get('authenticatedSession')
+        $this->assertSame(
+            $authenticatedSession['ses_data'],
+            $this->subject->get('authenticatedSession')['ses_data']
+        );
+        $this->assertSame(
+            $authenticatedSession['ses_userid'],
+            $this->subject->get('authenticatedSession')['ses_userid']
         );
 
         // assert that we set anonymous session correctly
-        $this->assertArraySubset(
-            $anonymousSession,
-            $this->subject->get('anonymousSession')
+        $this->assertSame(
+            $anonymousSession['ses_data'],
+            $this->subject->get('anonymousSession')['ses_data']
         );
 
         // Run the garbage collection
@@ -252,9 +257,13 @@ class RedisSessionBackendTest extends FunctionalTestCase
         $this->subject->collectGarbage(60, 10);
 
         // Authenticated session should still be there
-        $this->assertArraySubset(
-            $authenticatedSession,
-            $this->subject->get('authenticatedSession')
+        $this->assertSame(
+            $authenticatedSession['ses_data'],
+            $this->subject->get('authenticatedSession')['ses_data']
+        );
+        $this->assertSame(
+            $authenticatedSession['ses_userid'],
+            $this->subject->get('authenticatedSession')['ses_userid']
         );
 
         // Non-authenticated session should be removed
@@ -275,6 +284,6 @@ class RedisSessionBackendTest extends FunctionalTestCase
         $sessionId = 'randomSessionId';
         $this->subject->set($sessionId, $this->testSessionRecord);
         $this->subject->update($sessionId, []);
-        $this->assertArraySubset($updatedRecord, $this->subject->get($sessionId));
+        $this->assertSame($updatedRecord, $this->subject->get($sessionId));
     }
 }
index 0416405..a2e6dcb 100644 (file)
@@ -46,7 +46,7 @@ class SessionManagerTest extends FunctionalTestCase
     /**
      * Set configuration for DatabaseSessionBackend
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->subject = new SessionManager();
index 0090561..83a7bc1 100644 (file)
@@ -31,7 +31,7 @@ class ApcuBackendTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         // APCu module is called apcu, but options are prefixed with apc
         if (!extension_loaded('apcu') || !(bool)ini_get('apc.enabled') || !(bool)ini_get('apc.enable_cli')) {
index 3579300..bd8fcd3 100644 (file)
@@ -37,6 +37,7 @@ class FileBackendTest extends UnitTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         vfsStreamWrapper::register();
         vfsStreamWrapper::setRoot(new vfsStreamDirectory('Foo'));
     }
@@ -801,7 +802,7 @@ class FileBackendTest extends UnitTestCase
         $expectedEntry = 'BackendFileTest2';
 
         $actualEntries = $backend->findIdentifiersByTag('UnitTestTag%special');
-        $this->assertInternalType('array', $actualEntries);
+        $this->assertIsArray($actualEntries);
         $this->assertEquals($expectedEntry, array_pop($actualEntries));
     }
 
index 135e5ce..8c48926 100644 (file)
@@ -38,6 +38,7 @@ class CategoryRegistryTest extends UnitTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['defaultCategorizedTables'] = 'pages';
         $GLOBALS['TCA']['pages']['columns'] = [];
         $this->subject = new CategoryRegistry();
@@ -260,7 +261,7 @@ class CategoryRegistryTest extends UnitTestCase
         $this->subject->applyTcaForPreRegisteredTables();
 
         foreach ($GLOBALS['TCA'][$this->tables['first']]['types'] as $typeConfig) {
-            $this->assertContains('--div--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category', $typeConfig['showitem']);
+            $this->assertStringContainsString('--div--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category', $typeConfig['showitem']);
         }
     }
 
@@ -273,7 +274,7 @@ class CategoryRegistryTest extends UnitTestCase
         $this->subject->applyTcaForPreRegisteredTables();
 
         foreach ($GLOBALS['TCA'][$this->tables['first']]['types'] as $typeConfig) {
-            $this->assertNotContains('--div--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category', $typeConfig['showitem']);
+            $this->assertStringNotContainsString('--div--;LLL:EXT:core/Resources/Private/Language/locallang_tca.xlf:sys_category.tabs.category', $typeConfig['showitem']);
         }
     }
 
index 9d45913..0062f61 100644 (file)
@@ -32,6 +32,7 @@ class ConfigurationManagerTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $this->createSubjectWithMockedMethods(
             [
                 'getDefaultConfigurationFileLocation',
index a528db8..b4f911c 100644 (file)
@@ -64,7 +64,7 @@ class FlexFormToolsTest extends UnitTestCase
     /**
      * Set up
      */
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         // Underlying static GeneralUtility::xml2array() uses caches that have to be mocked here
index 981c5ee..4ffd091 100644 (file)
@@ -55,6 +55,7 @@ class AbstractConditionMatcherTest extends UnitTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         require_once 'Fixtures/ConditionMatcherUserFuncs.php';
 
         $this->resetSingletonInstances = true;
index 44b63c8..0700bd9 100644 (file)
@@ -43,8 +43,9 @@ class CommandRegistryTest extends UnitTestCase
     /**
      * Set up this testcase
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $commandMockClass = $this->getMockClass(Command::class, ['dummy']);
         $this->rootDirectory = vfsStream::setup('root', null, [
             'package1' => [
index c211aed..083f265 100644 (file)
@@ -29,8 +29,9 @@ class SystemEnvironmentBuilderTest extends UnitTestCase
     /**
      * Set up testcase
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = $this->getAccessibleMock(\TYPO3\CMS\Core\Core\SystemEnvironmentBuilder::class, ['dummy']);
     }
 
@@ -114,7 +115,7 @@ class SystemEnvironmentBuilderTest extends UnitTestCase
     {
         unset($GLOBALS['TYPO3_MISC']);
         $this->subject->_call('initializeGlobalVariables');
-        $this->assertInternalType('array', $GLOBALS['TYPO3_MISC']);
+        $this->assertIsArray($GLOBALS['TYPO3_MISC']);
     }
 
     /**
@@ -124,7 +125,7 @@ class SystemEnvironmentBuilderTest extends UnitTestCase
     {
         unset($GLOBALS['T3_VAR']);
         $this->subject->_call('initializeGlobalVariables');
-        $this->assertInternalType('array', $GLOBALS['T3_VAR']);
+        $this->assertIsArray($GLOBALS['T3_VAR']);
     }
 
     /**
@@ -134,7 +135,7 @@ class SystemEnvironmentBuilderTest extends UnitTestCase
     {
         unset($GLOBALS['T3_SERVICES']);
         $this->subject->_call('initializeGlobalVariables');
-        $this->assertInternalType('array', $GLOBALS['T3_SERVICES']);
+        $this->assertIsArray($GLOBALS['T3_SERVICES']);
     }
 
     /**
index 398ac24..0dd5523 100644 (file)
@@ -31,8 +31,9 @@ class Argon2iPasswordHashTest extends UnitTestCase
     /**
      * Sets up the subject for this test case.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $options = [
             'memory_cost' => 1024,
             'time_cost' => 2,
index d0b0f32..a63eac8 100644 (file)
@@ -31,8 +31,9 @@ class BcryptPasswordHashTest extends UnitTestCase
     /**
      * Sets up the fixtures for this testcase.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         // Set a low cost to speed up tests
         $options = [
             'cost' => 10,
index 609d337..e7e2422 100644 (file)
@@ -56,8 +56,9 @@ class DataHandlerTest extends UnitTestCase
     /**
      * Set up the tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['TCA'] = [];
         $cacheManagerProphecy = $this->prophesize(CacheManager::class);
         GeneralUtility::setSingletonInstance(CacheManager::class, $cacheManagerProphecy->reveal());
index 2f625fa..8cd203d 100644 (file)
@@ -28,8 +28,9 @@ class StateTest extends UnitTestCase
     /**
      * Set up the tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['TCA'] = [];
     }
 
index 651a503..fe83e83 100644 (file)
@@ -48,7 +48,7 @@ class ConnectionTest extends UnitTestCase
     /**
      * Create a new database connection mock object for every test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
index f7725ee..52912aa 100644 (file)
@@ -40,7 +40,7 @@ class BulkInsertTest extends UnitTestCase
     /**
      * Create a new database connection mock object for every test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
index b4ca39a..a4eaf0f 100644 (file)
@@ -47,7 +47,7 @@ class ExpressionBuilderTest extends UnitTestCase
     /**
      * Create a new database connection mock object for every test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
index 33556f0..bb84ba0 100644 (file)
@@ -32,8 +32,9 @@ class AbstractRestrictionTestCase extends UnitTestCase
     /**
      * Create a new database connection mock object for every test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         /** @var Connection|\Prophecy\Prophecy\ObjectProphecy $connection */
         $connection = $this->prophesize(Connection::class);
         $connection->quoteIdentifier(Argument::cetera())->will(function ($args) {
index 0baccd3..51a56d5 100644 (file)
@@ -28,8 +28,9 @@ class RelationHandlerTest extends UnitTestCase
 
     /**
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = $this->getMockBuilder(\TYPO3\CMS\Core\Database\RelationHandler::class)
             ->setMethods(['purgeVersionedIds', 'purgeLiveVersionedIds'])
             ->getMock();
index 0f591d7..3c2bc17 100644 (file)
@@ -51,7 +51,7 @@ class ConnectionMigratorTest extends UnitTestCase
     /**
      * Set up the test subject
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
index 161f6b6..f7f0a7d 100644 (file)
@@ -34,7 +34,7 @@ class DefaultTcaSchemaSqliteTest extends UnitTestCase
      */
     protected $subject;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->subject = $this->getAccessibleMock(DefaultTcaSchema::class, ['tableRunsOnSqlite']);
index 735c330..395a36e 100644 (file)
@@ -34,7 +34,7 @@ class DefaultTcaSchemaTest extends UnitTestCase
      */
     protected $subject;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->subject = $this->getAccessibleMock(DefaultTcaSchema::class, ['tableRunsOnSqlite']);
index a911bea..ac91a40 100644 (file)
@@ -46,7 +46,7 @@ class TableBuilderTest extends UnitTestCase
     /**
      * Setup test subject
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $sqlFile = file_get_contents(implode(DIRECTORY_SEPARATOR, [__DIR__, '..', 'Fixtures', 'tablebuilder.sql']));
index 299d402..5a69506 100644 (file)
@@ -30,7 +30,7 @@ class EnumTypeTest extends UnitTestCase
     /**
      * Set up the test subject
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (!Type::hasType(EnumType::TYPE)) {
index 5b7ef6a..c59cebe 100644 (file)
@@ -30,7 +30,7 @@ class SetTypeTest extends UnitTestCase
     /**
      * Set up the test subject
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         if (!Type::hasType(SetType::TYPE)) {
index 2ae4f52..a99f4eb 100644 (file)
@@ -29,8 +29,9 @@ class DebugExceptionHandlerTest extends UnitTestCase
     /**
      * Sets up this test case.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = $this->getMockBuilder(\TYPO3\CMS\Core\Error\DebugExceptionHandler::class)
             ->setMethods(['sendStatusHeaders', 'writeLogEntries'])
             ->disableOriginalConstructor()
@@ -48,7 +49,7 @@ class DebugExceptionHandlerTest extends UnitTestCase
         $this->subject->echoExceptionWeb($exception);
         $output = ob_get_contents();
         ob_end_clean();
-        $this->assertContains(htmlspecialchars($message), $output);
-        $this->assertNotContains($message, $output);
+        $this->assertStringContainsString(htmlspecialchars($message), $output);
+        $this->assertStringNotContainsString($message, $output);
     }
 }
index a53c83d..b99cb35 100644 (file)
@@ -29,8 +29,9 @@ class ProductionExceptionHandlerTest extends UnitTestCase
     /**
      * Sets up this test case.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = $this->getMockBuilder(\TYPO3\CMS\Core\Error\ProductionExceptionHandler::class)
             ->setMethods(['discloseExceptionInformation', 'sendStatusHeaders', 'writeLogEntries'])
             ->disableOriginalConstructor()
@@ -49,8 +50,8 @@ class ProductionExceptionHandlerTest extends UnitTestCase
         $this->subject->echoExceptionWeb($exception);
         $output = ob_get_contents();
         ob_end_clean();
-        $this->assertContains(htmlspecialchars($message), $output);
-        $this->assertNotContains($message, $output);
+        $this->assertStringContainsString(htmlspecialchars($message), $output);
+        $this->assertStringNotContainsString($message, $output);
     }
 
     /**
@@ -69,7 +70,7 @@ class ProductionExceptionHandlerTest extends UnitTestCase
         $this->subject->echoExceptionWeb($exception);
         $output = ob_get_contents();
         ob_end_clean();
-        $this->assertContains(htmlspecialchars($title), $output);
-        $this->assertNotContains($title, $output);
+        $this->assertStringContainsString(htmlspecialchars($title), $output);
+        $this->assertStringNotContainsString($title, $output);
     }
 }
index 31cc2a5..f388419 100644 (file)
@@ -33,7 +33,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class ResolverTest extends UnitTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->resetSingletonInstances = true;
index 244caa6..4dd8046 100644 (file)
@@ -30,6 +30,7 @@ class AbstractFormProtectionTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new FormProtectionTesting();
     }
 
index 5961d3c..2bf9003 100644 (file)
@@ -42,8 +42,9 @@ class BackendFormProtectionTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->backendUserMock = $this->createMock(\TYPO3\CMS\Core\Authentication\BackendUserAuthentication::class);
         $this->backendUserMock->user['uid'] = 1;
         $this->registryMock = $this->createMock(Registry::class);
index 711eefe..19d2cd6 100644 (file)
@@ -28,7 +28,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class FormProtectionFactoryTest extends UnitTestCase
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         FormProtectionFactory::purgeInstances();
         parent::tearDown();
index f0fb8d4..7b7d97d 100644 (file)
@@ -29,8 +29,9 @@ class InstallToolFormProtectionTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = $this->getAccessibleMock(
             \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection::class,
             ['dummy']
index 913173e..14ed6d0 100644 (file)
@@ -31,6 +31,7 @@ class HtmlParserTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new HtmlParser();
     }
 
@@ -307,38 +308,38 @@ class HtmlParserTest extends UnitTestCase
     public function emptyTagsDataProvider(): array
     {
         return [
-            [0, null, false, '<h1></h1>', '<h1></h1>'],
-            [1, null, false, '<h1></h1>', ''],
-            [1, null, false, '<h1>hallo</h1>', '<h1>hallo</h1>'],
-            [1, null, false, '<h1 class="something"></h1>', ''],
-            [1, null, false, '<h1 class="something"></h1><h2></h2>', ''],
-            [1, 'h2', false, '<h1 class="something"></h1><h2></h2>', '<h1 class="something"></h1>'],
-            [1, 'h2, h1', false, '<h1 class="something"></h1><h2></h2>', ''],
-            [1, null, false, '<div><p></p></div>', ''],
-            [1, null, false, '<div><p>&nbsp;</p></div>', '<div><p>&nbsp;</p></div>'],
-            [1, null, true, '<div><p>&nbsp;&nbsp;</p></div>', ''],
-            [1, null, true, '<div>&nbsp;&nbsp;<p></p></div>', ''],
-            [1, null, false, '<div>Some content<p></p></div>', '<div>Some content</div>'],
-            [1, null, true, '<div>Some content<p></p></div>', '<div>Some content</div>'],
-            [1, null, false, '<div>Some content</div>', '<div>Some content</div>'],
-            [1, null, true, '<div>Some content</div>', '<div>Some content</div>'],
-            [1, null, false, '<a href="#skiplinks">Skiplinks </a><b></b>', '<a href="#skiplinks">Skiplinks </a>'],
-            [1, null, true, '<a href="#skiplinks">Skiplinks </a><b></b>', '<a href="#skiplinks">Skiplinks </a>'],
-            [0, '', false, '<h1></h1>', '<h1></h1>'],
-            [1, '', false, '<h1></h1>', ''],
-            [1, '', false, '<h1>hallo</h1>', '<h1>hallo</h1>'],
-            [1, '', false, '<h1 class="something"></h1>', ''],
-            [1, '', false, '<h1 class="something"></h1><h2></h2>', ''],
-            [1, '', false, '<div><p></p></div>', ''],
-            [1, '', false, '<div><p>&nbsp;</p></div>', '<div><p>&nbsp;</p></div>'],
-            [1, '', true, '<div><p>&nbsp;&nbsp;</p></div>', ''],
-            [1, '', true, '<div>&nbsp;&nbsp;<p></p></div>', ''],
-            [1, '', false, '<div>Some content<p></p></div>', '<div>Some content</div>'],
-            [1, '', true, '<div>Some content<p></p></div>', '<div>Some content</div>'],
-            [1, '', false, '<div>Some content</div>', '<div>Some content</div>'],
-            [1, '', true, '<div>Some content</div>', '<div>Some content</div>'],
-            [1, '', false, '<a href="#skiplinks">Skiplinks </a><b></b>', '<a href="#skiplinks">Skiplinks </a>'],
-            [1, '', true, '<a href="#skiplinks">Skiplinks </a><b></b>', '<a href="#skiplinks">Skiplinks </a>'],
+            [false, null, false, '<h1></h1>', '<h1></h1>'],
+            [true, null, false, '<h1></h1>', ''],
+            [true, null, false, '<h1>hallo</h1>', '<h1>hallo</h1>'],
+            [true, null, false, '<h1 class="something"></h1>', ''],
+            [true, null, false, '<h1 class="something"></h1><h2></h2>', ''],
+            [true, 'h2', false, '<h1 class="something"></h1><h2></h2>', '<h1 class="something"></h1>'],
+            [true, 'h2, h1', false, '<h1 class="something"></h1><h2></h2>', ''],
+            [true, null, false, '<div><p></p></div>', ''],
+            [true, null, false, '<div><p>&nbsp;</p></div>', '<div><p>&nbsp;</p></div>'],
+            [true, null, true, '<div><p>&nbsp;&nbsp;</p></div>', ''],
+            [true, null, true, '<div>&nbsp;&nbsp;<p></p></div>', ''],
+            [true, null, false, '<div>Some content<p></p></div>', '<div>Some content</div>'],
+            [true, null, true, '<div>Some content<p></p></div>', '<div>Some content</div>'],
+            [true, null, false, '<div>Some content</div>', '<div>Some content</div>'],
+            [true, null, true, '<div>Some content</div>', '<div>Some content</div>'],
+            [true, null, false, '<a href="#skiplinks">Skiplinks </a><b></b>', '<a href="#skiplinks">Skiplinks </a>'],
+            [true, null, true, '<a href="#skiplinks">Skiplinks </a><b></b>', '<a href="#skiplinks">Skiplinks </a>'],
+            [false, '', false, '<h1></h1>', '<h1></h1>'],
+            [true, '', false, '<h1></h1>', ''],
+            [true, '', false, '<h1>hallo</h1>', '<h1>hallo</h1>'],
+            [true, '', false, '<h1 class="something"></h1>', ''],
+            [true, '', false, '<h1 class="something"></h1><h2></h2>', ''],
+            [true, '', false, '<div><p></p></div>', ''],
+            [true, '', false, '<div><p>&nbsp;</p></div>', '<div><p>&nbsp;</p></div>'],
+            [true, '', true, '<div><p>&nbsp;&nbsp;</p></div>', ''],
+            [true, '', true, '<div>&nbsp;&nbsp;<p></p></div>', ''],
+            [true, '', false, '<div>Some content<p></p></div>', '<div>Some content</div>'],
+            [true, '', true, '<div>Some content<p></p></div>', '<div>Some content</div>'],
+            [true, '', false, '<div>Some content</div>', '<div>Some content</div>'],
+            [true, '', true, '<div>Some content</div>', '<div>Some content</div>'],
+            [true, '', false, '<a href="#skiplinks">Skiplinks </a><b></b>', '<a href="#skiplinks">Skiplinks </a>'],
+            [true, '', true, '<a href="#skiplinks">Skiplinks </a><b></b>', '<a href="#skiplinks">Skiplinks </a>'],
         ];
     }
 
index 2b15472..a7a0c8e 100644 (file)
@@ -35,8 +35,9 @@ class MessageTest extends UnitTestCase
      */
     protected $message;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->stream = new Stream('php://memory', 'wb+');
         $this->message = (new Message())->withBody($this->stream);
     }
index 5018bd8..367b7f6 100644 (file)
@@ -31,8 +31,9 @@ class RequestTest extends UnitTestCase
      */
     protected $request;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->request = new Request();
     }
 
@@ -348,7 +349,7 @@ class RequestTest extends UnitTestCase
         $request = new Request('http://example.com');
         $headers = $request->getHeaders();
         $this->assertArrayHasKey('host', $headers);
-        $this->assertContains('example.com', $headers['host']);
+        $this->assertTrue(in_array('example.com', $headers['host']));
     }
 
     /**
@@ -406,7 +407,7 @@ class RequestTest extends UnitTestCase
     {
         $request = new Request('http://example.com');
         $header = $request->getHeaderLine('host');
-        $this->assertContains('example.com', $header);
+        $this->assertStringContainsString('example.com', $header);
     }
 
     /**
index 27de6c8..8c7f7db 100644 (file)
@@ -30,8 +30,9 @@ class ResponseTest extends UnitTestCase
      */
     protected $response;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->response = new Response();
     }
 
index 9460e40..043d3ef 100644 (file)
@@ -31,8 +31,9 @@ class ServerRequestTest extends UnitTestCase
      */
     protected $request;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->request = new ServerRequest();
     }
 
index 060b280..79e169a 100644 (file)
@@ -30,8 +30,9 @@ class StreamTest extends UnitTestCase
      */
     protected $stream;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->stream = new Stream('php://memory', 'wb+');
     }
 
index 57b6737..974bd81 100644 (file)
@@ -28,12 +28,13 @@ class UploadedFileTest extends UnitTestCase
 {
     protected $tmpFile;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->tmpFile = null;
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         if (is_scalar($this->tmpFile) && file_exists($this->tmpFile)) {
             unlink($this->tmpFile);
index f269256..4aebbf0 100644 (file)
@@ -40,8 +40,9 @@ class DimensionTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new \TYPO3\CMS\Core\Imaging\Dimension(Icon::SIZE_DEFAULT);
     }
 
@@ -52,7 +53,7 @@ class DimensionTest extends UnitTestCase
     {
         $value = $this->subject->getWidth();
         $this->assertEquals($this->width, $value);
-        $this->assertInternalType('int', $value);
+        $this->assertIsInt($value);
     }
 
     /**
@@ -62,6 +63,6 @@ class DimensionTest extends UnitTestCase
     {
         $value = $this->subject->getHeight();
         $this->assertEquals($this->height, $value);
-        $this->assertInternalType('int', $value);
+        $this->assertIsInt($value);
     }
 }
index c66ad5d..aeba2ea 100644 (file)
@@ -87,8 +87,9 @@ class IconFactoryTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->iconRegistryMock = $this->prophesize(IconRegistry::class);
         $signalSlotDispatcherMock = $this->prophesize(SignalSlotDispatcher::class);
         $signalSlotDispatcherMock->dispatch(Argument::any(), Argument::any(), Argument::type('array'))->willReturnArgument(2);
@@ -135,7 +136,7 @@ class IconFactoryTest extends UnitTestCase
      */
     public function getIconReturnsIconWithCorrectMarkupWrapperIfRegisteredIconIdentifierIsUsed()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="icon-markup">',
             $this->subject->getIcon($this->registeredIconIdentifier)->render()
         );
@@ -146,7 +147,7 @@ class IconFactoryTest extends UnitTestCase
      */
     public function getIconByIdentifierReturnsIconWithCorrectMarkupIfRegisteredIconIdentifierIsUsed()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-default icon-state-default icon-actions-close" data-identifier="actions-close">',
             $this->subject->getIcon($this->registeredIconIdentifier)->render()
         );
@@ -158,7 +159,7 @@ class IconFactoryTest extends UnitTestCase
      */
     public function getIconByIdentifierAndSizeReturnsIconWithCorrectMarkupIfRegisteredIconIdentifierIsUsed($size)
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-' . $size['expected'] . ' icon-state-default icon-actions-close" data-identifier="actions-close">',
             $this->subject->getIcon($this->registeredIconIdentifier, $size['input'])->render()
         );
@@ -170,7 +171,7 @@ class IconFactoryTest extends UnitTestCase
      */
     public function getIconByIdentifierAndSizeAndWithOverlayReturnsIconWithCorrectOverlayMarkupIfRegisteredIconIdentifierIsUsed($size)
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="icon-overlay icon-overlay-readonly">',
             $this->subject->getIcon($this->registeredIconIdentifier, $size['input'], 'overlay-readonly')->render()
         );
@@ -190,7 +191,7 @@ class IconFactoryTest extends UnitTestCase
                 'additionalClasses' => 'fa-fw'
             ]
         ]);
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-default icon-state-default icon-default-not-found" data-identifier="default-not-found">',
             $this->subject->getIcon($this->notRegisteredIconIdentifier)->render()
         );
@@ -211,7 +212,7 @@ class IconFactoryTest extends UnitTestCase
                 'additionalClasses' => 'fa-fw'
             ]
         ]);
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-' . $size['expected'] . ' icon-state-default icon-default-not-found" data-identifier="default-not-found">',
             $this->subject->getIcon($this->notRegisteredIconIdentifier, $size['input'])->render()
         );
@@ -230,7 +231,7 @@ class IconFactoryTest extends UnitTestCase
                 'spinning' => true
             ]
         ]);
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-default icon-state-default icon-' . $this->registeredSpinningIconIdentifier . ' icon-spin" data-identifier="spinning-icon">',
             $this->subject->getIcon($this->registeredSpinningIconIdentifier)->render()
         );
@@ -243,7 +244,7 @@ class IconFactoryTest extends UnitTestCase
      */
     public function getIconByIdentifierAndSizeAndOverlayReturnsNotFoundIconWithCorrectMarkupIfUnregisteredIdentifierIsUsed($size)
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="icon-overlay icon-overlay-readonly">',
             $this->subject->getIcon($this->notRegisteredIconIdentifier, $size['input'], 'overlay-readonly')->render()
         );
@@ -269,7 +270,7 @@ class IconFactoryTest extends UnitTestCase
      */
     public function getIconForFileWithNoFileTypeReturnsDefaultFileIcon()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-other-other" data-identifier="mimetypes-other-other">',
             $this->subject->getIconForFileExtension('')->render()
         );
@@ -282,7 +283,7 @@ class IconFactoryTest extends UnitTestCase
      */
     public function getIconForFileWithUnknownFileTypeReturnsDefaultFileIcon()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-other-other" data-identifier="mimetypes-other-other">',
             $this->subject->getIconForFileExtension('foo')->render()
         );
@@ -295,7 +296,7 @@ class IconFactoryTest extends UnitTestCase
      */
     public function getIconForFileWithFileTypePdfReturnsPdfIcon()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-pdf" data-identifier="mimetypes-pdf">',
             $this->subject->getIconForFileExtension('pdf')->render()
         );
@@ -308,7 +309,7 @@ class IconFactoryTest extends UnitTestCase
      */
     public function getIconForFileWithFileTypePngReturnsPngIcon()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-media-image" data-identifier="mimetypes-media-image">',
             $this->subject->getIconForFileExtension('png')->render()
         );
@@ -324,7 +325,7 @@ class IconFactoryTest extends UnitTestCase
         $resourceProphecy->getExtension()->willReturn('pdf');
         $resourceProphecy->getMimeType()->willReturn('');
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-pdf" data-identifier="mimetypes-pdf">',
             $this->subject->getIconForResource($resourceProphecy->reveal())->render()
         );
@@ -342,7 +343,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $fileObject = $this->getTestSubjectFileObject('');
         $result = $this->subject->getIconForResource($fileObject)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-other-other" data-identifier="mimetypes-other-other">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-other-other" data-identifier="mimetypes-other-other">', $result);
     }
 
     /**
@@ -354,7 +355,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $fileObject = $this->getTestSubjectFileObject('foo');
         $result = $this->subject->getIconForResource($fileObject)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-other-other" data-identifier="mimetypes-other-other">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-other-other" data-identifier="mimetypes-other-other">', $result);
     }
 
     /**
@@ -366,7 +367,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $fileObject = $this->getTestSubjectFileObject('pdf');
         $result = $this->subject->getIconForResource($fileObject)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-pdf" data-identifier="mimetypes-pdf">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-pdf" data-identifier="mimetypes-pdf">', $result);
     }
 
     /**
@@ -378,7 +379,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $fileObject = $this->getTestSubjectFileObject('pdf', 'application/pdf');
         $result = $this->subject->getIconForResource($fileObject)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-pdf" data-identifier="mimetypes-pdf">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-pdf" data-identifier="mimetypes-pdf">', $result);
     }
 
     /**
@@ -390,7 +391,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $fileObject = $this->getTestSubjectFileObject('custom', 'image/my-custom-extension');
         $result = $this->subject->getIconForResource($fileObject)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-media-image" data-identifier="mimetypes-media-image">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-media-image" data-identifier="mimetypes-media-image">', $result);
     }
 
     /**
@@ -402,7 +403,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $fileObject = $this->getTestSubjectFileObject('png', 'image/png');
         $result = $this->subject->getIconForResource($fileObject)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-media-image" data-identifier="mimetypes-media-image">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-media-image" data-identifier="mimetypes-media-image">', $result);
     }
 
     /**
@@ -414,7 +415,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $folderObject = $this->getTestSubjectFolderObject('/test');
         $result = $this->subject->getIconForResource($folderObject)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-apps-filetree-folder-default" data-identifier="apps-filetree-folder-default">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-apps-filetree-folder-default" data-identifier="apps-filetree-folder-default">', $result);
     }
 
     /**
@@ -426,7 +427,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $folderObject = $this->getTestSubjectFolderObject('/test');
         $result = $this->subject->getIconForResource($folderObject, Icon::SIZE_DEFAULT, null, ['folder-open' => true])->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-apps-filetree-folder-opened" data-identifier="apps-filetree-folder-opened">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-apps-filetree-folder-opened" data-identifier="apps-filetree-folder-opened">', $result);
     }
 
     /**
@@ -438,7 +439,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $folderObject = $this->getTestSubjectFolderObject('/');
         $result = $this->subject->getIconForResource($folderObject)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-apps-filetree-root" data-identifier="apps-filetree-root">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-apps-filetree-root" data-identifier="apps-filetree-root">', $result);
     }
 
     /**
@@ -450,7 +451,7 @@ class IconFactoryTest extends UnitTestCase
     {
         $folderObject = $this->getTestSubjectFolderObject('/mount');
         $result = $this->subject->getIconForResource($folderObject, Icon::SIZE_DEFAULT, null, ['mount-root' => true])->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-apps-filetree-mount" data-identifier="apps-filetree-mount">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-apps-filetree-mount" data-identifier="apps-filetree-mount">', $result);
     }
 
     //
@@ -465,7 +466,7 @@ class IconFactoryTest extends UnitTestCase
     public function getIconForRecordWithNullTableReturnsMissingIcon()
     {
         $GLOBALS['TCA']['']['ctrl'] = [];
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<span class="t3js-icon icon icon-size-default icon-state-default icon-default-not-found" data-identifier="default-not-found">',
             $this->subject->getIconForRecord('', [])->render()
         );
@@ -489,7 +490,7 @@ class IconFactoryTest extends UnitTestCase
             ],
         ];
         $result = $this->subject->getIconForRecord('tt_content', [])->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">', $result);
     }
 
     /**
@@ -511,7 +512,7 @@ class IconFactoryTest extends UnitTestCase
             ],
         ];
         $result = $this->subject->getIconForRecord('tt_content', $this->mockRecord)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">', $result);
     }
 
     /**
@@ -535,7 +536,7 @@ class IconFactoryTest extends UnitTestCase
         $mockRecord = $this->mockRecord;
         $mockRecord['CType'] = 'list';
         $result = $this->subject->getIconForRecord('tt_content', $mockRecord)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-x-content-plugin" data-identifier="mimetypes-x-content-plugin">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-x-content-plugin" data-identifier="mimetypes-x-content-plugin">', $result);
     }
 
     /**
@@ -562,8 +563,8 @@ class IconFactoryTest extends UnitTestCase
         $mockRecord = $this->mockRecord;
         $mockRecord['hidden'] = '1';
         $result = $this->subject->getIconForRecord('tt_content', $mockRecord)->render();
-        $this->assertContains('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">', $result);
-        $this->assertContains('<span class="icon-overlay icon-overlay-hidden">', $result);
+        $this->assertStringContainsString('<span class="t3js-icon icon icon-size-default icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">', $result);
+        $this->assertStringContainsString('<span class="icon-overlay icon-overlay-hidden">', $result);
     }
 
     /**
index f75647e..fccba82 100644 (file)
@@ -36,8 +36,9 @@ class BitmapIconProviderTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new \TYPO3\CMS\Core\Imaging\IconProvider\BitmapIconProvider();
         $this->icon = GeneralUtility::makeInstance(Icon::class);
         $this->icon->setIdentifier('foo');
index fa4e680..d2cdf02 100644 (file)
@@ -36,8 +36,9 @@ class FontawesomeIconProviderTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new \TYPO3\CMS\Core\Imaging\IconProvider\FontawesomeIconProvider();
         $this->icon = GeneralUtility::makeInstance(Icon::class);
         $this->icon->setIdentifier('foo');
index c60e221..9171b31 100644 (file)
@@ -37,8 +37,9 @@ class SvgIconProviderTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new \TYPO3\CMS\Core\Imaging\IconProvider\SvgIconProvider();
         $this->icon = GeneralUtility::makeInstance(Icon::class);
         $this->icon->setIdentifier('foo');
index efcb195..7a873d0 100644 (file)
@@ -33,8 +33,9 @@ class IconRegistryTest extends UnitTestCase
      */
     protected $notRegisteredIconIdentifier = 'my-super-unregistered-identifier';
 
-    public function setUp()
+    public function setUp(): void
     {
+        parent::setUp();
         $cacheManagerProphecy = $this->prophesize(CacheManager::class);
         GeneralUtility::setSingletonInstance(CacheManager::class, $cacheManagerProphecy->reveal());
         $cacheFrontendProphecy = $this->prophesize(FrontendInterface::class);
@@ -43,7 +44,7 @@ class IconRegistryTest extends UnitTestCase
         $cacheFrontendProphecy->set(Argument::cetera())->willReturn(null);
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // Drop cache manager singleton again
         GeneralUtility::purgeInstances();
@@ -133,7 +134,7 @@ class IconRegistryTest extends UnitTestCase
      */
     public function getAllRegisteredIconIdentifiersReturnsAnArrayWithIconIdentiefiers()
     {
-        $this->assertInternalType('array', (new IconRegistry)->getAllRegisteredIconIdentifiers());
+        $this->assertIsArray((new IconRegistry)->getAllRegisteredIconIdentifiers());
     }
 
     /**
@@ -142,7 +143,7 @@ class IconRegistryTest extends UnitTestCase
     public function getAllRegisteredIconIdentifiersReturnsArrayWithAllRegisteredIconIdentifiers()
     {
         $result = (new IconRegistry)->getAllRegisteredIconIdentifiers();
-        $this->assertInternalType('array', $result);
+        $this->assertIsArray($result);
         $this->assertContains('default-not-found', $result);
     }
 
index 45df01f..9b3c4fc 100644 (file)
@@ -46,8 +46,9 @@ class IconTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $cacheManagerProphecy = $this->prophesize(CacheManager::class);
         GeneralUtility::setSingletonInstance(CacheManager::class, $cacheManagerProphecy->reveal());
         $cacheFrontendProphecy = $this->prophesize(FrontendInterface::class);
@@ -58,7 +59,7 @@ class IconTest extends UnitTestCase
         $this->subject = $iconFactory->getIcon($this->iconIdentifier, Icon::SIZE_SMALL, $this->overlayIdentifier, IconState::cast(IconState::STATE_DISABLED));
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         // Drop cache manager singleton again
         GeneralUtility::purgeInstances();
index df12010..bddda1d 100644 (file)
@@ -69,7 +69,7 @@ class CropVariantTest extends UnitTestCase
 
     private static $expectedConfig = [];
 
-    public static function setUpBeforeClass()
+    public static function setUpBeforeClass(): void
     {
         parent::setUpBeforeClass();
         self::$expectedConfig = array_merge(['id' => 'default'], self::$tca);
index c2f07d2..48e43d6 100644 (file)
@@ -30,7 +30,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class LocalizationFactoryTest extends UnitTestCase
 {
-    public function tearDown()
+    public function tearDown(): void
     {
         // Drop created singletons again
         GeneralUtility::purgeInstances();
index 3090793..05116e9 100644 (file)
@@ -33,8 +33,9 @@ class LocallangXmlParserTest extends UnitTestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['lang']['format']['priority'] = 'xml';
 
         $cacheManagerProphecy = $this->prophesize(CacheManager::class);
@@ -49,7 +50,7 @@ class LocallangXmlParserTest extends UnitTestCase
     /**
      * Cleans up the environment after running a test.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         GeneralUtility::purgeInstances();
         parent::tearDown();
index 48a3540..1d94d24 100644 (file)
@@ -36,8 +36,9 @@ class XliffParserTest extends UnitTestCase
     /**
      * Prepares the environment before running a test.
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         // We have to take the whole relative path as otherwise this test fails on Windows systems
         $fixturePath = Environment::getFrameworkBasePath() . '/core/Tests/Unit/Localization/Parser/Fixtures/';
         $this->xliffFileNames = [
@@ -59,7 +60,7 @@ class XliffParserTest extends UnitTestCase
     /**
      * Cleans up the environment after running a test.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         GeneralUtility::purgeInstances();
         parent::tearDown();
index 1fd84ad..a1665fa 100644 (file)
@@ -35,8 +35,9 @@ class LockFactoryTest extends UnitTestCase
     /**
      * Set up the tests
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->mockFactory = $this->getAccessibleMock(LockFactory::class, ['dummy']);
     }
 
index 3273584..a738e55 100644 (file)
@@ -170,7 +170,7 @@ class LogRecordTest extends UnitTestCase
     {
         $dataArray = ['foo' => 'bar'];
         $record = $this->getRecord(['data' => $dataArray]);
-        $this->assertContains(json_encode($dataArray), (string)$record);
+        $this->assertStringContainsString(json_encode($dataArray), (string)$record);
     }
 
     /**
@@ -180,6 +180,6 @@ class LogRecordTest extends UnitTestCase
     {
         $dataArray = ['exception' => new \Exception('foo', 1476049451)];
         $record = $this->getRecord(['data' => $dataArray]);
-        $this->assertContains('Exception: foo', (string)$record);
+        $this->assertStringContainsString('Exception: foo', (string)$record);
     }
 }
index eb3ec60..41ef039 100644 (file)
@@ -59,8 +59,9 @@ class IntrospectionProcessorTest extends UnitTestCase
     /**
      * Sets up this testcase
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->processor = $this->getAccessibleMock(
             \TYPO3\CMS\Core\Log\Processor\IntrospectionProcessor::class,
             ['getDebugBacktrace', 'formatDebugBacktrace']
index 6053763..bf328d2 100644 (file)
@@ -26,8 +26,9 @@ class MailMessageTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Mail\MailMessage::class);
     }
 
index f9dd39e..944acea 100644 (file)
@@ -42,8 +42,9 @@ class MailerTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = $this->getMockBuilder(Mailer::class)
             ->setMethods(['emitPostInitializeMailerSignal'])
             ->disableOriginalConstructor()
index 22e05d8..82dd654 100644 (file)
@@ -62,7 +62,7 @@ class TransportFactoryTest extends UnitTestCase
         $this->assertInstanceOf(\Swift_FileSpool::class, $spool);
 
         $path = $spool->getPath();
-        $this->assertContains($mailSettings['transport_spool_filepath'], $path);
+        $this->assertStringContainsString($mailSettings['transport_spool_filepath'], $path);
     }
 
     /**
index fe19426..eed4ba4 100644 (file)
@@ -26,8 +26,9 @@ class FlashMessageServiceTest extends UnitTestCase
      */
     protected $flashMessageService;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->flashMessageService = $this->getAccessibleMock(\TYPO3\CMS\Core\Messaging\FlashMessageService::class, ['dummy']);
     }
 
index 043dda8..04db642 100644 (file)
@@ -37,11 +37,11 @@ class BootstrapRendererTest extends UnitTestCase
             FlashMessage::NOTICE
         );
         $output = $rendererClass->render([$flashMessage]);
-        $this->assertContains('<div class="typo3-messages">', $output);
-        $this->assertContains('<div class="alert alert-notice">', $output);
-        $this->assertContains('<div class="media-body">', $output);
-        $this->assertContains('<h4 class="alert-title">messageTitle</h4>', $output);
-        $this->assertContains('<p class="alert-message">messageBody</p>', $output);
+        $this->assertStringContainsString('<div class="typo3-messages">', $output);
+        $this->assertStringContainsString('<div class="alert alert-notice">', $output);
+        $this->assertStringContainsString('<div class="media-body">', $output);
+        $this->assertStringContainsString('<h4 class="alert-title">messageTitle</h4>', $output);
+        $this->assertStringContainsString('<p class="alert-message">messageBody</p>', $output);
     }
 
     /**
@@ -57,10 +57,10 @@ class BootstrapRendererTest extends UnitTestCase
             FlashMessage::NOTICE
         );
         $output = $rendererClass->render([$flashMessage]);
-        $this->assertContains('<div class="typo3-messages">', $output);
-        $this->assertContains('<div class="alert alert-notice">', $output);
-        $this->assertContains('<div class="media-body">', $output);
-        $this->assertContains('<p class="alert-message">messageBody</p>', $output);
-        $this->assertNotContains('<h4 class="alert-title">messageTitle</h4>', $output);
+        $this->assertStringContainsString('<div class="typo3-messages">', $output);
+        $this->assertStringContainsString('<div class="alert alert-notice">', $output);
+        $this->assertStringContainsString('<div class="media-body">', $output);
+        $this->assertStringContainsString('<p class="alert-message">messageBody</p>', $output);
+        $this->assertStringNotContainsString('<h4 class="alert-title">messageTitle</h4>', $output);
     }
 }
index 2bddab0..a61b646 100644 (file)
@@ -37,8 +37,9 @@ class PackageManagerTest extends UnitTestCase
     /**
      * Sets up this test case
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         vfsStream::setup('Test');
 
         /** @var PhpFrontend|\PHPUnit_Framework_MockObject_MockObject $mockCache */
index 325ea54..d66ce04 100644 (file)
@@ -25,8 +25,9 @@ class PackageTest extends UnitTestCase
 {
     /**
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         vfsStream::setup('Packages');
     }
 
index 074e85c..8674f6b 100644 (file)
@@ -31,7 +31,7 @@ abstract class BaseTestCase extends UnitTestCase
 
     protected $vfsContents = [];
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->mountDir = $this->getUniqueId('mount-');
index a1d730d..cbd4700 100644 (file)
@@ -24,8 +24,9 @@ class FileCollectionRegistryTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\Bas
      */
     protected $testSubject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->initializeTestSubject();
     }
 
index c9b51de..c6b7574 100644 (file)
@@ -24,7 +24,7 @@ class AbstractDriverTest extends \TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCas
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->subject = $this->createDriver();
index b9f4534..3899f36 100644 (file)
@@ -27,7 +27,7 @@ class AbstractHierarchicalFilesystemDriverTest extends BaseTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->subject = $this->getAccessibleMockForAbstractClass(AbstractHierarchicalFilesystemDriver::class, [], '', false);
index aee3e29..5fa928f 100644 (file)
@@ -31,8 +31,9 @@ class DriverRegistryTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->initializeSubject();
     }
 
index 967d3ed..10310cf 100644 (file)
@@ -157,7 +157,7 @@ class LocalDriverTest extends BaseTestCase
         ];
         $basePath = $subject->_call('calculateBasePath', $relativeDriverConfiguration);
 
-        $this->assertNotContains('//', $basePath);
+        $this->assertStringNotContainsString('//', $basePath);
     }
 
     /**
@@ -173,7 +173,7 @@ class LocalDriverTest extends BaseTestCase
         ];
         $basePath = $subject->_call('calculateBasePath', $relativeDriverConfiguration);
 
-        $this->assertNotContains('/../', $basePath);
+        $this->assertStringNotContainsString('/../', $basePath);
     }
 
     /**
@@ -989,7 +989,7 @@ class LocalDriverTest extends BaseTestCase
         $subject = $this->createDriver();
         $filePath = GeneralUtility::fixWindowsFilePath($subject->_call('copyFileToTemporaryPath', '/someDir/someFile.ext'));
         $this->testFilesToDelete[] = $filePath;
-        $this->assertContains('/typo3temp/var/transient/', $filePath);
+        $this->assertStringContainsString('/typo3temp/var/transient/', $filePath);
         $this->assertEquals($fileContents, file_get_contents($filePath));
     }
 
index 7f5c082..3bcb964 100644 (file)
@@ -39,6 +39,7 @@ class FileTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $this->storageMock = $this->createMock(ResourceStorage::class);
         $this->storageMock->expects($this->any())->method('getUid')->will($this->returnValue(5));
 
index 1e353a9..3c6aa10 100644 (file)
@@ -29,8 +29,9 @@ class FolderTest extends UnitTestCase
 
     protected $basedir = 'basedir';
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         vfsStream::setup($this->basedir);
     }
 
index 51b25c0..51fb578 100644 (file)
@@ -34,7 +34,7 @@ class ExtractorRegistryTest extends UnitTestCase
         $extractorRegistry = $this->getMockExtractorRegistry([[$extractorClass, $extractorObject]]);
 
         $extractorRegistry->registerExtractionService($extractorClass);
-        $this->assertContains($extractorObject, $extractorRegistry->getExtractors(), '', false, false);
+        $this->assertContains($extractorObject, $extractorRegistry->getExtractors());
     }
 
     /**
index 0c0ac6e..a084e5e 100644 (file)
@@ -43,6 +43,7 @@ class MetaDataAspectTest extends UnitTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $this->storageMock = $this->createMock(ResourceStorage::class);
         $this->storageMock->expects($this->any())->method('getUid')->will($this->returnValue(12));
     }
index 1d1d03b..bfd4431 100644 (file)
@@ -39,7 +39,7 @@ class VimeoHelperTest extends UnitTestCase
     /**
      * Set up the test
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
index 586e4ea..ee7f090 100644 (file)
@@ -49,8 +49,9 @@ class ProcessedFileTest extends UnitTestCase
     /**
      * @throws \PHPUnit\Framework\Exception
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->storageMock = $this->createMock(ResourceStorage::class);
         $this->storageMock->expects($this->any())->method('getUid')->will($this->returnValue(5));
 
index 89bf09c..b94d088 100644 (file)
@@ -58,7 +58,7 @@ class RendererRegistryTest extends UnitTestCase
         $rendererRegistry = $this->getTestRendererRegistry([[$rendererClass, $rendererObject]]);
 
         $rendererRegistry->registerRendererClass($rendererClass);
-        $this->assertContains($rendererObject, $rendererRegistry->getRendererInstances(), '', false, false);
+        $this->assertContains($rendererObject, $rendererRegistry->getRendererInstances());
     }
 
     /**
index f6ba71c..c75fe4b 100644 (file)
@@ -34,7 +34,7 @@ class VimeoRendererTest extends UnitTestCase
     /**
      * Set up the test
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
index be426fb..670ba71 100644 (file)
@@ -34,7 +34,7 @@ class YouTubeRendererTest extends UnitTestCase
     /**
      * Set up the test
      */
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $_SERVER['HTTP_HOST'] = 'test.server.org';
index 0e979ae..8cec748 100644 (file)
@@ -50,8 +50,9 @@ class AbstractRepositoryTest extends UnitTestCase
         return $queryBuilderProphet;
     }
 
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = $this->getMockForAbstractClass(AbstractRepository::class, [], '', false);
     }
 
index 800af38..53b8794 100644 (file)
@@ -52,6 +52,12 @@ class ResourceCompressorIntegrationTest extends BaseTestCase
         $this->fixtureDirFromTest = GeneralUtility::fixWindowsFilePath(__DIR__ . '/ResourceCompressorTest/Fixtures/');
     }
 
+    public function tearDown(): void
+    {
+        $this->testFilesToDelete[] = Environment::getPublicPath() . '/' . $this->resourceCompressor->getTargetDirectory();
+        parent::tearDown();
+    }
+
     /**
      * @test
      */
@@ -105,7 +111,6 @@ class ResourceCompressorIntegrationTest extends BaseTestCase
         );
         self::assertStringEqualsFile(GeneralUtility::fixWindowsFilePath(Environment::getPublicPath() . '/' . $mergedFile['file']), $expected);
     }
-
     /**
      * @test
      */
@@ -141,10 +146,4 @@ class ResourceCompressorIntegrationTest extends BaseTestCase
         );
         self::assertStringEqualsFile(GeneralUtility::fixWindowsFilePath(Environment::getPublicPath() . '/' . $mergedFile['file']), $expected);
     }
-
-    public function tearDown(): void
-    {
-        $this->testFilesToDelete[] = Environment::getPublicPath() . '/' . $this->resourceCompressor->getTargetDirectory();
-        parent::tearDown();
-    }
 }
index 1b9a387..b5d3ec9 100644 (file)
@@ -41,15 +41,16 @@ class ResourceFactoryTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = $this->getAccessibleMock(ResourceFactory::class, ['dummy'], [], '', false);
     }
 
     /**
      * Tear down
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         foreach ($this->filesCreated as $file) {
             unlink($file);
index 863a4c5..13a8280 100644 (file)
@@ -57,7 +57,7 @@ class TextExtractorRegistryTest extends UnitTestCase
         $textExtractorRegistry = $this->getTextExtractorRegistry([[$textExtractorClass, $textExtractorInstance]]);
 
         $textExtractorRegistry->registerTextExtractor($textExtractorClass);
-        $this->assertContains($textExtractorInstance, $textExtractorRegistry->getTextExtractorInstances(), '', false, false);
+        $this->assertContains($textExtractorInstance, $textExtractorRegistry->getTextExtractorInstances());
     }
 
     /**
index fa833bb..a5dfbb7 100644 (file)
@@ -28,7 +28,7 @@ class FileExtensionFilterTest extends UnitTestCase
     /**
      * Cleans up this test suite.
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         GeneralUtility::purgeInstances();
         parent::tearDown();
index d19e62d..bfa74db 100644 (file)
@@ -45,7 +45,7 @@ class AspectFactoryTest extends UnitTestCase
      */
     protected $aspectMockClass;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->languageProphecy = $this->prophesize(
@@ -64,7 +64,7 @@ class AspectFactoryTest extends UnitTestCase
         $this->subject = new AspectFactory();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->subject, $this->languageProphecy);
         parent::tearDown();
index f67b972..bfa54f1 100644 (file)
@@ -26,13 +26,13 @@ class VariableProcessorTest extends UnitTestCase
      */
     protected $subject;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
         $this->subject = new VariableProcessor();
     }
 
-    protected function tearDown()
+    protected function tearDown(): void
     {
         unset($this->subject);
         parent::tearDown();
index 7a85570..06a4629 100644 (file)
@@ -44,6 +44,7 @@ class MarkerBasedTemplateServiceTest extends UnitTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         /** @var CacheManager|ObjectProphecy $cacheManagerProphecy */
         $cacheManagerProphecy = $this->prophesize(CacheManager::class);
         GeneralUtility::setSingletonInstance(CacheManager::class, $cacheManagerProphecy->reveal());
index 38e7a27..705947f 100644 (file)
@@ -23,11 +23,12 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class RedisSessionBackendTest extends UnitTestCase
 {
-    protected function setUp()
+    protected function setUp(): void
     {
         if (!class_exists(\Redis::class)) {
             $this->markTestSkipped('Redis class needs to be available to test RedisSessionBackend');
         }
+        parent::setUp();
         $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey'] = '12345';
     }
 
index fe4e814..eaf5b61 100644 (file)
@@ -44,8 +44,9 @@ class DatabaseTreeDataProviderTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->treeData = new TreeNode();
     }
 
index 2c99426..f8c6e39 100644 (file)
@@ -32,6 +32,7 @@ class TreeDataProviderFactoryTest extends UnitTestCase
 
     protected function setUp(): void
     {
+        parent::setUp();
         $this->subject = new TreeDataProviderFactory();
         $GLOBALS['TCA'] = [];
         $GLOBALS['TCA']['foo'] = [];
index b383fbe..e90e740 100644 (file)
@@ -41,6 +41,7 @@ class TypoScriptParserTest extends UnitTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $accessibleClassName = $this->buildAccessibleProxy(TypoScriptParser::class);
         $this->typoScriptParser = new $accessibleClassName();
     }
@@ -463,8 +464,8 @@ class TypoScriptParserTest extends UnitTestCase
         GeneralUtility::addInstance(ConditionMatcher::class, $p->reveal());
 
         $resolvedIncludeLines = TypoScriptParser::checkIncludeLines($typoScript);
-        $this->assertContains('foo = bar', $resolvedIncludeLines);
-        $this->assertNotContains('INCLUDE_TYPOSCRIPT', $resolvedIncludeLines);
+        $this->assertStringContainsString('foo = bar', $resolvedIncludeLines);
+        $this->assertStringNotContainsString('INCLUDE_TYPOSCRIPT', $resolvedIncludeLines);
     }
 
     /**
index 1c2a8fc..9f66be7 100644 (file)
@@ -60,6 +60,7 @@ class TemplateServiceTest extends UnitTestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $GLOBALS['SIM_ACCESS_TIME'] = time();
         $GLOBALS['ACCESS_TIME'] = time();
         $this->packageManagerProphecy = $this->prophesize(PackageManager::class);
index cc394b0..8f06ac8 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
  */
 class DebugUtilityTest extends UnitTestCase
 {
-    protected function tearDown()
+    protected function tearDown(): void
     {
         parent::tearDown();
         DebugUtility::usePlainTextOutput(true);
@@ -42,7 +42,7 @@ class DebugUtilityTest extends UnitTestCase
         $output = ob_get_contents();
         ob_end_clean();
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<script>alert(\'Hello world!\')</script>',
             $output
         );
@@ -61,7 +61,7 @@ class DebugUtilityTest extends UnitTestCase
         $output = ob_get_contents();
         ob_end_clean();
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '&lt;script&gt;alert(\'Hello world!\')&lt;/script&gt;',
             $output
         );
index c022f94..615dd24 100644 (file)
@@ -45,15 +45,16 @@ class ExtensionManagementUtilityTest extends UnitTestCase
     /**
      * Set up
      */
-    protected function setUp()
+    protected function setUp(): void
     {
+        parent::setUp();
         $this->backUpPackageManager = ExtensionManagementUtilityAccessibleProxy::getPackageManager();
     }
 
     /**
      * Tear down
      */
-    protected function tearDown()
+    protected function tearDown(): void
     {
         ExtensionManagement