TASK: Add ProphecyTrait

TYPO3 · Feb 23, 2023 · 18fbfe0 · 18fbfe0
1 parent 7032d2c
commit 18fbfe0
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 7 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/tests/Unit/Application/BaseApplicationTest.php b/tests/Unit/Application/BaseApplicationTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\Surf\Application\BaseApplication;
 use TYPO3\Surf\Domain\Model\Deployment;
@@ -23,6 +24,7 @@
 
 class BaseApplicationTest extends TestCase
 {
+    use ProphecyTrait;
     private BaseApplication $subject;
 
     protected function setUp(): void

diff --git a/tests/Unit/Application/LaravelTest.php b/tests/Unit/Application/LaravelTest.php
@@ -13,13 +13,15 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use TYPO3\Surf\Application\Laravel;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Workflow;
 use TYPO3\Surf\Tests\Unit\FluidPromise;
 
 class LaravelTest extends TestCase
 {
+    use ProphecyTrait;
     protected Laravel $subject;
 
     protected function setUp(): void

diff --git a/tests/Unit/Application/Neos/FlowTest.php b/tests/Unit/Application/Neos/FlowTest.php
@@ -12,6 +12,7 @@
 namespace TYPO3\Surf\Tests\Unit\Application\Neos;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\Surf\Application\Neos\Flow;
 use TYPO3\Surf\Domain\Model\Deployment;
@@ -21,6 +22,7 @@
 
 class FlowTest extends TestCase
 {
+    use ProphecyTrait;
     protected Flow $subject;
 
     protected function setUp(): void

diff --git a/tests/Unit/Application/TYPO3/CMSTest.php b/tests/Unit/Application/TYPO3/CMSTest.php
@@ -13,13 +13,15 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use TYPO3\Surf\Application\TYPO3\CMS;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Workflow;
 use TYPO3\Surf\Tests\Unit\FluidPromise;
 
 class CMSTest extends TestCase
 {
+    use ProphecyTrait;
     protected CMS $subject;
 
     protected function setUp(): void

diff --git a/tests/Unit/AssertCommandExecuted.php b/tests/Unit/AssertCommandExecuted.php
@@ -38,7 +38,7 @@ public function __construct(string $expectedCommand)
     protected function matches($other): bool
     {
         if (!is_array($other)) {
-            throw new \InvalidArgumentException('Expected an array of executed commands as value, ' . gettype($other) . ' given');
+            throw new InvalidArgumentException('Expected an array of executed commands as value, ' . gettype($other) . ' given');
         }
 
         foreach ($other as $command) {

diff --git a/tests/Unit/Cli/Symfony/Logger/ConsoleHandlerTest.php b/tests/Unit/Cli/Symfony/Logger/ConsoleHandlerTest.php
@@ -13,12 +13,14 @@
 
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Console\Output\OutputInterface;
 use TYPO3\Surf\Cli\Symfony\Logger\ConsoleFormatter;
 use TYPO3\Surf\Cli\Symfony\Logger\ConsoleHandler;
 
 class ConsoleHandlerTest extends TestCase
 {
+    use ProphecyTrait;
     /**
      * @test
      */

diff --git a/tests/Unit/Cli/Symfony/Logger/LoggerFactoryTest.php b/tests/Unit/Cli/Symfony/Logger/LoggerFactoryTest.php
@@ -13,11 +13,13 @@
 
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use TYPO3\Surf\Cli\Symfony\Logger\ConsoleHandler;
 use TYPO3\Surf\Cli\Symfony\Logger\LoggerFactory;
 
 class LoggerFactoryTest extends TestCase
 {
+    use ProphecyTrait;
     /**
      * @test
      */

diff --git a/tests/Unit/Command/DeployCommandTest.php b/tests/Unit/Command/DeployCommandTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Component\Console\Tester\CommandTester;
 use TYPO3\Surf\Command\DeployCommand;
@@ -22,6 +23,7 @@
 
 final class DeployCommandTest extends TestCase
 {
+    use ProphecyTrait;
     /**
      * @var DeployCommand
      */

diff --git a/tests/Unit/Command/RollbackCommandTest.php b/tests/Unit/Command/RollbackCommandTest.php
@@ -12,6 +12,7 @@
 namespace TYPO3\Surf\Tests\Unit\Command;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Console\Tester\CommandTester;
 use TYPO3\Surf\Command\RollbackCommand;
 use TYPO3\Surf\Domain\Enum\DeploymentStatus;
@@ -20,6 +21,7 @@
 
 class RollbackCommandTest extends TestCase
 {
+    use ProphecyTrait;
     /**
      * @test
      */

diff --git a/tests/Unit/Command/ShowCommandTest.php b/tests/Unit/Command/ShowCommandTest.php
@@ -12,12 +12,14 @@
 namespace TYPO3\Surf\Tests\Unit\Command;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Console\Tester\CommandTester;
 use TYPO3\Surf\Command\ShowCommand;
 use TYPO3\Surf\Integration\FactoryInterface;
 
 class ShowCommandTest extends TestCase
 {
+    use ProphecyTrait;
     /**
      * @test
      */

diff --git a/tests/Unit/Command/SimulateCommandTest.php b/tests/Unit/Command/SimulateCommandTest.php
@@ -12,6 +12,7 @@
 namespace TYPO3\Surf\Tests\Unit\Command;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Console\Tester\CommandTester;
 use TYPO3\Surf\Command\SimulateCommand;
 use TYPO3\Surf\Domain\Enum\DeploymentStatus;
@@ -20,6 +21,7 @@
 
 class SimulateCommandTest extends TestCase
 {
+    use ProphecyTrait;
     /**
      * @test
      */

diff --git a/tests/Unit/Domain/Model/DeploymentTest.php b/tests/Unit/Domain/Model/DeploymentTest.php
@@ -12,6 +12,7 @@
 namespace TYPO3\Surf\Tests\Unit\Domain\Model;
 
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use TYPO3\Surf\Domain\Model\Application;
 use TYPO3\Surf\Domain\Model\Deployment;
 use TYPO3\Surf\Domain\Model\Node;
@@ -25,6 +26,7 @@
  */
 class DeploymentTest extends TestCase
 {
+    use ProphecyTrait;
     use KernelAwareTrait;
 
     /**

diff --git a/tests/Unit/Domain/Service/TaskManagerTest.php b/tests/Unit/Domain/Service/TaskManagerTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Log\LoggerInterface;
 use TYPO3\Surf\Domain\Model\Application;
@@ -24,6 +25,7 @@
 
 class TaskManagerTest extends TestCase
 {
+    use ProphecyTrait;
     /**
      * @var ObjectProphecy|Task
      */

diff --git a/tests/Unit/Integration/FactoryTest.php b/tests/Unit/Integration/FactoryTest.php
@@ -15,6 +15,7 @@
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use RuntimeException;
 use TYPO3\Surf\Domain\Filesystem\FilesystemInterface;
@@ -25,6 +26,7 @@
 
 class FactoryTest extends TestCase
 {
+    use ProphecyTrait;
     use KernelAwareTrait;
 
     /**

diff --git a/tests/Unit/Task/BaseTaskTest.php b/tests/Unit/Task/BaseTaskTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Log\LoggerInterface;
 use TYPO3\Surf\Domain\Model\Application;
@@ -29,6 +30,7 @@
  */
 abstract class BaseTaskTest extends TestCase
 {
+    use ProphecyTrait;
     use KernelAwareTrait;
 
     /**

diff --git a/tests/Unit/Task/CleanupReleasesTaskTest.php b/tests/Unit/Task/CleanupReleasesTaskTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\MockObject\MockObject;
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\Surf\Domain\Clock\ClockInterface;
 use TYPO3\Surf\Domain\Model\Application;
@@ -25,6 +26,7 @@
 
 class CleanupReleasesTaskTest extends BaseTaskTest
 {
+    use ProphecyTrait;
     use KernelAwareTrait;
 
     /**

diff --git a/tests/Unit/Task/CreateArchiveTaskTest.php b/tests/Unit/Task/CreateArchiveTaskTest.php
@@ -11,6 +11,7 @@
 
 namespace TYPO3\Surf\Tests\Unit\Task;
 
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\Surf\Domain\Filesystem\FilesystemInterface;
 use TYPO3\Surf\Domain\Generator\IdGeneratorInterface;
@@ -20,6 +21,7 @@
 class CreateArchiveTaskTest extends BaseTaskTest
 {
     private const SOURCE_DIRECTORY = '/var/www/html/source/';
+    use ProphecyTrait;
 
     /**
      * @var FilesystemInterface|ObjectProphecy

diff --git a/tests/Unit/Task/TYPO3/CMS/SetUpExtensionsTaskTest.php b/tests/Unit/Task/TYPO3/CMS/SetUpExtensionsTaskTest.php
@@ -12,6 +12,7 @@
 namespace TYPO3\Surf\Tests\Unit\Task\TYPO3\CMS;
 
 use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
 use TYPO3\Surf\Application\TYPO3\CMS;
 use TYPO3\Surf\Domain\Version\VersionCheckerInterface;
@@ -20,6 +21,7 @@
 
 class SetUpExtensionsTaskTest extends BaseTaskTest
 {
+    use ProphecyTrait;
     /**
      * @var ObjectProphecy|VersionCheckerInterface
      */