Skip to content

Commit d4c774c

Browse files
authored
Merge pull request #538 from ergebnis/feature/synchronize
Enhancement: Synchronize with ergebnis/php-library-template
2 parents 1269dbe + 8b81065 commit d4c774c

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/integrate.yaml

+3-6
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ jobs:
324324
- name: "Install PHP with extensions"
325325
uses: "shivammathur/[email protected]"
326326
with:
327-
coverage: "xdebug"
327+
coverage: "pcov"
328328
extensions: "${{ env.PHP_EXTENSIONS }}"
329329
ini-values: "${{ env.PHP_INI_VALUES }}"
330330
php-version: "${{ matrix.php-version }}"
@@ -347,11 +347,8 @@ jobs:
347347
with:
348348
dependencies: "${{ matrix.dependencies }}"
349349

350-
- name: "Dump Xdebug filter with phpunit/phpunit"
351-
run: "vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --dump-xdebug-filter=.build/phpunit/xdebug-filter.php"
352-
353-
- name: "Collect code coverage with Xdebug and phpunit/phpunit"
354-
run: "vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-clover=.build/logs/clover.xml --prepend=.build/phpunit/xdebug-filter.php"
350+
- name: "Collect code coverage with pcov and phpunit/phpunit"
351+
run: "vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-clover=.build/logs/clover.xml"
355352

356353
- name: "Send code coverage report to Codecov.io"
357354
env:

Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ it: coding-standards static-code-analysis tests ## Runs the coding-standards, st
66
.PHONY: code-coverage
77
code-coverage: vendor ## Collects coverage from running integration tests with phpunit/phpunit
88
mkdir -p .build/phpunit
9-
vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --dump-xdebug-filter=.build/phpunit/xdebug-filter.php
10-
vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-text --prepend=.build/phpunit/xdebug-filter.php
9+
vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-text
1110

1211
.PHONY: coding-standards
1312
coding-standards: vendor ## Normalizes composer.json with ergebnis/composer-normalize, lints YAML files with yamllint and fixes code style issues with friendsofphp/php-cs-fixer

test/Integration/phpunit.xml

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
</testsuites>
3030
<php>
3131
<env name="COMPOSER_ALLOW_XDEBUG" value="1"/>
32+
<ini name="memory_limit" value="-1"/>
3233
</php>
3334
<filter>
3435
<whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">

0 commit comments

Comments
 (0)