Skip to content

[5.3] PHP 8.4 compatibility #45125

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
HLeithner merged 1 commit into from
Mar 13, 2025
Merged

[5.3] PHP 8.4 compatibility #45125

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
70 changes: 26 additions & 44 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ clone:

steps:
- name: setup
image: joomlaprojects/docker-images:php8.3
image: joomlaprojects/docker-images:php8.4
volumes:
- name: certificates
path: /certificates
commands:
- cp -v tests/certs/* /certificates/

- name: composer
image: joomlaprojects/docker-images:php8.3
image: joomlaprojects/docker-images:php8.4
volumes:
- name: composer-cache
path: /tmp/composer-cache
Expand Down Expand Up @@ -70,6 +70,13 @@ steps:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php84-unit
depends_on: [ phpcs ]
image: joomlaprojects/docker-images:php8.4
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Unit

- name: php81-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php8.1
Expand All @@ -91,6 +98,13 @@ steps:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration

- name: php84-integration
depends_on: [ npm ]
image: joomlaprojects/docker-images:php8.4
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration

- name: php81-integration-pgsql
depends_on: [ npm ]
image: joomlaprojects/docker-images:php8.1
Expand All @@ -112,6 +126,13 @@ steps:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist

- name: php84-integration-pgsql
depends_on: [ npm ]
image: joomlaprojects/docker-images:php8.4
commands:
- php -v
- ./libraries/vendor/bin/phpunit --testsuite Integration --configuration phpunit-pgsql.xml.dist

- name: scss-cs
depends_on: [ npm ]
image: node:current-alpine
Expand Down Expand Up @@ -154,7 +175,7 @@ steps:
- name: phpmax-system-mysql
depends_on:
- phpmin-system-mysql
image: joomlaprojects/docker-images:cypress8.3
image: joomlaprojects/docker-images:cypress8.4
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
Expand All @@ -167,24 +188,6 @@ steps:
exclude:
- pull_request

- name: phpnext-system-mysql
depends_on:
- phpmax-system-mysql
image: joomlaprojects/docker-images:cypress8.4
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
failure: ignore
commands:
- echo "This test is disabled because php next is not stable yet"
- exit 1
- bash tests/System/entrypoint.sh "$(pwd)" cmysqlnext mysqli mysql
when:
event:
exclude:
- pull_request

- name: phpmin-system-postgres
depends_on:
Expand All @@ -205,39 +208,18 @@ steps:
- name: phpmax-system-postgres
depends_on:
- phpmin-system-postgres
image: joomlaprojects/docker-images:cypress8.3
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
commands:
- bash tests/System/entrypoint.sh "$(pwd)" cpostgresmax pgsql postgres

- name: phpnext-system-postgres
depends_on:
- phpmax-system-postgres
image: joomlaprojects/docker-images:cypress8.4
volumes:
- name: cypress-cache
path: /root/.cache/Cypress
environment:
JOOMLA_INSTALLATION_DISABLE_LOCALHOST_CHECK: 1
failure: ignore
commands:
- echo "This test is disabled because php next is not stable yet"
- exit 1
- bash tests/System/entrypoint.sh "$(pwd)" cpostgresnext pgsql postgres
when:
event:
exclude:
- pull_request
- bash tests/System/entrypoint.sh "$(pwd)" cpostgresmax pgsql postgres

- name: artifacts-system-tests
image: joomlaprojects/docker-images:packager
depends_on:
- phpnext-system-mysql
- phpnext-system-postgres
- phpmax-system-mysql
- phpmax-system-postgres
- phpmin-system-mysql
Expand Down Expand Up @@ -433,6 +415,6 @@ trigger:

---
kind: signature
hmac: fedcefde305c98f4dfc926b9039f83692827337da9e689e423c9de93a97248dd
hmac: 99da78521b10f37ddf6731e695fe52f85ee3db142bccac66901ae5372e332aae

...
8 changes: 4 additions & 4 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions libraries/src/Changelog/Changelog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,8 @@ public function loadFromXml($url)
$this->currentChangelog = new \stdClass();

$this->xmlParser = xml_parser_create('');
xml_set_object($this->xmlParser, $this);
xml_set_element_handler($this->xmlParser, 'startElement', 'endElement');
xml_set_character_data_handler($this->xmlParser, 'characterData');
xml_set_element_handler($this->xmlParser, [$this, 'startElement'], [$this, 'endElement']);
xml_set_character_data_handler($this->xmlParser, [$this, 'characterData']);

if (!xml_parse($this->xmlParser, $response->body)) {
Log::add(
Expand Down
3 changes: 1 addition & 2 deletions libraries/src/Updater/Adapter/CollectionAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,7 @@ public function findUpdate($options)
}

$this->xmlParser = xml_parser_create('');
xml_set_object($this->xmlParser, $this);
xml_set_element_handler($this->xmlParser, '_startElement', '_endElement');
xml_set_element_handler($this->xmlParser, [$this, '_startElement'], [$this, '_endElement']);

if (!xml_parse($this->xmlParser, $response->body)) {
// If the URL is missing the .xml extension, try appending it and retry loading the update
Expand Down
5 changes: 2 additions & 3 deletions libraries/src/Updater/Adapter/ExtensionAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,9 +280,8 @@ public function findUpdate($options)
}

$this->xmlParser = xml_parser_create('');
xml_set_object($this->xmlParser, $this);
xml_set_element_handler($this->xmlParser, '_startElement', '_endElement');
xml_set_character_data_handler($this->xmlParser, '_characterData');
xml_set_element_handler($this->xmlParser, [$this, '_startElement'], [$this, '_endElement']);
xml_set_character_data_handler($this->xmlParser, [$this, '_characterData']);

if (!xml_parse($this->xmlParser, $response->body)) {
// If the URL is missing the .xml extension, try appending it and retry loading the update
Expand Down
5 changes: 2 additions & 3 deletions libraries/src/Updater/Update.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,8 @@ public function loadFromXml($url, $minimumStability = Updater::STABILITY_STABLE,
$this->channel = $channel;

$this->xmlParser = xml_parser_create('');
xml_set_object($this->xmlParser, $this);
xml_set_element_handler($this->xmlParser, '_startElement', '_endElement');
xml_set_character_data_handler($this->xmlParser, '_characterData');
xml_set_element_handler($this->xmlParser, [$this, '_startElement'], [$this, '_endElement']);
xml_set_character_data_handler($this->xmlParser, [$this, '_characterData']);

if (!xml_parse($this->xmlParser, $response->body)) {
Log::add(
Expand Down