[TASK] Replace prophecy in EXT:extbase QueryTest

Resolves: #98898 Releases: main Change-Id: I62c2915adb19bc8cc124cab51e4f99782053b4d9 Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/76304 Tested-by: Nikita Hovratov <nikita.h@live.de> Tested-by: core-ci <typo3@b13.com> Tested-by: Stefan Bürk <stefan@buerk.tech> Reviewed-by: Nikita Hovratov <nikita.h@live.de> Reviewed-by: Stefan Bürk <stefan@buerk.tech>
TYPO3 · Oct 27, 2022 · 6dd8d7a · 6dd8d7a
1 parent ec8a26c
commit 6dd8d7a
Showing 1 changed file with 11 additions and 36 deletions.
diff --git a/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php b/typo3/sysext/extbase/Tests/Unit/Persistence/Generic/QueryTest.php
@@ -18,7 +18,6 @@
 namespace TYPO3\CMS\Extbase\Tests\Unit\Persistence\Generic;
 
 use PHPUnit\Framework\MockObject\MockObject;
-use Prophecy\PhpUnit\ProphecyTrait;
 use Psr\Container\ContainerInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Mapper\DataMapFactory;
 use TYPO3\CMS\Extbase\Persistence\Generic\Qom\Comparison;
@@ -35,37 +34,13 @@
 use TYPO3\TestingFramework\Core\AccessibleObjectInterface;
 use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
 
-/**
- * Test case
- */
 class QueryTest extends UnitTestCase
 {
-    use ProphecyTrait;
-
-    /**
-     * @var Query|MockObject|AccessibleObjectInterface
-     */
-    protected $query;
-
-    /**
-     * @var QuerySettingsInterface
-     */
-    protected $querySettings;
-
-    /**
-     * @var PersistenceManagerInterface
-     */
-    protected $persistenceManager;
-
-    /**
-     * @var DataMapFactory
-     */
-    protected $dataMapFactory;
-
-    /**
-     * @var ContainerInterface
-     */
-    protected $container;
+    protected Query&MockObject&AccessibleObjectInterface $query;
+    protected QuerySettingsInterface $querySettings;
+    protected PersistenceManagerInterface $persistenceManager;
+    protected DataMapFactory $dataMapFactory;
+    protected ContainerInterface $container;
 
     /**
      * Sets up this test case
@@ -183,10 +158,10 @@ public function equalsForCaseSensitiveFalseLowercasesOperand(string $propertyNam
     public function logicalAndSupportsMultipleConstraintsAsMethodArguments(): void
     {
         $subject = new Query(
-            $this->prophesize(DataMapFactory::class)->reveal(),
-            $this->prophesize(PersistenceManagerInterface::class)->reveal(),
+            $this->createMock(DataMapFactory::class),
+            $this->createMock(PersistenceManagerInterface::class),
             new QueryObjectModelFactory(),
-            $this->prophesize(ContainerInterface::class)->reveal()
+            $this->createMock(ContainerInterface::class)
         );
 
         $constraint1 = new Comparison(new PropertyValue('propertyName1'), QueryInterface::OPERATOR_EQUAL_TO, 'value1');
@@ -206,10 +181,10 @@ public function logicalAndSupportsMultipleConstraintsAsMethodArguments(): void
     public function logicalOrSupportsMultipleConstraintsAsMethodArguments(): void
     {
         $subject = new Query(
-            $this->prophesize(DataMapFactory::class)->reveal(),
-            $this->prophesize(PersistenceManagerInterface::class)->reveal(),
+            $this->createMock(DataMapFactory::class),
+            $this->createMock(PersistenceManagerInterface::class),
             new QueryObjectModelFactory(),
-            $this->prophesize(ContainerInterface::class)->reveal()
+            $this->createMock(ContainerInterface::class)
         );
 
         $constraint1 = new Comparison(new PropertyValue('propertyName1'), QueryInterface::OPERATOR_EQUAL_TO, 'value1');