Skip to content

Commit 47788c4

Browse files
authored
Merge pull request #288 from jhedstrom/287-php-versions-and-tests
287: Remove unsupported php and fix tests Closes #287.
2 parents afa9f71 + 437132a commit 47788c4

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ jobs:
77
fail-fast: false
88
matrix:
99
include:
10-
- php_version: "7.4"
11-
drupal_version: "9"
1210
- php_version: "8.2"
1311
drupal_version: "10"
1412
- php_version: "8.3"

CONTRIBUTING.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,32 @@ Features and bug fixes are welcome! First-time contributors can jump in with the
77
Testing is performed automatically in Github Actions when a PR is submitted. To execute tests locally before submitting a PR, you'll need [Docker and Docker Compose](https://docs.docker.com/engine/install/).
88

99
Configure your test environment:
10+
1011
```
11-
export PHP_VERSION=8.1
12-
export DRUPAL_VERSION=10
12+
export PHP_VERSION=8.3
13+
export DRUPAL_VERSION=11
1314
export DOCKER_USER_ID=${UID}
1415
```
1516

1617
Prepare environment for testing:
18+
1719
```
18-
docker-compose up -d
19-
docker-compose exec -T php composer self-update
20-
docker-compose exec -u ${DOCKER_USER_ID} -T php composer require --no-interaction --dev --no-update drupal/core:^${DRUPAL_VERSION}
21-
docker-compose exec -T php composer install
20+
docker compose up -d
21+
docker compose exec -T php composer self-update
22+
docker compose exec -u ${DOCKER_USER_ID} -T php composer require --no-interaction --dev --no-update drupal/core:^${DRUPAL_VERSION}
23+
docker compose exec -T php composer install
2224
```
2325

2426
Execute all tests:
27+
2528
```
26-
docker-compose exec -T php composer test
29+
docker compose exec -T php composer test
2730
```
2831

2932
Execute specific tests, eg just PHPUnit's Drupal7FieldHandlerTest:
33+
3034
```
31-
docker-compose exec -T php phpunit --filter Drupal7FieldHandlerTest
35+
docker compose exec -T php phpunit --filter Drupal7FieldHandlerTest
3236
```
3337

3438
- Check the changes from `composer require` are not included in your submitted PR.

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
],
1414
"require": {
1515
"php": ">=7.4",
16-
"symfony/process": "~2.5 || ~3.0 || ~4.4 || ^6 || ^7.1",
16+
"symfony/process": "~2.5 || ~3.0 || ~4.4 || ^6 || ^7",
1717
"symfony/dependency-injection": "~2.6 || ~3.0 || ~4.4 || ^6 || ^7.1",
1818
"drupal/core-utility": "^8.4 || ^9 || ^10 || ^11"
1919
},
2020
"require-dev": {
2121
"composer/installers": "^2.1",
2222
"drupal/coder": "~8.3.0",
23-
"phpspec/phpspec": "~2.0 || ~4.0 || ~6.1 || dev-main",
23+
"phpspec/phpspec": "~2.0 || ~4.0 || ~6.1 || ~7.5 || dev-main",
2424
"phpunit/phpunit": "~6.0 || ~7.0 || ^9 || ^10",
2525
"mockery/mockery": "^1.5",
2626
"drupal/core-composer-scaffold": "^8.4 || ^9 || ^10 || ^11",
@@ -29,7 +29,7 @@
2929
"drush-ops/behat-drush-endpoint": "*",
3030
"php-parallel-lint/php-parallel-lint": "^1.0",
3131
"dms/phpunit-arraysubset-asserts": "^0.4.0 || ^0.5.0",
32-
"palantirnet/drupal-rector": "^0.13",
32+
"palantirnet/drupal-rector": "^0.20",
3333
"symfony/phpunit-bridge": "^6.1"
3434
},
3535
"conflict": {

0 commit comments

Comments
 (0)