PHPUnit 9.5

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.1'
+          php-version: '7.4'
           coverage: none
           extensions: mongodb, redis, :xdebug
           ini-values: memory_limit=2048M
@@ -63,7 +63,7 @@ jobs:
 
       - uses: shivammathur/setup-php@v2
         with:
-          php-version: '7.1'
+          php-version: '7.4'
           coverage: none
           extensions: mongodb, redis, :xdebug
           ini-values: memory_limit=2048M
@@ -78,27 +78,10 @@ jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         php: ['7.4']
         include:
-          - php: 7.1
-            symfony_version: 4.3.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: 7.2
-            symfony_version: 4.3.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
-          - php: 7.2
-            symfony_version: 5.0.*
-            unit_tests: true
-            functional_tests: false
-            rdkafka_tests: false
-            prepare_container: false
           - php: 7.3
             symfony_version: 4.3.*
             unit_tests: true

.gitignore

@@ -17,3 +17,4 @@ var
 .php_cs
 .php_cs.cache
 composer.lock
+.phpunit.result.cache

composer.json

@@ -9,12 +9,12 @@
     "phpstan": "bin/phpstan analyse --memory-limit=512M -c phpstan.neon"
   },
   "require": {
-    "php": "^7.1.3",
+    "php": "^7.3",
 
     "ext-amqp": "^1.9.3",
     "ext-gearman": "^2.0",
     "ext-mongodb": "^1.5",
-    "ext-rdkafka": "^3.0.3",
+    "ext-rdkafka": "^3.0.3|^4.0|^5.0",
 
     "queue-interop/amqp-interop": "^0.8",
     "queue-interop/queue-interop": "^0.7|^0.8",
@@ -41,7 +41,8 @@
     "datadog/php-datadogstatsd": "^1.3"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.5",
+    "ext-pcntl": "*",
+    "phpunit/phpunit": "^9.5",
     "phpstan/phpstan": "^0.12",
     "queue-interop/queue-spec": "^0.6",
     "symfony/browser-kit": "^3.4|^4",
@@ -60,7 +61,9 @@
     "doctrine/mongodb-odm-bundle": "^3.5|^4",
     "alcaeus/mongo-php-adapter": "^1.0",
     "kwn/php-rdkafka-stubs": "^1.0.2 | ^2.0",
-    "friendsofphp/php-cs-fixer": "^2"
+    "friendsofphp/php-cs-fixer": "^2",
+    "dms/phpunit-arraysubset-asserts": "^0.2.1",
+    "phpspec/prophecy-phpunit": "^2.0"
   },
   "autoload": {
     "psr-4": {

docs/bundle/functional_testing.md

@@ -57,7 +57,7 @@ class FooTest extends WebTestCase
     /** @var  \Symfony\Bundle\FrameworkBundle\Client */
     private $client;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->client = static::createClient();
     }

phpunit.xml.dist

@@ -2,7 +2,7 @@
 
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
     backupGlobals="false"
     backupStaticAttributes="false"
     colors="true"
@@ -129,12 +129,12 @@
         <env name="SHELL_VERBOSITY" value="-1"/>
     </php>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">.</directory>
-            <exclude>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+        </include>
+        <exclude>
+            <directory>./vendor</directory>
+        </exclude>
+    </coverage>
 </phpunit>

pkg/amqp-bunny/Tests/AmqpConnectionFactoryTest.php

@@ -5,12 +5,14 @@
 use Enqueue\AmqpBunny\AmqpConnectionFactory;
 use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\ConnectionFactory;
 use PHPUnit\Framework\TestCase;
 
 class AmqpConnectionFactoryTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementConnectionFactoryInterface()
     {

pkg/amqp-bunny/composer.json

@@ -6,14 +6,14 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.3",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",
         "bunny/bunny": "^0.4",
         "enqueue/amqp-tools": "^0.10"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.5",
+        "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
         "queue-interop/queue-spec": "^0.6"

pkg/amqp-ext/Tests/AmqpConnectionFactoryTest.php

@@ -6,12 +6,14 @@
 use Enqueue\AmqpExt\AmqpContext;
 use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\ConnectionFactory;
 use PHPUnit\Framework\TestCase;
 
 class AmqpConnectionFactoryTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementConnectionFactoryInterface()
     {
@@ -34,6 +36,6 @@ public function testShouldCreateLazyContext()
         $this->assertInstanceOf(AmqpContext::class, $context);
 
         $this->assertAttributeEquals(null, 'extChannel', $context);
-        $this->assertInternalType('callable', $this->readAttribute($context, 'extChannelFactory'));
+        self::assertIsCallable($this->readAttribute($context, 'extChannelFactory'));
     }
 }

pkg/amqp-ext/Tests/AmqpContextTest.php

@@ -9,6 +9,7 @@
 use Enqueue\Null\NullQueue;
 use Enqueue\Null\NullTopic;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Amqp\Impl\AmqpMessage;
 use Interop\Amqp\Impl\AmqpQueue;
 use Interop\Amqp\Impl\AmqpTopic;
@@ -20,6 +21,7 @@
 class AmqpContextTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementQueueInteropContextInterface()
     {

pkg/amqp-ext/Tests/Functional/AmqpCommonUseCasesTest.php

@@ -14,23 +14,23 @@
  */
 class AmqpCommonUseCasesTest extends TestCase
 {
-    use RabbitmqAmqpExtension;
     use RabbitManagementExtensionTrait;
+    use RabbitmqAmqpExtension;
 
     /**
      * @var AmqpContext
      */
     private $amqpContext;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->amqpContext = $this->buildAmqpContext();
 
         $this->removeQueue('amqp_ext.test');
         $this->removeExchange('amqp_ext.test_exchange');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $this->amqpContext->close();
     }
@@ -128,7 +128,7 @@ public function testProduceAndReceiveOneMessageSentDirectlyToTemporaryQueue()
     public function testProduceAndReceiveOneMessageSentDirectlyToTopic()
     {
         $topic = $this->amqpContext->createTopic('amqp_ext.test_exchange');
-        $topic->setType(AMQP_EX_TYPE_FANOUT);
+        $topic->setType(\AMQP_EX_TYPE_FANOUT);
         $this->amqpContext->declareTopic($topic);
 
         $queue = $this->amqpContext->createQueue('amqp_ext.test');
@@ -153,7 +153,7 @@ public function testProduceAndReceiveOneMessageSentDirectlyToTopic()
     public function testConsumerReceiveMessageFromTopicDirectly()
     {
         $topic = $this->amqpContext->createTopic('amqp_ext.test_exchange');
-        $topic->setType(AMQP_EX_TYPE_FANOUT);
+        $topic->setType(\AMQP_EX_TYPE_FANOUT);
 
         $this->amqpContext->declareTopic($topic);
 
@@ -176,7 +176,7 @@ public function testConsumerReceiveMessageFromTopicDirectly()
     public function testConsumerReceiveMessageWithZeroTimeout()
     {
         $topic = $this->amqpContext->createTopic('amqp_ext.test_exchange');
-        $topic->setType(AMQP_EX_TYPE_FANOUT);
+        $topic->setType(\AMQP_EX_TYPE_FANOUT);
 
         $this->amqpContext->declareTopic($topic);
 

pkg/amqp-ext/Tests/Functional/AmqpConsumptionUseCasesTest.php

@@ -21,22 +21,22 @@
  */
 class AmqpConsumptionUseCasesTest extends TestCase
 {
-    use RabbitmqAmqpExtension;
     use RabbitManagementExtensionTrait;
+    use RabbitmqAmqpExtension;
 
     /**
      * @var AmqpContext
      */
     private $amqpContext;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->amqpContext = $this->buildAmqpContext();
 
         $this->removeQueue('amqp_ext.test');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $this->amqpContext->close();
     }

pkg/amqp-ext/Tests/Functional/AmqpRpcUseCasesTest.php

@@ -15,23 +15,23 @@
  */
 class AmqpRpcUseCasesTest extends TestCase
 {
-    use RabbitmqAmqpExtension;
     use RabbitManagementExtensionTrait;
+    use RabbitmqAmqpExtension;
 
     /**
      * @var AmqpContext
      */
     private $amqpContext;
 
-    public function setUp()
+    protected function setUp(): void
     {
         $this->amqpContext = $this->buildAmqpContext();
 
         $this->removeQueue('rpc.test');
         $this->removeQueue('rpc.reply_test');
     }
 
-    public function tearDown(): void
+    protected function tearDown(): void
     {
         $this->amqpContext->close();
     }

pkg/amqp-ext/composer.json

@@ -6,14 +6,14 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.3",
         "ext-amqp": "^1.9.3",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/amqp-tools": "^0.10"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.5",
+        "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
         "queue-interop/queue-spec": "^0.6",

pkg/amqp-lib/Tests/AmqpConnectionFactoryTest.php

@@ -5,12 +5,14 @@
 use Enqueue\AmqpLib\AmqpConnectionFactory;
 use Enqueue\AmqpTools\RabbitMqDlxDelayStrategy;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use Interop\Queue\ConnectionFactory;
 use PHPUnit\Framework\TestCase;
 
 class AmqpConnectionFactoryTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testShouldImplementConnectionFactoryInterface()
     {

pkg/amqp-lib/composer.json

@@ -6,14 +6,14 @@
     "homepage": "https://enqueue.forma-pro.com/",
     "license": "MIT",
     "require": {
-        "php": "^7.1.3",
+        "php": "^7.3",
         "php-amqplib/php-amqplib": "^2.10",
         "queue-interop/amqp-interop": "^0.8",
         "queue-interop/queue-interop": "^0.8",
         "enqueue/amqp-tools": "^0.10"
     },
     "require-dev": {
-        "phpunit/phpunit": "~7.5",
+        "phpunit/phpunit": "^9.5",
         "enqueue/test": "0.10.x-dev",
         "enqueue/null": "0.10.x-dev",
         "queue-interop/queue-spec": "^0.6"