Skip to content

Commit 311f4ab

Browse files
committed
Fix up move to php-collective
1 parent 898483b commit 311f4ab

File tree

5 files changed

+26
-125
lines changed

5 files changed

+26
-125
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ charset = utf-8
1212

1313
[*.bat]
1414
end_of_line = crlf
15+
16+
[*.neon]
17+
indent_style = tab

.github/workflows/ci.yml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@ on: [push, pull_request]
55
jobs:
66
testsuite:
77
name: Unittests
8-
runs-on: ubuntu-20.04
8+
runs-on: ubuntu-22.04
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
php-version: ['7.4', '8.2']
12+
php-version: ['8.1', '8.3']
1313

1414
steps:
1515
- uses: actions/checkout@v2
1616

1717
- name: Setup PHP
1818
uses: shivammathur/setup-php@v2
1919
with:
20-
php-version: '7.4'
20+
php-version: '8.1'
2121
extensions: mbstring, json, fileinfo
2222
tools: pecl
2323
coverage: pcov
@@ -30,44 +30,38 @@ jobs:
3030
composer install
3131
fi
3232
33-
- name: Phive install
34-
run: php config/composer_phive.php
35-
3633
- name: Run PHPUnit
3734
run: |
38-
if [[ ${{ matrix.php-version }} == '7.4' ]]; then
39-
bin/phpunit --coverage-clover=coverage.xml
35+
if [[ ${{ matrix.php-version }} == '8.1' ]]; then
36+
vendor/bin/phpunit --coverage-clover=coverage.xml
4037
else
41-
bin/phpunit
38+
vendor/bin/phpunit
4239
fi
4340
4441
- name: Code Coverage Report
45-
if: success() && matrix.php-version == '7.4'
46-
uses: codecov/codecov-action@v1
42+
if: success() && matrix.php-version == '8.1'
43+
uses: codecov/codecov-action@v3
4744

4845
cs-stan:
4946
name: Coding Standard & Static Analysis
50-
runs-on: ubuntu-20.04
47+
runs-on: ubuntu-22.04
5148

5249
steps:
53-
- uses: actions/checkout@v2
50+
- uses: actions/checkout@v3
5451

5552
- name: Setup PHP
5653
uses: shivammathur/setup-php@v2
5754
with:
58-
php-version: '7.4'
55+
php-version: '8.1'
5956
extensions: mbstring, json, fileinfo
6057
coverage: none
6158
tools: pecl
6259

6360
- name: Composer install
64-
run: composer update --prefer-lowest --prefer-stable
65-
66-
- name: Phive install
67-
run: php config/composer_phive.php
61+
run: composer update --prefer-stable
6862

6963
- name: Run phpstan
70-
run: bin/phpstan --error-format=github
64+
run: vendor/bin/phpstan --error-format=github
7165

7266
- name: Run phpcs
73-
run: bin/phpcs --report=checkstyle
67+
run: vendor/bin/phpcs --report=checkstyle

composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,14 @@
88
{
99
"name": "Florian Krämer",
1010
"role": "Maintainer"
11+
},
12+
{
13+
"name": "Mark Scherer",
14+
"role": "Maintainer"
1115
}
1216
],
1317
"require": {
14-
"php": ">=7.4",
18+
"php": ">=8.1",
1519
"intervention/image": "^2.5",
1620
"spatie/image-optimizer": "^1.2",
1721
"ext-json": "*"

contributing.md

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

phpstan.neon

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
parameters:
2-
level: 6
3-
paths:
4-
- src/
5-
checkGenericClassInNonGenericObjectType: false
2+
level: 6
3+
paths:
4+
- src/
5+
checkGenericClassInNonGenericObjectType: false

0 commit comments

Comments
 (0)