Merge pull request #154 from marc-mabe/3.x-php8.1

Support PHP-8.1

Author: marc-mabe

.github/workflows/test.Dockerfile

@@ -0,0 +1,10 @@
+ARG PHP_VERSION=latest
+FROM php:${PHP_VERSION}-cli-alpine
+
+WORKDIR /workdir
+
+# install composer
+RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
+ENV COMPOSER_ALLOW_SUPERUSER=1
+ENV COMPOSER_HTACCESS_PROTECT=0
+ENV COMPOSER_CACHE_DIR=/.composer

.github/workflows/test.yml

@@ -0,0 +1,46 @@
+name: Test
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - '[0-9]+.x'
+
+jobs:
+  php:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - PHP_VERSION: 5.6
+          - PHP_VERSION: 7.0
+          - PHP_VERSION: 7.1
+          - PHP_VERSION: 7.2
+          - PHP_VERSION: 7.3
+          - PHP_VERSION: 7.4
+          - PHP_VERSION: 8.0
+          - PHP_VERSION: 8.1
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Build Docker Image
+        if: steps.cache-docker-image.outputs.cache-hit != 'true'
+        run: docker build -f .github/workflows/test.Dockerfile -t 'test:${{ matrix.PHP_VERSION }}' --build-arg 'PHP_VERSION=${{ matrix.PHP_VERSION }}' .
+
+      - name: Cache Composer Cache Files
+        uses: actions/cache@v2
+        with:
+          path: /tmp/composer-cache-files
+          key: cache-composer-cache-files-${{ matrix.PHP_VERSION }}
+          restore-keys: |
+            cache-composer-cache-files-
+
+      - name: Install Composer Dependencies
+        run: |
+          docker run --rm -u "$(id -u):$(id -g)" -v "$(pwd):/workdir" -v '/tmp/composer-cache-files:/.composer' 'test:${{ matrix.PHP_VERSION }}' composer install --no-interaction --no-progress --prefer-dist ${{ matrix.COMPOSER_EXTRA_ARGS }}
+
+      - name: Run Unit Test
+        run: |
+          docker run --rm -u "$(id -u):$(id -g)" -v "$(pwd):/workdir" 'test:${{ matrix.PHP_VERSION }}' php -d 'zend.assertions=1' ./vendor/bin/phpunit

.travis.yml

@@ -1,7 +1,5 @@
 # php-enum
-[![Build Status](https://secure.travis-ci.org/marc-mabe/php-enum.png?branch=master)](http://travis-ci.org/marc-mabe/php-enum)
-[![Quality Score](https://scrutinizer-ci.com/g/marc-mabe/php-enum/badges/quality-score.png?s=7dfddb19a12314ecc5f05eeb2b297bdde3ad2623)](https://scrutinizer-ci.com/g/marc-mabe/php-enum/)
-[![Code Coverage](https://scrutinizer-ci.com/g/marc-mabe/php-enum/badges/coverage.png?s=8442d532fad964fd3d8afe493ac2d0d65162306a)](https://scrutinizer-ci.com/g/marc-mabe/php-enum/)
+[![Build Status](https://github.com/marc-mabe/php-enum/workflows/Test/badge.svg?branch=3.x)](https://github.com/marc-mabe/php-enum/actions?query=workflow%3ATest%20branch%3A3.x)
 [![Total Downloads](https://poser.pugx.org/marc-mabe/php-enum/downloads.png)](https://packagist.org/packages/marc-mabe/php-enum)
 [![Latest Stable](https://poser.pugx.org/marc-mabe/php-enum/v/stable.png)](https://packagist.org/packages/marc-mabe/php-enum)
 

README.md

@@ -21,7 +21,7 @@
         "ext-reflection": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7 || ^6.0",
+        "phpunit/phpunit": "^5.7 || ^6.0 || ^9.0",
         "phpbench/phpbench": "@dev",
 
         "lstrojny/functional-php": "HHVM: variadic params with type constraints are not supported in non-Hack",

composer.json

@@ -77,7 +77,7 @@ public function __toString()
      * @throws LogicException Enums are not cloneable
      *                        because instances are implemented as singletons
      */
-    final private function __clone()
+    final public function __clone()
     {
         throw new LogicException('Enums are not cloneable');
     }
@@ -299,7 +299,7 @@ final public static function getNames()
         }
         return self::$names[static::class];
     }
-    
+
     /**
      * Get a list of enumerator ordinal numbers
      *
@@ -324,7 +324,7 @@ final public static function getConstants()
 
     /**
      * Test if the given enumerator is part of this enumeration
-     * 
+     *
      * @param static|null|bool|int|float|string|array $enumerator
      * @return bool
      */

src/Enum.php

@@ -21,7 +21,7 @@ class EnumSerializableTraitTest extends TestCase
     public function testSerializeSerializableEnum()
     {
         $serialized = serialize(SerializableEnum::get(SerializableEnum::NIL));
-        $this->assertInternalType('string', $serialized);
+        $this->assertSame('string', gettype($serialized));
 
         $unserialized = unserialize($serialized);
         $this->assertInstanceOf(SerializableEnum::class, $unserialized);
@@ -30,7 +30,7 @@ public function testSerializeSerializableEnum()
     public function testUnserializeFirstWillHoldTheSameInstance()
     {
         $serialized = serialize(SerializableEnum::get(SerializableEnum::STR));
-        $this->assertInternalType('string', $serialized);
+        $this->assertSame('string', gettype($serialized));
 
         // clear all instantiated instances so we can virtual test unserializing first
         $this->clearEnumeration(SerializableEnum::class);

tests/MabeEnumTest/EnumSerializableTraitTest.php

@@ -26,16 +26,6 @@
  */
 class EnumTest extends TestCase
 {
-    public function setUp()
-    {
-        $this->resetStaticEnumProps();
-    }
-
-    public function tearDown()
-    {
-        assert_options(ASSERT_ACTIVE, 1);
-    }
-
     /**
      * Un-initialize all known enumerations
      */
@@ -233,7 +223,7 @@ public function testGetNamesConstantsNotDetected()
             $this->assertSame($expectedNames[$i], $names[$i]);
         }
     }
-    
+
     public function testGetOrdinals()
     {
         $constants = EnumInheritance::getConstants();
@@ -325,10 +315,15 @@ public function testEnabledAssertAmbiguousEnumeratorValues()
 
     public function testDisabledAssertAmbiguousEnumeratorValues()
     {
-        assert_options(ASSERT_ACTIVE, 0);
         $this->expectException(InvalidArgumentException::class);
 
-        EnumAmbiguous::get('unknown');
+        try {
+            assert_options(ASSERT_ACTIVE, 0);
+            EnumAmbiguous::get('unknown');
+        } catch (\Exception $e) {
+            assert_options(ASSERT_ACTIVE, 1);
+            throw $e;
+        }
     }
 
     public function testExtendedEnabledAssertAmbiguousEnumeratorValues()
@@ -345,10 +340,15 @@ public function testExtendedEnabledAssertAmbiguousEnumeratorValues()
 
     public function testExtendedDisabledAssertAmbiguousEnumeratorValues()
     {
-        assert_options(ASSERT_ACTIVE, 0);
         $this->expectException(InvalidArgumentException::class);
 
-        EnumExtendedAmbiguous::get('unknown');
+        try {
+            assert_options(ASSERT_ACTIVE, 0);
+            EnumExtendedAmbiguous::get('unknown');
+        } catch (\Exception $e) {
+            assert_options(ASSERT_ACTIVE, 1);
+            throw $e;
+        }
     }
 
     public function testSingleton()
@@ -364,12 +364,10 @@ public function testCloneNotCallableAndThrowsLogicException()
 
         $reflectionClass  = new ReflectionClass($enum);
         $reflectionMethod = $reflectionClass->getMethod('__clone');
-        $this->assertTrue($reflectionMethod->isPrivate(), 'The method __clone must be private');
         $this->assertTrue($reflectionMethod->isFinal(), 'The method __clone must be final');
 
-        $reflectionMethod->setAccessible(true);
         $this->expectException(LogicException::class);
-        $reflectionMethod->invoke($enum);
+        clone $enum;
     }
 
     public function testNotSerializable()
@@ -430,7 +428,7 @@ public function testConstVisibility()
             'PUB'  => ConstVisibilityEnum::PUB,
         ), $constants);
     }
-    
+
     public function testConstVisibilityExtended()
     {
         if (PHP_VERSION_ID < 70100) {

tests/MabeEnumTest/EnumTest.php

@@ -15,7 +15,6 @@
 assert_options(ASSERT_ACTIVE, 1);
 assert_options(ASSERT_WARNING, 0);
 assert_options(ASSERT_BAIL, 0);
-assert_options(ASSERT_QUIET_EVAL, 0);
 if (!class_exists('AssertionError')) {
     // AssertionError has been added in PHP-7.0
     class AssertionError extends Exception {};