Skip to content

Commit

Permalink
Drop Drupal 8 from testing workflows (mglaman#623)
Browse files Browse the repository at this point in the history
* First stab

* Replaced/Removed some more mentions of drupal/*:^8

* Drop symfony/*:^3 support

* Raised lowest version of phpunit/phpunit to ^8.5

* Drop drush/drush:^9.6 support and add ^12
  • Loading branch information
Boegie authored Nov 9, 2023
1 parent c6c3d04 commit 0c7e48a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 17 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ commands:
parameters:
project:
type: string
default: 'drupal/recommended-project:^8.8@alpha'
default: 'drupal/recommended-project:^9.0@alpha'
steps:
- run: composer create-project << parameters.project >> /tmp/drupal --no-interaction --prefer-dist --ignore-platform-reqs
- run: composer require zaporylie/composer-drupal-optimizations:^1.1 --dev --working-dir=/tmp/drupal
Expand All @@ -41,7 +41,7 @@ commands:
name: Add as local
command: |
cd /tmp/drupal
composer require --dev drupal/core-dev:^8.8
composer require --dev drupal/core-dev:^9.0
composer config repositories.1 '{"type": "path", "url": "'${CIRCLE_WORKING_DIRECTORY}'", "options": { "symlink": false }}'
composer require --dev mglaman/phpstan-drupal "*" phpstan/extension-installer
cat composer.json
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
steps:
- start-project
- create-drupal-project:
project: 'drupal/legacy-project:^8.8'
project: 'drupal/legacy-project:^9.0'
- local-require
- run:
name: Run against a file
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
steps:
- start-project
- create-drupal-project:
project: 'drupal/legacy-project:^8@alpha'
project: 'drupal/legacy-project:^9@alpha'
- local-require
# Composer constraints prevent requiring via compser, but this helps test drupalci's phpstan build step as well.
- run:
Expand Down
7 changes: 0 additions & 7 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ jobs:
php-version:
- "7.4"
drupal:
- "^8.9"
- "^9.0"
include:
- php-version: "8.0"
Expand All @@ -65,15 +64,11 @@ jobs:
php-version: "${{ matrix.php-version }}"
tools: composer:v2
extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, gd
- name: "Downgrade dev dependencies"
run: "composer require phpunit/phpunit:6.5.14 drush/drush:~9 drupal/core-recommended:${{ matrix.drupal }} drupal/core-dev:${{ matrix.drupal }} --with-all-dependencies --dev --no-update"
if: ${{ matrix.drupal == '^8.9' }}
- name: "Upgrade to drupal/core:${{ matrix.drupal }}"
run: "composer require drupal/core-recommended:${{ matrix.drupal }} --with-all-dependencies --dev --no-update"
if: ${{ matrix.drupal == '^10.0' || matrix.drupal == '11.x-dev' }}
- name: "Add phpspec/prophecy-phpunit"
run: "composer require phpspec/prophecy-phpunit:^2 --dev --no-update"
if: ${{ matrix.drupal != '^8.9' }}
- name: "Install dependencies"
uses: "ramsey/composer-install@v2"
- name: "PHPUnit"
Expand All @@ -92,7 +87,6 @@ jobs:
php-version:
- "7.4"
drupal:
- "^8.9"
- "^9.0"
include:
- php-version: "8.0"
Expand Down Expand Up @@ -168,7 +162,6 @@ jobs:
php-version:
- "7.4"
drupal:
- "^8.9"
- "^9.0"
include:
- php-version: "8.1"
Expand Down
12 changes: 6 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,23 +11,23 @@
],
"require": {
"php": "^7.4 || ^8.0",
"symfony/finder": "~3.4.5 ||^4.2 || ^5.0 || ^6.0",
"symfony/finder": "^4.2 || ^5.0 || ^6.0",
"phpstan/phpstan": "^1.10.1",
"phpstan/phpstan-deprecation-rules": "^1.1.4",
"symfony/yaml": "~3.4.5 || ^4.2|| ^5.0 || ^6.0",
"symfony/yaml": "^4.2|| ^5.0 || ^6.0",
"webflo/drupal-finder": "^1.2"
},
"require-dev": {
"behat/mink": "^1.8",
"composer/installers": "^1.9",
"drupal/core-recommended": "^8.8@alpha || ^9.0",
"drush/drush": "^9.6 || ^10.0 || ^11",
"drupal/core-recommended": "^9.0",
"drush/drush": "^10.0 || ^11 || ^12",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-strict-rules": "^1.0",
"phpunit/phpunit": "^6.5 || ^7.5 || ^8.0 || ^9",
"phpunit/phpunit": "^8.5 || ^9",
"slevomat/coding-standard": "^7.1",
"squizlabs/php_codesniffer": "^3.3",
"symfony/phpunit-bridge": "^3.4.3 || ^4.4 || ^5.4 || ^6.0"
"symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down

0 comments on commit 0c7e48a

Please sign in to comment.