Add PHP 8 support (#34)

Fixes #33.

Author: rybakit

.travis.yml

@@ -10,6 +10,7 @@ env:
   - PHP_RUNTIME='php:7.2-cli'
   - PHP_RUNTIME='php:7.3-cli' CHECK_CS=1
   - PHP_RUNTIME='php:7.4-cli' PHPUNIT_OPTS='--coverage-text --coverage-clover=coverage.clover'
+  - PHP_RUNTIME='php:8.0-cli'
 
 matrix:
   fast_finish: true

README.md

@@ -432,11 +432,11 @@ First, create a container:
 ./dockerfile.sh | docker build -t msgpack -
 ```
 
-The command above will create a container named `msgpack` with PHP 7.4 runtime.
+The command above will create a container named `msgpack` with PHP 8.0 runtime.
 You may change the default runtime by defining the `PHP_RUNTIME` environment variable:
 
 ```sh
-PHP_RUNTIME='php:7.3-cli' ./dockerfile.sh | docker build -t msgpack -
+PHP_RUNTIME='php:7.4-cli' ./dockerfile.sh | docker build -t msgpack -
 ```
 
 > *See a list of various runtimes [here](.travis.yml#L8).*

composer.json

@@ -11,13 +11,12 @@
         }
     ],
     "require": {
-        "php": "^7.1.1"
+        "php": "^7.1.1|^8"
     },
     "require-dev": {
-        "ext-decimal": "*",
         "ext-gmp": "*",
         "friendsofphp/php-cs-fixer": "^2.14",
-        "phpunit/phpunit": "^7.1|^8.0"
+        "phpunit/phpunit": "^7.1|^8|^9"
     },
     "suggest": {
         "ext-decimal": "For converting overflowed integers to Decimal objects",

dockerfile.sh

@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
 
 if [[ -z "$PHP_RUNTIME" ]]; then
-    PHP_RUNTIME='php:7.4-cli'
+    PHP_RUNTIME='php:8.0-cli'
 fi
 
 RUN_CMDS=''
-RUN_CMDS="$RUN_CMDS && \\\\\n    apt-get install -y libmpdec-dev"
-RUN_CMDS="$RUN_CMDS && \\\\\n    pecl install decimal && docker-php-ext-enable decimal"
+if [[ $PHP_RUNTIME != php:8* ]]; then
+  RUN_CMDS="$RUN_CMDS && \\\\\n    apt-get install -y libmpdec-dev"
+  RUN_CMDS="$RUN_CMDS && \\\\\n    pecl install decimal && docker-php-ext-enable decimal"
+fi
 
 if [[ $PHPUNIT_OPTS =~ (^|[[:space:]])--coverage-[[:alpha:]] ]]; then
     RUN_CMDS="$RUN_CMDS && \\\\\n    pecl install pcov && docker-php-ext-enable pcov"

tests/Unit/BufferUnpackerTest.php

@@ -24,6 +24,8 @@
 
 final class BufferUnpackerTest extends TestCase
 {
+    use PhpUnitCompat;
+
     /**
      * @var BufferUnpacker
      */
@@ -357,7 +359,7 @@ public function provideOptionsData() : iterable
     public function testConstructorThrowsExceptionOnInvalidOptions($options) : void
     {
         $this->expectException(InvalidOptionException::class);
-        $this->expectExceptionMessageRegExp('/Invalid option .+?, use .+?/');
+        $this->expectExceptionMessageMatches('/Invalid option .+?, use .+?/');
 
         new BufferUnpacker('', $options);
     }
@@ -380,7 +382,7 @@ public function testConstructorSetsTransformers() : void
         $transformer = $this->createMock(Extension::class);
         $transformer->method('getType')->willReturn($type);
         $transformer->expects(self::once())->method('unpackExt')
-            ->with($this->isInstanceOf(BufferUnpacker::class), 1)
+            ->with(self::isInstanceOf(BufferUnpacker::class), 1)
             ->willReturn($obj);
 
         $unpacker = new BufferUnpacker('', null, [$transformer]);
@@ -399,13 +401,13 @@ public function testUnpackCustomType() : void
         $extension1 = $this->createMock(Extension::class);
         $extension1->method('getType')->willReturn($type1);
         $extension1->expects(self::once())->method('unpackExt')
-            ->with($this->isInstanceOf(BufferUnpacker::class), 1)
+            ->with(self::isInstanceOf(BufferUnpacker::class), 1)
             ->willReturn($obj1);
 
         $extension2 = $this->createMock(Extension::class);
         $extension2->method('getType')->willReturn($type2);
         $extension2->expects(self::once())->method('unpackExt')
-            ->with($this->isInstanceOf(BufferUnpacker::class), 1)
+            ->with(self::isInstanceOf(BufferUnpacker::class), 1)
             ->willReturn($obj2);
 
         $unpacker = $this->unpacker->extendWith($extension1, $extension2);

tests/Unit/PackerTest.php

@@ -21,6 +21,8 @@
 
 final class PackerTest extends TestCase
 {
+    use PhpUnitCompat;
+
     /**
      * @var Packer
      */
@@ -104,7 +106,7 @@ public function provideOptionsData() : array
     public function testConstructorThrowsExceptionOnInvalidOptions($options) : void
     {
         $this->expectException(InvalidOptionException::class);
-        $this->expectExceptionMessageRegExp('/Invalid option .+?, use .+?/');
+        $this->expectExceptionMessageMatches('/Invalid option .+?, use .+?/');
 
         new Packer($options);
     }
@@ -127,7 +129,7 @@ public function testConstructorSetsTransformers() : void
 
         $transformer = $this->createMock(CanPack::class);
         $transformer->expects(self::once())->method('pack')
-            ->with($this->isInstanceOf(Packer::class), $obj)
+            ->with(self::isInstanceOf(Packer::class), $obj)
             ->willReturn($packed);
 
         $packer = new Packer(null, [$transformer]);
@@ -146,7 +148,7 @@ public function testPackCustomType() : void
         $transformer1 = $this->createMock(CanPack::class);
         $transformer1->expects(self::atMost(2))->method('pack')
             ->with(
-                $this->isInstanceOf(Packer::class),
+                self::isInstanceOf(Packer::class),
                 self::logicalOr(self::identicalTo($obj1), self::identicalTo($obj2))
             )
             ->willReturnCallback(static function ($packer, $value) use ($obj1, $packed1) {
@@ -156,7 +158,7 @@ public function testPackCustomType() : void
         $transformer2 = $this->createMock(CanPack::class);
         $transformer2->expects(self::atMost(2))->method('pack')
             ->with(
-                $this->isInstanceOf(Packer::class),
+                self::isInstanceOf(Packer::class),
                 self::logicalOr(self::identicalTo($obj1), self::identicalTo($obj2))
             )
             ->willReturnCallback(static function ($packer, $value) use ($obj2, $packed2) {
@@ -175,7 +177,7 @@ public function testPackThrowsExceptionOnUnsupportedCustomType() : void
 
         $transformer = $this->createMock(CanPack::class);
         $transformer->expects(self::once())->method('pack')
-            ->with($this->isInstanceOf(Packer::class), $obj)
+            ->with(self::isInstanceOf(Packer::class), $obj)
             ->willReturn(null);
 
         $packer = $this->packer->extendWith($transformer);

tests/Unit/PhpUnitCompat.php

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of the rybakit/msgpack.php package.
+ *
+ * (c) Eugene Leonovich <gen.work@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MessagePack\Tests\Unit;
+
+/**
+ * Compatibility layer for legacy PHPUnit versions.
+ */
+trait PhpUnitCompat
+{
+    /**
+     * TestCase::expectExceptionMessageRegExp() is deprecated since PHPUnit 8.4.
+     */
+    public function expectExceptionMessageMatches(string $regularExpression) : void
+    {
+        is_callable('parent::expectExceptionMessageMatches')
+            ? parent::expectExceptionMessageMatches(...func_get_args())
+            : parent::expectExceptionMessageRegExp(...func_get_args());
+    }
+}