[TASK] Use namespaced MockObject interface in tests 96/62096/4
authorAlexander Schnitzler <git@alexanderschnitzler.de>
Thu, 24 Oct 2019 12:43:46 +0000 (14:43 +0200)
committerDaniel Goerz <daniel.goerz@posteo.de>
Fri, 25 Oct 2019 09:14:39 +0000 (11:14 +0200)
This patch replaces the usages of interface
\PHPUnit_Framework_MockObject_MockObject with
\PHPUnit\Framework\MockObject\MockObject

Releases: master
Resolves: #89500
Change-Id: I52dce97bf4bd9b5159d806a03afc4021381c07e8
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/62096
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Daniel Goerz <daniel.goerz@posteo.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Reviewed-by: Daniel Goerz <daniel.goerz@posteo.de>
141 files changed:
typo3/sysext/backend/Tests/Functional/Configuration/TypoScript/ConditionMatching/ConditionMatcherTest.php
typo3/sysext/backend/Tests/Functional/Controller/Page/LocalizationControllerTest.php
typo3/sysext/backend/Tests/Unit/Controller/File/FileControllerTest.php
typo3/sysext/backend/Tests/Unit/Controller/LoginControllerTest.php
typo3/sysext/backend/Tests/Unit/Form/Element/AbstractFormElementTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseDefaultLanguagePageRowTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseEditRowTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseLanguageRowsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabasePageLanguageOverlayRowsTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseParentPageRowTest.php
typo3/sysext/backend/Tests/Unit/Form/FormDataProvider/DatabaseRecordTypeValueTest.php
typo3/sysext/backend/Tests/Unit/Form/InlineStackProcessorTest.php
typo3/sysext/backend/Tests/Unit/Form/NodeFactoryTest.php
typo3/sysext/backend/Tests/Unit/View/BackendLayoutViewTest.php
typo3/sysext/belog/Tests/Unit/Domain/Repository/LogEntryRepositoryTest.php
typo3/sysext/beuser/Tests/Unit/Controller/BackendUserControllerTest.php
typo3/sysext/core/Tests/Functional/Collection/RecordCollectionRepositoryTest.php
typo3/sysext/core/Tests/Unit/Authentication/BackendUserAuthenticationTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/ApcuBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/Backend/WincacheBackendTest.php
typo3/sysext/core/Tests/Unit/Cache/CacheManagerTest.php
typo3/sysext/core/Tests/Unit/Command/SendEmailCommandTest.php
typo3/sysext/core/Tests/Unit/Configuration/ConfigurationManagerTest.php
typo3/sysext/core/Tests/Unit/Configuration/FlexForm/FlexFormToolsTest.php
typo3/sysext/core/Tests/Unit/Configuration/TypoScript/ConditionMatching/AbstractConditionMatcherTest.php
typo3/sysext/core/Tests/Unit/Core/ClassLoadingInformationGeneratorTest.php
typo3/sysext/core/Tests/Unit/DataHandling/DataHandlerTest.php
typo3/sysext/core/Tests/Unit/Database/ConnectionTest.php
typo3/sysext/core/Tests/Unit/Database/Query/BulkInsertTest.php
typo3/sysext/core/Tests/Unit/Database/Schema/ConnectionMigratorTest.php
typo3/sysext/core/Tests/Unit/Error/DebugExceptionHandlerTest.php
typo3/sysext/core/Tests/Unit/Error/ProductionExceptionHandlerTest.php
typo3/sysext/core/Tests/Unit/FormProtection/AbstractFormProtectionTest.php
typo3/sysext/core/Tests/Unit/FormProtection/BackendFormProtectionTest.php
typo3/sysext/core/Tests/Unit/FormProtection/InstallToolFormProtectionTest.php
typo3/sysext/core/Tests/Unit/LinkHandling/FileLinkHandlerTest.php
typo3/sysext/core/Tests/Unit/LinkHandling/FolderLinkHandlerTest.php
typo3/sysext/core/Tests/Unit/LinkHandling/LegacyLinkNotationConverterTest.php
typo3/sysext/core/Tests/Unit/Locking/LockFactoryTest.php
typo3/sysext/core/Tests/Unit/Locking/SimpleLockStrategyTest.php
typo3/sysext/core/Tests/Unit/Log/LoggerTest.php
typo3/sysext/core/Tests/Unit/Log/Processor/IntrospectionProcessorTest.php
typo3/sysext/core/Tests/Unit/Messaging/FlashMessageServiceTest.php
typo3/sysext/core/Tests/Unit/Package/PackageManagerTest.php
typo3/sysext/core/Tests/Unit/Page/PageRendererTest.php
typo3/sysext/core/Tests/Unit/Resource/AbstractFileTest.php
typo3/sysext/core/Tests/Unit/Resource/BaseTestCase.php
typo3/sysext/core/Tests/Unit/Resource/Driver/AbstractHierarchicalFilesystemDriverTest.php
typo3/sysext/core/Tests/Unit/Resource/Driver/LocalDriverTest.php
typo3/sysext/core/Tests/Unit/Resource/FileReferenceTest.php
typo3/sysext/core/Tests/Unit/Resource/Filter/FileNameFilterTest.php
typo3/sysext/core/Tests/Unit/Resource/FolderTest.php
typo3/sysext/core/Tests/Unit/Resource/Index/ExtractorRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/OnlineMedia/Helpers/VimeoHelperTest.php
typo3/sysext/core/Tests/Unit/Resource/ProcessedFileTest.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/RendererRegistryTest.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/VimeoRendererTest.php
typo3/sysext/core/Tests/Unit/Resource/Rendering/YouTubeRendererTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceFactoryTest.php
typo3/sysext/core/Tests/Unit/Resource/ResourceStorageTest.php
typo3/sysext/core/Tests/Unit/Resource/TextExtraction/TextExtractorRegistryTest.php
typo3/sysext/core/Tests/Unit/Service/DependencyOrderingServiceTest.php
typo3/sysext/core/Tests/Unit/Tree/TableConfiguration/DatabaseTreeDataProviderTest.php
typo3/sysext/core/Tests/Unit/TypoScript/TemplateServiceTest.php
typo3/sysext/core/Tests/Unit/Utility/ExtensionManagementUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/GeneralUtilityTest.php
typo3/sysext/core/Tests/Unit/Utility/RootlineUtilityTest.php
typo3/sysext/extbase/Tests/Functional/Validation/ValidatorResolverTest.php
typo3/sysext/extbase/Tests/Unit/Configuration/AbstractConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Configuration/BackendConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Configuration/FrontendConfigurationManagerTest.php
typo3/sysext/extbase/Tests/Unit/Error/ResultTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Controller/ActionControllerTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/ResponseTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Web/CacheHashEnforcerTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Web/RequestBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Mvc/Web/Routing/UriBuilderTest.php
typo3/sysext/extbase/Tests/Unit/Object/Container/ContainerTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/BackendTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapFactoryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Mapper/DataMapperTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryFactoryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryResultTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/Generic/Storage/Typo3DbQueryParserTest.php
typo3/sysext/extbase/Tests/Unit/Persistence/RepositoryTest.php
typo3/sysext/extbase/Tests/Unit/Property/PropertyMapperTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/ObjectConverterTest.php
typo3/sysext/extbase/Tests/Unit/Property/TypeConverter/PersistentObjectConverterTest.php
typo3/sysext/extbase/Tests/Unit/Service/ImageScriptServiceTest.php
typo3/sysext/extbase/Tests/Unit/SignalSlot/DispatcherTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/AlphanumericValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/CollectionValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/ConjunctionValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/EmailAddressValidatorTest.php
typo3/sysext/extbase/Tests/Unit/Validation/Validator/GenericObjectValidatorTest.php
typo3/sysext/extensionmanager/Tests/Unit/Domain/Model/DownloadQueueTest.php
typo3/sysext/extensionmanager/Tests/Unit/Domain/Repository/RepositoryRepositoryTest.php
typo3/sysext/extensionmanager/Tests/Unit/Report/ExtensionStatusTest.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/DependencyUtilityTest.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/FileHandlingUtilityTest.php
typo3/sysext/extensionmanager/Tests/Unit/Utility/InstallUtilityTest.php
typo3/sysext/fluid/Tests/Unit/Core/Widget/AbstractWidgetControllerTest.php
typo3/sysext/fluid/Tests/Unit/View/AbstractTemplateViewTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/LinkViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Be/UriViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/Select/OptionViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Form/SelectViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/CropViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Format/DateViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Link/TypolinkViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Uri/TypolinkViewHelperTest.php
typo3/sysext/fluid/Tests/Unit/ViewHelpers/Widget/Controller/PaginateControllerTest.php
typo3/sysext/form/Tests/Unit/Domain/Finishers/ClosureFinisherTest.php
typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractFormElementTest.php
typo3/sysext/form/Tests/Unit/Domain/FormElements/AbstractSectionTest.php
typo3/sysext/form/Tests/Unit/Mvc/Property/PropertyMappingConfigurationTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/CaseContentObjectTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/ContentObjectRendererTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/FilesContentObjectTest.php
typo3/sysext/frontend/Tests/Unit/ContentObject/FluidTemplateContentObjectTest.php
typo3/sysext/frontend/Tests/Unit/Controller/TypoScriptFrontendControllerTest.php
typo3/sysext/frontend/Tests/Unit/Processor/GalleryProcessorTest.php
typo3/sysext/frontend/Tests/Unit/Typolink/AbstractTypolinkBuilderTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/AbstractNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/DirectoryNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/FileNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/LinkNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/RootNodeTest.php
typo3/sysext/install/Tests/Unit/FolderStructure/StructureFacadeTest.php
typo3/sysext/install/Tests/Unit/Service/CoreUpdateServiceTest.php
typo3/sysext/install/Tests/Unit/Service/CoreVersionServiceTest.php
typo3/sysext/install/Tests/Unit/Service/EnableFileServiceTest.php
typo3/sysext/install/Tests/Unit/Service/SilentConfigurationUpgradeServiceTest.php
typo3/sysext/recordlist/Tests/Unit/RecordList/DatabaseRecordListTest.php
typo3/sysext/recycler/Tests/Unit/Task/CleanerFieldProviderTest.php
typo3/sysext/recycler/Tests/Unit/Task/CleanerTaskTest.php
typo3/sysext/scheduler/Tests/Unit/Task/CachingFrameworkGarbageCollectionTest.php
typo3/sysext/t3editor/Tests/Unit/Registry/AddonRegistryTest.php
typo3/sysext/t3editor/Tests/Unit/Registry/ModeRegistryTest.php

index cfe006c..9a57e5e 100644 (file)
@@ -28,7 +28,7 @@ use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase;
 class ConditionMatcherTest extends FunctionalTestCase
 {
     /**
-     * @var ConditionMatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var ConditionMatcher|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
index e3398f3..5194791 100644 (file)
@@ -32,7 +32,7 @@ class LocalizationControllerTest extends AbstractDataHandlerActionTestCase
     protected $assertionDataSetDirectory = 'typo3/sysext/backend/Tests/Functional/Controller/Page/Localization/CSV/DataSet/';
 
     /**
-     * @var LocalizationController|\PHPUnit_Framework_MockObject_MockObject
+     * @var LocalizationController|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index b84c54e..a67fb7f 100644 (file)
@@ -30,27 +30,27 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class FileControllerTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\Resource\File|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Core\Resource\File|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $fileResourceMock;
 
     /**
-     * @var \TYPO3\CMS\Core\Resource\Folder|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Core\Resource\Folder|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $folderResourceMock;
 
     /**
-     * @var \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Core\Utility\File\ExtendedFileUtility|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockFileProcessor;
 
     /**
-     * @var ServerRequest|\PHPUnit_Framework_MockObject_MockObject
+     * @var ServerRequest|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $request;
 
     /**
-     * @var Response|\PHPUnit_Framework_MockObject_MockObject
+     * @var Response|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $response;
 
index d183ca4..88ff9e0 100644 (file)
@@ -39,7 +39,7 @@ class LoginControllerTest extends UnitTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var LoginController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var LoginController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $loginControllerMock;
 
index 6f96491..ba93033 100644 (file)
@@ -276,7 +276,7 @@ class AbstractFormElementTest extends UnitTestCase
      */
     public function formatValueWithGivenConfiguration($config, $itemValue, $expectedResult)
     {
-        /** @var AbstractFormElement|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var AbstractFormElement|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(AbstractFormElement::class, ['render'], [], '', false);
         $timezoneBackup = date_default_timezone_get();
         date_default_timezone_set('UTC');
index 5ab73cd..1c0a624 100644 (file)
@@ -24,7 +24,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class DatabaseDefaultLanguagePageRowTest extends UnitTestCase
 {
     /**
-     * @var DatabaseDefaultLanguagePageRow|\PHPUnit_Framework_MockObject_MockObject
+     * @var DatabaseDefaultLanguagePageRow|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index 169977f..cd8006d 100644 (file)
@@ -24,7 +24,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class DatabaseEditRowTest extends UnitTestCase
 {
     /**
-     * @var DatabaseEditRow|\PHPUnit_Framework_MockObject_MockObject
+     * @var DatabaseEditRow|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index 63a9302..df0de76 100644 (file)
@@ -28,7 +28,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class DatabaseLanguageRowsTest extends UnitTestCase
 {
     /**
-     * @var DatabaseLanguageRows|\PHPUnit_Framework_MockObject_MockObject
+     * @var DatabaseLanguageRows|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index c7b1284..f7f58c8 100644 (file)
@@ -23,7 +23,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class DatabasePageLanguageOverlayRowsTest extends UnitTestCase
 {
     /**
-     * @var DatabasePageLanguageOverlayRows|\PHPUnit_Framework_MockObject_MockObject
+     * @var DatabasePageLanguageOverlayRows|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index c9e13de..69ba5db 100644 (file)
@@ -23,7 +23,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class DatabaseParentPageRowTest extends UnitTestCase
 {
     /**
-     * @var DatabaseParentPageRow|\PHPUnit_Framework_MockObject_MockObject
+     * @var DatabaseParentPageRow|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index bd6a47f..ca3946f 100644 (file)
@@ -23,7 +23,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class DatabaseRecordTypeValueTest extends UnitTestCase
 {
     /**
-     * @var DatabaseRecordTypeValue|\PHPUnit_Framework_MockObject_MockObject
+     * @var DatabaseRecordTypeValue|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index 10aa4c4..51cc1ca 100644 (file)
@@ -274,7 +274,7 @@ class InlineStackProcessorTest extends UnitTestCase
      */
     public function initializeByParsingDomObjectIdStringParsesStructureString($string, array $expectedInlineStructure, array $_)
     {
-        /** @var InlineStackProcessor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var InlineStackProcessor|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(InlineStackProcessor::class, ['dummy']);
         $subject->initializeByParsingDomObjectIdString($string);
         $structure = $subject->_get('inlineStructure');
@@ -287,7 +287,7 @@ class InlineStackProcessorTest extends UnitTestCase
      */
     public function getCurrentStructureFormPrefixReturnsExceptedStringAfterInitializationByStructureString($string, array $_, array $expectedFormName)
     {
-        /** @var InlineStackProcessor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var InlineStackProcessor|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = new InlineStackProcessor;
         $subject->initializeByParsingDomObjectIdString($string);
         self::assertEquals($expectedFormName['form'], $subject->getCurrentStructureFormPrefix());
@@ -299,7 +299,7 @@ class InlineStackProcessorTest extends UnitTestCase
      */
     public function getCurrentStructureDomObjectIdPrefixReturnsExceptedStringAfterInitializationByStructureString($string, array $_, array $expectedFormName)
     {
-        /** @var InlineStackProcessor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var InlineStackProcessor|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = new InlineStackProcessor;
         $subject->initializeByParsingDomObjectIdString($string);
         self::assertEquals($expectedFormName['object'], $subject->getCurrentStructureDomObjectIdPrefix('pageId'));
index db4bb1c..57c5bf6 100644 (file)
@@ -274,7 +274,7 @@ class NodeFactoryTest extends UnitTestCase
         $this->expectException(Exception::class);
         $this->expectExceptionCode(1431872546);
         $mockNode = new \stdClass();
-        /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
+        /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
         $mockSubject = $this->getMockBuilder(NodeFactory::class)
             ->setMethods(['instantiate'])
             ->disableOriginalConstructor()
@@ -346,7 +346,7 @@ class NodeFactoryTest extends UnitTestCase
             ],
         ];
         $mockNode = $this->createMock(NodeInterface::class);
-        /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
+        /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
         $mockSubject = $this->getMockBuilder(NodeFactory::class)
             ->setMethods(['instantiate'])
             ->getMock();
@@ -373,7 +373,7 @@ class NodeFactoryTest extends UnitTestCase
             ],
         ];
         $mockNode = $this->createMock(NodeInterface::class);
-        /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
+        /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
         $mockSubject = $this->getMockBuilder(NodeFactory::class)
             ->setMethods(['instantiate'])
             ->getMock();
@@ -400,7 +400,7 @@ class NodeFactoryTest extends UnitTestCase
             ],
         ];
         $mockNode = $this->createMock(NodeInterface::class);
-        /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
+        /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
         $mockSubject = $this->getMockBuilder(NodeFactory::class)
             ->setMethods(['instantiate'])
             ->getMock();
@@ -425,7 +425,7 @@ class NodeFactoryTest extends UnitTestCase
         ];
         $mockResolver = $this->getMockBuilder(\stdClass::class)->getMock();
 
-        /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
+        /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
         $mockSubject = $this->getMockBuilder(NodeFactory::class)
             ->setMethods(['instantiate'])
             ->getMock();
@@ -463,7 +463,7 @@ class NodeFactoryTest extends UnitTestCase
         $mockResolver1 = $this->createMock(NodeResolverInterface::class);
         $mockResolver2 = $this->createMock(NodeResolverInterface::class);
 
-        /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
+        /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
         $mockSubject = $this->getMockBuilder(NodeFactory::class)
             ->setMethods(['instantiate'])
             ->getMock();
@@ -503,7 +503,7 @@ class NodeFactoryTest extends UnitTestCase
         $mockResolver1 = $this->createMock(NodeResolverInterface::class);
         $mockResolver2 = $this->createMock(NodeResolverInterface::class);
 
-        /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
+        /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
         $mockSubject = $this->getMockBuilder(NodeFactory::class)
             ->setMethods(['instantiate'])
             ->getMock();
@@ -538,7 +538,7 @@ class NodeFactoryTest extends UnitTestCase
         $mockResolver1 = $this->createMock(NodeResolverInterface::class);
         $mockResolver1->expects(self::once())->method('resolve')->willReturn('fooNodeClass');
 
-        /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
+        /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
         $mockSubject = $this->getMockBuilder(NodeFactory::class)
             ->setMethods(['instantiate'])
             ->getMock();
@@ -577,7 +577,7 @@ class NodeFactoryTest extends UnitTestCase
         $mockResolver1 = $this->createMock(NodeResolverInterface::class);
         $mockResolver1->expects(self::once())->method('resolve')->willReturn('fooNodeClass');
 
-        /** @var NodeFactory|\PHPUnit_Framework_MockObject_MockObject $mockSubject */
+        /** @var NodeFactory|\PHPUnit\Framework\MockObject\MockObject $mockSubject */
         $mockSubject = $this->getMockBuilder(NodeFactory::class)
             ->setMethods(['instantiate'])
             ->getMock();
index 021e143..bfe65ce 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class BackendLayoutViewTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Backend\View\BackendLayoutView|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Backend\View\BackendLayoutView|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $backendLayoutView;
 
index 4f0c1cc..1ce2dd4 100644 (file)
@@ -31,7 +31,7 @@ class LogEntryRepositoryTest extends UnitTestCase
         $objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
         $objectManager->expects(self::any())->method('get')->with(\TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface::class)->willReturn($querySettings);
         $querySettings->expects(self::atLeastOnce())->method('setRespectStoragePage')->with(false);
-        /** @var \TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var \TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(\TYPO3\CMS\Belog\Domain\Repository\LogEntryRepository::class)
             ->setMethods(['setDefaultQuerySettings', 'getBackendUsers'])
             ->setConstructorArgs([$objectManager])
index 41a57f6..68c79d0 100644 (file)
@@ -25,7 +25,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class BackendUserControllerTest extends UnitTestCase
 {
     /**
-     * @var BackendUserController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var BackendUserController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
index 8821838..40af7d0 100644 (file)
@@ -26,7 +26,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
 class RecordCollectionRepositoryTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
-     * @var RecordCollectionRepository|\PHPUnit_Framework_MockObject_MockObject
+     * @var RecordCollectionRepository|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index 77f62d7..843b592 100644 (file)
@@ -108,7 +108,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
         ];
         $GLOBALS['BE_USER']->setLogger(new NullLogger());
 
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['dummy'])
             ->disableOriginalConstructor()
@@ -177,7 +177,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
      */
     public function getFilePermissionsTakesUserDefaultPermissionsFromTsConfigIntoAccountIfUserIsNotAdmin(array $userTsConfiguration): void
     {
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['isAdmin', 'getTSConfig'])
             ->getMock();
@@ -319,7 +319,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
      */
     public function getFilePermissionsFromStorageOverwritesDefaultPermissions(array $defaultPermissions, $storageUid, array $storagePermissions, array $expectedPermissions): void
     {
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['isAdmin', 'getFilePermissions', 'getTSConfig'])
             ->getMock();
@@ -361,7 +361,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
      */
     public function getFilePermissionsFromStorageAlwaysReturnsDefaultPermissionsForAdmins(array $defaultPermissions, $storageUid, array $storagePermissions): void
     {
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['isAdmin', 'getFilePermissions', 'getTSConfig'])
             ->getMock();
@@ -513,7 +513,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
      */
     public function getFilePermissionsTakesUserDefaultPermissionsFromRecordIntoAccountIfUserIsNotAdmin(string $permissionValue, array $expectedPermissions): void
     {
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['isAdmin', 'getTSConfig'])
             ->getMock();
@@ -536,7 +536,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
      */
     public function getFilePermissionsGrantsAllPermissionsToAdminUsers(): void
     {
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['isAdmin'])
             ->getMock();
@@ -572,7 +572,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
      */
     public function jsConfirmationReturnsTrueIfPassedValueEqualsConfiguration(): void
     {
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['getTSConfig'])
             ->getMock();
@@ -590,7 +590,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
      */
     public function jsConfirmationAllowsSettingMultipleBitsInValue(): void
     {
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['getTSConfig'])
             ->getMock();
@@ -661,7 +661,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
      */
     public function jsConfirmationAlwaysReturnsFalseIfNoConfirmationIsSet(): void
     {
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['getTSConfig'])
             ->getMock();
@@ -679,7 +679,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
      */
     public function jsConfirmationReturnsTrueIfConfigurationIsMissing(): void
     {
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['getTSConfig'])
             ->getMock();
@@ -766,7 +766,7 @@ class BackendUserAuthenticationTest extends UnitTestCase
             GeneralUtility::addInstance(ConnectionPool::class, $databaseProphecy->reveal());
         }
 
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(BackendUserAuthentication::class)
             ->setMethods(['isAdmin'])
             ->getMock();
index 36c22aa..e439e4c 100644 (file)
@@ -212,13 +212,13 @@ class ApcuBackendTest extends UnitTestCase
      */
     public function flushRemovesOnlyOwnEntries()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FrontendInterface $thisCache */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FrontendInterface $thisCache */
         $thisCache = $this->createMock(FrontendInterface::class);
         $thisCache->expects(self::any())->method('getIdentifier')->willReturn('thisCache');
         $thisBackend = new ApcuBackend('Testing');
         $thisBackend->setCache($thisCache);
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FrontendInterface $thatCache */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FrontendInterface $thatCache */
         $thatCache = $this->createMock(FrontendInterface::class);
         $thatCache->expects(self::any())->method('getIdentifier')->willReturn('thatCache');
         $thatBackend = new ApcuBackend('Testing');
@@ -275,7 +275,7 @@ class ApcuBackendTest extends UnitTestCase
      */
     protected function setUpBackend($accessible = false)
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FrontendInterface $cache */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FrontendInterface $cache */
         $cache = $this->createMock(FrontendInterface::class);
         if ($accessible) {
             $accessibleClassName = $this->buildAccessibleProxy(ApcuBackend::class);
index 117d014..9b7c927 100644 (file)
@@ -197,13 +197,13 @@ class WincacheBackendTest extends UnitTestCase
      */
     public function flushRemovesOnlyOwnEntries()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thisCache */
         $thisCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thisCache->expects(self::any())->method('getIdentifier')->willReturn('thisCache');
         $thisBackend = new WincacheBackend('Testing');
         $thisBackend->setCache($thisCache);
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $thatCache */
         $thatCache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         $thatCache->expects(self::any())->method('getIdentifier')->willReturn('thatCache');
         $thatBackend = new WincacheBackend('Testing');
@@ -260,7 +260,7 @@ class WincacheBackendTest extends UnitTestCase
      */
     protected function setUpBackend($accessible = false)
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface $cache */
         $cache = $this->createMock(\TYPO3\CMS\Core\Cache\Frontend\FrontendInterface::class);
         if ($accessible) {
             $accessibleClassName = $this->buildAccessibleProxy(WincacheBackend::class);
index 5d949e3..d6949b0 100644 (file)
@@ -315,7 +315,7 @@ class CacheManagerTest extends UnitTestCase
      */
     public function getCacheCreatesCacheInstanceWithFallbackToDefaultFrontend()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
         $manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
         $cacheIdentifier = $this->getUniqueId('Test');
         $configuration = [
@@ -341,7 +341,7 @@ class CacheManagerTest extends UnitTestCase
      */
     public function getCacheCreatesCacheInstanceWithFallbackToDefaultBackend()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
         $manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
         $cacheIdentifier = $this->getUniqueId('Test');
         $configuration = [
@@ -425,7 +425,7 @@ class CacheManagerTest extends UnitTestCase
      */
     public function flushCachesInGroupByTagsWithEmptyTagsArrayDoesNotFlushCaches()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
         $manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
         $cacheIdentifier = 'aTest';
 
@@ -461,7 +461,7 @@ class CacheManagerTest extends UnitTestCase
      */
     public function flushCachesInGroupByTagsDeletesByTag()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|CacheManager $manager */
         $manager = $this->getAccessibleMock(CacheManager::class, ['dummy'], [], '', false);
         $cacheIdentifier = 'aTest';
 
index 40da425..afba45a 100644 (file)
@@ -52,7 +52,7 @@ class SendEmailCommandTest extends UnitTestCase
             ->method('getRealTransport')
             ->willReturn($realTransportProphecy->reveal());
 
-        /** @var SendEmailCommand|\PHPUnit_Framework_MockObject_MockObject $command */
+        /** @var SendEmailCommand|\PHPUnit\Framework\MockObject\MockObject $command */
         $command = $this->getMockBuilder(SendEmailCommand::class)
             ->setConstructorArgs(['mailer:spool:send'])
             ->setMethods(['getMailer'])
index 3fa6576..ae72baf 100644 (file)
@@ -26,7 +26,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class ConfigurationManagerTest extends UnitTestCase
 {
     /**
-     * @var ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConfigurationManager|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
@@ -379,7 +379,7 @@ class ConfigurationManagerTest extends UnitTestCase
         if (\function_exists('posix_getegid') && posix_getegid() === 0) {
             self::markTestSkipped('Test skipped if run on linux as root');
         }
-        /** @var $subject ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject ConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(ConfigurationManager::class, ['dummy']);
 
         $file = $this->getUniqueId('test_');
@@ -403,7 +403,7 @@ class ConfigurationManagerTest extends UnitTestCase
      */
     public function canWriteConfigurationReturnsTrueIfDirectoryAndFilesAreWritable(): void
     {
-        /** @var $subject ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject ConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(ConfigurationManager::class, ['dummy']);
 
         $directory = $this->getUniqueId('test_');
@@ -472,7 +472,7 @@ class ConfigurationManagerTest extends UnitTestCase
     {
         $this->expectException(\RuntimeException::class);
 
-        /** @var $subject ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject ConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(ConfigurationManager::class, ['getLocalConfigurationFileLocation']);
 
         $file = 'tests/' . $this->getUniqueId('test_');
@@ -490,7 +490,7 @@ class ConfigurationManagerTest extends UnitTestCase
      */
     public function createLocalConfigurationFromFactoryConfigurationWritesContentFromFactoryFile(): void
     {
-        /** @var $subject ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject ConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(ConfigurationManager::class, ['writeLocalConfiguration', 'getLocalConfigurationFileLocation', 'getFactoryConfigurationFileLocation']);
         $localConfigurationFile = '/tests/' . $this->getUniqueId('dummy_');
         $subject->_set('localConfigurationFile', $localConfigurationFile);
@@ -571,7 +571,7 @@ class ConfigurationManagerTest extends UnitTestCase
      */
     public function isValidLocalConfigurationPathAcceptsWhitelistedPath(): void
     {
-        /** @var $subject ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject ConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(ConfigurationManager::class, ['dummy']);
         $subject->_set('whiteListedLocalConfigurationPaths', ['foo/bar']);
         self::assertTrue($subject->_call('isValidLocalConfigurationPath', 'foo/bar/baz'));
@@ -582,7 +582,7 @@ class ConfigurationManagerTest extends UnitTestCase
      */
     public function isValidLocalConfigurationPathDeniesNotWhitelistedPath(): void
     {
-        /** @var $subject ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject ConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(ConfigurationManager::class, ['dummy']);
         $subject->_set('whiteListedLocalConfigurationPaths', ['foo/bar']);
         self::assertFalse($subject->_call('isValidLocalConfigurationPath', 'bar/baz'));
index 701abc9..9094b4b 100644 (file)
@@ -1567,7 +1567,7 @@ class FlexFormToolsTest extends UnitTestCase
             'callBackMethod_value' => 'dummy',
         ];
         $editData = [];
-        /** @var \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(FlexFormTools::class)
             ->setMethods(['executeCallBackMethod'])
             ->getMock();
@@ -1596,7 +1596,7 @@ class FlexFormToolsTest extends UnitTestCase
             ],
         ];
         $editData2 = [];
-        /** @var \TYPO3\CMS\Core\Configuration\FlexForm\FlexFormTools|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @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),
index cee5329..8455183 100644 (file)
@@ -41,7 +41,7 @@ class AbstractConditionMatcherTest extends UnitTestCase
     protected $backupApplicationContext;
 
     /**
-     * @var AbstractConditionMatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var AbstractConditionMatcher|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $conditionMatcher;
 
index 5ff83f1..74c2bcf 100644 (file)
@@ -42,7 +42,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
                 ],
             ],
         ]);
-        /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
+        /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
         $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
         $generator->buildClassAliasMapForPackage($packageMock);
@@ -65,7 +65,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
                 ],
             ],
         ]);
-        /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
+        /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
         $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
         $generator->buildClassAliasMapForPackage($packageMock);
@@ -91,7 +91,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
             ],
         ];
         $packageMock = $this->createPackageMock([]);
-        /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
+        /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
         $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
         self::assertEquals($expectedClassMap, $generator->buildClassAliasMapForPackage($packageMock));
@@ -125,7 +125,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
                 ],
             ],
         ]);
-        /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
+        /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
         $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [], __DIR__);
         self::assertEquals($expectedClassMap, $generator->buildClassAliasMapForPackage($packageMock));
@@ -263,7 +263,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
      */
     public function autoloadFilesAreBuildCorrectly($packageManifest, $expectedPsr4Files, $expectedClassMapFiles)
     {
-        /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
+        /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
         $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [$this->createPackageMock($packageManifest)], __DIR__);
         $files = $generator->buildAutoloadInformationFiles();
@@ -373,7 +373,7 @@ class ClassLoadingInformationGeneratorTest extends UnitTestCase
      */
     public function autoloadDevFilesAreBuildCorrectly($packageManifest, $expectedPsr4Files, $expectedClassMapFiles)
     {
-        /** @var ClassLoader|\PHPUnit_Framework_MockObject_MockObject $classLoaderMock */
+        /** @var ClassLoader|\PHPUnit\Framework\MockObject\MockObject $classLoaderMock */
         $classLoaderMock = $this->createMock(ClassLoader::class);
         $generator = new ClassLoadingInformationGenerator($classLoaderMock, [$this->createPackageMock($packageManifest)], __DIR__, true);
         $files = $generator->buildAutoloadInformationFiles();
index f8aa4e5..de51425 100644 (file)
@@ -46,7 +46,7 @@ class DataHandlerTest extends UnitTestCase
     protected $singletonInstances = [];
 
     /**
-     * @var DataHandler|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface
+     * @var DataHandler|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface
      */
     protected $subject;
 
@@ -434,7 +434,7 @@ class DataHandlerTest extends UnitTestCase
             ],
         ];
 
-        /** @var $subject DataHandler|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $subject DataHandler|\PHPUnit\Framework\MockObject\MockObject */
         $subject = $this->getMockBuilder(DataHandler::class)
             ->setMethods([
                 'newlog',
@@ -471,7 +471,7 @@ class DataHandlerTest extends UnitTestCase
         $subject->expects(self::once())->method('checkRecordUpdateAccess')->willReturn(true);
         $subject->expects(self::once())->method('unsetElementsToBeDeleted')->willReturnArgument(0);
 
-        /** @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject $backEndUser */
+        /** @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject $backEndUser */
         $backEndUser = $this->createMock(BackendUserAuthentication::class);
         $backEndUser->workspace = 1;
         $backEndUser->workspaceRec = ['freeze' => false];
@@ -785,7 +785,7 @@ class DataHandlerTest extends UnitTestCase
     {
         $table = 'phpunit_dummy';
 
-        /** @var DataHandler|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $subject */
+        /** @var DataHandler|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(
             DataHandler::class,
             ['dummy']
@@ -838,7 +838,7 @@ class DataHandlerTest extends UnitTestCase
      */
     public function deletePagesOnRootLevelIsDenied()
     {
-        /** @var DataHandler|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $dataHandlerMock */
+        /** @var DataHandler|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface $dataHandlerMock */
         $dataHandlerMock = $this->getMockBuilder(DataHandler::class)
             ->setMethods(['canDeletePage', 'log'])
             ->getMock();
@@ -873,7 +873,7 @@ class DataHandlerTest extends UnitTestCase
             '1' => ['table' => $this->getUniqueId('bar_'), 'id' => 67]
         ];
 
-        /** @var DataHandler|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $mockDataHandler */
+        /** @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);
index e1f9c4a..50568e1 100644 (file)
@@ -31,7 +31,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class ConnectionTest extends UnitTestCase
 {
     /**
-     * @var Connection|\PHPUnit_Framework_MockObject_MockObject
+     * @var Connection|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $connection;
 
index 8b99e3c..e2bf0bb 100644 (file)
@@ -322,7 +322,7 @@ 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 */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|BulkInsertQuery $subject */
         $subject = $this->getAccessibleMock(
             BulkInsertQuery::class,
             ['getInsertMaxRows'],
index be08d2c..2c30265 100644 (file)
@@ -39,7 +39,7 @@ class ConnectionMigratorTest extends UnitTestCase
     protected $platform;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
index c4b69df..49981e0 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class DebugExceptionHandlerTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\Error\DebugExceptionHandler|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Core\Error\DebugExceptionHandler|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index 52ba68d..57de288 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class ProductionExceptionHandlerTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\Error\ProductionExceptionHandler|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Core\Error\ProductionExceptionHandler|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
@@ -60,7 +60,7 @@ class ProductionExceptionHandlerTest extends UnitTestCase
     public function echoExceptionWebEscapesExceptionTitle()
     {
         $title = '<b>b</b><script>alert(1);</script>';
-        /** @var $exception \Exception|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $exception \Exception|\PHPUnit\Framework\MockObject\MockObject */
         $exception = $this->getMockBuilder('Exception')
             ->setMethods(['getTitle'])
             ->setConstructorArgs(['some message'])
index f893393..73c85fc 100644 (file)
@@ -244,7 +244,7 @@ class AbstractFormProtectionTest extends UnitTestCase
      */
     public function validateTokenForValidTokenNotCallsCreateValidationErrorMessage(): void
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FormProtectionTesting $subject */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FormProtectionTesting $subject */
         $subject = $this->getMockBuilder(FormProtectionTesting::class)
             ->setMethods(['createValidationErrorMessage'])
             ->getMock();
@@ -262,7 +262,7 @@ class AbstractFormProtectionTest extends UnitTestCase
      */
     public function validateTokenForInvalidTokenCallsCreateValidationErrorMessage(): void
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FormProtectionTesting $subject */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FormProtectionTesting $subject */
         $subject = $this->getMockBuilder(FormProtectionTesting::class)
             ->setMethods(['createValidationErrorMessage'])
             ->getMock();
@@ -280,7 +280,7 @@ class AbstractFormProtectionTest extends UnitTestCase
      */
     public function validateTokenForInvalidFormNameCallsCreateValidationErrorMessage(): void
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FormProtectionTesting $subject */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FormProtectionTesting $subject */
         $subject = $this->getMockBuilder(FormProtectionTesting::class)
             ->setMethods(['createValidationErrorMessage'])
             ->getMock();
index b0e9e61..87aed37 100644 (file)
@@ -25,17 +25,17 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class BackendFormProtectionTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\FormProtection\BackendFormProtection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Core\FormProtection\BackendFormProtection|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
     /**
-     * @var BackendUserAuthentication|\PHPUnit_Framework_MockObject_MockObject
+     * @var BackendUserAuthentication|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $backendUserMock;
 
     /**
-     * @var Registry|\PHPUnit_Framework_MockObject_MockObject
+     * @var Registry|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $registryMock;
 
index 30f9d00..4da24e2 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class InstallToolFormProtectionTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Core\FormProtection\InstallToolFormProtection|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
index b3d6e19..4a6bd6e 100644 (file)
@@ -72,11 +72,11 @@ class FileLinkHandlerTest extends UnitTestCase
      */
     public function resolveFileReferencesToSplitParameters($input, $expected, $finalString)
     {
-        /** @var ResourceStorage|\PHPUnit_Framework_MockObject_MockObject $storageMock */
+        /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $storageMock */
         $storage = $this->getMockBuilder(ResourceStorage::class)
             ->disableOriginalConstructor()
             ->getMock();
-        /** @var ResourceFactory|\PHPUnit_Framework_MockObject_MockObject $storageMock */
+        /** @var ResourceFactory|\PHPUnit\Framework\MockObject\MockObject $storageMock */
         $factory = $this->getMockBuilder(ResourceFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -87,7 +87,7 @@ class FileLinkHandlerTest extends UnitTestCase
         $factory->expects(self::any())->method('getFileObjectFromCombinedIdentifier')->with($expected['file'])->willReturn($fileObject);
         $expected['file'] = $fileObject;
 
-        /** @var FileLinkHandler|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var FileLinkHandler|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(FileLinkHandler::class, ['dummy']);
         $subject->_set('resourceFactory', $factory);
         self::assertEquals($expected, $subject->resolveHandlerData($input));
index 7a60fcd..2eac564 100644 (file)
@@ -87,7 +87,7 @@ class FolderLinkHandlerTest extends UnitTestCase
             ->willReturn($folderObject);
         $expected['folder'] = $folderObject;
 
-        /** @var FolderLinkHandler|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var FolderLinkHandler|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(FolderLinkHandler::class, ['dummy']);
         $subject->_set('resourceFactory', $factory);
         self::assertEquals($expected, $subject->resolveHandlerData($input));
@@ -113,7 +113,7 @@ class FolderLinkHandlerTest extends UnitTestCase
 
         $folderObject->expects(self::any())->method('getCombinedIdentifier')->willReturn($parameters['folder']);
         $folderData = explode(':', $parameters['folder']);
-        /** @var ResourceStorage|\PHPUnit_Framework_MockObject_MockObject $storageMock */
+        /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $storageMock */
         $storage = $this->getMockBuilder(ResourceStorage::class)
             ->disableOriginalConstructor()
             ->getMock(['getUid']);
index 529a2cf..ac8891b 100644 (file)
@@ -257,7 +257,7 @@ class LegacyLinkNotationConverterTest extends UnitTestCase
             $expected['folder'] = $folderObject;
         }
 
-        /** @var LegacyLinkNotationConverter|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var LegacyLinkNotationConverter|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(LegacyLinkNotationConverter::class, ['dummy']);
         $subject->_set('resourceFactory', $factory);
         self::assertEquals($expected, $subject->resolve($input));
@@ -306,7 +306,7 @@ class LegacyLinkNotationConverterTest extends UnitTestCase
                 ->getMock();
             $folderObject->expects(self::any())->method('getCombinedIdentifier')->willReturn($parameters['folder']);
             $folderData = explode(':', $parameters['folder']);
-            /** @var ResourceStorage|\PHPUnit_Framework_MockObject_MockObject $storageMock */
+            /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $storageMock */
             $storage = $this->getMockBuilder(ResourceStorage::class)
                 ->setMethods(['getUid'])
                 ->disableOriginalConstructor()
index b70b4f7..95fbcf3 100644 (file)
@@ -28,7 +28,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class LockFactoryTest extends UnitTestCase
 {
     /**
-     * @var LockFactory|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var LockFactory|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $mockFactory;
 
index ef9eb8e..8c20bf9 100644 (file)
@@ -53,7 +53,7 @@ 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 */
+        /** @var SimpleLockStrategy|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $lock */
         $lock = $this->getAccessibleMock(SimpleLockStrategy::class, ['dummy'], ['999999999']);
 
         $pathOfLockFile = $lock->_get('filePath');
@@ -73,7 +73,7 @@ class SimpleLockStrategyTest extends UnitTestCase
      */
     public function releaseRemovesLockfileInTypo3TempLocks()
     {
-        /** @var SimpleLockStrategy|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $lock */
+        /** @var SimpleLockStrategy|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $lock */
         $lock = $this->getAccessibleMock(SimpleLockStrategy::class, ['dummy'], ['999999999']);
 
         $pathOfLockFile = $lock->_get('filePath');
@@ -110,7 +110,7 @@ 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 */
+        /** @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);
index 93aa1ff..93ac054 100644 (file)
@@ -91,7 +91,7 @@ class LoggerTest extends UnitTestCase
         $level = LogLevel::DEBUG;
         $message = 'test';
         $logger = new Logger($component);
-        /** @var $processor \TYPO3\CMS\Core\Log\Processor\ProcessorInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $processor \TYPO3\CMS\Core\Log\Processor\ProcessorInterface|\PHPUnit\Framework\MockObject\MockObject */
         $processor = $this->getMockBuilder(NullProcessor::class)
             ->setMethods(['processLogRecord'])
             ->getMock();
@@ -108,7 +108,7 @@ class LoggerTest extends UnitTestCase
     public function loggerLogsRecord()
     {
         $logger = new Logger('test.core.log');
-        /** @var NullWriter|\PHPUnit_Framework_MockObject_MockObject $writer */
+        /** @var NullWriter|\PHPUnit\Framework\MockObject\MockObject $writer */
         $writer = $this->getMockBuilder(NullWriter::class)
             ->setMethods(['writeLog'])
             ->getMock();
index c472e56..8352a8c 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class IntrospectionProcessorTest extends UnitTestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Log\Processor\IntrospectionProcessor
+     * @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Log\Processor\IntrospectionProcessor
      */
     protected $processor;
 
index ab05776..852c87d 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class FlashMessageServiceTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Core\Messaging\FlashMessageService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Core\Messaging\FlashMessageService|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $flashMessageService;
 
index 314d3b7..7341150 100644 (file)
@@ -30,7 +30,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class PackageManagerTest extends UnitTestCase
 {
     /**
-     * @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $packageManager
+     * @var PackageManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $packageManager
      */
     protected $packageManager;
 
@@ -42,7 +42,7 @@ class PackageManagerTest extends UnitTestCase
         parent::setUp();
         vfsStream::setup('Test');
 
-        /** @var PhpFrontend|\PHPUnit_Framework_MockObject_MockObject $mockCache */
+        /** @var PhpFrontend|\PHPUnit\Framework\MockObject\MockObject $mockCache */
         $mockCache = $this->getMockBuilder(PhpFrontend::class)
             ->setMethods(['has', 'set', 'getBackend'])
             ->disableOriginalConstructor()
@@ -171,7 +171,7 @@ class PackageManagerTest extends UnitTestCase
             file_put_contents($packagePath . 'ext_emconf.php', '<?php' . LF . '$EM_CONF[$_EXTKEY] = [];');
         }
 
-        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $packageManager */
+        /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $packageManager */
         $packageManager = $this->getAccessibleMock(PackageManager::class, ['dummy'], [new DependencyOrderingService]);
         $packageManager->_set('packagesBasePaths', $packagePaths);
         $packageManager->_set('packagesBasePath', 'vfs://Test/Packages/');
@@ -214,7 +214,7 @@ class PackageManagerTest extends UnitTestCase
             $packagePaths[] = $packagePath;
         }
 
-        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $packageManager */
+        /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $packageManager */
         $packageManager = $this->getAccessibleMock(PackageManager::class, ['sortAndSavePackageStates', 'registerTransientClassLoadingInformationForPackage'], [new DependencyOrderingService]);
         $packageManager->_set('packagesBasePaths', $packagePaths);
         $packageManager->_set('packagesBasePath', 'vfs://Test/Packages/');
index 1533c25..b6d7786 100644 (file)
@@ -47,7 +47,7 @@ class PageRendererTest extends UnitTestCase
      */
     public function addBodyContentAddsContent()
     {
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
         $expectedReturnValue = 'ABCDE';
         $subject->addBodyContent('A');
@@ -64,7 +64,7 @@ class PageRendererTest extends UnitTestCase
      */
     public function addInlineLanguageLabelFileSetsInlineLanguageLabelFiles()
     {
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
         $fileReference = $this->getUniqueId('file_');
         $selectionPrefix = $this->getUniqueId('prefix_');
@@ -87,7 +87,7 @@ class PageRendererTest extends UnitTestCase
      */
     public function addInlineLanguageLabelFileSetsTwoDifferentInlineLanguageLabelFiles()
     {
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
         $fileReference1 = $this->getUniqueId('file1_');
         $selectionPrefix1 = $this->getUniqueId('prefix1_');
@@ -119,7 +119,7 @@ class PageRendererTest extends UnitTestCase
      */
     public function addInlineLanguageLabelFileDoesNotSetSameLanguageFileTwice()
     {
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var PageRenderer|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(PageRenderer::class, ['dummy'], [], '', false);
         $fileReference = $this->getUniqueId('file2_');
         $selectionPrefix = $this->getUniqueId('prefix2_');
@@ -138,7 +138,7 @@ class PageRendererTest extends UnitTestCase
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionCode(1284906026);
 
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @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');
@@ -152,7 +152,7 @@ class PageRendererTest extends UnitTestCase
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionCode(1284906026);
 
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @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');
@@ -163,7 +163,7 @@ class PageRendererTest extends UnitTestCase
      */
     public function includeLanguageFileForInlineDoesNotAddToInlineLanguageLabelsIfFileCouldNotBeRead()
     {
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @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');
@@ -229,7 +229,7 @@ class PageRendererTest extends UnitTestCase
      */
     public function includeLanguageFileForInlineAddsProcessesLabelsToInlineLanguageLabels($llFileContent, $selectionPrefix, $stripFromSelectionName, $expectation)
     {
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @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');
@@ -245,7 +245,7 @@ class PageRendererTest extends UnitTestCase
     public function getAddedMetaTag()
     {
         $this->resetSingletonInstances = true;
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @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');
@@ -263,7 +263,7 @@ class PageRendererTest extends UnitTestCase
     public function overrideMetaTag()
     {
         $this->resetSingletonInstances = true;
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @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');
@@ -282,7 +282,7 @@ class PageRendererTest extends UnitTestCase
     public function unsetAddedMetaTag()
     {
         $this->resetSingletonInstances = true;
-        /** @var PageRenderer|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @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');
index 661a6f1..9d34bb0 100644 (file)
@@ -33,14 +33,14 @@ class AbstractFileTest extends UnitTestCase
         $parentIdentifier = '/parent/';
         $currentIdentifier = '/parent/current/';
 
-        /** @var ResourceStorage|\PHPUnit_Framework_MockObject_MockObject $mockedStorageForParent */
+        /** @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 */
+        /** @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject $mockedStorage */
         $mockedStorage = $this->getMockBuilder(ResourceStorage::class)
             ->setMethods(['getFolderIdentifierFromFileIdentifier', 'getFolder'])
             ->disableOriginalConstructor()
@@ -65,7 +65,7 @@ class AbstractFileTest extends UnitTestCase
      */
     public function storageIsNotAskedForMimeTypeForPersistedRecord(): void
     {
-        /** @var ResourceStorage|\PHPUnit_Framework_MockObject_MockObject $mockedStorage */
+        /** @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);
index 864528e..d8aacba 100644 (file)
@@ -130,7 +130,7 @@ abstract class BaseTestCase extends UnitTestCase
      *
      * @param string $identifier
      * @param array $mockedMethods the methods to mock
-     * @return \TYPO3\CMS\Core\Resource\File|\PHPUnit_Framework_MockObject_MockObject
+     * @return \TYPO3\CMS\Core\Resource\File|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function getSimpleFileMock($identifier, $mockedMethods = [])
     {
index 91ffe79..da7c410 100644 (file)
@@ -23,7 +23,7 @@ use TYPO3\CMS\Core\Tests\Unit\Resource\BaseTestCase;
 class AbstractHierarchicalFilesystemDriverTest extends BaseTestCase
 {
     /**
-     * @var AbstractHierarchicalFilesystemDriver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var AbstractHierarchicalFilesystemDriver|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
index ece505f..4c63bb2 100644 (file)
@@ -185,7 +185,7 @@ class LocalDriverTest extends BaseTestCase
      */
     public function createFolderRecursiveSanitizesFilename(): void
     {
-        /** @var LocalDriver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $driver */
+        /** @var LocalDriver|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $driver */
         $driver = $this->createDriver([], ['sanitizeFilename']);
         $driver->expects(self::exactly(2))
             ->method('sanitizeFileName')
@@ -201,7 +201,7 @@ class LocalDriverTest extends BaseTestCase
      */
     public function determineBaseUrlUrlEncodesUriParts(): void
     {
-        /** @var LocalDriver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $driver */
+        /** @var LocalDriver|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $driver */
         $driver = $this->getAccessibleMock(
             LocalDriver::class,
             ['hasCapability'],
index af518fb..b63696e 100644 (file)
@@ -24,7 +24,7 @@ class FileReferenceTest extends UnitTestCase
     /**
      * @param array $fileReferenceProperties
      * @param array $originalFileProperties
-     * @return \TYPO3\CMS\Core\Resource\FileReference|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @return \TYPO3\CMS\Core\Resource\FileReference|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected function prepareFixture(array $fileReferenceProperties, array $originalFileProperties)
     {
index 2b4d1d3..1e72099 100644 (file)
@@ -61,7 +61,7 @@ class FileNameFilterTest extends UnitTestCase
      */
     public function filterHiddenFilesAndFoldersFiltersHiddenFilesAndFolders($itemName, $itemIdentifier, $expected)
     {
-        /** @var DriverInterface|\PHPUnit_Framework_MockObject_MockObject $driverMock */
+        /** @var DriverInterface|\PHPUnit\Framework\MockObject\MockObject $driverMock */
         FileNameFilter::setShowHiddenFilesAndFolders(false);
         $driverMock = $this->createMock(DriverInterface::class);
         self::assertSame(
@@ -85,7 +85,7 @@ class FileNameFilterTest extends UnitTestCase
      */
     public function filterHiddenFilesAndFoldersAllowsHiddenFilesAndFolders($itemName, $itemIdentifier, $expected)
     {
-        /** @var DriverInterface|\PHPUnit_Framework_MockObject_MockObject $driverMock */
+        /** @var DriverInterface|\PHPUnit\Framework\MockObject\MockObject $driverMock */
         $driverMock = $this->createMock(DriverInterface::class);
         FileNameFilter::setShowHiddenFilesAndFolders(true);
         self::assertSame(
index 013130a..8600bc1 100644 (file)
@@ -140,7 +140,7 @@ class FolderTest extends UnitTestCase
     {
         $mockedStorage = $this->createMock(\TYPO3\CMS\Core\Resource\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 */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Resource\ResourceFactory $mockedFactory */
         $mockedFactory = $this->createMock(\TYPO3\CMS\Core\Resource\ResourceFactory::class);
         $folderFixture = $this->createFolderFixture(
             '/somePath/someFolder/',
index f08e9d8..f787b23 100644 (file)
@@ -139,7 +139,7 @@ class ExtractorRegistryTest extends UnitTestCase
      * Initialize an ExtractorRegistry and mock createExtractorInstance()
      *
      * @param array $createsExtractorInstances
-     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Core\Resource\Index\ExtractorRegistry
+     * @return \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Core\Resource\Index\ExtractorRegistry
      */
     protected function getMockExtractorRegistry(array $createsExtractorInstances = [])
     {
index a7c5ae1..942b093 100644 (file)
@@ -27,7 +27,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class VimeoHelperTest extends UnitTestCase
 {
     /**
-     * @var VimeoHelper|\PHPUnit_Framework_MockObject_MockObject
+     * @var VimeoHelper|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
@@ -59,7 +59,7 @@ class VimeoHelperTest extends UnitTestCase
      */
     public function transformUrlToFileReturnsExpectedResult($url, $videoId, $expectedResult): void
     {
-        /** @var Folder|\PHPUnit_Framework_MockObject_MockObject $mockedFolder */
+        /** @var Folder|\PHPUnit\Framework\MockObject\MockObject $mockedFolder */
         $mockedFolder = $this->createMock(Folder::class);
 
         $this->subject->expects(self::any())->method('transformMediaIdToFile')
index 94709e4..8339098 100644 (file)
@@ -32,12 +32,12 @@ class ProcessedFileTest extends UnitTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|Folder
+     * @var \PHPUnit\Framework\MockObject\MockObject|Folder
      */
     protected $folderMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|ResourceStorage
+     * @var \PHPUnit\Framework\MockObject\MockObject|ResourceStorage
      */
     protected $storageMock;
 
index d1e9a11..558f54f 100644 (file)
@@ -28,7 +28,7 @@ class RendererRegistryTest extends UnitTestCase
      * Initialize a RendererRegistry and mock createRendererInstance()
      *
      * @param array $createsRendererInstances
-     * @return \PHPUnit_Framework_MockObject_MockObject|RendererRegistry
+     * @return \PHPUnit\Framework\MockObject\MockObject|RendererRegistry
      */
     protected function getTestRendererRegistry(array $createsRendererInstances = [])
     {
index e53c221..ce3dc40 100644 (file)
@@ -27,7 +27,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class VimeoRendererTest extends UnitTestCase
 {
     /**
-     * @var VimeoRenderer|\PHPUnit_Framework_MockObject_MockObject
+     * @var VimeoRenderer|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
@@ -38,7 +38,7 @@ class VimeoRendererTest extends UnitTestCase
     {
         parent::setUp();
 
-        /** @var VimeoHelper|\PHPUnit_Framework_MockObject_MockObject $vimeoHelper */
+        /** @var VimeoHelper|\PHPUnit\Framework\MockObject\MockObject $vimeoHelper */
         $vimeoHelper = $this->getAccessibleMock(VimeoHelper::class, ['getOnlineMediaId'], ['vimeo']);
         $vimeoHelper->expects(self::any())->method('getOnlineMediaId')->willReturn('7331');
 
@@ -59,10 +59,10 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function canRenderReturnsTrueOnCorrectFile()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock1 */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock1 */
         $fileResourceMock1 = $this->createMock(File::class);
         $fileResourceMock1->expects(self::any())->method('getMimeType')->willReturn('video/vimeo');
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock2 */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock2 */
         $fileResourceMock2 = $this->createMock(File::class);
         $fileResourceMock2->expects(self::any())->method('getMimeType')->willReturn('video/unknown');
         $fileResourceMock2->expects(self::any())->method('getExtension')->willReturn('vimeo');
@@ -76,7 +76,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function canRenderReturnsFalseOnCorrectFile()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
         $fileResourceMock->expects(self::any())->method('getMimeType')->willReturn('video/youtube');
 
@@ -88,7 +88,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -102,7 +102,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithLoopIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -116,7 +116,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithAutoplayIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -130,10 +130,10 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithAutoplayFromReferenceIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
-        /** @var FileReference|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var FileReference|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileReferenceMock = $this->createMock(FileReference::class);
         $fileReferenceMock->expects(self::any())->method('getProperty')->willReturn(1);
         $fileReferenceMock->expects(self::any())->method('getOriginalFile')->willReturn($fileResourceMock);
@@ -149,7 +149,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithAutoplayAndWithoutControllsIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -163,7 +163,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithAdditionalAttributes()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -177,7 +177,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithDataAttributesForCustomization()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -191,7 +191,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithCombinationOfDataAndAdditionalAttributes()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -205,7 +205,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithCustomAllowIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -219,7 +219,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithCustomAllowAndAutoplayIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -233,14 +233,14 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithPrivateVimeoCodeIsCorrect()
     {
-        /** @var VimeoHelper|\PHPUnit_Framework_MockObject_MockObject $vimeoHelper */
+        /** @var VimeoHelper|\PHPUnit\Framework\MockObject\MockObject $vimeoHelper */
         $vimeoHelper = $this->getAccessibleMock(VimeoHelper::class, ['getOnlineMediaId'], ['vimeo']);
         $vimeoHelper->expects(self::any())->method('getOnlineMediaId')->willReturn('7331/private0123');
 
         $subject = $this->getAccessibleMock(VimeoRenderer::class, ['getOnlineMediaHelper'], []);
         $subject->expects(self::any())->method('getOnlineMediaHelper')->willReturn($vimeoHelper);
 
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -254,14 +254,14 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputIsEscaped()
     {
-        /** @var VimeoHelper|\PHPUnit_Framework_MockObject_MockObject $vimeoHelper */
+        /** @var VimeoHelper|\PHPUnit\Framework\MockObject\MockObject $vimeoHelper */
         $vimeoHelper = $this->getAccessibleMock(VimeoHelper::class, ['getOnlineMediaId'], ['vimeo']);
         $vimeoHelper->expects(self::any())->method('getOnlineMediaId')->willReturn('7331<script>danger</script>\'"random"quotes;');
 
         $subject = $this->getAccessibleMock(VimeoRenderer::class, ['getOnlineMediaHelper'], []);
         $subject->expects(self::any())->method('getOnlineMediaHelper')->willReturn($vimeoHelper);
 
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -275,7 +275,7 @@ class VimeoRendererTest extends UnitTestCase
      */
     public function renderOutputWithApiIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
index 0f4c83c..f2d0d2e 100644 (file)
@@ -27,7 +27,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class YouTubeRendererTest extends UnitTestCase
 {
     /**
-     * @var YouTubeRenderer|\PHPUnit_Framework_MockObject_MockObject
+     * @var YouTubeRenderer|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
@@ -39,7 +39,7 @@ class YouTubeRendererTest extends UnitTestCase
         parent::setUp();
         $_SERVER['HTTP_HOST'] = 'test.server.org';
 
-        /** @var YouTubeHelper|\PHPUnit_Framework_MockObject_MockObject $youTubeHelper */
+        /** @var YouTubeHelper|\PHPUnit\Framework\MockObject\MockObject $youTubeHelper */
         $youTubeHelper = $this->getAccessibleMock(YouTubeHelper::class, ['getOnlineMediaId'], ['youtube']);
         $youTubeHelper->expects(self::any())->method('getOnlineMediaId')->willReturn('7331');
 
@@ -60,10 +60,10 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function canRenderReturnsTrueOnCorrectFile()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock1 */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock1 */
         $fileResourceMock1 = $this->createMock(File::class);
         $fileResourceMock1->expects(self::any())->method('getMimeType')->willReturn('video/youtube');
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock2 */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock2 */
         $fileResourceMock2 = $this->createMock(File::class);
         $fileResourceMock2->expects(self::any())->method('getMimeType')->willReturn('video/unknown');
         $fileResourceMock2->expects(self::any())->method('getExtension')->willReturn('youtube');
@@ -77,7 +77,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function canRenderReturnsFalseOnCorrectFile()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
         $fileResourceMock->expects(self::any())->method('getMimeType')->willReturn('video/vimeo');
 
@@ -89,7 +89,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithLoopIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -103,7 +103,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithAutoplayIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -117,10 +117,10 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithAutoplayFromFileReferenceIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
-        /** @var FileReference|\PHPUnit_Framework_MockObject_MockObject $fileReferenceMock */
+        /** @var FileReference|\PHPUnit\Framework\MockObject\MockObject $fileReferenceMock */
         $fileReferenceMock = $this->createMock(FileReference::class);
         $fileReferenceMock->expects(self::any())->method('getProperty')->willReturn(1);
         $fileReferenceMock->expects(self::any())->method('getOriginalFile')->willReturn($fileResourceMock);
@@ -136,7 +136,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithAutoplayAndWithoutControlsIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -221,7 +221,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithDefaultControlsIsCorrect($expected, $options)
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -235,7 +235,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithRelatedVideosTurnedOffIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -249,7 +249,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithAdditionalAttributes()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -263,7 +263,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithDataAttributesForCustomization()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -277,7 +277,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithCombinationOfDataAndAdditionalAttributes()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -291,7 +291,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithDisabledNoCookieIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -305,7 +305,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithModestbrandingIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -319,7 +319,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithCustomAllowIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -333,7 +333,7 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputWithCustomAllowAndAutoplayIsCorrect()
     {
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
@@ -347,14 +347,14 @@ class YouTubeRendererTest extends UnitTestCase
      */
     public function renderOutputIsEscaped()
     {
-        /** @var YouTubeHelper|\PHPUnit_Framework_MockObject_MockObject $youtubeHelper */
+        /** @var YouTubeHelper|\PHPUnit\Framework\MockObject\MockObject $youtubeHelper */
         $youtubeHelper = $this->getAccessibleMock(YouTubeHelper::class, ['getOnlineMediaId'], ['youtube']);
         $youtubeHelper->expects(self::any())->method('getOnlineMediaId')->willReturn('7331<script>danger</script>\'"random"quotes;');
 
         $subject = $this->getAccessibleMock(YouTubeRenderer::class, ['getOnlineMediaHelper'], []);
         $subject->expects(self::any())->method('getOnlineMediaHelper')->willReturn($youtubeHelper);
 
-        /** @var File|\PHPUnit_Framework_MockObject_MockObject $fileResourceMock */
+        /** @var File|\PHPUnit\Framework\MockObject\MockObject $fileResourceMock */
         $fileResourceMock = $this->createMock(File::class);
 
         self::assertSame(
index d7dcab9..ed6ec64 100644 (file)
@@ -30,7 +30,7 @@ class ResourceCompressorTest extends BaseTestCase
     protected $backupEnvironment = true;
 
     /**
-     * @var ResourceCompressor|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var ResourceCompressor|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
index c9d3e2f..dbe34ff 100644 (file)
@@ -102,7 +102,7 @@ class ResourceFactoryTest extends UnitTestCase
      */
     public function retrieveFileOrFolderObjectCallsGetFolderObjectFromCombinedIdentifierWithRelativePath()
     {
-        /** @var $subject \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|ResourceFactory */
+        /** @var $subject \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|ResourceFactory */
         $subject = $this->getAccessibleMock(
             ResourceFactory::class,
             ['getFolderObjectFromCombinedIdentifier'],
@@ -122,7 +122,7 @@ class ResourceFactoryTest extends UnitTestCase
      */
     public function retrieveFileOrFolderObjectCallsGetFolderObjectFromCombinedIdentifierWithAbsolutePath()
     {
-        /** @var $subject \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|ResourceFactory */
+        /** @var $subject \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|ResourceFactory */
         $subject = $this->getAccessibleMock(
             ResourceFactory::class,
             ['getFolderObjectFromCombinedIdentifier'],
index c185543..c62fabb 100644 (file)
@@ -45,7 +45,7 @@ class ResourceStorageTest extends BaseTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var ResourceStorage|\PHPUnit_Framework_MockObject_MockObject
+     * @var ResourceStorage|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
@@ -55,7 +55,7 @@ class ResourceStorageTest extends BaseTestCase
     protected function setUp(): void
     {
         parent::setUp();
-        /** @var FileRepository|\PHPUnit_Framework_MockObject_MockObject $fileRepositoryMock */
+        /** @var FileRepository|\PHPUnit\Framework\MockObject\MockObject $fileRepositoryMock */
         $fileRepositoryMock = $this->createMock(FileRepository::class);
         GeneralUtility::setSingletonInstance(
             FileRepository::class,
@@ -74,7 +74,7 @@ class ResourceStorageTest extends BaseTestCase
      *
      * @param array $configuration
      * @param bool $mockPermissionChecks
-     * @param AbstractDriver|\PHPUnit_Framework_MockObject_MockObject $driverObject
+     * @param AbstractDriver|\PHPUnit\Framework\MockObject\MockObject $driverObject
      * @param ResourceFactory $resourceFactory
      * @param array $storageRecord
      * @param array $mockedMethods
@@ -149,7 +149,7 @@ class ResourceStorageTest extends BaseTestCase
      * @param $driverConfiguration
      * @param ResourceStorage $storageObject
      * @param array $mockedDriverMethods
-     * @return \TYPO3\CMS\Core\Resource\Driver\LocalDriver|\PHPUnit_Framework_MockObject_MockObject
+     * @return \TYPO3\CMS\Core\Resource\Driver\LocalDriver|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function createDriverMock(
         $driverConfiguration,
@@ -285,7 +285,7 @@ class ResourceStorageTest extends BaseTestCase
      */
     public function addFileFailsIfFileDoesNotExist(): void
     {
-        /** @var Folder|\PHPUnit_Framework_MockObject_MockObject $mockedFolder */
+        /** @var Folder|\PHPUnit\Framework\MockObject\MockObject $mockedFolder */
         $mockedFolder = $this->createMock(Folder::class);
         $this->expectException(\InvalidArgumentException::class);
         $this->expectExceptionCode(1319552745);
@@ -298,12 +298,12 @@ class ResourceStorageTest extends BaseTestCase
      */
     public function getPublicUrlReturnsNullIfStorageIsNotOnline(): void
     {
-        /** @var $driver LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $driver LocalDriver|\PHPUnit\Framework\MockObject\MockObject */
         $driver = $this->getMockBuilder(LocalDriver::class)
             ->setConstructorArgs([['basePath' => $this->getMountRootUrl()]])
             ->getMock();
         $mockedResourceFactory = $this->createMock(ResourceFactory::class);
-        /** @var $subject ResourceStorage|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $subject ResourceStorage|\PHPUnit\Framework\MockObject\MockObject */
         $subject = $this->getMockBuilder(ResourceStorage::class)
             ->setMethods(['isOnline', 'getResourceFactoryInstance'])
             ->setConstructorArgs([$driver, ['configuration' => []]])
@@ -355,14 +355,14 @@ class ResourceStorageTest extends BaseTestCase
         array $permissionsFromDriver,
         bool $expectedResult
     ): void {
-        /** @var $mockedDriver LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockedDriver LocalDriver|\PHPUnit\Framework\MockObject\MockObject */
         $mockedDriver = $this->createMock(LocalDriver::class);
         $mockedDriver->expects(self::any())->method('getPermissions')->willReturn($permissionsFromDriver);
         $mockedResourceFactory = $this->createMock(ResourceFactory::class);
-        /** @var $mockedFolder Folder|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockedFolder Folder|\PHPUnit\Framework\MockObject\MockObject */
         $mockedFolder = $this->createMock(Folder::class);
         // Let all other checks pass
-        /** @var $subject ResourceStorage|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $subject ResourceStorage|\PHPUnit\Framework\MockObject\MockObject */
         $subject = $this->getMockBuilder(ResourceStorage::class)
             ->setMethods(['isWritable', 'isBrowsable', 'checkUserActionPermission', 'getResourceFactoryInstance'])
             ->setConstructorArgs([$mockedDriver, []])
@@ -574,7 +574,7 @@ class ResourceStorageTest extends BaseTestCase
             'name' => $fileInfo['name']
         ];
         $hash = 'asdfg';
-        /** @var $mockedDriver LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockedDriver LocalDriver|\PHPUnit\Framework\MockObject\MockObject */
         $mockedDriver = $this->getMockBuilder(LocalDriver::class)
             ->setConstructorArgs([['basePath' => $this->getMountRootUrl()]])
             ->getMock();
@@ -583,7 +583,7 @@ class ResourceStorageTest extends BaseTestCase
         $this->subject->setDriver($mockedDriver);
         $indexFileRepositoryMock = $this->createMock(FileIndexRepository::class);
         $this->subject->expects(self::any())->method('getFileIndexRepository')->willReturn($indexFileRepositoryMock);
-        /** @var $mockedFile File|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockedFile File|\PHPUnit\Framework\MockObject\MockObject */
         $mockedFile = $this->createMock(File::class);
         $mockedFile->expects(self::any())->method('getIdentifier')->willReturn($fileInfo['identifier']);
         // called by indexer because the properties are updated
@@ -620,7 +620,7 @@ class ResourceStorageTest extends BaseTestCase
         ]);
         $this->initializeVfs();
         $targetFolder = $this->getSimpleFolderMock('/targetFolder/');
-        /** @var $sourceDriver LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $sourceDriver LocalDriver|\PHPUnit\Framework\MockObject\MockObject */
         $sourceDriver = $this->createMock(LocalDriver::class);
         $sourceDriver->expects(self::once())->method('deleteFile')->with(self::equalTo($sourceFileIdentifier));
         $configuration = $this->convertConfigurationArrayToFlexformXml([]);
@@ -630,7 +630,7 @@ class ResourceStorageTest extends BaseTestCase
         $sourceFile->expects(self::any())->method('getStorage')->willReturn($sourceStorage);
         $sourceFile->expects(self::once())->method('getUpdatedProperties')->willReturn(array_keys($fileInfoDummy));
         $sourceFile->expects(self::once())->method('getProperties')->willReturn($fileInfoDummy);
-        /** @var $mockedDriver \TYPO3\CMS\Core\Resource\Driver\LocalDriver|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockedDriver \TYPO3\CMS\Core\Resource\Driver\LocalDriver|\PHPUnit\Framework\MockObject\MockObject */
         $mockedDriver = $this->getMockBuilder(LocalDriver::class)
             ->setConstructorArgs([['basePath' => $this->getMountRootUrl()]])
             ->getMock();
@@ -694,12 +694,12 @@ class ResourceStorageTest extends BaseTestCase
         $this->expectException(\RuntimeException::class);
         $this->expectExceptionCode(1325952534);
 
-        /** @var \TYPO3\CMS\Core\Resource\Folder|\PHPUnit_Framework_MockObject_MockObject $folderMock */
+        /** @var \TYPO3\CMS\Core\Resource\Folder|\PHPUnit\Framework\MockObject\MockObject $folderMock */
         $folderMock = $this->createMock(Folder::class);
-        /** @var $mockedDriver \TYPO3\CMS\Core\Resource\Driver\AbstractDriver|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockedDriver \TYPO3\CMS\Core\Resource\Driver\AbstractDriver|\PHPUnit\Framework\MockObject\MockObject */
         $mockedDriver = $this->getMockForAbstractClass(AbstractDriver::class);
         $mockedDriver->expects(self::once())->method('isFolderEmpty')->willReturn(false);
-        /** @var $subject ResourceStorage|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $subject ResourceStorage|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $subject = $this->getAccessibleMock(ResourceStorage::class, ['checkFolderActionPermission'], [], '', false);
         $subject->expects(self::any())->method('checkFolderActionPermission')->willReturn(true);
         $subject->_set('driver', $mockedDriver);
index 363df21..ff93164 100644 (file)
@@ -27,7 +27,7 @@ class TextExtractorRegistryTest extends UnitTestCase
      * Initialize a TextExtractorRegistry and mock createTextExtractorInstance()
      *
      * @param array $createsTextExtractorInstances
-     * @return \PHPUnit_Framework_MockObject_MockObject|TextExtractorRegistry
+     * @return \PHPUnit\Framework\MockObject\MockObject|TextExtractorRegistry
      */
     protected function getTextExtractorRegistry(array $createsTextExtractorInstances = [])
     {
index 06e7bff..2f45f6c 100644 (file)
@@ -166,7 +166,7 @@ class DependencyOrderingServiceTest extends UnitTestCase
      */
     public function prepareDependenciesBuildsFullIdentifierList(array $dependencies, array $expectedDependencies)
     {
-        /** @var DependencyOrderingService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $dependencyOrderingService */
+        /** @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);
@@ -715,7 +715,7 @@ class DependencyOrderingServiceTest extends UnitTestCase
      */
     public function findPathInGraphReturnsCorrectPath(array $graph, $from, $to, array $expected)
     {
-        /** @var DependencyOrderingService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $dependencyOrderingService */
+        /** @var DependencyOrderingService|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $dependencyOrderingService */
         $dependencyOrderingService = $this->getAccessibleMock(DependencyOrderingService::class, ['dummy']);
         $path = $dependencyOrderingService->_call('findPathInGraph', $graph, $from, $to);
 
index fe152bb..676c5b0 100644 (file)
@@ -32,7 +32,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class DatabaseTreeDataProviderTest extends UnitTestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|DatabaseTreeDataProvider|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|DatabaseTreeDataProvider|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
index ff8f3c4..5d1a9b9 100644 (file)
@@ -41,7 +41,7 @@ class TemplateServiceTest extends UnitTestCase
     protected $templateService;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface|TemplateService
+     * @var \PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface|TemplateService
      */
     protected $templateServiceMock;
 
index 1351027..3eb22c1 100644 (file)
@@ -65,7 +65,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
     /**
      * @param string $packageKey
      * @param array $packageMethods
-     * @return PackageManager|\PHPUnit_Framework_MockObject_MockObject
+     * @return PackageManager|\PHPUnit\Framework\MockObject\MockObject
      */
     protected function createMockPackageManagerWithMockPackage($packageKey, $packageMethods = ['getPackagePath', 'getPackageKey'])
     {
@@ -125,7 +125,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $this->expectExceptionCode(1365429656);
 
         $packageName = $this->getUniqueId('foo');
-        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
+        /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
         $packageManager = $this->getMockBuilder(PackageManager::class)
             ->setMethods(['isPackageActive'])
             ->disableOriginalConstructor()
@@ -147,7 +147,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
                 ->disableOriginalConstructor()
                 ->setMethods(['getPackagePath'])
                 ->getMock();
-        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
+        /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
         $packageManager = $this->getMockBuilder(PackageManager::class)
             ->setMethods(['isPackageActive', 'getPackage'])
             ->disableOriginalConstructor()
@@ -1195,7 +1195,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     public function loadExtLocalconfDoesNotReadFromCacheIfCachingIsDenied()
     {
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1216,7 +1216,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1402,7 +1402,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     public function loadBaseTcaDoesNotReadFromCacheIfCachingIsDenied()
     {
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1446,7 +1446,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1472,7 +1472,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1507,7 +1507,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
      */
     public function loadExtTablesDoesNotReadFromCacheIfCachingIsDenied()
     {
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1528,7 +1528,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1562,7 +1562,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1585,7 +1585,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1607,7 +1607,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var CacheManager|\PHPUnit_Framework_MockObject_MockObject $mockCacheManager */
+        /** @var CacheManager|\PHPUnit\Framework\MockObject\MockObject $mockCacheManager */
         $mockCacheManager = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->getMock();
@@ -1689,7 +1689,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
             ->getMock();
         $packageMetaData->expects(self::any())->method('getVersion')->willReturn('1.2.3');
         $packageManager = $this->createMockPackageManagerWithMockPackage($extensionKey, ['getPackagePath', 'getPackageKey', 'getPackageMetaData']);
-        /** @var \PHPUnit_Framework_MockObject_MockObject $package */
+        /** @var \PHPUnit\Framework\MockObject\MockObject $package */
         $package = $packageManager->getPackage($extensionKey);
         $package->expects(self::any())
                 ->method('getPackageMetaData')
@@ -1727,7 +1727,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $this->expectExceptionCode(1342345487);
 
         $packageName = $this->getUniqueId('foo');
-        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
+        /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
         $packageManager = $this->getMockBuilder(PackageManager::class)
             ->setMethods(['isPackageActive'])
             ->disableOriginalConstructor()
@@ -1746,7 +1746,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
     public function unloadExtensionCallsPackageManagerToDeactivatePackage()
     {
         $packageName = $this->getUniqueId('foo');
-        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
+        /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
         $packageManager = $this->getMockBuilder(PackageManager::class)
             ->setMethods(['isPackageActive', 'deactivatePackage'])
             ->disableOriginalConstructor()
@@ -1772,7 +1772,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $extensionKey = $this->getUniqueId('extension');
         $tableName = $this->getUniqueId('table');
 
-        /** @var CategoryRegistry|\PHPUnit_Framework_MockObject_MockObject $registryMock */
+        /** @var CategoryRegistry|\PHPUnit\Framework\MockObject\MockObject $registryMock */
         $registryMock = $this->getMockBuilder(CategoryRegistry::class)->getMock();
         $registryMock->expects(self::once())->method('add')->with($extensionKey, $tableName, 'categories', []);
         GeneralUtility::setSingletonInstance(CategoryRegistry::class, $registryMock);
@@ -1788,7 +1788,7 @@ class ExtensionManagementUtilityTest extends UnitTestCase
         $tableName = $this->getUniqueId('table');
         $fieldName = $this->getUniqueId('field');
 
-        /** @var CategoryRegistry|\PHPUnit_Framework_MockObject_MockObject $registryMock */
+        /** @var CategoryRegistry|\PHPUnit\Framework\MockObject\MockObject $registryMock */
         $registryMock = $this->getMockBuilder(CategoryRegistry::class)->getMock();
         $registryMock->expects(self::once())->method('add')->with($extensionKey, $tableName, $fieldName, []);
         GeneralUtility::setSingletonInstance(CategoryRegistry::class, $registryMock);
index d5d3dc5..dd8074f 100644 (file)
@@ -3900,7 +3900,7 @@ class GeneralUtilityTest extends UnitTestCase
             ->disableOriginalConstructor()
             ->setMethods(['getPackagePath'])
             ->getMock();
-        /** @var PackageManager|\PHPUnit_Framework_MockObject_MockObject $packageManager */
+        /** @var PackageManager|\PHPUnit\Framework\MockObject\MockObject $packageManager */
         $packageManager = $this->getMockBuilder(PackageManager::class)
             ->setMethods(['isPackageActive', 'getPackage'])
             ->disableOriginalConstructor()
index a01f1f5..a119c25 100644 (file)
@@ -34,7 +34,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class RootlineUtilityTest extends UnitTestCase
 {
     /**
-     * @var RootlineUtility|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var RootlineUtility|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index b3233e3..587981a 100644 (file)
@@ -31,7 +31,7 @@ use TYPO3\CMS\Extbase\Validation\ValidatorResolver;
 class ValidatorResolverTest extends \TYPO3\TestingFramework\Core\Functional\FunctionalTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Validation\ValidatorResolver|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Validation\ValidatorResolver|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     private $validatorResolver;
 
index 0a7838e..5447d59 100644 (file)
@@ -28,12 +28,12 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class AbstractConfigurationManagerTest extends UnitTestCase
 {
     /**
-     * @var AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface
+     * @var AbstractConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface
      */
     protected $abstractConfigurationManager;
 
     /**
-     * @var TypoScriptService|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface
+     * @var TypoScriptService|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface
      */
     protected $mockTypoScriptService;
 
@@ -395,7 +395,7 @@ class AbstractConfigurationManagerTest extends UnitTestCase
      */
     public function switchableControllerActionsAreNotOverriddenIfPluginNameIsSpecified(): void
     {
-        /** @var AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $abstractConfigurationManager */
+        /** @var AbstractConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface $abstractConfigurationManager */
         $abstractConfigurationManager = $this->getAccessibleMock(
             AbstractConfigurationManager::class,
             [
@@ -422,7 +422,7 @@ class AbstractConfigurationManagerTest extends UnitTestCase
      */
     public function switchableControllerActionsAreOverriddenIfSpecifiedPluginIsTheCurrentPlugin(): void
     {
-        /** @var AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $abstractConfigurationManager */
+        /** @var AbstractConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface $abstractConfigurationManager */
         $configuration = [
             'extensionName' => 'CurrentExtensionName',
             'pluginName' => 'CurrentPluginName',
@@ -455,7 +455,7 @@ class AbstractConfigurationManagerTest extends UnitTestCase
      */
     public function switchableControllerActionsAreOverriddenIfPluginNameIsNotSpecified(): void
     {
-        /** @var AbstractConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface $abstractConfigurationManager */
+        /** @var AbstractConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface $abstractConfigurationManager */
         $configuration = ['switchableControllerActions' => ['overriddenSwitchableControllerActions']];
         $abstractConfigurationManager = $this->getAccessibleMock(
             AbstractConfigurationManager::class,
@@ -695,7 +695,7 @@ class AbstractConfigurationManagerTest extends UnitTestCase
      */
     public function getContentObjectTheCurrentContentObject(): void
     {
-        /** @var ContentObjectRenderer|\PHPUnit_Framework_MockObject_MockObject $mockContentObject */
+        /** @var ContentObjectRenderer|\PHPUnit\Framework\MockObject\MockObject $mockContentObject */
         $mockContentObject = $this->createMock(ContentObjectRenderer::class);
         $this->abstractConfigurationManager->setContentObject($mockContentObject);
         self::assertSame($this->abstractConfigurationManager->getContentObject(), $mockContentObject);
index aae6329..fe64bc9 100644 (file)
@@ -24,12 +24,12 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class BackendConfigurationManagerTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Configuration\BackendConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $backendConfigurationManager;
 
     /**
-     * @var \TYPO3\CMS\Core\TypoScript\TypoScriptService|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Core\TypoScript\TypoScriptService|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $mockTypoScriptService;
 
index e3a9611..22e8325 100644 (file)
@@ -30,17 +30,17 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class FrontendConfigurationManagerTest extends UnitTestCase
 {
     /**
-     * @var ContentObjectRenderer|\PHPUnit_Framework_MockObject_MockObject
+     * @var ContentObjectRenderer|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockContentObject;
 
     /**
-     * @var FrontendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface
+     * @var FrontendConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface
      */
     protected $frontendConfigurationManager;
 
     /**
-     * @var TypoScriptService|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface
+     * @var TypoScriptService|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface
      */
     protected $mockTypoScriptService;
 
@@ -384,7 +384,7 @@ class FrontendConfigurationManagerTest extends UnitTestCase
                 'framework' => 'configuration'
             ]
         ];
-        /** @var FrontendConfigurationManager|\PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface */
+        /** @var FrontendConfigurationManager|\PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface */
         $frontendConfigurationManager = $this->getAccessibleMock(
             FrontendConfigurationManager::class,
             [
@@ -600,7 +600,7 @@ class FrontendConfigurationManagerTest extends UnitTestCase
      */
     public function overrideConfigurationFromFlexFormChecksForDataIsString(): void
     {
-        /** @var $flexFormService FlexFormService|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $flexFormService FlexFormService|\PHPUnit\Framework\MockObject\MockObject */
         $flexFormService = $this->getMockBuilder(FlexFormService::class)
             ->setMethods(['convertFlexFormContentToArray'])
             ->getMock();
@@ -625,7 +625,7 @@ class FrontendConfigurationManagerTest extends UnitTestCase
      */
     public function overrideConfigurationFromFlexFormChecksForDataIsStringAndEmpty(): void
     {
-        /** @var $flexFormService FlexFormService|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $flexFormService FlexFormService|\PHPUnit\Framework\MockObject\MockObject */
         $flexFormService = $this->getMockBuilder(FlexFormService::class)
             ->setMethods(['convertFlexFormContentToArray'])
             ->getMock();
@@ -646,7 +646,7 @@ class FrontendConfigurationManagerTest extends UnitTestCase
      */
     public function overrideConfigurationFromFlexFormChecksForDataIsArray(): void
     {
-        /** @var $flexFormService FlexFormService|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $flexFormService FlexFormService|\PHPUnit\Framework\MockObject\MockObject */
         $flexFormService = $this->getMockBuilder(FlexFormService::class)
             ->setMethods(['convertFlexFormContentToArray'])
             ->getMock();
@@ -667,7 +667,7 @@ class FrontendConfigurationManagerTest extends UnitTestCase
      */
     public function overrideConfigurationFromFlexFormChecksForDataIsArrayAndEmpty(): void
     {
-        /** @var $flexFormService FlexFormService|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $flexFormService FlexFormService|\PHPUnit\Framework\MockObject\MockObject */
         $flexFormService = $this->getMockBuilder(FlexFormService::class)
             ->setMethods(['convertFlexFormContentToArray'])
             ->getMock();
index e674e5c..bf3d924 100644 (file)
@@ -46,7 +46,7 @@ class ResultTest extends UnitTestCase
 
     /**
      * @param string $type
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject
      */
     protected function getMockMessage($type)
     {
index fa208f9..12102e4 100644 (file)
@@ -43,7 +43,7 @@ class ActionControllerTest extends UnitTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $actionController;
 
@@ -69,7 +69,7 @@ class ActionControllerTest extends UnitTestCase
     {
         $mockRequest = $this->createMock(Request::class);
         $mockRequest->expects(self::once())->method('getControllerActionName')->willReturn('fooBar');
-        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockController = $this->getAccessibleMock(ActionController::class, ['fooBarAction'], [], '', false);
         $mockController->_set('request', $mockRequest);
         self::assertEquals('fooBarAction', $mockController->_call('resolveActionMethodName'));
@@ -84,7 +84,7 @@ class ActionControllerTest extends UnitTestCase
         $this->expectExceptionCode(1186669086);
         $mockRequest = $this->createMock(Request::class);
         $mockRequest->expects(self::once())->method('getControllerActionName')->willReturn('fooBar');
-        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Mvc\Controller\ActionController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockController = $this->getAccessibleMock(ActionController::class, ['otherBarAction'], [], '', false);
         $mockController->_set('request', $mockRequest);
         $mockController->_call('resolveActionMethodName');
@@ -286,9 +286,9 @@ class ActionControllerTest extends UnitTestCase
      */
     public function setViewConfigurationResolvesTemplateRootPathsForTemplateRootPath($configuration, $expected)
     {
-        /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $mockController */
+        /** @var ActionController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $mockController */
         $mockController = $this->getAccessibleMock(ActionController::class, ['dummy'], [], '', false);
-        /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
+        /** @var ConfigurationManagerInterface|\PHPUnit\Framework\MockObject\MockObject $mockConfigurationManager */
         $mockConfigurationManager = $this->createMock(ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects(self::any())->method('getConfiguration')->willReturn($configuration);
         $mockController->injectConfigurationManager($mockConfigurationManager);
@@ -364,9 +364,9 @@ class ActionControllerTest extends UnitTestCase
      */
     public function setViewConfigurationResolvesLayoutRootPathsForLayoutRootPath($configuration, $expected)
     {
-        /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $mockController */
+        /** @var ActionController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $mockController */
         $mockController = $this->getAccessibleMock(ActionController::class, ['dummy'], [], '', false);
-        /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
+        /** @var ConfigurationManagerInterface|\PHPUnit\Framework\MockObject\MockObject $mockConfigurationManager */
         $mockConfigurationManager = $this->createMock(ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects(self::any())->method('getConfiguration')->willReturn($configuration);
         $mockController->injectConfigurationManager($mockConfigurationManager);
@@ -442,9 +442,9 @@ class ActionControllerTest extends UnitTestCase
      */
     public function setViewConfigurationResolvesPartialRootPathsForPartialRootPath($configuration, $expected)
     {
-        /** @var ActionController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $mockController */
+        /** @var ActionController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $mockController */
         $mockController = $this->getAccessibleMock(ActionController::class, ['dummy'], [], '', false);
-        /** @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject $mockConfigurationManager */
+        /** @var ConfigurationManagerInterface|\PHPUnit\Framework\MockObject\MockObject $mockConfigurationManager */
         $mockConfigurationManager = $this->createMock(ConfigurationManagerInterface::class);
         $mockConfigurationManager->expects(self::any())->method('getConfiguration')->willReturn($configuration);
         $mockController->injectConfigurationManager($mockConfigurationManager);
index bb47732..7fab2b0 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class ResponseTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Mvc\Response|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Mvc\Response|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $mockResponse;
 
index 5da7996..b8eabdd 100644 (file)
@@ -32,7 +32,7 @@ class CacheHashEnforcerTest extends UnitTestCase
     protected $subject;
 
     /**
-     * @var TypoScriptFrontendController|\PHPUnit_Framework_MockObject_MockObject
+     * @var TypoScriptFrontendController|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $frontendControllerMock;
 
index 69eee25..9d08a5e 100644 (file)
@@ -33,12 +33,12 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class RequestBuilderTest extends UnitTestCase
 {
     /**
-     * @var RequestBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var RequestBuilder|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $requestBuilder;
 
     /**
-     * @var ConfigurationManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ConfigurationManagerInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockConfigurationManager;
 
@@ -48,22 +48,22 @@ class RequestBuilderTest extends UnitTestCase
     protected $configuration;
 
     /**
-     * @var ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockObjectManager;
 
     /**
-     * @var ExtensionService|\PHPUnit_Framework_MockObject_MockObject
+     * @var ExtensionService|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockExtensionService;
 
     /**
-     * @var EnvironmentService|\PHPUnit_Framework_MockObject_MockObject
+     * @var EnvironmentService|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockEnvironmentService;
 
     /**
-     * @var Request|\PHPUnit_Framework_MockObject_MockObject
+     * @var Request|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockRequest;
 
index ab06787..5900a08 100644 (file)
@@ -50,22 +50,22 @@ class UriBuilderTest extends UnitTestCase
     protected $mockConfigurationManager;
 
     /**
-     * @var ContentObjectRenderer|\PHPUnit_Framework_MockObject_MockObject
+     * @var ContentObjectRenderer|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockContentObject;
 
     /**
-     * @var Request|\PHPUnit_Framework_MockObject_MockObject
+     * @var Request|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockRequest;
 
     /**
-     * @var ExtensionService|\PHPUnit_Framework_MockObject_MockObject
+     * @var ExtensionService|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockExtensionService;
 
     /**
-     * @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var UriBuilder|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $uriBuilder;
 
@@ -438,7 +438,7 @@ class UriBuilderTest extends UnitTestCase
      */
     public function buildFrontendUriCreatesTypoLink()
     {
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
+        /** @var UriBuilder|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
         $uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
         $uriBuilder->_set('contentObject', $this->mockContentObject);
         $uriBuilder->expects(self::once())->method('buildTypolinkConfiguration')->willReturn(['someTypoLinkConfiguration']);
@@ -473,7 +473,7 @@ class UriBuilderTest extends UnitTestCase
      */
     public function buildFrontendUriCreatesAbsoluteUrisIfSpecified()
     {
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
+        /** @var UriBuilder|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
         $uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
         $uriBuilder->_set('contentObject', $this->mockContentObject);
         $uriBuilder->expects(self::once())->method('buildTypolinkConfiguration')->willReturn(['foo' => 'bar']);
@@ -489,7 +489,7 @@ class UriBuilderTest extends UnitTestCase
      */
     public function buildFrontendUriSetsAbsoluteUriSchemeIfSpecified()
     {
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
+        /** @var UriBuilder|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
         $uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
         $uriBuilder->_set('contentObject', $this->mockContentObject);
         $uriBuilder->expects(self::once())->method('buildTypolinkConfiguration')->willReturn(['foo' => 'bar']);
@@ -506,7 +506,7 @@ class UriBuilderTest extends UnitTestCase
      */
     public function buildFrontendUriDoesNotSetAbsoluteUriSchemeIfCreateAbsoluteUriIsFalse()
     {
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
+        /** @var UriBuilder|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $uriBuilder */
         $uriBuilder = $this->getAccessibleMock(UriBuilder::class, ['buildTypolinkConfiguration']);
         $uriBuilder->_set('contentObject', $this->mockContentObject);
         $uriBuilder->expects(self::once())->method('buildTypolinkConfiguration')->willReturn(['foo' => 'bar']);
@@ -771,7 +771,7 @@ class UriBuilderTest extends UnitTestCase
     {
         $mockValueObject = new ValueObjectFixture();
         $mockValueObject->name = 'foo';
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|object $mockUriBuilder */
+        /** @var UriBuilder|\PHPUnit\Framework\MockObject\MockObject|object $mockUriBuilder */
         $mockUriBuilder = $this->getAccessibleMock(UriBuilder::class, ['convertTransientObjectToArray']);
         $mockUriBuilder->expects(self::once())->method('convertTransientObjectToArray')->willReturn(['foo' => 'bar']);
         $actualResult = $mockUriBuilder->_call('convertDomainObjectsToIdentityArrays', ['object' => $mockValueObject]);
@@ -788,7 +788,7 @@ class UriBuilderTest extends UnitTestCase
         $this->expectExceptionCode(1260881688);
         $mockEntity = new EntityFixture();
         $mockEntity->name = 'foo';
-        /** @var UriBuilder|\PHPUnit_Framework_MockObject_MockObject|object $mockUriBuilder */
+        /** @var UriBuilder|\PHPUnit\Framework\MockObject\MockObject|object $mockUriBuilder */
         $mockUriBuilder = $this->getAccessibleMock(UriBuilder::class, ['dummy']);
         $mockUriBuilder->_call('convertDomainObjectsToIdentityArrays', ['object' => $mockEntity]);
     }
index 1f92ae1..4dd274b 100644 (file)
@@ -40,7 +40,7 @@ class ContainerTest extends UnitTestCase
     protected $subject;
 
     /**
-     * @var LoggerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var LoggerInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $logger;
 
index 9685247..33b5990 100644 (file)
@@ -42,17 +42,17 @@ class BackendTest extends UnitTestCase
      */
     public function insertRelationInRelationtableSetsMmMatchFieldsInRow()
     {
-        /* \TYPO3\CMS\Extbase\Persistence\Generic\Backend|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /* \TYPO3\CMS\Extbase\Persistence\Generic\Backend|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $fixture = $this->getAccessibleMock(Backend::class, ['dummy'], [], '', false);
-        /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper|\PHPUnit_Framework_MockObject_MockObject */
+        /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapper|\PHPUnit\Framework\MockObject\MockObject */
         $dataMapFactory = $this->createMock(DataMapFactory::class);
-        /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap|\PHPUnit_Framework_MockObject_MockObject */
+        /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap|\PHPUnit\Framework\MockObject\MockObject */
         $dataMap = $this->createMock(DataMap::class);
-        /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap|\PHPUnit_Framework_MockObject_MockObject */
+        /* \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap|\PHPUnit\Framework\MockObject\MockObject */
         $columnMap = $this->createMock(ColumnMap::class);
-        /* \TYPO3\CMS\Extbase\Persistence\Generic\Storage\BackendInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /* \TYPO3\CMS\Extbase\Persistence\Generic\Storage\BackendInterface|\PHPUnit\Framework\MockObject\MockObject */
         $storageBackend = $this->createMock(BackendInterface::class);
-        /* \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /* \TYPO3\CMS\Extbase\DomainObject\DomainObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $domainObject = $this->createMock(DomainObjectInterface::class);
 
         $mmMatchFields = [
index b5a5db6..4862529 100644 (file)
@@ -477,13 +477,13 @@ class DataMapFactoryTest extends UnitTestCase
             'Tx_SampleExt_Domain_Model_LevelOne2'
         ];
 
-        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
+        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject $objectManager */
         $objectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManager::class)
             ->setMethods(['dummy'])
             ->disableOriginalConstructor()
             ->getMock();
 
-        /** @var $configurationManager \TYPO3\CMS\Extbase\Configuration\ConfigurationManager|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $configurationManager \TYPO3\CMS\Extbase\Configuration\ConfigurationManager|\PHPUnit\Framework\MockObject\MockObject */
         $configurationManager = $this->createMock(\TYPO3\CMS\Extbase\Configuration\ConfigurationManager::class);
         $configurationManager->expects(self::once())->method('getConfiguration')->with('Framework')->willReturn($configuration);
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory $dataMapFactory */
@@ -529,7 +529,7 @@ class DataMapFactoryTest extends UnitTestCase
         /** @var $dataMapFactory \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory */
         $dataMapFactory = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory::class, ['dummy'], [], '', false);
 
-        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
+        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject $objectManager */
         $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $columnMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\ColumnMap::class)
             ->setConstructorArgs(['column', 'property'])
index 8cdbb53..5723a1e 100644 (file)
@@ -41,7 +41,7 @@ class DataMapperTest extends UnitTestCase
         $rows = [['uid' => '1234']];
         $object = new \stdClass();
 
-        /** @var DataMapper|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject $dataMapper */
+        /** @var DataMapper|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject $dataMapper */
         $dataMapper = $this->getMockBuilder(DataMapper::class)
             ->setConstructorArgs([
                 $this->createMock(\TYPO3\CMS\Extbase\Reflection\ReflectionService::class),
@@ -246,7 +246,7 @@ class DataMapperTest extends UnitTestCase
         $object = new Fixture\DummyParentEntity();
         $child = new Fixture\DummyChildEntity();
 
-        /** @var \TYPO3\CMS\Extbase\Reflection\ClassSchema|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject $classSchema1 */
+        /** @var \TYPO3\CMS\Extbase\Reflection\ClassSchema|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject $classSchema1 */
         $classSchema1 = new ClassSchema(Fixture\DummyParentEntity::class);
         $identifier = 1;
 
@@ -316,7 +316,7 @@ class DataMapperTest extends UnitTestCase
      */
     public function mapDateTimeHandlesDifferentFieldEvaluations($value, $storageFormat, $expectedValue)
     {
-        /** @var DataMapper|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject $accessibleDataMapFactory */
+        /** @var DataMapper|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject $accessibleDataMapFactory */
         $accessibleDataMapFactory = $this->getAccessibleMock(DataMapper::class, ['dummy'], [], '', false);
 
         /** @var $dateTime NULL|\DateTime */
@@ -334,7 +334,7 @@ class DataMapperTest extends UnitTestCase
      */
     public function testMapDateTimeHandlesSubclassesOfDateTime()
     {
-        /** @var DataMapper|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject $accessibleDataMapFactory */
+        /** @var DataMapper|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\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';
index 929395a..3132342 100644 (file)
@@ -32,24 +32,24 @@ class QueryFactoryTest extends UnitTestCase
     protected $queryFactory;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $objectManager;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $dataMapFactory;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $dataMap;
 
     protected function setUp(): void
     {
         parent::setUp();
-        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
+        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject $objectManager */
         $this->objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
 
         $this->dataMap = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMap::class)
index 9cea597..1432b96 100644 (file)
@@ -186,7 +186,7 @@ class QueryResultTest extends UnitTestCase
      */
     public function initializeExecutesQueryWithArrayFetchMode()
     {
-        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\QueryResult|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $queryResult = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Persistence\Generic\QueryResult::class, ['dummy'], [$this->mockQuery]);
         $queryResult->_set('persistenceManager', $this->mockPersistenceManager);
         $queryResult->_set('dataMapper', $this->mockDataMapper);
index c31375a..0ab7c4b 100644 (file)
@@ -22,7 +22,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class QueryTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\Generic\Query|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Persistence\Generic\Query|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $query;
 
@@ -61,7 +61,7 @@ class QueryTest extends UnitTestCase
      */
     public function executeReturnsQueryResultInstanceAndInjectsItself()
     {
-        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
+        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject $objectManager */
         $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         $this->query->_set('objectManager', $objectManager);
         $queryResult = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\QueryResult::class);
@@ -145,7 +145,7 @@ class QueryTest extends UnitTestCase
      */
     public function equalsForCaseSensitiveFalseLowercasesOperand($propertyName, $operand, $expectedOperand)
     {
-        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject $objectManager */
+        /** @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject $objectManager */
         $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManager::class);
         /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Qom\DynamicOperandInterface $dynamicOperand */
         $dynamicOperand = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Qom\PropertyValueInterface::class);
index 1b3b892..8fad42a 100644 (file)
@@ -348,7 +348,7 @@ class Typo3DbQueryParserTest extends UnitTestCase
         $GLOBALS['TCA'][$table]['ctrl'] = [
             'languageField' => 'sys_language_uid'
         ];
-        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\PHPUnit_Framework_MockObject_MockObject $querySettings */
+        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\PHPUnit\Framework\MockObject\MockObject $querySettings */
         $querySettings = $this->createMock(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class);
         $mockTypo3DbQueryParser = $this->getAccessibleMock(Typo3DbQueryParser::class, ['dummy'], [], '', false);
         $queryBuilderProphet = $this->getQueryBuilderWithExpressionBuilderProphet();
@@ -367,7 +367,7 @@ class Typo3DbQueryParserTest extends UnitTestCase
         $GLOBALS['TCA'][$table]['ctrl'] = [
             'languageField' => 'sys_language_uid'
         ];
-        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\PHPUnit_Framework_MockObject_MockObject $querySettings */
+        /** @var \TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings|\PHPUnit\Framework\MockObject\MockObject $querySettings */
         $querySettings = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings::class)
             ->setMethods(['dummy'])
             ->getMock();
@@ -645,7 +645,7 @@ class Typo3DbQueryParserTest extends UnitTestCase
         $mockQuerySettings->expects(self::once())->method('getEnableFieldsToBeIgnored')->willReturn($enableFieldsToBeIgnored);
         $mockQuerySettings->expects(self::once())->method('getIncludeDeleted')->willReturn($deletedValue);
 
-        /** @var $mockEnvironmentService \TYPO3\CMS\Extbase\Service\EnvironmentService | \PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockEnvironmentService \TYPO3\CMS\Extbase\Service\EnvironmentService | \PHPUnit\Framework\MockObject\MockObject */
         $mockEnvironmentService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\EnvironmentService::class)
             ->setMethods(['isEnvironmentInFrontendMode'])
             ->getMock();
@@ -709,7 +709,7 @@ class Typo3DbQueryParserTest extends UnitTestCase
         $mockQuerySettings->setIgnoreEnableFields(!$respectEnableFields);
         $mockQuerySettings->setIncludeDeleted(!$respectEnableFields);
 
-        /** @var $mockEnvironmentService \TYPO3\CMS\Extbase\Service\EnvironmentService | \PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockEnvironmentService \TYPO3\CMS\Extbase\Service\EnvironmentService | \PHPUnit\Framework\MockObject\MockObject */
         $mockEnvironmentService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\EnvironmentService::class)
             ->setMethods(['isEnvironmentInFrontendMode'])
             ->getMock();
@@ -744,7 +744,7 @@ class Typo3DbQueryParserTest extends UnitTestCase
         $mockQuerySettings->expects(self::once())->method('getEnableFieldsToBeIgnored')->willReturn([]);
         $mockQuerySettings->expects(self::once())->method('getIncludeDeleted')->willReturn(true);
 
-        /** @var $mockEnvironmentService \TYPO3\CMS\Extbase\Service\EnvironmentService | \PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockEnvironmentService \TYPO3\CMS\Extbase\Service\EnvironmentService | \PHPUnit\Framework\MockObject\MockObject */
         $mockEnvironmentService = $this->getMockBuilder(\TYPO3\CMS\Extbase\Service\EnvironmentService::class)
             ->setMethods(['isEnvironmentInFrontendMode'])
             ->getMock();
index ff6a731..7f9e076 100644 (file)
@@ -26,7 +26,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class RepositoryTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\Repository|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\Persistence\Repository|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $repository;
 
index 46e0b5c..70e7a7f 100644 (file)
@@ -28,12 +28,12 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class PropertyMapperTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationBuilder|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockConfigurationBuilder;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockConfiguration;
 
@@ -69,7 +69,7 @@ class PropertyMapperTest extends UnitTestCase
      */
     public function sourceTypeCanBeCorrectlyDetermined($source, $sourceType)
     {
-        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $propertyMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class, ['dummy']);
         self::assertEquals($sourceType, $propertyMapper->_call('determineSourceType', $source));
     }
@@ -95,7 +95,7 @@ class PropertyMapperTest extends UnitTestCase
     {
         $this->expectException(InvalidSourceException::class);
         $this->expectExceptionCode(1297773150);
-        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $propertyMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class, ['dummy']);
         $propertyMapper->_call('determineSourceType', $source);
     }
@@ -105,7 +105,7 @@ class PropertyMapperTest extends UnitTestCase
      * @param bool $canConvertFrom
      * @param array $properties
      * @param string $typeOfSubObject
-     * @return \PHPUnit_Framework_MockObject_MockObject
+     * @return \PHPUnit\Framework\MockObject\MockObject
      */
     protected function getMockTypeConverter($name = '', $canConvertFrom = true, $properties = [], $typeOfSubObject = '')
     {
@@ -125,7 +125,7 @@ class PropertyMapperTest extends UnitTestCase
     {
         $mockTypeConverter = $this->getMockTypeConverter();
         $this->mockConfiguration->expects(self::any())->method('getTypeConverter')->willReturn($mockTypeConverter);
-        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $propertyMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class, ['dummy']);
         self::assertSame($mockTypeConverter, $propertyMapper->_call('findTypeConverter', 'someSource', 'someTargetType', $this->mockConfiguration));
     }
@@ -359,7 +359,7 @@ class PropertyMapperTest extends UnitTestCase
      */
     public function findFirstEligibleTypeConverterInObjectHierarchyShouldReturnNullIfSourceTypeIsUnknown()
     {
-        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Property\PropertyMapper|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $propertyMapper = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Property\PropertyMapper::class, ['dummy']);
         self::assertNull($propertyMapper->_call('findFirstEligibleTypeConverterInObjectHierarchy', 'source', 'unknownSourceType', \TYPO3\CMS\Extbase\Core\Bootstrap::class));
     }
index 8c24c14..b935505 100644 (file)
@@ -30,17 +30,17 @@ class ObjectConverterTest extends UnitTestCase
     protected $converter;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Reflection\ReflectionService|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Reflection\ReflectionService|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockReflectionService;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockObjectManager;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Object\Container\Container|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Object\Container\Container|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockContainer;
 
index 17aaa23..2b307c4 100644 (file)
@@ -31,27 +31,27 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class PersistentObjectConverterTest extends UnitTestCase
 {
     /**
-     * @var \TYPO3\CMS\Extbase\Property\TypeConverterInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Property\TypeConverterInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $converter;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Reflection\ReflectionService|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Reflection\ReflectionService|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockReflectionService;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockPersistenceManager;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockObjectManager;
 
     /**
-     * @var \TYPO3\CMS\Extbase\Object\Container\Container|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Extbase\Object\Container\Container|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockContainer;
 
index 01ae0b6..20755f1 100644 (file)
@@ -39,7 +39,7 @@ class ImageScriptServiceTest extends UnitTestCase
     protected $subject;
 
     /**
-     * @var EnvironmentService|\PHPUnit_Framework_MockObject_MockObject
+     * @var EnvironmentService|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $environmentService;
 
index 2010fd1..4598559 100644 (file)
@@ -42,7 +42,7 @@ class DispatcherTest extends UnitTestCase
     protected $objectManagerProphecy;
 
     /**
-     * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Extbase\SignalSlot\Dispatcher|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $signalSlotDispatcher;
 
index 5ab1415..f5ffa1a 100644 (file)
@@ -26,7 +26,7 @@ class AlphanumericValidatorTest extends UnitTestCase
      */
     public function alphanumericValidatorShouldReturnNoErrorsForAnAlphanumericString()
     {
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class)
             ->setMethods(['translateErrorMessage'])
             ->getMock();
@@ -38,7 +38,7 @@ class AlphanumericValidatorTest extends UnitTestCase
      */
     public function alphanumericValidatorReturnsErrorsForAStringWithSpecialCharacters()
     {
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class)
             ->setMethods(['translateErrorMessage'])
             ->getMock();
@@ -50,7 +50,7 @@ class AlphanumericValidatorTest extends UnitTestCase
      */
     public function alphanumericValidatorCreatesTheCorrectErrorForAnInvalidSubject()
     {
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class)
             ->setMethods(['translateErrorMessage'])
             ->getMock();
@@ -62,7 +62,7 @@ class AlphanumericValidatorTest extends UnitTestCase
      */
     public function alphanumericValidatorShouldReturnNoErrorsForAnAlphanumericUnicodeString()
     {
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var \TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\AlphanumericValidator::class)
             ->setMethods(['translateErrorMessage'])
             ->getMock();
index b621892..b505306 100644 (file)
@@ -40,7 +40,7 @@ class CollectionValidatorTest extends UnitTestCase
     /**
      * @param array $options
      * @param array $mockedMethods
-     * @return \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @return \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected function getValidator(array $options = [], array $mockedMethods = ['translateErrorMessage'])
     {
index ea423c2..46147b6 100644 (file)
@@ -100,7 +100,7 @@ class ConjunctionValidatorTest extends UnitTestCase
      */
     public function removingAValidatorOfTheValidatorConjunctionWorks()
     {
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var \TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $validatorConjunction = $this->getAccessibleMock(\TYPO3\CMS\Extbase\Validation\Validator\ConjunctionValidator::class, ['dummy'], [[]], '', true);
         $validator1 = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\ValidatorInterface::class)
             ->setMethods(['validate', 'getOptions'])
index afa1c7b..e75a636 100644 (file)
@@ -44,7 +44,7 @@ class EmailAddressValidatorTest extends UnitTestCase
      */
     public function emailAddressValidatorReturnsNoErrorsForAValidEmailAddress($address)
     {
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class)
             ->setMethods(['translateErrorMessage'])
             ->getMock();
@@ -78,7 +78,7 @@ class EmailAddressValidatorTest extends UnitTestCase
      */
     public function emailAddressValidatorReturnsFalseForAnInvalidEmailAddress($address)
     {
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class)
             ->setMethods(['translateErrorMessage'])
             ->getMock();
@@ -90,7 +90,7 @@ class EmailAddressValidatorTest extends UnitTestCase
      */
     public function emailValidatorCreatesTheCorrectErrorForAnInvalidEmailAddress()
     {
-        /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit_Framework_MockObject_MockObject $subject */
+        /** @var \TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator|\PHPUnit\Framework\MockObject\MockObject $subject */
         $subject = $this->getMockBuilder(\TYPO3\CMS\Extbase\Validation\Validator\EmailAddressValidator::class)
             ->setMethods(['translateErrorMessage'])
             ->getMock();
index a5fe100..1d17d51 100644 (file)
@@ -91,13 +91,13 @@ class GenericObjectValidatorTest extends UnitTestCase
     {
         $validator = new GenericObjectValidator();
 
-        /** @var ValidatorInterface|\PHPUnit_Framework_MockObject_MockObject $validatorForFoo */
+        /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $validatorForFoo */
         $validatorForFoo = $this->getMockBuilder(ValidatorInterface::class)
             ->setMethods(['validate', 'getOptions'])
             ->getMock();
         $validatorForFoo->expects(self::once())->method('validate')->with('foovalue')->willReturn($validationResultForFoo);
 
-        /** @var ValidatorInterface|\PHPUnit_Framework_MockObject_MockObject $validatorForBar */
+        /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $validatorForBar */
         $validatorForBar = $this->getMockBuilder(ValidatorInterface::class)
             ->setMethods(['validate', 'getOptions'])
             ->getMock();
@@ -159,7 +159,7 @@ class GenericObjectValidatorTest extends UnitTestCase
         $result = new Result();
         $result->addError($error);
 
-        /** @var ValidatorInterface|\PHPUnit_Framework_MockObject_MockObject $mockUuidValidator */
+        /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $mockUuidValidator */
         $mockUuidValidator = $this->getMockBuilder(ValidatorInterface::class)
             ->setMethods(['validate', 'getOptions'])
             ->getMock();
@@ -195,7 +195,7 @@ class GenericObjectValidatorTest extends UnitTestCase
         $result1 = new Result();
         $result1->addError($error1);
 
-        /** @var ValidatorInterface|\PHPUnit_Framework_MockObject_MockObject $mockUuidValidator */
+        /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $mockUuidValidator */
         $mockUuidValidator = $this->getMockBuilder(ValidatorInterface::class)
             ->setMethods(['validate', 'getOptions'])
             ->getMock();
@@ -231,7 +231,7 @@ class GenericObjectValidatorTest extends UnitTestCase
         $result1 = new Result();
         $result1->addError($error1);
 
-        /** @var ValidatorInterface|\PHPUnit_Framework_MockObject_MockObject $mockValidatorUuidNot0xF */
+        /** @var ValidatorInterface|\PHPUnit\Framework\MockObject\MockObject $mockValidatorUuidNot0xF */
         $mockValidatorUuidNot0xF = $this->getMockBuilder(ValidatorInterface::class)
             ->setMethods(['validate', 'getOptions'])
             ->getMock();
index 229a095..b190fc7 100644 (file)
@@ -22,12 +22,12 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class DownloadQueueTest extends UnitTestCase
 {
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Extensionmanager\Domain\Model\DownloadQueue
+     * @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|\TYPO3\CMS\Extensionmanager\Domain\Model\DownloadQueue
      */
     protected $downloadQueueMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Extension
+     * @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\CMS\Extensionmanager\Domain\Model\Extension
      */
     protected $extensionMock;
 
index fe5e9ea..9ca11e0 100644 (file)
@@ -35,7 +35,7 @@ class RepositoryRepositoryTest extends UnitTestCase
     {
         parent::setUp();
         $this->mockObjectManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class)->getMock();
-        /** @var $subject \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $subject \TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository|\PHPUnit\Framework\MockObject\MockObject */
         $this->subject = $this->getMockBuilder(\TYPO3\CMS\Extensionmanager\Domain\Repository\RepositoryRepository::class)
             ->setMethods(['findAll'])
             ->setConstructorArgs([$this->mockObjectManager])
index 5ad51f6..ca401c6 100644 (file)
@@ -53,7 +53,7 @@ class ExtensionStatusTest extends UnitTestCase
     {
         parent::setUp();
         $this->mockObjectManager = $this->getMockBuilder(ObjectManagerInterface::class)->getMock();
-        /** @var $mockRepositoryRepository RepositoryRepository|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockRepositoryRepository RepositoryRepository|\PHPUnit\Framework\MockObject\MockObject */
         $this->mockRepositoryRepository = $this->getMockBuilder(RepositoryRepository::class)
             ->setConstructorArgs([$this->mockObjectManager])
             ->getMock();
@@ -120,7 +120,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getStatusCallsGetMainRepositoryStatusForMainRepositoryStatusResult()
     {
-        /** @var $mockTerObject Extension|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockTerObject Extension|\PHPUnit\Framework\MockObject\MockObject */
         $mockTerObject = $this->getMockBuilder(Extension::class)->getMock();
         $mockTerObject
             ->expects(self::any())
@@ -136,14 +136,14 @@ class ExtensionStatusTest extends UnitTestCase
                 'terObject' => $mockTerObject
             ],
         ];
-        /** @var $mockListUtility ListUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockListUtility ListUtility|\PHPUnit\Framework\MockObject\MockObject */
         $mockListUtility = $this->getMockBuilder(ListUtility::class)->getMock();
         $mockListUtility
             ->expects(self::once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->willReturn($mockExtensionList);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['getMainRepositoryStatus'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $mockReport->_set('listUtility', $mockListUtility);
@@ -167,7 +167,7 @@ class ExtensionStatusTest extends UnitTestCase
             ->method('findOneTypo3OrgRepository')
             ->willReturn(null);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -188,7 +188,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getMainRepositoryStatusReturnsNoticeIfRepositoryUpdateIsLongerThanSevenDaysAgo()
     {
-        /** @var $mockRepositoryRepository Repository|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockRepositoryRepository Repository|\PHPUnit\Framework\MockObject\MockObject */
         $mockRepository = $this->getMockBuilder(Repository::class)->getMock();
         $mockRepository
             ->expects(self::once())
@@ -200,7 +200,7 @@ class ExtensionStatusTest extends UnitTestCase
             ->method('findOneTypo3OrgRepository')
             ->willReturn($mockRepository);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -222,7 +222,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getMainRepositoryStatusReturnsOkIfUpdatedLessThanSevenDaysAgo()
     {
-        /** @var $mockRepositoryRepository Repository|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockRepositoryRepository Repository|\PHPUnit\Framework\MockObject\MockObject */
         $mockRepository = $this->getMockBuilder(Repository::class)->getMock();
         $mockRepository
             ->expects(self::once())
@@ -234,7 +234,7 @@ class ExtensionStatusTest extends UnitTestCase
             ->method('findOneTypo3OrgRepository')
             ->willReturn($mockRepository);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -256,7 +256,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getSecurityStatusOfExtensionsReturnsOkForLoadedExtensionIfNoInsecureExtensionIsLoaded()
     {
-        /** @var $mockTerObject Extension|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockTerObject Extension|\PHPUnit\Framework\MockObject\MockObject */
         $mockTerObject = $this->getMockBuilder(Extension::class)->getMock();
         $mockTerObject
             ->expects(self::any())
@@ -272,14 +272,14 @@ class ExtensionStatusTest extends UnitTestCase
                 'terObject' => $mockTerObject
             ],
         ];
-        /** @var $mockListUtility ListUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockListUtility ListUtility|\PHPUnit\Framework\MockObject\MockObject */
         $mockListUtility = $this->getMockBuilder(ListUtility::class)->getMock();
         $mockListUtility
             ->expects(self::once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->willReturn($mockExtensionList);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -302,7 +302,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getSecurityStatusOfExtensionsReturnsErrorForLoadedExtensionIfInsecureExtensionIsLoaded()
     {
-        /** @var $mockTerObject Extension|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockTerObject Extension|\PHPUnit\Framework\MockObject\MockObject */
         $mockTerObject = $this->getMockBuilder(Extension::class)->getMock();
         $mockTerObject
             ->expects(self::any())
@@ -318,14 +318,14 @@ class ExtensionStatusTest extends UnitTestCase
                 'terObject' => $mockTerObject
             ],
         ];
-        /** @var $mockListUtility ListUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockListUtility ListUtility|\PHPUnit\Framework\MockObject\MockObject */
         $mockListUtility = $this->getMockBuilder(ListUtility::class)->getMock();
         $mockListUtility
             ->expects(self::once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->willReturn($mockExtensionList);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -348,7 +348,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getSecurityStatusOfExtensionsReturnsOkForExistingExtensionIfNoInsecureExtensionExists()
     {
-        /** @var $mockTerObject Extension|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockTerObject Extension|\PHPUnit\Framework\MockObject\MockObject */
         $mockTerObject = $this->getMockBuilder(Extension::class)->getMock();
         $mockTerObject
             ->expects(self::any())
@@ -363,14 +363,14 @@ class ExtensionStatusTest extends UnitTestCase
                 'terObject' => $mockTerObject
             ],
         ];
-        /** @var $mockListUtility ListUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockListUtility ListUtility|\PHPUnit\Framework\MockObject\MockObject */
         $mockListUtility = $this->getMockBuilder(ListUtility::class)->getMock();
         $mockListUtility
             ->expects(self::once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->willReturn($mockExtensionList);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -393,7 +393,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getSecurityStatusOfExtensionsReturnsErrorForExistingExtensionIfInsecureExtensionExists()
     {
-        /** @var $mockTerObject Extension|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockTerObject Extension|\PHPUnit\Framework\MockObject\MockObject */
         $mockTerObject = $this->getMockBuilder(Extension::class)->getMock();
         $mockTerObject
             ->expects(self::any())
@@ -408,14 +408,14 @@ class ExtensionStatusTest extends UnitTestCase
                 'terObject' => $mockTerObject
             ],
         ];
-        /** @var $mockListUtility ListUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockListUtility ListUtility|\PHPUnit\Framework\MockObject\MockObject */
         $mockListUtility = $this->getMockBuilder(ListUtility::class)->getMock();
         $mockListUtility
             ->expects(self::once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->willReturn($mockExtensionList);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -438,7 +438,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getSecurityStatusOfExtensionsReturnsOkForLoadedExtensionIfNoOutdatedExtensionIsLoaded()
     {
-        /** @var $mockTerObject Extension|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockTerObject Extension|\PHPUnit\Framework\MockObject\MockObject */
         $mockTerObject = $this->getMockBuilder(Extension::class)->getMock();
         $mockTerObject
             ->expects(self::any())
@@ -454,14 +454,14 @@ class ExtensionStatusTest extends UnitTestCase
                 'terObject' => $mockTerObject
             ],
         ];
-        /** @var $mockListUtility ListUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockListUtility ListUtility|\PHPUnit\Framework\MockObject\MockObject */
         $mockListUtility = $this->getMockBuilder(ListUtility::class)->getMock();
         $mockListUtility
             ->expects(self::once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->willReturn($mockExtensionList);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -484,7 +484,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getSecurityStatusOfExtensionsReturnsErrorForLoadedExtensionIfOutdatedExtensionIsLoaded()
     {
-        /** @var $mockTerObject Extension|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockTerObject Extension|\PHPUnit\Framework\MockObject\MockObject */
         $mockTerObject = $this->getMockBuilder(Extension::class)->getMock();
         $mockTerObject
             ->expects(self::any())
@@ -500,14 +500,14 @@ class ExtensionStatusTest extends UnitTestCase
                 'terObject' => $mockTerObject
             ],
         ];
-        /** @var $mockListUtility ListUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockListUtility ListUtility|\PHPUnit\Framework\MockObject\MockObject */
         $mockListUtility = $this->getMockBuilder(ListUtility::class)->getMock();
         $mockListUtility
             ->expects(self::once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->willReturn($mockExtensionList);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -530,7 +530,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getSecurityStatusOfExtensionsReturnsOkForExistingExtensionIfNoOutdatedExtensionExists()
     {
-        /** @var $mockTerObject Extension|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockTerObject Extension|\PHPUnit\Framework\MockObject\MockObject */
         $mockTerObject = $this->getMockBuilder(Extension::class)->getMock();
         $mockTerObject
             ->expects(self::any())
@@ -545,14 +545,14 @@ class ExtensionStatusTest extends UnitTestCase
                 'terObject' => $mockTerObject
             ],
         ];
-        /** @var $mockListUtility ListUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockListUtility ListUtility|\PHPUnit\Framework\MockObject\MockObject */
         $mockListUtility = $this->getMockBuilder(ListUtility::class)->getMock();
         $mockListUtility
             ->expects(self::once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->willReturn($mockExtensionList);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
@@ -575,7 +575,7 @@ class ExtensionStatusTest extends UnitTestCase
      */
     public function getSecurityStatusOfExtensionsReturnsErrorForExistingExtensionIfOutdatedExtensionExists()
     {
-        /** @var $mockTerObject Extension|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockTerObject Extension|\PHPUnit\Framework\MockObject\MockObject */
         $mockTerObject = $this->getMockBuilder(Extension::class)->getMock();
         $mockTerObject
             ->expects(self::any())
@@ -590,14 +590,14 @@ class ExtensionStatusTest extends UnitTestCase
                 'terObject' => $mockTerObject
             ],
         ];
-        /** @var $mockListUtility ListUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $mockListUtility ListUtility|\PHPUnit\Framework\MockObject\MockObject */
         $mockListUtility = $this->getMockBuilder(ListUtility::class)->getMock();
         $mockListUtility
             ->expects(self::once())
             ->method('getAvailableAndInstalledExtensionsWithAdditionalInformation')
             ->willReturn($mockExtensionList);
 
-        /** @var $mockReport ExtensionStatus|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
+        /** @var $mockReport ExtensionStatus|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface */
         $mockReport = $this->getAccessibleMock(ExtensionStatus::class, ['dummy'], [], '', false);
         $mockReport->_set('objectManager', $this->mockObjectManager);
         $statusMock = $this->createMock(Status::class);
index ff9ae68..0d2d72b 100644 (file)
@@ -45,7 +45,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkTypo3DependencyThrowsExceptionIfVersionNumberIsTooLow()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -63,7 +63,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkTypo3DependencyThrowsExceptionIfVersionNumberIsTooHigh()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -82,7 +82,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkTypo3DependencyThrowsExceptionIfIdentifierIsNotTypo3()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -99,7 +99,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkTypo3DependencyReturnsTrueIfVersionNumberIsInRange()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -116,7 +116,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkTypo3DependencyCanHandleEmptyVersionHighestVersion()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -133,7 +133,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkTypo3DependencyCanHandleEmptyVersionLowestVersion()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -150,7 +150,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkPhpDependencyThrowsExceptionIfVersionNumberIsTooLow()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -168,7 +168,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkPhpDependencyThrowsExceptionIfVersionNumberIsTooHigh()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -187,7 +187,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkPhpDependencyThrowsExceptionIfIdentifierIsNotTypo3()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -204,7 +204,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkPhpDependencyReturnsTrueIfVersionNumberIsInRange()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -221,7 +221,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkPhpDependencyCanHandleEmptyVersionHighestVersion()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -238,7 +238,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function checkPhpDependencyCanHandleEmptyVersionLowestVersion()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -267,7 +267,7 @@ class DependencyUtilityTest extends UnitTestCase
         $dependencyStorage = new \SplObjectStorage();
         $dependencyStorage->attach($dependencyMock);
         $extensionMock->setDependencies($dependencyStorage);
-        /** @var \PHPUnit_Framework_MockObject_MockObject|DependencyUtility $dependencyUtility */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|DependencyUtility $dependencyUtility */
         $dependencyUtility = $this->getMockBuilder(DependencyUtility::class)
             ->setMethods(['checkPhpDependency', 'checkTypo3Dependency'])
             ->getMock();
@@ -292,7 +292,7 @@ class DependencyUtilityTest extends UnitTestCase
         $dependencyStorage = new \SplObjectStorage();
         $dependencyStorage->attach($dependencyMock);
         $extensionMock->setDependencies($dependencyStorage);
-        /** @var \PHPUnit_Framework_MockObject_MockObject|DependencyUtility $dependencyUtility */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|DependencyUtility $dependencyUtility */
         $dependencyUtility = $this->getMockBuilder(DependencyUtility::class)
             ->setMethods(['checkPhpDependency', 'checkTypo3Dependency'])
             ->getMock();
@@ -306,7 +306,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function isVersionCompatibleReturnsTrueForCompatibleVersion()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
@@ -323,7 +323,7 @@ class DependencyUtilityTest extends UnitTestCase
      */
     public function isVersionCompatibleReturnsFalseForIncompatibleVersion()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|Dependency $dependencyMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|Dependency $dependencyMock */
         $dependencyMock = $this->getMockBuilder(Dependency::class)
             ->setMethods(['getHighestVersion', 'getLowestVersion'])
             ->getMock();
index c7c9e8e..084a871 100644 (file)
@@ -441,11 +441,11 @@ class FileHandlingUtilityTest extends UnitTestCase
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject|FileHandlingUtility
+     * @return \PHPUnit\Framework\MockObject\MockObject|FileHandlingUtility
      */
     protected function getPreparedFileHandlingMockForDirectoryCreationTests()
     {
-        /** @var $fileHandlerMock FileHandlingUtility|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $fileHandlerMock FileHandlingUtility|\PHPUnit\Framework\MockObject\MockObject */
         $fileHandlerMock = $this->getMockBuilder(FileHandlingUtility::class)
             ->setMethods(['createNestedDirectory', 'getAbsolutePath', 'directoryExists'])
             ->getMock();
index 864806c..f388c3a 100644 (file)
@@ -55,7 +55,7 @@ class InstallUtilityTest extends UnitTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|InstallUtility|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|InstallUtility|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $installMock;
 
index f914802..5b104b0 100644 (file)
@@ -33,12 +33,12 @@ class AbstractWidgetControllerTest extends UnitTestCase
      */
     public function canHandleWidgetRequest()
     {
-        /** @var WidgetRequest|\PHPUnit_Framework_MockObject_MockObject $request */
+        /** @var WidgetRequest|\PHPUnit\Framework\MockObject\MockObject $request */
         $request = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class)
             ->setMethods(['dummy'])
             ->disableOriginalConstructor()
             ->getMock();
-        /** @var AbstractWidgetController|\PHPUnit_Framework_MockObject_MockObject $abstractWidgetController */
+        /** @var AbstractWidgetController|\PHPUnit\Framework\MockObject\MockObject $abstractWidgetController */
         $abstractWidgetController = $this->getMockBuilder(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class)
             ->setMethods(['dummy'])
             ->disableOriginalConstructor()
@@ -53,12 +53,12 @@ class AbstractWidgetControllerTest extends UnitTestCase
     {
         $widgetContext = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetContext::class);
         $widgetContext->expects(self::once())->method('getWidgetConfiguration')->willReturn('myConfiguration');
-        /** @var WidgetRequest|\PHPUnit_Framework_MockObject_MockObject $request */
+        /** @var WidgetRequest|\PHPUnit\Framework\MockObject\MockObject $request */
         $request = $this->createMock(\TYPO3\CMS\Fluid\Core\Widget\WidgetRequest::class);
         $request->expects(self::once())->method('getWidgetContext')->willReturn($widgetContext);
-        /** @var ResponseInterface|\PHPUnit_Framework_MockObject_MockObject $response */
+        /** @var ResponseInterface|\PHPUnit\Framework\MockObject\MockObject $response */
         $response = $this->createMock(\TYPO3\CMS\Extbase\Mvc\ResponseInterface::class);
-        /** @var AbstractWidgetController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $abstractWidgetController */
+        /** @var AbstractWidgetController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $abstractWidgetController */
         $abstractWidgetController = $this->getAccessibleMock(\TYPO3\CMS\Fluid\Core\Widget\AbstractWidgetController::class, ['resolveActionMethodName', 'initializeActionMethodArguments', 'initializeActionMethodValidators', 'initializeAction', 'checkRequestHash', 'mapRequestArgumentsToControllerArguments', 'buildControllerContext', 'resolveView', 'callActionMethod'], [], '', false);
         $mockUriBuilder = $this->createMock(\TYPO3\CMS\Extbase\Mvc\Web\Routing\UriBuilder::class);
         $objectManager = $this->createMock(\TYPO3\CMS\Extbase\Object\ObjectManagerInterface::class);
index 7989f4f..427d13b 100644 (file)
@@ -31,12 +31,12 @@ class AbstractTemplateViewTest extends UnitTestCase
     protected $view;
 
     /**
-     * @var RenderingContext|\PHPUnit_Framework_MockObject_MockObject
+     * @var RenderingContext|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $renderingContext;
 
     /**
-     * @var ViewHelperVariableContainer|\PHPUnit_Framework_MockObject_MockObject
+     * @var ViewHelperVariableContainer|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $viewHelperVariableContainer;
 
index 36eac1d..b1a99eb 100644 (file)
@@ -28,7 +28,7 @@ class LinkViewHelperTest extends ViewHelperBaseTestcase
 {
 
     /**
-     * @var LinkViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var LinkViewHelper|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $viewHelper;
 
index e488ef0..4be3c7b 100644 (file)
@@ -27,7 +27,7 @@ class UriViewHelperTest extends ViewHelperBaseTestcase
 {
 
     /**
-     * @var UriViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var UriViewHelper|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $viewHelper;
 
index 18e82ca..5ad7219 100644 (file)
@@ -26,7 +26,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\TagBuilder;
 class OptionViewHelperTest extends ViewHelperBaseTestcase
 {
     /**
-     * @var OptionViewHelper|\PHPUnit_Framework_MockObject_MockObject
+     * @var OptionViewHelper|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $viewHelper;
 
index a909bb9..4b9f8cc 100644 (file)
@@ -391,7 +391,7 @@ class SelectViewHelperTest extends ViewHelperBaseTestcase
      */
     public function multipleSelectOnDomainObjectsCreatesExpectedOptionsWithoutOptionValueField()
     {
-        /** @var $mockPersistenceManager \PHPUnit_Framework_MockObject_MockObject|PersistenceManagerInterface */
+        /** @var $mockPersistenceManager \PHPUnit\Framework\MockObject\MockObject|PersistenceManagerInterface */
         $mockPersistenceManager = $this->createMock(PersistenceManagerInterface::class);
         $mockPersistenceManager->expects(self::any())->method('getIdentifierByObject')->willReturnCallback(
             function ($object) {
index 5ccac13..1636047 100644 (file)
@@ -30,7 +30,7 @@ class CropViewHelperTest extends ViewHelperBaseTestcase
     protected $viewHelper;
 
     /**
-     * @var ContentObjectRenderer|\PHPUnit_Framework_MockObject_MockObject
+     * @var ContentObjectRenderer|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $mockContentObject;
 
index 5d3e80d..1569dbd 100644 (file)
@@ -24,7 +24,7 @@ use TYPO3Fluid\Fluid\Core\ViewHelper\Exception;
 class DateViewHelperTest extends ViewHelperBaseTestcase
 {
     /**
-     * @var DateViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var DateViewHelper|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
index 5610045..b525d12 100644 (file)
@@ -28,7 +28,7 @@ use TYPO3\TestingFramework\Fluid\Unit\ViewHelpers\ViewHelperBaseTestcase;
 class TypolinkViewHelperTest extends ViewHelperBaseTestcase
 {
     /**
-     * @var TypolinkViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var TypolinkViewHelper|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
index 6fe9ef4..28a211e 100644 (file)
@@ -81,7 +81,7 @@ class TypolinkViewHelperTest extends ViewHelperBaseTestcase
      */
     public function createTypolinkParameterFromArgumentsReturnsExpectedArray($input, $additionalParametersFromFluid, $expected)
     {
-        /** @var \TYPO3\CMS\Fluid\ViewHelpers\Uri\TypolinkViewHelper|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
+        /** @var \TYPO3\CMS\Fluid\ViewHelpers\Uri\TypolinkViewHelper|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $subject */
         $subject = $this->getAccessibleMock(TypolinkViewHelper::class, ['dummy']);
         $result = $subject->_call('createTypolinkParameterFromArguments', $input, $additionalParametersFromFluid);
         self::assertSame($expected, $result);
index 104e676..b9dcd6f 100644 (file)
@@ -27,7 +27,7 @@ class PaginateControllerTest extends UnitTestCase
     protected $query;
 
     /**
-     * @var \TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \TYPO3\CMS\Fluid\ViewHelpers\Widget\Controller\PaginateController|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $controller;
 
index 79fe33c..9e450bc 100644 (file)
@@ -37,7 +37,7 @@ class ClosureFinisherTest extends UnitTestCase
             return 'foobar';
         };
 
-        /** @var ClosureFinisher|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $mockClosureFinisher */
+        /** @var ClosureFinisher|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface $mockClosureFinisher */
         $mockClosureFinisher = $this->getAccessibleMock(ClosureFinisher::class, ['dummy'], [], '', false);
 
         $mockClosureFinisher->_set('options', [
index a5aa5c7..29980f5 100644 (file)
@@ -166,7 +166,7 @@ class AbstractFormElementTest extends UnitTestCase
      */
     public function initializeFormElementExpectedCallInitializeFormObjectHooks(): void
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $abstractFormElementMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $abstractFormElementMock */
         $abstractFormElementMock = $this->getAccessibleMockForAbstractClass(
             AbstractFormElement::class,
             [],
@@ -176,7 +176,7 @@ class AbstractFormElementTest extends UnitTestCase
             true,
             []
         );
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $secondMock */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $secondMock */
         $secondMock = $this->getAccessibleMockForAbstractClass(
             AbstractFormElement::class,
             [],
@@ -208,7 +208,7 @@ class AbstractFormElementTest extends UnitTestCase
      */
     public function getUniqueIdentifierExpectedUnique(): void
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $abstractFormElementMock1 */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $abstractFormElementMock1 */
         $abstractFormElementMock1 = $this->getAccessibleMockForAbstractClass(
             AbstractFormElement::class,
             [],
@@ -221,7 +221,7 @@ class AbstractFormElementTest extends UnitTestCase
             ]
         );
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $abstractFormElementMock2 */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractFormElement $abstractFormElementMock2 */
         $abstractFormElementMock2 = $this->getAccessibleMockForAbstractClass(
             AbstractFormElement::class,
             [],
index e2bda6d..32b088c 100644 (file)
@@ -60,7 +60,7 @@ class AbstractSectionTest extends UnitTestCase
      */
     public function createElementThrowsExceptionIfTypeDefinitionNotFoundAndSkipUnknownElementsIsFalse()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FormDefinition $rootForm */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
         $rootForm = $this->getMockBuilder(FormDefinition::class)
             ->setMethods(['getRenderingOptions', 'getTypeDefinitions'])
             ->disableOriginalConstructor()
@@ -102,7 +102,7 @@ class AbstractSectionTest extends UnitTestCase
      */
     public function createElementReturnsUnknownElementsIfTypeDefinitionIsNotFoundAndSkipUnknownElementsIsTrue()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FormDefinition $rootForm */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
         $rootForm = $this->getMockBuilder(FormDefinition::class)
             ->setMethods(['getRenderingOptions', 'getTypeDefinitions'])
             ->disableOriginalConstructor()
@@ -116,7 +116,7 @@ class AbstractSectionTest extends UnitTestCase
             ->method('getTypeDefinitions')
             ->willReturn([]);
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
         $mockAbstractSection = $this->getAccessibleMockForAbstractClass(
             AbstractSection::class,
             [],
@@ -129,7 +129,7 @@ class AbstractSectionTest extends UnitTestCase
             ]
         );
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
         $mockAbstractSection
             ->expects(self::any())
             ->method('getRootForm')
@@ -151,7 +151,7 @@ class AbstractSectionTest extends UnitTestCase
      */
     public function createElementThrowsExceptionIfTypeDefinitionIsNotSet()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FormDefinition $rootForm */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
         $rootForm = $this->getMockBuilder(FormDefinition::class)
             ->setMethods(['getRenderingOptions', 'getTypeDefinitions'])
             ->disableOriginalConstructor()
@@ -165,7 +165,7 @@ class AbstractSectionTest extends UnitTestCase
             ->method('getTypeDefinitions')
             ->willReturn(['foobar' => []]);
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
         $mockAbstractSection = $this->getAccessibleMockForAbstractClass(
             AbstractSection::class,
             [],
@@ -195,7 +195,7 @@ class AbstractSectionTest extends UnitTestCase
     public function createElementThrowsExceptionIfTypeDefinitionNotInstanceOfFormElementInterface()
     {
         $this->resetSingletonInstances = true;
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
         $mockAbstractSection = $this->getAccessibleMockForAbstractClass(
             AbstractSection::class,
             [],
@@ -208,7 +208,7 @@ class AbstractSectionTest extends UnitTestCase
             ]
         );
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FormDefinition $rootForm */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
         $rootForm = $this->getMockBuilder(FormDefinition::class)
             ->setMethods(['getRenderingOptions', 'getTypeDefinitions'])
             ->disableOriginalConstructor()
@@ -275,7 +275,7 @@ class AbstractSectionTest extends UnitTestCase
             ->method('setOptions')
             ->with($typeDefinitionWithoutImplementationClassName);
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|AbstractSection $mockAbstractSection */
         $mockAbstractSection = $this->getAccessibleMockForAbstractClass(
             AbstractSection::class,
             [],
@@ -288,7 +288,7 @@ class AbstractSectionTest extends UnitTestCase
             ]
         );
 
-        /** @var \PHPUnit_Framework_MockObject_MockObject|FormDefinition $rootForm */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition $rootForm */
         $rootForm = $this->getMockBuilder(FormDefinition::class)
             ->setMethods(['getRenderingOptions', 'getTypeDefinitions'])
             ->disableOriginalConstructor()
index b8178c2..6df7c28 100644 (file)
@@ -42,16 +42,16 @@ class PropertyMappingConfigurationTest extends UnitTestCase
     /** @var PropertyMappingConfiguration */
     protected $propertyMappingConfiguration;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|ExtbasePropertyMappingConfiguration */
+    /** @var \PHPUnit\Framework\MockObject\MockObject|ExtbasePropertyMappingConfiguration */
     protected $extbasePropertyMappingConfiguration;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|FileUpload */
+    /** @var \PHPUnit\Framework\MockObject\MockObject|FileUpload */
     protected $fileUpload;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|FormDefinition */
+    /** @var \PHPUnit\Framework\MockObject\MockObject|FormDefinition */
     protected $rootForm;
 
-    /** @var \PHPUnit_Framework_MockObject_MockObject|ProcessingRule */
+    /** @var \PHPUnit\Framework\MockObject\MockObject|ProcessingRule */
     protected $processingRule;
 
     public function setUp(): void
@@ -112,11 +112,11 @@ class PropertyMappingConfigurationTest extends UnitTestCase
     public function afterBuildingFinishedAddsFileReferenceConverter(): void
     {
         // Mime Type Validator
-        /** @var \PHPUnit_Framework_MockObject_MockObject|MimeTypeValidator $mimeTypeValidator */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|MimeTypeValidator $mimeTypeValidator */
         $mimeTypeValidator = $this->createMock(MimeTypeValidator::class);
 
         // Resource Factory
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ResourceFactory $resourceFactory */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ResourceFactory $resourceFactory */
         $resourceFactory = $this->createMock(ResourceFactory::class);
 
         // Object Manager (in order to return mocked Resource Factory)
@@ -154,7 +154,7 @@ class PropertyMappingConfigurationTest extends UnitTestCase
         $mimeTypes = ['allowedMimeTypes' => ['text/plain', 'application/x-www-form-urlencoded']];
 
         // Create a MimeTypeValidator Mock
-        /** @var \PHPUnit_Framework_MockObject_MockObject|MimeTypeValidator $mimeTypeValidator */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|MimeTypeValidator $mimeTypeValidator */
         $mimeTypeValidator = $this->getMockBuilder(MimeTypeValidator::class)
             ->setMethods(['__construct'])
             ->disableOriginalConstructor()
@@ -197,15 +197,15 @@ class PropertyMappingConfigurationTest extends UnitTestCase
     public function afterBuildingFinishedSetsUpStoragePathToPropertySaveToFileMountIfItExists(): void
     {
         // Mime Type Validator
-        /** @var \PHPUnit_Framework_MockObject_MockObject|MimeTypeValidator $mimeTypeValidator */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|MimeTypeValidator $mimeTypeValidator */
         $mimeTypeValidator = $this->createMock(MimeTypeValidator::class);
 
         // Resource Factory
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ResourceFactory $resourceFactory */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ResourceFactory $resourceFactory */
         $resourceFactory = $this->createMock(ResourceFactory::class);
 
         // Object Manager (in order to return mocked Resource Factory)
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ObjectManager $objectManager */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ObjectManager $objectManager */
         $objectManager = $this->getMockBuilder(ObjectManager::class)
             ->setMethods(['get'])
             ->disableOriginalConstructor()
@@ -253,15 +253,15 @@ class PropertyMappingConfigurationTest extends UnitTestCase
     public function afterBuildingFinishedSetsUpStoragePathToToFormDefinitionPathIfSaveToFileMountIsNotDefinedAndFormWasNotAddedProgrammatically(): void
     {
         // Mime Type Validator
-        /** @var \PHPUnit_Framework_MockObject_MockObject|MimeTypeValidator $mimeTypeValidator */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|MimeTypeValidator $mimeTypeValidator */
         $mimeTypeValidator = $this->createMock(MimeTypeValidator::class);
 
         // Resource Factory
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ResourceFactory $resourceFactory */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ResourceFactory $resourceFactory */
         $resourceFactory = $this->createMock(ResourceFactory::class);
 
         // Object Manager (in order to return mocked Resource Factory)
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ObjectManager $objectManager */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ObjectManager $objectManager */
         $objectManager = $this->getMockBuilder(ObjectManager::class)
             ->setMethods(['get'])
             ->disableOriginalConstructor()
@@ -314,15 +314,15 @@ class PropertyMappingConfigurationTest extends UnitTestCase
     public function afterBuildingFinishedSetsStoragePathToUserUploadIfNeitherSaveToFileMountIsSetNorThereIsAFormDefinitionPath(): void
     {
         // Mime Type Validator
-        /** @var \PHPUnit_Framework_MockObject_MockObject|MimeTypeValidator $mimeTypeValidator */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|MimeTypeValidator $mimeTypeValidator */
         $mimeTypeValidator = $this->createMock(MimeTypeValidator::class);
 
         // Resource Factory
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ResourceFactory $resourceFactory */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ResourceFactory $resourceFactory */
         $resourceFactory = $this->createMock(ResourceFactory::class);
 
         // Object Manager (in order to return mocked Resource Factory)
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ObjectManager $objectManager */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ObjectManager $objectManager */
         $objectManager = $this->getMockBuilder(ObjectManager::class)
             ->setMethods(['get'])
             ->disableOriginalConstructor()
@@ -372,18 +372,18 @@ class PropertyMappingConfigurationTest extends UnitTestCase
     public function afterBuildingFinishedCopiesValidators(): void
     {
         // Mime Type Validator
-        /** @var \PHPUnit_Framework_MockObject_MockObject|MimeTypeValidator $mimeTypeValidator */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|MimeTypeValidator $mimeTypeValidator */
         $mimeTypeValidator = $this->createMock(MimeTypeValidator::class);
 
         // Some other Validator
         $otherValidator = $this->getMockForAbstractClass(AbstractValidator::class);
 
         // Resource Factory
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ResourceFactory $resourceFactory */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ResourceFactory $resourceFactory */
         $resourceFactory = $this->createMock(ResourceFactory::class);
 
         // Object Manager (in order to return mocked Resource Factory)
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ObjectManager $objectManager */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ObjectManager $objectManager */
         $objectManager = $this->getMockBuilder(ObjectManager::class)
             ->setMethods(['get'])
             ->disableOriginalConstructor()
@@ -428,18 +428,18 @@ class PropertyMappingConfigurationTest extends UnitTestCase
     public function afterBuildingFinishedDoesNotCopyNotEmptyValidator(): void
     {
         // Mime Type Validator
-        /** @var \PHPUnit_Framework_MockObject_MockObject|MimeTypeValidator $mimeTypeValidator */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|MimeTypeValidator $mimeTypeValidator */
         $mimeTypeValidator = $this->createMock(MimeTypeValidator::class);
 
         // Not Empty Validator
         $notEmptyValidator = $this->getMockForAbstractClass(NotEmptyValidator::class);
 
         // Resource Factory
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ResourceFactory $resourceFactory */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ResourceFactory $resourceFactory */
         $resourceFactory = $this->createMock(ResourceFactory::class);
 
         // Object Manager (in order to return mocked Resource Factory)
-        /** @var \PHPUnit_Framework_MockObject_MockObject|ObjectManager $objectManager */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|ObjectManager $objectManager */
         $objectManager = $this->getMockBuilder(ObjectManager::class)
             ->setMethods(['get'])
             ->disableOriginalConstructor()
index 3460e90..6810387 100644 (file)
@@ -33,7 +33,7 @@ class CaseContentObjectTest extends UnitTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var CaseContentObject|\PHPUnit_Framework_MockObject_MockObject
+     * @var CaseContentObject|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index 30840be..37968d5 100644 (file)
@@ -84,17 +84,17 @@ class ContentObjectRendererTest extends UnitTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|AccessibleObjectInterface|ContentObjectRenderer
+     * @var \PHPUnit\Framework\MockObject\MockObject|AccessibleObjectInterface|ContentObjectRenderer
      */
     protected $subject;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|TypoScriptFrontendController|AccessibleObjectInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|TypoScriptFrontendController|AccessibleObjectInterface
      */
     protected $frontendControllerMock;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|TemplateService
+     * @var \PHPUnit\Framework\MockObject\MockObject|TemplateService
      */
     protected $templateServiceMock;
 
@@ -1997,7 +1997,7 @@ class ContentObjectRendererTest extends UnitTestCase
      */
     public function getImageSourceCollectionRendersDefinedSources(): void
     {
-        /** @var $cObj \PHPUnit_Framework_MockObject_MockObject|ContentObjectRenderer */
+        /** @var $cObj \PHPUnit\Framework\MockObject\MockObject|ContentObjectRenderer */
         $cObj = $this->getMockBuilder(ContentObjectRenderer::class)
             ->setMethods(['stdWrap', 'getImgResource'])
             ->getMock();
@@ -2092,7 +2092,7 @@ class ContentObjectRendererTest extends UnitTestCase
      */
     public function getImageSourceCollectionRendersDefinedLayoutKeyDefault($layoutKey, $configuration): void
     {
-        /** @var $cObj \PHPUnit_Framework_MockObject_MockObject|ContentObjectRenderer */
+        /** @var $cObj \PHPUnit\Framework\MockObject\MockObject|ContentObjectRenderer */
         $cObj = $this->getMockBuilder(ContentObjectRenderer::class)
             ->setMethods(['stdWrap', 'getImgResource'])
             ->getMock();
@@ -2216,7 +2216,7 @@ class ContentObjectRendererTest extends UnitTestCase
         $xhtmlDoctype,
         $expectedHtml
     ): void {
-        /** @var $cObj \PHPUnit_Framework_MockObject_MockObject|ContentObjectRenderer */
+        /** @var $cObj \PHPUnit\Framework\MockObject\MockObject|ContentObjectRenderer */
         $cObj = $this->getMockBuilder(ContentObjectRenderer::class)
             ->setMethods(['stdWrap', 'getImgResource'])
             ->getMock();
@@ -2450,7 +2450,7 @@ class ContentObjectRendererTest extends UnitTestCase
     }
 
     /**
-     * @return \PHPUnit_Framework_MockObject_MockObject | AbstractContentObject
+     * @return \PHPUnit\Framework\MockObject\MockObject | AbstractContentObject
      */
     protected function createContentObjectThrowingExceptionFixture()
     {
index 92701e9..fdb61bf 100644 (file)
@@ -42,7 +42,7 @@ class FilesContentObjectTest extends UnitTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var \TYPO3\CMS\Frontend\ContentObject\FilesContentObject|\PHPUnit_Framework_MockObject_MockObject
+     * @var \TYPO3\CMS\Frontend\ContentObject\FilesContentObject|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $subject;
 
index fe63365..5438beb 100644 (file)
@@ -38,22 +38,22 @@ class FluidTemplateContentObjectTest extends UnitTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var FluidTemplateContentObject|\PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var FluidTemplateContentObject|\PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $subject;
 
     /**
-     * @var ContentObjectRenderer|\PHPUnit_Framework_MockObject_MockObject
+     * @var ContentObjectRenderer|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $contentObjectRenderer;
 
     /**
-     * @var StandaloneView|\PHPUnit_Framework_MockObject_MockObject
+     * @var StandaloneView|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $standaloneView;
 
     /**
-     * @var Request|\PHPUnit_Framework_MockObject_MockObject
+     * @var Request|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $request;
 
@@ -625,7 +625,7 @@ class FluidTemplateContentObjectTest extends UnitTestCase
             ],
         ];
 
-        /** @var TypoScriptService|\PHPUnit_Framework_MockObject_MockObject $typoScriptServiceMock */
+        /** @var TypoScriptService|\PHPUnit\Framework\MockObject\MockObject $typoScriptServiceMock */
         $typoScriptServiceMock = $this->getMockBuilder(TypoScriptService::class)->getMock();
         $typoScriptServiceMock
             ->expects(self::once())
index 7b1f8e8..20c40a4 100644 (file)
@@ -37,7 +37,7 @@ class TypoScriptFrontendControllerTest extends UnitTestCase
     protected $resetSingletonInstances = true;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|TypoScriptFrontendController
+     * @var \PHPUnit\Framework\MockObject\MockObject|\TYPO3\TestingFramework\Core\AccessibleObjectInterface|TypoScriptFrontendController
      */
     protected $subject;
 
@@ -83,11 +83,11 @@ class TypoScriptFrontendControllerTest extends UnitTestCase
      * Setup a \TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController object only for testing the header and footer
      * replacement during USER_INT rendering
      *
-     * @return \PHPUnit_Framework_MockObject_MockObject|TypoScriptFrontendController
+     * @return \PHPUnit\Framework\MockObject\MockObject|TypoScriptFrontendController
      */
     protected function setupTsfeMockForHeaderFooterReplacementCheck()
     {
-        /** @var \PHPUnit_Framework_MockObject_MockObject|TypoScriptFrontendController $tsfe */
+        /** @var \PHPUnit\Framework\MockObject\MockObject|TypoScriptFrontendController $tsfe */
         $tsfe = $this->getMockBuilder(TypoScriptFrontendController::class)
             ->setMethods([
                 'INTincScript_process',
index 8b4c748..ab987a6 100644 (file)
@@ -26,7 +26,7 @@ use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 class GalleryProcessorTest extends UnitTestCase
 {
     /**
-     * @var ContentObjectRenderer|\PHPUnit_Framework_MockObject_MockObject
+     * @var ContentObjectRenderer|\PHPUnit\Framework\MockObject\MockObject
      */
     protected $contentObjectRenderer;
 
index 220404d..32ad0cd 100644 (file)
@@ -40,7 +40,7 @@ class AbstractTypolinkBuilderTest extends UnitTestCase
     protected $backupEnvironment = true;
 
     /**
-     * @var \PHPUnit_Framework_MockObject_MockObject|TypoScriptFrontendController|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
+     * @var \PHPUnit\Framework\MockObject\MockObject|TypoScriptFrontendController|\TYPO3\TestingFramework\Core\AccessibleObjectInterface
      */
     protected $frontendControllerMock;
 
index 15ab6e1..e188ed7 100644 (file)
@@ -32,7 +32,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getNameReturnsSetName()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $name = $this->getUniqueId('name_');
         $node->_set('name', $name);
@@ -44,7 +44,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getTargetPermissionReturnsSetTargetPermission()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $permission = '1234';
         $node->_set('targetPermission', $permission);
@@ -56,7 +56,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getChildrenReturnsSetChildren()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $children = ['1234'];
         $node->_set('children', $children);
@@ -68,7 +68,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getParentReturnsSetParent()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $node->_set('parent', $parent);
@@ -80,7 +80,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getAbsolutePathCallsParentForPathAndAppendsOwnName()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(\TYPO3\CMS\Install\FolderStructure\RootNodeInterface::class);
         $parentPath = '/foo/bar';
@@ -96,7 +96,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function isWritableCallsParentIsWritable()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $parentMock = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $parentMock->expects(self::once())->method('isWritable');
@@ -109,7 +109,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function isWritableReturnsWritableStatusOfParent()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $parentMock = $this->createMock(\TYPO3\CMS\Install\FolderStructure\NodeInterface::class);
         $parentMock->expects(self::once())->method('isWritable')->willReturn(true);
@@ -122,7 +122,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function existsReturnsTrueIfNodeExists()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestDir('dir_');
         $node->expects(self::any())->method('getAbsolutePath')->willReturn($path);
@@ -135,7 +135,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function existsReturnsTrueIfIsLinkAndTargetIsDead()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $path = Environment::getVarPath() . '/tests/' . $this->getUniqueId('link_');
         $target = Environment::getVarPath() . '/tests/' . $this->getUniqueId('notExists_');
@@ -152,7 +152,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function existsReturnsFalseIfNodeNotExists()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestFilePath('dir_');
         $node->expects(self::any())->method('getAbsolutePath')->willReturn($path);
@@ -164,7 +164,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function fixPermissionThrowsExceptionIfPermissionAreAlreadyCorrect()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             AbstractNode::class,
             ['isPermissionCorrect', 'getAbsolutePath'],
@@ -187,7 +187,7 @@ class AbstractNodeTest extends FolderStructureTestCase
         if (function_exists('posix_getegid') && posix_getegid() === 0) {
             self::markTestSkipped('Test skipped if run on linux as root');
         }
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             AbstractNode::class,
             ['isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'],
@@ -215,7 +215,7 @@ class AbstractNodeTest extends FolderStructureTestCase
         if (function_exists('posix_getegid') && posix_getegid() === 0) {
             self::markTestSkipped('Test skipped if run on linux as root');
         }
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             AbstractNode::class,
             ['isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'],
@@ -240,7 +240,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function fixPermissionReturnsOkStatusIfPermissionCanBeFixedAndSetsPermissionToCorrectValue()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             AbstractNode::class,
             ['isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'getAbsolutePath'],
@@ -266,7 +266,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function isPermissionCorrectReturnsTrueOnWindowsOs()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['isWindowsOs'], [], '', false);
         $node->expects(self::once())->method('isWindowsOs')->willReturn(true);
         self::assertTrue($node->_call('isPermissionCorrect'));
@@ -277,7 +277,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function isPermissionCorrectReturnsFalseIfTargetPermissionAndCurrentPermissionAreNotIdentical()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['isWindowsOs', 'getCurrentPermission'], [], '', false);
         $node->expects(self::any())->method('isWindowsOs')->willReturn(false);
         $node->expects(self::any())->method('getCurrentPermission')->willReturn('foo');
@@ -290,7 +290,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getCurrentPermissionReturnsCurrentDirectoryPermission()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $path = $this->getVirtualTestDir('dir_');
         chmod($path, 02775);
@@ -304,7 +304,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getCurrentPermissionReturnsCurrentFilePermission()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['getAbsolutePath'], [], '', false);
         $file = $this->getVirtualTestFilePath('file_');
         touch($file);
@@ -321,7 +321,7 @@ class AbstractNodeTest extends FolderStructureTestCase
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366398198);
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $node->_call('getRelativePathBelowSiteRoot', '/tmp');
     }
@@ -331,7 +331,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getRelativePathCallsGetAbsolutePathIfPathIsNull()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             AbstractNode::class,
             ['getAbsolutePath'],
@@ -348,7 +348,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getRelativePathBelowSiteRootReturnsSingleForwardSlashIfGivenPathEqualsPathSiteConstant()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $result = $node->_call('getRelativePathBelowSiteRoot', Environment::getPublicPath() . '/');
         self::assertSame('/', $result);
@@ -359,7 +359,7 @@ class AbstractNodeTest extends FolderStructureTestCase
      */
     public function getRelativePathBelowSiteRootReturnsSubPath()
     {
-        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node AbstractNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(AbstractNode::class, ['dummy'], [], '', false);
         $result = $node->_call('getRelativePathBelowSiteRoot', Environment::getPublicPath() . '/foo/bar');
         self::assertSame('/foo/bar', $result);
index decea91..dcf25bb 100644 (file)
@@ -36,7 +36,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
     {
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366222203);
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
         $node->__construct([], null);
     }
@@ -49,7 +49,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
         $this->expectException(InvalidArgumentException::class);
         $this->expectExceptionCode(1366226639);
         $parent = $this->createMock(NodeInterface::class);
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
         $structure = [
             'name' => 'foo/bar',
@@ -63,7 +63,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
     public function constructorCallsCreateChildrenIfChildrenAreSet()
     {
         $parent = $this->createMock(NodeInterface::class);
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['createChildren'],
@@ -88,7 +88,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
     public function constructorSetsParent()
     {
         $parent = $this->createMock(NodeInterface::class);
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
         $structure = [
             'name' => 'foo',
@@ -103,7 +103,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
     public function constructorSetsTargetPermission()
     {
         $parent = $this->createMock(NodeInterface::class);
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
         $targetPermission = '2550';
         $structure = [
@@ -119,7 +119,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function constructorSetsName()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(DirectoryNode::class, ['dummy'], [], '', false);
         $parent = $this->createMock(RootNodeInterface::class);
         $name = $this->getUniqueId('test_');
@@ -132,7 +132,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function getStatusReturnsArray()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -155,7 +155,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithWarningStatusIfDirectoryNotExists()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -179,7 +179,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithErrorStatusIfNodeIsNotADirectory()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -204,7 +204,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithErrorStatusIfDirectoryExistsButIsNotWritable()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -229,7 +229,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithNoticeStatusIfDirectoryExistsButPermissionAreNotCorrect()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -254,7 +254,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithOkStatusIfDirectoryExistsAndPermissionAreCorrect()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['getAbsolutePath', 'getRelativePathBelowSiteRoot', 'exists', 'isDirectory', 'isWritable', 'isPermissionCorrect'],
@@ -279,7 +279,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function getStatusCallsGetStatusOnChildren()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['exists', 'isDirectory', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'isWritable'],
@@ -304,7 +304,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function getStatusReturnsArrayWithOwnStatusAndStatusOfChild()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['exists', 'isDirectory', 'isPermissionCorrect', 'getRelativePathBelowSiteRoot', 'isWritable'],
@@ -332,7 +332,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function fixCallsFixSelfAndReturnsItsResult()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(
             DirectoryNode::class,
             ['fixSelf'],
@@ -350,7 +350,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function fixCallsFixOnChildrenAndReturnsMergedResult()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit_Framework_MockObject_MockObject */
+        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit\Framework\MockObject\MockObject */
         $node = $this->getAccessibleMock(DirectoryNode::class, ['fixSelf'], [], '', false);
         $uniqueReturnSelf = $this->getUniqueId('foo_');
         $node->expects(self::once())->method('fixSelf')->willReturn([$uniqueReturnSelf]);
@@ -373,7 +373,7 @@ class DirectoryNodeTest extends FolderStructureTestCase
      */
     public function fixSelfCallsCreateDirectoryIfDirectoryDoesNotExistAndReturnsResult()
     {
-        /** @var $node DirectoryNode|AccessibleObjectInterface|\PHPUnit