Merge branch 'develop'

Author: martinyde

.github/workflows/docker-image.yaml

@@ -11,7 +11,7 @@ jobs:
     - name: Setup PHP, with composer and extensions
       uses: shivammathur/setup-php@v2
       with:
-        php-version: 8.2
+        php-version: 8.3
         extensions: dom, zip
         coverage: none
         tools: composer:v2

.github/workflows/pr.yaml

@@ -26,7 +26,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: ctype, dom, iconv, json, zip, gd, soap
           coverage: none
           tools: composer:v2
@@ -48,6 +48,29 @@ jobs:
           composer install --no-interaction --no-progress
           composer normalize composer.json --dry-run
 
+  config-check:
+    name: Check that config is up to date
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Install site
+        run: |
+          docker network create frontend
+          docker compose pull
+          docker compose up --detach
+
+          # Important: Use --no-interaction to make https://getcomposer.org/doc/06-config.md#discard-changes have effect.
+          docker compose exec --user root phpfpm composer install --no-interaction
+
+          # Install the site
+          docker compose exec --user root phpfpm vendor/bin/drush site:install --existing-config --yes
+
+      - name: Export config
+        run: docker compose exec --user root phpfpm vendor/bin/drush config:export --yes
+      - name: Check for changes in config
+        run: git diff --diff-filter=ACMRT --exit-code config/
+
   phpcs:
     name: PHP - Check Coding Standards
     runs-on: ubuntu-latest
@@ -56,7 +79,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: ctype, dom, iconv, json, zip, gd, soap
           coverage: none
           tools: composer:v2
@@ -116,7 +139,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: ctype, dom, iconv, json, zip, gd, soap
           coverage: none
           tools: composer:v2
@@ -186,7 +209,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 8.2
+          php-version: 8.3
           extensions: ctype, dom, iconv, json, zip, gd, soap
           coverage: none
           tools: composer:v2

CHANGELOG.md

@@ -8,9 +8,15 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [1.1.3]
+
+- [PR-363](https://github.com/itk-dev/os2loop/pull/363)
+  Security update
+
+
 ## [1.1.2]
 
-- [PR-362](https://github.com/itk-dev/os2loop/pull/362)
+  - [PR-362](https://github.com/itk-dev/os2loop/pull/362)
   - Change Share with a friend form
   - Add chosen lib
   - Use chosen lib for profession and expertise fields

README.md

@@ -10,34 +10,6 @@
 OS2loop is a question-answering system built on Drupal 9. See [os2.eu/produkt/os2loop](https://os2.eu/produkt/os2loop)
 (in Danish) for more information.
 
-## Upgrading to Drupal 10
-
-Upgrading to [Drupal 10](https://www.drupal.org/about/10) is a two-step process:
-first the site must be prepared for the upgrade ([tag:
-d-10-prepare](/releases/tag/d-10-prepare)) and then the actual upgrade must be
-performed.
-
-```sh
-# Backup the database
-
-# Prepare for the upgrade
-git checkout d-10-prepare
-composer install --no-dev --optimize-autoloader
-vendor/bin/drush --yes pm:uninstall samlauth
-vendor/bin/drush --yes deploy
-vendor/bin/drush --yes locale:update
-vendor/bin/drush --yes cache:rebuild
-
-# Check that site still works
-
-# Upgrade to Drupal 10
-git checkout «release tag»
-composer install --no-dev --optimize-autoloader
-vendor/bin/drush --yes deploy
-vendor/bin/drush --yes locale:update
-vendor/bin/drush --yes cache:rebuild
-```
-
 ## Installation
 
 ### Production

composer.json

@@ -5,7 +5,7 @@
     "type": "project",
     "homepage": "https://github.com/os2loop/os2loop",
     "require": {
-        "php": "^8.2",
+        "php": "^8.3",
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
         "dompdf/dompdf": "^2.0",
@@ -69,7 +69,7 @@
         "ergebnis/composer-normalize": "^2.42",
         "kint-php/kint": "^5.0",
         "mglaman/phpstan-drupal": "^1.2",
-        "os2loop/os2loop_fixtures": "dev-main",
+        "os2loop/os2loop_fixtures": "^1.0",
         "phpspec/prophecy-phpunit": "^2.0",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan-deprecation-rules": "^1.1",
@@ -103,7 +103,13 @@
         },
         "os2loop/os2loop_fixtures": {
             "type": "path",
-            "url": "web/profiles/custom/os2loop/modules/os2loop_fixtures"
+            "url": "web/profiles/custom/os2loop/modules/os2loop_fixtures",
+            "options": {
+                "symlink": false,
+                "versions": {
+                    "os2loop/os2loop_fixtures": "1.0-dev"
+                }
+            }
         },
         "drupal/views_flag_refresh": {
             "type": "package",
@@ -131,7 +137,8 @@
             "drupal/core-project-message": true,
             "ergebnis/composer-normalize": true,
             "php-http/discovery": true,
-            "phpstan/extension-installer": true
+            "phpstan/extension-installer": true,
+            "tbachert/spi": true
         },
         "process-timeout": 0,
         "sort-packages": true
@@ -205,7 +212,7 @@
                 "Handle undefined index when using form states (https://www.drupal.org/project/drupal/issues/2700667)": "https://www.drupal.org/files/issues/2020-03-11/2700667-104.patch"
             },
             "drupal/devel": {
-                "Public methods are not visible in kint (https://www.drupal.org/project/devel/issues/3112201)": "https://www.drupal.org/files/issues/2022-04-26/devel_3112201_4.patch"
+                "Public methods are not visible in kint (https://gitlab.com/drupalspoons/devel/-/issues/221 via https://www.drupal.org/project/devel/issues/3112201)": "https://gitlab.com/-/project/18040690/uploads/7897853cd83cb829ae8d752657e2f497/kint.221-5-3.patch"
             },
             "drupal/entity_print": {
                 "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",