Skip to content
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

Compatibility with Symfony 7 #104

Merged
merged 5 commits into from
Jun 12, 2024
Merged

Compatibility with Symfony 7 #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f53090
Allow Symfony 7
Toflar Jun 12, 2024
0d9eaae
Fixed phpstan
Toflar Jun 12, 2024
3915d2a
Fix CI coverage
ausi Jun 12, 2024
0afb5a1
Ensure string type
ausi Jun 12, 2024
d7bf224
Changelog
ausi Jun 12, 2024
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
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,11 @@ jobs:
run: php -d pcov.enabled=1 vendor/bin/phpunit --coverage-clover=clover.xml --colors=always

- name: Upload the coverage report
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v4
with:
file: ./clover.xml
fail_ci_if_error: true
token: b9688d71-d4b7-41e5-8b00-25406027a507

coding-style:
name: Coding Style
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
## [Unreleased]

* Fix unterminated entity reference error. [#101]
* Compatibility with Symfony 7. [#104]

## [1.2.0] (2023-05-30)

Expand Down Expand Up @@ -165,6 +166,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
[0.2.0]: https://github.com/contao/image/compare/0.1.0...0.2.0
[0.1.0]: https://github.com/contao/image/commits/0.1.0

[#104]: https://github.com/contao/image/issues/104
[#101]: https://github.com/contao/image/issues/101
[#98]: https://github.com/contao/image/issues/98
[#97]: https://github.com/contao/image/issues/97
Expand Down
4 changes: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"ext-zlib": "*",
"imagine/imagine": "^1.3",
"symfony/deprecation-contracts": "^2.1 || ^3.0",
"symfony/filesystem": "^5.4 || ^6.0",
"symfony/filesystem": "^5.4 || ^6.0 || ^7.0",
"symfony/polyfill-php73": "^1.27",
"symfony/polyfill-php80": "^1.27"
},
Expand All @@ -30,7 +30,7 @@
"contao/imagine-svg": "^1.0",
"contao/test-case": "^4.5",
"phpunit/phpunit": "^8.5 || ^9.5",
"symfony/phpunit-bridge": "^5.4",
"symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0",
"symfony/polyfill-php81": "^1.27"
},
"suggest": {
Expand Down
2 changes: 0 additions & 2 deletions phpstan.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,3 @@ parameters:
-
message: '#ResizeCoordinates::isEqualTo\(\) expects .*, stdClass given#'
path: %currentWorkingDirectory%/tests/ResizeCoordinatesTest.php
-
message: '#Access to an undefined property XMLReader::#'
2 changes: 1 addition & 1 deletion src/Metadata/XmpFormat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ private function buildXmp(array $metadata): string

foreach ($metadata as $namespace => $attributes) {
foreach ($attributes as $attribute => $values) {
if (!$values = array_filter($values, 'strlen')) {
if (!$values = array_filter($values, static function ($value): bool { return '' !== (string) $value; })) {
continue;
}

Expand Down
Loading