diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3bb173d..7318ce0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,14 +13,14 @@ jobs: fail-fast: false matrix: operating-system: [ubuntu-latest] - php-versions: ["8.0", "8.1", "8.2", "8.3"] + php-versions: ["8.0", "8.1", "8.2", "8.3", "8.4"] composer-args: ["", "--prefer-lowest"] runs-on: ${{ matrix.operating-system }} steps: - name: Checkout uses: actions/checkout@v4 - name: Setup PHP - uses: shivammathur/setup-php@2.30.2 + uses: shivammathur/setup-php@2.32.0 with: php-version: ${{ matrix.php-versions }} extensions: mbstring @@ -49,7 +49,7 @@ jobs: - name: Test run: composer test-with-coverage - name: Upload Coverage - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v5 with: files: ./clover.xml verbose: true diff --git a/composer.json b/composer.json index 74098ef..0d8b6f9 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "license": "BSD-3-Clause", "prefer-stable": true, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0", "diablomedia/zendframework1-loader": "^1.0.5", "diablomedia/zendframework1-registry": "^1.0.5", "diablomedia/zendframework1-translate": "^1.0.5", @@ -29,8 +29,8 @@ }, "require-dev": { "phpunit/phpunit": "^9.6.19 || ^10.5.18", - "phpstan/phpstan": "1.10.67", - "friendsofphp/php-cs-fixer": "3.54.0", + "phpstan/phpstan": "2.1.1", + "friendsofphp/php-cs-fixer": "3.67.0", "maglnet/composer-require-checker": "^3.0.0", "phpro/grumphp-shim": "^2.0.0" }, diff --git a/grumphp.yml.dist b/grumphp.yml.dist index ed37d03..dfa2976 100644 --- a/grumphp.yml.dist +++ b/grumphp.yml.dist @@ -1,5 +1,8 @@ # grumphp.yml grumphp: + environment: + variables: + PHP_CS_FIXER_IGNORE_ENV: "true" tasks: composer: strict: true diff --git a/phpstan.neon b/phpstan.neon index 4fe2cc7..9e8bee4 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,5 +1,4 @@ parameters: - checkMissingIterableValueType: false level: 7 paths: - ./ @@ -9,6 +8,8 @@ parameters: ignoreErrors: - '#Method Zend_Filter_Input::_getFilter\(\) should return Zend_Filter_Interface but returns Zend_Filter_Interface\|Zend_Validate_Interface\.#' - '#Method Zend_Filter_Input::_getValidator\(\) should return Zend_Validate_Interface but returns Zend_Filter_Interface\|Zend_Validate_Interface\.#' + - + identifier: missingType.iterableValue - message: '#Method Zend_Filter_Input::_getFilterOrValidator\(\) should return Zend_Filter_Interface\|Zend_Validate_Interface but returns object\.#' path: %currentWorkingDirectory%/src/Zend/Filter/Input.php diff --git a/src/Zend/Filter/Input.php b/src/Zend/Filter/Input.php index 70fa0be..dacb9b0 100644 --- a/src/Zend/Filter/Input.php +++ b/src/Zend/Filter/Input.php @@ -143,10 +143,10 @@ class Zend_Filter_Input /** * @param array $filterRules * @param array $validatorRules - * @param array $data OPTIONAL - * @param array $options OPTIONAL + * @param array|null $data OPTIONAL + * @param array|null $options OPTIONAL */ - public function __construct($filterRules, $validatorRules, array $data = null, array $options = null) + public function __construct($filterRules, $validatorRules, array|null $data = null, array|null $options = null) { if ($options) { $this->setOptions($options);