Fixed composer stuff

Author: rimi-itk

.github/workflows/composer.yaml

@@ -62,6 +62,11 @@ jobs:
           docker network create frontend
 
       - run: |
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
+
           docker compose run --rm phpfpm composer install
           docker compose run --rm phpfpm composer normalize --dry-run
 

.github/workflows/php.yaml

@@ -55,5 +55,10 @@ jobs:
           docker network create frontend
 
       - run: |
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
+
           docker compose run --rm phpfpm composer install
           docker compose run --rm phpfpm vendor/bin/phpcs

.github/workflows/twig.yaml

@@ -44,5 +44,11 @@ jobs:
 
       - run: |
           docker network create frontend
+
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient
+          docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
+
           docker compose run --rm phpfpm composer install
           docker compose run --rm phpfpm vendor/bin/twig-cs-fixer lint

.twig-cs-fixer.dist.php

@@ -13,7 +13,4 @@
 $config = new TwigCsFixer\Config\Config();
 $config->setFinder($finder);
 
-// @see https://github.com/VincentLanglet/Twig-CS-Fixer/pull/134#issuecomment-1756924889
-$config->addTokenParser(new Drupal\Core\Template\TwigTransTokenParser());
-
 return $config;

README.md

@@ -62,3 +62,24 @@ key_provider_settings:
 key_input: none
 key_input_settings: {  }
 ```
+
+## Development
+
+``` shell
+task composer:install
+```
+
+### Composer install hacks
+
+``` shell name=composer-install-hack
+# Create a temporary composer file to install https://github.com/mglaman/composer-drupal-lenient before the real install needs it.
+docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm sh <<<'EOF'
+composer init --no-interaction
+composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
+composer require mglaman/composer-drupal-lenient
+rm composer.lenient.*
+EOF
+
+# Now we can install what we actually need.
+docker compose run --rm phpfpm composer install
+```

Taskfile.yml

@@ -15,6 +15,21 @@ tasks:
         vars:
           TASK_ARGS: run --rm phpfpm composer {{.TASK_ARGS}}
 
+  composer:install:
+    desc: Run composer inside docker compose setup, e.g. `task {{.TASK}} -- install`
+    cmds:
+      - rm -fr composer.lock vendor
+      - |
+        # Create a temporary composer file to install https://github.com/mglaman/composer-drupal-lenient before the real install needs it.
+        docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer init --no-interaction
+        docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
+        docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm composer require mglaman/composer-drupal-lenient
+        docker compose run --rm --env COMPOSER=composer.lenient.json phpfpm rm composer.lenient.*
+
+      - task: composer
+        vars:
+          TASK_ARGS: install
+
   coding-standards:apply:
     desc: "Apply coding standards"
     cmds:

compose.yaml

@@ -7,6 +7,10 @@ services:
     volumes:
       - .:/app-os2forms_fordelingskomponent
     working_dir: /app-os2forms_fordelingskomponent
+    environment:
+      # https://getcomposer.org/doc/03-cli.md#composer-no-security-blocking
+      # @see https://github.com/OS2Forms/os2forms/issues/244
+      COMPOSER_NO_SECURITY_BLOCKING: 1
 
   # Code checks tools
   markdownlint:

composer.json

@@ -12,15 +12,13 @@
     "require": {
         "ext-dom": "*",
         "drupal/system_stream_wrapper": "^2.1",
-        "drupal/webform": "^6.2",
         "drush/drush": "^12 || ^13",
-        "itk-dev/serviceplatformen": "dev-feature/SF2900-Fordelingskomponenten",
-        "os2web/os2web_audit": "^1.2",
-        "os2web/os2web_key": "^1.0"
+        "itk-dev/serviceplatformen": "dev-feature/SF2900-Fordelingskomponenten as 1.7.9999",
+        "os2forms/os2forms": "^5.0"
     },
     "require-dev": {
         "drupal/coder": "^8.3",
-        "ergebnis/composer-normalize": "^2.49",
+        "ergebnis/composer-normalize": "^2.50",
         "mglaman/phpstan-drupal": "^2.0",
         "phpstan/extension-installer": "^1.4",
         "phpunit/phpunit": "^9.6",
@@ -45,7 +43,19 @@
             "cweagans/composer-patches": true,
             "dealerdirect/phpcodesniffer-composer-installer": true,
             "ergebnis/composer-normalize": true,
-            "phpstan/extension-installer": true
+            "mglaman/composer-drupal-lenient": true,
+            "phpstan/extension-installer": true,
+            "simplesamlphp/composer-module-installer": false,
+            "simplesamlphp/composer-xmlprovider-installer": false,
+            "zaporylie/composer-drupal-optimizations": true
+        }
+    },
+    "extra": {
+        "drupal-lenient": {
+            "allowed-list": [
+                "drupal/coc_forms_auto_export",
+                "drupal/webform_node_element"
+            ]
         }
     }
 }

scripts/base

@@ -77,6 +77,12 @@ setup() {
   compose down --remove-orphans
   compose pull
   compose up --detach --remove-orphans --wait
+
+  COMPOSER=composer.lenient.json composer init --no-interaction
+  COMPOSER=composer.lenient.json composer config --no-plugins allow-plugins.mglaman/composer-drupal-lenient true
+  COMPOSER=composer.lenient.json composer require mglaman/composer-drupal-lenient
+  # COMPOSER=composer.lenient.json rm composer.lenient.*
+
   # Allow all plugins to run.
   composer --no-plugins config allow-plugins true