php 8 Support [WIP]

.travis.yml

@@ -51,6 +51,10 @@ matrix:
       sudo: required
       services: docker
       env: SYMFONY_VERSION=4.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
+    - php: 8.0
+      sudo: false
+      services: docker
+      env: SYMFONY_VERSION=5.2.* UNIT_TESTS=true
   allow_failures:
     - env: SYMFONY_VERSION=4.3.* RDKAFKA_TESTS=true PREPARE_CONTAINER=true
 

composer.json

@@ -9,7 +9,7 @@
     "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",
@@ -41,7 +41,7 @@
     "datadog/php-datadogstatsd": "^1.3"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.5",
+    "phpunit/phpunit": "^9.5",
     "phpstan/phpstan": "^0.12",
     "queue-interop/queue-spec": "^0.6",
     "symfony/browser-kit": "^3.4|^4",
@@ -60,7 +60,8 @@
     "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"
   },
   "autoload": {
     "psr-4": {

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

@@ -22,7 +22,7 @@ class AmqpCommonUseCasesTest extends TestCase
      */
     private $amqpContext;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->amqpContext = $this->buildAmqpContext();
 

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

@@ -29,7 +29,7 @@ class AmqpConsumptionUseCasesTest extends TestCase
      */
     private $amqpContext;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->amqpContext = $this->buildAmqpContext();
 

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

@@ -23,7 +23,7 @@ class AmqpRpcUseCasesTest extends TestCase
      */
     private $amqpContext;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->amqpContext = $this->buildAmqpContext();
 

pkg/amqp-tools/Tests/SignalSocketHelperTest.php

@@ -16,7 +16,7 @@ class SignalSocketHelperTest extends TestCase
 
     private $backupSigIntHandler;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -76,7 +76,7 @@ public function testShouldRegisterHandlerOnBeforeSocketAndBackupCurrentOne()
 
         $handlers = $this->readAttribute($this->signalHelper, 'handlers');
 
-        $this->assertInternalType('array', $handlers);
+        $this->assertIsArray($handlers);
         $this->assertArrayHasKey(SIGTERM, $handlers);
         $this->assertSame($handler, $handlers[SIGTERM]);
     }

pkg/async-event-dispatcher/Tests/Functional/UseCasesTest.php

@@ -53,7 +53,7 @@ class UseCasesTest extends TestCase
      */
     protected $asyncProcessor;
 
-    public function setUp()
+    public function setUp(): void
     {
         (new Filesystem())->remove(__DIR__.'/queues/');
 

pkg/dbal/Tests/DbalConnectionFactoryConfigTest.php

@@ -4,6 +4,7 @@
 
 use Enqueue\Dbal\DbalConnectionFactory;
 use Enqueue\Test\ClassExtensionTrait;
+use Enqueue\Test\ReadAttributeTrait;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -12,6 +13,7 @@
 class DbalConnectionFactoryConfigTest extends TestCase
 {
     use ClassExtensionTrait;
+    use ReadAttributeTrait;
 
     public function testThrowNeitherArrayStringNorNullGivenAsConfig()
     {

pkg/dbal/Tests/Functional/DbalConsumerTest.php

@@ -21,7 +21,7 @@ class DbalConsumerTest extends TestCase
      */
     private $context;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->context = $this->createDbalContext();
     }

pkg/dbal/Tests/Spec/Mysql/DbalSendAndReceivePriorityMessagesFromQueueTest.php

@@ -16,7 +16,7 @@ class DbalSendAndReceivePriorityMessagesFromQueueTest extends SendAndReceivePrio
 
     private $publishedAt;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

pkg/dbal/Tests/Spec/Postgresql/DbalSendAndReceivePriorityMessagesFromQueueTest.php

@@ -16,7 +16,7 @@ class DbalSendAndReceivePriorityMessagesFromQueueTest extends SendAndReceivePrio
 
     private $publishedAt;
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

pkg/enqueue-bundle/Tests/Functional/Events/AsyncListenerTest.php

@@ -16,7 +16,7 @@
  */
 class AsyncListenerTest extends WebTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

pkg/enqueue-bundle/Tests/Functional/Events/AsyncProcessorTest.php

@@ -18,7 +18,7 @@
  */
 class AsyncProcessorTest extends WebTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

pkg/enqueue-bundle/Tests/Functional/Events/AsyncSubscriberTest.php

@@ -16,7 +16,7 @@
  */
 class AsyncSubscriberTest extends WebTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

pkg/enqueue-bundle/Tests/Functional/LazyProducerTest.php

@@ -11,7 +11,7 @@
  */
 class LazyProducerTest extends WebTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         // do not call parent::setUp.
         // parent::setUp();

pkg/enqueue-bundle/Tests/Functional/UseCasesTest.php

@@ -20,7 +20,7 @@ class UseCasesTest extends WebTestCase
 {
     const RECEIVE_TIMEOUT = 500;
 
-    public function setUp()
+    public function setUp(): void
     {
         // do not call parent::setUp.
         // parent::setUp();

pkg/enqueue-bundle/Tests/Functional/WebTestCase.php

@@ -20,7 +20,7 @@ abstract class WebTestCase extends BaseWebTestCase
      */
     protected static $container;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

pkg/enqueue-bundle/Tests/Unit/DependencyInjection/ConfigurationTest.php

@@ -2,6 +2,7 @@
 
 namespace Enqueue\Bundle\Tests\Unit\DependencyInjection;
 
+use DMS\PHPUnitExtensions\ArraySubset\Assert;
 use Enqueue\Bundle\DependencyInjection\Configuration;
 use Enqueue\Test\ClassExtensionTrait;
 use PHPUnit\Framework\TestCase;
@@ -222,7 +223,7 @@ public function testJobShouldBeDisabledByDefault()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'job' => [
                     'enabled' => false,
@@ -243,7 +244,7 @@ public function testCouldEnableJob()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'job' => true,
             ],
@@ -261,7 +262,7 @@ public function testDoctrinePingConnectionExtensionShouldBeDisabledByDefault()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'doctrine_ping_connection_extension' => false,
@@ -284,7 +285,7 @@ public function testDoctrinePingConnectionExtensionCouldBeEnabled()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'doctrine_ping_connection_extension' => true,
@@ -304,7 +305,7 @@ public function testDoctrineClearIdentityMapExtensionShouldBeDisabledByDefault()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'doctrine_clear_identity_map_extension' => false,
@@ -327,7 +328,7 @@ public function testDoctrineClearIdentityMapExtensionCouldBeEnabled()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'doctrine_clear_identity_map_extension' => true,
@@ -347,7 +348,7 @@ public function testDoctrineOdmClearIdentityMapExtensionShouldBeDisabledByDefaul
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'doctrine_odm_clear_identity_map_extension' => false,
@@ -370,7 +371,7 @@ public function testDoctrineOdmClearIdentityMapExtensionCouldBeEnabled()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'doctrine_odm_clear_identity_map_extension' => true,
@@ -390,7 +391,7 @@ public function testDoctrineClosedEntityManagerExtensionShouldBeDisabledByDefaul
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'doctrine_closed_entity_manager_extension' => false,
@@ -413,7 +414,7 @@ public function testDoctrineClosedEntityManagerExtensionCouldBeEnabled()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'doctrine_closed_entity_manager_extension' => true,
@@ -433,7 +434,7 @@ public function testResetServicesExtensionShouldBeDisabledByDefault()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'reset_services_extension' => false,
@@ -456,7 +457,7 @@ public function testResetServicesExtensionCouldBeEnabled()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'reset_services_extension' => true,
@@ -478,7 +479,7 @@ public function testSignalExtensionShouldBeEnabledIfPcntlExtensionIsLoaded()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'signal_extension' => $isLoaded,
@@ -501,7 +502,7 @@ public function testSignalExtensionCouldBeDisabled()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'signal_extension' => false,
@@ -521,7 +522,7 @@ public function testReplyExtensionShouldBeEnabledByDefault()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'reply_extension' => true,
@@ -544,7 +545,7 @@ public function testReplyExtensionCouldBeDisabled()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'extensions' => [
                     'reply_extension' => false,
@@ -564,7 +565,7 @@ public function testShouldDisableAsyncEventsByDefault()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'async_events' => [
                     'enabled' => false,
@@ -586,7 +587,7 @@ public function testShouldAllowEnableAsyncEvents()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'async_events' => [
                     'enabled' => true,
@@ -603,7 +604,7 @@ public function testShouldAllowEnableAsyncEvents()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'async_events' => [
                     'enabled' => true,
@@ -623,7 +624,7 @@ public function testShouldSetDefaultConfigurationForConsumption()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'consumption' => [
                     'receive_timeout' => 10000,
@@ -646,7 +647,7 @@ public function testShouldAllowConfigureConsumption()
             ],
         ]]);
 
-        $this->assertArraySubset([
+        Assert::assertArraySubset([
             'default' => [
                 'consumption' => [
                     'receive_timeout' => 456,
@@ -657,6 +658,6 @@ public function testShouldAllowConfigureConsumption()
 
     private function assertConfigEquals(array $expected, array $actual): void
     {
-        $this->assertArraySubset($expected, $actual, false, var_export($actual, true));
+        Assert::assertArraySubset($expected, $actual, false, var_export($actual, true));
     }
 }