Skip to content

Commit 3221d11

Browse files
committed
Improve
1 parent f53846b commit 3221d11

File tree

3 files changed

+23
-25
lines changed

3 files changed

+23
-25
lines changed

.github/workflows/CI.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313

1414
env:
1515
# Cache params
16-
CACHE_VERSION: 2022061801 # To be able to create a new cache (YYYYMMDDXX)
16+
CACHE_VERSION: 2022061901 # To be able to create a new cache (YYYYMMDDXX)
1717
CI: 'true'
1818
COVERAGE_OUTPUT_STYLE: clover
1919
TEST_OUTPUT_STYLE: 'pretty'
@@ -44,6 +44,7 @@ jobs:
4444
runs-on: ubuntu-latest
4545
strategy:
4646
fail-fast: true
47+
max-parallel: 4
4748
matrix:
4849
php-version:
4950
- '7.2'
@@ -105,6 +106,7 @@ jobs:
105106
runs-on: ubuntu-latest
106107
strategy:
107108
fail-fast: true
109+
max-parallel: 4
108110
matrix:
109111
php-version:
110112
- '7.2'
@@ -164,8 +166,11 @@ jobs:
164166
name: Nightly / PHP ${{ matrix.php-version }} / Symfony ${{ matrix.symfony-version }}
165167
needs: [ functional-tests ]
166168
runs-on: ubuntu-latest
169+
env:
170+
COMPOSER_OPTIONS: '--optimize-autoloader --ignore-platform-req=php+' # Ignore upper PHP bound requirement
167171
strategy:
168-
fail-fast: true
172+
fail-fast: false
173+
max-parallel: 2
169174
matrix:
170175
exclude:
171176
- php-version: '8.1' # Already done above

composer.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
},
3232
"require": {
3333
"php": "^7.2 || ^8.0",
34-
"yoanm/jsonrpc-server-sdk": "^3.0",
35-
"symfony/http-foundation": "^4.4 || ^5.4",
36-
"symfony/http-kernel": "^4.4 || ^5.4",
34+
"psr/container": "^1.0",
3735
"symfony/config": "^4.4 || ^5.4",
3836
"symfony/dependency-injection": "^4.4 || ^5.4",
3937
"symfony/event-dispatcher": "^4.4 || ^5.4",
4038
"symfony/event-dispatcher-contracts": "^1.0 || ^2.0",
41-
"psr/container": "^1.0"
39+
"symfony/http-foundation": "^5.4",
40+
"symfony/http-kernel": "^5.4",
41+
"yoanm/jsonrpc-server-sdk": "^3.0"
4242
},
4343
"require-dev": {
4444
"behat/behat": "~3.0",
@@ -51,5 +51,8 @@
5151
"yoanm/php-unit-extended": "~1.0",
5252
"phpspec/prophecy-phpunit": "^1.0 || ^2.0",
5353
"dvdoug/behat-code-coverage": "^5.0"
54+
},
55+
"config": {
56+
"sort-packages": true
5457
}
5558
}

phpunit.xml.dist

+9-19
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,35 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
4-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
3+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
64
backupStaticAttributes="false"
75
colors="true"
86
processIsolation="false"
9-
107
stopOnRisky="true"
118
stopOnError="true"
129
stopOnFailure="true"
13-
1410
convertErrorsToExceptions="true"
1511
convertNoticesToExceptions="true"
1612
convertWarningsToExceptions="true"
17-
1813
beStrictAboutOutputDuringTests="true"
1914
beStrictAboutTestsThatDoNotTestAnything="true"
2015
beStrictAboutChangesToGlobalState="true"
2116
backupGlobals="true"
22-
2317
forceCoversAnnotation="true"
24-
25-
bootstrap="vendor/autoload.php"
26-
>
18+
bootstrap="vendor/autoload.php">
19+
<coverage>
20+
<include>
21+
<directory>src</directory>
22+
</include>
23+
</coverage>
2724
<listeners>
2825
<listener class="Yoanm\PhpUnitExtended\Listener\YoanmTestsStrategyListener"/>
2926
</listeners>
30-
3127
<testsuites>
3228
<testsuite name="functional">
33-
<directory>tests/Functional</directory>
29+
<directory>tests/Functional/*</directory>
3430
</testsuite>
3531
<testsuite name="technical">
36-
<directory>tests/Technical</directory>
32+
<directory>tests/Technical/*</directory>
3733
</testsuite>
3834
</testsuites>
39-
40-
<filter>
41-
<whitelist>
42-
<directory>src</directory>
43-
</whitelist>
44-
</filter>
4535
</phpunit>

0 commit comments

Comments
 (0)