Upgrading PHPUnit to the next major version

JimTools · JimTools · commit aa85cc03849b · 2025-04-19T11:18:03.000+01:00
PHPUnit 9.5 causes issues with signature mismatch with newer versions of PHP.
Upgrading this to 10.5 fixes the language level issues but causes
some side effects. There are a lot of deprecation warnings being thrown now.

PHPUnit class is marked as final, so methods in RetryTrait cannot be redeclared.
diff --git a/composer.json b/composer.json
@@ -50,7 +50,7 @@
   },
   "require-dev": {
     "ext-pcntl": "*",
-    "phpunit/phpunit": "^9.5",
+    "phpunit/phpunit": "^10.5",
     "phpstan/phpstan": "^1.0",
     "queue-interop/queue-spec": "^0.6.2",
     "symfony/browser-kit": "^6.2|^7.0",
@@ -71,7 +71,6 @@
     "alcaeus/mongo-php-adapter": "^1.0",
     "kwn/php-rdkafka-stubs": "^2.0.3",
     "friendsofphp/php-cs-fixer": "^3.4",
-    "dms/phpunit-arraysubset-asserts": "^0.2.1",
     "phpspec/prophecy-phpunit": "^2.0"
   },
   "autoload": {
diff --git a/pkg/snsqs/Tests/Spec/SnsQsSendToAndReceiveFromQueueTest.php b/pkg/snsqs/Tests/Spec/SnsQsSendToAndReceiveFromQueueTest.php
@@ -2,7 +2,6 @@
 
 namespace Enqueue\SnsQs\Tests\Spec;
 
-use Enqueue\Test\RetryTrait;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec;
 
@@ -13,7 +12,6 @@
  */
 class SnsQsSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec
 {
-    use RetryTrait;
     use SnsQsFactoryTrait;
 
     protected function tearDown(): void
diff --git a/pkg/snsqs/Tests/Spec/SnsQsSendToAndReceiveNoWaitFromQueueTest.php b/pkg/snsqs/Tests/Spec/SnsQsSendToAndReceiveNoWaitFromQueueTest.php
@@ -2,7 +2,6 @@
 
 namespace Enqueue\SnsQs\Tests\Spec;
 
-use Enqueue\Test\RetryTrait;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToAndReceiveNoWaitFromQueueSpec;
 
@@ -13,7 +12,6 @@
  */
 class SnsQsSendToAndReceiveNoWaitFromQueueTest extends SendToAndReceiveNoWaitFromQueueSpec
 {
-    use RetryTrait;
     use SnsQsFactoryTrait;
 
     protected function tearDown(): void
diff --git a/pkg/snsqs/Tests/Spec/SnsQsSendToTopicAndReceiveFromQueueSpec.php b/pkg/snsqs/Tests/Spec/SnsQsSendToTopicAndReceiveFromQueueSpec.php
@@ -2,7 +2,6 @@
 
 namespace Enqueue\SnsQs\Tests\Spec;
 
-use Enqueue\Test\RetryTrait;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToTopicAndReceiveFromQueueSpec;
 
@@ -13,7 +12,6 @@
  */
 class SnsQsSendToTopicAndReceiveFromQueueSpec extends SendToTopicAndReceiveFromQueueSpec
 {
-    use RetryTrait;
     use SnsQsFactoryTrait;
 
     protected function tearDown(): void
diff --git a/pkg/snsqs/Tests/Spec/SnsQsSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/snsqs/Tests/Spec/SnsQsSendToTopicAndReceiveNoWaitFromQueueTest.php
@@ -2,7 +2,6 @@
 
 namespace Enqueue\SnsQs\Tests\Spec;
 
-use Enqueue\Test\RetryTrait;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToTopicAndReceiveNoWaitFromQueueSpec;
 
@@ -13,7 +12,6 @@
  */
 class SnsQsSendToTopicAndReceiveNoWaitFromQueueTest extends SendToTopicAndReceiveNoWaitFromQueueSpec
 {
-    use RetryTrait;
     use SnsQsFactoryTrait;
 
     protected function tearDown(): void
diff --git a/pkg/sqs/Tests/Functional/SqsConsumptionUseCasesTest.php b/pkg/sqs/Tests/Functional/SqsConsumptionUseCasesTest.php
@@ -9,7 +9,6 @@
 use Enqueue\Consumption\QueueConsumer;
 use Enqueue\Consumption\Result;
 use Enqueue\Sqs\SqsContext;
-use Enqueue\Test\RetryTrait;
 use Enqueue\Test\SqsExtension;
 use Interop\Queue\Context;
 use Interop\Queue\Message;
@@ -18,7 +17,6 @@
 
 class SqsConsumptionUseCasesTest extends TestCase
 {
-    use RetryTrait;
     use SqsExtension;
 
     /**
diff --git a/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php b/pkg/sqs/Tests/Spec/SqsSendAndReceiveDelayedMessageFromQueueTest.php
@@ -4,7 +4,6 @@
 
 use Enqueue\Sqs\SqsContext;
 use Enqueue\Sqs\SqsDestination;
-use Enqueue\Test\RetryTrait;
 use Enqueue\Test\SqsExtension;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendAndReceiveDelayedMessageFromQueueSpec;
@@ -17,7 +16,6 @@
 class SqsSendAndReceiveDelayedMessageFromQueueTest extends SendAndReceiveDelayedMessageFromQueueSpec
 {
     use CreateSqsQueueTrait;
-    use RetryTrait;
     use SqsExtension;
 
     /**
diff --git a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromQueueTest.php
@@ -4,7 +4,6 @@
 
 use Enqueue\Sqs\SqsContext;
 use Enqueue\Sqs\SqsDestination;
-use Enqueue\Test\RetryTrait;
 use Enqueue\Test\SqsExtension;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToAndReceiveFromQueueSpec;
@@ -17,7 +16,6 @@
 class SqsSendToAndReceiveFromQueueTest extends SendToAndReceiveFromQueueSpec
 {
     use CreateSqsQueueTrait;
-    use RetryTrait;
     use SqsExtension;
 
     /**
diff --git a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveFromTopicTest.php
@@ -4,7 +4,6 @@
 
 use Enqueue\Sqs\SqsContext;
 use Enqueue\Sqs\SqsDestination;
-use Enqueue\Test\RetryTrait;
 use Enqueue\Test\SqsExtension;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToAndReceiveFromTopicSpec;
@@ -17,7 +16,6 @@
 class SqsSendToAndReceiveFromTopicTest extends SendToAndReceiveFromTopicSpec
 {
     use CreateSqsQueueTrait;
-    use RetryTrait;
     use SqsExtension;
 
     /**
diff --git a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveNoWaitFromQueueTest.php b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveNoWaitFromQueueTest.php
@@ -4,7 +4,6 @@
 
 use Enqueue\Sqs\SqsContext;
 use Enqueue\Sqs\SqsDestination;
-use Enqueue\Test\RetryTrait;
 use Enqueue\Test\SqsExtension;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToAndReceiveNoWaitFromQueueSpec;
@@ -17,7 +16,6 @@
 class SqsSendToAndReceiveNoWaitFromQueueTest extends SendToAndReceiveNoWaitFromQueueSpec
 {
     use CreateSqsQueueTrait;
-    use RetryTrait;
     use SqsExtension;
 
     /**
diff --git a/pkg/sqs/Tests/Spec/SqsSendToAndReceiveNoWaitFromTopicTest.php b/pkg/sqs/Tests/Spec/SqsSendToAndReceiveNoWaitFromTopicTest.php
@@ -4,7 +4,6 @@
 
 use Enqueue\Sqs\SqsContext;
 use Enqueue\Sqs\SqsDestination;
-use Enqueue\Test\RetryTrait;
 use Enqueue\Test\SqsExtension;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToAndReceiveNoWaitFromTopicSpec;
@@ -17,7 +16,6 @@
 class SqsSendToAndReceiveNoWaitFromTopicTest extends SendToAndReceiveNoWaitFromTopicSpec
 {
     use CreateSqsQueueTrait;
-    use RetryTrait;
     use SqsExtension;
 
     /**
diff --git a/pkg/sqs/Tests/Spec/SqsSendToTopicAndReceiveFromQueueTest.php b/pkg/sqs/Tests/Spec/SqsSendToTopicAndReceiveFromQueueTest.php
@@ -4,7 +4,6 @@
 
 use Enqueue\Sqs\SqsContext;
 use Enqueue\Sqs\SqsDestination;
-use Enqueue\Test\RetryTrait;
 use Enqueue\Test\SqsExtension;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToTopicAndReceiveFromQueueSpec;
@@ -17,7 +16,6 @@
 class SqsSendToTopicAndReceiveFromQueueTest extends SendToTopicAndReceiveFromQueueSpec
 {
     use CreateSqsQueueTrait;
-    use RetryTrait;
     use SqsExtension;
 
     /**
diff --git a/pkg/sqs/Tests/Spec/SqsSendToTopicAndReceiveNoWaitFromQueueTest.php b/pkg/sqs/Tests/Spec/SqsSendToTopicAndReceiveNoWaitFromQueueTest.php
@@ -4,7 +4,6 @@
 
 use Enqueue\Sqs\SqsContext;
 use Enqueue\Sqs\SqsDestination;
-use Enqueue\Test\RetryTrait;
 use Enqueue\Test\SqsExtension;
 use Interop\Queue\Context;
 use Interop\Queue\Spec\SendToTopicAndReceiveNoWaitFromQueueSpec;
@@ -17,7 +16,6 @@
 class SqsSendToTopicAndReceiveNoWaitFromQueueTest extends SendToTopicAndReceiveNoWaitFromQueueSpec
 {
     use CreateSqsQueueTrait;
-    use RetryTrait;
     use SqsExtension;
 
     /**
diff --git a/pkg/wamp/Tests/Functional/WampConsumerTest.php b/pkg/wamp/Tests/Functional/WampConsumerTest.php
@@ -2,7 +2,6 @@
 
 namespace Enqueue\Wamp\Tests\Functional;
 
-use Enqueue\Test\RetryTrait;
 use Enqueue\Test\WampExtension;
 use Enqueue\Wamp\WampMessage;
 use PHPUnit\Framework\TestCase;
@@ -17,7 +16,6 @@
  */
 class WampConsumerTest extends TestCase
 {
-    use RetryTrait;
     use WampExtension;
 
     public static function setUpBeforeClass(): void
