Skip to content

Commit ce17b38

Browse files
jaydiablognutix
andauthored
Php84 (#286)
* PHP 8.4 * removing dev package versions --------- Co-authored-by: Dorian Villet <[email protected]>
1 parent 8df22b9 commit ce17b38

File tree

6 files changed

+19
-15
lines changed

6 files changed

+19
-15
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
operating-system: [ubuntu-latest]
16-
php-versions: ["8.0", "8.1", "8.2", "8.3"]
16+
php-versions: ["8.0", "8.1", "8.2", "8.3", "8.4"]
1717
composer-args: ["", "--prefer-lowest"]
1818
runs-on: ${{ matrix.operating-system }}
1919
steps:
2020
- name: Checkout
2121
uses: actions/checkout@v4
2222
- name: Setup PHP
23-
uses: shivammathur/setup-php@2.30.2
23+
uses: shivammathur/setup-php@2.32.0
2424
with:
2525
php-version: ${{ matrix.php-versions }}
2626
extensions: mbstring
@@ -49,7 +49,7 @@ jobs:
4949
- name: Test
5050
run: composer test-with-coverage
5151
- name: Upload Coverage
52-
uses: codecov/codecov-action@v3
52+
uses: codecov/codecov-action@v5
5353
with:
5454
files: ./clover.xml
5555
verbose: true

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"license": "BSD-3-Clause",
1111
"prefer-stable": true,
1212
"require": {
13-
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
13+
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
1414
"diablomedia/zendframework1-exception": "^1.1.1",
1515
"diablomedia/zendframework1-config": "^2.0.5",
1616
"diablomedia/zendframework1-loader": "^1.0.5",
@@ -35,8 +35,8 @@
3535
},
3636
"require-dev": {
3737
"phpunit/phpunit": "^9.6.19 || ^10.5.18",
38-
"phpstan/phpstan": "1.10.67",
39-
"friendsofphp/php-cs-fixer": "3.54.0",
38+
"phpstan/phpstan": "2.1.1",
39+
"friendsofphp/php-cs-fixer": "3.67.0",
4040
"maglnet/composer-require-checker": "^3.0.0",
4141
"phpro/grumphp-shim": "^2.0.0"
4242
},

grumphp.yml.dist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# grumphp.yml
22
grumphp:
3+
environment:
4+
variables:
5+
PHP_CS_FIXER_IGNORE_ENV: "true"
36
tasks:
47
composer:
58
strict: true

phpstan.neon

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,23 @@ parameters:
1010
- ./src/Zend/Validate/Hostname/*
1111
ignoreErrors:
1212
- '#Variable \$context in isset\(\) always exists and is not nullable\.#'
13-
- '#Binary operation "\*" between string and .+ results in an error\.#'
14-
- '#Binary operation "\*" between 3 and string results in an error\.#'
13+
- '#Binary operation "\*" between non-empty-string and .+ results in an error\.#'
14+
- '#Binary operation "\*" between 3 and non-empty-string results in an error\.#'
1515
# This is intentional for short circuiting/execution flow management
1616
-
1717
message: '#Do-while loop condition is always false\.#'
1818
path: ./src/Zend/Validate/Hostname.php
1919
-
20-
message: '#Binary operation "\*" between int<1, max> and string results in an error\.#'
20+
message: '#Binary operation "\*" between int<1, max> and non-empty-string results in an error\.#'
2121
path: ./src/Zend/Validate/Ccnum.php
2222
count: 1
2323
-
24-
message: '#Binary operation "\*" between int<1, max> and string results in an error\.#'
24+
message: '#Binary operation "\*" between int<1, max> and non-empty-string results in an error\.#'
2525
path: ./src/Zend/Validate/CreditCard.php
2626
count: 1
27+
-
28+
message: '#Call to function method_exists\(\) with object and ''__toString'' will always evaluate to true\.#'
29+
path: ./src/Zend/Validate/NotEmpty.php
2730
# This does seem like a bug in ZF1, as the loop with $j will never run
2831
-
2932
message: '#Comparison operation "<" between int<4, max> and 4 is always false\.#'

src/Zend/Validate/EmailAddress.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,10 @@ public function getHostnameValidator()
229229
}
230230

231231
/**
232-
* @param Zend_Validate_Hostname $hostnameValidator OPTIONAL
233-
* @param int $allow OPTIONAL
232+
* @param int $allow OPTIONAL
234233
* @return $this
235234
*/
236-
public function setHostnameValidator(Zend_Validate_Hostname $hostnameValidator = null, $allow = Zend_Validate_Hostname::ALLOW_DNS)
235+
public function setHostnameValidator(Zend_Validate_Hostname|null $hostnameValidator = null, $allow = Zend_Validate_Hostname::ALLOW_DNS)
237236
{
238237
if (!$hostnameValidator) {
239238
$hostnameValidator = new Zend_Validate_Hostname($allow);

src/Zend/Validate/Hostname.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,10 +1581,9 @@ public function getIpValidator()
15811581
}
15821582

15831583
/**
1584-
* @param Zend_Validate_Ip $ipValidator OPTIONAL
15851584
* @return Zend_Validate_Hostname
15861585
*/
1587-
public function setIpValidator(Zend_Validate_Ip $ipValidator = null)
1586+
public function setIpValidator(Zend_Validate_Ip|null $ipValidator = null)
15881587
{
15891588
if ($ipValidator === null) {
15901589
$ipValidator = new Zend_Validate_Ip();

0 commit comments

Comments
 (0)