Skip to content

Commit ff6076a

Browse files
authored
Update circleci config (#25)
* Update circleci config * Update phpunit and phpcs * Add conflict for older php_codesniffer * Set min drupal/coder * Update version of dbal * Update min php version
1 parent 3406247 commit ff6076a

File tree

8 files changed

+1534
-314
lines changed

8 files changed

+1534
-314
lines changed

.circleci/config.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
version: 2.1
2+
3+
executors:
4+
php74:
5+
docker:
6+
- image: skpr/php-cli:7.4-1.x
7+
php80:
8+
docker:
9+
- image: skpr/php-cli:8.0-1.x
10+
11+
workflows:
12+
build:
13+
jobs:
14+
- build:
15+
matrix:
16+
parameters:
17+
php: ["php74", "php80"]
18+
composer-opts: ["", "--prefer-lowest"]
19+
20+
jobs:
21+
build:
22+
parameters:
23+
php:
24+
type: executor
25+
composer-opts:
26+
type: string
27+
executor: << parameters.php >>
28+
working_directory: /data
29+
steps:
30+
- checkout
31+
- run: composer2 update --prefer-dist --no-progress --no-suggest --no-interaction --optimize-autoloader << parameters.composer-opts >>
32+
- run: ./bin/phpcs --colors --report=full --runtime-set testVersion 8.0-
33+
- run: mkdir -p build/phpunit
34+
- run: ./bin/phpunit --log-junit build/phpunit/results.xml
35+
- store_test_results:
36+
path: build

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/bin/
22
/vendor/
33
*.sqlite
4+
.phpunit.result.cache

Makefile

Lines changed: 0 additions & 18 deletions
This file was deleted.

composer.json

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "previousnext/nested-set",
33
"description": "A PHP Doctrine DBAL implementation for Nested Sets.",
44
"type": "library",
5-
"license": "GPL-2.0+",
5+
"license": "GPL-2.0-or-later",
66
"authors": [
77
{
88
"name": "Kim Pepper",
@@ -12,12 +12,16 @@
1212
"minimum-stability": "dev",
1313
"prefer-stable": true,
1414
"require": {
15-
"doctrine/dbal": "~2.5"
15+
"php": "^7.3 || ^8.0",
16+
"doctrine/dbal": "^2.12.1"
1617
},
1718
"require-dev": {
18-
"phpunit/phpunit": "~4.8",
19-
"drupal/coder": "~8.0",
20-
"pear/console_table": "^1.3"
19+
"ext-pdo_sqlite": "*",
20+
"dealerdirect/phpcodesniffer-composer-installer": "^0.7",
21+
"drupal/coder": "^8.3.12",
22+
"pear/console_table": "^1.3",
23+
"phpcompatibility/php-compatibility": "^9.3",
24+
"phpunit/phpunit": "^8.5 || ^9.3"
2125
},
2226
"autoload": {
2327
"psr-4": {
@@ -30,6 +34,13 @@
3034
}
3135
},
3236
"config": {
33-
"bin-dir": "bin/"
37+
"bin-dir": "bin",
38+
"preferred-install": {
39+
"*": "dist"
40+
},
41+
"sort-packages": true
42+
},
43+
"conflict": {
44+
"squizlabs/php_codesniffer": "<3.5.8"
3445
}
3546
}

0 commit comments

Comments
 (0)