Skip to content

Commit 7ac1030

Browse files
authored
Merge pull request #22 from infection/codeception-5-support
Drop Codeception 4 support, php < 8.0 and symfony < 5.0
2 parents 9cccc6c + baf1b4e commit 7ac1030

File tree

18 files changed

+1200
-1567
lines changed

18 files changed

+1200
-1567
lines changed

.github/workflows/ci.yaml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,15 @@ jobs:
1818

1919
strategy:
2020
matrix:
21-
php-version: ['7.4', '8.0', '8.1']
22-
coverage-driver: [pcov]
23-
symfony-require: ['^4', '^5', '^6']
24-
exclude:
25-
- symfony-require: "^6"
26-
php-version: "7.4"
21+
php-version: [ '8.0', '8.1', '8.2' ]
22+
coverage-driver: [ pcov ]
23+
symfony-require: [ '^5', '^6' ]
2724

2825
name: CI with PHP ${{ matrix.php-version }}, using ${{ matrix.coverage-driver }}, with Symfony ${{ matrix.symfony-require }}
2926

3027
steps:
3128
- name: Checkout
32-
uses: actions/checkout@v2
29+
uses: actions/checkout@v4
3330

3431
- name: Setup PHP
3532
uses: shivammathur/setup-php@v2
@@ -52,7 +49,7 @@ jobs:
5249
composer-${{ runner.os }}-${{ matrix.php-version }}-
5350
composer-${{ runner.os }}-
5451
composer-
55-
52+
5653
- name: Configure Symfony Flex
5754
run: composer config extra.symfony.require ${{ matrix.symfony-require }}
5855

.github/workflows/cs.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
operating-system: [ubuntu-latest]
20-
php-version: ['7.4']
21-
check: ['cs', 'static-analyze']
19+
operating-system: [ ubuntu-latest ]
20+
php-version: [ '8.0' ]
21+
check: [ 'cs', 'static-analyze' ]
2222

2323
name: Coding Standards on PHP ${{ matrix.php-version }}
2424

2525
steps:
2626
- name: Checkout
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v4
2828

2929
- name: Setup PHP
3030
uses: shivammathur/setup-php@v2

.github/workflows/e2e-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
php-version: [ '7.4', '8.0', '8.1' ]
19+
php-version: [ '8.0', '8.1', '8.2' ]
2020
coverage-driver: [ pcov ]
2121

2222
name: CI with PHP ${{ matrix.php-version }}, using ${{ matrix.coverage-driver }}

.github/workflows/mt.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
operating-system: [ubuntu-latest]
20-
php-version: ['7.4']
21-
coverage-driver: [pcov]
19+
operating-system: [ ubuntu-latest ]
20+
php-version: [ '8.1' ]
21+
coverage-driver: [ pcov ]
2222

2323
name: Mutation testing with PHP ${{ matrix.php-version }}, using ${{ matrix.coverage-driver }}
2424

2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v4
2828

2929
- name: Setup PHP
3030
uses: shivammathur/setup-php@v2

.php-cs-fixer.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
use PhpCsFixer\Config;
3737
use PhpCsFixer\Finder;
3838

39-
$header = trim(sprintf(
39+
$header = \trim(\sprintf(
4040
'This code is licensed under the BSD 3-Clause License.%s',
41-
substr(
42-
file_get_contents('LICENSE'),
43-
strlen('BSD 3-Clause License')
41+
\substr(
42+
\file_get_contents('LICENSE'),
43+
\strlen('BSD 3-Clause License')
4444
)
4545
));
4646

@@ -85,7 +85,8 @@
8585
'yield',
8686
],
8787
],
88-
'compact_nullable_typehint' => true,
88+
'blank_line_between_import_groups' => false,
89+
'compact_nullable_type_declaration' => true,
8990
'concat_space' => ['spacing' => 'one'],
9091
'fully_qualified_strict_types' => true,
9192
'global_namespace_import' => [

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ JOBS=$(shell nproc)
88

99
# PHP CS Fixer
1010
PHP_CS_FIXER=./.tools/php-cs-fixer
11-
PHP_CS_FIXER_URL="https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.2.1/php-cs-fixer.phar"
11+
PHP_CS_FIXER_URL="https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.35.1/php-cs-fixer.phar"
1212

1313
# PHPUnit
1414
PHPUNIT=vendor/bin/phpunit
@@ -28,9 +28,9 @@ COMPOSER=$(PHP) $(shell which composer)
2828

2929
# Infection
3030
INFECTION=./.tools/infection.phar
31-
INFECTION_URL="https://github.com/infection/infection/releases/download/0.24.0/infection.phar"
32-
MIN_MSI=87
33-
MIN_COVERED_MSI=99
31+
INFECTION_URL="https://github.com/infection/infection/releases/download/0.27.4/infection.phar"
32+
MIN_MSI=70
33+
MIN_COVERED_MSI=76
3434
INFECTION_ARGS=--min-msi=$(MIN_MSI) --min-covered-msi=$(MIN_COVERED_MSI) --threads=$(JOBS) --log-verbosity=none --no-interaction --no-progress --show-mutations
3535

3636
all: test

composer.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@
2929
}
3030
},
3131
"require": {
32-
"php": "^7.4 || ^8.0",
32+
"php": "^8.0",
3333
"infection/abstract-testframework-adapter": "^0.5.0",
3434
"infection/include-interceptor": "^0.2.0",
35-
"symfony/filesystem": "^4.4 || ^5.0 || ^6.0",
36-
"symfony/process": "^4.4 || ^5.0 || ^6.0",
37-
"symfony/yaml": "^4.4 || ^5.0 || ^6.0"
35+
"symfony/filesystem": "^5.0 || ^6.0",
36+
"symfony/process": "^5.0 || ^6.0",
37+
"symfony/yaml": "^5.0 || ^6.0"
3838
},
3939
"extra": {
4040
"infection": {
@@ -44,15 +44,15 @@
4444
"require-dev": {
4545
"php-coveralls/php-coveralls": "^2.5",
4646
"phpstan/extension-installer": "^1.1",
47-
"phpstan/phpstan": "^0.12.70",
48-
"phpstan/phpstan-phpunit": "^0.12.17",
49-
"phpstan/phpstan-strict-rules": "^0.12.9",
50-
"phpstan/phpstan-webmozart-assert": "^0.12.9",
47+
"phpstan/phpstan": "^1.10",
48+
"phpstan/phpstan-phpunit": "^1.3",
49+
"phpstan/phpstan-strict-rules": "^1.5",
50+
"phpstan/phpstan-webmozart-assert": "^1.2",
5151
"phpunit/phpunit": "^9.5",
5252
"thecodingmachine/safe": "^1.3",
53-
"vimeo/psalm": "^4.12"
53+
"vimeo/psalm": "^5.15"
5454
},
5555
"conflict": {
56-
"codeception/codeception": "<4.1.9"
56+
"codeception/codeception": "<5.0.0"
5757
}
5858
}

0 commit comments

Comments
 (0)