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.

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

OEL-2115: Update to PHP 8.1 #165

Merged
merged 6 commits into from
Jan 16, 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 @@ -89,5 +89,5 @@ matrix:
- lowest
- highest
PHP_VERSION:
- 7.4
- 8.0
- 8.1
51 changes: 32 additions & 19 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,38 +6,46 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=7.4",
"drupal/core": "^9.3",
"php": ">=8.0",
"drupal/core": "^9.4",
"drupal/emr": "^1.1",
"drupal/facets": "^2.0",
"drupal/multivalue_form_element": "^1.0@beta",
"drupal/search_api": "~1.17",
"symfony/options-resolver": "^4"
"drupal/search_api": "^1.27",
"symfony/options-resolver": "^4.4.30"
},
"require-dev": {
"behat/mink-selenium2-driver": "^1.5",
"composer/installers": "^1.11",
"drupal/address": "^1.8",
"drupal/config_devel": "^1.2",
"drupal/core-composer-scaffold": "^9.3",
"drupal/core-dev": "^9.3",
"drupal/core-composer-scaffold": "^9.4",
"drupal/ctools": "^3.7",
"drupal/drupal-extension": "^4.0",
"drupal/drupal-extension": "dev-master as 4.0",
"drupal/extra_field": "^2.1",
"drupal/inline_entity_form": "^1.0-rc12",
"drupal/token": "^1.10",
"drush/drush": "^10.3",
"drush/drush": "^11.1",
"guzzlehttp/guzzle": "^7.0",
"masterminds/html5": "^2.7.6",
"mikey179/vfsstream": "^1.6.10",
"openeuropa/code-review": "^2.0",
"openeuropa/oe_link_lists": "~0.16.0",
"openeuropa/oe_multilingual": "^1.10",
"openeuropa/open_vocabularies": "^1.0-alpha6",
"openeuropa/oe_link_lists": "^0.19",
"openeuropa/oe_multilingual": "^1.12",
"openeuropa/open_vocabularies": "dev-master",
"openeuropa/task-runner-drupal-project-symlink": "^1.0.0-beta5",
"phpspec/prophecy-phpunit": "^2",
"symfony/dom-crawler": "^4.4.12",
"composer/xdebug-handler": "^2.0"
"symfony/console": "^4.4.30",
"symfony/css-selector": "^4.4.44",
"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.44",
"symfony/validator": "^4.4.35",
"symfony/yaml": "^4.4.29"
},
"_readme": [
"Requiring composer/xdebug-handler until PHPMD 2.12 is released"
],
"scripts": {
"post-install-cmd": "./vendor/bin/run drupal:site-setup",
"post-update-cmd": "./vendor/bin/run drupal:site-setup"
Expand Down Expand Up @@ -76,9 +84,14 @@
}
},
"_readme": [
"Explicit lower version requirement of drupal/ctools due to Drupal core 9.3 compatibility.",
"Explicit minimum version requirement for symfony/dom-crawler due to its lower versions using the deprecated function libxml_disable_entity_loader() in PHP8.",
"Explicit requirement of drupal/token module due to PHP 8 compatbility."
"Explicit minimum version requirement of drupal/ctools due to previous versions having the 'core' key set in .info.yml files.",
"Explicit requirement of token module due to lower versions declaring optional parameters before the require one on token_tokens() function.",
"Explicit minimum version requirement of mikey179/vfsstream due to lower versions missing return type on vfsStreamDirectory::getIterator() method.",
"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 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.",
"Explicit minimum version requirement of masterminds/html5 due to lower versions passing NULL parameters instead of string when calling DOMImplementation::createDocument() method."
]
},
"config": {
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: The OpenEuropa List Page content type.
package: OpenEuropa

type: module
core_version_requirement: ^9.3
core_version_requirement: ^9.4

dependencies:
- emr:emr_node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: This submodule adds support for Address fields in List Pages.
package: OpenEuropa

type: module
core_version_requirement: ^9.3
core_version_requirement: ^9.4

dependencies:
- address:address
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Provides a link list source plugin that collect links from a list p
package: OpenEuropa

type: module
core_version_requirement: ^9.3
core_version_requirement: ^9.4

dependencies:
- oe_link_lists:oe_link_lists
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Test module for OpenEuropa List Pages Link List Source
package: Testing

type: module
core_version_requirement: ^9.3
core_version_requirement: ^9.4

dependencies:
- oe_list_pages_link_list_source:oe_list_pages_link_list_source
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: This submodule adds support for OpenVocabularies fields in List Pag
package: OpenEuropa

type: module
core_version_requirement: ^9.3
core_version_requirement: ^9.4

dependencies:
- oe_list_pages:oe_list_pages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Test module for OpenEuropa List Pages Open Vocabularies
package: Testing

type: module
core_version_requirement: ^9.3
core_version_requirement: ^9.4

dependencies:
- oe_list_pages:oe_list_pages_open_vocabularies
Expand Down
2 changes: 1 addition & 1 deletion oe_list_pages.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: The OpenEuropa List Pages allows creation and management of list pa
package: OpenEuropa

type: module
core_version_requirement: ^9.3
core_version_requirement: ^9.4

dependencies:
- emr:emr_node
Expand Down
3 changes: 0 additions & 3 deletions runner.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,5 @@ commands:
- { task: "run", command: "drupal:drush-setup" }
- { task: "run", command: "drupal:settings-setup" }
- { task: "run", command: "setup:phpunit" }
- { task: "run", command: "setup:behat" }
setup:phpunit:
- { task: "process", source: "phpunit.xml.dist", destination: "phpunit.xml" }
setup:behat:
- { task: "process", source: "behat.yml.dist", destination: "behat.yml" }
2 changes: 1 addition & 1 deletion src/FilterConfigurationFormBuilderBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ protected function buildSummaryPresetFilters(array $form, FormStateInterface $fo
* The altered array.
*/
public static function preRenderOperationButtons(array $form): array {
$rows =& $form['summary']['table']['#rows'];
$rows = &$form['summary']['table']['#rows'];
for ($i = 0; $i < count($rows); $i++) {
$facet_id = $rows[$i][0]['filter_id'];
$rows[$i][static::getOperationsButtonsPosition()]['data'] = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ type: module
description: The test module for OE List Pages plugin event subscriber.

package: Testing
core_version_requirement: ^9.3
core_version_requirement: ^9.4

dependencies:
- oe_list_pages
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ type: module
description: The test module for filters of OE List Pages.

package: Testing
core_version_requirement: ^9.3
core_version_requirement: ^9.4

dependencies:
- drupal:link
Expand Down