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

EWPP-4991: Ensure PHP8.3 compatibility. #1542

Open
wants to merge 1 commit into
base: 4.x
Choose a base branch
from
Open

EWPP-4991: Ensure PHP8.3 compatibility. #1542

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
32 changes: 16 additions & 16 deletions .drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ services:
- COMPOSERVER=--2
- DOCUMENT_ROOT=/test/oe_theme
mysql:
image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/percona:5.7
command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3
image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/percona:8.0
command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3 --skip-log-bin --innodb-flush-log-at-trx-commit=2 --innodb-read-io-threads=16 --innodb-write-io-threads=16
environment:
- MYSQL_ALLOW_EMPTY_PASSWORD=yes
- MYSQL_DATABASE=drupal
Expand Down Expand Up @@ -130,22 +130,22 @@ pipeline:

matrix:
include:
- { PHP_VERSION: 8.1, CORE_VERSION: 10.2.0, TYPE: behat }
- { PHP_VERSION: 8.1, CORE_VERSION: 10.2.0, TYPE: phpunit, BATCH: batch1 }
- { PHP_VERSION: 8.1, CORE_VERSION: 10.2.0, TYPE: phpunit, BATCH: batch2 }
- { PHP_VERSION: 8.1, CORE_VERSION: 10.2.0, TYPE: phpunit, BATCH: batch3 }

- { PHP_VERSION: 8.2, CORE_VERSION: 10.2.0, TYPE: behat }
- { PHP_VERSION: 8.2, CORE_VERSION: 10.2.0, TYPE: phpunit, BATCH: batch1 }
- { PHP_VERSION: 8.2, CORE_VERSION: 10.2.0, TYPE: phpunit, BATCH: batch2 }
- { PHP_VERSION: 8.2, CORE_VERSION: 10.2.0, TYPE: phpunit, BATCH: batch3 }

- { PHP_VERSION: 8.1, CORE_VERSION: 10.3.0, TYPE: behat }
- { PHP_VERSION: 8.1, CORE_VERSION: 10.3.0, TYPE: phpunit, BATCH: batch1 }
- { PHP_VERSION: 8.1, CORE_VERSION: 10.3.0, TYPE: phpunit, BATCH: batch2 }
- { PHP_VERSION: 8.1, CORE_VERSION: 10.3.0, TYPE: phpunit, BATCH: batch3 }

- { PHP_VERSION: 8.2, CORE_VERSION: 10.3.0, TYPE: behat }
- { PHP_VERSION: 8.2, CORE_VERSION: 10.3.0, TYPE: phpunit, BATCH: batch1 }
- { PHP_VERSION: 8.2, CORE_VERSION: 10.3.0, TYPE: phpunit, BATCH: batch2 }
- { PHP_VERSION: 8.2, CORE_VERSION: 10.3.0, TYPE: phpunit, BATCH: batch3 }
- { PHP_VERSION: 8.3, CORE_VERSION: 10.3.0, TYPE: behat }
- { PHP_VERSION: 8.3, CORE_VERSION: 10.3.0, TYPE: phpunit, BATCH: batch1 }
- { PHP_VERSION: 8.3, CORE_VERSION: 10.3.0, TYPE: phpunit, BATCH: batch2 }
- { PHP_VERSION: 8.3, CORE_VERSION: 10.3.0, TYPE: phpunit, BATCH: batch3 }

- { PHP_VERSION: 8.1, CORE_VERSION: 10.4.0, TYPE: behat }
- { PHP_VERSION: 8.1, CORE_VERSION: 10.4.0, TYPE: phpunit, BATCH: batch1 }
- { PHP_VERSION: 8.1, CORE_VERSION: 10.4.0, TYPE: phpunit, BATCH: batch2 }
- { PHP_VERSION: 8.1, CORE_VERSION: 10.4.0, TYPE: phpunit, BATCH: batch3 }

- { PHP_VERSION: 8.3, CORE_VERSION: 10.4.0, TYPE: behat }
- { PHP_VERSION: 8.3, CORE_VERSION: 10.4.0, TYPE: phpunit, BATCH: batch1 }
- { PHP_VERSION: 8.3, CORE_VERSION: 10.4.0, TYPE: phpunit, BATCH: batch2 }
- { PHP_VERSION: 8.3, CORE_VERSION: 10.4.0, TYPE: phpunit, BATCH: batch3 }
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 @@ -45,7 +45,7 @@
"mikey179/vfsstream": "^1.6.10",
"nikic/php-parser": "^4.18",
"openeuropa/behat-transformation-context": "^0.2",
"openeuropa/code-review": "^2.0.0-alpha6",
"openeuropa/code-review": "^2.0",
Copy link
Member

Choose a reason for hiding this comment

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

openeuropa/code-review should be replaced by openeuropa/code-review-drupal

"openeuropa/oe_contact_forms": "^1.14",
"openeuropa/oe_content": "^4.0.0",
"openeuropa/oe_corporate_blocks": "4.x-dev",
Expand All @@ -57,7 +57,7 @@
"openeuropa/oe_search": "^2.0@beta",
"openeuropa/oe_webtools": "^1.23",
"openeuropa/rdf_skos": "^1.0.0",
"openeuropa/task-runner-drupal-project-symlink": "^1.0.0-beta6",
"openeuropa/task-runner-drupal-project-symlink": "^1.0",
"phpspec/prophecy-phpunit": "^2",
"symfony/phpunit-bridge": "^6.0"
},
Expand Down
7 changes: 3 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
version: '2'
services:
web:
image: fpfis/httpd-php-dev:8.1
image: fpfis/httpd-php-dev:8.3
working_dir: /var/www/html
ports:
- 8080:8080
Expand All @@ -17,8 +16,8 @@ services:
# Enable step debugging for all PHP request. See ./README.md#step-debugging for more information.
# XDEBUG_SESSION: 1
mysql:
image: percona/percona-server:5.7
command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3
image: percona/percona-server:8.0
command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3 --skip-log-bin --innodb-flush-log-at-trx-commit=2 --innodb-read-io-threads=16 --innodb-write-io-threads=16
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
# ports:
Expand Down