Skip to content

Php84 update #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
odan merged 8 commits into from
Nov 6, 2025
Merged

Php84 update #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3eb6346
updating year
heinrichschiller Oct 17, 2025
7e05b78
Add support for PHP 8.4 and update test:coverage
heinrichschiller Oct 17, 2025
9a57c53
fixed PHP_CS_FIXER_IGNORE_ENV deprecation
heinrichschiller Oct 17, 2025
00d2856
upgrading from phpstan 1x to 2x
heinrichschiller Oct 17, 2025
436ff93
upgrading squizlabs/php_codesniffer from ^3 to ^4
heinrichschiller Oct 17, 2025
3a84dd8
fixed compact_nullable_typehint deprecation
heinrichschiller Oct 17, 2025
10934cb
added php versions 8.3 and 8.4
heinrichschiller Oct 20, 2025
d8d4dba
fix, Don't we support PHP8.3 version?
heinrichschiller Oct 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .cs.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
'array_syntax' => ['syntax' => 'short'],
'cast_spaces' => ['space' => 'none'],
'concat_space' => ['spacing' => 'one'],
'compact_nullable_typehint' => true,
'compact_nullable_type_declaration' => true,
'declare_equal_normalize' => ['space' => 'single'],
'general_phpdoc_annotation_remove' => [
'annotations' => [
Expand All @@ -36,7 +36,11 @@
'phpdoc_order' => true, // psr-5
'phpdoc_no_useless_inheritdoc' => false,
'protected_to_private' => false,
'yoda_style' => false,
'yoda_style' => [
'equal' => false,
'identical' => false,
'less_and_greater' => false
],
'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
'ordered_imports' => [
'sort_algorithm' => 'alpha',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
operating-system: [ ubuntu-latest ]
php-versions: [ '8.1', '8.2' ]
php-versions: [ '8.1', '8.2', '8.3', '8.4' ]
name: PHP ${{ matrix.php-versions }} Test on ${{ matrix.operating-system }}

steps:
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2023 odan
Copyright (c) 2025 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
Expand Down
17 changes: 9 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
],
"homepage": "https://github.com/selective-php/image-type",
"require": {
"php": "^8.1"
"php": "8.1.* || 8.2.* || 8.3.* || 8.4.*"
},
"require-dev": {
"friendsofphp/php-cs-fixer": "^3",
"phpstan/phpstan": "^1",
"phpstan/phpstan": "^2",
"phpunit/phpunit": "^10",
"squizlabs/php_codesniffer": "^3"
"squizlabs/php_codesniffer": "^4"
},
"autoload": {
"psr-4": {
Expand All @@ -34,12 +34,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"
Copy link
Member

@peter279k peter279k Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain why adding the --allow-unsupported-php-version=yes option?

Copy link
Contributor Author

@heinrichschiller heinrichschiller Oct 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I run the test with composer cs:check, I get the message,

`root@2df332b08462:/var/www/html# composer cs:check

@putenv PHP_CS_FIXER_IGNORE_ENV=1
php-cs-fixer fix --dry-run --format=txt --verbose --diff --config=.cs.php --ansi
Setting PHP_CS_FIXER_IGNORE_ENV environment variable is deprecated and will be removed in 4.0, use unsupportedPhpVersionAllowed config instead.
Setting PHP_CS_FIXER_IGNORE_ENV environment variable is deprecated and will be removed in 4.0, use unsupportedPhpVersionAllowed config instead.
PHP CS Fixer 3.88.2 Folding Bike by Fabien Potencier, Dariusz Ruminski and contributors.
PHP runtime: 8.4.11
Running analysis on 1 core sequentially.
You can enable parallel runner and speed up the analysis! Please see usage docs for more information.`

The same applies to cs:check, and you should now use --allow-unsupported-php-version=yes.

That's why I changed it like this.

Edit: I found it again ... https://cs.symfony.com/doc/usage.html

`The --allow-unsupported-php-version=yes can be used to ignore any environment requirements.

Also possible via PHP_CS_FIXER_IGNORE_ENV environment variable (deprecated), which also allows the Fixer to run with required PHP extensions missing.

`

],
"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"
Copy link
Member

@peter279k peter279k Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain why adding the --allow-unsupported-php-version=yes option?

Copy link
Contributor Author

@heinrichschiller heinrichschiller Oct 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see cs:check ...

],
"sniffer:check": "phpcs --standard=phpcs.xml",
"sniffer:fix": "phpcbf --standard=phpcs.xml",
Expand All @@ -51,6 +49,9 @@
"@stan",
"@test"
],
"test:coverage": "php -d xdebug.mode=coverage -r \"require 'vendor/bin/phpunit';\" -- --configuration phpunit.xml --do-not-cache-result --colors=always --coverage-clover build/logs/clover.xml --coverage-html build/coverage"
"test:coverage": [
"@putenv XDEBUG_MODE=coverage",
"phpunit --configuration phpunit.xml --do-not-cache-result --colors=always --display-warnings --display-deprecations --coverage-clover build/coverage/clover.xml --coverage-html build/coverage --coverage-text"
Copy link
Member

@peter279k peter279k Oct 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain this change? It seems that the original and modified command are equivalent.

Copy link
Contributor Author

@heinrichschiller heinrichschiller Oct 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When changing phpunit, I simply adopted Odan's settings. During the first updates, I saw that he had changed it in selective/packages and thought I could do the same. Maybe that was a bit silly. But I liked the changes.

]
}
}