From 4011f1f357bdd89793d13b1f8536625eb9d3cce7 Mon Sep 17 00:00:00 2001 From: byrond Date: Wed, 14 Aug 2024 17:40:06 -0400 Subject: [PATCH] Drupal 11 compatibility (#309) * update symfony constraint to allow 7.0+ * use former constraint notation * update composer.lock content-hash * update CI to use Drupal 10 * update to php 8.2 on CI * use correct docker image name * use correct docker image name, for real * back to php 7.3 * try apt instead of apt-get * use libjpeg-dev for ubuntu container on CI * use shell environment when running docker-php-ext-install on CI * gd is built into PHP of the new Docker image * use new php.ini file on CI * php memory limit already disabled in docker image * xdebug is not installed in the docker container on CI * update to php 8.2 on CI * revert CI config changes * pin to ctools version that supported D8 * pin to ctools version that supported D8 (use tag) * allow the composer-patches plugin during AppVeyor job * fix composer project directory in appveyor script * ignore platform reqs when running composer install on appveyor * use --no-interaction during composer install on appveyor * enable composer/installers plugin on appveyor * allow the rest (hopefully) of the composer plugins on appveyor * remove allow for missing composer plugin on appveyor * remove allow for missing composer plugin on appveyor * fix composer config command on appveyor * allow composer plugins on appveyor based on local install * allow missing composer config value * change back to appveyor build folder after composer install --- .circleci/config.yml | 2 +- appveyor.yml | 11 ++++++++++- composer.json | 4 ++-- composer.lock | 6 +++--- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c81f2af..3b5cc56 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -146,7 +146,7 @@ jobs: - global-require - create-drupal-project - require-contrib: - project: drupal/ctools:3.x-dev + project: drupal/ctools:3.9 - run: name: Run against a module command: | diff --git a/appveyor.yml b/appveyor.yml index 3e8cc85..1735543 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,7 +21,16 @@ install: - refreshenv - SET | more - composer install --no-interaction --no-progress --no-suggest --prefer-dist - - set COMPOSER_MEMORY_LIMIT=-1&& composer create-project drupal-composer/drupal-project:8.x-dev %APPVEYOR_BUILD_FOLDER%\..\drupal --no-interaction --prefer-dist --ignore-platform-reqs + - set COMPOSER_MEMORY_LIMIT=-1&& composer create-project drupal-composer/drupal-project:8.x-dev %APPVEYOR_BUILD_FOLDER%\..\drupal --no-interaction --prefer-dist --ignore-platform-reqs --no-install + - cd %APPVEYOR_BUILD_FOLDER%\..\drupal + - composer config --no-plugins allow-plugins.cweagans/composer-patches true + - composer config --no-plugins allow-plugins.composer/installers true + - composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true + - composer config --no-plugins allow-plugins.zaporylie/composer-drupal-optimizations true + - composer config --no-plugins allow-plugins.drupal/console-extend-plugin true + - composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true + - set COMPOSER_MEMORY_LIMIT=-1&& composer install --no-interaction --ignore-platform-req=ext-gd + - cd %APPVEYOR_BUILD_FOLDER% build: off test_script: - php drupal-check --version diff --git a/composer.json b/composer.json index 2ee620a..2f730ba 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ "mglaman/phpstan-drupal": "^1.0.0", "nette/neon": "^3.1", "phpstan/phpstan-deprecation-rules": "^1.0.0", - "symfony/console": "~3.4.5 || ^4.2|| ^5.0 || ^6.0", - "symfony/process": "~3.4.5 || ^4.2|| ^5.0 || ^6.0", + "symfony/console": "~3.4.5 || ^4.2|| ^5.0 || ^6.0 || ^7.0", + "symfony/process": "~3.4.5 || ^4.2|| ^5.0 || ^6.0 || ^7.0", "webflo/drupal-finder": "^1.1" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 99648f7..2f10a34 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2da033108001e4ce5752213f8d22664a", + "content-hash": "97b897ccfb6367d07992cecaea395ee5", "packages": [ { "name": "composer/pcre", @@ -1857,12 +1857,12 @@ "version": "3.7.1", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", "shasum": "" },