Skip to content

Commit 47ac97f

Browse files
committed
Updated to async test utilities 2.0 first alpha
1 parent 629a1af commit 47ac97f

File tree

5 files changed

+135
-131
lines changed

5 files changed

+135
-131
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Continuous Integration
22
on:
33
push:
44
pull_request:
5-
schedule:
6-
- cron: '0 0 * * 0'
75
jobs:
86
composer-install:
97
strategy:
@@ -12,7 +10,7 @@ jobs:
1210
composer: [lowest, current, highest]
1311
runs-on: ubuntu-latest
1412
container:
15-
image: wyrihaximusnet/php:${{ matrix.php }}-zts-alpine3.11-dev-root
13+
image: wyrihaximusnet/php:${{ matrix.php }}-zts-alpine3.10-dev-root
1614
steps:
1715
- uses: actions/checkout@v1
1816
- name: Cache composer packages
@@ -34,11 +32,11 @@ jobs:
3432
matrix:
3533
php: [7.4]
3634
composer: [lowest, current, highest]
37-
qa: [lint, cs, stan, psalm, composer-require-checker, composer-unused]
35+
qa: [lint, cs, stan, psalm, unit-ci, infection, composer-require-checker, composer-unused]
3836
needs: composer-install
3937
runs-on: ubuntu-latest
4038
container:
41-
image: wyrihaximusnet/php:${{ matrix.php }}-zts-alpine3.11-dev-root
39+
image: wyrihaximusnet/php:${{ matrix.php }}-zts-alpine3.10-dev-root
4240
steps:
4341
- uses: actions/checkout@v1
4442
- name: Cache composer packages

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,14 @@ psalm:
3232
unit:
3333
$(DOCKER_RUN) vendor/bin/phpunit --colors=always -c phpunit.xml.dist --coverage-text --coverage-html covHtml --coverage-clover ./build/logs/clover.xml
3434

35+
unit-ci: unit
36+
if [ -f ./build/logs/clover.xml ]; then wget https://scrutinizer-ci.com/ocular.phar && sleep 3 && php ocular.phar code-coverage:upload --format=php-clover ./build/logs/clover.xml; fi
37+
3538
infection:
3639
$(DOCKER_RUN) vendor/bin/infection --ansi --min-msi=100 --min-covered-msi=100 --threads=$(nproc)
3740

3841
composer-require-checker:
39-
$(DOCKER_RUN) vendor/bin/composer-require-checker --ignore-parse-errors --ansi -vvv
42+
$(DOCKER_RUN) vendor/bin/composer-require-checker --ignore-parse-errors --ansi -vvv --config-file=composer-require-checker.json
4043

4144
composer-unused:
4245
$(DOCKER_RUN) composer unused --ansi

composer-require-checker.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"symbol-whitelist" : [
3+
"null", "true", "false",
4+
"static", "self", "parent",
5+
"array", "string", "int", "float", "bool", "iterable", "callable", "void", "object",
6+
"WyriHaximus\\Constants\\ComposerAutoloader\\LOCATION"
7+
],
8+
"php-core-extensions" : [
9+
"Core",
10+
"date",
11+
"pcre",
12+
"Phar",
13+
"Reflection",
14+
"SPL",
15+
"standard"
16+
],
17+
"scan-files" : []
18+
}

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@
1717
"react/promise": "^2.7"
1818
},
1919
"require-dev": {
20-
"thecodingmachine/safe": "1.0.0 as 0.1.17",
21-
"wyrihaximus/async-test-utilities": "dev-update-to-test-utilities-2.0 as 1.999.999",
20+
"wyrihaximus/async-test-utilities": "^2.0.0-alpha1",
2221
"wyrihaximus/ticking-promise": "^1.6"
2322
},
2423
"config": {

0 commit comments

Comments
 (0)