diff --git a/CHANGELOG.md b/CHANGELOG.md index 17649ff..828e0c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.0.0 - WIP +- Upgrade dev package PestPHP 3 +- Upgrade dev package PHPstan 2 +- Upgrade dev package Rector 2 + ## 0.4.4 - 2025-03-22 - Adding `getBoolean()` method for returning boolean value diff --git a/composer.json b/composer.json index 80d39c6..0047600 100644 --- a/composer.json +++ b/composer.json @@ -18,15 +18,15 @@ } ], "require": { - "php": "^8.1|^8.2|^8.3|^8.4", + "php": "^8.2|^8.3|^8.4", "swaggest/json-schema": "^0.12.42", "symfony/yaml": "^6.4|^7.1" }, "require-dev": { "laravel/pint": "^1.2", - "pestphp/pest": "^2.34", - "phpstan/phpstan": "^1.6", - "rector/rector": "^1" + "pestphp/pest": "^3.0", + "phpstan/phpstan": "^2", + "rector/rector": "^2" }, "autoload": { "psr-4": { diff --git a/rector.php b/rector.php index 4ebb558..bb3868b 100644 --- a/rector.php +++ b/rector.php @@ -11,7 +11,7 @@ ]) // uncomment to reach your current PHP version ->withPhpSets( - php81: true, + php82: true, ) ->withPreparedSets( deadCode: true, diff --git a/src/Block.php b/src/Block.php index 50c85cc..af6f2ed 100644 --- a/src/Block.php +++ b/src/Block.php @@ -36,13 +36,10 @@ final class Block implements Iterator, ArrayAccess, Countable /** @var array */ private array $data; - private bool $iteratorReturnsBlock = true; - /** @param array $data */ - public function __construct(array $data = [], bool $iteratorReturnsBlock = true) + public function __construct(array $data = [], private bool $iteratorReturnsBlock = true) { $this->data = $data; - $this->iteratorReturnsBlock = $iteratorReturnsBlock; } public function iterateBlock(bool $returnsBlock = true): self @@ -204,9 +201,9 @@ public function values(): self * It returns Block or [] depending on $returnArrClass value * * @param bool $returnBlockClass true if you need Block object - * @return int|string|array|Block + * @return array|Block */ - public function keys(bool $returnBlockClass = false): int|string|array|Block + public function keys(bool $returnBlockClass = false): array|Block { if ($returnBlockClass) { return self::make(array_keys($this->data)); diff --git a/tests/Feature/BlockTest.php b/tests/Feature/BlockTest.php index 5553828..7affd75 100644 --- a/tests/Feature/BlockTest.php +++ b/tests/Feature/BlockTest.php @@ -70,7 +70,7 @@ expect($composer->getBlock("require.php"))->toBeInstanceOf(Block::class); expect($composer->get("require.php"))->toBeString(); - expect($composer->getBlock("require")->has("^8.1|^8.2|^8.3|^8.4"))->toBeTrue(); + expect($composer->getBlock("require")->has("^8.2|^8.3|^8.4"))->toBeTrue(); expect($composer->getBlock("require")->hasKey("php"))->toBeTrue(); expect($composer->getBlock("require-dev")->hasKey("pestphp/pest"))->toBeTrue(); });