Skip to content

Commit 2e3b4b2

Browse files
authored
Merge pull request #54 from shochdoerfer/feature/php8.1
Allow the plugin to run with PHP 8.1
2 parents 4532d7d + 8ba5a7d commit 2e3b4b2

File tree

5 files changed

+19
-6916
lines changed

5 files changed

+19
-6916
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,11 @@ jobs:
1111
strategy:
1212
matrix:
1313
operating-system: ['ubuntu-latest']
14-
php-versions: ['7.4', '8.0']
15-
composer-prefer-lowest: [false]
14+
php-versions: ['7.4', '8.0', '8.1']
1615
coveralls: [false]
1716
include:
1817
- operating-system: 'ubuntu-latest'
19-
php-versions: '7.4'
20-
composer-prefer-lowest: true
21-
coveralls: false
22-
- operating-system: 'ubuntu-latest'
23-
php-versions: '7.4'
18+
php-versions: '8.1'
2419
composer-prefer-lowest: false
2520
coveralls: true
2621
steps:
@@ -34,24 +29,9 @@ jobs:
3429
tools: composer:v2
3530
coverage: xdebug
3631

37-
- name: Install Composer dependencies (PHP 7.4)
38-
if: matrix.php-versions == '7.4'
32+
- name: Install Composer dependencies
3933
run: composer install
4034

41-
- name: Install Composer dependencies (PHP 8.0)
42-
if: matrix.php-versions == '8.0'
43-
run: |
44-
composer update ocramius/package-versions
45-
composer install
46-
47-
- name: Install lowest CaptainHookPHP version
48-
if: matrix.composer-prefer-lowest == true
49-
run: |
50-
composer remove --dev captainhook/plugin-composer bitexpert/captainhook-infection
51-
composer remove captainhook/captainhook
52-
composer require --prefer-lowest captainhook/captainhook
53-
composer require --prefer-lowest --dev captainhook/plugin-composer bitexpert/captainhook-infection
54-
5535
- name: Composer license check
5636
run: composer check-license
5737

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.phpunit.result.cache
22
clover.xml
33
infection.log
4+
composer.lock
45
/vendor

composer.json

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111
}
1212
],
1313
"require": {
14-
"php": "^7.4.0|^8.0.0",
15-
"captainhook/captainhook": "^5.10.4"
14+
"php": "^7.4.0|^8.0.0|^8.1.0",
15+
"captainhook/captainhook": "^5.10.8"
1616
},
1717
"require-dev": {
1818
"bitexpert/captainhook-infection": "^0.5.0",
19-
"captainhook/plugin-composer": "^5.3.2",
19+
"captainhook/plugin-composer": "^5.3.3",
2020
"infection/infection": "^0.21.5",
2121
"madewithlove/license-checker": "^0.10.0",
2222
"phly/keep-a-changelog": "^2.11",
2323
"phpstan/extension-installer": "^1.1",
24-
"phpstan/phpstan": "^0.12.99",
25-
"phpstan/phpstan-phpunit": "^0.12.22",
26-
"phpstan/phpstan-strict-rules": "^0.12.9",
27-
"phpunit/phpunit": "^9.5.10",
24+
"phpstan/phpstan": "^1.5.4",
25+
"phpstan/phpstan-phpunit": "^1.1.0",
26+
"phpstan/phpstan-strict-rules": "^1.1.0",
27+
"phpunit/phpunit": "^9.5.20",
2828
"roave/security-advisories": "dev-latest",
29-
"squizlabs/php_codesniffer": "^3.6.1"
29+
"squizlabs/php_codesniffer": "^3.6.2"
3030
},
3131
"autoload": {
3232
"psr-4": {
@@ -52,6 +52,11 @@
5252
"coverage": "vendor/bin/phpunit --coverage-clover clover.xml"
5353
},
5454
"config": {
55-
"sort-packages": true
55+
"sort-packages": true,
56+
"allow-plugins": {
57+
"infection/extension-installer": true,
58+
"captainhook/plugin-composer": true,
59+
"phpstan/extension-installer": true
60+
}
5661
}
5762
}

0 commit comments

Comments
 (0)