Merge pull request #104 from openeuropa/EWPP-1896

EWPP-1896: Update to PHP8

.drone.yml

@@ -17,6 +17,7 @@ services:
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     environment:
       - DOCUMENT_ROOT=/test/oe_corporate_blocks
+      - COMPOSERVER=--2
   mysql:
     image: registry.fpfis.eu/fpfis/sql: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
@@ -46,10 +47,8 @@ pipeline:
     volumes:
       - /cache/${DRONE_REPO_NAME}:/cache
     commands:
-      # @todo remove "composer install" step once the following issue is fixed.
-      # @link https://webgate.ec.europa.eu/CITnet/jira/browse/OPENEUROPA-1234
-      - composer install --ansi --no-suggest --no-progress
-      - composer update --prefer-lowest --prefer-stable --ansi --no-suggest --no-progress
+      - composer self-update --2
+      - composer update --prefer-lowest --prefer-stable --ansi --no-progress
     when:
       matrix:
         COMPOSER_BOUNDARY: lowest
@@ -60,14 +59,16 @@ pipeline:
     volumes:
       - /cache/${DRONE_REPO_NAME}:/cache
     commands:
-      - composer install --ansi --no-suggest --no-progress
+      - composer self-update --2
+      - composer install --ansi --no-progress
     when:
       matrix:
         COMPOSER_BOUNDARY: highest
 
   site-install:
     image: registry.fpfis.eu/fpfis/httpd-php:${PHP_VERSION}-ci
     commands:
+      - while ! mysqladmin ping -h mysql --silent; do sleep 1; done
       - ./vendor/bin/run drupal:site-install
 
   grumphp:
@@ -93,4 +94,5 @@ matrix:
     - lowest
     - highest
   PHP_VERSION:
-    - 7.3
+    - 7.4
+    - 8.0

composer.json

@@ -6,24 +6,33 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.3",
-        "drupal/core": "^8.9 || ^9.1",
-        "easyrdf/easyrdf": "1.0.0 as 0.9.1",
+        "php": ">=7.4",
+        "drupal/core": "^9.2",
         "openeuropa/oe_corporate_site_info": "^1.0"
     },
     "require-dev": {
+        "behat/behat": "^3.10",
         "composer/installers": "^1.11",
-        "drupal/core-composer-scaffold": "^8.9 || ^9.1",
+        "drupal/core-composer-scaffold": "^9.2",
+        "drupal/core-dev": "^9.2",
         "drupal/config_devel": "^1.2",
+        "drupal/ctools": "^3.7",
         "drupal/drupal-extension": "^4.0",
+        "drupal/token": "^1.10",
         "drush/drush": "^10.3",
+        "egulias/email-validator": "^2.1.22 || ^3.0",
         "openeuropa/behat-transformation-context" : "~0.1",
-        "openeuropa/code-review": "^1.6",
-        "openeuropa/drupal-core-require-dev": "^8.9 || ^9.1",
-        "openeuropa/task-runner-drupal-project-symlink": "^1.0",
-        "openeuropa/oe_multilingual": "^1.8",
+        "openeuropa/code-review": "^2.0",
+        "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
+        "openeuropa/oe_multilingual": "^1.10",
         "phpspec/prophecy-phpunit": "^1 || ^2"
     },
+    "_readme": [
+        "Explicit lower version requirement of ctools due to Drupal core 9.2 compatibility.",
+        "Explicit requirement for egulias/email-validator due to https://www.drupal.org/project/drupal/issues/3061074#comment-14300579. It can be removed when Drupal core 9.2 support is droppped.",
+        "Explicit requirement of token module due to PHP7.4 compatbility.",
+        "Explicit requirement of behat module due to PHP8 compatibility."
+    ],
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
         "post-update-cmd": "./vendor/bin/run drupal:site-setup"
@@ -61,6 +70,13 @@
         }
     },
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/installers": true,
+            "cweagans/composer-patches": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "drupal/core-composer-scaffold": true,
+            "phpro/grumphp": true
+        }
     }
 }

docker-compose.yml

@@ -1,14 +1,15 @@
 version: '2'
 services:
   web:
-    image: fpfis/httpd-php-dev:7.3
+    image: fpfis/httpd-php-dev:8.0
     working_dir: /var/www/html
     ports:
       - 8080:8080
     volumes:
       - .:/var/www/html # Non Mac users.
       # - nfsmount:/var/www/html # Mac Users with the nfsmount volume.
     environment:
+      COMPOSERVER: "--2"
       XDEBUG_CONFIG: "remote_enable=1 remote_host=10.254.254.254 remote_port=9000 idekey=PHPSTORM remote_autostart=1"
       PHP_IDE_CONFIG: "serverName=Docker"
       # For Xdebug setup, run this command in the terminal:

grumphp.yml.dist

@@ -12,3 +12,6 @@ parameters:
     - php
     - theme
     - yml
+grumphp:
+  git_hook_variables:
+    EXEC_GRUMPHP_COMMAND: 'docker-compose exec -T web'

modules/oe_corporate_blocks_demo/oe_corporate_blocks_demo.info.yml

@@ -1,5 +1,5 @@
 name: OpenEuropa Corporate blocks Demo
-core_version_requirement: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 type: module
 
 config_devel:

oe_corporate_blocks.info.yml

@@ -2,7 +2,7 @@ name: OpenEuropa Corporate Blocks
 description: OpenEuropa Corporate Blocks.
 package: OpenEuropa
 type: module
-core_version_requirement: ^8.9 || ^9.1
+core_version_requirement: ^9.2
 configure: oe_corporate_blocks.settings_index
 
 dependencies: