diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b88998f..429673a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: strategy: matrix: operating-system: [ ubuntu-latest ] - php-versions: [ '8.1', '8.2', '8.3', '8.4' ] + php-versions: [ '8.2', '8.3', '8.4', '8.5' ] name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }} steps: diff --git a/LICENSE b/LICENSE index bfcf021..2013f40 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2025 odan +Copyright (c) 2026 odan Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index cc39510..019ac65 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ A strictly typed array reader for PHP. ## Requirements -* PHP 8.1 - 8.4 +* PHP 8.2 - 8.5 ## Installation diff --git a/composer.json b/composer.json index ff7ebe1..e4917db 100644 --- a/composer.json +++ b/composer.json @@ -13,13 +13,13 @@ ], "homepage": "https://github.com/selective-php/array-reader", "require": { - "php": "8.1.* || 8.2.* || 8.3.* || 8.4.*", + "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0", "cakephp/chronos": "^2 || ^3" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3", "phpstan/phpstan": "^1 || ^2", - "phpunit/phpunit": "^10", + "phpunit/phpunit": "^11", "squizlabs/php_codesniffer": "^3" }, "autoload": { @@ -37,12 +37,10 @@ }, "scripts": { "cs:check": [ - "@putenv PHP_CS_FIXER_IGNORE_ENV=1", - "php-cs-fixer fix --dry-run --format=txt --verbose --diff --config=.cs.php --ansi" + "php-cs-fixer fix --dry-run --format=txt --verbose --diff --config=.cs.php --ansi --allow-unsupported-php-version=yes" ], "cs:fix": [ - "@putenv PHP_CS_FIXER_IGNORE_ENV=1", - "php-cs-fixer fix --config=.cs.php --ansi --verbose" + "php-cs-fixer fix --config=.cs.php --ansi --verbose --allow-unsupported-php-version=yes" ], "sniffer:check": "phpcs --standard=phpcs.xml", "sniffer:fix": "phpcbf --standard=phpcs.xml", diff --git a/phpunit.xml b/phpunit.xml index 2927473..7b7ad74 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -3,7 +3,7 @@ bootstrap="vendor/autoload.php" colors="true" backupGlobals="false" - xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.3/phpunit.xsd" + xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false"> diff --git a/tests/ArrayReaderTest.php b/tests/ArrayReaderTest.php index d0e7453..f92df94 100644 --- a/tests/ArrayReaderTest.php +++ b/tests/ArrayReaderTest.php @@ -3,6 +3,7 @@ namespace Selective\ArrayReader\Test; use InvalidArgumentException; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; use Selective\ArrayReader\ArrayReader; @@ -14,8 +15,6 @@ class ArrayReaderTest extends TestCase /** * Test. * - * @dataProvider providerGetInt - * * @param mixed $data The data * @param string|int $key The lookup key * @param mixed $default The default value @@ -23,6 +22,7 @@ class ArrayReaderTest extends TestCase * * @return void */ + #[DataProvider('providerGetInt')] public function testCreateFromArray($data, $key, $default, $expected): void { $reader = ArrayReader::createFromArray($data); @@ -32,8 +32,6 @@ public function testCreateFromArray($data, $key, $default, $expected): void /** * Test. * - * @dataProvider providerGetInt - * * @param mixed $data The data * @param string|key $key The lookup key * @param mixed $default The default value @@ -41,6 +39,7 @@ public function testCreateFromArray($data, $key, $default, $expected): void * * @return void */ + #[DataProvider('providerGetInt')] public function testGetInt($data, $key, $default, $expected): void { $reader = new ArrayReader($data); @@ -50,14 +49,13 @@ public function testGetInt($data, $key, $default, $expected): void /** * Test. * - * @dataProvider providerGetIntError - * * @param mixed $data The data * @param string|int $key The lookup key * @param mixed $default The default value * * @return void */ + #[DataProvider('providerGetIntError')] public function testGetIntError($data, $key, $default): void { $reader = new ArrayReader($data); @@ -70,8 +68,6 @@ public function testGetIntError($data, $key, $default): void /** * Test. * - * @dataProvider providerFindInt - * * @param mixed $data The data * @param string|int $key The lookup key * @param mixed $default The default value @@ -79,6 +75,7 @@ public function testGetIntError($data, $key, $default): void * * @return void */ + #[DataProvider('providerFindInt')] public function testFindInt($data, $key, $default, $expected): void { $reader = new ArrayReader($data); @@ -88,8 +85,6 @@ public function testFindInt($data, $key, $default, $expected): void /** * Test. * - * @dataProvider providerGetFloat - * * @param mixed $data The data * @param string|key $key The lookup key * @param mixed $default The default value @@ -97,6 +92,7 @@ public function testFindInt($data, $key, $default, $expected): void * * @return void */ + #[DataProvider('providerGetFloat')] public function testGetFloat($data, $key, $default, $expected): void { $reader = new ArrayReader($data); @@ -106,14 +102,13 @@ public function testGetFloat($data, $key, $default, $expected): void /** * Test. * - * @dataProvider providerGetFloatError - * * @param mixed $data The data * @param string|int $key The lookup key * @param mixed $default The default value * * @return void */ + #[DataProvider('providerGetFloatError')] public function testGetFloatError($data, $key, $default): void { $reader = new ArrayReader($data); @@ -126,8 +121,6 @@ public function testGetFloatError($data, $key, $default): void /** * Test. * - * @dataProvider providerFindFloat - * * @param mixed $data The data * @param string|int $key The lookup key * @param mixed $default The default value @@ -135,6 +128,7 @@ public function testGetFloatError($data, $key, $default): void * * @return void */ + #[DataProvider('providerFindFloat')] public function testFindFloat($data, $key, $default, $expected): void { $reader = new ArrayReader($data); @@ -238,8 +232,6 @@ public static function providerFindFloat(): array /** * Test. * - * @dataProvider providerGetString - * * @param mixed $data The data * @param string $key The lookup key * @param mixed $default The default value @@ -247,6 +239,7 @@ public static function providerFindFloat(): array * * @return void */ + #[DataProvider('providerGetString')] public function testGetString($data, string $key, $default, $expected): void { $reader = new ArrayReader($data); @@ -273,13 +266,12 @@ public static function providerGetString(): array /** * Test. * - * @dataProvider providerGetStringError - * * @param mixed $data The data * @param string $key The lookup key * * @return void */ + #[DataProvider('providerGetStringError')] public function testGetStringError($data, string $key): void { $this->expectException(InvalidArgumentException::class); @@ -308,8 +300,6 @@ public static function providerGetStringError(): array /** * Test. * - * @dataProvider providerFindString - * * @param mixed $data The data * @param string $key The lookup key * @param mixed $default The default value @@ -317,6 +307,7 @@ public static function providerGetStringError(): array * * @return void */ + #[DataProvider('providerFindString')] public function testFindString($data, string $key, $default, $expected): void { $reader = new ArrayReader($data); @@ -343,8 +334,6 @@ public static function providerFindString(): array /** * Test. * - * @dataProvider providerGetArray - * * @param mixed $data The data * @param string|int $key The lookup key * @param mixed $default The default value @@ -352,6 +341,7 @@ public static function providerFindString(): array * * @return void */ + #[DataProvider('providerGetArray')] public function testGetArray($data, $key, $default, $expected): void { $reader = new ArrayReader($data); @@ -376,14 +366,13 @@ public static function providerGetArray(): array /** * Test. * - * @dataProvider providerGetArrayError - * * @param mixed $data The data * @param string|int $key The lookup key * @param mixed $default The default value * * @return void */ + #[DataProvider('providerGetArrayError')] public function testGetArrayError($data, $key, $default): void { $reader = new ArrayReader($data); @@ -409,8 +398,6 @@ public static function providerGetArrayError(): array /** * Test. * - * @dataProvider providerFindArray - * * @param mixed $data The data * @param string|int $key The lookup key * @param mixed $default The default value @@ -418,6 +405,7 @@ public static function providerGetArrayError(): array * * @return void */ + #[DataProvider('providerFindArray')] public function testFindArray($data, $key, $default, $expected): void { $reader = new ArrayReader($data);