From 7526fd3e3190c6c244babfb6668920849098920e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dezs=C5=91=20BICZ=C3=93?= Date: Mon, 8 Apr 2024 14:16:30 +0200 Subject: [PATCH] Drop Drupal <10.1 support also fix QA pipeline --- .github/workflows/tests.yml | 2 +- composer.json | 28 +++++++++++++++++----------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a7f855f..17fe323 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,7 +51,7 @@ jobs: php_image: ["wodby/drupal-php:8.1-dev"] db_image: ["wodby/mariadb:10.5"] # TODO Get version range from composer.json dynamically. - drupal_version: ["~9.4.0", "~9.5.0", "^10.0"] + drupal_version: ["^10.1"] lowest_highest: ["--prefer-lowest", ""] steps: diff --git a/composer.json b/composer.json index cd6af31..227a99f 100644 --- a/composer.json +++ b/composer.json @@ -20,18 +20,17 @@ ], "require": { "php": "~8.1.0", - "drupal/core": "^9.4 || ^10.0" + "drupal/core": "^10.1" }, "require-dev": { "bower-asset/swagger-ui": "^4.15.0", - "composer/installers": "^v2.2.0", + "composer/installers": "^2.2.0", "drupal/core-composer-scaffold": "^9.4 || ^10.0.0", - "drupal/core-dev": "^9.4 || ^10.0.0", - "drupal/core-recommended": "^9.4 || ^10.0.0", + "drupal/core-dev": "^10.1", + "drupal/core-recommended": "^10.1", "drupal/devel": "^5.1.1", "league/container": "<4.0.0 || >=4.1.1", - "pronovix/drupal-qa": "^3.11.1", - "pronovix/simple-symlink": "^3.11.1", + "pronovix/drupal-qa": "^4.2.0", "zaporylie/composer-drupal-optimizations": "^1.2" }, "repositories": [ @@ -60,13 +59,14 @@ "config": { "allow-plugins": { "composer/installers": true, - "drupal/core-composer-scaffold": true, "cweagans/composer-patches": true, - "zaporylie/composer-drupal-optimizations": true, "dealerdirect/phpcodesniffer-composer-installer": true, + "drupal/core-composer-scaffold": true, "ergebnis/composer-normalize": true, + "php-http/discovery": false, + "phpstan/extension-installer": false, "pronovix/drupal-qa": true, - "phpstan/extension-installer": false + "zaporylie/composer-drupal-optimizations": true }, "optimize-autoloader": true, "sort-packages": true, @@ -139,10 +139,16 @@ }, "scripts": { "post-install-cmd": [ - "Pronovix\\SimpleSymlink\\ScriptHandler::createSymlinks" + "@symlink-for-local-dev-env" ], "post-update-cmd": [ - "Pronovix\\SimpleSymlink\\ScriptHandler::createSymlinks" + "@symlink-for-local-dev-env" + ], + "symlink-for-local-dev-env": [ + "@php -r \"@symlink('../../..', 'build/web/modules/drupal_module');\"", + "@php -r \"@symlink('../phpcs.xml.dist', 'build/phpcs.xml.dist');\"", + "@php -r \"@symlink('../phpstan-baseline.neon', 'build/phpstan-baseline.neon');\"", + "@php -r \"@symlink('../phpstan.neon.dist', 'build/phpstan.neon.dist');\"" ] } }