Prepare for d11

.docker/nginx.conf

@@ -17,9 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    set_real_ip_from 172.16.0.0/16;
-    real_ip_recursive on;
-    real_ip_header X-Forwarded-For;
+    # Note: set_real_ip_from is set in the server block
 
     log_format  main  '$http_x_real_ip - $remote_user [$time_local] "$request" '
                       '$status $body_bytes_sent "$http_referer" '

.docker/templates/default.conf.template

@@ -6,11 +6,20 @@ server {
 
     client_max_body_size ${NGINX_MAX_BODY_SIZE};
 
-    # This also needs to be set in the single server tag and not only in http.
     set_real_ip_from 172.16.0.0/16;
+    set_real_ip_from 192.168.39.0/24;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 
+    location = /cron-metrics {
+        # Proxy to supercronic metrics
+        proxy_pass http://${NGINX_CRON_METRICS}/metrics;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+
     location = /favicon.ico {
         log_not_found off;
         access_log off;

.github/workflows/composer.yaml

@@ -26,7 +26,7 @@
 name: Composer
 
 env:
-  COMPOSE_USER: root
+  COMPOSE_USER: runner
 
 on:
   pull_request:

.github/workflows/php.yaml

@@ -34,7 +34,7 @@
 name: PHP
 
 env:
-  COMPOSE_USER: root
+  COMPOSE_USER: runner
 
 on:
   pull_request:

.github/workflows/pr.yaml

@@ -43,7 +43,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           extensions: ctype, dom, iconv, json, zip, gd, soap
           coverage: none
           tools: composer:v2
@@ -112,7 +112,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.3
+          php-version: 8.4
           extensions: ctype, dom, iconv, json, zip, gd, soap
           coverage: none
           tools: composer:v2

.github/workflows/site.yaml

@@ -19,7 +19,7 @@
 name: Drupal
 
 env:
-  COMPOSE_USER: root
+  COMPOSE_USER: runner
 
 on:
   pull_request:

.github/workflows/twig.yaml

@@ -24,7 +24,7 @@
 name: Twig
 
 env:
-  COMPOSE_USER: root
+  COMPOSE_USER: runner
 
 on:
   pull_request:

.phpcs.xml.dist

@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!-- This file is copied from config/drupal/php/.phpcs.xml.dist in https://github.com/itk-dev/devops_itkdev-docker. -->
+<!-- Feel free to edit the file, but consider making a pull request if you find a general issue with the file. -->
+
+<ruleset name="PHP_CodeSniffer">
+  <description>The coding standard.</description>
+
+  <file>web/modules/custom/</file>
+  <file>web/themes/custom/</file>
+
+  <!-- Exclude generated files -->
+  <exclude-pattern>node_modules</exclude-pattern>
+  <exclude-pattern>vendor</exclude-pattern>
+  <exclude-pattern>web/*/custom/*/build/</exclude-pattern>
+  <exclude-pattern>*.css</exclude-pattern>
+  <exclude-pattern>*.js</exclude-pattern>
+
+  <arg value="p"/>
+
+  <arg name="extensions" value="php,module,inc,install,test,profile,theme,css,info,txt,yml"/>
+
+  <config name="drupal_core_version" value="11"/>
+
+  <rule ref="Drupal">
+    <!-- <exclude name="Drupal.Files.TxtFileLineLength.TooLong"/> -->
+    <!-- We want to be able to use "package" and "version" in our custom modules -->
+    <exclude name="Drupal.InfoFiles.AutoAddedKeys.Project"/>
+    <exclude name="Drupal.InfoFiles.AutoAddedKeys.Version"/>
+    <exclude name="Drupal.NamingConventions.ValidEnumCase.NoUpperAcronyms" />
+    <exclude name="Drupal.NamingConventions.ValidEnumCase.NoUnderscores" />
+  </rule>
+   <rule ref="Squiz.Strings.DoubleQuoteUsage.NotRequired"/>
+</ruleset>

CHANGELOG.md

@@ -11,6 +11,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 - [PR-377](https://github.com/itk-dev/os2loop/pull/377)
   - Security update
   - Code cleanup
+  - d11 preparation
 
 ## [1.2.3]
 

Taskfile.yml

@@ -5,7 +5,7 @@ dotenv:
 
 includes:
   dev:
-    taskfile: task/
+    taskfile: task/dev.yml
 
   server:
     taskfile: task/

composer.json

@@ -15,50 +15,53 @@
         "drupal/block_field": "^1.0@RC",
         "drupal/chosen": "^4.0",
         "drupal/color": "^1.0",
-        "drupal/config_ignore": "^2.4",
-        "drupal/convert_media_tags_to_markup": "^3.0",
+        "drupal/config_filter": "^2.7",
+        "drupal/config_ignore": "^3.3",
+        "drupal/content_fixtures": "^3.2",
+        "drupal/convert_media_tags_to_markup": "^4.0",
         "drupal/core-composer-scaffold": "^10.4",
         "drupal/core-project-message": "^10.4",
         "drupal/core-recommended": "^10.4",
         "drupal/date_popup": "^2.0",
         "drupal/diff": "^1.1",
         "drupal/entity_print": "^2.13",
-        "drupal/entity_reference_integrity": "^1.2",
+        "drupal/entity_reference_integrity": "^2.0",
         "drupal/entity_usage": "^2.0@beta",
         "drupal/externalauth": "^2.0",
         "drupal/facets": "^2.0",
         "drupal/field_group": "^3.4",
         "drupal/flag": "^4.0@beta",
-        "drupal/gin": "^3.0@RC",
+        "drupal/gin": "^4.1",
         "drupal/gin_login": "^2.0",
-        "drupal/gin_toolbar": "^1.0@RC",
-        "drupal/inline_entity_form": "^2.0@RC",
+        "drupal/gin_toolbar": "^2.1",
+        "drupal/inline_entity_form": "^3.0@RC",
         "drupal/mailsystem": "^4.4",
         "drupal/masquerade": "^2.0@RC",
         "drupal/message": "^1.4",
         "drupal/openid_connect": "^3.0@alpha",
         "drupal/paragraphs": "^1.16",
-        "drupal/paragraphs_edit": "^2.0",
+        "drupal/paragraphs_edit": "^3.0",
         "drupal/pathauto": "^1.12",
-        "drupal/rdf": "^2.1",
         "drupal/redirect": "^1.9",
         "drupal/search_api": "^1.29",
         "drupal/search_api_autocomplete": "^1.7",
-        "drupal/simple_menu_permissions": "^2.0",
+        "drupal/simple_menu_permissions": "^3.0",
         "drupal/snowball_stemmer": "^2.1",
-        "drupal/theme_switcher": "^2.0",
-        "drupal/toc_api": "^1.3",
+        "drupal/statistics": "^1.0",
+        "drupal/theme_switcher": "^2.1",
+        "drupal/toc_api": "^2.0",
         "drupal/toc_filter": "^2.1",
         "drupal/token": "^1.12",
         "drupal/token_filter": "^2.0",
         "drupal/twig_tweak": "^3.2",
+        "drupal/upgrade_status": "^4.3",
         "drupal/view_unpublished": "^1.2",
-        "drupal/views_autosubmit": "^1.6",
-        "drupal/views_data_export": "^1.3",
+        "drupal/views_autosubmit": "^1.7",
+        "drupal/views_data_export": "^1.8",
         "drupal/views_flag_refresh": "^1.0",
         "drupal/viewsreference": "^2.0@beta",
         "drupal/xls_serialization": "^2.0",
-        "drush/drush": "^12.2",
+        "drush/drush": "^13.0",
         "jjj/chosen": "^2.2"
     },
     "require-dev": {
@@ -80,49 +83,49 @@
     },
     "repositories": {
         "drupal": {
+            "canonical": false,
             "type": "composer",
-            "url": "https://packages.drupal.org/8",
-            "canonical": false
+            "url": "https://packages.drupal.org/8"
         },
         "chosen": {
-            "type": "package",
             "package": {
                 "name": "jjj/chosen",
-                "type": "drupal-library",
-                "version": "2.2.1",
                 "source": {
+                    "reference": "2.2.1",
                     "type": "git",
-                    "url": "https://github.com/JJJ/chosen.git",
-                    "reference": "2.2.1"
-                }
-            }
+                    "url": "https://github.com/JJJ/chosen.git"
+                },
+                "type": "drupal-library",
+                "version": "2.2.1"
+            },
+            "type": "package"
         },
         "drupal/theme_switcher": {
             "type": "vcs",
             "url": "https://git.drupalcode.org/project/theme_switcher"
         },
         "os2loop/os2loop_fixtures": {
-            "type": "path",
-            "url": "web/profiles/custom/os2loop/modules/os2loop_fixtures",
             "options": {
                 "symlink": false,
                 "versions": {
                     "os2loop/os2loop_fixtures": "1.0-dev"
                 }
-            }
+            },
+            "type": "path",
+            "url": "web/profiles/custom/os2loop/modules/os2loop_fixtures"
         },
         "drupal/views_flag_refresh": {
-            "type": "package",
             "package": {
                 "name": "drupal/views_flag_refresh",
-                "type": "drupal-module",
-                "version": "dev-2929394-drupal-8-port",
                 "source": {
+                    "reference": "origin/2929394-drupal-8-port",
                     "type": "git",
-                    "url": "https://git.drupalcode.org/issue/views_flag_refresh-2929394.git",
-                    "reference": "origin/2929394-drupal-8-port"
-                }
-            }
+                    "url": "https://git.drupalcode.org/issue/views_flag_refresh-2929394.git"
+                },
+                "type": "drupal-module",
+                "version": "dev-2929394-drupal-8-port"
+            },
+            "type": "package"
         }
     },
     "minimum-stability": "dev",
@@ -214,9 +217,6 @@
                 "Add page count https://www.drupal.org/project/entity_print/issues/2823430": "https://www.drupal.org/files/issues/2023-07-10/entity_print-dompdf_page_count-2823430-14.patch",
                 "Fix bug in cached pdf styles (https://www.drupal.org/project/entity_print/issues/3394857)": "https://www.drupal.org/files/issues/2023-12-01/3394857-hotfix.patch"
             },
-            "drupal/entity_reference_integrity": {
-                "https://www.drupal.org/project/entity_reference_integrity/issues/3380250": "https://www.drupal.org/files/issues/2023-08-29/entity_reference_integrity-3380250-5.patch"
-            },
             "drupal/flag": {
                 "Implement Migration Paths for Flag 7.x (https://www.drupal.org/project/flag/issues/2409901#comment-13082245)": "https://www.drupal.org/files/issues/2019-04-25/2409901_flag_migration_paths_52.patch",
                 "Implement Migration Paths for Flag 7.x (https://www.drupal.org/project/flag/issues/2409901#comment-13281955)": "https://www.drupal.org/files/issues/2019-10-02/2409901-60.patch"