Merge pull request #373 from mglaman/coverage

Update PHPUnit config and workflow

Author: mglaman

.github/workflows/php.yml

@@ -8,6 +8,31 @@ on:
     - cron: 0 0 * * *
 
 jobs:
+  lint:
+    runs-on: "ubuntu-latest"
+    name: "Linting | PHP ${{ matrix.php-version }}"
+    strategy:
+      matrix:
+        php-version:
+          - "7.4"
+          - "8.0"
+          - "8.1"
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          coverage: "none"
+          php-version: "${{ matrix.php-version }}"
+          tools: composer:v2
+          extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, gd
+      - name: "Install dependencies"
+        run: "composer update --no-progress --prefer-dist"
+      - name: "PHPCS"
+        run: "php vendor/bin/phpcs src"
+      - name: "PHPStan"
+        run: "php vendor/bin/phpstan analyze"
   tests:
     continue-on-error: ${{ matrix.experimental }}
     runs-on: "ubuntu-latest"
@@ -33,7 +58,7 @@ jobs:
       - name: "Install PHP"
         uses: "shivammathur/setup-php@v2"
         with:
-          coverage: "none"
+          coverage: "xdebug"
           php-version: "${{ matrix.php-version }}"
           tools: composer:v2
           extensions: dom, curl, libxml, mbstring, zip, pdo, mysql, pdo_mysql, gd
@@ -48,14 +73,13 @@ jobs:
         if: ${{ matrix.drupal != '^8.9' }}
       - name: "Install dependencies"
         run: "composer update --no-progress --prefer-dist"
-      - name: "PHPCS"
-        run: "php vendor/bin/phpcs src"
-      - name: "PHPStan"
-        run: "php vendor/bin/phpstan analyze"
       - name: "PHPUnit"
         run: "php vendor/bin/phpunit --debug"
 
   build_integration:
+    needs:
+      - lint
+      - tests
     continue-on-error: ${{ matrix.experimental }}
     runs-on: "ubuntu-latest"
     name: "Build Integration | PHP ${{ matrix.php-version }} | Drupal ${{ matrix.drupal }}"
@@ -133,6 +157,9 @@ jobs:
           ./vendor/bin/phpstan analyze web/modules/contrib --no-progress || if (($? == 255)); then false; else true; fi
           COMPOSER_MEMORY_LIMIT=-1 composer remove drupal/video_embed_field drupal/slick
   build_integration_no_phpunit:
+    needs:
+      - lint
+      - tests
     continue-on-error: ${{ matrix.experimental }}
     runs-on: "ubuntu-latest"
     name: "Build Integration (No PHPUnit) | PHP ${{ matrix.php-version }} | Drupal ${{ matrix.drupal }}"

phpunit.xml

@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.5/phpunit.xsd"
-         bootstrap="vendor/autoload.php"
-         forceCoversAnnotation="false"
-         beStrictAboutCoversAnnotation="true"
-         beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
-         beStrictAboutChangesToGlobalState="true"
-         verbose="false">
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php"
+         forceCoversAnnotation="false" beStrictAboutCoversAnnotation="true" beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true" beStrictAboutChangesToGlobalState="true" verbose="false">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+        <exclude>
+            <directory>./vendor</directory>
+            <directory>./tests</directory>
+        </exclude>
+        <report>
+            <clover outputFile="clover.xml"/>
+            <text outputFile="php://stdout" showUncoveredFiles="true"/>
+        </report>
+    </coverage>
     <php>
         <ini name="error_reporting" value="32767"/>
         <ini name="memory_limit" value="-1"/>
@@ -19,17 +27,5 @@
             <directory suffix="Test.php">tests/src</directory>
         </testsuite>
     </testsuites>
-    <logging>
-        <log type="coverage-text" target="php://stdout" showUncoveredFiles="true" lowUpperBound="50" highLowerBound="80" />
-        <log type="coverage-clover" target="./clover.xml" />
-    </logging>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <directory>./vendor</directory>
-                <directory>./tests</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+    <logging/>
 </phpunit>