Add support for PHPUnit 9

composer.json

@@ -20,7 +20,7 @@
         "ext-sockets": "*",
         "friendsofphp/php-cs-fixer": "^2.14",
         "monolog/monolog": "^1.24|^2.0",
-        "phpunit/phpunit": "^7.1|^8",
+        "phpunit/phpunit": "^7.1|^8|^9",
         "psr/log": "^1.1",
         "rybakit/msgpack": "^0.7",
         "vimeo/psalm": "^3.9"

tests/Integration/Connection/ParseGreetingTest.php

@@ -63,7 +63,7 @@ public function testParseGreetingWithInvalidSalt(string $greeting) : void
         $client = $clientBuilder->setOptions(['username' => 'guest'])->build();
 
         $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessageRegExp('/(Unable to decode salt|Salt is too short)/');
+        $this->expectExceptionMessageMatches('/(Unable to decode salt|Salt is too short)/');
 
         $client->ping();
     }

tests/Integration/TestCase.php

@@ -21,9 +21,12 @@
 use Tarantool\Client\Exception\CommunicationFailed;
 use Tarantool\Client\Handler\Handler;
 use Tarantool\Client\Request\Request;
+use Tarantool\Client\Tests\PhpUnitCompat;
 
 abstract class TestCase extends BaseTestCase
 {
+    use PhpUnitCompat;
+
     protected const STAT_REQUEST_SELECT = 'SELECT';
     protected const STAT_REQUEST_AUTH = 'AUTH';
 

tests/PhpUnitCompat.php

@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * This file is part of the Tarantool Client package.
+ *
+ * (c) Eugene Leonovich <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace Tarantool\Client\Tests;
+
+/**
+ * A compatibility layer for the legacy PHPUnit 7.
+ */
+trait PhpUnitCompat
+{
+    public function expectExceptionMessageMatches(string $regularExpression) : void
+    {
+        if (is_callable('parent::expectExceptionMessageRegExp')) {
+            parent::expectExceptionMessageRegExp($regularExpression);
+
+            return;
+        }
+
+        parent::expectExceptionMessageMatches($regularExpression);
+    }
+}

tests/Unit/Packer/PeclPackerTest.php

@@ -16,12 +16,15 @@
 use Tarantool\Client\Keys;
 use Tarantool\Client\Packer\Packer;
 use Tarantool\Client\Packer\PeclPacker;
+use Tarantool\Client\Tests\PhpUnitCompat;
 
 /**
  * @requires extension msgpack
  */
 final class PeclPackerTest extends PackerTest
 {
+    use PhpUnitCompat;
+
     protected function createPacker() : Packer
     {
         return new PeclPacker();
@@ -33,7 +36,7 @@ protected function createPacker() : Packer
     public function testThrowExceptionOnBadUnpackData(string $data) : void
     {
         $this->expectException(\RuntimeException::class);
-        $this->expectExceptionMessageRegExp('/Unable to unpack response (header|body)/');
+        $this->expectExceptionMessageMatches('/Unable to unpack response (header|body)/');
 
         $this->packer->unpack($data)->tryGetBodyField(Keys::DATA);
     }