From 23d4b4e30b1b33673dfe22cae6f9e652a891fe82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Thu, 10 Jun 2021 12:57:07 -0300
Subject: [PATCH] Do not convert errors to exceptions for PHP 8.1 tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 .github/workflows/tests.yml  |  9 +++++++--
 test/phpunit-php-nightly.xml | 38 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 test/phpunit-php-nightly.xml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d40e6149c8..f2a3a44bb8 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -67,8 +67,13 @@ jobs:
                 php-version: ["7.2", "7.3", "7.4", "8.0"]
                 experimental: [false]
                 os: [ubuntu-latest]
+                phpunit-options: ['--exclude-group selenium']
                 include:
-                    - { php-version: '8.1', composer-options: '--ignore-platform-req=php', experimental: true, os: ubuntu-latest }
+                  - php-version: '8.1'
+                    experimental: true
+                    os: ubuntu-latest
+                    phpunit-options: '--configuration test/phpunit-php-nightly.xml'
+                    composer-options: '--ignore-platform-req=php'
         steps:
             - uses: actions/checkout@v2
             - name: Install gettext
@@ -98,7 +103,7 @@ jobs:
             - name: Install dependencies
               run: composer install --no-interaction ${{ matrix.composer-options }}
             - name: Run php tests
-              run: composer run phpunit --  --exclude-group selenium
+              run: composer run phpunit -- ${{ matrix.phpunit-options }}
             - name: Send coverage
               uses: codecov/codecov-action@v1
               with:
diff --git a/test/phpunit-php-nightly.xml b/test/phpunit-php-nightly.xml
new file mode 100644
index 0000000000..baef0c2f16
--- /dev/null
+++ b/test/phpunit-php-nightly.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.5/phpunit.xsd"
+    bootstrap="bootstrap-dist.php"
+    convertDeprecationsToExceptions="false"
+    convertNoticesToExceptions="false"
+    convertWarningsToExceptions="false"
+    convertErrorsToExceptions="false"
+    forceCoversAnnotation="true"
+    executionOrder="random"
+    colors="true"
+    verbose="true">
+
+    <php>
+        <const name="PHPMYADMIN" value="1"/>
+        <const name="TESTSUITE" value="1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="default">
+            <directory suffix="Test.php">classes</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">.</directory>
+            <exclude>
+                <directory>../examples</directory>
+                <directory>../libraries/cache</directory>
+                <directory>../node_modules</directory>
+                <directory>../test</directory>
+                <directory>../tmp</directory>
+                <directory>../vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>