From 8b81065c58a7bd8cb7c2bba41ed990935812817c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=B6ller?= <am@localheinz.com>
Date: Sun, 30 Aug 2020 17:42:24 +0200
Subject: [PATCH] Enhancement: Synchronize with ergebnis/php-library-template

---
 .github/workflows/integrate.yaml | 9 +++------
 Makefile                         | 3 +--
 test/Integration/phpunit.xml     | 1 +
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index f9b0ab4b..55933750 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -324,7 +324,7 @@ jobs:
       - name: "Install PHP with extensions"
         uses: "shivammathur/setup-php@2.4.3"
         with:
-          coverage: "xdebug"
+          coverage: "pcov"
           extensions: "${{ env.PHP_EXTENSIONS }}"
           ini-values: "${{ env.PHP_INI_VALUES }}"
           php-version: "${{ matrix.php-version }}"
@@ -347,11 +347,8 @@ jobs:
         with:
           dependencies: "${{ matrix.dependencies }}"
 
-      - name: "Dump Xdebug filter with phpunit/phpunit"
-        run: "vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --dump-xdebug-filter=.build/phpunit/xdebug-filter.php"
-
-      - name: "Collect code coverage with Xdebug and phpunit/phpunit"
-        run: "vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-clover=.build/logs/clover.xml --prepend=.build/phpunit/xdebug-filter.php"
+      - name: "Collect code coverage with pcov and phpunit/phpunit"
+        run: "vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-clover=.build/logs/clover.xml"
 
       - name: "Send code coverage report to Codecov.io"
         env:
diff --git a/Makefile b/Makefile
index 80383bb6..f303e200 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,7 @@ it: coding-standards static-code-analysis tests ## Runs the coding-standards, st
 .PHONY: code-coverage
 code-coverage: vendor ## Collects coverage from running integration tests with phpunit/phpunit
 	mkdir -p .build/phpunit
-	vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --dump-xdebug-filter=.build/phpunit/xdebug-filter.php
-	vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-text --prepend=.build/phpunit/xdebug-filter.php
+	vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-text
 
 .PHONY: coding-standards
 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
diff --git a/test/Integration/phpunit.xml b/test/Integration/phpunit.xml
index a8e6125e..40143c4c 100644
--- a/test/Integration/phpunit.xml
+++ b/test/Integration/phpunit.xml
@@ -29,6 +29,7 @@
     </testsuites>
     <php>
         <env name="COMPOSER_ALLOW_XDEBUG" value="1"/>
+        <ini name="memory_limit" value="-1"/>
     </php>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true" processUncoveredFilesFromWhitelist="true">