Update PHP to version ^7.4

Author: vjik

.gitignore

@@ -3,4 +3,7 @@
 
 # Composer
 /vendor
-composer.lock
+composer.lock
+
+# PHPUnit Cache
+/.phpunit.result.cache

Enum.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace vjik\enum;
 
 use LogicException;
@@ -13,25 +15,14 @@
  */
 abstract class Enum
 {
-
-    /**
-     * @var array
-     */
-    protected static $_cacheItems = [];
-
-    /**
-     * @var array
-     */
-    protected static $_cacheInstances = [];
+    protected static array $cacheItems = [];
+    protected static array $cacheInstances = [];
 
     /**
      * @var int|string
      */
     protected $id;
 
-    /**
-     * @var string
-     */
     protected $name;
 
     /**
@@ -56,13 +47,13 @@ public function __construct($id)
      * @throws UnexpectedValueException
      * @since 2.1.0
      */
-    public static function get($id)
+    public static function get($id): self
     {
         $key = get_called_class() . '~' . $id;
-        if (empty(static::$_cacheInstances[$key])) {
-            static::$_cacheInstances[$key] = new static($id);
+        if (empty(static::$cacheInstances[$key])) {
+            static::$cacheInstances[$key] = new static($id);
         }
-        return static::$_cacheInstances[$key];
+        return static::$cacheInstances[$key];
     }
 
     /**
@@ -72,7 +63,7 @@ public static function get($id)
      * @return bool
      * @throws ReflectionException
      */
-    public static function isValid($id, array $filter = [])
+    public static function isValid($id, array $filter = []): bool
     {
         return in_array($id, static::toIds($filter), true);
     }
@@ -83,10 +74,10 @@ public static function isValid($id, array $filter = [])
      * @return array enum-значение - ключ, массив с данными - значение
      * @throws ReflectionException
      */
-    public static function toArray(array $filter = [])
+    public static function toArray(array $filter = []): array
     {
         $class = get_called_class();
-        if (!array_key_exists($class, static::$_cacheItems)) {
+        if (!array_key_exists($class, static::$cacheItems)) {
             $reflection = new \ReflectionClass($class);
             if (is_callable([$class, 'items'])) {
                 /** @noinspection PhpUndefinedMethodInspection */
@@ -103,9 +94,9 @@ public static function toArray(array $filter = [])
                 }
                 $items[$constant]['id'] = $constant;
             }
-            static::$_cacheItems[$class] = $items;
+            static::$cacheItems[$class] = $items;
         }
-        $items = array_filter(static::$_cacheItems[$class], function ($item) use ($class, $filter) {
+        $items = array_filter(static::$cacheItems[$class], function ($item) use ($class, $filter) {
             foreach ($filter as $key => $filterItem) {
                 if (is_int($key)) {
                     $operator = $filterItem[0];
@@ -177,7 +168,7 @@ public static function toArray(array $filter = [])
      * @return array
      * @throws ReflectionException
      */
-    public static function toIds(array $filter = [])
+    public static function toIds(array $filter = []): array
     {
         $ids = [];
         foreach (static::toArray($filter) as $item) {
@@ -192,7 +183,7 @@ public static function toIds(array $filter = [])
      * @return array enum-значение - ключ, имя - значение
      * @throws ReflectionException
      */
-    public static function toList(array $filter = [])
+    public static function toList(array $filter = []): array
     {
         $list = [];
         foreach (static::toArray($filter) as $id => $data) {
@@ -207,7 +198,7 @@ public static function toList(array $filter = [])
      * @return array
      * @throws ReflectionException
      */
-    public static function toObjects(array $filter = [])
+    public static function toObjects(array $filter = []): array
     {
         $objects = [];
         foreach (static::toIds($filter) as $id) {

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "vjik/php-enum",
-    "description": "PHP 5.4+ Enum implementation",
+    "description": "PHP Enum implementation",
     "version": "2.2.0",
     "type": "library",
     "keywords": [
@@ -23,11 +23,13 @@
             "vjik\\enum\\": ""
         }
     },
+    "require": {
+        "php": "^7.4"
+    },
     "require-dev": {
-        "phpunit/phpunit": "^4.8",
-        "yiisoft/yii2-coding-standards": "2.*"
+        "phpunit/phpunit": "^9.4"
     },
-    "require": {
-        "php": ">=5.4.0"
+    "config": {
+        "sort-packages": true
     }
-}
+}

tests/BaseTest.php

@@ -1,25 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 namespace vjik\enum\tests;
 
+use PHPUnit\Framework\TestCase;
 use vjik\enum\tests\enums\Pure;
 use vjik\enum\tests\enums\WithData;
 use vjik\enum\tests\enums\WithName;
 
-class EnumTest extends \PHPUnit_Framework_TestCase
+final class BaseTest extends TestCase
 {
-    protected $pure;
-    protected $withName;
-    protected $withData;
+    protected Pure $pure;
+    protected WithName $withName;
+    protected WithData $withData;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->pure = new Pure(Pure::FOO);
         $this->withName = new WithName(WithName::FOO);
         $this->withData = new WithData(WithData::ONE);
     }
 
-    public function testGetId()
+    public function testGetId(): void
     {
         $this->assertEquals(Pure::FOO, $this->pure->id);
         $this->assertEquals((string)Pure::FOO, $this->pure);
@@ -31,7 +34,7 @@ public function testGetId()
         $this->assertEquals((string)WithData::ONE, $this->withData);
     }
 
-    public function testGetName()
+    public function testGetName(): void
     {
         $this->assertEquals(Pure::FOO, $this->pure->name);
         $this->assertEquals('Foo Name', $this->withName->name);

tests/PureTest.php

@@ -1,34 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace vjik\enum\tests;
 
+use PHPUnit\Framework\TestCase;
 use UnexpectedValueException;
 use vjik\enum\tests\enums\Pure;
 
-class PureTest extends \PHPUnit_Framework_TestCase
+final class PureTest extends TestCase
 {
-    protected $enum;
+    protected Pure $enum;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         $this->enum = new Pure(Pure::FOO);
     }
 
-
-    /**
-     * @dataProvider invalidIdProvider
-     * @expectedException UnexpectedValueException
-     */
-    public function testCreateWithInvalidId($id)
-    {
-        new Pure($id);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function invalidIdProvider()
+    public function dataCreateWithInvalidId(): array
     {
         return [
             [0],
@@ -38,20 +27,18 @@ public function invalidIdProvider()
         ];
     }
 
-
     /**
-     * @dataProvider isIdProvider
+     * @dataProvider dataCreateWithInvalidId
+     *
+     * @param mixed $id
      */
-    public function testIsValid($id, $isValid)
+    public function testCreateWithInvalidId($id): void
     {
-        $this->assertSame(Pure::isValid($id), $isValid);
+        $this->expectException(UnexpectedValueException::class);
+        new Pure($id);
     }
 
-
-    /**
-     * @return array
-     */
-    public function isIdProvider()
+    public function dataIsValid(): array
     {
         return [
             [0, false],
@@ -64,8 +51,18 @@ public function isIdProvider()
         ];
     }
 
+    /**
+     * @dataProvider dataIsValid
+     *
+     * @param mixed $id
+     * @param bool $isValid
+     */
+    public function testIsValid($id, bool $isValid): void
+    {
+        $this->assertSame(Pure::isValid($id), $isValid);
+    }
 
-    public function testToArray()
+    public function testToArray(): void
     {
         $this->assertSame([
             Pure::FOO => [
@@ -88,7 +85,7 @@ public function testToArray()
     }
 
 
-    public function testToList()
+    public function testToList(): void
     {
         $this->assertSame([
             Pure::FOO => Pure::FOO,
@@ -99,7 +96,7 @@ public function testToList()
     }
 
 
-    public function testToIds()
+    public function testToIds(): void
     {
         $this->assertSame([
             Pure::FOO,
@@ -110,7 +107,7 @@ public function testToIds()
     }
 
 
-    public function testToObjects()
+    public function testToObjects(): void
     {
         $this->assertEquals([
             Pure::FOO => new Pure(Pure::FOO),