Skip to content
This repository has been archived by the owner on Jan 10, 2025. It is now read-only.

OEL-2115: Update to PHP 8.1 #84

Merged
merged 2 commits into from
Jan 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,5 @@ matrix:
- lowest
- highest
PHP_VERSION:
- 7.4
- 8.0
- 8.1
40 changes: 29 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,34 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=7.4",
"php": ">=8.0",
"cweagans/composer-patches": "~1.4",
"drupal/core": "^9.3",
"drupal/core": "^9.4",
"drupal/remote_stream_wrapper": "^2.0"
},
"require-dev": {
"behat/mink-selenium2-driver": "^1.5",
"composer/installers": "~1.5",
"drupal/core-composer-scaffold": "^9.3",
"drupal/core-dev": "^9.3",
"drupal/core-composer-scaffold": "^9.4",
"drupal/config_devel": "~1.2",
"drupal/drupal-extension": "~4.0",
"drush/drush": "~10.3",
"guzzlehttp/guzzle": "^6.3",
"drupal/drupal-extension": "dev-master as 4.0",
"drush/drush": "^11.1",
"guzzlehttp/guzzle": "^7.0",
"mikey179/vfsstream": "^1.6.10",
"nikic/php-parser": "^4.12.0",
"openeuropa/code-review": "^2.0",
"openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
"phpspec/prophecy-phpunit": "^2"
"openeuropa/code-review": "2.x-dev",
"openeuropa/task-runner-drupal-project-symlink": "1.x-dev",
"phpspec/prophecy-phpunit": "^2",
"symfony/console": "^4.4.30",
"symfony/css-selector": "^4.4.24",
"symfony/dom-crawler": "^4.4.44",
"symfony/finder": "^4.4.30",
"symfony/http-foundation": "^4.4.30",
"symfony/phpunit-bridge": "^6.0",
"symfony/process": "^4.4.30",
"symfony/routing": "^4.4.30",
"symfony/validator": "^4.4.35",
"symfony/yaml": "^4.4.29"
},
"scripts": {
"post-install-cmd": "./vendor/bin/run drupal:site-setup",
Expand Down Expand Up @@ -62,7 +73,14 @@
"locations": {
"web-root": "./build"
}
}
},
"_readme": [
"Use master branch of drupal/drupal-extension to replace fabpot/goutte with behat/mink-browserkit-driver.",
"Explicit minimum version requirement of symfony/phpunit-bridge to replace drupal/core-dev testing classes and traits.",
"Explicit minimum version requirement of mikey179/vfsstream due to lower versions missing return type on vfsStreamDirectory::getIterator() method.",
"Explicit minimum version requirement of guzzlehttp/guzzle due to lower versions missing return type on CookieJar::getIterator() and CookieJar::count() methods.",
"Explicit minimum version requirement of symfony packages due to lower versions missing return type on various methods being incompatible with PHP 8.1 parent methods."
]
},
"config": {
"sort-packages": true,
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '2'
services:
web:
image: fpfis/httpd-php-dev:8.0
image: fpfis/httpd-php-dev:8.1
working_dir: /var/www/html
ports:
- 8080:8080
Expand Down
2 changes: 1 addition & 1 deletion media_avportal.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: 'Media AV Portal'
description: 'Media AV Portal adds European Audiovisual Services as a supported media provider.'
type: module
package: Media
core_version_requirement: ^9.3
core_version_requirement: ^9.4
dependencies:
- drupal:media
- remote_stream_wrapper:remote_stream_wrapper
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Media AV Portal Mock'
description: 'Provides a middleware for the returning mocked responses from AV Portal. Do not use this in production.'
core_version_requirement: ^9.3
core_version_requirement: ^9.4
type: module
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 'Media AV Portal Responsive Test'
description: 'Test module for the Responsive image style'
type: module
core_version_requirement: ^9.3
core_version_requirement: ^9.4
package: Testing

dependencies:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Media AV Portal Test'
description: 'Provides configuration media bundles for testing purpose.'
core_version_requirement: ^9.3
core_version_requirement: ^9.4
type: module