Skip to content

Ensure PHP 8.5 compatibility #3045

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
merged 1 commit into from
Aug 22, 2025
+104 −22
Merged

Ensure PHP 8.5 compatibility #3045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/code-quality.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
include:
# dev packages (probably not needed to have multiple such jobs)
- minimum-stability: 'dev'
php-version: 8.4
php-version: 8.5
# lowest deps
- dependency-version: 'lowest'
# LTS version of Symfony
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/functional-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.1', '8.2', '8.3', '8.4']
php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
dependency-version: ['']
symfony-version: ['']
minimum-stability: ['stable']
os: ['']
include:
# dev packages (probably not needed to have multiple such jobs)
- minimum-stability: 'dev'
php-version: '8.4'
php-version: '8.5'
# lowest deps
- php-version: '8.1'
dependency-version: 'lowest'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/unit-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ jobs:
strategy:
fail-fast: false
matrix:
php-version: ['8.1', '8.2', '8.3', '8.4']
php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
dependency-version: ['']
symfony-version: ['']
minimum-stability: ['stable']
os: ['']
include:
# dev packages (probably not needed to have multiple such jobs)
- minimum-stability: 'dev'
php-version: '8.4'
php-version: '8.5'
# lowest deps
- php-version: '8.1'
dependency-version: 'lowest'
Expand All @@ -50,8 +50,8 @@ jobs:
- php-version: '8.1'
symfony-version: '6.4.*'
- php-version: '8.2'
symfony-version: '7.3.*' # TODO: change to '7.4' when Symfony 7.4 is released
- php-version: '8.4'
symfony-version: '7.4.x-dev' # TODO: change to '7.4' when Symfony 7.4 is released
- php-version: '8.5'
symfony-version: '8.0.x-dev' # TODO: change to '8.0' when Symfony 8.0 is released
minimum-stability: 'dev' # TODO: remove when Symfony 8.0 is released

Expand Down
4 changes: 4 additions & 0 deletions src/Autocomplete/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/Chartjs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/Cropperjs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/Dropzone/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/Icons/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/LazyImage/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/LiveComponent/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/Map/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## 2.30

- Ensure compatibility with PHP 8.5

## 2.30

- Deprecate option `title` from `Polygon`, `Polyline`, `Rectangle` and `Circle` in favor of `infoWindow`

## 2.29.0
Expand Down
4 changes: 4 additions & 0 deletions src/Map/src/Bridge/Google/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
2 changes: 1 addition & 1 deletion src/Map/src/Bridge/Google/tests/GoogleRendererTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public static function provideTestRenderMap(): iterable
->addMarker($marker1)
->addMarker($marker2)
->removeMarker($marker1)
->removeMarker($marker2),
->removeMarker('marker2'),
Copy link
Member Author

Choose a reason for hiding this comment

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

AFAIK we didn't have coverage for remove(string)

];

yield 'with marker remove and new ones added' => [
Expand Down
4 changes: 4 additions & 0 deletions src/Map/src/Bridge/Leaflet/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
2 changes: 1 addition & 1 deletion src/Map/src/Bridge/Leaflet/tests/LeafletRendererTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static function provideTestRenderMap(): iterable
->addMarker($marker1)
->addMarker($marker2)
->removeMarker($marker1)
->removeMarker($marker2),
->removeMarker('marker2'),
];

yield 'with marker remove and new ones added' => [
Expand Down
18 changes: 8 additions & 10 deletions src/Map/src/Elements.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ public function __construct(
) {
$this->elements = new \SplObjectStorage();
foreach ($elements as $element) {
$this->elements->attach($element);
$this->add($element);
}
}

public function add(Element $element): static
{
$this->elements->attach($element, $element->id ?? $this->elements->getHash($element));
$this->elements[$element] = $element->id ?? $this->elements->getHash($element);

return $this;
}

private function getElement(string $id): ?Element
private function getElementById(string $id): ?Element
{
foreach ($this->elements as $element) {
if ($element->id === $id) {
Expand All @@ -52,15 +52,13 @@ private function getElement(string $id): ?Element
public function remove(Element|string $elementOrId): static
{
if (\is_string($elementOrId)) {
$elementOrId = $this->getElement($elementOrId);
$element = $this->getElementById($elementOrId);
} else {
$element = $elementOrId;
}

if (null === $elementOrId) {
return $this;
}

if ($this->elements->contains($elementOrId)) {
$this->elements->detach($elementOrId);
if (null !== $element && $this->elements->offsetExists($element)) {
unset($this->elements[$element]);
}

return $this;
Expand Down
4 changes: 4 additions & 0 deletions src/Notify/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/React/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/StimulusBundle/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/Svelte/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/Swup/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/TogglePassword/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 2 additions & 2 deletions src/Toolkit/src/Installer/PoolResolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ public function resolveForRecipe(Kit $kit, Recipe $recipe): Pool
$currentRecipe = array_pop($recipesStack);

// Skip circular references
if ($visitedRecipes->contains($currentRecipe)) {
if ($visitedRecipes->offsetExists($currentRecipe)) {
continue;
}

$visitedRecipes->attach($currentRecipe);
$visitedRecipes[$currentRecipe] = null;

foreach ($currentRecipe->getFiles() as $file) {
$pool->addFile($currentRecipe, $file);
Expand Down
4 changes: 4 additions & 0 deletions src/Translator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/Turbo/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/TwigComponent/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
2 changes: 1 addition & 1 deletion src/TwigComponent/src/Command/TwigComponentDebugCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ private function getComponentProperties(ComponentMetadata $metadata): array
} else {
$typeName = (string) $type;
}
$value = $property->getDefaultValue();
$value = $property->hasDefaultValue() ? $property->getDefaultValue() : null;
$propertyDisplay = $typeName.' $'.$propertyName.(null !== $value ? ' = '.json_encode($value) : '');
$properties[$property->name] = $propertyDisplay;
}
Expand Down
4 changes: 4 additions & 0 deletions src/Typed/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
4 changes: 4 additions & 0 deletions src/Vue/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 2.30

- Ensure compatibility with PHP 8.5

## 2.29.0

- Add Symfony 8 support
Expand Down
Loading