DE-12: Support PHP 8

Author: Kalle Vuorjoki

.ddev/config.yaml

@@ -1,7 +1,7 @@
 name: drupal-elasticsearch
 type: drupal9
 docroot: web
-php_version: "7.3"
+php_version: "8.1"
 webserver_type: nginx-fpm
 router_http_port: "80"
 router_https_port: "443"

.ddev/docker-compose.elasticsearch.yml

@@ -3,7 +3,9 @@ services:
   elasticsearch:
     container_name: ddev-${DDEV_SITENAME}-elasticsearch
     hostname: ${DDEV_SITENAME}-elasticsearch
-    image: elasticsearch:${ELASTICSEARCH_VERSION}
+    # Support for .env files has been dropped, @see https://github.com/drud/ddev/discussions/2940
+    #image: elasticsearch:${ELASTICSEARCH_VERSION}
+    image: elasticsearch:7.14.2
     expose:
       - "9200"
       - "9300"

.ddev/docker-compose.kibana.yml

@@ -3,7 +3,9 @@ services:
   kibana:
     container_name: ddev-${DDEV_PROJECT}-kibana
     hostname: ${DDEV_PROJECT}-kibana
-    image: docker.elastic.co/kibana/kibana:${ELASTICSEARCH_VERSION}
+    # Support for .env files has been dropped, @see https://github.com/drud/ddev/discussions/2940
+    #image: docker.elastic.co/kibana/kibana:${ELASTICSEARCH_VERSION}
+    image: docker.elastic.co/kibana/kibana:7.14.2
     restart: "no"
     expose:
       - '5601'

README.md

@@ -3,13 +3,11 @@
 For local development use [DDEV](https://github.com/drud/ddev)
 
 Requirements on local machine:
-- PHP 7.3 (Make sure have same version `php --version`, otherwise `composer install` might fail)
-- Composer 2.x
 - Docker
 - mkcert [Installation quite](https://ddev.readthedocs.io/en/stable/#installationupgrade-script-linux-and-macos)
 
 ```sh
-composer install
+ddev composer install
 ddev start
 ```
 

composer.json

@@ -17,17 +17,17 @@
     "require": {
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.7",
-        "drupal/admin_toolbar": "^3.0",
-        "drupal/core-composer-scaffold": "^9.2",
-        "drupal/core-project-message": "^9.2",
-        "drupal/core-recommended": "^9.2",
-        "drupal/devel": "^4.1.1",
-        "drupal/elasticsearch_connector": "7.0.0-alpha3",
+        "drupal/admin_toolbar": "^3.0.3",
+        "drupal/core-composer-scaffold": "^9.3",
+        "drupal/core-project-message": "^9.3",
+        "drupal/core-recommended": "^9.3",
+        "drupal/devel": "^4.1.3",
+        "drupal/elasticsearch_connector": "8.0.x-dev",
         "drupal/geolocation": "^3.7",
-        "drupal/search_api": "^1.19",
+        "drupal/search_api": "^1.22",
         "drupal/search_api_location": "^1.0",
-        "drupal/search_api_solr": "^4.1",
-        "drupal/token": "^1.9",
+        "drupal/search_api_solr": "^4.2.6",
+        "drupal/token": "^1.10",
         "drush/drush": "^10"
     },
     "conflict": {
@@ -36,7 +36,14 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "composer/installers": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true,
+            "cweagans/composer-patches": true,
+            "drupal/core-composer-scaffold": true,
+            "drupal/core-project-message": true
+        }
     },
     "scripts": {
         "post-install-cmd": [
@@ -49,8 +56,7 @@
         "patches": {
           "drupal/elasticsearch_connector": {
             "3189051 - Handle pre-epoch dates": "https://www.drupal.org/files/issues/2021-06-25/3189051-pre-epoch-dates-10.patch",
-            "3116153 - Add support for geofield mapping": "https://www.drupal.org/files/issues/2020-11-17/elasticsearch_connector-support_geofield-3116153-3.patch",
-            "3153850 - getCluster error in getIndexName": "https://git.drupalcode.org/project/elasticsearch_connector/-/merge_requests/4.diff"
+            "3116153 - Add support for geofield mapping": "https://www.drupal.org/files/issues/2020-11-17/elasticsearch_connector-support_geofield-3116153-3.patch"
           }
         },
         "patchLevel": {
@@ -107,10 +113,10 @@
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.1",
-        "drupal/core-dev": "^9.2",
-        "drupal/coder": "~8.3.12",
-        "mglaman/drupal-check": "^1.1",
-        "mglaman/phpstan-drupal": "^0.12.8",
+        "drupal/core-dev": "^9.3",
+        "drupal/coder": "~8.3.13",
+        "mglaman/drupal-check": "^1.2",
+        "mglaman/phpstan-drupal": "^1.1",
         "phpspec/prophecy-phpunit": "^2"
     }
 }