Skip to content

Commit

Permalink
Php84 (#297)
Browse files Browse the repository at this point in the history
* PHP 8.4

* removing dev package versions

---------

Co-authored-by: Dorian Villet <gnutix@gmail.com>
  • Loading branch information
jaydiablo and gnutix authored Jan 10, 2025
1 parent 6771327 commit 7b51a99
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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, mcrypt, openssl
Expand Down Expand Up @@ -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
13 changes: 3 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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-exception": "^1.1.1",
"diablomedia/zendframework1-config": "^2.0.5",
"diablomedia/zendframework1-loader": "^1.0.5",
Expand All @@ -31,17 +31,10 @@
"Zend_": "tests/"
}
},
"repositories": [
{
"type": "vcs",
"no-api": true,
"url": "https://github.com/diablomedia/phpstorm-stubs"
}
],
"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",
"pear/archive_tar": "^1.4.6",
"maglnet/composer-require-checker": "^3.0.0",
"phpro/grumphp-shim": "^2.0.0"
Expand Down
3 changes: 3 additions & 0 deletions grumphp.yml.dist
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# grumphp.yml
grumphp:
environment:
variables:
PHP_CS_FIXER_IGNORE_ENV: "true"
tasks:
composer:
strict: true
Expand Down
4 changes: 2 additions & 2 deletions src/Zend/Filter/LocalizedToNormalized.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ public function getOptions()
/**
* Sets options to use
*
* @param array $options (Optional) Options to use
* @param array|null $options (Optional) Options to use
* @return Zend_Filter_LocalizedToNormalized
*/
public function setOptions(array $options = null)
public function setOptions(array|null $options = null)
{
$this->_options = $options + $this->_options;
return $this;
Expand Down
4 changes: 2 additions & 2 deletions src/Zend/Filter/NormalizedToLocalized.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ public function getOptions()
/**
* Sets options to use
*
* @param array $options (Optional) Options to use
* @param array|null $options (Optional) Options to use
* @return $this
*/
public function setOptions(array $options = null)
public function setOptions(array|null $options = null)
{
$this->_options = $options + $this->_options;
return $this;
Expand Down

0 comments on commit 7b51a99

Please sign in to comment.