From 3cd23569ff29ccb2caf85bd04fb0a221d942698d Mon Sep 17 00:00:00 2001
From: Simon Schaufelberger <simonschaufi+typo3@gmail.com>
Date: Sun, 29 May 2022 15:45:38 +0200
Subject: [PATCH] [TASK] Remove type annotations where possible
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Searched for "/** @var " and went through all results manually.
Skipped results where GeneralUtility::makeInstance is called with
a variable.
This reduces the PHPStan baseline further.
Imported some namespaces on the go.
Run commands:
> Build/Scripts/runTests.sh -s phpstanGenerateBaseline
> Build/Scripts/runTests.sh -s cglGit
Resolves: #97705
Releases: main,11.5
Change-Id: I700ba596234af8cd3d32507fb03d77cfe30c678a
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/74787
Tested-by: core-ci <typo3@b13.com>
Tested-by: Oliver Klee <typo3-coding@oliverklee.de>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
---
Build/phpstan/phpstan-baseline.neon | 79 +------------------
.../Classes/Log/InMemoryLogWriter.php | 1 -
.../Classes/Modules/Debug/Events.php | 3 +-
.../adminpanel/Classes/Modules/Debug/Log.php | 1 -
.../Classes/Modules/Debug/PageTitle.php | 1 -
.../ViewHelpers/SubModuleRenderViewHelper.php | 2 +-
.../SystemInformationToolbarItem.php | 1 -
.../Backend/ToolbarItems/UserToolbarItem.php | 1 -
.../Classes/ContextMenu/ContextMenu.php | 3 +-
.../AbstractFormEngineAjaxController.php | 1 -
.../Controller/AjaxLoginController.php | 3 +-
.../ElementInformationController.php | 1 -
.../Controller/ContextMenuController.php | 1 -
.../Controller/EditDocumentController.php | 2 -
.../Controller/FormInlineAjaxController.php | 16 ----
.../Classes/Controller/LogoutController.php | 3 +-
.../Controller/OnlineMediaController.php | 2 -
.../Page/LocalizationController.php | 1 -
.../SimpleDataHandlerController.php | 1 -
.../Controller/Wizard/AddController.php | 5 --
.../Module/BackendModuleRepository.php | 2 -
.../Form/Container/InlineControlContainer.php | 1 -
.../Form/Container/SingleFieldContainer.php | 2 -
.../Form/Element/SelectSingleElement.php | 1 -
.../Classes/Form/FieldControl/AddRecord.php | 1 -
.../Classes/Form/FieldControl/LinkPopup.php | 1 -
.../Classes/Form/FieldControl/ListModule.php | 1 -
.../FormDataProvider/AbstractItemProvider.php | 8 --
.../FormDataProvider/DatabaseLanguageRows.php | 1 -
.../DatabaseSystemLanguageRows.php | 2 -
.../FormDataProvider/SiteDatabaseEditRow.php | 1 -
.../Form/FormDataProvider/SiteTcaInline.php | 1 -
.../Form/FormDataProvider/TcaInline.php | 8 --
.../FormDataProvider/TcaInputPlaceholders.php | 2 -
.../Classes/Form/FormResultCompiler.php | 1 -
.../backend/Classes/Http/RouteDispatcher.php | 2 -
.../backend/Classes/Module/ModuleLoader.php | 1 -
.../Security/CategoryPermissionsAspect.php | 1 -
.../Classes/Utility/BackendUtility.php | 2 -
.../backend/Classes/View/PageLayoutView.php | 1 -
.../Controller/EditDocumentControllerTest.php | 3 -
.../Form/Element/AbstractFormElementTest.php | 3 -
.../Unit/Form/InlineStackProcessorTest.php | 5 --
.../Tests/Unit/Form/NodeFactoryTest.php | 1 -
.../Controller/BackendLogController.php | 5 +-
.../Domain/Repository/LogEntryRepository.php | 1 -
.../BackendUserAuthentication.php | 2 -
.../Cache/Backend/Typo3DatabaseBackend.php | 2 -
.../Collection/CategoryCollection.php | 4 +-
.../Collection/AbstractRecordCollection.php | 1 -
.../core/Classes/Configuration/Richtext.php | 1 -
typo3/sysext/core/Classes/Core/Bootstrap.php | 7 +-
.../Classes/Core/ClassLoadingInformation.php | 2 -
.../core/Classes/DataHandling/DataHandler.php | 22 +-----
.../DataHandling/ItemProcessingService.php | 2 -
.../DataHandling/Localization/DataMapItem.php | 1 -
.../DataHandling/Model/RecordStateFactory.php | 1 -
.../core/Classes/Database/QueryView.php | 2 -
.../core/Classes/Database/RelationHandler.php | 1 -
.../Domain/Repository/PageRepository.php | 2 +-
.../FormProtection/FormProtectionFactory.php | 1 -
.../Hooks/BackendUserGroupIntegrityCheck.php | 4 -
typo3/sysext/core/Classes/Html/HtmlParser.php | 1 -
typo3/sysext/core/Classes/Log/LogManager.php | 7 +-
typo3/sysext/core/Classes/Log/Logger.php | 1 -
.../core/Classes/Package/PackageManager.php | 1 -
.../Page/DefaultJavaScriptAssetTrait.php | 1 -
.../sysext/core/Classes/Page/PageRenderer.php | 3 -
.../Collection/FolderBasedFileCollection.php | 4 +-
.../Collection/StaticFileCollection.php | 1 -
.../Classes/Resource/Driver/LocalDriver.php | 2 -
.../core/Classes/Resource/FileRepository.php | 1 -
.../Resource/Index/ExtractorRegistry.php | 1 -
.../Resource/Index/FileIndexRepository.php | 1 -
.../Processing/FileDeletionAspect.php | 1 -
.../Resource/Rendering/RendererRegistry.php | 2 -
.../core/Classes/Resource/ResourceFactory.php | 6 +-
.../core/Classes/Resource/ResourceStorage.php | 1 -
.../Service/FileProcessingService.php | 3 -
.../Resource/Service/UserFileMountService.php | 5 +-
.../Classes/Resource/Utility/ListUtility.php | 4 +-
.../DatabaseTreeDataProvider.php | 6 --
.../TypoScript/ExtendedTemplateService.php | 5 --
.../TypoScript/Parser/TypoScriptParser.php | 2 -
.../Classes/TypoScript/TemplateService.php | 4 -
.../Utility/File/ExtendedFileUtility.php | 8 +-
.../core/Classes/Utility/MailUtility.php | 1 -
.../core/Classes/Utility/RootlineUtility.php | 1 -
.../ViewHelpers/IconForRecordViewHelper.php | 1 -
...cation-94223-ExtbaseRequest-getBaseUri.rst | 1 -
...8-DeprecateExtbaseRequestGetRequestUri.rst | 1 -
...PSR-7RequestsWithTYPO3ServerParameters.rst | 1 -
.../Functional/Error/ErrorHandlerTest.php | 4 -
.../Imaging/ImageMagickFileTest.php | 2 -
.../AbstractUserAuthenticationTest.php | 1 -
.../BackendUserAuthenticationTest.php | 13 ---
.../Unit/Cache/Backend/ApcuBackendTest.php | 3 -
.../Tests/Unit/Cache/CacheManagerTest.php | 23 +++---
.../Unit/Command/SendEmailCommandTest.php | 1 -
.../ConfigurationManagerTest.php | 6 --
.../FlexForm/FlexFormToolsTest.php | 2 -
.../ClassLoadingInformationGeneratorTest.php | 6 --
.../Unit/DataHandling/DataHandlerTest.php | 4 -
.../Unit/Database/Query/BulkInsertTest.php | 1 -
.../AbstractFormProtectionTest.php | 3 -
.../Unit/LinkHandling/FileLinkHandlerTest.php | 2 -
.../LinkHandling/FolderLinkHandlerTest.php | 1 -
.../LegacyLinkNotationConverterTest.php | 3 -
.../Unit/Locking/SimpleLockStrategyTest.php | 3 -
.../Unit/Log/Writer/DatabaseWriterTest.php | 2 -
.../Tests/Unit/Log/Writer/FileWriterTest.php | 2 -
.../Tests/Unit/Package/PackageManagerTest.php | 3 -
.../core/Tests/Unit/Page/PageRendererTest.php | 13 ---
.../Tests/Unit/Resource/AbstractFileTest.php | 5 --
.../Unit/Resource/Driver/LocalDriverTest.php | 3 -
.../Resource/Filter/FileNameFilterTest.php | 2 -
.../core/Tests/Unit/Resource/FolderTest.php | 2 +-
.../Tests/Unit/Resource/Index/IndexerTest.php | 1 -
.../Unit/Resource/MetaDataAspectTest.php | 1 -
.../OnlineMedia/Helpers/VimeoHelperTest.php | 1 -
.../Resource/Rendering/VimeoRendererTest.php | 22 +-----
.../Rendering/YouTubeRendererTest.php | 21 +----
.../Unit/Resource/ResourceFactoryTest.php | 4 -
.../Unit/Resource/ResourceStorageTest.php | 10 +--
.../Resource/Service/ExtractorServiceTest.php | 2 -
.../Utility/FileExtensionFilterTest.php | 3 -
.../Unit/Routing/Aspect/AspectFactoryTest.php | 2 -
.../Tests/Unit/Routing/SiteMatcherTest.php | 2 -
.../Service/DependencyOrderingServiceTest.php | 2 -
.../ExtensionManagementUtilityTest.php | 14 +---
.../Utility/File/ExtendedFileUtilityTest.php | 2 -
.../Tests/Unit/Utility/GeneralUtilityTest.php | 1 -
.../Unit/Utility/RootlineUtilityTest.php | 1 -
.../Cache/Backend/WincacheBackendTest.php | 3 -
.../DashboardInitializationService.php | 1 -
.../BackendConfigurationManager.php | 1 -
.../Mvc/Controller/ActionController.php | 9 +--
.../Classes/Mvc/Controller/Arguments.php | 1 -
.../Persistence/Generic/LazyLoadingProxy.php | 1 -
.../Persistence/Generic/LazyObjectStorage.php | 1 -
.../Classes/Persistence/Generic/Query.php | 2 -
.../Persistence/Generic/QueryFactory.php | 2 -
.../Generic/Storage/Typo3DbQueryParser.php | 2 -
.../PropertyMappingConfigurationBuilder.php | 5 +-
.../AbstractFileFolderConverter.php | 8 +-
.../Validator/GenericObjectValidator.php | 4 +-
.../Classes/Validation/ValidatorResolver.php | 2 +-
.../Mvc/Controller/ActionControllerTest.php | 1 -
.../Classes/Controller/TestController.php | 2 -
.../Functional/Persistence/RelationTest.php | 1 -
.../TypeConverter/ObjectConverterTest.php | 3 +-
.../AbstractConfigurationManagerTest.php | 1 -
.../FrontendConfigurationManagerTest.php | 5 --
.../DataHandler/CheckFlexFormValueTest.php | 2 -
.../Mvc/Controller/ActionControllerTest.php | 8 --
.../Unit/Mvc/Web/Routing/UriBuilderTest.php | 6 --
.../Unit/Persistence/Generic/BackendTest.php | 4 -
.../Generic/Mapper/DataMapFactoryTest.php | 5 --
.../Generic/Mapper/DataMapperTest.php | 10 ---
.../Generic/PersistenceManagerTest.php | 9 +--
.../Persistence/Generic/QueryResultTest.php | 1 -
.../Unit/Persistence/Generic/QueryTest.php | 1 -
.../Storage/Typo3DbQueryParserTest.php | 1 -
.../Validator/AlphanumericValidatorTest.php | 4 -
.../Validator/EmailAddressValidatorTest.php | 4 -
.../Validator/GenericObjectValidatorTest.php | 5 --
.../RegularExpressionValidatorTest.php | 5 --
.../Validator/StringLengthValidatorTest.php | 7 +-
.../Validator/StringValidatorTest.php | 2 -
.../AbstractConfigurationManagerTest.php | 3 -
.../Classes/Controller/DownloadController.php | 1 -
.../Classes/Domain/Model/Extension.php | 1 -
.../Classes/Parser/ExtensionXmlParser.php | 1 -
.../Classes/Report/ExtensionStatus.php | 1 -
.../DownloadExtensionViewHelper.php | 1 -
.../ViewHelpers/ReloadSqlDataViewHelper.php | 1 -
.../ViewHelpers/RemoveExtensionViewHelper.php | 1 -
.../Controller/DownloadControllerTest.php | 2 -
.../Unit/Utility/FileHandlingUtilityTest.php | 5 +-
.../Classes/Updates/MigrateFeloginPlugins.php | 1 -
.../Updates/MigrateFeloginPluginsCtype.php | 3 -
.../Classes/Controller/FileListController.php | 1 -
.../fluid/Classes/View/StandaloneView.php | 1 -
.../Classes/ViewHelpers/Be/UriViewHelper.php | 1 -
.../ViewHelpers/Format/CropViewHelper.php | 1 -
.../ViewHelpers/Link/ActionViewHelper.php | 2 -
.../ViewHelpers/Link/PageViewHelper.php | 2 -
.../Uri/TypolinkViewHelperTest.php | 2 -
.../Controller/FormEditorController.php | 1 -
.../Controller/FormManagerController.php | 1 -
.../InheritancesResolverService.php | 1 -
.../Persistence/FormPersistenceManager.php | 2 +-
.../Property/PropertyMappingConfiguration.php | 1 -
.../Classes/Service/TranslationService.php | 6 +-
.../Domain/Finishers/ClosureFinisherTest.php | 6 +-
.../FormElements/AbstractFormElementTest.php | 8 --
.../FormElements/AbstractSectionTest.php | 10 ---
.../PropertyMappingConfigurationTest.php | 4 -
.../Collection/CategoryCollection.php | 1 -
.../ContentObject/ContentContentObject.php | 1 -
.../ContentObject/ContentObjectRenderer.php | 2 -
.../FluidTemplateContentObject.php | 1 -
.../HierarchicalMenuContentObject.php | 1 -
.../Menu/AbstractMenuContentObject.php | 1 -
.../ContentObject/RecordsContentObject.php | 2 -
.../TypoScriptFrontendController.php | 4 +-
.../DataProcessing/DatabaseQueryProcessor.php | 1 -
.../Classes/DataProcessing/FilesProcessor.php | 1 -
.../Classes/DataProcessing/MenuProcessor.php | 1 -
.../frontend/Classes/Imaging/GifBuilder.php | 1 -
.../Classes/Plugin/AbstractPlugin.php | 2 -
.../Classes/Resource/FileCollector.php | 1 -
.../InternalRequestDataMappingTest.php | 2 -
.../SiteHandling/TypoLinkGeneratorTest.php | 1 -
.../FrontendUserAuthenticationTest.php | 2 -
.../ContentObject/CaseContentObjectTest.php | 1 -
.../FluidTemplateContentObjectTest.php | 1 -
.../TypoScriptFrontendControllerTest.php | 1 -
.../Classes/Controller/ImportController.php | 2 -
.../Export/ExportPageTreeViewTest.php | 3 -
.../Export/IrreTutorialRecordsTest.php | 3 -
.../Export/PagesAndTtContentTest.php | 4 -
.../PagesAndTtContentWithImagesTest.php | 6 --
...dTtContentWithRelationsAndSoftrefsTest.php | 5 --
.../impexp/Tests/Functional/ImportTest.php | 3 -
.../Controller/AdministrationController.php | 3 +-
.../Classes/Controller/SearchController.php | 2 -
.../Repository/AdministrationRepository.php | 3 -
.../Repository/IndexSearchRepository.php | 5 +-
.../Controller/InfoModuleController.php | 1 -
.../Classes/Configuration/FeatureManager.php | 2 -
.../Classes/Controller/UpgradeController.php | 3 +-
.../Classes/Report/InstallStatusReport.php | 2 -
.../Classes/Report/SecurityStatusReport.php | 1 -
.../Classes/Service/UpgradeWizardsService.php | 1 -
.../Unit/Controller/UpgradeControllerTest.php | 2 -
.../Unit/FolderStructure/AbstractNodeTest.php | 22 ------
.../FolderStructure/DirectoryNodeTest.php | 28 -------
.../Unit/FolderStructure/FileNodeTest.php | 41 ----------
.../Unit/FolderStructure/LinkNodeTest.php | 23 ------
.../Unit/FolderStructure/RootNodeTest.php | 13 ---
.../FolderStructure/StructureFacadeTest.php | 4 -
.../Unit/Service/CoreUpdateServiceTest.php | 6 --
.../Unit/Service/CoreVersionServiceTest.php | 4 -
.../Unit/Service/EnableFileServiceTest.php | 4 -
.../SilentConfigurationUpgradeServiceTest.php | 15 ----
.../Classes/Command/DeletedRecordsCommand.php | 1 -
.../DatabaseIntegrityController.php | 1 -
.../ToolbarItems/OpendocsToolbarItem.php | 1 -
.../Classes/Browser/FileBrowser.php | 2 -
.../Controller/RecordListController.php | 2 -
.../Classes/LinkHandler/FileLinkHandler.php | 1 -
.../Classes/RecordList/DatabaseRecordList.php | 1 -
.../Classes/Domain/Model/DeletedRecords.php | 1 -
.../Controller/ManagementController.php | 1 -
.../Unit/Service/RedirectServiceTest.php | 1 -
.../Report/Status/ConfigurationStatus.php | 4 +-
.../Classes/Report/Status/FalStatus.php | 4 +-
.../Classes/Report/Status/SecurityStatus.php | 2 -
.../Status/WarningMessagePostProcessor.php | 1 -
.../Classes/Task/SystemStatusUpdateTask.php | 2 -
.../Controller/BrowseLinksController.php | 1 -
.../Controller/SchedulerModuleController.php | 6 +-
typo3/sysext/scheduler/Classes/Execution.php | 1 -
typo3/sysext/scheduler/Classes/Scheduler.php | 1 -
.../scheduler/Classes/Task/AbstractTask.php | 2 -
...edulableCommandAdditionalFieldProvider.php | 1 -
...orageExtractionAdditionalFieldProvider.php | 3 +-
...StorageIndexingAdditionalFieldProvider.php | 3 +-
.../CachingFrameworkGarbageCollectionTest.php | 3 -
.../TypoScriptTemplateModuleController.php | 1 -
...eObjectBrowserModuleFunctionController.php | 2 -
.../Controller/Remote/RemoteServer.php | 1 -
.../Classes/Hook/BackendUtilityHook.php | 4 +-
.../Classes/Middleware/WorkspacePreview.php | 1 -
275 files changed, 97 insertions(+), 914 deletions(-)
diff --git a/Build/phpstan/phpstan-baseline.neon b/Build/phpstan/phpstan-baseline.neon
index 5269c8c006f6..c5cb2fd05a11 100644
--- a/Build/phpstan/phpstan-baseline.neon
+++ b/Build/phpstan/phpstan-baseline.neon
@@ -2205,31 +2205,11 @@ parameters:
count: 1
path: ../../typo3/sysext/core/Tests/Unit/LinkHandling/EmailLinkHandlerTest.php
- -
- message: "#^Variable \\$storageMock in PHPDoc tag @var does not match assigned variable \\$factory\\.$#"
- count: 1
- path: ../../typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
-
- -
- message: "#^Variable \\$storageMock in PHPDoc tag @var does not match assigned variable \\$storage\\.$#"
- count: 1
- path: ../../typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
-
-
message: "#^Method PHPUnit\\\\Framework\\\\MockObject\\\\MockBuilder\\<TYPO3\\\\CMS\\\\Core\\\\Resource\\\\ResourceStorage\\>\\:\\:getMock\\(\\) invoked with 1 parameter, 0 required\\.$#"
count: 1
path: ../../typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
- -
- message: "#^Variable \\$storageMock in PHPDoc tag @var does not match assigned variable \\$storage\\.$#"
- count: 1
- path: ../../typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
-
- -
- message: "#^Variable \\$storageMock in PHPDoc tag @var does not match assigned variable \\$storage\\.$#"
- count: 1
- path: ../../typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
-
-
message: "#^Parameter \\#1 \\$data of method TYPO3\\\\CMS\\\\Core\\\\LinkHandling\\\\UrlLinkHandler\\:\\:resolveHandlerData\\(\\) expects array, string given\\.$#"
count: 1
@@ -2295,11 +2275,6 @@ parameters:
count: 1
path: ../../typo3/sysext/core/Tests/Unit/Page/AssetRendererTest.php
- -
- message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Core\\\\Page\\\\PageRenderer\\|TYPO3\\\\TestingFramework\\\\Core\\\\AccessibleObjectInterface\\:\\:expects\\(\\)\\.$#"
- count: 1
- path: ../../typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
-
-
message: "#^Cannot call method withCurrentPageNumber\\(\\) on array\\.$#"
count: 1
@@ -2350,21 +2325,11 @@ parameters:
count: 1
path: ../../typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
- -
- message: "#^Variable \\$driver in PHPDoc tag @var does not exist\\.$#"
- count: 1
- path: ../../typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
-
-
message: "#^PHPDoc tag @param references unknown parameter\\: \\$expectedMergedProperties$#"
count: 1
path: ../../typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
- -
- message: "#^Variable \\$driverMock in PHPDoc tag @var does not exist\\.$#"
- count: 1
- path: ../../typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
-
-
message: "#^Parameter \\#1 \\$expected of static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertInstanceOf\\(\\) expects class\\-string\\<ad9195e2487eea33c8a2abd5cf33cba4\\>, string given\\.$#"
count: 1
@@ -2380,11 +2345,6 @@ parameters:
count: 1
path: ../../typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php
- -
- message: "#^PHPDoc tag @var for variable \\$fileResourceMock contains unknown class PHPUnit_Framework_MockObject_MockObject\\.$#"
- count: 1
- path: ../../typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
-
-
message: "#^Parameter \\#1 \\$uid of method TYPO3\\\\CMS\\\\Core\\\\Resource\\\\AbstractRepository\\:\\:findByUid\\(\\) expects int, string given\\.$#"
count: 2
@@ -2400,11 +2360,6 @@ parameters:
count: 2
path: ../../typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
- -
- message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Core\\\\Site\\\\SiteFinder\\:\\:method\\(\\)\\.$#"
- count: 2
- path: ../../typo3/sysext/core/Tests/Unit/Routing/SiteMatcherTest.php
-
-
message: "#^Parameter \\#1 \\$id of method TYPO3\\\\CMS\\\\Backend\\\\Tree\\\\TreeNode\\:\\:setId\\(\\) expects string, int given\\.$#"
count: 3
@@ -3091,7 +3046,7 @@ parameters:
path: ../../typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php
-
- message: "#^Property class@anonymous/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest\\.php\\:343\\:\\:\\$name is unused\\.$#"
+ message: "#^Property class@anonymous/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest\\.php\\:344\\:\\:\\$name is unused\\.$#"
count: 1
path: ../../typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php
@@ -3212,7 +3167,7 @@ parameters:
-
message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with DateTime&PHPUnit\\\\Framework\\\\MockObject\\\\MockObject&TYPO3\\\\TestingFramework\\\\Core\\\\AccessibleObjectInterface will always evaluate to false\\.$#"
- count: 2
+ count: 1
path: ../../typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
-
@@ -3465,11 +3420,6 @@ parameters:
count: 1
path: ../../typo3/sysext/extbase/Tests/Unit/Validation/Validator/UrlValidatorTest.php
- -
- message: "#^Variable \\$abstractConfigurationManager in PHPDoc tag @var does not match assigned variable \\$configuration\\.$#"
- count: 2
- path: ../../typo3/sysext/extbase/Tests/UnitDeprecated/Configuration/AbstractConfigurationManagerTest.php
-
-
message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertNull\\(\\) with DateTime will always evaluate to false\\.$#"
count: 1
@@ -3505,11 +3455,6 @@ parameters:
count: 1
path: ../../typo3/sysext/extensionmanager/Classes/Controller/AbstractModuleController.php
- -
- message: "#^Offset 'message' does not exist on string\\.$#"
- count: 1
- path: ../../typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
-
-
message: "#^Parameter \\#2 \\$lowestVersion of method TYPO3\\\\CMS\\\\Extensionmanager\\\\Domain\\\\Repository\\\\ExtensionRepository\\:\\:findByVersionRangeAndExtensionKeyOrderedByVersion\\(\\) expects int, array\\|string given\\.$#"
count: 1
@@ -3635,11 +3580,6 @@ parameters:
count: 1
path: ../../typo3/sysext/extensionmanager/Classes/ViewHelpers/ToggleExtensionInstallationStateViewHelper.php
- -
- message: "#^Variable \\$downloadUtilityMock in PHPDoc tag @var does not match assigned variable \\$extensionManagementServiceMock\\.$#"
- count: 1
- path: ../../typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
-
-
message: "#^Method PHPUnit\\\\Framework\\\\TestCase\\:\\:count\\(\\) invoked with 1 parameter, 0 required\\.$#"
count: 1
@@ -4760,11 +4700,6 @@ parameters:
count: 3
path: ../../typo3/sysext/frontend/Tests/Functional/SiteHandling/SiteRequestTest.php
- -
- message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Frontend\\\\Authentication\\\\FrontendUserAuthentication\\|TYPO3\\\\TestingFramework\\\\Core\\\\AccessibleObjectInterface\\:\\:method\\(\\)\\.$#"
- count: 2
- path: ../../typo3/sysext/frontend/Tests/Unit/Authentication/FrontendUserAuthenticationTest.php
-
-
message: "#^Call to static method PHPUnit\\\\Framework\\\\Assert\\:\\:assertFalse\\(\\) with string will always evaluate to false\\.$#"
count: 1
@@ -4905,11 +4840,6 @@ parameters:
count: 1
path: ../../typo3/sysext/impexp/Tests/Functional/ImportExportTest.php
- -
- message: "#^Variable \\$subject in PHPDoc tag @var does not match assigned variable \\$importMock\\.$#"
- count: 1
- path: ../../typo3/sysext/impexp/Tests/Functional/ImportTest.php
-
-
message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Extbase\\\\Mvc\\\\RequestInterface\\:\\:setArguments\\(\\)\\.$#"
count: 1
@@ -5415,11 +5345,6 @@ parameters:
count: 1
path: ../../typo3/sysext/redirects/Classes/Service/RedirectService.php
- -
- message: "#^Call to an undefined method TYPO3\\\\CMS\\\\Redirects\\\\Service\\\\RedirectService\\:\\:method\\(\\)\\.$#"
- count: 1
- path: ../../typo3/sysext/redirects/Tests/Unit/Service/RedirectServiceTest.php
-
-
message: "#^Constructor of class TYPO3\\\\CMS\\\\RteCKEditor\\\\Form\\\\Resolver\\\\RichTextNodeResolver has an unused parameter \\$nodeFactory\\.$#"
count: 1
diff --git a/typo3/sysext/adminpanel/Classes/Log/InMemoryLogWriter.php b/typo3/sysext/adminpanel/Classes/Log/InMemoryLogWriter.php
index 50a94ae8f21c..4353feaad69e 100644
--- a/typo3/sysext/adminpanel/Classes/Log/InMemoryLogWriter.php
+++ b/typo3/sysext/adminpanel/Classes/Log/InMemoryLogWriter.php
@@ -77,7 +77,6 @@ class InMemoryLogWriter extends AbstractWriter
protected function lockWriter(): void
{
self::$memoryLock = true;
- /** @var LogRecord $record */
$record = GeneralUtility::makeInstance(
LogRecord::class,
'TYPO3.CMS.AdminPanel.Log.InMemoryLogWriter',
diff --git a/typo3/sysext/adminpanel/Classes/Modules/Debug/Events.php b/typo3/sysext/adminpanel/Classes/Modules/Debug/Events.php
index 57a6a1469dc1..17f12baf028c 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Debug/Events.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Debug/Events.php
@@ -25,6 +25,7 @@ use Symfony\Component\VarDumper\Dumper\HtmlDumper;
use TYPO3\CMS\Adminpanel\ModuleApi\AbstractSubModule;
use TYPO3\CMS\Adminpanel\ModuleApi\DataProviderInterface;
use TYPO3\CMS\Adminpanel\ModuleApi\ModuleData;
+use TYPO3\CMS\Adminpanel\Service\EventDispatcher;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\View\StandaloneView;
@@ -47,7 +48,7 @@ class Events extends AbstractSubModule implements DataProviderInterface
public function getDataToStore(ServerRequestInterface $request): ModuleData
{
- /** @var \TYPO3\CMS\Adminpanel\Service\EventDispatcher $eventDispatcher */
+ /** @var EventDispatcher $eventDispatcher */
$eventDispatcher = GeneralUtility::makeInstance(EventDispatcherInterface::class);
$cloner = new VarCloner();
$cloner->setMinDepth(2);
diff --git a/typo3/sysext/adminpanel/Classes/Modules/Debug/Log.php b/typo3/sysext/adminpanel/Classes/Modules/Debug/Log.php
index badd311a0f14..88432f8b2749 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Debug/Log.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Debug/Log.php
@@ -89,7 +89,6 @@ class Log extends AbstractSubModule implements DataProviderInterface, ModuleSett
$log = InMemoryLogWriter::$log;
$logArray = [];
- /** @var \TYPO3\CMS\Core\Log\LogRecord $logRecord */
foreach ($log as $logRecord) {
$entry = $logRecord->toArray();
// store only necessary info
diff --git a/typo3/sysext/adminpanel/Classes/Modules/Debug/PageTitle.php b/typo3/sysext/adminpanel/Classes/Modules/Debug/PageTitle.php
index 66b7eac7ff90..ae8d8af7a437 100644
--- a/typo3/sysext/adminpanel/Classes/Modules/Debug/PageTitle.php
+++ b/typo3/sysext/adminpanel/Classes/Modules/Debug/PageTitle.php
@@ -77,7 +77,6 @@ class PageTitle extends AbstractSubModule implements DataProviderInterface
];
$log = InMemoryLogWriter::$log;
- /** @var \TYPO3\CMS\Core\Log\LogRecord $logEntry */
foreach ($log as $logEntry) {
if ($logEntry->getComponent() === self::LOG_COMPONENT) {
if (isset($logEntry->getData()['orderedTitleProviders'])) {
diff --git a/typo3/sysext/adminpanel/Classes/ViewHelpers/SubModuleRenderViewHelper.php b/typo3/sysext/adminpanel/Classes/ViewHelpers/SubModuleRenderViewHelper.php
index f3b7221c402a..00b8f96a7124 100644
--- a/typo3/sysext/adminpanel/Classes/ViewHelpers/SubModuleRenderViewHelper.php
+++ b/typo3/sysext/adminpanel/Classes/ViewHelpers/SubModuleRenderViewHelper.php
@@ -61,7 +61,7 @@ class SubModuleRenderViewHelper extends AbstractViewHelper
RenderingContextInterface $renderingContext
): string {
$module = $arguments['module'];
- /** @var \TYPO3\CMS\Adminpanel\ModuleApi\ModuleDataStorageCollection $data */
+ /** @var ModuleDataStorageCollection $data */
$data = $arguments['data'];
$moduleData = $data->contains($module) ? $data->offsetGet($module) : new ModuleData();
return $module->getContent($moduleData);
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
index 520ed1b152c1..2459e5a0990c 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/SystemInformationToolbarItem.php
@@ -103,7 +103,6 @@ class SystemInformationToolbarItem implements ToolbarItemInterface
{
$this->totalCount += (int)$count;
- /** @var InformationStatus $messageSeverity */
$messageSeverity = InformationStatus::cast($status);
// define the severity for the badge
if ($messageSeverity->isGreaterThan($this->highestSeverity)) {
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/UserToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/UserToolbarItem.php
index 46c72ae6bca9..88f5f95f7759 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/UserToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/UserToolbarItem.php
@@ -66,7 +66,6 @@ class UserToolbarItem implements ToolbarItemInterface
{
$backendUser = $this->getBackendUser();
- /** @var BackendModuleRepository $backendModuleRepository */
$backendModuleRepository = GeneralUtility::makeInstance(BackendModuleRepository::class);
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
diff --git a/typo3/sysext/backend/Classes/ContextMenu/ContextMenu.php b/typo3/sysext/backend/Classes/ContextMenu/ContextMenu.php
index 4a6a765917f4..7aa78e06365e 100644
--- a/typo3/sysext/backend/Classes/ContextMenu/ContextMenu.php
+++ b/typo3/sysext/backend/Classes/ContextMenu/ContextMenu.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Backend\ContextMenu;
use TYPO3\CMS\Backend\ContextMenu\ItemProviders\PageProvider;
+use TYPO3\CMS\Backend\ContextMenu\ItemProviders\ProviderInterface;
use TYPO3\CMS\Backend\ContextMenu\ItemProviders\RecordProvider;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -48,7 +49,7 @@ class ContextMenu
$items = [];
$itemsProviders = $this->getAvailableProviders($table, $identifier, $context);
- /** @var \TYPO3\CMS\Backend\ContextMenu\ItemProviders\ProviderInterface $provider */
+ /** @var ProviderInterface $provider */
foreach ($itemsProviders as $provider) {
$items = $provider->addItems($items);
}
diff --git a/typo3/sysext/backend/Classes/Controller/AbstractFormEngineAjaxController.php b/typo3/sysext/backend/Classes/Controller/AbstractFormEngineAjaxController.php
index 2d9970a37ca9..ffd48da788ee 100644
--- a/typo3/sysext/backend/Classes/Controller/AbstractFormEngineAjaxController.php
+++ b/typo3/sysext/backend/Classes/Controller/AbstractFormEngineAjaxController.php
@@ -124,7 +124,6 @@ abstract class AbstractFormEngineAjaxController
*/
protected function getLabelsFromLocalizationFile($file)
{
- /** @var LocalizationFactory $languageFactory */
$languageFactory = GeneralUtility::makeInstance(LocalizationFactory::class);
$language = $this->getLanguageService()->lang;
$localizationArray = $languageFactory->getParsedData($file, $language);
diff --git a/typo3/sysext/backend/Classes/Controller/AjaxLoginController.php b/typo3/sysext/backend/Classes/Controller/AjaxLoginController.php
index 3607410f3ffd..8580c8c51a11 100644
--- a/typo3/sysext/backend/Classes/Controller/AjaxLoginController.php
+++ b/typo3/sysext/backend/Classes/Controller/AjaxLoginController.php
@@ -19,6 +19,7 @@ use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\FormProtection\BackendFormProtection;
use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
use TYPO3\CMS\Core\Http\JsonResponse;
use TYPO3\CMS\Core\Session\UserSessionManager;
@@ -44,7 +45,7 @@ class AjaxLoginController
if ($this->isAuthorizedBackendSession()) {
$result = ['success' => true];
if ($this->hasLoginBeenProcessed()) {
- /** @var \TYPO3\CMS\Core\FormProtection\BackendFormProtection $formProtection */
+ /** @var BackendFormProtection $formProtection */
$formProtection = FormProtectionFactory::get();
$formProtection->setSessionTokenFromRegistry();
$formProtection->persistSessionToken();
diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
index 055b27a17343..df39785789af 100644
--- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementInformationController.php
@@ -517,7 +517,6 @@ class ElementInformationController
if ($rowValue) {
$creatorRecord = BackendUtility::getRecord('be_users', (int)$rowValue);
if ($creatorRecord) {
- /** @var Avatar $avatar */
$avatar = GeneralUtility::makeInstance(Avatar::class);
$creatorRecord['icon'] = $avatar->render($creatorRecord);
$rowValue = $creatorRecord;
diff --git a/typo3/sysext/backend/Classes/Controller/ContextMenuController.php b/typo3/sysext/backend/Classes/Controller/ContextMenuController.php
index 3f67bca492c6..9774e14cf3df 100644
--- a/typo3/sysext/backend/Classes/Controller/ContextMenuController.php
+++ b/typo3/sysext/backend/Classes/Controller/ContextMenuController.php
@@ -64,7 +64,6 @@ class ContextMenuController
*/
public function clipboardAction(ServerRequestInterface $request): ResponseInterface
{
- /** @var Clipboard $clipboard */
$clipboard = GeneralUtility::makeInstance(Clipboard::class);
$clipboard->initializeClipboard($request);
$clipboard->lockToNormal();
diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index b996a0fa7b08..e20dfa329004 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -711,7 +711,6 @@ class EditDocumentController
$relatedPageId = -$nRec['t3ver_oid'];
}
- /** @var DataHandler $duplicateTce */
$duplicateTce = GeneralUtility::makeInstance(DataHandler::class);
$duplicateCmd = [
@@ -1689,7 +1688,6 @@ class EditDocumentController
}
}
- /** @var ReferenceIndex $referenceIndex */
$referenceIndex = GeneralUtility::makeInstance(ReferenceIndex::class);
$numberOfReferences = $referenceIndex->getNumberOfReferencedRecords(
$this->firstEl['table'],
diff --git a/typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php b/typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php
index 41d9a4712bd9..45bc2478f3dd 100644
--- a/typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php
+++ b/typo3/sysext/backend/Classes/Controller/FormInlineAjaxController.php
@@ -63,7 +63,6 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
}
// Parse the DOM identifier, add the levels to the structure stack
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
$inlineStackProcessor->initializeByParsingDomObjectIdString($domObjectId);
$inlineStackProcessor->injectAjaxConfiguration($parentConfig);
@@ -84,9 +83,7 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
$childTableName = $parentConfig['foreign_table'];
- /** @var TcaDatabaseRecord $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(TcaDatabaseRecord::class);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$formDataCompilerInput = [
'command' => 'new',
@@ -120,9 +117,7 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
];
$childData['combinationChild'] = $this->compileChildChild($childData, $parentConfig, $inlineStackProcessor->getStructure());
} else {
- /** @var TcaDatabaseRecord $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(TcaDatabaseRecord::class);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$formDataCompilerInput = [
'command' => 'new',
@@ -174,7 +169,6 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
$parentConfig = $this->extractSignedParentConfigFromRequest((string)$ajaxArguments['context']);
// Parse the DOM identifier, add the levels to the structure stack
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
$inlineStackProcessor->initializeByParsingDomObjectIdString($domObjectId);
$inlineStackProcessor->injectAjaxConfiguration($parentConfig);
@@ -241,7 +235,6 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
$type = $ajaxArguments[1] ?? null;
$parentConfig = $this->extractSignedParentConfigFromRequest((string)$ajaxArguments['context']);
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
// Parse the DOM identifier (string), add the levels to the structure stack (array), load the TCA config:
$inlineStackProcessor->initializeByParsingDomObjectIdString($domObjectId);
@@ -279,9 +272,7 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
'inlineCompileExistingChildren' => false,
];
// Full TcaDatabaseRecord is required here to have the list of connected uids $oldItemList
- /** @var TcaDatabaseRecord $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(TcaDatabaseRecord::class);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$parentData = $formDataCompiler->compile($formDataCompilerInputForParent);
$parentConfig = $parentData['processedTca']['columns'][$parentFieldName]['config'];
@@ -311,7 +302,6 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
];
}
- /** @var DataHandler $tce */
$tce = GeneralUtility::makeInstance(DataHandler::class);
$tce->start([], $cmd);
$tce->process_cmdmap();
@@ -399,7 +389,6 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
$ajaxArguments = $request->getParsedBody()['ajax'] ?? $request->getQueryParams()['ajax'];
[$domObjectId, $expand, $collapse] = $ajaxArguments;
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
// Parse the DOM identifier (string), add the levels to the structure stack (array), don't load TCA config
$inlineStackProcessor->initializeByParsingDomObjectIdString($domObjectId);
@@ -451,7 +440,6 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
{
$parentConfig = $parentData['processedTca']['columns'][$parentFieldName]['config'];
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
$inlineStackProcessor->initializeByGivenStructure($inlineStructure);
$inlineTopMostParent = $inlineStackProcessor->getStructureLevel(0);
@@ -460,9 +448,7 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
$child = $inlineStackProcessor->getUnstableStructure();
$childTableName = $child['table'];
- /** @var TcaDatabaseRecord $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(TcaDatabaseRecord::class);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$formDataCompilerInput = [
'command' => 'edit',
@@ -512,9 +498,7 @@ class FormInlineAjaxController extends AbstractFormEngineAjaxController
$childChildUid = $child['databaseRow'][$parentConfig['foreign_selector']][0];
// child-child table name is set in child tca "the selector field" foreign_table
$childChildTableName = $child['processedTca']['columns'][$parentConfig['foreign_selector']]['config']['foreign_table'];
- /** @var TcaDatabaseRecord $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(TcaDatabaseRecord::class);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$formDataCompilerInput = [
'command' => 'edit',
diff --git a/typo3/sysext/backend/Classes/Controller/LogoutController.php b/typo3/sysext/backend/Classes/Controller/LogoutController.php
index ffe0f4765dea..e7a7264d5315 100644
--- a/typo3/sysext/backend/Classes/Controller/LogoutController.php
+++ b/typo3/sysext/backend/Classes/Controller/LogoutController.php
@@ -20,6 +20,7 @@ namespace TYPO3\CMS\Backend\Controller;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Backend\Routing\UriBuilder;
+use TYPO3\CMS\Core\FormProtection\BackendFormProtection;
use TYPO3\CMS\Core\FormProtection\FormProtectionFactory;
use TYPO3\CMS\Core\Http\RedirectResponse;
use TYPO3\CMS\Core\SysLog\Action\Login as SystemLogLoginAction;
@@ -65,7 +66,7 @@ class LogoutController
}
// Logout written to log
$this->getBackendUser()->writelog(SystemLogType::LOGIN, SystemLogLoginAction::LOGOUT, SystemLogErrorClassification::MESSAGE, 1, 'User %s logged out from TYPO3 Backend', [$this->getBackendUser()->user['username']]);
- /** @var \TYPO3\CMS\Core\FormProtection\BackendFormProtection $backendFormProtection */
+ /** @var BackendFormProtection $backendFormProtection */
$backendFormProtection = FormProtectionFactory::get();
$backendFormProtection->removeSessionTokenFromRegistry();
$this->getBackendUser()->logoff();
diff --git a/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php b/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
index cef5d35f731c..df3c42baa224 100644
--- a/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
+++ b/typo3/sysext/backend/Classes/Controller/OnlineMediaController.php
@@ -139,10 +139,8 @@ class OnlineMediaController
*/
protected function addFlashMessage(FlashMessage $flashMessage)
{
- /** @var FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue $defaultFlashMessageQueue */
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
}
diff --git a/typo3/sysext/backend/Classes/Controller/Page/LocalizationController.php b/typo3/sysext/backend/Classes/Controller/Page/LocalizationController.php
index 7bafc22ecf81..6ecbec991637 100644
--- a/typo3/sysext/backend/Classes/Controller/Page/LocalizationController.php
+++ b/typo3/sysext/backend/Classes/Controller/Page/LocalizationController.php
@@ -91,7 +91,6 @@ class LocalizationController
$pageId = (int)$params['pageId'];
$languageId = (int)$params['languageId'];
- /** @var TranslationConfigurationProvider $translationProvider */
$translationProvider = GeneralUtility::makeInstance(TranslationConfigurationProvider::class);
$systemLanguages = $translationProvider->getSystemLanguages($pageId);
diff --git a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
index 562886121d96..f450ac17f76e 100644
--- a/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
+++ b/typo3/sysext/backend/Classes/Controller/SimpleDataHandlerController.php
@@ -134,7 +134,6 @@ class SimpleDataHandlerController
$this->initializeClipboard($request);
$this->processRequest();
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
$content = [
diff --git a/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php b/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
index 0b7178bd006c..938780cd3367 100644
--- a/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
+++ b/typo3/sysext/backend/Classes/Controller/Wizard/AddController.php
@@ -99,9 +99,7 @@ class AddController extends AbstractWizardController
if ($this->processDataFlag) {
// Because OnTheFly can't handle MM relations with intermediate tables we use TcaDatabaseRecord here
// Otherwise already stored relations are overwritten with the new entry
- /** @var TcaDatabaseRecord $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(TcaDatabaseRecord::class);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$input = [
'tableName' => $this->P['table'],
@@ -114,7 +112,6 @@ class AddController extends AbstractWizardController
// If that record was found (should absolutely be...), then init DataHandler and set, prepend or append
// the record
if (is_array($currentParentRow)) {
- /** @var DataHandler $dataHandler */
$dataHandler = GeneralUtility::makeInstance(DataHandler::class);
$data = [];
$recordId = $this->table . '_' . $this->id;
@@ -197,9 +194,7 @@ class AddController extends AbstractWizardController
// Redirecting to FormEngine with instructions to create a new record
// AND when closing to return back with information about that records ID etc.
- /** @var \TYPO3\CMS\Core\Http\NormalizedParams */
$normalizedParams = $request->getAttribute('normalizedParams');
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$redirectUrl = (string)$uriBuilder->buildUriFromRoute('record_edit', [
'returnEditConf' => 1,
diff --git a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
index e0f5b7d25674..05dd59f90dc3 100644
--- a/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
+++ b/typo3/sysext/backend/Classes/Domain/Repository/Module/BackendModuleRepository.php
@@ -153,7 +153,6 @@ class BackendModuleRepository implements SingletonInterface
*/
protected function createEntryFromRawData(array $module)
{
- /** @var \TYPO3\CMS\Backend\Domain\Model\Module\BackendModule $entry */
$entry = GeneralUtility::makeInstance(BackendModule::class);
if (!empty($module['name']) && is_string($module['name'])) {
$entry->setName($module['name']);
@@ -239,7 +238,6 @@ class BackendModuleRepository implements SingletonInterface
public function getRawModuleMenuData()
{
// Loads the backend modules available for the logged in user.
- /** @var ModuleLoader $moduleLoader */
$moduleLoader = GeneralUtility::makeInstance(ModuleLoader::class);
$moduleLoader->observeWorkspaces = true;
$moduleLoader->load($GLOBALS['TBE_MODULES']);
diff --git a/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php b/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php
index d14bbe8a3710..da5f0f0585aa 100644
--- a/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/InlineControlContainer.php
@@ -107,7 +107,6 @@ class InlineControlContainer extends AbstractContainer
$this->inlineData = $this->data['inlineData'];
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
$this->inlineStackProcessor = $inlineStackProcessor;
$inlineStackProcessor->initializeByGivenStructure($this->data['inlineStructure']);
diff --git a/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php b/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
index f44a59d458ec..61685996509e 100644
--- a/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/SingleFieldContainer.php
@@ -159,7 +159,6 @@ class SingleFieldContainer extends AbstractContainer
*/
protected function isInlineChildAndLabelField($table, $field)
{
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
$inlineStackProcessor->initializeByGivenStructure($this->data['inlineStructure']);
$level = $inlineStackProcessor->getStructureLevel(-1);
@@ -189,7 +188,6 @@ class SingleFieldContainer extends AbstractContainer
'foreign_field' => '',
];
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
$inlineStackProcessor->initializeByGivenStructure($this->data['inlineStructure']);
$structureDepth = $inlineStackProcessor->getStructureDepth();
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php
index 0bd52bb9cd8f..a2b8c45f81ac 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php
@@ -87,7 +87,6 @@ class SelectSingleElement extends AbstractFormElement
$classList = ['form-select', 'form-control-adapt'];
// Check against inline uniqueness
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
$inlineStackProcessor->initializeByGivenStructure($this->data['inlineStructure']);
$uniqueIds = [];
diff --git a/typo3/sysext/backend/Classes/Form/FieldControl/AddRecord.php b/typo3/sysext/backend/Classes/Form/FieldControl/AddRecord.php
index cd066030eff7..958fc90ea154 100644
--- a/typo3/sysext/backend/Classes/Form/FieldControl/AddRecord.php
+++ b/typo3/sysext/backend/Classes/Form/FieldControl/AddRecord.php
@@ -89,7 +89,6 @@ class AddRecord extends AbstractNode
$id = StringUtility::getUniqueId('t3js-formengine-fieldcontrol-');
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
return [
'iconIdentifier' => 'actions-add',
diff --git a/typo3/sysext/backend/Classes/Form/FieldControl/LinkPopup.php b/typo3/sysext/backend/Classes/Form/FieldControl/LinkPopup.php
index d8d8ec4272e0..61dbc6c85900 100644
--- a/typo3/sysext/backend/Classes/Form/FieldControl/LinkPopup.php
+++ b/typo3/sysext/backend/Classes/Form/FieldControl/LinkPopup.php
@@ -69,7 +69,6 @@ class LinkPopup extends AbstractNode
],
$this->forwardOnFieldChangeQueryParams($parameterArray['fieldChangeFunc'] ?? [])
);
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$url = (string)$uriBuilder->buildUriFromRoute('wizard_link', ['P' => $urlParameters]);
$id = StringUtility::getUniqueId('t3js-formengine-fieldcontrol-');
diff --git a/typo3/sysext/backend/Classes/Form/FieldControl/ListModule.php b/typo3/sysext/backend/Classes/Form/FieldControl/ListModule.php
index ae83bfd0e57a..fa1614dc0713 100644
--- a/typo3/sysext/backend/Classes/Form/FieldControl/ListModule.php
+++ b/typo3/sysext/backend/Classes/Form/FieldControl/ListModule.php
@@ -91,7 +91,6 @@ class ListModule extends AbstractNode
$id = StringUtility::getUniqueId('t3js-formengine-fieldcontrol-');
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
return [
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
index dbb547f391f4..a03cba3d638d 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/AbstractItemProvider.php
@@ -30,7 +30,6 @@ use TYPO3\CMS\Core\Hooks\TcaItemsProcessorFunctions;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Messaging\FlashMessage;
-use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
use TYPO3\CMS\Core\Messaging\FlashMessageService;
use TYPO3\CMS\Core\Resource\FileRepository;
use TYPO3\CMS\Core\Resource\ResourceStorage;
@@ -108,7 +107,6 @@ abstract class AbstractItemProvider
$fieldLabel,
$exception->getMessage()
);
- /** @var FlashMessage $flashMessage */
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
$message,
@@ -116,7 +114,6 @@ abstract class AbstractItemProvider
FlashMessage::ERROR,
true
);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
@@ -354,11 +351,8 @@ abstract class AbstractItemProvider
$msg = $databaseError . '. ';
$msg .= $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:error.database_schema_mismatch');
$msgTitle = $languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:error.database_schema_mismatch_title');
- /** @var FlashMessage $flashMessage */
$flashMessage = GeneralUtility::makeInstance(FlashMessage::class, $msg, $msgTitle, FlashMessage::ERROR, true);
- /** @var FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
- /** @var FlashMessageQueue $defaultFlashMessageQueue */
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
return $items;
@@ -622,7 +616,6 @@ abstract class AbstractItemProvider
$foreignTableClauseArray = $this->processForeignTableClause($result, $foreignTableName, $localFieldName);
$fieldList = BackendUtility::getCommonSelectFields($foreignTableName, $foreignTableName . '.');
- /** @var QueryBuilder $queryBuilder */
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
->getQueryBuilderForTable($foreignTableName);
@@ -1031,7 +1024,6 @@ abstract class AbstractItemProvider
}
if (isset($fieldConfig['config']['foreign_table']) && !empty($fieldConfig['config']['foreign_table'])) {
- /** @var RelationHandler $relationHandler */
$relationHandler = GeneralUtility::makeInstance(RelationHandler::class);
$relationHandler->registerNonTableValues = !empty($fieldConfig['config']['allowNonIdValues']);
if (!empty($fieldConfig['config']['MM']) && $result['command'] !== 'new') {
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseLanguageRows.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseLanguageRows.php
index 7a2e68e01802..021dc1e987fc 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseLanguageRows.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseLanguageRows.php
@@ -76,7 +76,6 @@ class DatabaseLanguageRows implements FormDataProviderInterface
// @todo: The TranslationConfigurationProvider is more stupid than good for us ... invent a better translation overlay api!
if (!empty($result['userTsConfig']['options.']['additionalPreviewLanguages'])) {
$additionalLanguageUids = GeneralUtility::intExplode(',', $result['userTsConfig']['options.']['additionalPreviewLanguages'], true);
- /** @var TranslationConfigurationProvider $translationProvider */
$translationProvider = GeneralUtility::makeInstance(TranslationConfigurationProvider::class);
foreach ($additionalLanguageUids as $additionalLanguageUid) {
// Continue if this system language record does not exist or if 0 or -1 is requested
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseSystemLanguageRows.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseSystemLanguageRows.php
index 5dba095d321f..34ad86ce0552 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseSystemLanguageRows.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/DatabaseSystemLanguageRows.php
@@ -76,14 +76,12 @@ class DatabaseSystemLanguageRows implements FormDataProviderInterface
$language->getTwoLetterIsoCode(),
$languageId
);
- /** @var FlashMessage $flashMessage */
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
$message,
'',
FlashMessage::ERROR
);
- /** @var FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/SiteDatabaseEditRow.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/SiteDatabaseEditRow.php
index b64bfb28ad6e..aea73abe96e3 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/SiteDatabaseEditRow.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/SiteDatabaseEditRow.php
@@ -54,7 +54,6 @@ class SiteDatabaseEditRow implements FormDataProviderInterface
}
$tableName = $result['tableName'];
- /** @var SiteFinder $siteFinder */
$siteFinder = GeneralUtility::makeInstance(SiteFinder::class, $this->siteConfiguration);
if ($tableName === 'site') {
$rootPageId = (int)$result['vanillaUid'];
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/SiteTcaInline.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/SiteTcaInline.php
index c345493683dc..c477515cda2f 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/SiteTcaInline.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/SiteTcaInline.php
@@ -162,7 +162,6 @@ class SiteTcaInline extends AbstractDatabaseRecordProvider implements FormDataPr
$parentConfig = $result['processedTca']['columns'][$parentFieldName]['config'];
$childTableName = $parentConfig['foreign_table'];
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
$inlineStackProcessor->initializeByGivenStructure($result['inlineStructure']);
$inlineTopMostParent = $inlineStackProcessor->getStructureLevel(0);
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInline.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInline.php
index 469fff201fbd..2b976ee36d19 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInline.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInline.php
@@ -292,10 +292,8 @@ class TcaInline extends AbstractDatabaseRecordProvider implements FormDataProvid
],
'inlineExpandCollapseStateArray' => $result['inlineExpandCollapseStateArray'],
];
- /** @var OnTheFly $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(OnTheFly::class);
$formDataGroup->setProviderList([TcaSelectItems::class]);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$compilerResult = $formDataCompiler->compile($selectDataInput);
$selectorOrUniquePossibleRecords = $compilerResult['processedTca']['columns'][$foreignFieldName]['config']['items'];
@@ -319,14 +317,11 @@ class TcaInline extends AbstractDatabaseRecordProvider implements FormDataProvid
$parentConfig = $result['processedTca']['columns'][$parentFieldName]['config'];
$childTableName = $parentConfig['foreign_table'];
- /** @var InlineStackProcessor $inlineStackProcessor */
$inlineStackProcessor = GeneralUtility::makeInstance(InlineStackProcessor::class);
$inlineStackProcessor->initializeByGivenStructure($result['inlineStructure']);
$inlineTopMostParent = $inlineStackProcessor->getStructureLevel(0) ?: [];
- /** @var TcaDatabaseRecord $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(TcaDatabaseRecord::class);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$formDataCompilerInput = [
'command' => 'edit',
@@ -394,9 +389,7 @@ class TcaInline extends AbstractDatabaseRecordProvider implements FormDataProvid
$childChildUid = $child['databaseRow'][$parentConfig['foreign_selector']][0];
// child-child table name is set in child tca "the selector field" foreign_table
$childChildTableName = $child['processedTca']['columns'][$parentConfig['foreign_selector']]['config']['foreign_table'];
- /** @var TcaDatabaseRecord $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(TcaDatabaseRecord::class);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$formDataCompilerInput = [
@@ -462,7 +455,6 @@ class TcaInline extends AbstractDatabaseRecordProvider implements FormDataProvid
if (empty($parentConfig['MM'])) {
$parentUid = $this->getLiveDefaultId($parentTableName, $parentUid);
}
- /** @var RelationHandler $relationHandler */
$relationHandler = GeneralUtility::makeInstance(RelationHandler::class);
$relationHandler->registerNonTableValues = (bool)($parentConfig['allowedIdValues'] ?? false);
$relationHandler->start($parentFieldValue, $parentConfig['foreign_table'] ?? '', $parentConfig['MM'] ?? '', $parentUid, $parentTableName, $parentConfig);
diff --git a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php
index 03f3d7417040..b0156d81c7c0 100644
--- a/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php
+++ b/typo3/sysext/backend/Classes/Form/FormDataProvider/TcaInputPlaceholders.php
@@ -168,9 +168,7 @@ class TcaInputPlaceholders implements FormDataProviderInterface
'inlineCompileExistingChildren' => false,
'columnsToProcess' => [$columnToProcess],
];
- /** @var TcaInputPlaceholderRecord $formDataGroup */
$formDataGroup = GeneralUtility::makeInstance(TcaInputPlaceholderRecord::class);
- /** @var FormDataCompiler $formDataCompiler */
$formDataCompiler = GeneralUtility::makeInstance(FormDataCompiler::class, $formDataGroup);
$compilerResult = $formDataCompiler->compile($fakeDataInput);
return $compilerResult;
diff --git a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
index 10f5caaa2d27..b4b6f953719a 100644
--- a/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
+++ b/typo3/sysext/backend/Classes/Form/FormResultCompiler.php
@@ -192,7 +192,6 @@ class FormResultCompiler
protected function JSbottom()
{
$pageRenderer = $this->getPageRenderer();
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
// @todo: this is messy here - "additional hidden fields" should be handled elsewhere
diff --git a/typo3/sysext/backend/Classes/Http/RouteDispatcher.php b/typo3/sysext/backend/Classes/Http/RouteDispatcher.php
index 85e2cc56b41d..9ebc08442f38 100644
--- a/typo3/sysext/backend/Classes/Http/RouteDispatcher.php
+++ b/typo3/sysext/backend/Classes/Http/RouteDispatcher.php
@@ -112,7 +112,6 @@ class RouteDispatcher extends Dispatcher
*/
protected function enforceReferrer(ServerRequestInterface $request, Route $route): ?ResponseInterface
{
- /** @var Features $features */
$features = GeneralUtility::makeInstance(Features::class);
if (!$features->isFeatureEnabled('security.backend.enforceReferrer')) {
return null;
@@ -121,7 +120,6 @@ class RouteDispatcher extends Dispatcher
if (!in_array('required', $referrerFlags, true)) {
return null;
}
- /** @var ReferrerEnforcer $referrerEnforcer */
$referrerEnforcer = GeneralUtility::makeInstance(ReferrerEnforcer::class, $request);
return $referrerEnforcer->handle([
'flags' => $referrerFlags,
diff --git a/typo3/sysext/backend/Classes/Module/ModuleLoader.php b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
index c8377621e5ed..39a03ab78f63 100644
--- a/typo3/sysext/backend/Classes/Module/ModuleLoader.php
+++ b/typo3/sysext/backend/Classes/Module/ModuleLoader.php
@@ -167,7 +167,6 @@ class ModuleLoader
$finalModuleConfiguration['name'] = $name;
// Language processing. This will add module labels and image reference to the internal ->moduleLabels array of the LANG object.
$this->addLabelsForModule($name, $finalModuleConfiguration['labels'] ?? $setupInformation['labels']);
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
if (isset($setupInformation['configuration']['routeTarget'])) {
$finalModuleConfiguration['script'] = (string)$uriBuilder->buildUriFromRoute($name);
diff --git a/typo3/sysext/backend/Classes/Security/CategoryPermissionsAspect.php b/typo3/sysext/backend/Classes/Security/CategoryPermissionsAspect.php
index d60f41ab8547..5bf0aebb85ae 100644
--- a/typo3/sysext/backend/Classes/Security/CategoryPermissionsAspect.php
+++ b/typo3/sysext/backend/Classes/Security/CategoryPermissionsAspect.php
@@ -87,7 +87,6 @@ final class CategoryPermissionsAspect
$treeData->removeChildNodes();
// Create an empty tree node collection to receive the secured nodes.
- /** @var TreeNodeCollection $securedTreeNodeCollection */
$securedTreeNodeCollection = GeneralUtility::makeInstance(TreeNodeCollection::class);
foreach ($categoryMountPoints as $categoryMountPoint) {
diff --git a/typo3/sysext/backend/Classes/Utility/BackendUtility.php b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
index fece77c2f19d..92b981def6d7 100644
--- a/typo3/sysext/backend/Classes/Utility/BackendUtility.php
+++ b/typo3/sysext/backend/Classes/Utility/BackendUtility.php
@@ -962,7 +962,6 @@ class BackendUtility
}
$fileReferences = [];
- /** @var RelationHandler $relationHandler */
$relationHandler = GeneralUtility::makeInstance(RelationHandler::class);
if ($workspaceId !== null) {
$relationHandler->setWorkspaceId($workspaceId);
@@ -1970,7 +1969,6 @@ class BackendUtility
}
// Add see also arrow if we have more info
if ($helpTextArray['moreInfo']) {
- /** @var IconFactory $iconFactory */
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$arrow = $iconFactory->getIcon('actions-view-go-forward', Icon::SIZE_SMALL)->render();
}
diff --git a/typo3/sysext/backend/Classes/View/PageLayoutView.php b/typo3/sysext/backend/Classes/View/PageLayoutView.php
index abfae5e4d686..4dd544ab7d1c 100644
--- a/typo3/sysext/backend/Classes/View/PageLayoutView.php
+++ b/typo3/sysext/backend/Classes/View/PageLayoutView.php
@@ -202,7 +202,6 @@ class PageLayoutView implements LoggerAwareInterface
{
$drawingConfiguration = $context->getDrawingConfiguration();
$languageId = $drawingConfiguration->getSelectedLanguageId();
- /** @var PageLayoutView $pageLayoutView */
$pageLayoutView = GeneralUtility::makeInstance(self::class);
$pageLayoutView->id = $context->getPageId();
$pageLayoutView->pageinfo = BackendUtility::readPageAccess($pageLayoutView->id, '') ?: [];
diff --git a/typo3/sysext/backend/Tests/Functional/Controller/EditDocumentControllerTest.php b/typo3/sysext/backend/Tests/Functional/Controller/EditDocumentControllerTest.php
index c98c1c3daa1c..e24c2eb569ca 100644
--- a/typo3/sysext/backend/Tests/Functional/Controller/EditDocumentControllerTest.php
+++ b/typo3/sysext/backend/Tests/Functional/Controller/EditDocumentControllerTest.php
@@ -33,9 +33,6 @@ class EditDocumentControllerTest extends FunctionalTestCase
{
protected EditDocumentController $subject;
- /**
- * @var NormalizedParams
- */
protected NormalizedParams $normalizedParams;
/**
diff --git a/typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php b/typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php
index 19c0c5fd9a08..b9174ee59902 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php
@@ -17,9 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Backend\Tests\Unit\Form\Element;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Backend\Form\Element\AbstractFormElement;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -275,7 +273,6 @@ class AbstractFormElementTest extends UnitTestCase
*/
public function formatValueWithGivenConfiguration(array $config, ?string $itemValue, string $expectedResult): void
{
- /** @var AbstractFormElement|MockObject|AccessibleObjectInterface */
$subject = $this->getAccessibleMock(AbstractFormElement::class, ['render'], [], '', false);
$timezoneBackup = date_default_timezone_get();
date_default_timezone_set('UTC');
diff --git a/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php b/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php
index 7a7a967119e8..2e80b0c280d9 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php
@@ -17,14 +17,12 @@ declare(strict_types=1);
namespace TYPO3\CMS\Backend\Tests\Unit\Form;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Backend\Form\InlineStackProcessor;
use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
class InlineStackProcessorTest extends UnitTestCase
@@ -272,7 +270,6 @@ class InlineStackProcessorTest extends UnitTestCase
*/
public function initializeByParsingDomObjectIdStringParsesStructureString(string $string, array $expectedInlineStructure, array $_): void
{
- /** @var InlineStackProcessor|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(InlineStackProcessor::class, ['dummy']);
$subject->initializeByParsingDomObjectIdString($string);
$structure = $subject->_get('inlineStructure');
@@ -285,7 +282,6 @@ class InlineStackProcessorTest extends UnitTestCase
*/
public function getCurrentStructureFormPrefixReturnsExpectedStringAfterInitializationByStructureString(string $string, array $_, array $expectedFormName): void
{
- /** @var InlineStackProcessor|MockObject|AccessibleObjectInterface $subject */
$subject = new InlineStackProcessor();
$subject->initializeByParsingDomObjectIdString($string);
self::assertEquals($expectedFormName['form'], $subject->getCurrentStructureFormPrefix());
@@ -297,7 +293,6 @@ class InlineStackProcessorTest extends UnitTestCase
*/
public function getCurrentStructureDomObjectIdPrefixReturnsExpectedStringAfterInitializationByStructureString(string $string, array $_, array $expectedFormName): void
{
- /** @var InlineStackProcessor|MockObject|AccessibleObjectInterface $subject */
$subject = new InlineStackProcessor();
$subject->initializeByParsingDomObjectIdString($string);
self::assertEquals($expectedFormName['object'], $subject->getCurrentStructureDomObjectIdPrefix('pageId'));
diff --git a/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php b/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
index 658fc70e995f..d0c7c9801c91 100644
--- a/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
+++ b/typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
@@ -283,7 +283,6 @@ class NodeFactoryTest extends UnitTestCase
$this->expectException(Exception::class);
$this->expectExceptionCode(1431872546);
$mockNode = new \stdClass();
- /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
$mockSubject = $this->getMockBuilder(NodeFactory::class)
->onlyMethods(['instantiate'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/belog/Classes/Controller/BackendLogController.php b/typo3/sysext/belog/Classes/Controller/BackendLogController.php
index 963251043e01..161931f25c2d 100644
--- a/typo3/sysext/belog/Classes/Controller/BackendLogController.php
+++ b/typo3/sysext/belog/Classes/Controller/BackendLogController.php
@@ -20,6 +20,7 @@ use TYPO3\CMS\Backend\Template\ModuleTemplateFactory;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Belog\Domain\Model\Constraint;
use TYPO3\CMS\Belog\Domain\Model\LogEntry;
+use TYPO3\CMS\Belog\Domain\Model\Workspace;
use TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository;
use TYPO3\CMS\Belog\Domain\Repository\WorkspaceRepository;
use TYPO3\CMS\Core\Messaging\AbstractMessage;
@@ -127,7 +128,7 @@ class BackendLogController extends ActionController
*/
public function deleteMessageAction(int $errorUid): ResponseInterface
{
- /** @var \TYPO3\CMS\Belog\Domain\Model\LogEntry $logEntry */
+ /** @var LogEntry $logEntry */
$logEntry = $this->logEntryRepository->findByUid($errorUid);
if (!$logEntry) {
$this->addFlashMessage(LocalizationUtility::translate('actions.delete.noRowFound', 'belog') ?? '', '', AbstractMessage::WARNING);
@@ -256,7 +257,7 @@ class BackendLogController extends ActionController
$workspaceArray[-99] = LocalizationUtility::translate('any', 'Belog');
$workspaceArray[0] = LocalizationUtility::translate('live', 'Belog');
$workspaces = $this->workspaceRepository->findAll();
- /** @var \TYPO3\CMS\Belog\Domain\Model\Workspace $workspace */
+ /** @var Workspace $workspace */
foreach ($workspaces as $workspace) {
$workspaceArray[$workspace->getUid()] = $workspace->getUid() . ': ' . $workspace->getTitle();
}
diff --git a/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php b/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
index d6acc1437e46..952e93947921 100644
--- a/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
+++ b/typo3/sysext/belog/Classes/Domain/Repository/LogEntryRepository.php
@@ -124,7 +124,6 @@ class LogEntryRepository extends Repository
$pageIds = [];
// Check if we should get a whole tree of pages and not only a single page
if ($constraint->getDepth() > 0) {
- /** @var \TYPO3\CMS\Backend\Tree\View\PageTreeView $pageTree */
$pageTree = GeneralUtility::makeInstance(PageTreeView::class);
$pageTree->init('AND ' . $GLOBALS['BE_USER']->getPagePermsClause(Permission::PAGE_SHOW));
$pageTree->makeHTML = 0;
diff --git a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
index 08dbbb168bdd..5238df5e2698 100644
--- a/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
+++ b/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php
@@ -1318,7 +1318,6 @@ TCAdefaults.sys_note.email = ' . $this->user['email'];
protected function initializeFileStorages()
{
$this->fileStorages = [];
- /** @var \TYPO3\CMS\Core\Resource\StorageRepository $storageRepository */
$storageRepository = GeneralUtility::makeInstance(StorageRepository::class);
// Admin users have all file storages visible, without any filters
if ($this->isAdmin()) {
@@ -1706,7 +1705,6 @@ TCAdefaults.sys_note.email = ' . $this->user['email'];
}
}
if (!$uploadFolder instanceof Folder) {
- /** @var ResourceStorage $storage */
foreach ($this->getFileStorages() as $storage) {
if ($storage->isWritable()) {
try {
diff --git a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
index 30d44d6e5f39..c80a15e22adf 100644
--- a/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
+++ b/typo3/sysext/core/Classes/Cache/Backend/Typo3DatabaseBackend.php
@@ -271,7 +271,6 @@ class Typo3DatabaseBackend extends AbstractBackend implements TaggableBackendInt
return;
}
- /** @var Connection $connection */
$connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable($this->cacheTable);
// A large set of tags was detected. Process it in chunks to guard against exceeding
@@ -331,7 +330,6 @@ class Typo3DatabaseBackend extends AbstractBackend implements TaggableBackendInt
return;
}
- /** @var Connection $connection */
$connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable($this->cacheTable);
$quotedTag = '\'' . $tag . '\'';
diff --git a/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php b/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
index 4ef52c0cf30a..18e78649a8cc 100644
--- a/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
+++ b/typo3/sysext/core/Classes/Category/Collection/CategoryCollection.php
@@ -21,6 +21,7 @@ use TYPO3\CMS\Core\Collection\EditableCollectionInterface;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryBuilder;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
+use TYPO3\CMS\Core\Resource\File;
use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
@@ -72,7 +73,6 @@ class CategoryCollection extends AbstractRecordCollection implements EditableCol
*/
public static function create(array $collectionRecord, $fillItems = false)
{
- /** @var CategoryCollection $collection */
$collection = GeneralUtility::makeInstance(
self::class,
$collectionRecord['table_name'],
@@ -287,7 +287,7 @@ class CategoryCollection extends AbstractRecordCollection implements EditableCol
public function getItems()
{
$itemArray = [];
- /** @var \TYPO3\CMS\Core\Resource\File $item */
+ /** @var File $item */
foreach ($this->storage as $item) {
$itemArray[] = $item;
}
diff --git a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
index d0dccf301b51..c75067ee3801 100644
--- a/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
+++ b/typo3/sysext/core/Classes/Collection/AbstractRecordCollection.php
@@ -400,7 +400,6 @@ abstract class AbstractRecordCollection implements RecordCollectionInterface, Pe
if ($this->getIdentifier() == 0) {
$data[trim(static::getCollectionDatabaseTable())][$uid]['pid'] = 0;
}
- /** @var \TYPO3\CMS\Core\DataHandling\DataHandler $tce */
$tce = GeneralUtility::makeInstance(DataHandler::class);
$tce->start($data, []);
$tce->process_datamap();
diff --git a/typo3/sysext/core/Classes/Configuration/Richtext.php b/typo3/sysext/core/Classes/Configuration/Richtext.php
index 231a03e54e45..c1f26dac79ef 100644
--- a/typo3/sysext/core/Classes/Configuration/Richtext.php
+++ b/typo3/sysext/core/Classes/Configuration/Richtext.php
@@ -150,7 +150,6 @@ class Richtext
if (substr($key, -1) !== '.') {
continue;
}
- /** @var TypoScriptService $typoScriptService */
$typoScriptService = GeneralUtility::makeInstance(TypoScriptService::class);
$typoScriptArray[substr($key, 0, -1)] = $typoScriptService->convertTypoScriptArrayToPlainArray($typoScriptArray[$key]);
}
diff --git a/typo3/sysext/core/Classes/Core/Bootstrap.php b/typo3/sysext/core/Classes/Core/Bootstrap.php
index b42c83acd424..21435725a6d3 100644
--- a/typo3/sysext/core/Classes/Core/Bootstrap.php
+++ b/typo3/sysext/core/Classes/Core/Bootstrap.php
@@ -249,7 +249,7 @@ class Bootstrap
public static function createPackageManager($packageManagerClassName, PackageCacheInterface $packageCache): PackageManager
{
$dependencyOrderingService = GeneralUtility::makeInstance(DependencyOrderingService::class);
- /** @var \TYPO3\CMS\Core\Package\PackageManager $packageManager */
+ /** @var PackageManager $packageManager */
$packageManager = new $packageManagerClassName($dependencyOrderingService);
$packageManager->setPackageCache($packageCache);
$packageManager->initialize();
@@ -550,7 +550,7 @@ class Bootstrap
trigger_error('Using the hook $TYPO3_CONF_VARS[SC_OPTIONS][GLOBAL][extTablesInclusion-PostProcessing] will be removed in TYPO3 v12.0. in favor of the new PSR-14 BootCompletedEvent', E_USER_DEPRECATED);
}
foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['extTablesInclusion-PostProcessing'] ?? [] as $className) {
- /** @var \TYPO3\CMS\Core\Database\TableConfigurationPostProcessingHookInterface $hookObject */
+ /** @var TableConfigurationPostProcessingHookInterface $hookObject */
$hookObject = GeneralUtility::makeInstance($className);
if (!$hookObject instanceof TableConfigurationPostProcessingHookInterface) {
throw new \UnexpectedValueException(
@@ -571,7 +571,7 @@ class Bootstrap
*/
public static function initializeBackendUser($className = BackendUserAuthentication::class, ServerRequestInterface $request = null)
{
- /** @var \TYPO3\CMS\Core\Authentication\BackendUserAuthentication $backendUser */
+ /** @var BackendUserAuthentication $backendUser */
$backendUser = GeneralUtility::makeInstance($className);
// The global must be available very early, because methods below
// might trigger code which relies on it. See: #45625
@@ -597,7 +597,6 @@ class Bootstrap
*/
public static function initializeLanguageObject()
{
- /** @var \TYPO3\CMS\Core\Localization\LanguageService $GLOBALS['LANG'] */
$GLOBALS['LANG'] = GeneralUtility::makeInstance(LanguageServiceFactory::class)->createFromUserPreferences($GLOBALS['BE_USER']);
}
}
diff --git a/typo3/sysext/core/Classes/Core/ClassLoadingInformation.php b/typo3/sysext/core/Classes/Core/ClassLoadingInformation.php
index 466ee094028a..d718575f9e2d 100644
--- a/typo3/sysext/core/Classes/Core/ClassLoadingInformation.php
+++ b/typo3/sysext/core/Classes/Core/ClassLoadingInformation.php
@@ -94,7 +94,6 @@ class ClassLoadingInformation
$composerClassLoader = static::getClassLoader();
$activeExtensionPackages = static::getActiveExtensionPackages();
- /** @var ClassLoadingInformationGenerator $generator */
$generator = GeneralUtility::makeInstance(ClassLoadingInformationGenerator::class, $composerClassLoader, $activeExtensionPackages, Environment::getPublicPath() . '/', self::isTestingContext());
$classInfoFiles = $generator->buildAutoloadInformationFiles();
GeneralUtility::writeFile(self::getClassLoadingInformationDirectory() . self::AUTOLOAD_CLASSMAP_FILENAME, $classInfoFiles['classMapFile']);
@@ -174,7 +173,6 @@ class ClassLoadingInformation
$composerClassLoader = static::getClassLoader();
$activeExtensionPackages = static::getActiveExtensionPackages();
- /** @var ClassLoadingInformationGenerator $generator */
$generator = GeneralUtility::makeInstance(ClassLoadingInformationGenerator::class, $composerClassLoader, $activeExtensionPackages, Environment::getPublicPath() . '/', self::isTestingContext());
$classInformation = $generator->buildClassLoadingInformationForPackage($package);
diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
index b5d5fdec812f..d951b0b0fd8f 100644
--- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php
+++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php
@@ -999,8 +999,7 @@ class DataHandler implements LoggerAwareInterface
// new version of a record created in a workspace - so always refresh pagetree to indicate there is a change in the workspace
$this->pagetreeNeedsRefresh = true;
- /** @var DataHandler $tce */
- $tce = GeneralUtility::makeInstance(__CLASS__, $this->referenceIndexUpdater);
+ $tce = GeneralUtility::makeInstance(self::class, $this->referenceIndexUpdater);
$tce->enableLogging = $this->enableLogging;
// Setting up command for creating a new version of the record:
$cmd = [];
@@ -1901,7 +1900,6 @@ class DataHandler implements LoggerAwareInterface
{
$items = $tcaFieldConf['items'] ?? null;
if (!empty($tcaFieldConf['itemsProcFunc'])) {
- /** @var ItemProcessingService $processingService */
$processingService = GeneralUtility::makeInstance(ItemProcessingService::class);
$items = $processingService->getProcessingItems(
$table,
@@ -2216,7 +2214,6 @@ class DataHandler implements LoggerAwareInterface
*/
public function checkValue_flexArray2Xml($array, $addPrologue = false)
{
- /** @var FlexFormTools $flexObj */
$flexObj = GeneralUtility::makeInstance(FlexFormTools::class);
return $flexObj->flexArray2Xml($array, $addPrologue);
}
@@ -2800,7 +2797,6 @@ class DataHandler implements LoggerAwareInterface
$tables = $type === 'group' ? $tcaFieldConf['allowed'] : $tcaFieldConf['foreign_table'];
$prep = $type === 'group' ? ($tcaFieldConf['prepend_tname'] ?? '') : '';
$newRelations = implode(',', $valueArray);
- /** @var RelationHandler $dbAnalysis */
$dbAnalysis = $this->createRelationHandlerInstance();
$dbAnalysis->registerNonTableValues = !empty($tcaFieldConf['allowNonIdValues']);
$dbAnalysis->start($newRelations, $tables, '', 0, $currentTable, $tcaFieldConf);
@@ -2809,7 +2805,6 @@ class DataHandler implements LoggerAwareInterface
// (only required for MM relations in a workspace context)
$dbAnalysis->convertItemArray();
if ($status === 'update') {
- /** @var RelationHandler $oldRelations_dbAnalysis */
$oldRelations_dbAnalysis = $this->createRelationHandlerInstance();
$oldRelations_dbAnalysis->registerNonTableValues = !empty($tcaFieldConf['allowNonIdValues']);
// Db analysis with $id will initialize with the existing relations
@@ -3038,7 +3033,6 @@ class DataHandler implements LoggerAwareInterface
$foreignTable = $tcaFieldConf['foreign_table'];
$valueArray = $this->applyFiltersToValues($tcaFieldConf, $valueArray);
// Fetch the related child records using \TYPO3\CMS\Core\Database\RelationHandler
- /** @var RelationHandler $dbAnalysis */
$dbAnalysis = $this->createRelationHandlerInstance();
$dbAnalysis->start(implode(',', $valueArray), $foreignTable, '', 0, $table, $tcaFieldConf);
// IRRE with a pointer field (database normalization):
@@ -3187,7 +3181,6 @@ class DataHandler implements LoggerAwareInterface
}
}
}
- /** @var DataHandler $copyTCE */
$copyTCE = $this->getLocalTCE();
$copyTCE->start($pasteDatamap, [], $this->BE_USER);
$copyTCE->process_datamap();
@@ -3328,7 +3321,6 @@ class DataHandler implements LoggerAwareInterface
$data[$table][$theNewID][$GLOBALS['TCA'][$table]['ctrl']['origUid']] = $uid;
}
// Do the copy by simply submitting the array through DataHandler:
- /** @var DataHandler $copyTCE */
$copyTCE = $this->getLocalTCE();
$copyTCE->start($data, [], $this->BE_USER);
$copyTCE->process_datamap();
@@ -3830,7 +3822,6 @@ class DataHandler implements LoggerAwareInterface
array $workspaceOptions
) {
// Fetch the related child records using \TYPO3\CMS\Core\Database\RelationHandler
- /** @var RelationHandler $dbAnalysis */
$dbAnalysis = $this->createRelationHandlerInstance();
$dbAnalysis->start($value, $conf['foreign_table'], '', $uid, $table, $conf);
// Walk through the items, copy them and remember the new id:
@@ -4698,7 +4689,6 @@ class DataHandler implements LoggerAwareInterface
$removeArray = [];
$mmTable = $inlineSubType === 'mm' && isset($config['MM']) && $config['MM'] ? $config['MM'] : '';
// Fetch children from original language parent:
- /** @var RelationHandler $dbAnalysisOriginal */
$dbAnalysisOriginal = $this->createRelationHandlerInstance();
$dbAnalysisOriginal->start($transOrigRecord[$field], $foreignTable, $mmTable, $transOrigRecord['uid'], $table, $config);
$elementsOriginal = [];
@@ -4707,7 +4697,6 @@ class DataHandler implements LoggerAwareInterface
}
unset($dbAnalysisOriginal);
// Fetch children from current localized parent:
- /** @var RelationHandler $dbAnalysisCurrent */
$dbAnalysisCurrent = $this->createRelationHandlerInstance();
$dbAnalysisCurrent->start($parentRecord[$field], $foreignTable, $mmTable, $id, $table, $config);
// Perform synchronization: Possibly removal of already localized records:
@@ -4758,8 +4747,7 @@ class DataHandler implements LoggerAwareInterface
$this->registerDBList[$table][$id][$field] = $value;
// Remove child records (if synchronization requested it):
if (is_array($removeArray) && !empty($removeArray)) {
- /** @var DataHandler $tce */
- $tce = GeneralUtility::makeInstance(__CLASS__, $this->referenceIndexUpdater);
+ $tce = GeneralUtility::makeInstance(self::class, $this->referenceIndexUpdater);
$tce->enableLogging = $this->enableLogging;
$tce->start([], $removeArray, $this->BE_USER);
$tce->process_cmdmap();
@@ -5317,7 +5305,6 @@ class DataHandler implements LoggerAwareInterface
if ($foreign_table) {
$inlineType = $this->getInlineFieldType($conf);
if ($inlineType === 'list' || $inlineType === 'field') {
- /** @var RelationHandler $dbAnalysis */
$dbAnalysis = $this->createRelationHandlerInstance();
$dbAnalysis->start($value, $conf['foreign_table'], '', $uid, $table, $conf);
$dbAnalysis->undeleteRecord = true;
@@ -6354,7 +6341,6 @@ class DataHandler implements LoggerAwareInterface
if ($inlineType === 'mm') {
$this->remapListedDBRecords_procDBRefs($conf, $value, $theUidToUpdate, $table);
} elseif ($inlineType !== false) {
- /** @var RelationHandler $dbAnalysis */
$dbAnalysis = $this->createRelationHandlerInstance();
$dbAnalysis->start($value, $conf['foreign_table'], '', 0, $table, $conf);
@@ -8708,7 +8694,6 @@ class DataHandler implements LoggerAwareInterface
}
}
- /** @var CacheManager $cacheManager */
$cacheManager = $this->getCacheManager();
$cacheManager->flushCachesInGroupByTags('pages', array_keys($tagsToClear));
@@ -9063,9 +9048,7 @@ class DataHandler implements LoggerAwareInterface
while ($row = $result->fetchAssociative()) {
$msg = $this->formatLogDetails($row['details'], $row['log_data'] ?? '');
$msg = $row['error'] . ': ' . $msg;
- /** @var FlashMessage $flashMessage */
$flashMessage = GeneralUtility::makeInstance(FlashMessage::class, $msg, '', $row['error'] === SystemLogErrorClassification::WARNING ? FlashMessage::WARNING : FlashMessage::ERROR, true);
- /** @var FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
@@ -9202,7 +9185,6 @@ class DataHandler implements LoggerAwareInterface
$sortingStatement = !empty($sortingField)
? [$connection->quoteIdentifier($sortingField)]
: null;
- /** @var PlainDataResolver $resolver */
$resolver = GeneralUtility::makeInstance(
PlainDataResolver::class,
$tableName,
diff --git a/typo3/sysext/core/Classes/DataHandling/ItemProcessingService.php b/typo3/sysext/core/Classes/DataHandling/ItemProcessingService.php
index bcdae62281fb..4fa9d11f9e9f 100644
--- a/typo3/sysext/core/Classes/DataHandling/ItemProcessingService.php
+++ b/typo3/sysext/core/Classes/DataHandling/ItemProcessingService.php
@@ -66,7 +66,6 @@ class ItemProcessingService
$fieldLabel,
$exception->getMessage()
);
- /** @var FlashMessage $flashMessage */
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
$message,
@@ -74,7 +73,6 @@ class ItemProcessingService
FlashMessage::ERROR,
true
);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
diff --git a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapItem.php b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapItem.php
index 19d34db45eb1..b60546870798 100644
--- a/typo3/sysext/core/Classes/DataHandling/Localization/DataMapItem.php
+++ b/typo3/sysext/core/Classes/DataHandling/Localization/DataMapItem.php
@@ -110,7 +110,6 @@ class DataMapItem
array $persistedValues,
array $configurationFieldNames
) {
- /** @var DataMapItem $item */
$item = GeneralUtility::makeInstance(
static::class,
$tableName,
diff --git a/typo3/sysext/core/Classes/DataHandling/Model/RecordStateFactory.php b/typo3/sysext/core/Classes/DataHandling/Model/RecordStateFactory.php
index 46b92897cbc7..1fcbf2ace578 100644
--- a/typo3/sysext/core/Classes/DataHandling/Model/RecordStateFactory.php
+++ b/typo3/sysext/core/Classes/DataHandling/Model/RecordStateFactory.php
@@ -68,7 +68,6 @@ class RecordStateFactory
$node = $this->createEntityPointer($pageId, 'pages');
$subject = $this->createEntityPointer($recordId);
- /** @var RecordState $target */
$target = GeneralUtility::makeInstance(
RecordState::class,
$context,
diff --git a/typo3/sysext/core/Classes/Database/QueryView.php b/typo3/sysext/core/Classes/Database/QueryView.php
index cd454657d4f9..a6bf315d73e1 100644
--- a/typo3/sysext/core/Classes/Database/QueryView.php
+++ b/typo3/sysext/core/Classes/Database/QueryView.php
@@ -247,7 +247,6 @@ class QueryView
}
// Show query
if ($saveArr['queryTable']) {
- /** @var \TYPO3\CMS\Core\Database\QueryGenerator $queryGenerator */
$queryGenerator = GeneralUtility::makeInstance(QueryGenerator::class);
$queryGenerator->init('queryConfig', $saveArr['queryTable'], '', $this->settings);
$queryGenerator->makeSelectorTable($saveArr);
@@ -688,7 +687,6 @@ class QueryView
}
}
$out .= '<td>';
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
if (!$row['deleted']) {
diff --git a/typo3/sysext/core/Classes/Database/RelationHandler.php b/typo3/sysext/core/Classes/Database/RelationHandler.php
index 3210c2cf28d1..ea4d2ff46489 100644
--- a/typo3/sysext/core/Classes/Database/RelationHandler.php
+++ b/typo3/sysext/core/Classes/Database/RelationHandler.php
@@ -1714,7 +1714,6 @@ class RelationHandler
*/
protected function getResolver($tableName, array $ids, array $sortingStatement = null)
{
- /** @var PlainDataResolver $resolver */
$resolver = GeneralUtility::makeInstance(
PlainDataResolver::class,
$tableName,
diff --git a/typo3/sysext/core/Classes/Domain/Repository/PageRepository.php b/typo3/sysext/core/Classes/Domain/Repository/PageRepository.php
index df403dd7d90e..5ba233649c56 100644
--- a/typo3/sysext/core/Classes/Domain/Repository/PageRepository.php
+++ b/typo3/sysext/core/Classes/Domain/Repository/PageRepository.php
@@ -1708,7 +1708,7 @@ class PageRepository implements LoggerAwareInterface
// Notice, that unless $bypassEnableFieldsCheck is TRUE, the $row is unset if
// enablefields for BOTH the version AND the online record deselects it. See
// note for $bypassEnableFieldsCheck
- /** @var \TYPO3\CMS\Core\Versioning\VersionState $versionState */
+ /** @var VersionState $versionState */
$versionState = VersionState::cast($row['t3ver_state'] ?? 0);
if ($wsAlt <= -1 || $versionState->indicatesPlaceholder()) {
// Unset record if it turned out to be "hidden"
diff --git a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
index dbd7e0efb8a2..3b21ab716422 100644
--- a/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
+++ b/typo3/sysext/core/Classes/FormProtection/FormProtectionFactory.php
@@ -179,7 +179,6 @@ class FormProtectionFactory
public static function getMessageClosure(LanguageService $languageService, FlashMessageQueue $messageQueue, $isAjaxCall)
{
return static function () use ($languageService, $messageQueue, $isAjaxCall) {
- /** @var FlashMessage $flashMessage */
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
$languageService->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:error.formProtection.tokenInvalid'),
diff --git a/typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php b/typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php
index 4866976a628d..09414d6620ec 100644
--- a/typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php
+++ b/typo3/sysext/core/Classes/Hooks/BackendUserGroupIntegrityCheck.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\DataHandling\DataHandler;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Messaging\FlashMessage;
-use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
use TYPO3\CMS\Core\Messaging\FlashMessageService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -47,7 +46,6 @@ class BackendUserGroupIntegrityCheck
foreach ($explicitAllowDenyFields as $value) {
if ($value !== '' && strpos($value, 'tt_content:list_type:') === 0) {
if (!in_array('tt_content:CType:list:ALLOW', $explicitAllowDenyFields, true)) {
- /** @var FlashMessage $flashMessage */
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
$this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:error.backendUserGroupListTypeError.message'),
@@ -55,9 +53,7 @@ class BackendUserGroupIntegrityCheck
FlashMessage::WARNING,
true
);
- /** @var FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
- /** @var FlashMessageQueue $defaultFlashMessageQueue */
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
}
diff --git a/typo3/sysext/core/Classes/Html/HtmlParser.php b/typo3/sysext/core/Classes/Html/HtmlParser.php
index 94e0ee595eb9..c37ae711e773 100644
--- a/typo3/sysext/core/Classes/Html/HtmlParser.php
+++ b/typo3/sysext/core/Classes/Html/HtmlParser.php
@@ -561,7 +561,6 @@ class HtmlParser
if ($params['prefixLocalAnchors'] ?? false) {
if ($tagAttrib[0][$attr][0] === '#') {
if ($params['prefixLocalAnchors'] == 2) {
- /** @var ContentObjectRenderer $contentObjectRenderer */
$contentObjectRenderer = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$prefix = $contentObjectRenderer->getUrlToCurrentLocation();
} else {
diff --git a/typo3/sysext/core/Classes/Log/LogManager.php b/typo3/sysext/core/Classes/Log/LogManager.php
index 886f05fdcbb3..7db5c585fc25 100644
--- a/typo3/sysext/core/Classes/Log/LogManager.php
+++ b/typo3/sysext/core/Classes/Log/LogManager.php
@@ -19,6 +19,8 @@ use Psr\Log\InvalidArgumentException;
use Psr\Log\LoggerInterface;
use TYPO3\CMS\Core\Log\Exception\InvalidLogProcessorConfigurationException;
use TYPO3\CMS\Core\Log\Exception\InvalidLogWriterConfigurationException;
+use TYPO3\CMS\Core\Log\Processor\ProcessorInterface;
+use TYPO3\CMS\Core\Log\Writer\WriterInterface;
use TYPO3\CMS\Core\SingletonInterface;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -100,7 +102,6 @@ class LogManager implements SingletonInterface, LogManagerInterface
*/
protected function makeLogger(string $name, string $requestId): Logger
{
- /** @var \TYPO3\CMS\Core\Log\Logger $logger */
$logger = GeneralUtility::makeInstance(Logger::class, $name, $requestId);
$this->setWritersForLogger($logger);
$this->setProcessorsForLogger($logger);
@@ -140,7 +141,7 @@ class LogManager implements SingletonInterface, LogManagerInterface
foreach ($writer as $logWriterClassName => $logWriterOptions) {
try {
unset($logWriterOptions['disabled']);
- /** @var \TYPO3\CMS\Core\Log\Writer\WriterInterface $logWriter */
+ /** @var WriterInterface $logWriter */
$logWriter = GeneralUtility::makeInstance($logWriterClassName, $logWriterOptions);
$logger->addWriter($severityLevel, $logWriter);
} catch (InvalidArgumentException|InvalidLogWriterConfigurationException $e) {
@@ -165,7 +166,7 @@ class LogManager implements SingletonInterface, LogManagerInterface
foreach ($configuration as $severityLevel => $processor) {
foreach ($processor as $logProcessorClassName => $logProcessorOptions) {
try {
- /** @var \TYPO3\CMS\Core\Log\Processor\ProcessorInterface $logProcessor */
+ /** @var ProcessorInterface $logProcessor */
$logProcessor = GeneralUtility::makeInstance($logProcessorClassName, $logProcessorOptions);
$logger->addProcessor($severityLevel, $logProcessor);
} catch (InvalidArgumentException|InvalidLogProcessorConfigurationException $e) {
diff --git a/typo3/sysext/core/Classes/Log/Logger.php b/typo3/sysext/core/Classes/Log/Logger.php
index 89df70ffe152..42b1765fb83c 100644
--- a/typo3/sysext/core/Classes/Log/Logger.php
+++ b/typo3/sysext/core/Classes/Log/Logger.php
@@ -201,7 +201,6 @@ class Logger extends AbstractLogger
if ($level > $this->minimumLogLevel) {
return $this;
}
- /** @var \TYPO3\CMS\Core\Log\LogRecord $record */
$record = GeneralUtility::makeInstance(LogRecord::class, $this->name, LogLevel::getInternalName($level), $message, $data, $this->requestId);
$record = $this->callProcessors($record);
$this->writeLog($record);
diff --git a/typo3/sysext/core/Classes/Package/PackageManager.php b/typo3/sysext/core/Classes/Package/PackageManager.php
index f4b49a0f4c43..0ae16039f06a 100644
--- a/typo3/sysext/core/Classes/Package/PackageManager.php
+++ b/typo3/sysext/core/Classes/Package/PackageManager.php
@@ -822,7 +822,6 @@ class PackageManager implements SingletonInterface
throw new InvalidPackageStateException('Package "' . $packageKey . '" is not registered.', 1436201329);
}
- /** @var PackageInterface $package */
$package = $this->packages[$packageKey];
$packagePath = $package->getPackagePath();
$newPackage = new Package($this, $packageKey, $packagePath);
diff --git a/typo3/sysext/core/Classes/Page/DefaultJavaScriptAssetTrait.php b/typo3/sysext/core/Classes/Page/DefaultJavaScriptAssetTrait.php
index 718349a5ba8c..2562aff5ef28 100644
--- a/typo3/sysext/core/Classes/Page/DefaultJavaScriptAssetTrait.php
+++ b/typo3/sysext/core/Classes/Page/DefaultJavaScriptAssetTrait.php
@@ -36,7 +36,6 @@ trait DefaultJavaScriptAssetTrait
return;
}
$filePath = $this->defaultFrontendJavaScriptFile;
- /** @var AssetCollector $collector */
$collector = GeneralUtility::makeInstance(AssetCollector::class);
// `config.removeDefaultJS = external` - persist JavaScript to `typo3temp/assets/`
if ($this->shallExportDefaultFrontendJavaScript()) {
diff --git a/typo3/sysext/core/Classes/Page/PageRenderer.php b/typo3/sysext/core/Classes/Page/PageRenderer.php
index 56be89096338..59ea23650f7a 100644
--- a/typo3/sysext/core/Classes/Page/PageRenderer.php
+++ b/typo3/sysext/core/Classes/Page/PageRenderer.php
@@ -2133,9 +2133,7 @@ class PageRenderer implements SingletonInterface
{
$ajaxUrls = [];
// Add the ajax-based routes
- /** @var UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
- /** @var Router $router */
$router = GeneralUtility::makeInstance(Router::class);
foreach ($router->getRoutes() as $routeIdentifier => $route) {
if ($publicRoutesOnly && $route->getOption('access') !== 'public') {
@@ -2414,7 +2412,6 @@ class PageRenderer implements SingletonInterface
*/
protected function readLLfile($fileRef)
{
- /** @var LocalizationFactory $languageFactory */
$languageFactory = GeneralUtility::makeInstance(LocalizationFactory::class);
if ($this->lang !== 'default') {
diff --git a/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php b/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
index a66cb31ab837..bca67f760047 100644
--- a/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
+++ b/typo3/sysext/core/Classes/Resource/Collection/FolderBasedFileCollection.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Core\Resource\Collection;
use TYPO3\CMS\Core\Resource\Folder;
+use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Resource\StorageRepository;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -113,9 +114,8 @@ class FolderBasedFileCollection extends AbstractFileCollection
$this->description = $array['description'];
$this->recursive = (bool)$array['recursive'];
if (!empty($array['folder']) && !empty($array['storage'])) {
- /** @var StorageRepository $storageRepository */
$storageRepository = GeneralUtility::makeInstance(StorageRepository::class);
- /** @var \TYPO3\CMS\Core\Resource\ResourceStorage $storage */
+ /** @var ResourceStorage $storage */
$storage = $storageRepository->findByUid($array['storage']);
if ($storage) {
$this->folder = $storage->getFolder($array['folder']);
diff --git a/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php b/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
index 705d5f16d9ab..51f11328f84a 100644
--- a/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
+++ b/typo3/sysext/core/Classes/Resource/Collection/StaticFileCollection.php
@@ -51,7 +51,6 @@ class StaticFileCollection extends AbstractFileCollection
*/
public function loadContents()
{
- /** @var FileRepository $fileRepository */
$fileRepository = GeneralUtility::makeInstance(FileRepository::class);
$fileReferences = $fileRepository->findByRelation('sys_file_collection', 'files', $this->getIdentifier());
foreach ($fileReferences as $file) {
diff --git a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
index 3afeb8a52cb5..cc934127817a 100644
--- a/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
+++ b/typo3/sysext/core/Classes/Resource/Driver/LocalDriver.php
@@ -687,7 +687,6 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver implements Stream
{
$identifier = $this->canonicalizeAndCheckFileIdentifier($containerPath . PathUtility::basename($fileIdentifier));
- /** @var FileInfo $fileInfo */
$fileInfo = GeneralUtility::makeInstance(FileInfo::class, $fileIdentifier);
switch ($property) {
case 'size':
@@ -1079,7 +1078,6 @@ class LocalDriver extends AbstractHierarchicalFilesystemDriver implements Stream
$targetFolderPath = $this->getAbsolutePath($newFolderIdentifier);
mkdir($targetFolderPath);
- /** @var \RecursiveDirectoryIterator $iterator */
$iterator = new \RecursiveIteratorIterator(
new \RecursiveDirectoryIterator($sourceFolderPath),
\RecursiveIteratorIterator::SELF_FIRST,
diff --git a/typo3/sysext/core/Classes/Resource/FileRepository.php b/typo3/sysext/core/Classes/Resource/FileRepository.php
index 8b4efc42d08e..d6165bbcf954 100644
--- a/typo3/sysext/core/Classes/Resource/FileRepository.php
+++ b/typo3/sysext/core/Classes/Resource/FileRepository.php
@@ -108,7 +108,6 @@ class FileRepository extends AbstractRepository
}
} else {
$workspaceId ??= GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('workspace', 'id', 0);
- /** @var RelationHandler $relationHandler */
$relationHandler = GeneralUtility::makeInstance(RelationHandler::class);
$relationHandler->setWorkspaceId($workspaceId);
$relationHandler->start(
diff --git a/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php b/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
index 8a4af7f7cf2e..b785e549250a 100644
--- a/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Index/ExtractorRegistry.php
@@ -77,7 +77,6 @@ class ExtractorRegistry implements SingletonInterface
$extractors = array_reverse($this->extractors);
foreach ($extractors as $className) {
- /** @var ExtractorInterface $object */
$object = $this->createExtractorInstance($className);
$this->instances[] = $object;
}
diff --git a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
index a63015646eb7..3ecbf46072e8 100644
--- a/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
+++ b/typo3/sysext/core/Classes/Resource/Index/FileIndexRepository.php
@@ -542,7 +542,6 @@ class FileIndexRepository implements SingletonInterface
*/
public function updateRefIndex($id)
{
- /** @var ReferenceIndex $refIndexObj */
$refIndexObj = GeneralUtility::makeInstance(ReferenceIndex::class);
$refIndexObj->updateRefIndexTable($this->table, $id);
}
diff --git a/typo3/sysext/core/Classes/Resource/Processing/FileDeletionAspect.php b/typo3/sysext/core/Classes/Resource/Processing/FileDeletionAspect.php
index d5edc0d7e15b..7d15c2b9f79a 100644
--- a/typo3/sysext/core/Classes/Resource/Processing/FileDeletionAspect.php
+++ b/typo3/sysext/core/Classes/Resource/Processing/FileDeletionAspect.php
@@ -119,7 +119,6 @@ final class FileDeletionAspect
return;
}
- /** @var \TYPO3\CMS\Core\Resource\ProcessedFile $processedFile */
foreach ($this->getProcessedFileRepository()->findAllByOriginalFile($fileObject) as $processedFile) {
if ($processedFile->exists()) {
$processedFile->delete(true);
diff --git a/typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php b/typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php
index bd396042e94a..75701f66ef98 100644
--- a/typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php
+++ b/typo3/sysext/core/Classes/Resource/Rendering/RendererRegistry.php
@@ -82,7 +82,6 @@ class RendererRegistry implements SingletonInterface
// priority in the same order as they were added to the registry.
$classNames = array_reverse($this->classNames);
foreach ($classNames as $className) {
- /** @var FileRendererInterface $object */
$object = $this->createRendererInstance($className);
$this->instances[] = $object;
}
@@ -130,7 +129,6 @@ class RendererRegistry implements SingletonInterface
{
$matchingFileRenderer = null;
- /** @var FileRendererInterface $fileRenderer */
foreach ($this->getRendererInstances() as $fileRenderer) {
if ($fileRenderer->canRender($file)) {
$matchingFileRenderer = $fileRenderer;
diff --git a/typo3/sysext/core/Classes/Resource/ResourceFactory.php b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
index 7f0b772cdbc9..2cad4cc38f1d 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceFactory.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceFactory.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Core\Resource;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Backend\Utility\BackendUtility;
+use TYPO3\CMS\Core\Collection\AbstractRecordCollection;
use TYPO3\CMS\Core\Collection\CollectionInterface;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Database\ConnectionPool;
@@ -162,10 +163,9 @@ class ResourceFactory implements SingletonInterface
*/
public function createCollectionObject(array $collectionData)
{
- /** @var Collection\FileCollectionRegistry $registry */
$registry = GeneralUtility::makeInstance(FileCollectionRegistry::class);
- /** @var \TYPO3\CMS\Core\Collection\AbstractRecordCollection $class */
+ /** @var AbstractRecordCollection $class */
$class = $registry->getFileCollectionClass($collectionData['type']);
return $class::create($collectionData);
@@ -422,7 +422,6 @@ class ResourceFactory implements SingletonInterface
} else {
throw new \RuntimeException('A file needs to reside in a Storage', 1381570997);
}
- /** @var File $fileObject */
$fileObject = GeneralUtility::makeInstance(File::class, $fileData, $storageObject);
return $fileObject;
}
@@ -472,7 +471,6 @@ class ResourceFactory implements SingletonInterface
*/
public function createFileReferenceObject(array $fileReferenceData)
{
- /** @var FileReference $fileReferenceObject */
$fileReferenceObject = GeneralUtility::makeInstance(FileReference::class, $fileReferenceData);
return $fileReferenceObject;
}
diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index c27e81a04d83..94e1603b657f 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -1685,7 +1685,6 @@ class ResourceStorage implements ResourceStorageInterface
if ($this->processingFolders === null) {
$this->processingFolders = [];
$this->processingFolders[] = $this->getProcessingFolder();
- /** @var StorageRepository $storageRepository */
$storageRepository = GeneralUtility::makeInstance(StorageRepository::class);
$allStorages = $storageRepository->findAll();
foreach ($allStorages as $storage) {
diff --git a/typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php b/typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
index 3211736cf67b..f686b99915db 100644
--- a/typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/FileProcessingService.php
@@ -92,9 +92,7 @@ class FileProcessingService
}
}
- /** @var Resource\ProcessedFileRepository $processedFileRepository */
$processedFileRepository = GeneralUtility::makeInstance(ProcessedFileRepository::class);
-
$processedFile = $processedFileRepository->findOneByOriginalFileAndTaskTypeAndConfiguration($fileObject, $taskType, $configuration);
// set the storage of the processed file
@@ -139,7 +137,6 @@ class FileProcessingService
$processor->processTask($task);
if ($task->isExecuted() && $task->isSuccessful() && $processedFile->isProcessed()) {
- /** @var Resource\ProcessedFileRepository $processedFileRepository */
$processedFileRepository = GeneralUtility::makeInstance(ProcessedFileRepository::class);
$processedFileRepository->add($processedFile);
}
diff --git a/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php b/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
index 01b51b9fae52..8b60557af7b5 100644
--- a/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
+++ b/typo3/sysext/core/Classes/Resource/Service/UserFileMountService.php
@@ -55,12 +55,10 @@ class UserFileMountService
$storageUid = (int)($PA['row']['storage'][0] ?? 0);
}
if ($storageUid > 0 && in_array($storageUid, $allowedStorageIds, true)) {
- /** @var StorageRepository $storageRepository */
$storageRepository = GeneralUtility::makeInstance(StorageRepository::class);
- /** @var \TYPO3\CMS\Core\Resource\ResourceStorage $storage */
+ /** @var ResourceStorage $storage */
$storage = $storageRepository->findByUid($storageUid);
if ($storage === null) {
- /** @var FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
$queue = $flashMessageService->getMessageQueueByIdentifier();
$queue->enqueue(new FlashMessage('Storage #' . $storageUid . ' does not exist. No folder is currently selectable.', '', FlashMessage::ERROR));
@@ -92,7 +90,6 @@ class UserFileMountService
}
}
} else {
- /** @var FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
$queue = $flashMessageService->getMessageQueueByIdentifier();
$queue->enqueue(new FlashMessage('Storage "' . $storage->getName() . '" is not browsable. No folder is currently selectable.', '', FlashMessage::WARNING));
diff --git a/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php b/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
index 2a72973d2265..5f699ed9bdce 100644
--- a/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
+++ b/typo3/sysext/core/Classes/Resource/Utility/ListUtility.php
@@ -16,6 +16,7 @@
namespace TYPO3\CMS\Core\Resource\Utility;
use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Resource\Folder;
use TYPO3\CMS\Core\Resource\FolderInterface;
/**
@@ -26,7 +27,7 @@ class ListUtility
/**
* Resolve special folders (by their role) into localised string
*
- * @param array $folders Array of \TYPO3\CMS\Core\Resource\Folder
+ * @param Folder[] $folders
* @return array Array of \TYPO3\CMS\Core\Resource\Folder; folder name or role with folder name as keys
*/
public static function resolveSpecialFolderNames(array $folders)
@@ -35,7 +36,6 @@ class ListUtility
$lang = $GLOBALS['LANG'];
$resolvedFolders = [];
- /** @var \TYPO3\CMS\Core\Resource\Folder $folder */
foreach ($folders as $folder) {
$name = $folder->getName();
$role = $folder->getRole();
diff --git a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
index 6e6a2c086881..41387d6f8f1b 100644
--- a/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
+++ b/typo3/sysext/core/Classes/Tree/TableConfiguration/DatabaseTreeDataProvider.php
@@ -282,7 +282,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
*/
protected function buildRepresentationForNode(TreeNode $basicNode, DatabaseTreeNode $parent = null, $level = 0)
{
- /** @var DatabaseTreeNode $node */
$node = GeneralUtility::makeInstance(DatabaseTreeNode::class);
$row = [];
if ($basicNode->getId() == 0) {
@@ -303,7 +302,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
$node->setParentNode($parent);
if ($basicNode->hasChildNodes()) {
$node->setHasChildren(true);
- /** @var \TYPO3\CMS\Backend\Tree\SortedTreeNodeCollection $childNodes */
$childNodes = GeneralUtility::makeInstance(SortedTreeNodeCollection::class);
$tempNodes = [];
foreach ($basicNode->getChildNodes() as $child) {
@@ -365,10 +363,8 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
// this with a separate TreeNodeCollection that gets attached to the root node with uid 0. This has the
// nasty side effect we cannot avoid the root node being rendered.
- /** @var TreeNodeCollection $treeNodeCollection */
$treeNodeCollection = GeneralUtility::makeInstance(TreeNodeCollection::class);
foreach ($startingPoints as $startingPoint) {
- /** @var TreeNode $treeData */
$treeData = GeneralUtility::makeInstance(TreeNode::class);
$treeData->setId($startingPoint);
@@ -420,7 +416,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
$storage = null;
$children = $this->getRelatedRecords($nodeData);
if (!empty($children)) {
- /** @var TreeNodeCollection $storage */
$storage = GeneralUtility::makeInstance(TreeNodeCollection::class);
foreach ($children as $child) {
$node = GeneralUtility::makeInstance(TreeNode::class);
@@ -471,7 +466,6 @@ class DatabaseTreeDataProvider extends AbstractTableConfigurationTreeDataProvide
$uid = $row['uid'];
if (in_array($this->columnConfiguration['type'] ?? '', ['select', 'category', 'inline'], true)) {
if ($this->columnConfiguration['MM'] ?? null) {
- /** @var \TYPO3\CMS\Core\Database\RelationHandler $dbGroup */
$dbGroup = GeneralUtility::makeInstance(RelationHandler::class);
// Dummy field for setting "look from other site"
$this->columnConfiguration['MM_oppositeField'] = 'children';
diff --git a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
index 9dbed580dbbc..6cae5f4eaacd 100644
--- a/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/ExtendedTemplateService.php
@@ -258,7 +258,6 @@ class ExtendedTemplateService extends TemplateService
$constants = GeneralUtility::makeInstance(TypoScriptParser::class);
// Register comments!
$constants->regComments = true;
- /** @var ConditionMatcher $matchObj */
$matchObj = GeneralUtility::makeInstance(ConditionMatcher::class);
// Matches ALL conditions in TypoScript
$matchObj->setSimulateMatchResult(true);
@@ -327,7 +326,6 @@ class ExtendedTemplateService extends TemplateService
}
$keyArr_num = [];
$keyArr_alpha = [];
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
foreach ($arr as $key => $value) {
// Don't do anything with comments / linenumber registrations...
@@ -566,9 +564,7 @@ class ExtendedTemplateService extends TemplateService
}
$a = 0;
$c = count($keyArr);
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
- /** @var IconFactory $iconFactory */
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
foreach ($keyArr as $key => $value) {
$HTML = '';
@@ -833,7 +829,6 @@ class ExtendedTemplateService extends TemplateService
$subcat = '';
if (!empty($this->categories[$category]) && is_array($this->categories[$category])) {
asort($this->categories[$category]);
- /** @var IconFactory $iconFactory */
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$categoryLoop = 0;
foreach ($this->categories[$category] as $name => $type) {
diff --git a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
index 4ed1c52c0bcd..3615ce34c48d 100644
--- a/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
+++ b/typo3/sysext/core/Classes/TypoScript/Parser/TypoScriptParser.php
@@ -20,7 +20,6 @@ use Psr\Log\LoggerInterface;
use Psr\Log\LogLevel;
use Symfony\Component\Finder\Finder;
use TYPO3\CMS\Backend\Configuration\TypoScript\ConditionMatching\ConditionMatcher as BackendConditionMatcher;
-use TYPO3\CMS\Core\Configuration\TypoScript\ConditionMatching\AbstractConditionMatcher;
use TYPO3\CMS\Core\Http\ApplicationType;
use TYPO3\CMS\Core\Log\LogManager;
use TYPO3\CMS\Core\Resource\Security\FileNameValidator;
@@ -761,7 +760,6 @@ class TypoScriptParser
$condition = '[' . $condition . ']';
}
- /** @var AbstractConditionMatcher $conditionMatcher */
$conditionMatcher = null;
if (($GLOBALS['TYPO3_REQUEST'] ?? null) instanceof ServerRequestInterface
&& ApplicationType::fromRequest($GLOBALS['TYPO3_REQUEST'])->isFrontend()
diff --git a/typo3/sysext/core/Classes/TypoScript/TemplateService.php b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
index 2aa23054dec3..5a263b27d9f2 100644
--- a/typo3/sysext/core/Classes/TypoScript/TemplateService.php
+++ b/typo3/sysext/core/Classes/TypoScript/TemplateService.php
@@ -370,7 +370,6 @@ class TemplateService
public function matching($cc)
{
if (is_array($cc['all'])) {
- /** @var ConditionMatcher $matchObj */
$matchObj = GeneralUtility::makeInstance(ConditionMatcher::class);
$matchObj->setRootline((array)($cc['rootLine'] ?? []));
$sectionsMatch = [];
@@ -964,9 +963,7 @@ class TemplateService
// Parse TypoScript Constants
// ****************************
// Initialize parser and match-condition classes:
- /** @var Parser\TypoScriptParser $constants */
$constants = GeneralUtility::makeInstance(TypoScriptParser::class);
- /** @var ConditionMatcher $matchObj */
$matchObj = GeneralUtility::makeInstance(ConditionMatcher::class);
$matchObj->setSimulateMatchConditions($this->matchAlternative);
$matchObj->setSimulateMatchResult((bool)$this->matchAll);
@@ -982,7 +979,6 @@ class TemplateService
// Parse TypoScript Setup (here called "config")
// ***********************************************
// Initialize parser and match-condition classes:
- /** @var Parser\TypoScriptParser $config */
$config = GeneralUtility::makeInstance(TypoScriptParser::class);
$config->regLinenumbers = $this->ext_regLinenumbers;
$config->regComments = $this->ext_regComments;
diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
index 04bb8ef1f46e..8c219b7c1718 100644
--- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
+++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php
@@ -495,7 +495,6 @@ class ExtendedFileUtility extends BasicFileUtility
$result = $fileObject->delete(true);
if ($result) {
// notify the user that the folder was deleted
- /** @var FlashMessage $flashMessage */
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
sprintf($this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:message.description.folderDeleted'), $fileObject->getName()),
@@ -568,7 +567,6 @@ class ExtendedFileUtility extends BasicFileUtility
$hasReferences = $numberOfReferences > 0;
if ($hasReferences) {
- /** @var FlashMessage $flashMessage */
$flashMessage = GeneralUtility::makeInstance(
FlashMessage::class,
$this->getLanguageService()->sL('LLL:EXT:core/Resources/Private/Language/locallang_core.xlf:message.description.folderNotDeletedHasFilesWithReferences'),
@@ -651,7 +649,7 @@ class ExtendedFileUtility extends BasicFileUtility
protected function func_copy($cmds)
{
$sourceFileObject = $this->getFileObject($cmds['data']);
- /** @var \TYPO3\CMS\Core\Resource\Folder $targetFolderObject */
+ /** @var Folder $targetFolderObject */
$targetFolderObject = $this->getFileObject($cmds['target']);
// Basic check
if (!$targetFolderObject instanceof Folder) {
@@ -909,7 +907,7 @@ class ExtendedFileUtility extends BasicFileUtility
* + example "2:targetpath/targetfolder/"
*
* @param array $cmds Command details as described above
- * @return \TYPO3\CMS\Core\Resource\Folder|false Returns the new foldername upon success
+ * @return Folder|false Returns the new foldername upon success
*/
public function func_newfolder($cmds)
{
@@ -1219,10 +1217,8 @@ class ExtendedFileUtility extends BasicFileUtility
*/
protected function addFlashMessage(FlashMessage $flashMessage)
{
- /** @var FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue $defaultFlashMessageQueue */
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
}
diff --git a/typo3/sysext/core/Classes/Utility/MailUtility.php b/typo3/sysext/core/Classes/Utility/MailUtility.php
index 4fe5d8cae429..4437546a64e8 100644
--- a/typo3/sysext/core/Classes/Utility/MailUtility.php
+++ b/typo3/sysext/core/Classes/Utility/MailUtility.php
@@ -170,7 +170,6 @@ class MailUtility
*/
public static function parseAddresses($rawAddresses)
{
- /** @var \TYPO3\CMS\Core\Mail\Rfc822AddressesParser $addressParser */
$addressParser = GeneralUtility::makeInstance(
Rfc822AddressesParser::class,
$rawAddresses
diff --git a/typo3/sysext/core/Classes/Utility/RootlineUtility.php b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
index 7560ac74166a..e7d02c9ebca6 100644
--- a/typo3/sysext/core/Classes/Utility/RootlineUtility.php
+++ b/typo3/sysext/core/Classes/Utility/RootlineUtility.php
@@ -357,7 +357,6 @@ class RootlineUtility
if ($parentUid > 0) {
// Get rootline of (and including) parent page
$mountPointParameter = !empty($this->parsedMountPointParameters) ? $this->mountPointParameter : '';
- /** @var RootlineUtility $rootlineUtility */
$rootlineUtility = GeneralUtility::makeInstance(self::class, $parentUid, $mountPointParameter, $this->context);
$rootline = $rootlineUtility->get();
// retrieve cache tags of parent rootline
diff --git a/typo3/sysext/core/Classes/ViewHelpers/IconForRecordViewHelper.php b/typo3/sysext/core/Classes/ViewHelpers/IconForRecordViewHelper.php
index 00c69df660ca..53146ee0c74d 100644
--- a/typo3/sysext/core/Classes/ViewHelpers/IconForRecordViewHelper.php
+++ b/typo3/sysext/core/Classes/ViewHelpers/IconForRecordViewHelper.php
@@ -74,7 +74,6 @@ class IconForRecordViewHelper extends AbstractViewHelper
$size = $arguments['size'];
$row = $arguments['row'];
$alternativeMarkupIdentifier = $arguments['alternativeMarkupIdentifier'];
- /** @var IconFactory $iconFactory */
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
return $iconFactory->getIconForRecord($table, $row, $size)->render($alternativeMarkupIdentifier);
}
diff --git a/typo3/sysext/core/Documentation/Changelog/11.3/Deprecation-94223-ExtbaseRequest-getBaseUri.rst b/typo3/sysext/core/Documentation/Changelog/11.3/Deprecation-94223-ExtbaseRequest-getBaseUri.rst
index 4ce232bc3c1f..5bd36c44f7b5 100644
--- a/typo3/sysext/core/Documentation/Changelog/11.3/Deprecation-94223-ExtbaseRequest-getBaseUri.rst
+++ b/typo3/sysext/core/Documentation/Changelog/11.3/Deprecation-94223-ExtbaseRequest-getBaseUri.rst
@@ -42,7 +42,6 @@ a typical substitution of this getter looks like this for now:
// @todo Adapt this example as soon as ViewHelpers receive a ServerRequestInterface
$request = $GLOBALS['TYPO3_REQUEST'];
- /** @var NormalizedParams $normalizedParams */
$normalizedParams = $request->getAttribute('normalizedParams');
$baseUri = $normalizedParams->getSiteUrl();
diff --git a/typo3/sysext/core/Documentation/Changelog/11.3/Deprecation-94228-DeprecateExtbaseRequestGetRequestUri.rst b/typo3/sysext/core/Documentation/Changelog/11.3/Deprecation-94228-DeprecateExtbaseRequestGetRequestUri.rst
index 9f571a5d0051..c9f6ba2e775f 100644
--- a/typo3/sysext/core/Documentation/Changelog/11.3/Deprecation-94228-DeprecateExtbaseRequestGetRequestUri.rst
+++ b/typo3/sysext/core/Documentation/Changelog/11.3/Deprecation-94228-DeprecateExtbaseRequestGetRequestUri.rst
@@ -42,7 +42,6 @@ A substitution looks like this for now:
// @todo Adapt this example as soon as Extbase Request implements ServerRequestInterface
$request = $GLOBALS['TYPO3_REQUEST'];
- /** @var NormalizedParams $normalizedParams */
$normalizedParams = $request->getAttribute('normalizedParams');
$requestUrl = $normalizedParams->getRequestUrl();
diff --git a/typo3/sysext/core/Documentation/Changelog/9.2/Feature-83736-ExtendedPSR-7RequestsWithTYPO3ServerParameters.rst b/typo3/sysext/core/Documentation/Changelog/9.2/Feature-83736-ExtendedPSR-7RequestsWithTYPO3ServerParameters.rst
index e0ec7268edfc..1511ca4f1c0e 100644
--- a/typo3/sysext/core/Documentation/Changelog/9.2/Feature-83736-ExtendedPSR-7RequestsWithTYPO3ServerParameters.rst
+++ b/typo3/sysext/core/Documentation/Changelog/9.2/Feature-83736-ExtendedPSR-7RequestsWithTYPO3ServerParameters.rst
@@ -18,7 +18,6 @@ is given to controllers, example:
.. code-block:: php
- /** @var NormalizedParams $normalizedParams */
$normalizedParams = $request->getAttribute('normalizedParams');
$requestPort = $normalizedParams->getRequestPort();
diff --git a/typo3/sysext/core/Tests/Functional/Error/ErrorHandlerTest.php b/typo3/sysext/core/Tests/Functional/Error/ErrorHandlerTest.php
index 19113292b9ca..f7fb8a7cbf5b 100644
--- a/typo3/sysext/core/Tests/Functional/Error/ErrorHandlerTest.php
+++ b/typo3/sysext/core/Tests/Functional/Error/ErrorHandlerTest.php
@@ -17,12 +17,10 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Tests\Functional\Error;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Error\ErrorHandler;
use TYPO3\CMS\Core\Log\Logger;
use TYPO3\CMS\Core\Log\LogManager;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
class ErrorHandlerTest extends FunctionalTestCase
@@ -86,7 +84,6 @@ class ErrorHandlerTest extends FunctionalTestCase
$logManagerMock->expects(self::never())->method('getLogger')->with('TYPO3.CMS.deprecations');
GeneralUtility::setSingletonInstance(LogManager::class, $logManagerMock);
- /** @var Logger|MockObject $logger */
$logger = $this->getMockBuilder(Logger::class)
->disableOriginalConstructor()
->onlyMethods(['log'])
@@ -95,7 +92,6 @@ class ErrorHandlerTest extends FunctionalTestCase
// Make sure the assigned logger does not log
$logger->expects(self::never())->method('log');
- /** @var ErrorHandler|AccessibleObjectInterface $coreErrorHandler */
$coreErrorHandler = new ErrorHandler(
E_ALL & ~(E_STRICT | E_NOTICE | E_COMPILE_WARNING | E_COMPILE_ERROR | E_CORE_WARNING | E_CORE_ERROR | E_PARSE | E_ERROR)
);
diff --git a/typo3/sysext/core/Tests/Functional/Imaging/ImageMagickFileTest.php b/typo3/sysext/core/Tests/Functional/Imaging/ImageMagickFileTest.php
index c4efb7a9b3c7..1163e50ee43e 100644
--- a/typo3/sysext/core/Tests/Functional/Imaging/ImageMagickFileTest.php
+++ b/typo3/sysext/core/Tests/Functional/Imaging/ImageMagickFileTest.php
@@ -19,7 +19,6 @@ namespace TYPO3\CMS\Core\Tests\Functional\Imaging;
use org\bovigo\vfs\vfsStream;
use org\bovigo\vfs\vfsStreamDirectory;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Exception;
use TYPO3\CMS\Core\Imaging\ImageMagickFile;
use TYPO3\CMS\Core\Type\File\FileInfo;
@@ -345,7 +344,6 @@ class ImageMagickFileTest extends FunctionalTestCase
*/
private function simulateNextFileInfoInvocation(string $mimeType, array $mimeExtensions = []): void
{
- /** @var FileInfo|MockObject $fileInfo */
$fileInfo = $this->getAccessibleMock(
FileInfo::class,
['getMimeType', 'getMimeExtensions'],
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
index 4f94d8eac4b0..714eaa3d4f1d 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/AbstractUserAuthenticationTest.php
@@ -60,7 +60,6 @@ class AbstractUserAuthenticationTest extends UnitTestCase
GeneralUtility::addInstance(ConnectionPool::class, $connectionPool->reveal());
- /** @var AbstractUserAuthentication $mock */
$mock = $this->getMockBuilder(AbstractUserAuthentication::class)
->addMethods(['dummy'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
index 856e99d32ce8..35251d1ef02b 100644
--- a/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
+++ b/typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Tests\Unit\Authentication;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use Psr\Log\NullLogger;
@@ -112,7 +111,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
$GLOBALS['BE_USER']->setLogger(new NullLogger());
$GLOBALS['BE_USER']->initializeUserSessionManager($userSessionManager);
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->addMethods(['dummy'])
->disableOriginalConstructor()
@@ -182,7 +180,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function getFilePermissionsTakesUserDefaultPermissionsFromTsConfigIntoAccountIfUserIsNotAdmin(array $userTsConfiguration): void
{
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['isAdmin', 'getTSConfig'])
->getMock();
@@ -322,7 +319,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function getFilePermissionsFromStorageOverwritesDefaultPermissions(array $defaultPermissions, $storageUid, array $storagePermissions, array $expectedPermissions): void
{
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['isAdmin', 'getFilePermissions', 'getTSConfig'])
->getMock();
@@ -358,7 +354,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function getFilePermissionsFromStorageAlwaysReturnsDefaultPermissionsForAdmins(array $defaultPermissions, int $storageUid, array $storagePermissions): void
{
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['isAdmin', 'getFilePermissions', 'getTSConfig'])
->getMock();
@@ -507,7 +502,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function getFilePermissionsTakesUserDefaultPermissionsFromRecordIntoAccountIfUserIsNotAdmin(string $permissionValue, array $expectedPermissions): void
{
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['isAdmin', 'getTSConfig'])
->getMock();
@@ -528,7 +522,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function getFilePermissionsGrantsAllPermissionsToAdminUsers(): void
{
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['isAdmin'])
->getMock();
@@ -563,7 +556,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function jsConfirmationReturnsTrueIfPassedValueEqualsConfiguration(): void
{
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['getTSConfig'])
->getMock();
@@ -581,7 +573,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function jsConfirmationAllowsSettingMultipleBitsInValue(): void
{
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['getTSConfig'])
->getMock();
@@ -652,7 +643,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function jsConfirmationAlwaysReturnsFalseIfNoConfirmationIsSet(): void
{
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['getTSConfig'])
->getMock();
@@ -670,7 +660,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function jsConfirmationReturnsTrueIfConfigurationIsMissing(): void
{
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['getTSConfig'])
->getMock();
@@ -754,7 +743,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
GeneralUtility::addInstance(ConnectionPool::class, $databaseProphecy->reveal());
}
- /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->onlyMethods(['isAdmin'])
->getMock();
@@ -778,7 +766,6 @@ class BackendUserAuthenticationTest extends UnitTestCase
*/
public function checkAuthModeReturnsExpectedValue(string $theValue, string $authMode, bool $expectedResult): void
{
- /** @var BackendUserAuthentication|MockObject $subject */
$subject = $this->getMockBuilder(BackendUserAuthentication::class)
->disableOriginalConstructor()
->onlyMethods(['isAdmin'])
diff --git a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
index aeb8ae2e286e..8562d8bd3435 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
@@ -216,13 +216,11 @@ class ApcuBackendTest extends UnitTestCase
*/
public function flushRemovesOnlyOwnEntries(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|FrontendInterface $thisCache */
$thisCache = $this->createMock(FrontendInterface::class);
$thisCache->method('getIdentifier')->willReturn('thisCache');
$thisBackend = new ApcuBackend('Testing');
$thisBackend->setCache($thisCache);
- /** @var \PHPUnit\Framework\MockObject\MockObject|FrontendInterface $thatCache */
$thatCache = $this->createMock(FrontendInterface::class);
$thatCache->method('getIdentifier')->willReturn('thatCache');
$thatBackend = new ApcuBackend('Testing');
@@ -279,7 +277,6 @@ class ApcuBackendTest extends UnitTestCase
*/
protected function setUpBackend(bool $accessible = false)
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|FrontendInterface $cache */
$cache = $this->createMock(FrontendInterface::class);
if ($accessible) {
$backend = $this->getAccessibleMock(ApcuBackend::class, ['dummy'], ['Testing']);
diff --git a/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php b/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
index 5e528a9c8015..6d99d3629f14 100644
--- a/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
@@ -19,6 +19,7 @@ namespace TYPO3\CMS\Core\Tests\Unit\Cache;
use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
+use TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend;
use TYPO3\CMS\Core\Cache\CacheManager;
use TYPO3\CMS\Core\Cache\Exception\DuplicateIdentifierException;
use TYPO3\CMS\Core\Cache\Exception\InvalidBackendException;
@@ -26,6 +27,7 @@ use TYPO3\CMS\Core\Cache\Exception\InvalidCacheException;
use TYPO3\CMS\Core\Cache\Exception\NoSuchCacheException;
use TYPO3\CMS\Core\Cache\Exception\NoSuchCacheGroupException;
use TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend;
+use TYPO3\CMS\Core\Cache\Frontend\VariableFrontend;
use TYPO3\CMS\Core\Tests\Unit\Cache\Fixtures\BackendConfigurationOptionFixture;
use TYPO3\CMS\Core\Tests\Unit\Cache\Fixtures\BackendDefaultFixture;
use TYPO3\CMS\Core\Tests\Unit\Cache\Fixtures\BackendFixture;
@@ -324,7 +326,6 @@ class CacheManagerTest extends UnitTestCase
*/
public function getCacheCreatesCacheInstanceWithFallbackToDefaultFrontend(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
$manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
$cacheIdentifier = StringUtility::getUniqueId('Test');
$configuration = [
@@ -350,7 +351,6 @@ class CacheManagerTest extends UnitTestCase
*/
public function getCacheCreatesCacheInstanceWithFallbackToDefaultBackend(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
$manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
$cacheIdentifier = StringUtility::getUniqueId('Test');
$configuration = [
@@ -434,7 +434,6 @@ class CacheManagerTest extends UnitTestCase
*/
public function flushCachesInGroupByTagsWithEmptyTagsArrayDoesNotFlushCaches(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
$manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
$cacheIdentifier = 'aTest';
@@ -470,7 +469,6 @@ class CacheManagerTest extends UnitTestCase
*/
public function flushCachesInGroupByTagsDeletesByTag(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
$manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
$cacheIdentifier = 'aTest';
@@ -509,8 +507,8 @@ class CacheManagerTest extends UnitTestCase
{
$rawConfiguration = [
'pages' => [
- 'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
+ 'frontend' => VariableFrontend::class,
+ 'backend' => Typo3DatabaseBackend::class,
'options' => [
'compression' => true,
],
@@ -526,7 +524,7 @@ class CacheManagerTest extends UnitTestCase
];
$expectedConfiguration = [
'pages' => [
- 'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
+ 'frontend' => VariableFrontend::class,
'backend' => \TYPO3\CMS\Core\Cache\Backend\RedisBackend::class,
'options' => [
'compression' => true,
@@ -537,7 +535,6 @@ class CacheManagerTest extends UnitTestCase
];
$this->expectDeprecation();
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
$manager = $this->getAccessibleMock(CacheManager::class, ['dummy']);
$manager->setCacheConfigurations($rawConfiguration);
self::assertEquals($expectedConfiguration, $manager->_get('cacheConfigurations'));
@@ -551,12 +548,11 @@ class CacheManagerTest extends UnitTestCase
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1596980032);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
$manager = $this->getAccessibleMock(CacheManager::class, ['dummy']);
$manager->setCacheConfigurations([
'' => [
- 'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
+ 'frontend' => VariableFrontend::class,
+ 'backend' => Typo3DatabaseBackend::class,
'options' => [
'compression' => true,
],
@@ -573,12 +569,11 @@ class CacheManagerTest extends UnitTestCase
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1596980033);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
$manager = $this->getAccessibleMock(CacheManager::class, ['dummy']);
$manager->setCacheConfigurations([
'cache_' => [
- 'frontend' => \TYPO3\CMS\Core\Cache\Frontend\VariableFrontend::class,
- 'backend' => \TYPO3\CMS\Core\Cache\Backend\Typo3DatabaseBackend::class,
+ 'frontend' => VariableFrontend::class,
+ 'backend' => Typo3DatabaseBackend::class,
'options' => [
'compression' => true,
],
diff --git a/typo3/sysext/core/Tests/Unit/Command/SendEmailCommandTest.php b/typo3/sysext/core/Tests/Unit/Command/SendEmailCommandTest.php
index baf284c51dd8..345ee1faec9a 100644
--- a/typo3/sysext/core/Tests/Unit/Command/SendEmailCommandTest.php
+++ b/typo3/sysext/core/Tests/Unit/Command/SendEmailCommandTest.php
@@ -55,7 +55,6 @@ class SendEmailCommandTest extends UnitTestCase
->method('getRealTransport')
->willReturn($realTransportProphecy->reveal());
- /** @var SendEmailCommand|\PHPUnit\Framework\MockObject\MockObject $command */
$command = $this->getMockBuilder(SendEmailCommand::class)
->setConstructorArgs(['mailer:spool:send'])
->onlyMethods(['getMailer'])
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php b/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
index f9c5f67ac127..27b45a87f6ca 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
@@ -21,7 +21,6 @@ use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Configuration\ConfigurationManager;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
class ConfigurationManagerTest extends UnitTestCase
@@ -376,7 +375,6 @@ class ConfigurationManagerTest extends UnitTestCase
*/
public function canWriteConfigurationReturnsTrueIfDirectoryAndFilesAreWritable(): void
{
- /** @var ConfigurationManager|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(ConfigurationManager::class, ['dummy']);
$directory = StringUtility::getUniqueId('test_');
@@ -444,7 +442,6 @@ class ConfigurationManagerTest extends UnitTestCase
{
$this->expectException(\RuntimeException::class);
- /** @var ConfigurationManager|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(ConfigurationManager::class, ['getLocalConfigurationFileLocation']);
$file = 'tests/' . StringUtility::getUniqueId('test_');
@@ -462,7 +459,6 @@ class ConfigurationManagerTest extends UnitTestCase
*/
public function createLocalConfigurationFromFactoryConfigurationWritesContentFromFactoryFile(): void
{
- /** @var ConfigurationManager|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(ConfigurationManager::class, ['writeLocalConfiguration', 'getLocalConfigurationFileLocation', 'getFactoryConfigurationFileLocation']);
$localConfigurationFile = '/tests/' . StringUtility::getUniqueId('dummy_');
$subject->_set('localConfigurationFile', $localConfigurationFile);
@@ -543,7 +539,6 @@ class ConfigurationManagerTest extends UnitTestCase
*/
public function isValidLocalConfigurationPathAcceptsWhitelistedPath(): void
{
- /** @var ConfigurationManager|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(ConfigurationManager::class, ['dummy']);
$subject->_set('whiteListedLocalConfigurationPaths', ['foo/bar']);
self::assertTrue($subject->_call('isValidLocalConfigurationPath', 'foo/bar/baz'));
@@ -554,7 +549,6 @@ class ConfigurationManagerTest extends UnitTestCase
*/
public function isValidLocalConfigurationPathDeniesNotWhitelistedPath(): void
{
- /** @var ConfigurationManager|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(ConfigurationManager::class, ['dummy']);
$subject->_set('whiteListedLocalConfigurationPaths', ['foo/bar']);
self::assertFalse($subject->_call('isValidLocalConfigurationPath', 'bar/baz'));
diff --git a/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php b/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
index 4578e898552b..546b10db228e 100644
--- a/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
+++ b/typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
@@ -1747,7 +1747,6 @@ class FlexFormToolsTest extends UnitTestCase
'callBackMethod_value' => 'dummy',
];
$editData = [];
- /** @var \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(FlexFormTools::class)
->onlyMethods(['executeCallBackMethod'])
->getMock();
@@ -1776,7 +1775,6 @@ class FlexFormToolsTest extends UnitTestCase
],
];
$editData2 = [];
- /** @var \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->createMock(FlexFormTools::class);
self::assertEquals(
$subject->traverseFlexFormXMLData_recurse($dataStruct, $editData, $pA),
diff --git a/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php b/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
index 086d0e84417c..432feed53b2b 100644
--- a/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
@@ -48,7 +48,6 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
],
],
]);
- /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
$classLoaderMock = $this->createMock(ClassLoader::class);
$generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
$generator->buildClassAliasMapForPackage($packageMock);
@@ -71,7 +70,6 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
],
],
]);
- /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
$classLoaderMock = $this->createMock(ClassLoader::class);
$generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
$generator->buildClassAliasMapForPackage($packageMock);
@@ -97,7 +95,6 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
],
];
$packageMock = $this->createPackageMock([]);
- /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
$classLoaderMock = $this->createMock(ClassLoader::class);
$generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
self::assertEquals($expectedClassMap, $generator->buildClassAliasMapForPackage($packageMock));
@@ -131,7 +128,6 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
],
],
]);
- /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
$classLoaderMock = $this->createMock(ClassLoader::class);
$generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
self::assertEquals($expectedClassMap, $generator->buildClassAliasMapForPackage($packageMock));
@@ -269,7 +265,6 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
*/
public function autoloadFilesAreBuildCorrectly($packageManifest, $expectedPsr4Files, $expectedClassMapFiles): void
{
- /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
$classLoaderMock = $this->createMock(ClassLoader::class);
$generator = new ClassLoadingInformationGenerator($classLoaderMock, [$this->createPackageMock($packageManifest)], __DIR__);
$files = $generator->buildAutoloadInformationFiles();
@@ -379,7 +374,6 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
*/
public function autoloadDevFilesAreBuildCorrectly($packageManifest, $expectedPsr4Files, $expectedClassMapFiles): void
{
- /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
$classLoaderMock = $this->createMock(ClassLoader::class);
$generator = new ClassLoadingInformationGenerator($classLoaderMock, [$this->createPackageMock($packageManifest)], __DIR__, true);
$files = $generator->buildAutoloadInformationFiles();
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
index 4949b1f780f1..6175aec8500b 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
@@ -619,7 +619,6 @@ class DataHandlerTest extends UnitTestCase
*/
public function processDatamapForFrozenNonZeroWorkspaceReturnsFalse(): void
{
- /** @var DataHandler $subject */
$subject = $this->getMockBuilder(DataHandler::class)
->onlyMethods(['log'])
->getMock();
@@ -1107,7 +1106,6 @@ class DataHandlerTest extends UnitTestCase
*/
public function deletePagesOnRootLevelIsDenied(): void
{
- /** @var DataHandler|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface $dataHandlerMock */
$dataHandlerMock = $this->getMockBuilder(DataHandler::class)
->onlyMethods(['canDeletePage', 'log'])
->getMock();
@@ -1136,13 +1134,11 @@ class DataHandlerTest extends UnitTestCase
],
];
- /** @var \TYPO3\CMS\Core\Database\RelationHandler $mockRelationHandler */
$mockRelationHandler = $this->createMock(RelationHandler::class);
$mockRelationHandler->itemArray = [
'1' => ['table' => StringUtility::getUniqueId('bar_'), 'id' => 67],
];
- /** @var DataHandler|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface $mockDataHandler */
$mockDataHandler = $this->getAccessibleMock(DataHandler::class, ['getInlineFieldType', 'deleteAction', 'createRelationHandlerInstance'], [], '', false);
$mockDataHandler->expects(self::once())->method('getInlineFieldType')->willReturn('field');
$mockDataHandler->expects(self::once())->method('createRelationHandlerInstance')->willReturn($mockRelationHandler);
diff --git a/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php b/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
index ec16a790c64a..0b91f4fea983 100644
--- a/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
+++ b/typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
@@ -318,7 +318,6 @@ class BulkInsertTest extends UnitTestCase
$this->expectException(\LogicException::class);
$this->expectExceptionMessage('You can only insert 10 rows in a single INSERT statement with platform "mock".');
- /** @var \PHPUnit\Framework\MockObject\MockObject|BulkInsertQuery $subject */
$subject = $this->getAccessibleMock(
BulkInsertQuery::class,
['getInsertMaxRows'],
diff --git a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
index 16b3e268ee31..ade5d35b1450 100644
--- a/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
+++ b/typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
@@ -243,7 +243,6 @@ class AbstractFormProtectionTest extends UnitTestCase
*/
public function validateTokenForValidTokenNotCallsCreateValidationErrorMessage(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|FormProtectionTesting $subject */
$subject = $this->getMockBuilder(FormProtectionTesting::class)
->onlyMethods(['createValidationErrorMessage'])
->getMock();
@@ -260,7 +259,6 @@ class AbstractFormProtectionTest extends UnitTestCase
*/
public function validateTokenForInvalidTokenCallsCreateValidationErrorMessage(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|FormProtectionTesting $subject */
$subject = $this->getMockBuilder(FormProtectionTesting::class)
->onlyMethods(['createValidationErrorMessage'])
->getMock();
@@ -277,7 +275,6 @@ class AbstractFormProtectionTest extends UnitTestCase
*/
public function validateTokenForInvalidFormNameCallsCreateValidationErrorMessage(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|FormProtectionTesting $subject */
$subject = $this->getMockBuilder(FormProtectionTesting::class)
->onlyMethods(['createValidationErrorMessage'])
->getMock();
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
index 60f2eb94c3aa..a10551bbe96b 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
@@ -98,11 +98,9 @@ class FileLinkHandlerTest extends UnitTestCase
*/
public function resolveFileReferencesToSplitParameters(array $input, array $expected): void
{
- /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $storageMock */
$storage = $this->getMockBuilder(ResourceStorage::class)
->disableOriginalConstructor()
->getMock();
- /** @var ResourceFactory|\PHPUnit\Framework\MockObject\MockObject $storageMock */
$factory = $this->getMockBuilder(ResourceFactory::class)
->disableOriginalConstructor()
->getMock();
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
index 6bb948f925db..304093678560 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
@@ -117,7 +117,6 @@ class FolderLinkHandlerTest extends UnitTestCase
$folderObject->method('getCombinedIdentifier')->willReturn($parameters['folder']);
$folderData = explode(':', $parameters['folder']);
- /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $storageMock */
$storage = $this->getMockBuilder(ResourceStorage::class)
->disableOriginalConstructor()
->getMock(['getUid']);
diff --git a/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php b/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
index 1a8bdccce29c..7d1b78259f52 100644
--- a/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
+++ b/typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Tests\Unit\LinkHandling;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\LinkHandling\LegacyLinkNotationConverter;
use TYPO3\CMS\Core\LinkHandling\LinkService;
use TYPO3\CMS\Core\Resource\File;
@@ -269,7 +268,6 @@ class LegacyLinkNotationConverterTest extends UnitTestCase
*/
public function resolveFileReferencesToSplitParameters(string $input, array $expected): void
{
- /** @var ResourceStorage|MockObject $storage */
$storage = $this->getMockBuilder(ResourceStorage::class)
->disableOriginalConstructor()
->getMock();
@@ -350,7 +348,6 @@ class LegacyLinkNotationConverterTest extends UnitTestCase
->getMock();
$folderObject->method('getCombinedIdentifier')->willReturn($parameters['folder']);
$folderData = explode(':', $parameters['folder']);
- /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $storageMock */
$storage = $this->getMockBuilder(ResourceStorage::class)
->onlyMethods(['getUid'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php b/typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php
index 7846241c858c..8c6ddb1e64cb 100644
--- a/typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php
+++ b/typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php
@@ -57,7 +57,6 @@ class SimpleLockStrategyTest extends UnitTestCase
self::markTestSkipped('Test not available on Windows.');
}
// Use a very high id to be unique
- /** @var SimpleLockStrategy|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $lock */
$lock = $this->getAccessibleMock(SimpleLockStrategy::class, ['dummy'], ['999999999']);
$pathOfLockFile = $lock->_get('filePath');
@@ -77,7 +76,6 @@ class SimpleLockStrategyTest extends UnitTestCase
*/
public function releaseRemovesLockfileInTypo3TempLocks(): void
{
- /** @var SimpleLockStrategy|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $lock */
$lock = $this->getAccessibleMock(SimpleLockStrategy::class, ['dummy'], ['999999999']);
$pathOfLockFile = $lock->_get('filePath');
@@ -114,7 +112,6 @@ class SimpleLockStrategyTest extends UnitTestCase
self::markTestIncomplete('releaseDoesNotRemoveFilesNotWithinTypo3TempLocksDirectory() skipped: Test file could not be created');
}
// Create instance, set lock file to invalid path
- /** @var SimpleLockStrategy|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $lock */
$lock = $this->getAccessibleMock(SimpleLockStrategy::class, ['dummy'], ['999999999']);
$lock->_set('filePath', $file);
$lock->_set('isAcquired', true);
diff --git a/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php b/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
index 8823d64540f9..54ab3c6779ce 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Writer/DatabaseWriterTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Tests\Unit\Log\Writer;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Log\Writer\DatabaseWriter;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -33,7 +32,6 @@ class DatabaseWriterTest extends UnitTestCase
public function getTableReturnsPreviouslySetTable(): void
{
$logTable = StringUtility::getUniqueId('logtable_');
- /** @var DatabaseWriter|MockObject $subject */
$subject = $this->getMockBuilder(DatabaseWriter::class)
->addMethods(['dummy'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php b/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
index c7bb457423ee..5804814e8de0 100644
--- a/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Log/Writer/FileWriterTest.php
@@ -54,7 +54,6 @@ class FileWriterTest extends UnitTestCase
$name = StringUtility::getUniqueId('test.core.log.');
}
GeneralUtility::makeInstance(LogManager::class)->registerLogger($name);
- /** @var Logger $logger */
$logger = GeneralUtility::makeInstance(LogManager::class)->getLogger($name);
return $logger;
}
@@ -67,7 +66,6 @@ class FileWriterTest extends UnitTestCase
*/
protected function createWriter(string $prependName = ''): FileWriter
{
- /** @var FileWriter $writer */
$writer = GeneralUtility::makeInstance(FileWriter::class, [
'logFile' => $this->getDefaultFileName($prependName),
]);
diff --git a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
index 68277b318165..83ab34d2dffb 100644
--- a/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
@@ -52,7 +52,6 @@ class PackageManagerTest extends UnitTestCase
parent::setUp();
vfsStream::setup('Test');
- /** @var PhpFrontend|MockObject $mockCache */
$mockCache = $this->getMockBuilder(PhpFrontend::class)
->onlyMethods(['has', 'set', 'getBackend'])
->disableOriginalConstructor()
@@ -182,7 +181,6 @@ class PackageManagerTest extends UnitTestCase
file_put_contents($packagePath . 'ext_emconf.php', '<?php' . LF . '$EM_CONF[$_EXTKEY] = [];');
}
- /** @var PackageManager|MockObject|AccessibleObjectInterface $packageManager */
$packageManager = $this->getAccessibleMock(PackageManager::class, ['dummy'], [new DependencyOrderingService()]);
$packageManager->_set('packagesBasePaths', $packagePaths);
$packageManager->_set('packagesBasePath', 'vfs://Test/Packages/');
@@ -263,7 +261,6 @@ class PackageManagerTest extends UnitTestCase
$packagePaths[] = $packagePath;
}
- /** @var PackageManager|MockObject|AccessibleObjectInterface $packageManager */
$packageManager = $this->getAccessibleMock(PackageManager::class, ['sortAndSavePackageStates', 'registerTransientClassLoadingInformationForPackage'], [new DependencyOrderingService()]);
$packageManager->_set('packagesBasePaths', $packagePaths);
$packageManager->_set('packagesBasePath', 'vfs://Test/Packages/');
diff --git a/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php b/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
index a0cc41ee7295..487d1dbf26ad 100644
--- a/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
@@ -20,7 +20,6 @@ namespace TYPO3\CMS\Core\Tests\Unit\Page;
use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -37,7 +36,6 @@ class PageRendererTest extends UnitTestCase
{
$this->resetSingletonInstances = true;
- /** @var PageRenderer|AccessibleObjectInterface $pageRenderer */
$pageRenderer = $this->getMockBuilder(PageRenderer::class)
->onlyMethods(['reset', 'prepareRendering', 'renderJavaScriptAndCss', 'getPreparedMarkerArray', 'getTemplate'])
->getMock();
@@ -51,7 +49,6 @@ class PageRendererTest extends UnitTestCase
*/
public function addBodyContentAddsContent(): void
{
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
$expectedReturnValue = 'ABCDE';
$subject->addBodyContent('A');
@@ -68,7 +65,6 @@ class PageRendererTest extends UnitTestCase
*/
public function addInlineLanguageLabelFileSetsInlineLanguageLabelFiles(): void
{
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
$fileReference = StringUtility::getUniqueId('file_');
$selectionPrefix = StringUtility::getUniqueId('prefix_');
@@ -91,7 +87,6 @@ class PageRendererTest extends UnitTestCase
*/
public function addInlineLanguageLabelFileSetsTwoDifferentInlineLanguageLabelFiles(): void
{
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
$fileReference1 = StringUtility::getUniqueId('file1_');
$selectionPrefix1 = StringUtility::getUniqueId('prefix1_');
@@ -123,7 +118,6 @@ class PageRendererTest extends UnitTestCase
*/
public function addInlineLanguageLabelFileDoesNotSetSameLanguageFileTwice(): void
{
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
$fileReference = StringUtility::getUniqueId('file2_');
$selectionPrefix = StringUtility::getUniqueId('prefix2_');
@@ -142,7 +136,6 @@ class PageRendererTest extends UnitTestCase
$this->expectException(\RuntimeException::class);
$this->expectExceptionCode(1284906026);
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
$subject->_set('charSet', 'utf-8');
$subject->_call('includeLanguageFileForInline', 'someLLFile.xml');
@@ -156,7 +149,6 @@ class PageRendererTest extends UnitTestCase
$this->expectException(\RuntimeException::class);
$this->expectExceptionCode(1284906026);
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
$subject->_set('lang', 'default');
$subject->_call('includeLanguageFileForInline', 'someLLFile.xml');
@@ -167,7 +159,6 @@ class PageRendererTest extends UnitTestCase
*/
public function includeLanguageFileForInlineDoesNotAddToInlineLanguageLabelsIfFileCouldNotBeRead(): void
{
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['readLLfile'], [], '', false);
$subject->_set('lang', 'default');
$subject->_set('charSet', 'utf-8');
@@ -233,7 +224,6 @@ class PageRendererTest extends UnitTestCase
*/
public function includeLanguageFileForInlineAddsProcessesLabelsToInlineLanguageLabels($llFileContent, $selectionPrefix, $stripFromSelectionName, $expectation): void
{
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['readLLfile'], [], '', false);
$subject->_set('lang', 'default');
$subject->_set('charSet', 'utf-8');
@@ -249,7 +239,6 @@ class PageRendererTest extends UnitTestCase
public function getAddedMetaTag(): void
{
$this->resetSingletonInstances = true;
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['whatDoesThisDo']);
$subject->setMetaTag('nAme', 'Author', 'foobar');
$actualResult = $subject->getMetaTag('naMe', 'AUTHOR');
@@ -267,7 +256,6 @@ class PageRendererTest extends UnitTestCase
public function overrideMetaTag(): void
{
$this->resetSingletonInstances = true;
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['whatDoesThisDo']);
$subject->setMetaTag('nAme', 'Author', 'Axel Foley');
$subject->setMetaTag('nAme', 'Author', 'foobar');
@@ -286,7 +274,6 @@ class PageRendererTest extends UnitTestCase
public function unsetAddedMetaTag(): void
{
$this->resetSingletonInstances = true;
- /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(PageRenderer::class, ['whatDoesThisDo']);
$subject->setMetaTag('nAme', 'Author', 'foobar');
$subject->removeMetaTag('naMe', 'AUTHOR');
diff --git a/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php b/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
index 915da42df7c7..20865de7cb2f 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
@@ -35,14 +35,11 @@ class AbstractFileTest extends UnitTestCase
$parentIdentifier = '/parent/';
$currentIdentifier = '/parent/current/';
- /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $mockedStorageForParent */
$mockedStorageForParent = $this->createMock(ResourceStorage::class);
- /** @var AbstractFile $parentFolderFixture */
$parentFolderFixture = $this->getMockForAbstractClass(AbstractFile::class);
$parentFolderFixture->setIdentifier($parentIdentifier)->setStorage($mockedStorageForParent);
- /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $mockedStorage */
$mockedStorage = $this->getMockBuilder(ResourceStorage::class)
->onlyMethods(['getFolderIdentifierFromFileIdentifier', 'getFolder'])
->disableOriginalConstructor()
@@ -50,7 +47,6 @@ class AbstractFileTest extends UnitTestCase
$mockedStorage->expects(self::once())->method('getFolderIdentifierFromFileIdentifier')->with($currentIdentifier)->willReturn($parentIdentifier);
$mockedStorage->expects(self::once())->method('getFolder')->with($parentIdentifier)->willReturn($parentFolderFixture);
- /** @var AbstractFile $currentFolderFixture */
$currentFolderFixture = $this->getMockForAbstractClass(AbstractFile::class);
$currentFolderFixture->setIdentifier($currentIdentifier)->setStorage($mockedStorage);
@@ -67,7 +63,6 @@ class AbstractFileTest extends UnitTestCase
*/
public function storageIsNotAskedForMimeTypeForPersistedRecord(): void
{
- /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $mockedStorage */
$mockedStorage = $this->getMockBuilder(ResourceStorage::class)->disableOriginalConstructor()->getMock();
$mockedStorage->expects(self::never())->method('getFileInfoByIdentifier')->with('/foo', 'mimetype');
$subject = new File(['identifier' => '/foo', 'mime_type' => 'my/mime-type'], $mockedStorage);
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php b/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
index 84dee04ea653..c52959391590 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
@@ -107,7 +107,6 @@ class LocalDriverTest extends BaseTestCase
$this->initializeVfs();
$driverConfiguration['basePath'] = $this->getMountRootUrl();
}
- /** @var LocalDriver $driver */
$mockedDriverMethods[] = 'isPathValid';
$driver = $this->getAccessibleMock(
LocalDriver::class,
@@ -270,7 +269,6 @@ class LocalDriverTest extends BaseTestCase
*/
public function createFolderRecursiveSanitizesFilename(): void
{
- /** @var LocalDriver|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $driver */
$driver = $this->createDriver([], ['sanitizeFilename']);
$driver->expects(self::exactly(2))
->method('sanitizeFileName')
@@ -286,7 +284,6 @@ class LocalDriverTest extends BaseTestCase
*/
public function determineBaseUrlUrlEncodesUriParts(): void
{
- /** @var LocalDriver|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $driver */
$driver = $this->getAccessibleMock(
LocalDriver::class,
['hasCapability'],
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php b/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
index fceb693cfd46..ab612fce2405 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
@@ -65,7 +65,6 @@ class FileNameFilterTest extends UnitTestCase
*/
public function filterHiddenFilesAndFoldersFiltersHiddenFilesAndFolders(string $itemName, string $itemIdentifier, $expected): void
{
- /** @var DriverInterface|\PHPUnit\Framework\MockObject\MockObject $driverMock */
FileNameFilter::setShowHiddenFilesAndFolders(false);
$driverMock = $this->createMock(DriverInterface::class);
self::assertSame(
@@ -89,7 +88,6 @@ class FileNameFilterTest extends UnitTestCase
*/
public function filterHiddenFilesAndFoldersAllowsHiddenFilesAndFolders(string $itemName, string $itemIdentifier, $expected): void
{
- /** @var DriverInterface|\PHPUnit\Framework\MockObject\MockObject $driverMock */
$driverMock = $this->createMock(DriverInterface::class);
FileNameFilter::setShowHiddenFilesAndFolders(true);
self::assertSame(
diff --git a/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php b/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
index eb5cd55efa19..2a2c480e9dc7 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
@@ -148,7 +148,7 @@ class FolderTest extends UnitTestCase
{
$mockedStorage = $this->createMock(ResourceStorage::class);
$mockedStorage->expects(self::once())->method('hasFolderInFolder')->with(self::equalTo('someSubfolder'))->willReturn(true);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Resource\ResourceFactory $mockedFactory */
+
$mockedFactory = $this->createMock(ResourceFactory::class);
$folderFixture = $this->createFolderFixture(
'/somePath/someFolder/',
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php b/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php
index 0bfb5948411e..70709ff00065 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Index/IndexerTest.php
@@ -36,7 +36,6 @@ class IndexerTest extends UnitTestCase
{
$mockStorage = $this->createMock(ResourceStorage::class);
- /** @var Indexer|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(Indexer::class)
->setConstructorArgs([$mockStorage])
->onlyMethods(['getFileIndexRepository', 'extractRequiredMetaData', 'getExtractorService'])
diff --git a/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php b/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
index 2c272466e4a9..e4b1d8a39806 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
@@ -116,7 +116,6 @@ class MetaDataAspectTest extends UnitTestCase
$file = new File(['uid' => 12], $this->storageMock);
- /** @var MetaDataAspect|MockObject $metaDataAspectMock */
$metaDataAspectMock = $this->getMockBuilder(MetaDataAspect::class)
->setConstructorArgs([$file])
->onlyMethods(['getMetaDataRepository'])
diff --git a/typo3/sysext/core/Tests/Unit/Resource/OnlineMedia/Helpers/VimeoHelperTest.php b/typo3/sysext/core/Tests/Unit/Resource/OnlineMedia/Helpers/VimeoHelperTest.php
index 3a310d0f494d..e18039dc05e8 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/OnlineMedia/Helpers/VimeoHelperTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/OnlineMedia/Helpers/VimeoHelperTest.php
@@ -59,7 +59,6 @@ class VimeoHelperTest extends UnitTestCase
*/
public function transformUrlToFileReturnsExpectedResult($url, $videoId, $expectedResult): void
{
- /** @var Folder|MockObject $mockedFolder */
$mockedFolder = $this->createMock(Folder::class);
$this->subject->method('transformMediaIdToFile')
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
index 1c2cfbe86def..17ed78f865fd 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
@@ -41,7 +41,6 @@ class VimeoRendererTest extends UnitTestCase
{
parent::setUp();
- /** @var VimeoHelper|MockObject $vimeoHelper */
$vimeoHelper = $this->getAccessibleMock(VimeoHelper::class, ['getOnlineMediaId'], ['vimeo']);
$vimeoHelper->method('getOnlineMediaId')->willReturn('7331');
@@ -62,10 +61,9 @@ class VimeoRendererTest extends UnitTestCase
*/
public function canRenderReturnsTrueOnCorrectFile(): void
{
- /** @var File|MockObject $fileResourceMock1 */
$fileResourceMock1 = $this->createMock(File::class);
$fileResourceMock1->method('getMimeType')->willReturn('video/vimeo');
- /** @var File|MockObject $fileResourceMock2 */
+
$fileResourceMock2 = $this->createMock(File::class);
$fileResourceMock2->method('getMimeType')->willReturn('video/unknown');
$fileResourceMock2->method('getExtension')->willReturn('vimeo');
@@ -79,7 +77,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function canRenderReturnsFalseOnCorrectFile(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
$fileResourceMock->method('getMimeType')->willReturn('video/youtube');
@@ -91,7 +88,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -105,7 +101,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithLoopIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -119,7 +114,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithAutoplayIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -133,10 +127,8 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithAutoplayFromReferenceIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
- /** @var FileReference|MockObject $fileResourceMock */
$fileReferenceMock = $this->createMock(FileReference::class);
$fileReferenceMock->method('getProperty')->willReturn(1);
$fileReferenceMock->method('getOriginalFile')->willReturn($fileResourceMock);
@@ -152,7 +144,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithAutoplayAndWithoutControlsIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -166,7 +157,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithAdditionalAttributes(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -180,7 +170,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithDataAttributesForCustomization(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -194,7 +183,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithCombinationOfDataAndAdditionalAttributes(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -208,7 +196,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithCustomAllowIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -222,7 +209,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithCustomAllowAndAutoplayIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -236,14 +222,12 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithPrivateVimeoCodeIsCorrect(): void
{
- /** @var VimeoHelper|MockObject $vimeoHelper */
$vimeoHelper = $this->getAccessibleMock(VimeoHelper::class, ['getOnlineMediaId'], ['vimeo']);
$vimeoHelper->method('getOnlineMediaId')->willReturn('7331/private0123');
$subject = $this->getAccessibleMock(VimeoRenderer::class, ['getOnlineMediaHelper'], []);
$subject->method('getOnlineMediaHelper')->willReturn($vimeoHelper);
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -257,14 +241,12 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputIsEscaped(): void
{
- /** @var VimeoHelper|MockObject $vimeoHelper */
$vimeoHelper = $this->getAccessibleMock(VimeoHelper::class, ['getOnlineMediaId'], ['vimeo']);
$vimeoHelper->method('getOnlineMediaId')->willReturn('7331<script>danger</script>\'"random"quotes;');
$subject = $this->getAccessibleMock(VimeoRenderer::class, ['getOnlineMediaHelper'], []);
$subject->method('getOnlineMediaHelper')->willReturn($vimeoHelper);
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -278,7 +260,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithApiIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -292,7 +273,6 @@ class VimeoRendererTest extends UnitTestCase
*/
public function renderOutputWithDisabledNoCookieIsCorrect(): void
{
- /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
index e75e65e8bc1f..f6c5009a0be7 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
@@ -42,7 +42,6 @@ class YouTubeRendererTest extends UnitTestCase
parent::setUp();
$_SERVER['HTTP_HOST'] = 'test.server.org';
- /** @var YouTubeHelper|MockObject $youTubeHelper */
$youTubeHelper = $this->getAccessibleMock(YouTubeHelper::class, ['getOnlineMediaId'], ['youtube']);
$youTubeHelper->method('getOnlineMediaId')->willReturn('7331');
@@ -63,10 +62,9 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function canRenderReturnsTrueOnCorrectFile(): void
{
- /** @var File|MockObject $fileResourceMock1 */
$fileResourceMock1 = $this->createMock(File::class);
$fileResourceMock1->method('getMimeType')->willReturn('video/youtube');
- /** @var File|MockObject $fileResourceMock2 */
+
$fileResourceMock2 = $this->createMock(File::class);
$fileResourceMock2->method('getMimeType')->willReturn('video/unknown');
$fileResourceMock2->method('getExtension')->willReturn('youtube');
@@ -80,7 +78,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function canRenderReturnsFalseOnCorrectFile(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
$fileResourceMock->method('getMimeType')->willReturn('video/vimeo');
@@ -92,7 +89,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithLoopIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -106,7 +102,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithAutoplayIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -120,10 +115,8 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithAutoplayFromFileReferenceIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
- /** @var FileReference|MockObject $fileReferenceMock */
$fileReferenceMock = $this->createMock(FileReference::class);
$fileReferenceMock->method('getProperty')->willReturn(1);
$fileReferenceMock->method('getOriginalFile')->willReturn($fileResourceMock);
@@ -139,7 +132,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithAutoplayAndWithoutControlsIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -224,7 +216,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithDefaultControlsIsCorrect($expected, $options): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -238,7 +229,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithRelatedVideosTurnedOffIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -252,7 +242,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithAdditionalAttributes(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -266,7 +255,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithDataAttributesForCustomization(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -280,7 +268,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithCombinationOfDataAndAdditionalAttributes(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -294,7 +281,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithDisabledNoCookieIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -308,7 +294,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithModestbrandingIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -322,7 +307,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithCustomAllowIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -336,7 +320,6 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputWithCustomAllowAndAutoplayIsCorrect(): void
{
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
@@ -350,14 +333,12 @@ class YouTubeRendererTest extends UnitTestCase
*/
public function renderOutputIsEscaped(): void
{
- /** @var YouTubeHelper|MockObject $youtubeHelper */
$youtubeHelper = $this->getAccessibleMock(YouTubeHelper::class, ['getOnlineMediaId'], ['youtube']);
$youtubeHelper->method('getOnlineMediaId')->willReturn('7331<script>danger</script>\'"random"quotes;');
$subject = $this->getAccessibleMock(YouTubeRenderer::class, ['getOnlineMediaHelper'], []);
$subject->method('getOnlineMediaHelper')->willReturn($youtubeHelper);
- /** @var File|MockObject $fileResourceMock */
$fileResourceMock = $this->createMock(File::class);
self::assertSame(
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
index cffa02f4f09c..c68ae90d3b39 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
@@ -17,14 +17,12 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Tests\Unit\Resource;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Resource\Exception\ResourceDoesNotExistException;
use TYPO3\CMS\Core\Resource\ResourceFactory;
use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -89,7 +87,6 @@ class ResourceFactoryTest extends UnitTestCase
*/
public function retrieveFileOrFolderObjectCallsGetFolderObjectFromCombinedIdentifierWithRelativePath(): void
{
- /** @var MockObject|AccessibleObjectInterface|ResourceFactory $subject */
$subject = $this->getAccessibleMock(
ResourceFactory::class,
['getFolderObjectFromCombinedIdentifier'],
@@ -109,7 +106,6 @@ class ResourceFactoryTest extends UnitTestCase
*/
public function retrieveFileOrFolderObjectCallsGetFolderObjectFromCombinedIdentifierWithAbsolutePath(): void
{
- /** @var MockObject|AccessibleObjectInterface|ResourceFactory $subject */
$subject = $this->getAccessibleMock(
ResourceFactory::class,
['getFolderObjectFromCombinedIdentifier'],
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
index 373d74ccee24..87d786a8ce55 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
@@ -36,7 +36,6 @@ use TYPO3\CMS\Core\Resource\ResourceFactory;
use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
/**
* Test case for ResourceStorage class
@@ -66,7 +65,6 @@ class ResourceStorageTest extends BaseTestCase
protected function setUp(): void
{
parent::setUp();
- /** @var FileRepository|MockObject $fileRepositoryMock */
$fileRepositoryMock = $this->createMock(FileRepository::class);
GeneralUtility::setSingletonInstance(
FileRepository::class,
@@ -237,7 +235,6 @@ class ResourceStorageTest extends BaseTestCase
*/
public function addFileFailsIfFileDoesNotExist(): void
{
- /** @var Folder|MockObject $mockedFolder */
$mockedFolder = $this->createMock(Folder::class);
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionCode(1319552745);
@@ -308,7 +305,6 @@ class ResourceStorageTest extends BaseTestCase
$mockedDriver = $this->createMock(LocalDriver::class);
$mockedDriver->method('getPermissions')->willReturn($permissionsFromDriver);
$mockedResourceFactory = $this->createMock(ResourceFactory::class);
- /** @var Folder|MockObject $mockedFolder */
$mockedFolder = $this->createMock(Folder::class);
// Let all other checks pass
$subject = $this->getMockBuilder(ResourceStorage::class)
@@ -505,7 +501,7 @@ class ResourceStorageTest extends BaseTestCase
$folderMock = $this->createMock(Folder::class);
$mockedDriver = $this->getMockForAbstractClass(AbstractDriver::class);
$mockedDriver->expects(self::once())->method('isFolderEmpty')->willReturn(false);
- /** @var ResourceStorage|MockObject|AccessibleObjectInterface $subject */
+
$subject = $this->getAccessibleMock(ResourceStorage::class, ['checkFolderActionPermission'], [], '', false);
$subject->method('checkFolderActionPermission')->willReturn(true);
$subject->_set('driver', $mockedDriver);
@@ -534,7 +530,6 @@ class ResourceStorageTest extends BaseTestCase
$mockedDriver = $this->createDriverMock([], $this->subject, ['renameFile']);
$mockedDriver->expects(self::once())->method('renameFile')->willReturn('bar');
$this->prepareSubject([], true, $mockedDriver, null);
- /** @var File $file */
$file = new File(['identifier' => 'foo', 'name' => 'foo'], $this->subject);
$result = $this->subject->renameFile($file, 'bar');
// fake what the indexer does in updateIndexEntry
@@ -565,7 +560,6 @@ class ResourceStorageTest extends BaseTestCase
['getUniqueName', 'createFolderObject']
);
$this->subject->expects(self::once())->method('createFolderObject')->willReturn(new Folder($this->subject, '', ''));
- /** @var File $file */
$file = new File(['identifier' => 'foo', 'name' => 'foo'], $this->subject);
$this->subject->method('getUniqueName')->willReturn('bar_01');
$result = $this->subject->renameFile($file, 'bar');
@@ -585,7 +579,6 @@ class ResourceStorageTest extends BaseTestCase
1489593099
)));
$this->prepareSubject([], true, $mockedDriver);
- /** @var File $file */
$file = new File(['identifier' => 'foo', 'name' => 'foo'], $this->subject);
$this->expectException(ExistingTargetFileNameException::class);
$this->subject->renameFile($file, 'bar', DuplicationBehavior::CANCEL);
@@ -611,7 +604,6 @@ class ResourceStorageTest extends BaseTestCase
$file = $this->prophesize(FileInterface::class);
$resourceFactory->getFileObjectFromCombinedIdentifier(Argument::any())->willReturn($file->reveal());
$this->subject->expects(self::once())->method('replaceFile')->willReturn($file->reveal());
- /** @var File $file */
$file = new File(['identifier' => 'foo', 'name' => 'foo', 'missing' => false], $this->subject);
$this->subject->renameFile($file, 'bar', DuplicationBehavior::REPLACE);
}
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Service/ExtractorServiceTest.php b/typo3/sysext/core/Tests/Unit/Resource/Service/ExtractorServiceTest.php
index 02eb1b614447..543ce3efe145 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Service/ExtractorServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Service/ExtractorServiceTest.php
@@ -106,7 +106,6 @@ class ExtractorServiceTest extends UnitTestCase
$storageMock = $this->createMock(ResourceStorage::class);
$storageMock->method('getDriverType')->willReturn('Local');
- /** @var ExtractorService|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(ExtractorService::class)
->onlyMethods(['getExtractorRegistry'])
->getMock()
@@ -146,7 +145,6 @@ class ExtractorServiceTest extends UnitTestCase
'keywords' => 'typo3, cms',
]);
- /** @var ExtractorRegistry|\PHPUnit\Framework\MockObject\MockObject $extractorRegistryMock */
$extractorRegistryMock = $this->getMockBuilder(ExtractorRegistry::class)
->onlyMethods(['createExtractorInstance'])
->getMock();
diff --git a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
index 337aaa5038ee..b398b808bf29 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/Utility/FileExtensionFilterTest.php
@@ -17,13 +17,11 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Tests\Unit\Resource\Utility;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Core\DataHandling\DataHandler;
use TYPO3\CMS\Core\Resource\Filter\FileExtensionFilter;
use TYPO3\CMS\Core\Resource\ResourceFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -110,7 +108,6 @@ class FileExtensionFilterTest extends UnitTestCase
*/
public function extensionFilterIgnoresCaseInAllowedExtensionCheck($fileExtension, $allowedExtensions, $disallowedExtensions, $isAllowed): void
{
- /** @var FileExtensionFilter|MockObject|AccessibleObjectInterface $filter */
$filter = $this->getAccessibleMock(FileExtensionFilter::class, ['dummy']);
$filter->setAllowedFileExtensions($allowedExtensions);
$filter->setDisallowedFileExtensions($disallowedExtensions);
diff --git a/typo3/sysext/core/Tests/Unit/Routing/Aspect/AspectFactoryTest.php b/typo3/sysext/core/Tests/Unit/Routing/Aspect/AspectFactoryTest.php
index 029ae321c9ed..786a4c3317cc 100644
--- a/typo3/sysext/core/Tests/Unit/Routing/Aspect/AspectFactoryTest.php
+++ b/typo3/sysext/core/Tests/Unit/Routing/Aspect/AspectFactoryTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Tests\Unit\Routing\Aspect;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\PhpUnit\ProphecyTrait;
use Prophecy\Prophecy\ObjectProphecy;
use TYPO3\CMS\Core\Context\Context;
@@ -62,7 +61,6 @@ class AspectFactoryTest extends UnitTestCase
'Persisted' => $this->persistedMockClass,
'Aspect' => $this->aspectMockClass,
];
- /** @var Context|MockObject $contextMock */
$contextMock = $this->getMockBuilder(Context::class)
->disableOriginalConstructor()
->getMock();
diff --git a/typo3/sysext/core/Tests/Unit/Routing/SiteMatcherTest.php b/typo3/sysext/core/Tests/Unit/Routing/SiteMatcherTest.php
index cd78f44e3a0a..3b3a614eeb46 100644
--- a/typo3/sysext/core/Tests/Unit/Routing/SiteMatcherTest.php
+++ b/typo3/sysext/core/Tests/Unit/Routing/SiteMatcherTest.php
@@ -71,7 +71,6 @@ class SiteMatcherTest extends UnitTestCase
],
],
]);
- /** @var SiteFinder $finderMock */
$finderMock = $this
->getMockBuilder(SiteFinder::class)
->onlyMethods(['getAllSites'])
@@ -170,7 +169,6 @@ class SiteMatcherTest extends UnitTestCase
],
],
]);
- /** @var SiteFinder $finderMock */
$finderMock = $this
->getMockBuilder(SiteFinder::class)
->onlyMethods(['getAllSites'])
diff --git a/typo3/sysext/core/Tests/Unit/Service/DependencyOrderingServiceTest.php b/typo3/sysext/core/Tests/Unit/Service/DependencyOrderingServiceTest.php
index d6814adee468..b007c9fdaecb 100644
--- a/typo3/sysext/core/Tests/Unit/Service/DependencyOrderingServiceTest.php
+++ b/typo3/sysext/core/Tests/Unit/Service/DependencyOrderingServiceTest.php
@@ -167,7 +167,6 @@ class DependencyOrderingServiceTest extends UnitTestCase
*/
public function prepareDependenciesBuildsFullIdentifierList(array $dependencies, array $expectedDependencies): void
{
- /** @var DependencyOrderingService|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $dependencyOrderingService */
$dependencyOrderingService = $this->getAccessibleMock(DependencyOrderingService::class, ['dummy']);
$preparedDependencies = $dependencyOrderingService->_call('prepareDependencies', $dependencies);
self::assertEquals($expectedDependencies, $preparedDependencies);
@@ -716,7 +715,6 @@ class DependencyOrderingServiceTest extends UnitTestCase
*/
public function findPathInGraphReturnsCorrectPath(array $graph, string $from, string $to, array $expected): void
{
- /** @var DependencyOrderingService|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $dependencyOrderingService */
$dependencyOrderingService = $this->getAccessibleMock(DependencyOrderingService::class, ['dummy']);
$path = $dependencyOrderingService->_call('findPathInGraph', $graph, $from, $to);
diff --git a/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
index 9cbe0d4dd440..d1b4716058b9 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Core\Tests\Unit\Utility;
+use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use Psr\EventDispatcher\EventDispatcherInterface;
@@ -130,7 +131,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
$this->expectExceptionCode(1365429656);
$packageName = StringUtility::getUniqueId('foo');
- /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
$packageManager = $this->getMockBuilder(PackageManager::class)
->onlyMethods(['isPackageActive'])
->disableOriginalConstructor()
@@ -152,7 +152,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
->disableOriginalConstructor()
->onlyMethods(['getPackagePath'])
->getMock();
- /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
$packageManager = $this->getMockBuilder(PackageManager::class)
->onlyMethods(['isPackageActive', 'getPackage'])
->disableOriginalConstructor()
@@ -1192,7 +1191,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
*/
public function loadExtLocalconfDoesNotReadFromCacheIfCachingIsDenied(): void
{
- /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
$mockCacheManager = $this->getMockBuilder(CacheManager::class)
->onlyMethods(['getCache'])
->getMock();
@@ -1213,7 +1211,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
->disableOriginalConstructor()
->getMock();
- /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
$mockCacheManager = $this->getMockBuilder(CacheManager::class)
->onlyMethods(['getCache'])
->getMock();
@@ -1422,7 +1419,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
*/
public function loadBaseTcaDoesNotReadFromCacheIfCachingIsDenied(): void
{
- /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
$mockCacheManager = $this->getMockBuilder(CacheManager::class)
->onlyMethods(['getCache'])
->getMock();
@@ -1468,7 +1464,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
->disableOriginalConstructor()
->getMock();
- /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
$mockCacheManager = $this->getMockBuilder(CacheManager::class)
->onlyMethods(['getCache'])
->getMock();
@@ -1494,7 +1489,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
->disableOriginalConstructor()
->getMock();
- /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
$mockCacheManager = $this->getMockBuilder(CacheManager::class)
->onlyMethods(['getCache'])
->getMock();
@@ -1529,7 +1523,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
*/
public function loadExtTablesDoesNotReadFromCacheIfCachingIsDenied(): void
{
- /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
$mockCacheManager = $this->getMockBuilder(CacheManager::class)
->onlyMethods(['getCache'])
->getMock();
@@ -1550,7 +1543,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
->disableOriginalConstructor()
->getMock();
- /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
$mockCacheManager = $this->getMockBuilder(CacheManager::class)
->onlyMethods(['getCache'])
->getMock();
@@ -1696,7 +1688,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
->getMock();
$packageMetaData->method('getVersion')->willReturn('1.2.3');
$packageManager = $this->createMockPackageManagerWithMockPackage($extensionKey, ['getPackagePath', 'getPackageKey', 'getPackageMetaData']);
- /** @var \PHPUnit\Framework\MockObject\MockObject $package */
+ /** @var Package&MockObject $package */
$package = $packageManager->getPackage($extensionKey);
$package
->method('getPackageMetaData')
@@ -1734,7 +1726,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
$this->expectExceptionCode(1342345487);
$packageName = StringUtility::getUniqueId('foo');
- /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
$packageManager = $this->getMockBuilder(PackageManager::class)
->onlyMethods(['isPackageActive'])
->disableOriginalConstructor()
@@ -1753,7 +1744,6 @@ class ExtensionManagementUtilityTest extends UnitTestCase
public function unloadExtensionCallsPackageManagerToDeactivatePackage(): void
{
$packageName = StringUtility::getUniqueId('foo');
- /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
$packageManager = $this->getMockBuilder(PackageManager::class)
->onlyMethods(['isPackageActive', 'deactivatePackage'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
index fbb1cfbf9fd9..528f22828c7b 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/File/ExtendedFileUtilityTest.php
@@ -72,7 +72,6 @@ class ExtendedFileUtilityTest extends UnitTestCase
[$file]
);
- /** @var \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility $subject */
$subject = $this->getMockBuilder(ExtendedFileUtility::class)
->onlyMethods(['addFlashMessage'])
->getMock();
@@ -123,7 +122,6 @@ class ExtendedFileUtilityTest extends UnitTestCase
[]
);
- /** @var \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility $subject */
$subject = $this->getMockBuilder(ExtendedFileUtility::class)
->onlyMethods(['addFlashMessage'])
->getMock();
diff --git a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
index 4d2bb49fed04..3feed734fca3 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
@@ -3408,7 +3408,6 @@ class GeneralUtilityTest extends UnitTestCase
->disableOriginalConstructor()
->onlyMethods(['getPackagePath'])
->getMock();
- /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
$packageManager = $this->getMockBuilder(PackageManager::class)
->onlyMethods(['isPackageActive', 'getPackage', 'getActivePackages'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
index 421598e04d40..fde2cf1efeaf 100644
--- a/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
+++ b/typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
@@ -335,7 +335,6 @@ class RootlineUtilityTest extends UnitTestCase
{
$this->subject->method('resolvePageId')->willReturn(42);
- /** @var AbstractFrontend $cacheFrontendMock */
$cacheFrontendMock = $this->getMockForAbstractClass(
AbstractFrontend::class,
[],
diff --git a/typo3/sysext/core/Tests/UnitDeprecated/Cache/Backend/WincacheBackendTest.php b/typo3/sysext/core/Tests/UnitDeprecated/Cache/Backend/WincacheBackendTest.php
index 828a6119e447..5e430c7e0baf 100644
--- a/typo3/sysext/core/Tests/UnitDeprecated/Cache/Backend/WincacheBackendTest.php
+++ b/typo3/sysext/core/Tests/UnitDeprecated/Cache/Backend/WincacheBackendTest.php
@@ -203,13 +203,11 @@ class WincacheBackendTest extends UnitTestCase
*/
public function flushRemovesOnlyOwnEntries(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
$thisCache = $this->createMock(FrontendInterface::class);
$thisCache->method('getIdentifier')->willReturn('thisCache');
$thisBackend = new WincacheBackend('Testing');
$thisBackend->setCache($thisCache);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
$thatCache = $this->createMock(FrontendInterface::class);
$thatCache->method('getIdentifier')->willReturn('thatCache');
$thatBackend = new WincacheBackend('Testing');
@@ -266,7 +264,6 @@ class WincacheBackendTest extends UnitTestCase
*/
protected function setUpBackend(bool $accessible = false)
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
$cache = $this->createMock(FrontendInterface::class);
if ($accessible) {
$backend = $this->getAccessibleMock(WincacheBackend::class, ['dummy'], ['Testing']);
diff --git a/typo3/sysext/dashboard/Classes/DashboardInitializationService.php b/typo3/sysext/dashboard/Classes/DashboardInitializationService.php
index 8cec63475c42..e46e920020f3 100644
--- a/typo3/sysext/dashboard/Classes/DashboardInitializationService.php
+++ b/typo3/sysext/dashboard/Classes/DashboardInitializationService.php
@@ -110,7 +110,6 @@ class DashboardInitializationService
$userConfig['options.']['dashboard.']['dashboardPresetsForNewUsers'] ?? 'default'
);
- /** @var DashboardPreset $dashboardPreset */
foreach ($this->dashboardPresetRegistry->getDashboardPresets() as $dashboardPreset) {
if (in_array($dashboardPreset->getIdentifier(), $dashboardsToCreate, true)) {
$dashboard = $this->dashboardRepository->create(
diff --git a/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php b/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
index bf45cc72ba18..704a5c6657c4 100644
--- a/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
+++ b/typo3/sysext/extbase/Classes/Configuration/BackendConfigurationManager.php
@@ -55,7 +55,6 @@ class BackendConfigurationManager extends AbstractConfigurationManager
$pageId = $this->getCurrentPageId();
if (!array_key_exists($pageId, $this->typoScriptSetupCache)) {
- /** @var TemplateService $template */
$template = GeneralUtility::makeInstance(TemplateService::class);
// do not log time-performance information
$template->tt_track = false;
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php b/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
index 8ab58a6254cf..b9c8088dc6d6 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/ActionController.php
@@ -397,7 +397,7 @@ abstract class ActionController implements ControllerInterface
$classSchemaMethod = $this->reflectionService->getClassSchema(static::class)
->getMethod($this->actionMethodName);
- /** @var \TYPO3\CMS\Extbase\Mvc\Controller\Argument $argument */
+ /** @var Argument $argument */
foreach ($this->arguments as $argument) {
$classSchemaMethodParameter = $classSchemaMethod->getParameter($argument->getName());
// At this point validation is skipped if there is an IgnoreValidation annotation.
@@ -446,7 +446,7 @@ abstract class ActionController implements ControllerInterface
*/
public function initializeControllerArgumentsBaseValidators()
{
- /** @var \TYPO3\CMS\Extbase\Mvc\Controller\Argument $argument */
+ /** @var Argument $argument */
foreach ($this->arguments as $argument) {
$validator = $this->validatorResolver->getBaseValidatorConjunction($argument->getDataType());
if ($validator !== null) {
@@ -565,7 +565,7 @@ abstract class ActionController implements ControllerInterface
// todo: support this via method-reflection
$preparedArguments = [];
- /** @var \TYPO3\CMS\Extbase\Mvc\Controller\Argument $argument */
+ /** @var Argument $argument */
foreach ($this->arguments as $argument) {
$preparedArguments[] = $argument->getValue();
}
@@ -897,7 +897,6 @@ abstract class ActionController implements ControllerInterface
*/
protected function buildControllerContext()
{
- /** @var ControllerContext $controllerContext */
$controllerContext = GeneralUtility::makeInstance(ControllerContext::class);
$controllerContext->setRequest($this->request);
if ($this->arguments !== null) {
@@ -1036,7 +1035,7 @@ abstract class ActionController implements ControllerInterface
*/
protected function mapRequestArgumentsToControllerArguments()
{
- /** @var \TYPO3\CMS\Extbase\Mvc\Controller\Argument $argument */
+ /** @var Argument $argument */
foreach ($this->arguments as $argument) {
$argumentName = $argument->getName();
if ($this->request->hasArgument($argumentName)) {
diff --git a/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php b/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
index a15dc8e8d441..a5bec5f01e1c 100644
--- a/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
+++ b/typo3/sysext/extbase/Classes/Mvc/Controller/Arguments.php
@@ -146,7 +146,6 @@ class Arguments extends \ArrayObject
*/
public function addNewArgument($name, $dataType = 'Text', $isRequired = false, $defaultValue = null)
{
- /** @var Argument $argument */
$argument = GeneralUtility::makeInstance(Argument::class, $name, $dataType);
$argument->setRequired($isRequired);
$argument->setDefaultValue($defaultValue);
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
index a7c6f697b137..be3d2b663014 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyLoadingProxy.php
@@ -66,7 +66,6 @@ class LazyLoadingProxy implements \Iterator, LoadingStrategyInterface
if ($dataMapper === null) {
$dataMapper = GeneralUtility::makeInstance(DataMapper::class);
}
- /** @var DataMapper $dataMapper */
$this->dataMapper = $dataMapper;
}
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
index b373173aecda..1fd56d734474 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/LazyObjectStorage.php
@@ -95,7 +95,6 @@ class LazyObjectStorage extends ObjectStorage implements LoadingStrategyInterfac
if ($dataMapper === null) {
$dataMapper = GeneralUtility::makeInstance(DataMapper::class);
}
- /** @var DataMapper $dataMapper */
$this->dataMapper = $dataMapper;
}
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
index 20d9881a8cd2..61b88ed98f67 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Query.php
@@ -234,7 +234,6 @@ class Query implements QueryInterface, ForwardCompatibleQueryInterface
return $this->persistenceManager->getObjectDataByQuery($this);
}
if ($this->container->has(QueryResultInterface::class)) {
- /** @var QueryResultInterface $queryResult */
$queryResult = $this->container->get(QueryResultInterface::class);
if ($queryResult instanceof ForwardCompatibleQueryResultInterface) {
$queryResult->setQuery($this);
@@ -242,7 +241,6 @@ class Query implements QueryInterface, ForwardCompatibleQueryInterface
}
}
// @deprecated since v11, will be removed in v12. Fallback to ObjectManager, drop together with ForwardCompatibleQueryResultInterface.
- /** @var QueryResultInterface $queryResult */
$queryResult = GeneralUtility::makeInstance(ObjectManager::class)->get(QueryResultInterface::class, $this);
return $queryResult;
}
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/QueryFactory.php b/typo3/sysext/extbase/Classes/Persistence/Generic/QueryFactory.php
index 93c0fdd57a01..c7f58eae4ef2 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/QueryFactory.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/QueryFactory.php
@@ -52,13 +52,11 @@ class QueryFactory implements QueryFactoryInterface, SingletonInterface
*/
public function create($className): QueryInterface
{
- /** @var QueryInterface $query */
$query = $this->container->get(QueryInterface::class);
if ($query instanceof ForwardCompatibleQueryInterface) {
$query->setType($className);
} else {
// @deprecated since v11, will be removed in v12. Use ObjectManager if an implementation does not implement ForwardCompatibleQueryInterface.
- /** @var QueryInterface $query */
$query = GeneralUtility::makeInstance(ObjectManager::class)->get(QueryInterface::class, $className);
}
diff --git a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbQueryParser.php b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbQueryParser.php
index 22e4aa7a51b5..ce839f8e3f6b 100644
--- a/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbQueryParser.php
+++ b/typo3/sysext/extbase/Classes/Persistence/Generic/Storage/Typo3DbQueryParser.php
@@ -18,7 +18,6 @@ namespace TYPO3\CMS\Extbase\Persistence\Generic\Storage;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Context\Context;
-use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\Expression\CompositeExpression;
use TYPO3\CMS\Core\Database\Query\Expression\ExpressionBuilder;
@@ -1073,7 +1072,6 @@ class Typo3DbQueryParser
protected function replaceTableNameWithAlias($statement, $tableName, $tableAlias)
{
if ($tableAlias !== $tableName) {
- /** @var Connection $connection */
$connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable($tableName);
$quotedTableName = $connection->quoteIdentifier($tableName);
$quotedTableAlias = $connection->quoteIdentifier($tableAlias);
diff --git a/typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationBuilder.php b/typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationBuilder.php
index b58d7f4635d1..649030646b5c 100644
--- a/typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationBuilder.php
+++ b/typo3/sysext/extbase/Classes/Property/PropertyMappingConfigurationBuilder.php
@@ -27,12 +27,11 @@ class PropertyMappingConfigurationBuilder implements SingletonInterface
/**
* Builds the default property mapping configuration.
*
- * @param string $type the implementation class name of the PropertyMappingConfiguration to instantiate; must be a subclass of \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration
- * @return \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration
+ * @param class-string<PropertyMappingConfiguration> $type the implementation class to instantiate
+ * @return PropertyMappingConfiguration
*/
public function build($type = PropertyMappingConfiguration::class)
{
- /** @var \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration $configuration */
$configuration = new $type();
$configuration->setTypeConverterOptions(PersistentObjectConverter::class, [
diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
index 39f82daa704d..ba1d01de97b2 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/AbstractFileFolderConverter.php
@@ -61,9 +61,9 @@ abstract class AbstractFileFolderConverter extends AbstractTypeConverter
* @param string|int $source
* @param string $targetType
* @param array $convertedChildProperties
- * @param \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration
- * @throws \TYPO3\CMS\Extbase\Property\Exception
- * @return \TYPO3\CMS\Extbase\Domain\Model\AbstractFileFolder
+ * @param PropertyMappingConfigurationInterface|null $configuration
+ * @return AbstractFileFolder
+ * @throws Exception
*/
public function convertFrom($source, string $targetType, array $convertedChildProperties = [], PropertyMappingConfigurationInterface $configuration = null): AbstractFileFolder
{
@@ -71,7 +71,7 @@ abstract class AbstractFileFolderConverter extends AbstractTypeConverter
if (empty($this->expectedObjectType) || !$object instanceof $this->expectedObjectType) {
throw new Exception('Expected object of type "' . $this->expectedObjectType . '" but got ' . (is_object($object) ? get_class($object) : 'null'), 1342895975);
}
- /** @var \TYPO3\CMS\Extbase\Domain\Model\AbstractFileFolder $subject */
+ /** @var AbstractFileFolder $subject */
$subject = GeneralUtility::makeInstance($targetType);
$subject->setOriginalResource($object);
return $subject;
diff --git a/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php b/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
index a7294942d6d5..8e2d2f9157b0 100644
--- a/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
+++ b/typo3/sysext/extbase/Classes/Validation/Validator/GenericObjectValidator.php
@@ -33,7 +33,7 @@ class GenericObjectValidator extends AbstractValidator implements ObjectValidato
* the Error Messages object which occurred.
*
* @param mixed $value The value that should be validated
- * @return \TYPO3\CMS\Extbase\Error\Result
+ * @return Result
*/
public function validate($value)
{
@@ -90,7 +90,7 @@ class GenericObjectValidator extends AbstractValidator implements ObjectValidato
*/
protected function checkProperty($value, $validators, $propertyName)
{
- /** @var \TYPO3\CMS\Extbase\Error\Result $result */
+ /** @var Result $result */
$result = null;
foreach ($validators as $validator) {
if ($validator instanceof ObjectValidatorInterface) {
diff --git a/typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php b/typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
index d802624397e2..67977add63bf 100644
--- a/typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
+++ b/typo3/sysext/extbase/Classes/Validation/ValidatorResolver.php
@@ -141,7 +141,7 @@ class ValidatorResolver implements SingletonInterface
$classSchema = $this->reflectionService->getClassSchema($targetClassName);
// Model based validator
- /** @var \TYPO3\CMS\Extbase\Validation\Validator\GenericObjectValidator $objectValidator */
+ /** @var GenericObjectValidator $objectValidator */
$objectValidator = GeneralUtility::makeInstance(GenericObjectValidator::class, []);
foreach ($classSchema->getProperties() as $property) {
if ($property->getType() === null) {
diff --git a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerTest.php b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerTest.php
index 3e54f6043f31..4f11a2ab6073 100644
--- a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/ActionControllerTest.php
@@ -108,7 +108,6 @@ class ActionControllerTest extends FunctionalTestCase
$conjunctionValidator = $argument->getValidator();
self::assertInstanceOf(ConjunctionValidator::class, $conjunctionValidator);
- /** @var \SplObjectStorage $validators */
$validators = $conjunctionValidator->getValidators();
self::assertInstanceOf(\SplObjectStorage::class, $validators);
self::assertCount(1, $validators);
diff --git a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/Fixture/Extension/action_controller_test/Classes/Controller/TestController.php b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/Fixture/Extension/action_controller_test/Classes/Controller/TestController.php
index 2f3efa4c01d3..b22b8fb4786a 100644
--- a/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/Fixture/Extension/action_controller_test/Classes/Controller/TestController.php
+++ b/typo3/sysext/extbase/Tests/Functional/Mvc/Controller/Fixture/Extension/action_controller_test/Classes/Controller/TestController.php
@@ -22,7 +22,6 @@ use Psr\Http\Message\ResponseInterface;
use TYPO3\CMS\Extbase\Annotation as Extbase;
use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Mvc\Controller\Arguments;
-use TYPO3\CMS\Extbase\Mvc\Controller\MvcPropertyMappingConfiguration;
use TYPO3\CMS\Extbase\Property\TypeConverter\PersistentObjectConverter;
/**
@@ -37,7 +36,6 @@ class TestController extends ActionController
public function initializeFooAction(): void
{
- /** @var MvcPropertyMappingConfiguration $propertyMappingConfiguration */
$propertyMappingConfiguration = $this->arguments['fooParam']->getPropertyMappingConfiguration();
$propertyMappingConfiguration->allowAllProperties();
$propertyMappingConfiguration->setTypeConverterOption(
diff --git a/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php b/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
index 62e7fac152a0..9e407c2a27d4 100644
--- a/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Persistence/RelationTest.php
@@ -223,7 +223,6 @@ class RelationTest extends FunctionalTestCase
->executeQuery()
->fetchOne();
- /** @var Post $newPost */
$newPost = new Post();
$posts = clone $this->blog->getPosts();
diff --git a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php
index 613b41fc0630..ea7bd7b550e9 100644
--- a/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php
+++ b/typo3/sysext/extbase/Tests/Functional/Property/TypeConverter/ObjectConverterTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Tests\Functional\Property\TypeConverter;
use TYPO3\CMS\Extbase\DomainObject\AbstractEntity;
+use TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
use TYPO3\CMS\Extbase\Property\Exception;
use TYPO3\CMS\Extbase\Property\PropertyMapper;
@@ -53,7 +54,7 @@ class ObjectConverterTest extends FunctionalTestCase
}
};
- /** @var \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface $object */
+ /** @var DomainObjectInterface $object */
$object = $propertyMapper->convert(['name' => 'John Doe'], get_class($model));
self::assertInstanceOf(get_class($model), $object);
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
index e93dbe740d74..ddeb568d452a 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
@@ -378,7 +378,6 @@ class AbstractConfigurationManagerTest extends UnitTestCase
*/
public function getContentObjectTheCurrentContentObject(): void
{
- /** @var ContentObjectRenderer|MockObject $mockContentObject */
$mockContentObject = $this->createMock(ContentObjectRenderer::class);
$this->abstractConfigurationManager->setContentObject($mockContentObject);
self::assertSame($this->abstractConfigurationManager->getContentObject(), $mockContentObject);
diff --git a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
index b274289ea5d2..8beac7c06615 100644
--- a/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
@@ -279,7 +279,6 @@ class FrontendConfigurationManagerTest extends UnitTestCase
'framework' => 'configuration',
],
];
- /** @var FrontendConfigurationManager|MockObject|AccessibleObjectInterface */
$frontendConfigurationManager = $this->getAccessibleMock(
FrontendConfigurationManager::class,
[
@@ -309,7 +308,6 @@ class FrontendConfigurationManagerTest extends UnitTestCase
{
$storagePids = [3, 5, 9];
$recursive = 99;
- /** @var FrontendConfigurationManager|MockObject|AccessibleObjectInterface $abstractConfigurationManager */
$abstractConfigurationManager = $this->getAccessibleMock(
FrontendConfigurationManager::class,
[
@@ -340,7 +338,6 @@ class FrontendConfigurationManagerTest extends UnitTestCase
{
$storagePids = [-3, 5, 9];
$recursive = 99;
- /** @var FrontendConfigurationManager|MockObject|AccessibleObjectInterface $abstractConfigurationManager */
$abstractConfigurationManager = $this->getAccessibleMock(
FrontendConfigurationManager::class,
[
@@ -371,7 +368,6 @@ class FrontendConfigurationManagerTest extends UnitTestCase
{
$storagePids = [1, 2, 3];
- /** @var FrontendConfigurationManager|MockObject|AccessibleObjectInterface $abstractConfigurationManager */
$abstractConfigurationManager = $this->getAccessibleMock(
FrontendConfigurationManager::class,
[
@@ -571,7 +567,6 @@ class FrontendConfigurationManagerTest extends UnitTestCase
*/
public function overrideConfigurationFromPluginOverridesCorrectly(): void
{
- /** @var FrontendConfigurationManager|MockObject|AccessibleObjectInterface $frontendConfigurationManager */
$frontendConfigurationManager = $this->getAccessibleMock(
FrontendConfigurationManager::class,
['getTypoScriptSetup'],
diff --git a/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php b/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php
index ab2129f09b66..0dce4b9ccd6e 100644
--- a/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Hook/DataHandler/CheckFlexFormValueTest.php
@@ -52,11 +52,9 @@ class CheckFlexFormValueTest extends UnitTestCase
],
];
- /** @var DataHandler $dataHandler */
$dataHandler = $this->createMock(DataHandler::class);
$newFlexFormDataArray = [];
- /** @var CheckFlexFormValue $checkFlexFormValue */
$checkFlexFormValue = $this->getMockBuilder(CheckFlexFormValue::class)
->addMethods(['dummy'])
->getMock();
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
index df4cacd83312..2af9af071f17 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
@@ -71,7 +71,6 @@ class ActionControllerTest extends UnitTestCase
{
$mockRequest = $this->createMock(Request::class);
$mockRequest->expects(self::once())->method('getControllerActionName')->willReturn('fooBar');
- /** @var ActionController|MockObject|AccessibleObjectInterface */
$mockController = $this->getAccessibleMockForAbstractClass(ActionController::class, [], '', false, true, true, ['fooBarAction']);
$mockController->_set('request', $mockRequest);
self::assertEquals('fooBarAction', $mockController->_call('resolveActionMethodName'));
@@ -86,7 +85,6 @@ class ActionControllerTest extends UnitTestCase
$this->expectExceptionCode(1186669086);
$mockRequest = $this->createMock(Request::class);
$mockRequest->expects(self::once())->method('getControllerActionName')->willReturn('fooBar');
- /** @var ActionController|MockObject|AccessibleObjectInterface */
$mockController = $this->getAccessibleMockForAbstractClass(ActionController::class, [], '', false, true, true, ['otherBarAction']);
$mockController->_set('request', $mockRequest);
$mockController->_call('resolveActionMethodName');
@@ -288,9 +286,7 @@ class ActionControllerTest extends UnitTestCase
*/
public function setViewConfigurationResolvesTemplateRootPathsForTemplateRootPath(array $configuration, array $expected): void
{
- /** @var ActionController|MockObject|AccessibleObjectInterface $mockController */
$mockController = $this->getAccessibleMockForAbstractClass(ActionController::class, [], '', false, true, true, ['dummy']);
- /** @var ConfigurationManagerInterface|MockObject $mockConfigurationManager */
$mockConfigurationManager = $this->createMock(ConfigurationManagerInterface::class);
$mockConfigurationManager->method('getConfiguration')->willReturn($configuration);
$mockController->injectConfigurationManager($mockConfigurationManager);
@@ -368,9 +364,7 @@ class ActionControllerTest extends UnitTestCase
*/
public function setViewConfigurationResolvesLayoutRootPathsForLayoutRootPath(array $configuration, array $expected): void
{
- /** @var ActionController|MockObject|AccessibleObjectInterface $mockController */
$mockController = $this->getAccessibleMockForAbstractClass(ActionController::class, [], '', false, true, true, ['dummy']);
- /** @var ConfigurationManagerInterface|MockObject $mockConfigurationManager */
$mockConfigurationManager = $this->createMock(ConfigurationManagerInterface::class);
$mockConfigurationManager->method('getConfiguration')->willReturn($configuration);
$mockController->injectConfigurationManager($mockConfigurationManager);
@@ -448,9 +442,7 @@ class ActionControllerTest extends UnitTestCase
*/
public function setViewConfigurationResolvesPartialRootPathsForPartialRootPath(array $configuration, array $expected): void
{
- /** @var ActionController|MockObject|AccessibleObjectInterface $mockController */
$mockController = $this->getAccessibleMockForAbstractClass(ActionController::class, [], '', false, true, true, ['dummy']);
- /** @var ConfigurationManagerInterface|MockObject $mockConfigurationManager */
$mockConfigurationManager = $this->createMock(ConfigurationManagerInterface::class);
$mockConfigurationManager->method('getConfiguration')->willReturn($configuration);
$mockController->injectConfigurationManager($mockConfigurationManager);
diff --git a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
index 16bf013f0bf3..3c9d1a439fb0 100644
--- a/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
@@ -386,7 +386,6 @@ class UriBuilderTest extends UnitTestCase
*/
public function buildFrontendUriCreatesTypoLink(): void
{
- /** @var UriBuilder|MockObject|AccessibleObjectInterface $uriBuilder */
$uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
$uriBuilder->_set('contentObject', $this->mockContentObject);
$uriBuilder->expects(self::once())->method('buildTypolinkConfiguration')->willReturn(['someTypoLinkConfiguration']);
@@ -421,7 +420,6 @@ class UriBuilderTest extends UnitTestCase
*/
public function buildFrontendUriCreatesAbsoluteUrisIfSpecified(): void
{
- /** @var UriBuilder|MockObject|AccessibleObjectInterface $uriBuilder */
$uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
$uriBuilder->_set('contentObject', $this->mockContentObject);
$uriBuilder->expects(self::once())->method('buildTypolinkConfiguration')->willReturn(['foo' => 'bar']);
@@ -437,7 +435,6 @@ class UriBuilderTest extends UnitTestCase
*/
public function buildFrontendUriSetsAbsoluteUriSchemeIfSpecified(): void
{
- /** @var UriBuilder|MockObject|AccessibleObjectInterface $uriBuilder */
$uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
$uriBuilder->_set('contentObject', $this->mockContentObject);
$uriBuilder->expects(self::once())->method('buildTypolinkConfiguration')->willReturn(['foo' => 'bar']);
@@ -454,7 +451,6 @@ class UriBuilderTest extends UnitTestCase
*/
public function buildFrontendUriDoesNotSetAbsoluteUriSchemeIfCreateAbsoluteUriIsFalse(): void
{
- /** @var UriBuilder|MockObject|AccessibleObjectInterface $uriBuilder */
$uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
$uriBuilder->_set('contentObject', $this->mockContentObject);
$uriBuilder->expects(self::once())->method('buildTypolinkConfiguration')->willReturn(['foo' => 'bar']);
@@ -704,7 +700,6 @@ class UriBuilderTest extends UnitTestCase
{
$mockValueObject = new ValueObjectFixture();
$mockValueObject->name = 'foo';
- /** @var UriBuilder|MockObject|AccessibleObjectInterface $mockUriBuilder */
$mockUriBuilder = $this->getAccessibleMock(UriBuilder::class, ['convertTransientObjectToArray']);
$mockUriBuilder->expects(self::once())->method('convertTransientObjectToArray')->willReturn(['foo' => 'bar']);
$actualResult = $mockUriBuilder->_call('convertDomainObjectsToIdentityArrays', ['object' => $mockValueObject]);
@@ -721,7 +716,6 @@ class UriBuilderTest extends UnitTestCase
$this->expectExceptionCode(1260881688);
$mockEntity = new EntityFixture();
$mockEntity->name = 'foo';
- /** @var UriBuilder|MockObject|AccessibleObjectInterface $mockUriBuilder */
$mockUriBuilder = $this->getAccessibleMock(UriBuilder::class, ['dummy']);
$mockUriBuilder->_call('convertDomainObjectsToIdentityArrays', ['object' => $mockEntity]);
}
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
index 38b626be5d48..5a0aafbbfc42 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Core\Database\ReferenceIndex;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -29,7 +28,6 @@ use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap;
use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap;
use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory;
use TYPO3\CMS\Extbase\Persistence\Generic\Storage\BackendInterface;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
class BackendTest extends UnitTestCase
@@ -114,7 +112,6 @@ class BackendTest extends UnitTestCase
$session->expects(self::once())->method('getIdentifierByObject')->with($object)->willReturn($fakeUuid);
- /** @var Backend|MockObject|AccessibleObjectInterface $backend */
$backend = $this->getAccessibleMock(Backend::class, ['dummy'], [$configurationManager], '', false);
$backend->_set('session', $session);
@@ -145,7 +142,6 @@ class BackendTest extends UnitTestCase
$proxy->expects(self::once())->method('_loadRealInstance')->willReturn($object);
$session->expects(self::once())->method('getIdentifierByObject')->with($object)->willReturn($fakeUuid);
- /** @var Backend|MockObject|AccessibleObjectInterface $backend */
$backend = $this->getAccessibleMock(Backend::class, ['dummy'], [$configurationManager], '', false);
$backend->_set('session', $session);
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
index 47d25757449c..ad6ac85f2977 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic\Mapper;
use ExtbaseTeam\BlogExample\Domain\Model\Administrator;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Belog\Domain\Model\LogEntry;
use TYPO3\CMS\Core\Cache\Frontend\VariableFrontend;
use TYPO3\CMS\Core\DataHandling\TableColumnSubType;
@@ -28,7 +27,6 @@ use TYPO3\CMS\Extbase\Persistence\Generic\Exception\InvalidClassException;
use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap;
use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory;
use TYPO3\CMS\Extbase\Persistence\ObjectStorage;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -479,7 +477,6 @@ class DataMapFactoryTest extends UnitTestCase
*/
public function createColumnMapReturnsAValidColumnMap(): void
{
- /** @var DataMapFactory|MockObject|AccessibleObjectInterface $dataMapFactory*/
$dataMapFactory = $this->getAccessibleMock(DataMapFactory::class, ['dummy'], [], '', false);
$columnMap = $this->getMockBuilder(ColumnMap::class)
@@ -527,10 +524,8 @@ class DataMapFactoryTest extends UnitTestCase
*/
public function setTypeDetectsTypeAndInternalTypeProperly(array $columnConfiguration, $type, $internalType): void
{
- /** @var DataMapFactory|AccessibleObjectInterface|MockObject $dataMapFactory */
$dataMapFactory = $this->getAccessibleMock(DataMapFactory::class, ['dummy'], [], '', false);
- /** @var ColumnMap|MockObject|AccessibleObjectInterface $columnMap */
$columnMap = $this->getAccessibleMock(ColumnMap::class, ['dummy'], [], '', false);
$dataMapFactory->_call('setType', $columnMap, $columnConfiguration);
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
index 1f0d4d9a7cc5..9dcf95a05341 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
@@ -60,7 +60,6 @@ class DataMapperTest extends UnitTestCase
$rows = [['uid' => '1234']];
$object = new \stdClass();
- /** @var DataMapper|AccessibleObjectInterface|MockObject $dataMapper */
$dataMapper = $this->getMockBuilder(DataMapper::class)
->setConstructorArgs([
$this->createMock(ReflectionService::class),
@@ -143,7 +142,6 @@ class DataMapperTest extends UnitTestCase
$dataMaps = [
$className => $dataMap,
];
- /** @var AccessibleObjectInterface|ClassSchema $classSchema */
$classSchema = new ClassSchema($className);
$mockReflectionService = $this->getMockBuilder(ReflectionService::class)
->setConstructorArgs([new NullFrontend('extbase'), 'ClassSchemata'])
@@ -379,10 +377,8 @@ class DataMapperTest extends UnitTestCase
*/
public function mapDateTimeHandlesDifferentFieldEvaluations($value, $storageFormat, $expectedValue): void
{
- /** @var DataMapper|AccessibleObjectInterface|MockObject $accessibleDataMapFactory */
$accessibleDataMapFactory = $this->getAccessibleMock(DataMapper::class, ['dummy'], [], '', false);
- /** @var \DateTime|MockObject|AccessibleObjectInterface $dateTime */
$dateTime = $accessibleDataMapFactory->_call('mapDateTime', $value, $storageFormat);
if ($expectedValue === null) {
@@ -419,7 +415,6 @@ class DataMapperTest extends UnitTestCase
$originalTimeZone = date_default_timezone_get();
date_default_timezone_set('America/Chicago');
$usedTimeZone = date_default_timezone_get();
- /** @var DataMapper|AccessibleObjectInterface|MockObject $accessibleDataMapFactory */
$accessibleDataMapFactory = $this->getAccessibleMock(DataMapper::class, ['dummy'], [], '', false);
/** @var \DateTime|MockObject|AccessibleObjectInterface $dateTime */
@@ -439,7 +434,6 @@ class DataMapperTest extends UnitTestCase
*/
public function mapDateTimeHandlesSubclassesOfDateTime(): void
{
- /** @var DataMapper|AccessibleObjectInterface|MockObject $accessibleDataMapFactory */
$accessibleDataMapFactory = $this->getAccessibleMock(DataMapper::class, ['dummy'], [], '', false);
$targetType = 'TYPO3\CMS\Extbase\Tests\Unit\Persistence\Fixture\Model\CustomDateTime';
$date = '2013-01-01 01:02:03';
@@ -456,7 +450,6 @@ class DataMapperTest extends UnitTestCase
*/
public function getPlainValueReturnsCorrectDateTimeFormat(): void
{
- /** @var DataMapper $subject */
$subject = $this->createPartialMock(DataMapper::class, []);
$columnMap = new ColumnMap('column_name', 'propertyName');
@@ -473,7 +466,6 @@ class DataMapperTest extends UnitTestCase
*/
public function getPlainValueReturnsExpectedValues($expectedValue, $input): void
{
- /** @var DataMapper $dataMapper */
$dataMapper = $this->createPartialMock(DataMapper::class, []);
self::assertSame($expectedValue, $dataMapper->getPlainValue($input));
@@ -511,7 +503,6 @@ class DataMapperTest extends UnitTestCase
$this->expectException(UnexpectedTypeException::class);
$this->expectExceptionCode(1274799934);
- /** @var DataMapper $dataMapper */
$dataMapper = $this->createPartialMock(DataMapper::class, []);
$input = $this->createMock(LazyLoadingProxy::class);
$input->expects(self::once())->method('_loadRealInstance')->willReturn($dataMapper);
@@ -523,7 +514,6 @@ class DataMapperTest extends UnitTestCase
*/
public function getPlainValueCallsGetUidOnDomainObjectInterfaceInput(): void
{
- /** @var DataMapper $dataMapper */
$dataMapper = $this->createPartialMock(DataMapper::class, []);
$input = $this->createMock(DomainObjectInterface::class);
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
index c02bdef726bd..22be16af122d 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/PersistenceManagerTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use Psr\Container\ContainerInterface;
@@ -341,6 +340,7 @@ class PersistenceManagerTest extends UnitTestCase
class ' . $className . 'Repository extends \\TYPO3\\CMS\\Extbase\\Persistence\\Repository {}
');
$classNameWithNamespace = __NAMESPACE__ . '\\Domain\\Model\\' . $className;
+ /** @var class-string<RepositoryInterface> $repositoryClassNameWithNamespace */
$repositoryClassNameWithNamespace = __NAMESPACE__ . '\\Domain\\Repository\\' . $className . 'Repository';
$psrContainer = $this->getMockBuilder(ContainerInterface::class)
@@ -351,10 +351,10 @@ class PersistenceManagerTest extends UnitTestCase
$session = new Session(new Container($psrContainer));
$changedEntities = new ObjectStorage();
$entity1 = new $classNameWithNamespace();
- /** @var RepositoryInterface|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $repository */
+
$repository = $this->getAccessibleMock($repositoryClassNameWithNamespace, ['dummy'], [$this->mockObjectManager]);
$repository->_set('objectType', get_class($entity1));
- /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Backend|MockObject $mockBackend */
+
$mockBackend = $this->getMockBuilder(Backend::class)
->onlyMethods(['commit', 'setChangedEntities'])
->disableOriginalConstructor()
@@ -381,7 +381,6 @@ class PersistenceManagerTest extends UnitTestCase
*/
public function tearDownWithBackendSupportingTearDownDelegatesCallToBackend(): void
{
- /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Backend|MockObject $mockBackend */
$mockBackend = $this->getMockBuilder(BackendInterface::class)
->onlyMethods(get_class_methods(BackendInterface::class))
->addMethods(['tearDown'])
@@ -415,7 +414,7 @@ class PersistenceManagerTest extends UnitTestCase
$classNameWithNamespace = __NAMESPACE__ . '\\Domain\\Model\\' . $className;
$entity1 = new $classNameWithNamespace();
$aggregateRootObjects->attach($entity1);
- /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Backend|MockObject $mockBackend */
+
$mockBackend = $this->getMockBuilder(Backend::class)
->onlyMethods(['commit', 'setAggregateRootObjects', 'setDeletedEntities'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
index ed8482425803..37416bed4d87 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
@@ -222,7 +222,6 @@ class QueryResultTest extends UnitTestCase
*/
public function initializeExecutesQueryWithArrayFetchMode(): void
{
- /** @var QueryResult|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
$queryResult = $this->getAccessibleMock(QueryResult::class, ['dummy'], [], '', false);
$queryResult->_set('persistenceManager', $this->mockPersistenceManager);
$queryResult->_set('dataMapper', $this->mockDataMapper);
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
index 1462990f36dc..7b81de7a6adb 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
@@ -170,7 +170,6 @@ class QueryTest extends UnitTestCase
*/
public function equalsForCaseSensitiveFalseLowercasesOperand(string $propertyName, $operand, string $expectedOperand): void
{
- /** @var QueryObjectModelFactory|MockObject|AccessibleObjectInterface $qomFactory */
$qomFactory = $this->getAccessibleMock(QueryObjectModelFactory::class, ['comparison']);
$qomFactory->expects(self::once())->method('comparison')->with(self::anything(), self::anything(), $expectedOperand);
$this->query->method('getSelectorName')->willReturn('someSelector');
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
index 80e040f49bea..696692e46c7d 100644
--- a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
@@ -710,7 +710,6 @@ class Typo3DbQueryParserTest extends UnitTestCase
GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
GeneralUtility::addInstance(ConnectionPool::class, $connectionPoolProphet->reveal());
- /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings $mockQuerySettings */
$mockQuerySettings = $this->getMockBuilder(Typo3QuerySettings::class)
->addMethods(['dummy'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
index 8b7706be5a70..094adcf7ac8c 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
@@ -30,7 +30,6 @@ class AlphanumericValidatorTest extends UnitTestCase
*/
public function alphanumericValidatorShouldReturnNoErrorsForAnAlphanumericString(): void
{
- /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(AlphanumericValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
@@ -42,7 +41,6 @@ class AlphanumericValidatorTest extends UnitTestCase
*/
public function alphanumericValidatorReturnsErrorsForAStringWithSpecialCharacters(): void
{
- /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(AlphanumericValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
@@ -54,7 +52,6 @@ class AlphanumericValidatorTest extends UnitTestCase
*/
public function alphanumericValidatorCreatesTheCorrectErrorForAnInvalidSubject(): void
{
- /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(AlphanumericValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
@@ -66,7 +63,6 @@ class AlphanumericValidatorTest extends UnitTestCase
*/
public function alphanumericValidatorShouldReturnNoErrorsForAnAlphanumericUnicodeString(): void
{
- /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(AlphanumericValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
index 7b58c4ea9b3e..dc66140a90b5 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
@@ -30,7 +30,6 @@ class EmailAddressValidatorTest extends UnitTestCase
*/
public function emailAddressValidatorReturnsNoErrorsForAValidEmailAddress(): void
{
- /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(EmailAddressValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
@@ -42,7 +41,6 @@ class EmailAddressValidatorTest extends UnitTestCase
*/
public function emailAddressValidatorReturnsFalseForAnInvalidEmailAddress(): void
{
- /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(EmailAddressValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
@@ -54,7 +52,6 @@ class EmailAddressValidatorTest extends UnitTestCase
*/
public function emailAddressValidatorReturnsFalseForNonStringAddress(): void
{
- /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(EmailAddressValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
@@ -66,7 +63,6 @@ class EmailAddressValidatorTest extends UnitTestCase
*/
public function emailValidatorCreatesTheCorrectErrorForAnInvalidEmailAddress(): void
{
- /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
$subject = $this->getMockBuilder(EmailAddressValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php
index dc6880c6cf79..badf58441828 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php
@@ -93,13 +93,11 @@ class GenericObjectValidatorTest extends UnitTestCase
{
$validator = new GenericObjectValidator();
- /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $validatorForFoo */
$validatorForFoo = $this->getMockBuilder(ValidatorInterface::class)
->onlyMethods(['validate', 'getOptions'])
->getMock();
$validatorForFoo->expects(self::once())->method('validate')->with('foovalue')->willReturn($validationResultForFoo);
- /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $validatorForBar */
$validatorForBar = $this->getMockBuilder(ValidatorInterface::class)
->onlyMethods(['validate', 'getOptions'])
->getMock();
@@ -161,7 +159,6 @@ class GenericObjectValidatorTest extends UnitTestCase
$result = new Result();
$result->addError($error);
- /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $mockUuidValidator */
$mockUuidValidator = $this->getMockBuilder(ValidatorInterface::class)
->onlyMethods(['validate', 'getOptions'])
->getMock();
@@ -197,7 +194,6 @@ class GenericObjectValidatorTest extends UnitTestCase
$result1 = new Result();
$result1->addError($error1);
- /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $mockUuidValidator */
$mockUuidValidator = $this->getMockBuilder(ValidatorInterface::class)
->onlyMethods(['validate', 'getOptions'])
->getMock();
@@ -233,7 +229,6 @@ class GenericObjectValidatorTest extends UnitTestCase
$result1 = new Result();
$result1->addError($error1);
- /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $mockValidatorUuidNot0xF */
$mockValidatorUuidNot0xF = $this->getMockBuilder(ValidatorInterface::class)
->onlyMethods(['validate', 'getOptions'])
->getMock();
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
index 242bca61182a..b40cf2485616 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/RegularExpressionValidatorTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Extbase\Validation\Error;
use TYPO3\CMS\Extbase\Validation\Validator\RegularExpressionValidator;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -33,7 +32,6 @@ class RegularExpressionValidatorTest extends UnitTestCase
public function regularExpressionValidatorMatchesABasicExpressionCorrectly(): void
{
$options = ['regularExpression' => '/^simple[0-9]expression$/'];
- /** @var MockObject|RegularExpressionValidator $validator */
$validator = $this->getMockBuilder(RegularExpressionValidator::class)
->onlyMethods(['getErrorMessage'])
->setConstructorArgs([$options])
@@ -48,7 +46,6 @@ class RegularExpressionValidatorTest extends UnitTestCase
public function regularExpressionValidatorCreatesTheCorrectErrorIfTheExpressionDidNotMatch(): void
{
$options = ['regularExpression' => '/^simple[0-9]expression$/'];
- /** @var MockObject|RegularExpressionValidator $validator */
$validator = $this->getMockBuilder(RegularExpressionValidator::class)
->onlyMethods(['getErrorMessage'])
->setConstructorArgs([$options])
@@ -82,7 +79,6 @@ class RegularExpressionValidatorTest extends UnitTestCase
$options = [
'regularExpression' => '/^simple[0-9]expression$/',
];
- /** @var RegularExpressionValidator|MockObject $validator */
$validator = $this->getMockBuilder(RegularExpressionValidator::class)
->onlyMethods(['translateErrorMessage'])
->setConstructorArgs([$options])
@@ -104,7 +100,6 @@ class RegularExpressionValidatorTest extends UnitTestCase
'regularExpression' => '/^simple[0-9]expression$/',
'errorMessage' => 'LLL:demo/Resources/',
];
- /** @var RegularExpressionValidator|MockObject $validator */
$validator = $this->getMockBuilder(RegularExpressionValidator::class)
->onlyMethods(['translateErrorMessage'])
->setConstructorArgs([$options])
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
index 1b65af03a05e..e7d392da05a2 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringLengthValidatorTest.php
@@ -17,6 +17,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extbase\Tests\Unit\Validation\Validator;
+use TYPO3\CMS\Extbase\Validation\Error;
use TYPO3\CMS\Extbase\Validation\Exception\InvalidValidationOptionsException;
use TYPO3\CMS\Extbase\Validation\Validator\StringLengthValidator;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
@@ -57,7 +58,6 @@ class StringLengthValidatorTest extends UnitTestCase
*/
public function stringLengthValidatorReturnsErrorForAStringShorterThanThanMinLength(): void
{
- /** @var StringLengthValidator $validator */
$validator = $this->getMockBuilder(StringLengthValidator::class)
->onlyMethods(['translateErrorMessage'])
->setConstructorArgs([['minimum' => 50, 'maximum' => 100]])
@@ -71,7 +71,6 @@ class StringLengthValidatorTest extends UnitTestCase
*/
public function stringLengthValidatorReturnsErrorsForAStringLongerThanThanMaxLength(): void
{
- /** @var StringLengthValidator $validator */
$validator = $this->getMockBuilder(StringLengthValidator::class)
->onlyMethods(['translateErrorMessage'])
->setConstructorArgs([['minimum' => 5, 'maximum' => 10]])
@@ -158,7 +157,6 @@ class StringLengthValidatorTest extends UnitTestCase
$this->expectException(InvalidValidationOptionsException::class);
$this->expectExceptionCode(1238107096);
- /** @var StringLengthValidator $validator */
$validator = $this->getMockBuilder(StringLengthValidator::class)
->onlyMethods(['addError', 'translateErrorMessage'])
->setConstructorArgs([['minimum' => 101, 'maximum' => 100]])
@@ -171,7 +169,6 @@ class StringLengthValidatorTest extends UnitTestCase
*/
public function stringLengthValidatorInsertsAnErrorObjectIfValidationFails(): void
{
- /** @var StringLengthValidator $validator */
$validator = $this->getMockBuilder(StringLengthValidator::class)
->onlyMethods(['translateErrorMessage'])
->setConstructorArgs([['minimum' => 50, 'maximum' => 100]])
@@ -211,7 +208,7 @@ class StringLengthValidatorTest extends UnitTestCase
self::assertTrue($result->hasErrors());
self::assertCount(1, $result->getErrors());
- /** @var \TYPO3\CMS\Extbase\Validation\Error $error */
+ /** @var Error $error */
$error = current($result->getErrors());
self::assertSame(1238110957, $error->getCode());
}
diff --git a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringValidatorTest.php b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringValidatorTest.php
index d57ff8b35660..f888c93706dc 100644
--- a/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringValidatorTest.php
+++ b/typo3/sysext/extbase/Tests/Unit/Validation/Validator/StringValidatorTest.php
@@ -38,7 +38,6 @@ class StringValidatorTest extends UnitTestCase
*/
public function stringValidatorShouldReturnErrorIfNumberIsGiven(): void
{
- /** @var StringValidator $validator */
$validator = $this->getMockBuilder(StringValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
@@ -51,7 +50,6 @@ class StringValidatorTest extends UnitTestCase
*/
public function stringValidatorShouldReturnErrorIfObjectWithToStringMethodStringIsGiven(): void
{
- /** @var StringValidator $validator */
$validator = $this->getMockBuilder(StringValidator::class)
->onlyMethods(['translateErrorMessage'])
->getMock();
diff --git a/typo3/sysext/extbase/Tests/UnitDeprecated/Configuration/AbstractConfigurationManagerTest.php b/typo3/sysext/extbase/Tests/UnitDeprecated/Configuration/AbstractConfigurationManagerTest.php
index c7dc74e54269..66e588aecf01 100644
--- a/typo3/sysext/extbase/Tests/UnitDeprecated/Configuration/AbstractConfigurationManagerTest.php
+++ b/typo3/sysext/extbase/Tests/UnitDeprecated/Configuration/AbstractConfigurationManagerTest.php
@@ -300,7 +300,6 @@ class AbstractConfigurationManagerTest extends UnitTestCase
*/
public function switchableControllerActionsAreNotOverriddenIfPluginNameIsSpecified(): void
{
- /** @var AbstractConfigurationManager|MockObject|AccessibleObjectInterface $abstractConfigurationManager */
$abstractConfigurationManager = $this->getAccessibleMock(
AbstractConfigurationManager::class,
[
@@ -327,7 +326,6 @@ class AbstractConfigurationManagerTest extends UnitTestCase
*/
public function switchableControllerActionsAreOverriddenIfSpecifiedPluginIsTheCurrentPlugin(): void
{
- /** @var AbstractConfigurationManager|MockObject|AccessibleObjectInterface $abstractConfigurationManager */
$configuration = [
'extensionName' => 'CurrentExtensionName',
'pluginName' => 'CurrentPluginName',
@@ -360,7 +358,6 @@ class AbstractConfigurationManagerTest extends UnitTestCase
*/
public function switchableControllerActionsAreOverriddenIfPluginNameIsNotSpecified(): void
{
- /** @var AbstractConfigurationManager|MockObject|AccessibleObjectInterface $abstractConfigurationManager */
$configuration = ['switchableControllerActions' => ['overriddenSwitchableControllerActions']];
$abstractConfigurationManager = $this->getAccessibleMock(
AbstractConfigurationManager::class,
diff --git a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
index e7daa6a74cee..6120e1dd61f3 100644
--- a/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
+++ b/typo3/sysext/extensionmanager/Classes/Controller/DownloadController.php
@@ -196,7 +196,6 @@ class DownloadController extends AbstractController
if ($errorMessages) {
foreach ($errorMessages as $extensionKey => $messages) {
foreach ($messages as $message) {
- /** @var string $message */
$this->addFlashMessage(
$message['message'],
LocalizationUtility::translate(
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
index 0b159636b5e8..507ba003182c 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Model/Extension.php
@@ -648,7 +648,6 @@ class Extension extends AbstractEntity
*/
public static function createFromExtensionArray(array $extensionArray): self
{
- /** @var Extension $extension */
$extension = GeneralUtility::makeInstance(self::class);
$extension->setExtensionKey($extensionArray['key']);
if (isset($extensionArray['version'])) {
diff --git a/typo3/sysext/extensionmanager/Classes/Parser/ExtensionXmlParser.php b/typo3/sysext/extensionmanager/Classes/Parser/ExtensionXmlParser.php
index 4f1cde6fd074..72bf8f492162 100644
--- a/typo3/sysext/extensionmanager/Classes/Parser/ExtensionXmlParser.php
+++ b/typo3/sysext/extensionmanager/Classes/Parser/ExtensionXmlParser.php
@@ -120,7 +120,6 @@ class ExtensionXmlParser implements \SplSubject
if ($legacyXmlParserResource === null) {
throw new ExtensionManagerException('Unable to create XML parser.', 1342640663);
}
- /** @var resource $parser */
$parser = $legacyXmlParserResource;
// Disables the functionality to allow external entities to be loaded when parsing the XML, must be kept
diff --git a/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php b/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
index 85a933fd941a..08a9906c1f5e 100644
--- a/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
+++ b/typo3/sysext/extensionmanager/Classes/Report/ExtensionStatus.php
@@ -140,7 +140,6 @@ class ExtensionStatus implements StatusProviderInterface
array_key_exists('terObject', $information)
&& $information['terObject'] instanceof Extension
) {
- /** @var \TYPO3\CMS\Extensionmanager\Domain\Model\Extension $terObject */
$terObject = $information['terObject'];
$insecureStatus = $terObject->getReviewState();
if ($insecureStatus === -1) {
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php
index 24a1d8990bc9..71b963aa1783 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/DownloadExtensionViewHelper.php
@@ -84,7 +84,6 @@ class DownloadExtensionViewHelper extends AbstractFormViewHelper
</li>';
}
$pathSelector .= '</ul>';
- /** @var UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$uriBuilder->setRequest($this->renderingContext->getRequest());
$action = 'checkDependencies';
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ReloadSqlDataViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ReloadSqlDataViewHelper.php
index 7745e3a4a301..738bdabe6733 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/ReloadSqlDataViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/ReloadSqlDataViewHelper.php
@@ -78,7 +78,6 @@ class ReloadSqlDataViewHelper extends AbstractTagBasedViewHelper
$languageKey = 'extensionList.databaseImport';
}
- /** @var UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$uriBuilder->setRequest($this->renderingContext->getRequest());
$uriBuilder->reset();
diff --git a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
index 2d9543f6173c..e4a7a2f0e4e5 100644
--- a/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
+++ b/typo3/sysext/extensionmanager/Classes/ViewHelpers/RemoveExtensionViewHelper.php
@@ -60,7 +60,6 @@ class RemoveExtensionViewHelper extends AbstractTagBasedViewHelper
) {
return '<span class="btn btn-default disabled">' . $iconFactory->getIcon('empty-empty', Icon::SIZE_SMALL)->render() . '</span>';
}
- /** @var UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$uriBuilder->setRequest($this->renderingContext->getRequest());
$uriBuilder->reset();
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
index 7ca4d8ccb90d..38e1e459a5c3 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Controller/DownloadControllerTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Controller;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Extensionmanager\Controller\DownloadController;
use TYPO3\CMS\Extensionmanager\Domain\Model\Extension;
@@ -45,7 +44,6 @@ class DownloadControllerTest extends UnitTestCase
$dummyExtension = new Extension();
$dummyExtension->setExtensionKey($dummyExtensionName);
- /** @var ExtensionManagementService|MockObject $downloadUtilityMock */
$extensionManagementServiceMock = $this->getMockBuilder(ExtensionManagementService::class)->disableOriginalConstructor()->getMock();
$extensionManagementServiceMock->method('setDownloadPath')->willThrowException($dummyException);
diff --git a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
index 7d0c8ecc8660..b1adb8eeef8c 100644
--- a/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
+++ b/typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Extensionmanager\Tests\Unit\Utility;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
@@ -29,7 +28,6 @@ use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Extensionmanager\Exception\ExtensionManagerException;
use TYPO3\CMS\Extensionmanager\Utility\EmConfUtility;
use TYPO3\CMS\Extensionmanager\Utility\FileHandlingUtility;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
class FileHandlingUtilityTest extends UnitTestCase
@@ -69,7 +67,6 @@ class FileHandlingUtilityTest extends UnitTestCase
public function makeAndClearExtensionDirRemovesExtensionDirIfAlreadyExists(): void
{
$extKey = $this->createFakeExtension();
- /** @var FileHandlingUtility|MockObject|AccessibleObjectInterface $fileHandlerMock */
$fileHandlerMock = $this->getAccessibleMock(FileHandlingUtility::class, ['removeDirectory', 'addDirectory', 'getExtensionDir'], [], '', false);
$fileHandlerMock->expects(self::once())
->method('removeDirectory')
@@ -372,7 +369,7 @@ class FileHandlingUtilityTest extends UnitTestCase
'category' => 'Frontend',
];
$rootPath = $this->fakedExtensions[$extKey]['packagePath'];
- /** @var FileHandlingUtility|MockObject|AccessibleObjectInterface $fileHandlerMock */
+
$fileHandlerMock = $this->getAccessibleMock(FileHandlingUtility::class, ['makeAndClearExtensionDir']);
$fileHandlerMock->injectEmConfUtility(new EmConfUtility());
$fileHandlerMock->_call('writeEmConfToFile', $extKey, $emConfData, $rootPath);
diff --git a/typo3/sysext/felogin/Classes/Updates/MigrateFeloginPlugins.php b/typo3/sysext/felogin/Classes/Updates/MigrateFeloginPlugins.php
index af78147352a0..f6d7bd0a724e 100644
--- a/typo3/sysext/felogin/Classes/Updates/MigrateFeloginPlugins.php
+++ b/typo3/sysext/felogin/Classes/Updates/MigrateFeloginPlugins.php
@@ -103,7 +103,6 @@ final class MigrateFeloginPlugins implements UpgradeWizardInterface
// Get all tt_content data for login plugins and update their flexforms settings
$connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('tt_content');
- /** @var QueryBuilder $queryBuilder */
$queryBuilder = $connection->createQueryBuilder();
$statement = $queryBuilder->select('uid')
->addSelect('pi_flexform')
diff --git a/typo3/sysext/felogin/Classes/Updates/MigrateFeloginPluginsCtype.php b/typo3/sysext/felogin/Classes/Updates/MigrateFeloginPluginsCtype.php
index b346cc6ba12e..7f555feef26b 100644
--- a/typo3/sysext/felogin/Classes/Updates/MigrateFeloginPluginsCtype.php
+++ b/typo3/sysext/felogin/Classes/Updates/MigrateFeloginPluginsCtype.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\FrontendLogin\Updates;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\QueryBuilder;
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Install\Updates\RepeatableInterface;
@@ -76,7 +75,6 @@ final class MigrateFeloginPluginsCtype implements UpgradeWizardInterface, Repeat
// Get all tt_content data for login plugins and update their CTypes and Flexforms settings
$connection = GeneralUtility::makeInstance(ConnectionPool::class)->getConnectionForTable('tt_content');
- /** @var QueryBuilder $queryBuilder */
$queryBuilder = $connection->createQueryBuilder();
$queryBuilder
->update('tt_content')
@@ -102,7 +100,6 @@ final class MigrateFeloginPluginsCtype implements UpgradeWizardInterface, Repeat
*/
public function updateNecessary(): bool
{
- /** @var QueryBuilder $queryBuilder */
$queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tt_content');
$queryBuilder->getRestrictions()->removeAll()->add(GeneralUtility::makeInstance(DeletedRestriction::class));
$elementCount = $queryBuilder->count('uid')
diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php
index 035ad94a247d..7b0cc892d60d 100644
--- a/typo3/sysext/filelist/Classes/Controller/FileListController.php
+++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php
@@ -351,7 +351,6 @@ class FileListController implements LoggerAwareInterface
$this->filelist->clipObj->removeElement($clipboardIdentifier);
}
// Init file processing object for deleting and pass the cmd array.
- /** @var ExtendedFileUtility $fileProcessor */
$fileProcessor = GeneralUtility::makeInstance(ExtendedFileUtility::class);
$fileProcessor->setActionPermissions();
$fileProcessor->setExistingFilesConflictMode($this->overwriteExistingFiles);
diff --git a/typo3/sysext/fluid/Classes/View/StandaloneView.php b/typo3/sysext/fluid/Classes/View/StandaloneView.php
index d483aa2f3403..f0a9f3b7e4e0 100644
--- a/typo3/sysext/fluid/Classes/View/StandaloneView.php
+++ b/typo3/sysext/fluid/Classes/View/StandaloneView.php
@@ -43,7 +43,6 @@ class StandaloneView extends AbstractTemplateView
if ($contentObject !== null) {
trigger_error('Argument $contentObject of class ' . __CLASS__ . ' is deprecated since v11, will be removed with v12.', E_USER_DEPRECATED);
} else {
- /** @var ContentObjectRenderer $contentObject */
$contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class);
}
$configurationManager->setContentObject($contentObject);
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Be/UriViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Be/UriViewHelper.php
index 3b566e465ab7..397fc96f6396 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Be/UriViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Be/UriViewHelper.php
@@ -63,7 +63,6 @@ class UriViewHelper extends AbstractBackendViewHelper
*/
public function render()
{
- /** @var UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$route = $this->arguments['route'];
$parameters = $this->arguments['parameters'];
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
index e3eda42b693e..268d76c393be 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/CropViewHelper.php
@@ -130,7 +130,6 @@ class CropViewHelper extends AbstractViewHelper
// It would be possible to retrieve the "current" content object via ConfigurationManager->getContentObject(),
// but both crop() and cropHTML() are "nearly" static and do not depend on current content object settings, so
// it is safe to use a fresh instance here directly.
- /** @var ContentObjectRenderer $contentObject */
$contentObject = GeneralUtility::makeInstance(ContentObjectRenderer::class);
if ($respectHtml) {
$content = $contentObject->cropHTML($stringToTruncate, $maxCharacters . '|' . $append . '|' . $respectWordBoundaries);
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
index 7b0d95c9d002..f2d5f0017d18 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/ActionViewHelper.php
@@ -16,7 +16,6 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
/**
@@ -94,7 +93,6 @@ class ActionViewHelper extends AbstractTagBasedViewHelper
$addQueryString = (bool)$this->arguments['addQueryString'];
$argumentsToBeExcludedFromQueryString = (array)$this->arguments['argumentsToBeExcludedFromQueryString'];
$parameters = $this->arguments['arguments'];
- /** @var UriBuilder $uriBuilder */
$uriBuilder = $this->renderingContext->getUriBuilder();
$uriBuilder
->reset()
diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
index 1cb3ef2648f6..1c1d824c9b5c 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Link/PageViewHelper.php
@@ -16,7 +16,6 @@
namespace TYPO3\CMS\Fluid\ViewHelpers\Link;
use TYPO3\CMS\Core\Utility\MathUtility;
-use TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder;
use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractTagBasedViewHelper;
/**
@@ -111,7 +110,6 @@ class PageViewHelper extends AbstractTagBasedViewHelper
$absolute = isset($this->arguments['absolute']) ? (bool)$this->arguments['absolute'] : false;
$addQueryString = isset($this->arguments['addQueryString']) ? (bool)$this->arguments['addQueryString'] : false;
$argumentsToBeExcludedFromQueryString = isset($this->arguments['argumentsToBeExcludedFromQueryString']) ? (array)$this->arguments['argumentsToBeExcludedFromQueryString'] : [];
- /** @var UriBuilder $uriBuilder */
$uriBuilder = $this->renderingContext->getUriBuilder();
$uriBuilder->reset()
->setTargetPageType($pageType)
diff --git a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
index c7e098934715..60ade20ae259 100644
--- a/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
+++ b/typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
@@ -82,7 +82,6 @@ class TypolinkViewHelperTest extends UnitTestCase
*/
public function mergeTypoLinkConfigurationDoesNotModifyData(array $decodedConfiguration): void
{
- /** @var \TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(TypolinkViewHelper::class, ['dummy']);
$result = $subject->_call('mergeTypoLinkConfiguration', $decodedConfiguration, []);
self::assertSame($decodedConfiguration, $result);
@@ -181,7 +180,6 @@ class TypolinkViewHelperTest extends UnitTestCase
*/
public function mergeTypoLinkConfigurationMergesData(array $decodedConfiguration, array $viewHelperArguments, array $expected): void
{
- /** @var \TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(TypolinkViewHelper::class, ['dummy']);
$result = $subject->_call('mergeTypoLinkConfiguration', $decodedConfiguration, $viewHelperArguments);
self::assertSame($expected, $result);
diff --git a/typo3/sysext/form/Classes/Controller/FormEditorController.php b/typo3/sysext/form/Classes/Controller/FormEditorController.php
index 1fbb45540e3b..40f70cb592d6 100644
--- a/typo3/sysext/form/Classes/Controller/FormEditorController.php
+++ b/typo3/sysext/form/Classes/Controller/FormEditorController.php
@@ -297,7 +297,6 @@ class FormEditorController extends AbstractBackendController
],
];
- /** @var \TYPO3\CMS\Core\Site\Entity\SiteLanguage $currentSiteLanguage */
$currentSiteLanguage = GeneralUtility::makeInstance(Site::class, 'form-dummy', $pageId, $fakeSiteConfiguration)
->getLanguageById($languageId);
return $currentSiteLanguage;
diff --git a/typo3/sysext/form/Classes/Controller/FormManagerController.php b/typo3/sysext/form/Classes/Controller/FormManagerController.php
index 7d74c5a5e71d..53a837183652 100644
--- a/typo3/sysext/form/Classes/Controller/FormManagerController.php
+++ b/typo3/sysext/form/Classes/Controller/FormManagerController.php
@@ -595,7 +595,6 @@ class FormManagerController extends AbstractBackendController
*/
protected function getModuleUrl(string $moduleName, array $urlParameters = []): string
{
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
return (string)$uriBuilder->buildUriFromRoute($moduleName, $urlParameters);
}
diff --git a/typo3/sysext/form/Classes/Mvc/Configuration/InheritancesResolverService.php b/typo3/sysext/form/Classes/Mvc/Configuration/InheritancesResolverService.php
index cce87cb92626..70d98e008a93 100644
--- a/typo3/sysext/form/Classes/Mvc/Configuration/InheritancesResolverService.php
+++ b/typo3/sysext/form/Classes/Mvc/Configuration/InheritancesResolverService.php
@@ -102,7 +102,6 @@ class InheritancesResolverService
*/
public static function create(array $configuration = []): InheritancesResolverService
{
- /** @var InheritancesResolverService $inheritancesResolverService */
$inheritancesResolverService = GeneralUtility::makeInstance(self::class);
$inheritancesResolverService->setReferenceConfiguration($configuration);
return $inheritancesResolverService;
diff --git a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
index 2de2ca9a56ba..1814f65a5e99 100644
--- a/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
+++ b/typo3/sysext/form/Classes/Mvc/Persistence/FormPersistenceManager.php
@@ -394,7 +394,7 @@ class FormPersistenceManager implements FormPersistenceManagerInterface
$parentFolder = $storage->getRootLevelFolder(false);
foreach ($storage->getFileMounts() as $storageFileMount) {
- /** @var \TYPO3\CMS\Core\Resource\Folder */
+ /** @var Folder */
$storageFileMountFolder = $storageFileMount['folder'];
// Normally should use ResourceStorage::isWithinFolder() to check if the configured file mount path is within a storage file mount but this requires a valid Folder object and thus a directory which already exists. And the folder could simply not exist yet.
diff --git a/typo3/sysext/form/Classes/Mvc/Property/PropertyMappingConfiguration.php b/typo3/sysext/form/Classes/Mvc/Property/PropertyMappingConfiguration.php
index df4bd2bf73e0..43182d1fdbaa 100644
--- a/typo3/sysext/form/Classes/Mvc/Property/PropertyMappingConfiguration.php
+++ b/typo3/sysext/form/Classes/Mvc/Property/PropertyMappingConfiguration.php
@@ -60,7 +60,6 @@ class PropertyMappingConfiguration implements AfterFormStateInitializedInterface
// the default storage "1:/user_uploads/" will be used. Uploads are placed
// in a dedicated sub-folder (e.g. ".../form_<40-chars-hash>/actual.file").
- /** @var UploadedFileReferenceConverter $typeConverter */
$typeConverter = GeneralUtility::makeInstance(UploadedFileReferenceConverter::class);
/** @var \TYPO3\CMS\Extbase\Property\PropertyMappingConfiguration $propertyMappingConfiguration */
$propertyMappingConfiguration = $renderable->getRootForm()
diff --git a/typo3/sysext/form/Classes/Service/TranslationService.php b/typo3/sysext/form/Classes/Service/TranslationService.php
index 46d4f40e3f62..4da7742d3685 100644
--- a/typo3/sysext/form/Classes/Service/TranslationService.php
+++ b/typo3/sysext/form/Classes/Service/TranslationService.php
@@ -92,9 +92,7 @@ class TranslationService implements SingletonInterface
public static function getInstance(): self
{
trigger_error(__CLASS__ . '::getInstance() will be removed in TYPO3 v12.0. Use Dependency Injection or GeneralUtility::makeInstance() if DI is not possible.', E_USER_DEPRECATED);
- /** @var self $instance */
- $instance = GeneralUtility::makeInstance(self::class);
- return $instance;
+ return GeneralUtility::makeInstance(self::class);
}
/**
@@ -572,7 +570,6 @@ class TranslationService implements SingletonInterface
}
if (!empty($locallangPathAndFilename)) {
- /** @var LocalizationFactory $languageFactory */
$languageFactory = GeneralUtility::makeInstance(LocalizationFactory::class);
$this->LOCAL_LANG = $languageFactory->getParsedData($locallangPathAndFilename, $this->languageKey);
@@ -599,7 +596,6 @@ class TranslationService implements SingletonInterface
) {
$this->languageKey = $this->getCurrentSiteLanguage()->getTypo3Language();
if ($this->languageKey !== 'default') {
- /** @var \TYPO3\CMS\Core\Localization\Locales $locales */
$locales = GeneralUtility::makeInstance(Locales::class);
if (in_array($this->languageKey, $locales->getLocales(), true)) {
foreach ($locales->getLocaleDependencies($this->languageKey) as $language) {
diff --git a/typo3/sysext/form/Tests/Unit/Domain/Finishers/ClosureFinisherTest.php b/typo3/sysext/form/Tests/Unit/Domain/Finishers/ClosureFinisherTest.php
index ac7a83d0b2ec..0f41ef9bc9f1 100644
--- a/typo3/sysext/form/Tests/Unit/Domain/Finishers/ClosureFinisherTest.php
+++ b/typo3/sysext/form/Tests/Unit/Domain/Finishers/ClosureFinisherTest.php
@@ -18,6 +18,7 @@ declare(strict_types=1);
namespace TYPO3\CMS\Form\Tests\Unit\Domain\Finishers;
use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Form\Domain\Finishers\ClosureFinisher;
use TYPO3\CMS\Form\Domain\Finishers\FinisherContext;
use TYPO3\CMS\Form\Domain\Runtime\FormRuntime;
@@ -28,7 +29,8 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
*/
class ClosureFinisherTest extends UnitTestCase
{
- use \Prophecy\PhpUnit\ProphecyTrait;
+ use ProphecyTrait;
+
/**
* @test
*/
@@ -38,9 +40,7 @@ class ClosureFinisherTest extends UnitTestCase
return 'foobar';
};
- /** @var ClosureFinisher|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $mockClosureFinisher */
$mockClosureFinisher = $this->getAccessibleMock(ClosureFinisher::class, ['dummy'], [], '', false);
-
$mockClosureFinisher->_set('options', [
'closure' => $closure,
]);
diff --git a/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractFormElementTest.php b/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractFormElementTest.php
index d9000459a0de..c11ffc6aaad3 100644
--- a/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractFormElementTest.php
+++ b/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractFormElementTest.php
@@ -34,7 +34,6 @@ class AbstractFormElementTest extends UnitTestCase
*/
public function newInstanceHasNoProperties(): void
{
- /** @var AbstractFormElement $subject */
$subject = $this->getMockForAbstractClass(AbstractFormElement::class, ['an_id', 'a_type']);
self::assertNotNull($subject);
self::assertCount(0, $subject->getProperties());
@@ -45,7 +44,6 @@ class AbstractFormElementTest extends UnitTestCase
*/
public function setSimpleProperties(): void
{
- /** @var AbstractFormElement $subject */
$subject = $this->getMockForAbstractClass(AbstractFormElement::class, ['an_id', 'a_type']);
$subject->setProperty('foo', 'bar');
@@ -64,7 +62,6 @@ class AbstractFormElementTest extends UnitTestCase
*/
public function overrideProperties(): void
{
- /** @var AbstractFormElement $subject */
$subject = $this->getMockForAbstractClass(AbstractFormElement::class, ['an_id', 'a_type']);
$subject->setProperty('foo', 'bar');
@@ -81,7 +78,6 @@ class AbstractFormElementTest extends UnitTestCase
*/
public function setArrayProperties(): void
{
- /** @var AbstractFormElement $subject */
$subject = $this->getMockForAbstractClass(AbstractFormElement::class, ['an_id', 'a_type']);
$subject->setProperty('foo', ['bar' => 'baz', 'bla' => 'blubb']);
@@ -168,7 +164,6 @@ class AbstractFormElementTest extends UnitTestCase
*/
public function initializeFormElementExpectedCallInitializeFormObjectHooks(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $abstractFormElementMock */
$abstractFormElementMock = $this->getMockForAbstractClass(
AbstractFormElement::class,
[],
@@ -178,7 +173,6 @@ class AbstractFormElementTest extends UnitTestCase
true,
[]
);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $secondMock */
$secondMock = $this->getMockForAbstractClass(
AbstractFormElement::class,
[],
@@ -210,7 +204,6 @@ class AbstractFormElementTest extends UnitTestCase
*/
public function getUniqueIdentifierExpectedUnique(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $abstractFormElementMock1 */
$abstractFormElementMock1 = $this->getMockForAbstractClass(
AbstractFormElement::class,
[],
@@ -223,7 +216,6 @@ class AbstractFormElementTest extends UnitTestCase
]
);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $abstractFormElementMock2 */
$abstractFormElementMock2 = $this->getMockForAbstractClass(
AbstractFormElement::class,
[],
diff --git a/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php b/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php
index 12235b346d41..85818b0a54c3 100644
--- a/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php
+++ b/typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php
@@ -61,7 +61,6 @@ class AbstractSectionTest extends UnitTestCase
*/
public function createElementThrowsExceptionIfTypeDefinitionNotFoundAndSkipUnknownElementsIsFalse(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
$rootForm = $this->getMockBuilder(FormDefinition::class)
->onlyMethods(['getRenderingOptions', 'getTypeDefinitions'])
->disableOriginalConstructor()
@@ -101,7 +100,6 @@ class AbstractSectionTest extends UnitTestCase
*/
public function createElementReturnsUnknownElementsIfTypeDefinitionIsNotFoundAndSkipUnknownElementsIsTrue(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
$rootForm = $this->getMockBuilder(FormDefinition::class)
->onlyMethods(['getRenderingOptions', 'getTypeDefinitions'])
->disableOriginalConstructor()
@@ -113,7 +111,6 @@ class AbstractSectionTest extends UnitTestCase
->method('getTypeDefinitions')
->willReturn([]);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
$mockAbstractSection = $this->getMockForAbstractClass(
AbstractSection::class,
[],
@@ -126,7 +123,6 @@ class AbstractSectionTest extends UnitTestCase
]
);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
$mockAbstractSection
->method('getRootForm')
->willReturn($rootForm);
@@ -144,7 +140,6 @@ class AbstractSectionTest extends UnitTestCase
*/
public function createElementThrowsExceptionIfTypeDefinitionIsNotSet(): void
{
- /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
$rootForm = $this->getMockBuilder(FormDefinition::class)
->onlyMethods(['getRenderingOptions', 'getTypeDefinitions'])
->disableOriginalConstructor()
@@ -156,7 +151,6 @@ class AbstractSectionTest extends UnitTestCase
->method('getTypeDefinitions')
->willReturn(['foobar' => []]);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
$mockAbstractSection = $this->getMockForAbstractClass(
AbstractSection::class,
[],
@@ -185,7 +179,6 @@ class AbstractSectionTest extends UnitTestCase
public function createElementThrowsExceptionIfTypeDefinitionNotInstanceOfFormElementInterface(): void
{
$this->resetSingletonInstances = true;
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
$mockAbstractSection = $this->getMockForAbstractClass(
AbstractSection::class,
[],
@@ -198,7 +191,6 @@ class AbstractSectionTest extends UnitTestCase
]
);
- /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
$rootForm = $this->getMockBuilder(FormDefinition::class)
->onlyMethods(['getRenderingOptions', 'getTypeDefinitions'])
->disableOriginalConstructor()
@@ -260,7 +252,6 @@ class AbstractSectionTest extends UnitTestCase
->method('setOptions')
->with($typeDefinitionWithoutImplementationClassName);
- /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
$mockAbstractSection = $this->getMockForAbstractClass(
AbstractSection::class,
[],
@@ -273,7 +264,6 @@ class AbstractSectionTest extends UnitTestCase
]
);
- /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
$rootForm = $this->getMockBuilder(FormDefinition::class)
->onlyMethods(['getRenderingOptions', 'getTypeDefinitions'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Property/PropertyMappingConfigurationTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Property/PropertyMappingConfigurationTest.php
index de47ea6170ad..1f80e67c48d0 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Property/PropertyMappingConfigurationTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Property/PropertyMappingConfigurationTest.php
@@ -163,8 +163,6 @@ class PropertyMappingConfigurationTest extends UnitTestCase
*/
public function afterBuildingFinishedSetsUpStoragePathToPropertySaveToFileMountIfItExists(): void
{
- // Resource Factory
- /** @var \PHPUnit\Framework\MockObject\MockObject|ResourceFactory $resourceFactory */
$resourceFactory = $this->createMock(ResourceFactory::class);
GeneralUtility::setSingletonInstance(ResourceFactory::class, $resourceFactory);
@@ -197,8 +195,6 @@ class PropertyMappingConfigurationTest extends UnitTestCase
*/
public function afterBuildingFinishedSetsUpStoragePathToToFormDefinitionPathIfSaveToFileMountIsNotDefinedAndFormWasNotAddedProgrammatically(): void
{
- // Resource Factory
- /** @var \PHPUnit\Framework\MockObject\MockObject|ResourceFactory $resourceFactory */
$resourceFactory = $this->createMock(ResourceFactory::class);
GeneralUtility::setSingletonInstance(ResourceFactory::class, $resourceFactory);
diff --git a/typo3/sysext/frontend/Classes/Category/Collection/CategoryCollection.php b/typo3/sysext/frontend/Classes/Category/Collection/CategoryCollection.php
index efaaf81a089f..0748433f60b4 100644
--- a/typo3/sysext/frontend/Classes/Category/Collection/CategoryCollection.php
+++ b/typo3/sysext/frontend/Classes/Category/Collection/CategoryCollection.php
@@ -42,7 +42,6 @@ class CategoryCollection extends \TYPO3\CMS\Core\Category\Collection\CategoryCol
*/
public static function create(array $collectionRecord, $fillItems = false)
{
- /** @var \TYPO3\CMS\Frontend\Category\Collection\CategoryCollection $collection */
$collection = GeneralUtility::makeInstance(
__CLASS__,
$collectionRecord['table_name'],
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/ContentContentObject.php
index 5b1596833aaf..4795603ff7b4 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentContentObject.php
@@ -77,7 +77,6 @@ class ContentContentObject extends AbstractContentObject
$this->cObj->currentRecordTotal = count($records);
$this->getTimeTracker()->setTSlogMessage('NUMROWS: ' . count($records));
- /** @var ContentObjectRenderer $cObj */
$cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$cObj->setParent($this->cObj->data, $this->cObj->currentRecord);
$this->cObj->currentRecordNumber = 0;
diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index eb24c0563121..89f55d3980d1 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -4521,7 +4521,6 @@ class ContentObjectRenderer implements LoggerAwareInterface
if ($fileUidOrCurrentKeyword === 'current') {
$fileObject = $this->getCurrentFile();
} elseif (MathUtility::canBeInterpretedAsInteger($fileUidOrCurrentKeyword)) {
- /** @var ResourceFactory $fileFactory */
$fileFactory = GeneralUtility::makeInstance(ResourceFactory::class);
$fileObject = $fileFactory->getFileObject($fileUidOrCurrentKeyword);
} else {
@@ -5694,7 +5693,6 @@ class ContentObjectRenderer implements LoggerAwareInterface
$result = $queryBuilder->executeQuery();
while ($row = $result->fetchAssociative()) {
- /** @var VersionState $versionState */
$versionState = VersionState::cast($row['t3ver_state']);
$tsfe->sys_page->versionOL('pages', $row);
if ($row === false
diff --git a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
index 2bc050d5cd98..9bca93aadfe2 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/FluidTemplateContentObject.php
@@ -324,7 +324,6 @@ class FluidTemplateContentObject extends AbstractContentObject
protected function assignSettings(array $conf)
{
if (isset($conf['settings.'])) {
- /** @var TypoScriptService $typoScriptService */
$typoScriptService = GeneralUtility::makeInstance(TypoScriptService::class);
$settings = $typoScriptService->convertTypoScriptArrayToPlainArray($conf['settings.']);
$this->view->assign('settings', $settings);
diff --git a/typo3/sysext/frontend/Classes/ContentObject/HierarchicalMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/HierarchicalMenuContentObject.php
index aec8b37aade0..7a038684527c 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/HierarchicalMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/HierarchicalMenuContentObject.php
@@ -39,7 +39,6 @@ class HierarchicalMenuContentObject extends AbstractContentObject
$theValue = '';
$menuType = $conf[1] ?? '';
try {
- /** @var Menu\MenuContentObjectFactory $menuObjectFactory */
$menuObjectFactory = GeneralUtility::makeInstance(MenuContentObjectFactory::class);
$menu = $menuObjectFactory->getMenuObjectByType($menuType);
if (isset($GLOBALS['TSFE']->register['count_HMENU'])) {
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index dc8bd3402bad..0874dd924f97 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -532,7 +532,6 @@ abstract class AbstractMenuContentObject
);
break;
case 'categories':
- /** @var CategoryMenuUtility $categoryMenuUtility */
$categoryMenuUtility = GeneralUtility::makeInstance(CategoryMenuUtility::class);
$menuItems = $categoryMenuUtility->collectPages($value, $this->conf['special.'], $this);
break;
diff --git a/typo3/sysext/frontend/Classes/ContentObject/RecordsContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/RecordsContentObject.php
index 6812de8d24c5..ea0bfb5caf16 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/RecordsContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/RecordsContentObject.php
@@ -89,7 +89,6 @@ class RecordsContentObject extends AbstractContentObject
}
$itemArrayCount = count($this->itemArray);
if ($itemArrayCount > 0) {
- /** @var ContentObjectRenderer $cObj */
$cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$cObj->setParent($this->cObj->data, $this->cObj->currentRecord);
$this->cObj->currentRecordNumber = 0;
@@ -155,7 +154,6 @@ class RecordsContentObject extends AbstractContentObject
*/
protected function collectRecordsFromSource($source, array $tables)
{
- /** @var RelationHandler $loadDB*/
$loadDB = GeneralUtility::makeInstance(RelationHandler::class);
$loadDB->start($source, implode(',', $tables));
foreach ($loadDB->tableArray as $table => $v) {
diff --git a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
index aa2c48235da5..a679156f3b25 100644
--- a/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
+++ b/typo3/sysext/frontend/Classes/Controller/TypoScriptFrontendController.php
@@ -22,6 +22,7 @@ use Psr\Log\LoggerAwareTrait;
use Psr\Log\LogLevel;
use TYPO3\CMS\Backend\FrontendBackendUserAuthentication;
use TYPO3\CMS\Core\Cache\CacheManager;
+use TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend;
use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
use TYPO3\CMS\Core\Charset\CharsetConverter;
use TYPO3\CMS\Core\Charset\UnknownCharsetException;
@@ -3210,7 +3211,7 @@ class TypoScriptFrontendController implements LoggerAwareInterface
*/
public function get_cache_timeout()
{
- /** @var \TYPO3\CMS\Core\Cache\Frontend\AbstractFrontend $runtimeCache */
+ /** @var AbstractFrontend $runtimeCache */
$runtimeCache = GeneralUtility::makeInstance(CacheManager::class)->getCache('runtime');
$cachedCacheLifetimeIdentifier = 'core-tslib_fe-get_cache_timeout';
$cachedCacheLifetime = $runtimeCache->get($cachedCacheLifetimeIdentifier);
@@ -3283,7 +3284,6 @@ class TypoScriptFrontendController implements LoggerAwareInterface
public function convOutputCharset($content)
{
if ($this->metaCharset !== 'utf-8') {
- /** @var CharsetConverter $charsetConverter */
$charsetConverter = GeneralUtility::makeInstance(CharsetConverter::class);
try {
$content = $charsetConverter->conv($content, 'utf-8', $this->metaCharset);
diff --git a/typo3/sysext/frontend/Classes/DataProcessing/DatabaseQueryProcessor.php b/typo3/sysext/frontend/Classes/DataProcessing/DatabaseQueryProcessor.php
index 76666532b1dc..fc3bcf777e63 100644
--- a/typo3/sysext/frontend/Classes/DataProcessing/DatabaseQueryProcessor.php
+++ b/typo3/sysext/frontend/Classes/DataProcessing/DatabaseQueryProcessor.php
@@ -95,7 +95,6 @@ class DatabaseQueryProcessor implements DataProcessorInterface
$request = $cObj->getRequest();
$processedRecordVariables = [];
foreach ($records as $key => $record) {
- /** @var ContentObjectRenderer $recordContentObjectRenderer */
$recordContentObjectRenderer = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$recordContentObjectRenderer->start($record, $tableName, $request);
$processedRecordVariables[$key] = ['data' => $record];
diff --git a/typo3/sysext/frontend/Classes/DataProcessing/FilesProcessor.php b/typo3/sysext/frontend/Classes/DataProcessing/FilesProcessor.php
index 11265d179b66..8b390b183982 100644
--- a/typo3/sysext/frontend/Classes/DataProcessing/FilesProcessor.php
+++ b/typo3/sysext/frontend/Classes/DataProcessing/FilesProcessor.php
@@ -55,7 +55,6 @@ class FilesProcessor implements DataProcessorInterface
}
// gather data
- /** @var FileCollector $fileCollector */
$fileCollector = GeneralUtility::makeInstance(FileCollector::class);
// references / relations
diff --git a/typo3/sysext/frontend/Classes/DataProcessing/MenuProcessor.php b/typo3/sysext/frontend/Classes/DataProcessing/MenuProcessor.php
index 6c5482a56a00..413e05c36246 100644
--- a/typo3/sysext/frontend/Classes/DataProcessing/MenuProcessor.php
+++ b/typo3/sysext/frontend/Classes/DataProcessing/MenuProcessor.php
@@ -490,7 +490,6 @@ class MenuProcessor implements DataProcessorInterface
}
}
$request = $this->cObj->getRequest();
- /** @var ContentObjectRenderer $recordContentObjectRenderer */
$recordContentObjectRenderer = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$recordContentObjectRenderer->start($page['data'], 'pages', $request);
$processedPage = $this->contentDataProcessor->process($recordContentObjectRenderer, $processorConfiguration, $page);
diff --git a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
index 682a0ed484ae..153c668ef8d1 100644
--- a/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
+++ b/typo3/sysext/frontend/Classes/Imaging/GifBuilder.php
@@ -218,7 +218,6 @@ class GifBuilder extends GraphicalFunctions
if (($maskInfo['processedFile'] ?? null) instanceof ProcessedFile) {
$this->setup[$theKey . '.']['mask'] = $maskInfo['processedFile']->getForLocalProcessing(false);
} elseif (!isset($maskInfo['origFile']) && $maskInfo['originalFile'] instanceof File) {
- /** @var File $originalFile */
$originalFile = $maskInfo['originalFile'];
$this->setup[$theKey . '.']['mask'] = $originalFile->getForLocalProcessing(false);
} else {
diff --git a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
index 4aeaee8b36fd..4d1af39ad5b2 100644
--- a/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
+++ b/typo3/sysext/frontend/Classes/Plugin/AbstractPlugin.php
@@ -242,7 +242,6 @@ class AbstractPlugin
}
$this->LLkey = $this->frontendController->getLanguage()->getTypo3Language();
- /** @var Locales $locales */
$locales = GeneralUtility::makeInstance(Locales::class);
if (in_array($this->LLkey, $locales->getLocales())) {
foreach ($locales->getLocaleDependencies($this->LLkey) as $language) {
@@ -1010,7 +1009,6 @@ class AbstractPlugin
$languageFilePath = 'EXT:' . $this->extKey . '/' . PathUtility::dirname($this->scriptRelPath) . '/locallang.xlf';
}
if ($languageFilePath !== '') {
- /** @var LocalizationFactory $languageFactory */
$languageFactory = GeneralUtility::makeInstance(LocalizationFactory::class);
$this->LOCAL_LANG = $languageFactory->getParsedData($languageFilePath, $this->LLkey);
$alternativeLanguageKeys = GeneralUtility::trimExplode(',', $this->altLLkey, true);
diff --git a/typo3/sysext/frontend/Classes/Resource/FileCollector.php b/typo3/sysext/frontend/Classes/Resource/FileCollector.php
index 7271fcabed21..f991667bbab0 100644
--- a/typo3/sysext/frontend/Classes/Resource/FileCollector.php
+++ b/typo3/sysext/frontend/Classes/Resource/FileCollector.php
@@ -289,7 +289,6 @@ class FileCollector implements \Countable, LoggerAwareInterface
*/
protected function getFileReferences($tableName, $fieldName, array $element): array
{
- /** @var FileRepository $fileRepository */
$fileRepository = GeneralUtility::makeInstance(FileRepository::class);
$currentId = !empty($element['uid']) ? $element['uid'] : 0;
diff --git a/typo3/sysext/frontend/Tests/Functional/Request/InternalRequestDataMappingTest.php b/typo3/sysext/frontend/Tests/Functional/Request/InternalRequestDataMappingTest.php
index 28711fb2e56f..8fe1703f1b90 100644
--- a/typo3/sysext/frontend/Tests/Functional/Request/InternalRequestDataMappingTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/Request/InternalRequestDataMappingTest.php
@@ -18,7 +18,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Frontend\Tests\Functional\Request;
use Psr\Http\Message\StreamFactoryInterface;
-use TYPO3\CMS\Core\Http\StreamFactory;
use TYPO3\TestingFramework\Core\Functional\Framework\Frontend\InternalRequest;
use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
@@ -232,7 +231,6 @@ class InternalRequestDataMappingTest extends FunctionalTestCase
$request = $request->withAddedHeader($headerName, $headerValue);
}
if ($body) {
- /** @var StreamFactory $streamFactory */
$streamFactory = $this->get(StreamFactoryInterface::class);
$request = $request->withBody($streamFactory->createStream($body));
}
diff --git a/typo3/sysext/frontend/Tests/Functional/SiteHandling/TypoLinkGeneratorTest.php b/typo3/sysext/frontend/Tests/Functional/SiteHandling/TypoLinkGeneratorTest.php
index ff45f049186f..980a61fc9152 100644
--- a/typo3/sysext/frontend/Tests/Functional/SiteHandling/TypoLinkGeneratorTest.php
+++ b/typo3/sysext/frontend/Tests/Functional/SiteHandling/TypoLinkGeneratorTest.php
@@ -77,7 +77,6 @@ class TypoLinkGeneratorTest extends AbstractTestCase
// @todo Provide functionality of assigning TSconfig to Testing Framework
$connection = GeneralUtility::makeInstance(ConnectionPool::class)
->getConnectionForTable('pages');
- /** @var $connection \TYPO3\CMS\Core\Database\Connection */
$connection->update(
'pages',
['TSconfig' => implode(chr(10), [
diff --git a/typo3/sysext/frontend/Tests/Unit/Authentication/FrontendUserAuthenticationTest.php b/typo3/sysext/frontend/Tests/Unit/Authentication/FrontendUserAuthenticationTest.php
index a57fcfaeb819..5ab87b28e09a 100644
--- a/typo3/sysext/frontend/Tests/Unit/Authentication/FrontendUserAuthenticationTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Authentication/FrontendUserAuthenticationTest.php
@@ -35,7 +35,6 @@ use TYPO3\CMS\Core\Session\UserSessionManager;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -352,7 +351,6 @@ class FrontendUserAuthenticationTest extends UnitTestCase
$userSessionManager->elevateToFixatedUserSession(Argument::cetera())->shouldBeCalled()->willReturn($elevatedUserSession);
// Mock the login data and auth services here since fully prophesize this is a lot of hassle
- /** @var AccessibleObjectInterface|FrontendUserAuthentication $subject */
$subject = $this->getAccessibleMock(
FrontendUserAuthentication::class,
[
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
index 6e649ceccb41..cce5585ce660 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
@@ -48,7 +48,6 @@ class CaseContentObjectTest extends UnitTestCase
protected function setUp(): void
{
parent::setUp();
- /** @var TypoScriptFrontendController $tsfe */
$tsfe = $this->getMockBuilder(TypoScriptFrontendController::class)
->addMethods(['dummy'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php b/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
index 8d3a97baddf6..c70f61164b3f 100644
--- a/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
@@ -871,7 +871,6 @@ class FluidTemplateContentObjectTest extends UnitTestCase
],
];
- /** @var TypoScriptService|MockObject $typoScriptServiceMock */
$typoScriptServiceMock = $this->getMockBuilder(TypoScriptService::class)->getMock();
$typoScriptServiceMock
->expects(self::once())
diff --git a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
index 877c57076fcc..64b61c592796 100644
--- a/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
+++ b/typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
@@ -119,7 +119,6 @@ class TypoScriptFrontendControllerTest extends UnitTestCase
*/
protected function setupTsfeMockForHeaderFooterReplacementCheck()
{
- /** @var MockObject|TypoScriptFrontendController $tsfe */
$tsfe = $this->getMockBuilder(TypoScriptFrontendController::class)
->onlyMethods([
'processNonCacheableContentPartsAndSubstituteContentMarkers',
diff --git a/typo3/sysext/impexp/Classes/Controller/ImportController.php b/typo3/sysext/impexp/Classes/Controller/ImportController.php
index d9c07b152741..0aa82d978bd1 100644
--- a/typo3/sysext/impexp/Classes/Controller/ImportController.php
+++ b/typo3/sysext/impexp/Classes/Controller/ImportController.php
@@ -294,8 +294,6 @@ class ImportController extends ImportExportController
$folder = $this->import->getOrCreateDefaultImportExportFolder();
if ($folder !== null) {
-
- /** @var FileExtensionFilter $filter */
$filter = GeneralUtility::makeInstance(FileExtensionFilter::class);
$filter->setAllowedFileExtensions(['t3d', 'xml']);
$folder->getStorage()->addFileAndFolderNameFilter([$filter, 'filterFileList']);
diff --git a/typo3/sysext/impexp/Tests/Functional/Export/ExportPageTreeViewTest.php b/typo3/sysext/impexp/Tests/Functional/Export/ExportPageTreeViewTest.php
index d34e572b337f..8fe18d6b9f6f 100644
--- a/typo3/sysext/impexp/Tests/Functional/Export/ExportPageTreeViewTest.php
+++ b/typo3/sysext/impexp/Tests/Functional/Export/ExportPageTreeViewTest.php
@@ -17,12 +17,10 @@ declare(strict_types=1);
namespace TYPO3\CMS\Impexp\Tests\Functional\Export;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Impexp\Export;
use TYPO3\CMS\Impexp\Tests\Functional\AbstractImportExportTestCase;
use TYPO3\CMS\Impexp\View\ExportPageTreeView;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
class ExportPageTreeViewTest extends AbstractImportExportTestCase
{
@@ -57,7 +55,6 @@ class ExportPageTreeViewTest extends AbstractImportExportTestCase
$exportPageTreeView = $this->getAccessibleMock(ExportPageTreeView::class, ['dummy']);
GeneralUtility::addInstance(ExportPageTreeView::class, $exportPageTreeView);
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, [
'setMetaData', 'exportAddRecordsFromRelations', 'exportAddFilesFromRelations', 'exportAddFilesFromSysFilesRecords',
]);
diff --git a/typo3/sysext/impexp/Tests/Functional/Export/IrreTutorialRecordsTest.php b/typo3/sysext/impexp/Tests/Functional/Export/IrreTutorialRecordsTest.php
index 9996e33f4bcc..374e18ece2bc 100644
--- a/typo3/sysext/impexp/Tests/Functional/Export/IrreTutorialRecordsTest.php
+++ b/typo3/sysext/impexp/Tests/Functional/Export/IrreTutorialRecordsTest.php
@@ -17,10 +17,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Impexp\Tests\Functional\Export;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Impexp\Export;
use TYPO3\CMS\Impexp\Tests\Functional\AbstractImportExportTestCase;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
class IrreTutorialRecordsTest extends AbstractImportExportTestCase
{
@@ -43,7 +41,6 @@ class IrreTutorialRecordsTest extends AbstractImportExportTestCase
// @todo irre_tutorial.xml contains duplicate sorting values that need careful consideration before converting to csv
$this->importDataSet(__DIR__ . '/../Fixtures/DatabaseImports/irre_tutorial.xml');
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$subject->setPid(1);
$subject->setTables(['_ALL']);
diff --git a/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentTest.php b/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentTest.php
index f4b2fc6563fe..65bf03aa3ce0 100644
--- a/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentTest.php
+++ b/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentTest.php
@@ -17,10 +17,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Impexp\Tests\Functional\Export;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Impexp\Export;
use TYPO3\CMS\Impexp\Tests\Functional\AbstractImportExportTestCase;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
class PagesAndTtContentTest extends AbstractImportExportTestCase
{
@@ -81,7 +79,6 @@ class PagesAndTtContentTest extends AbstractImportExportTestCase
*/
public function exportPagesAndRelatedTtContent(): void
{
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$subject->setPid(1);
$subject->setLevels(1);
@@ -104,7 +101,6 @@ class PagesAndTtContentTest extends AbstractImportExportTestCase
*/
public function exportPagesAndRelatedTtContentWithComplexConfiguration(): void
{
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$subject->setPid(1);
$subject->setExcludeMap(['pages:2' => 1]);
diff --git a/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentWithImagesTest.php b/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentWithImagesTest.php
index c0071c328f05..74c6bfa4ba9b 100644
--- a/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentWithImagesTest.php
+++ b/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentWithImagesTest.php
@@ -17,10 +17,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Impexp\Tests\Functional\Export;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Impexp\Export;
use TYPO3\CMS\Impexp\Tests\Functional\AbstractImportExportTestCase;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
class PagesAndTtContentWithImagesTest extends AbstractImportExportTestCase
{
@@ -47,7 +45,6 @@ class PagesAndTtContentWithImagesTest extends AbstractImportExportTestCase
{
$this->importCSVDataSet(__DIR__ . '/../Fixtures/DatabaseImports/sys_file.csv');
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$this->compileExportPagesAndRelatedTtContentWithImages($subject);
$out = $subject->render();
@@ -68,7 +65,6 @@ class PagesAndTtContentWithImagesTest extends AbstractImportExportTestCase
{
$this->importCSVDataSet(__DIR__ . '/../Fixtures/DatabaseImports/sys_file_corrupt.csv');
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$this->compileExportPagesAndRelatedTtContentWithImages($subject);
$out = $subject->render();
@@ -94,7 +90,6 @@ class PagesAndTtContentWithImagesTest extends AbstractImportExportTestCase
{
$this->importCSVDataSet(__DIR__ . '/../Fixtures/DatabaseImports/sys_file.csv');
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$subject->setSaveFilesOutsideExportFile(true);
$this->compileExportPagesAndRelatedTtContentWithImages($subject);
@@ -117,7 +112,6 @@ class PagesAndTtContentWithImagesTest extends AbstractImportExportTestCase
{
$this->importCSVDataSet(__DIR__ . '/../Fixtures/DatabaseImports/sys_file_invalid_hash.csv');
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$subject->setSaveFilesOutsideExportFile(true);
$this->compileExportPagesAndRelatedTtContentWithImages($subject);
diff --git a/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentWithRelationsAndSoftrefsTest.php b/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentWithRelationsAndSoftrefsTest.php
index 41169d05a365..1ad5b23ac213 100644
--- a/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentWithRelationsAndSoftrefsTest.php
+++ b/typo3/sysext/impexp/Tests/Functional/Export/PagesAndTtContentWithRelationsAndSoftrefsTest.php
@@ -17,10 +17,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Impexp\Tests\Functional\Export;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Impexp\Export;
use TYPO3\CMS\Impexp\Tests\Functional\AbstractImportExportTestCase;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
class PagesAndTtContentWithRelationsAndSoftrefsTest extends AbstractImportExportTestCase
{
@@ -94,7 +92,6 @@ class PagesAndTtContentWithRelationsAndSoftrefsTest extends AbstractImportExport
</ROOT>
</T3DataStructure>';
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$subject->setPid(1);
$subject->setLevels(1);
@@ -149,7 +146,6 @@ class PagesAndTtContentWithRelationsAndSoftrefsTest extends AbstractImportExport
</ROOT>
</T3DataStructure>';
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$subject->setPid(1);
$subject->setLevels(1);
@@ -209,7 +205,6 @@ class PagesAndTtContentWithRelationsAndSoftrefsTest extends AbstractImportExport
</sheets>
</T3DataStructure>';
- /** @var Export|MockObject|AccessibleObjectInterface $subject */
$subject = $this->getAccessibleMock(Export::class, ['setMetaData']);
$subject->setPid(1);
$subject->setLevels(1);
diff --git a/typo3/sysext/impexp/Tests/Functional/ImportTest.php b/typo3/sysext/impexp/Tests/Functional/ImportTest.php
index 294417f73768..6b401f4ce401 100644
--- a/typo3/sysext/impexp/Tests/Functional/ImportTest.php
+++ b/typo3/sysext/impexp/Tests/Functional/ImportTest.php
@@ -15,11 +15,9 @@
namespace TYPO3\CMS\Impexp\Tests\Functional;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Impexp\Exception\LoadingFileFailedException;
use TYPO3\CMS\Impexp\Import;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
class ImportTest extends AbstractImportExportTestCase
{
@@ -314,7 +312,6 @@ class ImportTest extends AbstractImportExportTestCase
$fileDirectory = Environment::getVarPath() . '/transient';
$numTemporaryFilesAndFoldersBeforeImport = iterator_count(new \FilesystemIterator($fileDirectory, \FilesystemIterator::SKIP_DOTS));
- /** @var Import|MockObject|AccessibleObjectInterface $subject */
$importMock = $this->getAccessibleMock(Import::class, ['dummy']);
$importMock->setPid(0);
// Simulation of import of TCA field type=group with internal_type=file
diff --git a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
index 39121559c43f..fb92f43ddf86 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/AdministrationController.php
@@ -32,6 +32,7 @@ use TYPO3\CMS\Extbase\Mvc\Controller\ActionController;
use TYPO3\CMS\Extbase\Mvc\Request;
use TYPO3\CMS\Extbase\Mvc\RequestInterface;
use TYPO3\CMS\IndexedSearch\Domain\Repository\AdministrationRepository;
+use TYPO3\CMS\IndexedSearch\FileContentParser;
use TYPO3\CMS\IndexedSearch\Indexer;
/**
@@ -504,7 +505,7 @@ class AdministrationController extends ActionController
public function statisticAction($depth = 1, $mode = 'overview'): ResponseInterface
{
foreach ($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['indexed_search']['external_parsers'] ?? [] as $extension => $className) {
- /** @var \TYPO3\CMS\IndexedSearch\FileContentParser $fileContentParser */
+ /** @var FileContentParser $fileContentParser */
$fileContentParser = GeneralUtility::makeInstance($className);
if ($fileContentParser->softInit($extension)) {
$this->external_parsers[$extension] = $fileContentParser;
diff --git a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
index 7348899022b0..623f502c23fe 100644
--- a/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
+++ b/typo3/sysext/indexed_search/Classes/Controller/SearchController.php
@@ -662,7 +662,6 @@ class SearchController extends ActionController
if ((string)$row['item_type'] === '0') {
// If TypoScript is used to render the flag:
if (is_array($this->settings['flagRendering'] ?? false)) {
- /** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj */
$cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$cObj->setCurrentVal($row['sys_language_uid']);
$typoScriptArray = $this->typoScriptService->convertPlainArrayToTypoScriptArray($this->settings['flagRendering']);
@@ -695,7 +694,6 @@ class SearchController extends ActionController
$this->iconFileNameCache[$imageType] = '';
// If TypoScript is used to render the icon:
if (is_array($this->settings['iconRendering'] ?? false)) {
- /** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj */
$cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$cObj->setCurrentVal($imageType);
$typoScriptArray = $this->typoScriptService->convertPlainArrayToTypoScriptArray($this->settings['iconRendering']);
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/AdministrationRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/AdministrationRepository.php
index f701c2bcef0c..f2c1c588fe45 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/AdministrationRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/AdministrationRepository.php
@@ -19,7 +19,6 @@ use TYPO3\CMS\Backend\Tree\View\PageTreeView;
use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
use TYPO3\CMS\Core\Cache\CacheManager;
-use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\Query\QueryHelper;
@@ -472,7 +471,6 @@ class AdministrationRepository
if (!$pageRecord) {
return $allLines;
}
- /** @var PageTreeView $tree */
$tree = GeneralUtility::makeInstance(PageTreeView::class);
$perms_clause = $this->getBackendUserAuthentication()->getPagePermsClause(Permission::PAGE_SHOW);
$tree->init('AND ' . $perms_clause);
@@ -761,7 +759,6 @@ class AdministrationRepository
}
if (!empty($idList)) {
- /** @var FrontendInterface $pageCache */
$pageCache = GeneralUtility::makeInstance(CacheManager::class)->getCache('pages');
foreach ($idList as $pageId) {
$pageCache->flushByTag('pageId_' . $pageId);
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
index e560cb413cd1..47d8bfa3417f 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
@@ -25,6 +25,7 @@ use TYPO3\CMS\Core\TimeTracker\TimeTracker;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
+use TYPO3\CMS\IndexedSearch\FileContentParser;
use TYPO3\CMS\IndexedSearch\Indexer;
use TYPO3\CMS\IndexedSearch\Utility\IndexedSearchUtility;
use TYPO3\CMS\IndexedSearch\Utility\LikeWildcard;
@@ -346,7 +347,6 @@ class IndexSearchRepository
// Perform SQL Search / collection of result rows array:
$resource = false;
if ($searchData) {
- /** @var TimeTracker $timeTracker */
$timeTracker = GeneralUtility::makeInstance(TimeTracker::class);
// Do the search:
$timeTracker->push('execFinalQuery');
@@ -493,7 +493,6 @@ class IndexSearchRepository
// filtering out ALL pages that are not accessible due to restriction containers. Does NOT look for "no_search" field!
$idList = [];
foreach ($searchRootPageIdList as $rootId) {
- /** @var \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer $cObj */
$cObj = GeneralUtility::makeInstance(ContentObjectRenderer::class);
$idList[] = $cObj->getTreeList(-1 * $rootId, 9999);
}
@@ -1211,7 +1210,7 @@ class IndexSearchRepository
*/
protected function multiplePagesType($itemType)
{
- /** @var \TYPO3\CMS\IndexedSearch\FileContentParser $fileContentParser */
+ /** @var FileContentParser|null $fileContentParser */
$fileContentParser = $this->externalParsers[$itemType] ?? null;
return is_object($fileContentParser) && $fileContentParser->isMultiplePageExtension($itemType);
}
diff --git a/typo3/sysext/info/Classes/Controller/InfoModuleController.php b/typo3/sysext/info/Classes/Controller/InfoModuleController.php
index a8cad3b99752..1bff936a72e8 100644
--- a/typo3/sysext/info/Classes/Controller/InfoModuleController.php
+++ b/typo3/sysext/info/Classes/Controller/InfoModuleController.php
@@ -456,7 +456,6 @@ class InfoModuleController
$languageService->getLL('title'),
FlashMessage::ERROR
);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue $defaultFlashMessageQueue */
$defaultFlashMessageQueue = $this->flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
} else {
diff --git a/typo3/sysext/install/Classes/Configuration/FeatureManager.php b/typo3/sysext/install/Classes/Configuration/FeatureManager.php
index cfe396fa221f..3a46afe4bc74 100644
--- a/typo3/sysext/install/Classes/Configuration/FeatureManager.php
+++ b/typo3/sysext/install/Classes/Configuration/FeatureManager.php
@@ -76,7 +76,6 @@ class FeatureManager
$localConfigurationValuesToSet = [];
$features = $this->getInitializedFeatures($postValues);
foreach ($features as $feature) {
- /** @var FeatureInterface $feature */
$featureName = $feature->getName();
$presets = $feature->getPresetsOrderedByPriority();
foreach ($presets as $preset) {
@@ -107,7 +106,6 @@ class FeatureManager
$localConfigurationValuesToSet = [];
$features = $this->getInitializedFeatures([]);
foreach ($features as $feature) {
- /** @var FeatureInterface $feature */
$presets = $feature->getPresetsOrderedByPriority();
foreach ($presets as $preset) {
// Only choose "normal" presets, no custom presets
diff --git a/typo3/sysext/install/Classes/Controller/UpgradeController.php b/typo3/sysext/install/Classes/Controller/UpgradeController.php
index 0ae0f3e79a45..e27f52defc29 100644
--- a/typo3/sysext/install/Classes/Controller/UpgradeController.php
+++ b/typo3/sysext/install/Classes/Controller/UpgradeController.php
@@ -41,6 +41,7 @@ use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Install\CoreVersion\CoreRelease;
+use TYPO3\CMS\Install\ExtensionScanner\CodeScannerInterface;
use TYPO3\CMS\Install\ExtensionScanner\Php\CodeStatistics;
use TYPO3\CMS\Install\ExtensionScanner\Php\GeneratorClassesResolver;
use TYPO3\CMS\Install\ExtensionScanner\Php\Matcher\ArrayDimensionMatcher;
@@ -833,7 +834,7 @@ class UpgradeController extends AbstractController
// Gather code matches
$matches = [[]];
foreach ($matchers as $matcher) {
- /** @var \TYPO3\CMS\Install\ExtensionScanner\CodeScannerInterface $matcher */
+ /** @var CodeScannerInterface $matcher */
$matches[] = $matcher->getMatches();
}
$matches = array_merge(...$matches);
diff --git a/typo3/sysext/install/Classes/Report/InstallStatusReport.php b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
index bb226e790376..6633af4b8524 100644
--- a/typo3/sysext/install/Classes/Report/InstallStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/InstallStatusReport.php
@@ -188,7 +188,6 @@ class InstallStatusReport implements StatusProviderInterface
$value = $languageService->getLL('status_updateComplete');
$message = '';
$severity = Status::OK;
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
// check if there are update wizards left to perform
$incompleteWizards = $this->getIncompleteWizards();
@@ -212,7 +211,6 @@ class InstallStatusReport implements StatusProviderInterface
{
$typoVersion = GeneralUtility::makeInstance(Typo3Version::class);
$languageService = $this->getLanguageService();
- /** @var \TYPO3\CMS\Install\Service\CoreVersionService $coreVersionService */
$coreVersionService = GeneralUtility::makeInstance(CoreVersionService::class);
// No updates for development versions
diff --git a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
index 368c4ba7b6fd..2aab4e63dcd5 100644
--- a/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
+++ b/typo3/sysext/install/Classes/Report/SecurityStatusReport.php
@@ -79,7 +79,6 @@ class SecurityStatusReport implements StatusProviderInterface
if ($isDefaultPassword) {
$value = $this->getLanguageService()->getLL('status_insecure');
$severity = Status::ERROR;
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$changeInstallToolPasswordUrl = (string)$uriBuilder->buildUriFromRoute('tools_toolssettings');
$message = sprintf(
diff --git a/typo3/sysext/install/Classes/Service/UpgradeWizardsService.php b/typo3/sysext/install/Classes/Service/UpgradeWizardsService.php
index 9073151b5d99..c57a832a8000 100644
--- a/typo3/sysext/install/Classes/Service/UpgradeWizardsService.php
+++ b/typo3/sysext/install/Classes/Service/UpgradeWizardsService.php
@@ -214,7 +214,6 @@ class UpgradeWizardsService
*/
public function isDatabaseCharsetUtf8(): bool
{
- /** @var \TYPO3\CMS\Core\Database\Connection $connection */
$connection = GeneralUtility::makeInstance(ConnectionPool::class)
->getConnectionByName(ConnectionPool::DEFAULT_CONNECTION_NAME);
diff --git a/typo3/sysext/install/Tests/Unit/Controller/UpgradeControllerTest.php b/typo3/sysext/install/Tests/Unit/Controller/UpgradeControllerTest.php
index 9a4005ce0236..77be8f41d4f0 100644
--- a/typo3/sysext/install/Tests/Unit/Controller/UpgradeControllerTest.php
+++ b/typo3/sysext/install/Tests/Unit/Controller/UpgradeControllerTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\Controller;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\PhpUnit\ProphecyTrait;
use Psr\Http\Message\ServerRequestInterface;
use TYPO3\CMS\Fluid\View\StandaloneView;
@@ -75,7 +74,6 @@ class UpgradeControllerTest extends UnitTestCase
],
]);
- /** @var UpgradeController|MockObject $subject */
$subject = $this->getMockBuilder(UpgradeController::class)
->disableOriginalConstructor()
->onlyMethods(['getDocumentationFiles', 'initializeStandaloneView'])
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
index 10cbc3a077db..846eac35b532 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Utility\StringUtility;
@@ -27,7 +26,6 @@ use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
use TYPO3\CMS\Install\FolderStructure\NodeInterface;
use TYPO3\CMS\Install\FolderStructure\RootNodeInterface;
use TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
/**
* Test case
@@ -39,7 +37,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getNameReturnsSetName(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$name = StringUtility::getUniqueId('name_');
$node->_set('name', $name);
@@ -51,7 +48,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getTargetPermissionReturnsSetTargetPermission(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$permission = '1234';
$node->_set('targetPermission', $permission);
@@ -63,7 +59,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getChildrenReturnsSetChildren(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$children = ['1234'];
$node->_set('children', $children);
@@ -75,7 +70,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getParentReturnsSetParent(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$node->_set('parent', $parent);
@@ -87,7 +81,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getAbsolutePathCallsParentForPathAndAppendsOwnName(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$parentPath = '/foo/bar';
@@ -103,7 +96,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function isWritableCallsParentIsWritable(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$parentMock = $this->createMock(NodeInterface::class);
$parentMock->expects(self::once())->method('isWritable');
@@ -116,7 +108,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function isWritableReturnsWritableStatusOfParent(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$parentMock = $this->createMock(NodeInterface::class);
$parentMock->expects(self::once())->method('isWritable')->willReturn(true);
@@ -129,7 +120,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function existsReturnsTrueIfNodeExists(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestDir('dir_');
$node->method('getAbsolutePath')->willReturn($path);
@@ -142,7 +132,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function existsReturnsTrueIfIsLinkAndTargetIsDead(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
$path = Environment::getVarPath() . '/tests/' . StringUtility::getUniqueId('link_');
$target = Environment::getVarPath() . '/tests/' . StringUtility::getUniqueId('notExists_');
@@ -159,7 +148,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function existsReturnsFalseIfNodeNotExists(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestFilePath('dir_');
$node->method('getAbsolutePath')->willReturn($path);
@@ -171,7 +159,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function fixPermissionThrowsExceptionIfPermissionAreAlreadyCorrect(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
AbstractNode::class,
['isPermissionCorrect', 'getAbsolutePath'],
@@ -191,7 +178,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function fixPermissionReturnsOkStatusIfPermissionCanBeFixedAndSetsPermissionToCorrectValue(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
AbstractNode::class,
['isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'],
@@ -217,7 +203,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function isPermissionCorrectReturnsTrueOnWindowsOs(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['isWindowsOs'], [], '', false);
$node->expects(self::once())->method('isWindowsOs')->willReturn(true);
self::assertTrue($node->_call('isPermissionCorrect'));
@@ -228,7 +213,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function isPermissionCorrectReturnsFalseIfTargetPermissionAndCurrentPermissionAreNotIdentical(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['isWindowsOs', 'getCurrentPermission'], [], '', false);
$node->method('isWindowsOs')->willReturn(false);
$node->method('getCurrentPermission')->willReturn('foo');
@@ -241,7 +225,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getCurrentPermissionReturnsCurrentDirectoryPermission(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestDir('dir_');
chmod($path, 02775);
@@ -255,7 +238,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getCurrentPermissionReturnsCurrentFilePermission(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
$file = $this->getVirtualTestFilePath('file_');
touch($file);
@@ -272,7 +254,6 @@ class AbstractNodeTest extends FolderStructureTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366398198);
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$node->_call('getRelativePathBelowSiteRoot', '/tmp');
}
@@ -282,7 +263,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getRelativePathCallsGetAbsolutePathIfPathIsNull(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
AbstractNode::class,
['getAbsolutePath'],
@@ -299,7 +279,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getRelativePathBelowSiteRootReturnsSingleForwardSlashIfGivenPathEqualsPathSiteConstant(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$result = $node->_call('getRelativePathBelowSiteRoot', Environment::getPublicPath() . '/');
self::assertSame('/', $result);
@@ -310,7 +289,6 @@ class AbstractNodeTest extends FolderStructureTestCase
*/
public function getRelativePathBelowSiteRootReturnsSubPath(): void
{
- /** @var AbstractNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
$result = $node->_call('getRelativePathBelowSiteRoot', Environment::getPublicPath() . '/foo/bar');
self::assertSame('/foo/bar', $result);
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
index c3070a92fd1b..497b9c5914ee 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -28,7 +27,6 @@ use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
use TYPO3\CMS\Install\FolderStructure\NodeInterface;
use TYPO3\CMS\Install\FolderStructure\RootNodeInterface;
use TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
/**
* Test case
@@ -86,7 +84,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
public function constructorSetsParent(): void
{
$parent = $this->createMock(NodeInterface::class);
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
$structure = [
'name' => 'foo',
@@ -101,7 +98,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
public function constructorSetsTargetPermission(): void
{
$parent = $this->createMock(NodeInterface::class);
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
$targetPermission = '2550';
$structure = [
@@ -128,7 +124,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArray(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -151,7 +146,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithWarningStatusIfDirectoryNotExists(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -175,7 +169,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithErrorStatusIfNodeIsNotADirectory(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -200,7 +193,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithErrorStatusIfDirectoryExistsButIsNotWritable(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -225,7 +217,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithNoticeStatusIfDirectoryExistsButPermissionAreNotCorrect(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -250,7 +241,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithOkStatusIfDirectoryExistsAndPermissionAreCorrect(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -275,7 +265,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function getStatusCallsGetStatusOnChildren(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['exists', 'isDirectory', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'isWritable'],
@@ -300,7 +289,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithOwnStatusAndStatusOfChild(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['exists', 'isDirectory', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'isWritable'],
@@ -342,7 +330,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function fixCallsFixOnChildrenAndReturnsMergedResult(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['fixSelf'], [], '', false);
$uniqueReturnSelf = StringUtility::getUniqueId('foo_');
$node->expects(self::once())->method('fixSelf')->willReturn([$uniqueReturnSelf]);
@@ -365,7 +352,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function fixSelfCallsCreateDirectoryIfDirectoryDoesNotExistAndReturnsResult(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['exists', 'createDirectory', 'isPermissionCorrect'],
@@ -385,7 +371,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function fixSelfReturnsErrorStatusIfNodeExistsButIsNotADirectoryAndReturnsResult(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['exists', 'isWritable', 'getRelativePathBelowSiteRoot', 'isDirectory', 'getAbsolutePath'],
@@ -407,7 +392,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function fixSelfCallsFixPermissionIfDirectoryExistsButIsNotWritable(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
DirectoryNode::class,
['exists', 'isWritable', 'fixPermission'],
@@ -429,7 +413,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionCode(1366740091);
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['exists', 'getAbsolutePath'], [], '', false);
$node->expects(self::once())->method('getAbsolutePath')->willReturn('');
$node->expects(self::once())->method('exists')->willReturn(true);
@@ -441,7 +424,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function createDirectoryCreatesDirectory(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
$path = $this->getVirtualTestFilePath('dir_');
$node->expects(self::once())->method('exists')->willReturn(false);
@@ -456,7 +438,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function createDirectoryReturnsOkStatusIfDirectoryWasCreated(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
$path = $this->getVirtualTestFilePath('dir_');
$node->expects(self::once())->method('exists')->willReturn(false);
@@ -470,7 +451,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function createDirectoryReturnsErrorStatusIfDirectoryWasNotCreated(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
$path = $this->getVirtualTestDir('root_');
chmod($path, 02550);
@@ -488,7 +468,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366222204);
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
$brokenStructure = [
[
@@ -505,7 +484,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366222205);
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
$brokenStructure = [
[
@@ -522,7 +500,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366222206);
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
$brokenStructure = [
[
@@ -542,7 +519,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function getChildrenReturnsCreatedChild(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(NodeInterface::class);
$childName = StringUtility::getUniqueId('test_');
@@ -569,7 +545,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function isWritableReturnsFalseIfNodeDoesNotExist(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestFilePath('dir_');
$node->method('getAbsolutePath')->willReturn($path);
@@ -581,7 +556,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function isWritableReturnsTrueIfNodeExistsAndFileCanBeCreated(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestDir('root_');
$node->method('getAbsolutePath')->willReturn($path);
@@ -593,7 +567,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function isDirectoryReturnsTrueIfNameIsADirectory(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestDir('dir_');
$node->method('getAbsolutePath')->willReturn($path);
@@ -606,7 +579,6 @@ class DirectoryNodeTest extends FolderStructureTestCase
*/
public function isDirectoryReturnsFalseIfNameIsALinkToADirectory(): void
{
- /** @var DirectoryNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(DirectoryNode::class, ['getAbsolutePath'], [], '', false);
$path = Environment::getVarPath() . '/tests/' . StringUtility::getUniqueId('root_');
GeneralUtility::mkdir_deep($path);
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
index 8eb6ca6cbd4c..207388b82c5d 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -28,7 +27,6 @@ use TYPO3\CMS\Install\FolderStructure\FileNode;
use TYPO3\CMS\Install\FolderStructure\NodeInterface;
use TYPO3\CMS\Install\FolderStructure\RootNodeInterface;
use TYPO3\CMS\Install\Tests\Unit\FolderStructureTestCase;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
/**
* Test case
@@ -42,7 +40,6 @@ class FileNodeTest extends FolderStructureTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366927513);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$node->__construct([], null);
}
@@ -55,7 +52,6 @@ class FileNodeTest extends FolderStructureTestCase
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366222207);
$parent = $this->createMock(NodeInterface::class);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$structure = [
'name' => 'foo/bar',
@@ -69,7 +65,6 @@ class FileNodeTest extends FolderStructureTestCase
public function constructorSetsParent(): void
{
$parent = $this->createMock(NodeInterface::class);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$structure = [
'name' => 'foo',
@@ -84,7 +79,6 @@ class FileNodeTest extends FolderStructureTestCase
public function constructorSetsTargetPermission(): void
{
$parent = $this->createMock(NodeInterface::class);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$targetPermission = '0660';
$structure = [
@@ -100,7 +94,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function constructorSetsName(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$name = StringUtility::getUniqueId('test_');
@@ -115,7 +108,6 @@ class FileNodeTest extends FolderStructureTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1380364361);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$structure = [
@@ -131,7 +123,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function constructorSetsTargetContent(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$targetContent = StringUtility::getUniqueId('content_');
@@ -148,7 +139,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function constructorSetsTargetContentToContentOfTargetContentFile(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$targetFile = $this->getVirtualTestFilePath('test_');
@@ -169,7 +159,6 @@ class FileNodeTest extends FolderStructureTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1380364362);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$targetFile = $this->getVirtualTestFilePath('test_');
@@ -185,7 +174,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function targetContentIsNullIfNotGiven(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$structure = [
@@ -200,7 +188,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArray(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['getAbsolutePath', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -224,7 +211,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithWarningStatusIFileNotExists(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -249,7 +235,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithErrorStatusIfNodeIsNotAFile(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -275,7 +260,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayNoticeStatusIfFileExistsButIsNotWritable(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -301,7 +285,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithNoticeStatusIfFileExistsButPermissionAreNotCorrect(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -327,7 +310,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithNoticeStatusIfFileExistsButContentIsNotCorrect(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -353,7 +335,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function getStatusReturnsArrayWithOkStatusIfFileExistsAndPermissionAreCorrect(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isFile', 'isWritable', 'isPermissionCorrect', 'isContentCorrect'],
@@ -379,7 +360,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function fixCallsFixSelfAndReturnsItsResult(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['fixSelf'],
@@ -397,7 +377,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function fixSelfCallsCreateFileIfFileDoesNotExistAndReturnsResult(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'],
@@ -420,7 +399,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function fixSelfCallsSetsContentIfFileCreationWasSuccessfulAndTargetContentIsNotNullAndReturnsResult(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'],
@@ -446,7 +424,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function fixSelfDoesNotCallSetContentIfFileCreationFailed(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'],
@@ -469,7 +446,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function fixSelfDoesNotCallSetContentIfFileTargetContentIsNull(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['exists', 'createFile', 'setContent', 'getAbsolutePath', 'isFile', 'isPermissionCorrect'],
@@ -492,7 +468,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function fixSelfReturnsErrorStatusIfNodeExistsButIsNotAFileAndReturnsResult(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['exists', 'createFile', 'getAbsolutePath', 'isFile', 'isPermissionCorrect', 'fixPermission'],
@@ -513,7 +488,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function fixSelfCallsFixPermissionIfFileExistsButPermissionAreWrong(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
FileNode::class,
['exists', 'createFile', 'getAbsolutePath', 'isFile', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot'],
@@ -552,7 +526,6 @@ class FileNodeTest extends FolderStructureTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionCode(1366398198);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['exists', 'getAbsolutePath'], [], '', false);
$node->expects(self::once())->method('getAbsolutePath')->willReturn('');
$node->expects(self::once())->method('exists')->willReturn(true);
@@ -564,7 +537,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function createFileReturnsOkStatusIfFileWasCreated(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
$path = $this->getVirtualTestFilePath('file_');
$node->expects(self::once())->method('exists')->willReturn(false);
@@ -578,7 +550,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function createFileCreatesFile(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
$path = $this->getVirtualTestFilePath('file_');
$node->expects(self::once())->method('exists')->willReturn(false);
@@ -593,7 +564,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function createFileReturnsErrorStatusIfFileWasNotCreated(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['exists', 'getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
$path = $this->getVirtualTestDir();
chmod($path, 02550);
@@ -611,7 +581,6 @@ class FileNodeTest extends FolderStructureTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionCode(1367056363);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestDir('dir_');
$node->method('getAbsolutePath')->willReturn($path);
@@ -623,7 +592,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function isContentCorrectReturnsTrueIfTargetContentPropertyIsNull(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestFilePath('file_');
touch($path);
@@ -637,7 +605,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function isContentCorrectReturnsTrueIfTargetContentEqualsCurrentContent(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestFilePath('file_');
$content = StringUtility::getUniqueId('content_');
@@ -652,7 +619,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function isContentCorrectReturnsFalseIfTargetContentNotEqualsCurrentContent(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestFilePath('file_');
$content = StringUtility::getUniqueId('content1_');
@@ -669,7 +635,6 @@ class FileNodeTest extends FolderStructureTestCase
public function isPermissionCorrectReturnsTrueIfTargetPermissionAndCurrentPermissionAreIdentical(): void
{
$parent = $this->createMock(NodeInterface::class);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getCurrentPermission', 'isWindowsOs'], [], '', false);
$node->method('isWindowsOs')->willReturn(false);
$node->method('getCurrentPermission')->willReturn('0664');
@@ -689,7 +654,6 @@ class FileNodeTest extends FolderStructureTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionCode(1367060201);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestDir('dir_');
$node->method('getAbsolutePath')->willReturn($path);
@@ -704,7 +668,6 @@ class FileNodeTest extends FolderStructureTestCase
{
$this->expectException(Exception::class);
$this->expectExceptionCode(1367060202);
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath'], [], '', false);
$path = $this->getVirtualTestFilePath('file_');
touch($path);
@@ -718,7 +681,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function setContentSetsContentToFile(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
$path = $this->getVirtualTestFilePath('file_');
touch($path);
@@ -735,7 +697,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function setContentReturnsOkStatusIfContentWasSuccessfullySet(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
$path = $this->getVirtualTestFilePath('file_');
touch($path);
@@ -750,7 +711,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function isFileReturnsTrueIfNameIsFile(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath', 'getRelativePathBelowSiteRoot'], [], '', false);
$path = $this->getVirtualTestFilePath('file_');
touch($path);
@@ -764,7 +724,6 @@ class FileNodeTest extends FolderStructureTestCase
*/
public function isFileReturnsFalseIfNameIsALinkFile(): void
{
- /** @var FileNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(FileNode::class, ['getAbsolutePath'], [], '', false);
$path = Environment::getVarPath() . '/tests/' . StringUtility::getUniqueId('root_');
GeneralUtility::mkdir_deep($path);
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
index 65bc2bbe1093..0ffb510c7f3a 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Utility\StringUtility;
@@ -25,7 +24,6 @@ use TYPO3\CMS\Install\FolderStructure\Exception\InvalidArgumentException;
use TYPO3\CMS\Install\FolderStructure\LinkNode;
use TYPO3\CMS\Install\FolderStructure\NodeInterface;
use TYPO3\CMS\Install\FolderStructure\RootNodeInterface;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -40,7 +38,6 @@ class LinkNodeTest extends UnitTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1380485700);
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['dummy'], [], '', false);
$node->__construct([], null);
}
@@ -53,7 +50,6 @@ class LinkNodeTest extends UnitTestCase
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1380546061);
$parent = $this->createMock(NodeInterface::class);
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['dummy'], [], '', false);
$structure = [
'name' => 'foo/bar',
@@ -67,7 +63,6 @@ class LinkNodeTest extends UnitTestCase
public function constructorSetsParent(): void
{
$parent = $this->createMock(NodeInterface::class);
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['dummy'], [], '', false);
$structure = [
'name' => 'foo',
@@ -81,7 +76,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function constructorSetsName(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$name = StringUtility::getUniqueId('test_');
@@ -94,7 +88,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function constructorSetsNameAndTarget(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['dummy'], [], '', false);
$parent = $this->createMock(RootNodeInterface::class);
$name = StringUtility::getUniqueId('test_');
@@ -108,7 +101,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function getStatusReturnsArray(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
LinkNode::class,
['isWindowsOs', 'getAbsolutePath', 'exists'],
@@ -127,7 +119,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function getStatusReturnsArrayWithInformationStatusIfRunningOnWindows(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
LinkNode::class,
['isWindowsOs', 'getAbsolutePath', 'exists'],
@@ -148,7 +139,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function getStatusReturnsArrayWithErrorStatusIfLinkNotExists(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
LinkNode::class,
['isWindowsOs', 'getAbsolutePath', 'exists'],
@@ -170,7 +160,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function getStatusReturnsArrayWithWarningStatusIfNodeIsNotALink(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
LinkNode::class,
['isWindowsOs', 'getAbsolutePath', 'exists', 'isLink', 'getRelativePathBelowSiteRoot'],
@@ -190,7 +179,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function getStatusReturnsErrorStatusIfLinkTargetIsNotCorrect(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
LinkNode::class,
['isWindowsOs', 'getAbsolutePath', 'exists', 'isLink', 'isTargetCorrect', 'getCurrentTarget', 'getRelativePathBelowSiteRoot'],
@@ -212,7 +200,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function getStatusReturnsOkStatusIfLinkExistsAndTargetIsCorrect(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
LinkNode::class,
['isWindowsOs', 'getAbsolutePath', 'exists', 'isLink', 'isTargetCorrect', 'getRelativePathBelowSiteRoot'],
@@ -234,7 +221,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function fixReturnsEmptyArray(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
LinkNode::class,
['getRelativePathBelowSiteRoot'],
@@ -253,7 +239,6 @@ class LinkNodeTest extends UnitTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1380556246);
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['exists'], [], '', false);
$node->expects(self::once())->method('exists')->willReturn(false);
self::assertFalse($node->_call('isLink'));
@@ -264,7 +249,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function isLinkReturnsTrueIfNameIsLink(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['exists', 'getAbsolutePath'], [], '', false);
$path = Environment::getVarPath() . '/tests/' . StringUtility::getUniqueId('link_');
$target = Environment::getVarPath() . '/tests/' . StringUtility::getUniqueId('linkTarget_');
@@ -282,7 +266,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function isFileReturnsFalseIfNameIsAFile(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['exists', 'getAbsolutePath'], [], '', false);
$path = Environment::getVarPath() . '/tests/' . StringUtility::getUniqueId('file_');
touch($path);
@@ -299,7 +282,6 @@ class LinkNodeTest extends UnitTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1380556245);
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['exists'], [], '', false);
$node->expects(self::once())->method('exists')->willReturn(false);
self::assertFalse($node->_call('isTargetCorrect'));
@@ -312,7 +294,6 @@ class LinkNodeTest extends UnitTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1380556247);
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['exists', 'isLink', 'getTarget'], [], '', false);
$node->method('exists')->willReturn(true);
$node->expects(self::once())->method('isLink')->willReturn(false);
@@ -324,7 +305,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function isTargetCorrectReturnsTrueIfNoExpectedLinkTargetIsSpecified(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['exists', 'isLink', 'getTarget'], [], '', false);
$node->method('exists')->willReturn(true);
$node->method('isLink')->willReturn(true);
@@ -337,7 +317,6 @@ class LinkNodeTest extends UnitTestCase
*/
public function isTargetCorrectAcceptsATargetWithATrailingSlash(): void
{
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(LinkNode::class, ['exists', 'isLink', 'getCurrentTarget', 'getTarget'], [], '', false);
$node->method('exists')->willReturn(true);
$node->method('isLink')->willReturn(true);
@@ -358,7 +337,6 @@ class LinkNodeTest extends UnitTestCase
symlink($target, $path);
$this->testFilesToDelete[] = $path;
$this->testFilesToDelete[] = $target;
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
LinkNode::class,
['exists', 'isLink', 'getTarget', 'getAbsolutePath'],
@@ -385,7 +363,6 @@ class LinkNodeTest extends UnitTestCase
symlink($target, $path);
$this->testFilesToDelete[] = $path;
$this->testFilesToDelete[] = $target;
- /** @var LinkNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
LinkNode::class,
['exists', 'isLink', 'getTarget', 'getAbsolutePath'],
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
index 0ff0fa6ff0bd..8663e51109b3 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Messaging\FlashMessage;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -28,7 +27,6 @@ use TYPO3\CMS\Install\FolderStructure\Exception\RootNodeException;
use TYPO3\CMS\Install\FolderStructure\NodeInterface;
use TYPO3\CMS\Install\FolderStructure\RootNode;
use TYPO3\CMS\Install\FolderStructure\RootNodeInterface;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -43,7 +41,6 @@ class RootNodeTest extends UnitTestCase
{
$this->expectException(RootNodeException::class);
$this->expectExceptionCode(1366140117);
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
$falseParent = $this->createMock(RootNodeInterface::class);
$node->__construct([], $falseParent);
@@ -56,7 +53,6 @@ class RootNodeTest extends UnitTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366141329);
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
$structure = [
'type' => 'root',
@@ -71,7 +67,6 @@ class RootNodeTest extends UnitTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366141329);
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
$node
->method('isWindowsOs')
@@ -89,7 +84,6 @@ class RootNodeTest extends UnitTestCase
{
$this->expectException(InvalidArgumentException::class);
$this->expectExceptionCode(1366141329);
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
$node
->method('isWindowsOs')
@@ -105,7 +99,6 @@ class RootNodeTest extends UnitTestCase
*/
public function constructorSetsParentToNull(): void
{
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
$node
->method('isWindowsOs')
@@ -122,7 +115,6 @@ class RootNodeTest extends UnitTestCase
*/
public function getChildrenReturnsChildCreatedByConstructor(): void
{
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
$node
->method('isWindowsOs')
@@ -150,7 +142,6 @@ class RootNodeTest extends UnitTestCase
*/
public function constructorSetsTargetPermission(): void
{
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
$node
->method('isWindowsOs')
@@ -169,7 +160,6 @@ class RootNodeTest extends UnitTestCase
*/
public function constructorSetsName(): void
{
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
$node
->method('isWindowsOs')
@@ -184,7 +174,6 @@ class RootNodeTest extends UnitTestCase
*/
public function getStatusReturnsArrayWithOkStatusAndCallsOwnStatusMethods(): void
{
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
RootNode::class,
['getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -210,7 +199,6 @@ class RootNodeTest extends UnitTestCase
*/
public function getStatusCallsGetChildrenStatusForStatus(): void
{
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(
RootNode::class,
['getAbsolutePath', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect', 'getChildrenStatus'],
@@ -241,7 +229,6 @@ class RootNodeTest extends UnitTestCase
*/
public function getAbsolutePathReturnsGivenName(): void
{
- /** @var RootNode|AccessibleObjectInterface|MockObject $node */
$node = $this->getAccessibleMock(RootNode::class, ['isWindowsOs'], [], '', false);
$node
->method('isWindowsOs')
diff --git a/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php b/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
index 00a9fc00e6cc..0b6a168206dd 100644
--- a/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
+++ b/typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
@@ -17,11 +17,9 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\FolderStructure;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
use TYPO3\CMS\Install\FolderStructure\RootNode;
use TYPO3\CMS\Install\FolderStructure\StructureFacade;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -34,7 +32,6 @@ class StructureFacadeTest extends UnitTestCase
*/
public function getStatusReturnsStatusOfStructureAndReturnsItsResult(): void
{
- /** @var StructureFacade|AccessibleObjectInterface|MockObject $facade */
$facade = $this->getAccessibleMock(StructureFacade::class, ['dummy'], [], '', false);
$root = $this->createMock(RootNode::class);
$root->expects(self::once())->method('getStatus')->willReturn([]);
@@ -48,7 +45,6 @@ class StructureFacadeTest extends UnitTestCase
*/
public function fixCallsFixOfStructureAndReturnsItsResult(): void
{
- /** @var StructureFacade|AccessibleObjectInterface|MockObject $facade */
$facade = $this->getAccessibleMock(StructureFacade::class, ['dummy'], [], '', false);
$root = $this->createMock(RootNode::class);
$root->expects(self::once())->method('fix')->willReturn([]);
diff --git a/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
index 612c3a1844af..c66a6a4dda20 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
@@ -17,10 +17,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\Service;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Messaging\FlashMessageQueue;
use TYPO3\CMS\Install\Service\CoreUpdateService;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -33,7 +31,6 @@ class CoreUpdateServiceTest extends UnitTestCase
*/
public function getMessagesReturnsPreviouslySetMessage(): void
{
- /** @var CoreUpdateService|AccessibleObjectInterface|MockObject $instance */
$instance = $this->getAccessibleMock(CoreUpdateService::class, ['dummy'], [], '', false);
$aMessage = new FlashMessageQueue('install');
$instance->_set('messages', $aMessage);
@@ -48,7 +45,6 @@ class CoreUpdateServiceTest extends UnitTestCase
if (defined('TYPO3_COMPOSER_MODE') && TYPO3_COMPOSER_MODE) {
self::markTestSkipped('This test is only available in Non-Composer mode.');
}
- /** @var CoreUpdateService|AccessibleObjectInterface|MockObject $instance */
$instance = $this->getAccessibleMock(CoreUpdateService::class, ['dummy'], [], '', false);
putenv('TYPO3_DISABLE_CORE_UPDATER');
putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER');
@@ -60,7 +56,6 @@ class CoreUpdateServiceTest extends UnitTestCase
*/
public function isCoreUpdateEnabledReturnsFalseFor_TYPO3_DISABLE_CORE_UPDATER_EnvironmentVariableSet(): void
{
- /** @var CoreUpdateService|AccessibleObjectInterface|MockObject $instance */
$instance = $this->getAccessibleMock(CoreUpdateService::class, ['dummy'], [], '', false);
putenv('TYPO3_DISABLE_CORE_UPDATER=1');
putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER');
@@ -72,7 +67,6 @@ class CoreUpdateServiceTest extends UnitTestCase
*/
public function isCoreUpdateEnabledReturnsFalseFor_REDIRECT_TYPO3_DISABLE_CORE_UPDATER_EnvironmentVariableSet(): void
{
- /** @var CoreUpdateService|AccessibleObjectInterface|MockObject $instance */
$instance = $this->getAccessibleMock(CoreUpdateService::class, ['dummy'], [], '', false);
putenv('TYPO3_DISABLE_CORE_UPDATER');
putenv('REDIRECT_TYPO3_DISABLE_CORE_UPDATER=1');
diff --git a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
index 2a5bd6c79052..873f1555842e 100644
--- a/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\Service;
-use PHPUnit\Framework\MockObject\MockObject;
use Prophecy\Argument;
use Prophecy\PhpUnit\ProphecyTrait;
use TYPO3\CMS\Core\Http\JsonResponse;
@@ -25,7 +24,6 @@ use TYPO3\CMS\Core\Http\RequestFactory;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Install\CoreVersion\CoreRelease;
use TYPO3\CMS\Install\Service\CoreVersionService;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -598,7 +596,6 @@ class CoreVersionServiceTest extends UnitTestCase
*/
public function isInstalledVersionAReleasedVersionReturnsTrueForNonDevelopmentVersion(): void
{
- /** @var CoreVersionService|AccessibleObjectInterface|MockObject $instance */
$instance = $this->getAccessibleMock(CoreVersionService::class, ['getInstalledVersion'], [], '', false);
$instance->expects(self::once())->method('getInstalledVersion')->willReturn('7.2.0');
self::assertTrue($instance->isInstalledVersionAReleasedVersion());
@@ -609,7 +606,6 @@ class CoreVersionServiceTest extends UnitTestCase
*/
public function isInstalledVersionAReleasedVersionReturnsFalseForDevelopmentVersion(): void
{
- /** @var CoreVersionService|AccessibleObjectInterface|MockObject $instance */
$instance = $this->getAccessibleMock(CoreVersionService::class, ['getInstalledVersion'], [], '', false);
$instance->expects(self::once())->method('getInstalledVersion')->willReturn('7.4-dev');
self::assertFalse($instance->isInstalledVersionAReleasedVersion());
diff --git a/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php
index 04968c72c14a..19cc921d77cb 100644
--- a/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php
@@ -18,10 +18,8 @@ declare(strict_types=1);
namespace TYPO3\CMS\Install\Tests\Unit\Service;
use org\bovigo\vfs\vfsStream;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Install\Service\EnableFileService;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -79,7 +77,6 @@ class EnableFileServiceTest extends UnitTestCase
{
$vfs = vfsStream::setup();
vfsStream::create($structure, $vfs);
- /** @var EnableFileService|AccessibleObjectInterface|MockObject $subject */
$subject = $this->getAccessibleMock(EnableFileService::class, ['dummy'], [], '', false);
Environment::initialize(
Environment::getContext(),
@@ -151,7 +148,6 @@ class EnableFileServiceTest extends UnitTestCase
{
$vfs = vfsStream::setup();
vfsStream::create($structure, $vfs);
- /** @var EnableFileService|AccessibleObjectInterface|MockObject $subject */
$subject = $this->getAccessibleMock(EnableFileService::class, ['dummy'], [], '', false);
Environment::initialize(
Environment::getContext(),
diff --git a/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php b/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
index e8e5d70ed990..2570864beec4 100644
--- a/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
+++ b/typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
@@ -34,7 +34,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\Core\Cache\FluidTemplateCache;
use TYPO3\CMS\Install\Service\Exception\ConfigurationChangedException;
use TYPO3\CMS\Install\Service\SilentConfigurationUpgradeService;
-use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
/**
@@ -87,7 +86,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function removeObsoleteLocalConfigurationSettingsIfThereAreOldSettings(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -125,7 +123,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function doNotRemoveObsoleteLocalConfigurationSettingsIfThereAreNoOldSettings(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -161,7 +158,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function doNotGenerateEncryptionKeyIfExists(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -196,7 +192,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function generateEncryptionKeyIfNotExists(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -337,7 +332,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function transferHttpSettingsIfSet(array $currentLocalConfiguration, array $newSettings, bool $localConfigurationNeedsUpdate): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -380,7 +374,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function disableImageMagickDetailSettingsIfImageMagickIsDisabled(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -426,7 +419,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function doNotDisableImageMagickDetailSettingsIfImageMagickIsEnabled(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -467,7 +459,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function setImageMagickDetailSettings(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -513,7 +504,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function doNotSetImageMagickDetailSettings(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -611,7 +601,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function migrateNonExistingLangDebug(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -645,7 +634,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
*/
public function migrateExistingLangDebug(): void
{
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -704,7 +692,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
$this->expectException(ConfigurationChangedException::class);
$this->expectExceptionCode(1379024938);
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -867,7 +854,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
$this->expectException(ConfigurationChangedException::class);
$this->expectExceptionCode(1379024938);
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
@@ -907,7 +893,6 @@ class SilentConfigurationUpgradeServiceTest extends UnitTestCase
$configurationManager->setLocalConfigurationValueByPath(Argument::cetera())->shouldNotBeCalled();
- /** @var SilentConfigurationUpgradeService|MockObject|AccessibleObjectInterface $silentConfigurationUpgradeServiceInstance */
$silentConfigurationUpgradeServiceInstance = $this->getAccessibleMock(
SilentConfigurationUpgradeService::class,
['dummy'],
diff --git a/typo3/sysext/lowlevel/Classes/Command/DeletedRecordsCommand.php b/typo3/sysext/lowlevel/Classes/Command/DeletedRecordsCommand.php
index 84a7eb11773d..fc6749bbf4b4 100644
--- a/typo3/sysext/lowlevel/Classes/Command/DeletedRecordsCommand.php
+++ b/typo3/sysext/lowlevel/Classes/Command/DeletedRecordsCommand.php
@@ -143,7 +143,6 @@ class DeletedRecordsCommand extends Command
*/
protected function findAllFlaggedRecordsInPage(int $pageId, int $depth, array $deletedRecords = []): array
{
- /** @var QueryBuilder $queryBuilderForPages */
$queryBuilderForPages = $this->connectionPool
->getQueryBuilderForTable('pages');
$queryBuilderForPages->getRestrictions()->removeAll();
diff --git a/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php b/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
index 3e5af562c639..f015579be8e0 100644
--- a/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
+++ b/typo3/sysext/lowlevel/Classes/Controller/DatabaseIntegrityController.php
@@ -387,7 +387,6 @@ class DatabaseIntegrityController
*/
protected function func_records()
{
- /** @var DatabaseIntegrityCheck $admin */
$admin = GeneralUtility::makeInstance(DatabaseIntegrityCheck::class);
$admin->genTree(0);
diff --git a/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php b/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
index 40ae5768988a..af6893b0b5d3 100644
--- a/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
+++ b/typo3/sysext/opendocs/Classes/Backend/ToolbarItems/OpendocsToolbarItem.php
@@ -174,7 +174,6 @@ class OpendocsToolbarItem implements ToolbarItemInterface
$result['table'] = $table;
$result['record'] = $record;
$result['label'] = strip_tags(htmlspecialchars_decode($document[0]));
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$uri = (string)$uriBuilder->buildUriFromRoute('record_edit') . '&' . $document[2];
$pid = (int)$document[3]['pid'];
diff --git a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
index e70abe8e8934..30b14a584868 100644
--- a/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
+++ b/typo3/sysext/recordlist/Classes/Browser/FileBrowser.php
@@ -127,7 +127,6 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
$filterObject->setAllowedFileExtensions($allowedFileExtensions);
// Set file extension filters on all storages
$storages = $backendUser->getFileStorages();
- /** @var \TYPO3\CMS\Core\Resource\ResourceStorage $storage */
foreach ($storages as $storage) {
$storage->addFileAndFolderNameFilter([$filterObject, 'filterFileList']);
}
@@ -375,7 +374,6 @@ class FileBrowser extends AbstractElementBrowser implements ElementBrowserInterf
protected function getFilesInFolder(FolderInterface $folder, array $extensionList)
{
if (!empty($extensionList)) {
- /** @var FileExtensionFilter $filter */
$filter = GeneralUtility::makeInstance(FileExtensionFilter::class);
$filter->setAllowedFileExtensions($extensionList);
$folder->setFileAndFolderNameFilters([[$filter, 'filterFileList']]);
diff --git a/typo3/sysext/recordlist/Classes/Controller/RecordListController.php b/typo3/sysext/recordlist/Classes/Controller/RecordListController.php
index 6f8e5cdbe72b..557687bb4f92 100644
--- a/typo3/sysext/recordlist/Classes/Controller/RecordListController.php
+++ b/typo3/sysext/recordlist/Classes/Controller/RecordListController.php
@@ -290,9 +290,7 @@ class RecordListController
FlashMessage::INFO
);
unset($ll);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue $defaultFlashMessageQueue */
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
}
diff --git a/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php b/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php
index eedb407ab9c9..d7afd926034f 100644
--- a/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php
+++ b/typo3/sysext/recordlist/Classes/LinkHandler/FileLinkHandler.php
@@ -193,7 +193,6 @@ class FileLinkHandler extends AbstractLinkHandler implements LinkHandlerInterfac
protected function getFolderContent(Folder $folder, $extensionList)
{
if ($extensionList !== '') {
- /** @var FileExtensionFilter $filter */
$filter = GeneralUtility::makeInstance(FileExtensionFilter::class);
$filter->setAllowedFileExtensions($extensionList);
$folder->setFileAndFolderNameFilters([[$filter, 'filterFileList']]);
diff --git a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
index 8c4fa18de0d5..64fc239573c6 100644
--- a/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
+++ b/typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
@@ -2992,7 +2992,6 @@ class DatabaseRecordList
$idList = $runtimeCache->get($hash);
if ($idList === false) {
$backendUser = $this->getBackendUserAuthentication();
- /** @var PageTreeView $tree */
$tree = GeneralUtility::makeInstance(PageTreeView::class);
$tree->init('AND ' . $perms_clause);
$tree->makeHTML = 0;
diff --git a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
index bf77116a3b9c..91755f7dda84 100644
--- a/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
+++ b/typo3/sysext/recycler/Classes/Domain/Model/DeletedRecords.php
@@ -352,7 +352,6 @@ class DeletedRecords
public function deleteData($recordsArray)
{
if (is_array($recordsArray)) {
- /** @var DataHandler $tce **/
$tce = GeneralUtility::makeInstance(DataHandler::class);
$tce->start([], []);
$tce->disableDeleteClause();
diff --git a/typo3/sysext/redirects/Classes/Controller/ManagementController.php b/typo3/sysext/redirects/Classes/Controller/ManagementController.php
index 79af81079d09..2bbd3da9289c 100644
--- a/typo3/sysext/redirects/Classes/Controller/ManagementController.php
+++ b/typo3/sysext/redirects/Classes/Controller/ManagementController.php
@@ -153,7 +153,6 @@ class ManagementController
*/
protected function getButtons(): void
{
- /** @var UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$buttonBar = $this->moduleTemplate->getDocHeaderComponent()->getButtonBar();
diff --git a/typo3/sysext/redirects/Tests/Unit/Service/RedirectServiceTest.php b/typo3/sysext/redirects/Tests/Unit/Service/RedirectServiceTest.php
index 2bddfe845f2b..3f5ab6f4aec7 100644
--- a/typo3/sysext/redirects/Tests/Unit/Service/RedirectServiceTest.php
+++ b/typo3/sysext/redirects/Tests/Unit/Service/RedirectServiceTest.php
@@ -581,7 +581,6 @@ class RedirectServiceTest extends UnitTestCase
*/
public function getTargetUrlRespectsAdditionalParametersFromTypolink(): void
{
- /** @var RedirectService $redirectService */
$redirectService = $this->getAccessibleMock(
RedirectService::class,
['getUriFromCustomLinkDetails'],
diff --git a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
index b5ce7a4cbd10..ffaaa51223a3 100644
--- a/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/ConfigurationStatus.php
@@ -20,7 +20,6 @@ use TYPO3\CMS\Backend\Utility\BackendUtility;
use TYPO3\CMS\Core\Cache\Backend\MemcachedBackend;
use TYPO3\CMS\Core\Core\Environment;
use TYPO3\CMS\Core\Database\ConnectionPool;
-use TYPO3\CMS\Core\Database\Query\QueryBuilder;
use TYPO3\CMS\Core\Localization\LanguageService;
use TYPO3\CMS\Core\Registry;
use TYPO3\CMS\Core\Utility\GeneralUtility;
@@ -76,7 +75,7 @@ class ConfigurationStatus implements StatusProviderInterface
$registry = GeneralUtility::makeInstance(Registry::class);
$lastRefIndexUpdate = $registry->get('core', 'sys_refindex_lastUpdate');
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
+
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
if (!$count && $lastRefIndexUpdate) {
$value = $this->getLanguageService()->getLL('status_empty');
@@ -232,7 +231,6 @@ class ConfigurationStatus implements StatusProviderInterface
$charset = '';
$connection = GeneralUtility::makeInstance(ConnectionPool::class)
->getConnectionByName(ConnectionPool::DEFAULT_CONNECTION_NAME);
- /** @var QueryBuilder $queryBuilder */
$queryBuilder = $connection->createQueryBuilder();
$defaultDatabaseCharset = (string)$queryBuilder->select('DEFAULT_CHARACTER_SET_NAME')
->from('information_schema.SCHEMATA')
diff --git a/typo3/sysext/reports/Classes/Report/Status/FalStatus.php b/typo3/sysext/reports/Classes/Report/Status/FalStatus.php
index ef7575be03a1..c909915e0547 100644
--- a/typo3/sysext/reports/Classes/Report/Status/FalStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/FalStatus.php
@@ -18,6 +18,7 @@ namespace TYPO3\CMS\Reports\Report\Status;
use TYPO3\CMS\Core\Database\Connection;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Resource\StorageRepository;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Reports\Status as ReportStatus;
@@ -54,12 +55,11 @@ class FalStatus implements StatusProviderInterface
$message = '';
$severity = ReportStatus::OK;
- /** @var StorageRepository $storageRepository */
$storageRepository = GeneralUtility::makeInstance(StorageRepository::class);
$storageObjects = $storageRepository->findAll();
$storages = [];
- /** @var \TYPO3\CMS\Core\Resource\ResourceStorage $storageObject */
+ /** @var ResourceStorage $storageObject */
foreach ($storageObjects as $storageObject) {
// We only check missing files for storages that are online
diff --git a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
index ce06b70dc5ac..654ab07da32f 100644
--- a/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
+++ b/typo3/sysext/reports/Classes/Report/Status/SecurityStatus.php
@@ -80,7 +80,6 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
$message = '';
$severity = ReportStatus::OK;
- /** @var \TYPO3\CMS\Core\Http\NormalizedParams $normalizedParams */
$normalizedParams = $request->getAttribute('normalizedParams');
if (!$normalizedParams->isHttps()) {
@@ -98,7 +97,6 @@ class SecurityStatus implements RequestAwareStatusProviderInterface
*/
protected function getLockSslStatus(ServerRequestInterface $request): ?ReportStatus
{
- /** @var \TYPO3\CMS\Core\Http\NormalizedParams $normalizedParams */
$normalizedParams = $request->getAttribute('normalizedParams');
if ($normalizedParams->isHttps()) {
diff --git a/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php b/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
index 3973fb7c6594..9b063874cd19 100644
--- a/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
+++ b/typo3/sysext/reports/Classes/Report/Status/WarningMessagePostProcessor.php
@@ -40,7 +40,6 @@ class WarningMessagePostProcessor
return;
}
// Get highest severity
- /** @var Registry $registry */
$registry = GeneralUtility::makeInstance(Registry::class);
$highestSeverity = $registry->get('tx_reports', 'status.highestSeverity', null);
if ($highestSeverity !== null) {
diff --git a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
index 598202338a08..eed357086f7e 100644
--- a/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
+++ b/typo3/sysext/reports/Classes/Task/SystemStatusUpdateTask.php
@@ -55,9 +55,7 @@ class SystemStatusUpdateTask extends AbstractTask
*/
public function execute()
{
- /** @var Registry $registry */
$registry = GeneralUtility::makeInstance(Registry::class);
- /** @var \TYPO3\CMS\Reports\Report\Status\Status $statusReport */
$statusReport = GeneralUtility::makeInstance(\TYPO3\CMS\Reports\Report\Status\Status::class);
$systemStatus = $statusReport->getDetailedSystemStatus();
$highestSeverity = $statusReport->getHighestSeverity($systemStatus);
diff --git a/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php b/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
index 9868e827fd96..e4ce496bdcd2 100644
--- a/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
+++ b/typo3/sysext/rte_ckeditor/Classes/Controller/BrowseLinksController.php
@@ -131,7 +131,6 @@ class BrowseLinksController extends AbstractLinkBrowserController
$tcaFieldConf['richtextConfiguration'] = $queryParameters['P']['richtextConfigurationName'];
}
- /** @var Richtext $richtextConfigurationProvider */
$richtextConfigurationProvider = GeneralUtility::makeInstance(Richtext::class);
$this->thisConfig = $richtextConfigurationProvider->getConfiguration(
$this->parameters['table'],
diff --git a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
index 9223d4a82ce3..7223c20b20b4 100644
--- a/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
+++ b/typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
@@ -556,7 +556,7 @@ class SchedulerModuleController
}
// Get the task object
- /** @var \TYPO3\CMS\Scheduler\Task\AbstractTask $task */
+ /** @var AbstractTask $task */
$task = unserialize($taskRecord['serialized_task_object']);
// Set some task information
@@ -907,7 +907,7 @@ class SchedulerModuleController
$isRunning = false;
$showAsDisabled = false;
// Restore the serialized task and pass it a reference to the scheduler object
- /** @var \TYPO3\CMS\Scheduler\Task\AbstractTask|ProgressProviderInterface $task */
+ /** @var AbstractTask|ProgressProviderInterface $task */
$exceptionWithClass = false;
$task = null;
try {
@@ -1068,7 +1068,7 @@ class SchedulerModuleController
if (!empty($this->submittedData['uid'])) {
try {
$taskRecord = $this->scheduler->fetchTaskRecord($this->submittedData['uid']);
- /** @var \TYPO3\CMS\Scheduler\Task\AbstractTask $task */
+ /** @var AbstractTask $task */
$task = unserialize($taskRecord['serialized_task_object']);
} catch (\OutOfBoundsException $e) {
// If the task could not be fetched, issue an error message
diff --git a/typo3/sysext/scheduler/Classes/Execution.php b/typo3/sysext/scheduler/Classes/Execution.php
index 4d2752972bd4..43e2c4e03871 100644
--- a/typo3/sysext/scheduler/Classes/Execution.php
+++ b/typo3/sysext/scheduler/Classes/Execution.php
@@ -250,7 +250,6 @@ class Execution
*/
public function getNextCronExecution()
{
- /** @var \TYPO3\CMS\Scheduler\CronCommand\CronCommand $cronCmd */
$cronCmd = GeneralUtility::makeInstance(CronCommand::class, $this->getCronCmd());
$cronCmd->calculateNextValue();
return $cronCmd->getTimestamp();
diff --git a/typo3/sysext/scheduler/Classes/Scheduler.php b/typo3/sysext/scheduler/Classes/Scheduler.php
index 55aef57a7029..3d5e60638eba 100644
--- a/typo3/sysext/scheduler/Classes/Scheduler.php
+++ b/typo3/sysext/scheduler/Classes/Scheduler.php
@@ -217,7 +217,6 @@ class Scheduler implements SingletonInterface
if ($type !== 'manual' && $type !== 'cli-by-id') {
$type = 'cron';
}
- /** @var Registry $registry */
$registry = GeneralUtility::makeInstance(Registry::class);
$runInformation = ['start' => $GLOBALS['EXEC_TIME'], 'end' => time(), 'type' => $type];
$registry->set('tx_scheduler', 'lastRun', $runInformation);
diff --git a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
index 546d316573d7..d8a77b9c5f5b 100644
--- a/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
+++ b/typo3/sysext/scheduler/Classes/Task/AbstractTask.php
@@ -311,7 +311,6 @@ abstract class AbstractTask implements LoggerAwareInterface
*/
public function registerSingleExecution($timestamp)
{
- /** @var Execution $execution */
$execution = GeneralUtility::makeInstance(Execution::class);
$execution->setStart($timestamp);
$execution->setInterval(0);
@@ -334,7 +333,6 @@ abstract class AbstractTask implements LoggerAwareInterface
*/
public function registerRecurringExecution($start, $interval, $end = 0, $multiple = false, $cron_cmd = '')
{
- /** @var Execution $execution */
$execution = GeneralUtility::makeInstance(Execution::class);
// Set general values
$execution->setStart($start);
diff --git a/typo3/sysext/scheduler/Classes/Task/ExecuteSchedulableCommandAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/ExecuteSchedulableCommandAdditionalFieldProvider.php
index 916c9e653e89..9e00008a5fed 100644
--- a/typo3/sysext/scheduler/Classes/Task/ExecuteSchedulableCommandAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/ExecuteSchedulableCommandAdditionalFieldProvider.php
@@ -104,7 +104,6 @@ class ExecuteSchedulableCommandAdditionalFieldProvider implements AdditionalFiel
$command = $this->schedulableCommands[$submittedData['task_executeschedulablecommand']['command']];
- /** @var FlashMessageService $flashMessageService */
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
$hasErrors = false;
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
index de0daf90473e..fe66c2099210 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageExtractionAdditionalFieldProvider.php
@@ -17,6 +17,7 @@ namespace TYPO3\CMS\Scheduler\Task;
use TYPO3\CMS\Core\Resource\Index\ExtractorInterface;
use TYPO3\CMS\Core\Resource\Index\ExtractorRegistry;
+use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Resource\StorageRepository;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
@@ -58,7 +59,7 @@ class FileStorageExtractionAdditionalFieldProvider implements AdditionalFieldPro
*/
protected function getAllStoragesField(FileStorageExtractionTask $task = null)
{
- /** @var \TYPO3\CMS\Core\Resource\ResourceStorage[] $storages */
+ /** @var ResourceStorage[] $storages */
$storages = GeneralUtility::makeInstance(StorageRepository::class)->findAll();
$options = [];
foreach ($storages as $storage) {
diff --git a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
index 38e16ca6baa8..5d38293764f5 100644
--- a/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
+++ b/typo3/sysext/scheduler/Classes/Task/FileStorageIndexingAdditionalFieldProvider.php
@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Scheduler\Task;
+use TYPO3\CMS\Core\Resource\ResourceStorage;
use TYPO3\CMS\Core\Resource\StorageRepository;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
@@ -55,7 +56,7 @@ class FileStorageIndexingAdditionalFieldProvider implements AdditionalFieldProvi
*/
protected function getAllStoragesField(FileStorageIndexingTask $task = null, $taskInfo)
{
- /** @var \TYPO3\CMS\Core\Resource\ResourceStorage[] $storages */
+ /** @var ResourceStorage[] $storages */
$storages = GeneralUtility::makeInstance(StorageRepository::class)->findAll();
$options = [];
foreach ($storages as $storage) {
diff --git a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
index ab637de920af..52e881fe7c5f 100644
--- a/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
+++ b/typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
@@ -17,7 +17,6 @@ declare(strict_types=1);
namespace TYPO3\CMS\Scheduler\Tests\Unit\Task;
-use PHPUnit\Framework\MockObject\MockObject;
use TYPO3\CMS\Core\Cache\Backend\AbstractBackend;
use TYPO3\CMS\Core\Cache\Backend\NullBackend;
use TYPO3\CMS\Core\Cache\CacheManager;
@@ -53,7 +52,6 @@ class CachingFrameworkGarbageCollectionTest extends UnitTestCase
'backend' => AbstractBackend::class,
],
];
- /** @var CachingFrameworkGarbageCollectionTask|MockObject $subject */
$subject = $this->getMockBuilder(CachingFrameworkGarbageCollectionTask::class)
->addMethods(['dummy'])
->disableOriginalConstructor()
@@ -82,7 +80,6 @@ class CachingFrameworkGarbageCollectionTest extends UnitTestCase
'frontend' => 'foo',
],
];
- /** @var CachingFrameworkGarbageCollectionTask|MockObject $subject */
$subject = $this->getMockBuilder(CachingFrameworkGarbageCollectionTask::class)
->addMethods(['dummy'])
->disableOriginalConstructor()
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
index 1656a1e0dc45..2f9182ea6fa6 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateModuleController.php
@@ -690,7 +690,6 @@ page.10.value = HELLO WORLD!
FlashMessage::ERROR
);
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue $defaultFlashMessageQueue */
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
} elseif (is_callable([$this->extObj, 'main'])) {
diff --git a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
index f62d2e2216ea..ec510108889a 100644
--- a/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
+++ b/typo3/sysext/tstemplate/Classes/Controller/TypoScriptTemplateObjectBrowserModuleFunctionController.php
@@ -288,7 +288,6 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController
$urlParameters = [
'id' => $this->id,
];
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$aHref = (string)$uriBuilder->buildUriFromRoute('web_ts', $urlParameters);
$assigns['moduleUrl'] = (string)$uriBuilder->buildUriFromRoute('web_ts', $urlParameters);
@@ -341,7 +340,6 @@ class TypoScriptTemplateObjectBrowserModuleFunctionController
$urlParameters = [
'id' => $this->id,
];
- /** @var \TYPO3\CMS\Backend\Routing\UriBuilder $uriBuilder */
$uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$aHref = (string)$uriBuilder->buildUriFromRoute('web_ts', $urlParameters);
// Parser Errors:
diff --git a/typo3/sysext/workspaces/Classes/Controller/Remote/RemoteServer.php b/typo3/sysext/workspaces/Classes/Controller/Remote/RemoteServer.php
index 9cf1b139651e..c6ec2c8d6aec 100644
--- a/typo3/sysext/workspaces/Classes/Controller/Remote/RemoteServer.php
+++ b/typo3/sysext/workspaces/Classes/Controller/Remote/RemoteServer.php
@@ -407,7 +407,6 @@ class RemoteServer
protected function getCommentsForRecord(array $historyEntries, array $additionalChangesFromLog): array
{
$allStageChanges = [];
- /** @var Avatar $avatar */
$avatar = GeneralUtility::makeInstance(Avatar::class);
foreach ($historyEntries as $entry) {
diff --git a/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php b/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php
index 75217b1ec7ae..7f1e6db393ec 100644
--- a/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php
+++ b/typo3/sysext/workspaces/Classes/Hook/BackendUtilityHook.php
@@ -67,10 +67,10 @@ class BackendUtilityHook
$stageName = $stages->getStageTitle($record['t3ver_stage']);
$editingName = $stages->getStageTitle(StagesService::STAGE_EDIT_ID);
$message = $this->getLanguageService()->sL('LLL:EXT:workspaces/Resources/Private/Language/locallang.xlf:info.elementAlreadyModified');
+
$flashMessage = GeneralUtility::makeInstance(FlashMessage::class, sprintf($message, $stageName, $editingName), '', FlashMessage::INFO, true);
- /** @var FlashMessageService $flashMessageService */
+
$flashMessageService = GeneralUtility::makeInstance(FlashMessageService::class);
- /** @var \TYPO3\CMS\Core\Messaging\FlashMessageQueue $defaultFlashMessageQueue */
$defaultFlashMessageQueue = $flashMessageService->getMessageQueueByIdentifier();
$defaultFlashMessageQueue->enqueue($flashMessage);
}
diff --git a/typo3/sysext/workspaces/Classes/Middleware/WorkspacePreview.php b/typo3/sysext/workspaces/Classes/Middleware/WorkspacePreview.php
index 7d92256f7082..3faa9c4c213c 100644
--- a/typo3/sysext/workspaces/Classes/Middleware/WorkspacePreview.php
+++ b/typo3/sysext/workspaces/Classes/Middleware/WorkspacePreview.php
@@ -77,7 +77,6 @@ class WorkspacePreview implements MiddlewareInterface
$addInformationAboutDisabledCache = false;
$keyword = $this->getPreviewInputCode($request);
$setCookieOnCurrentRequest = false;
- /** @var NormalizedParams $normalizedParams */
$normalizedParams = $request->getAttribute('normalizedParams');
$context = GeneralUtility::makeInstance(Context::class);
--
GitLab