From dc48da5cc48600adb589f6840f10e954e216270a Mon Sep 17 00:00:00 2001
From: jjroelofs <904576+jjroelofs@users.noreply.github.com>
Date: Thu, 2 Jul 2026 09:04:58 +0200
Subject: [PATCH 1/3] fix: ensure Drupal 11.4 compatibility

autosave_form 1.10 passes too few arguments to FormBuilder::__construct(),
which gained an 11th parameter in Drupal 11.4. Bumping to ^1.11 fixes the
ArgumentCountError that breaks site installation.

Drupal 11.4 also pulls in symfony/runtime as a Composer plugin; allow it
in the project config so composer install does not abort.
---
 composer.json                                    | 3 ++-
 recipes/dxpr_cms_content_type_base/composer.json | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index fda74349c..8ecedfba6 100644
--- a/composer.json
+++ b/composer.json
@@ -205,7 +205,8 @@
             "php-http/discovery": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "phpstan/extension-installer": true,
-            "tbachert/spi": true
+            "tbachert/spi": true,
+            "symfony/runtime": true
         },
         "sort-packages": true,
         "optimize-autoloader": true
diff --git a/recipes/dxpr_cms_content_type_base/composer.json b/recipes/dxpr_cms_content_type_base/composer.json
index 8c7c0e7ed..7a646134d 100644
--- a/recipes/dxpr_cms_content_type_base/composer.json
+++ b/recipes/dxpr_cms_content_type_base/composer.json
@@ -4,7 +4,7 @@
     "type": "drupal-recipe",
     "license": ["GPL-2.0-or-later"],
     "require": {
-        "drupal/autosave_form": "^1.10",
+        "drupal/autosave_form": "^1.11",
         "drupal/bpmn_io": "^3.0",
         "drupal/block_classes": "^1.0",
         "drupal/core": "^10.4 || ^11",

From 805e5ebb32f3e13a6a61c669e78828550f5ad184 Mon Sep 17 00:00:00 2001
From: jjroelofs <904576+jjroelofs@users.noreply.github.com>
Date: Thu, 2 Jul 2026 09:07:19 +0200
Subject: [PATCH 2/3] fix: remove double dash flagged by emdash lint

---
 .../dxpr_cms_installer/src/Form/ConfigureAPIKeysForm.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web/profiles/dxpr_cms_installer/src/Form/ConfigureAPIKeysForm.php b/web/profiles/dxpr_cms_installer/src/Form/ConfigureAPIKeysForm.php
index c4bb9455d..2ba270181 100644
--- a/web/profiles/dxpr_cms_installer/src/Form/ConfigureAPIKeysForm.php
+++ b/web/profiles/dxpr_cms_installer/src/Form/ConfigureAPIKeysForm.php
@@ -221,7 +221,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
    * Submit handler for the skip button.
    */
   public function skipForm(array &$form, FormStateInterface $form_state): void {
-    // Do nothing -- just advance to the next install task.
+    // Intentionally empty: advancing to the next install task.
   }
 
   /**

From b3afbaacaf27320b77afb4c4297aa66f93dbc9d0 Mon Sep 17 00:00:00 2001
From: jjroelofs <904576+jjroelofs@users.noreply.github.com>
Date: Thu, 2 Jul 2026 09:13:17 +0200
Subject: [PATCH 3/3] fix: remove layout_builder_component_attributes patch

The implicit nullable fix is included upstream in version 2.3.0,
which is what ^2.2 now resolves to. The patch no longer applies
cleanly and is no longer needed.
---
 composer.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 8ecedfba6..69765cf0c 100644
--- a/composer.json
+++ b/composer.json
@@ -248,10 +248,7 @@
             "drupal/ace_editor": {
                 "Fix profile detection for recipe-based installations  ": "patches/ace_editor_no_profile.patch"
             },
-            "drupal/layout_builder_component_attributes": {
-                "Fix PHP 8.4 implicit nullable deprecation in ManageComponentAttributesForm::buildForm()": "patches/layout_builder_component_attributes--implicit-nullable.patch"
-            },
-            "drupal/tmgmt": {
+"drupal/tmgmt": {
                 "Same Job processed/checkout twice by the JobCheckoutManager": "patches/tmgmt--issue-3198609.patch"
             },
             "neilime/php-css-lint": {