Skip to content

Commit 4011f1f

Browse files
authored
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
1 parent 358c977 commit 4011f1f

File tree

4 files changed

+16
-7
lines changed

4 files changed

+16
-7
lines changed

Diff for: .circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ jobs:
146146
- global-require
147147
- create-drupal-project
148148
- require-contrib:
149-
project: drupal/ctools:3.x-dev
149+
project: drupal/ctools:3.9
150150
- run:
151151
name: Run against a module
152152
command: |

Diff for: appveyor.yml

+10-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,16 @@ install:
2121
- refreshenv
2222
- SET | more
2323
- composer install --no-interaction --no-progress --no-suggest --prefer-dist
24-
- 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
24+
- 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
25+
- cd %APPVEYOR_BUILD_FOLDER%\..\drupal
26+
- composer config --no-plugins allow-plugins.cweagans/composer-patches true
27+
- composer config --no-plugins allow-plugins.composer/installers true
28+
- composer config --no-plugins allow-plugins.drupal/core-composer-scaffold true
29+
- composer config --no-plugins allow-plugins.zaporylie/composer-drupal-optimizations true
30+
- composer config --no-plugins allow-plugins.drupal/console-extend-plugin true
31+
- composer config --no-plugins allow-plugins.dealerdirect/phpcodesniffer-composer-installer true
32+
- set COMPOSER_MEMORY_LIMIT=-1&& composer install --no-interaction --ignore-platform-req=ext-gd
33+
- cd %APPVEYOR_BUILD_FOLDER%
2534
build: off
2635
test_script:
2736
- php drupal-check --version

Diff for: composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"mglaman/phpstan-drupal": "^1.0.0",
1818
"nette/neon": "^3.1",
1919
"phpstan/phpstan-deprecation-rules": "^1.0.0",
20-
"symfony/console": "~3.4.5 || ^4.2|| ^5.0 || ^6.0",
21-
"symfony/process": "~3.4.5 || ^4.2|| ^5.0 || ^6.0",
20+
"symfony/console": "~3.4.5 || ^4.2|| ^5.0 || ^6.0 || ^7.0",
21+
"symfony/process": "~3.4.5 || ^4.2|| ^5.0 || ^6.0 || ^7.0",
2222
"webflo/drupal-finder": "^1.1"
2323
},
2424
"require-dev": {

Diff for: composer.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)