From 746d7b05e27addca46cc7e1ce61935939c10dd27 Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Sun, 2 Jun 2024 12:27:30 +0400
Subject: [PATCH] ci: use pest for arch tests only; phpunit for unit tests
 without limitations

---
 .github/workflows/testing.yml          |  6 +++---
 composer.json                          |  7 ++----
 pest.xml.dist                          | 30 ++++++++++++++++++++++++++
 phpunit.xml.dist                       |  3 ---
 tests/Unit/Client/FunctionTrapTest.php |  1 -
 tests/Unit/Client/TrTest.php           |  1 -
 6 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 pest.xml.dist

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 0f9d82a5..a426ef00 100644
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -129,11 +129,11 @@ jobs:
         with:
           dependencies: ${{ matrix.dependencies }}
 
-      - name: 🧪 Run unit tests using pestphp/pest
+      - name: 🧪 Run unit tests using phpunit/phpunit
         run: composer test
 
-      - name: 🧪 Run tests that require separate process using phpunit/phpunit
-        run: composer test:sep
+      - name: 🧪 Run arch tests using pestphp/pest
+        run: composer test:arch
 
   compile-phar:
     timeout-minutes: 4
diff --git a/composer.json b/composer.json
index 6e3dd385..fb893cdb 100644
--- a/composer.json
+++ b/composer.json
@@ -132,11 +132,8 @@
         ],
         "test:cc": [
             "@putenv XDEBUG_MODE=coverage",
-            "pest --coverage --coverage-clover=.build/phpunit/logs/clover.xml --exclude-group=phpunit-only --color=always"
+            "phpunit --coverage --coverage-clover=.build/phpunit/logs/clover.xml --color=always"
         ],
-        "test:sep": [
-            "@putenv XDEBUG_MODE=coverage",
-            "phpunit --group=phpunit-only --color=always --exclude-testsuite=Arch"
-        ]
+        "test:arch": "pest --color=always --configuration pest.xml.dist"
     }
 }
diff --git a/pest.xml.dist b/pest.xml.dist
new file mode 100644
index 00000000..2d40f524
--- /dev/null
+++ b/pest.xml.dist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         colors="true"
+         cacheResultFile=".build/phpunit/result.cache"
+         failOnWarning="true"
+         failOnRisky="true"
+         executionOrder="random"
+         stderr="true"
+         beStrictAboutOutputDuringTests="true"
+>
+    <extensions>
+        <bootstrap class="Ergebnis\PHPUnit\SlowTestDetector\Extension"/>
+    </extensions>
+    <testsuites>
+        <testsuite name="Arch">
+            <directory>tests/Arch</directory>
+        </testsuite>
+    </testsuites>
+    <source>
+        <include>
+            <directory>src</directory>
+        </include>
+        <exclude>
+            <directory>tests</directory>
+            <directory>src/Test</directory>
+        </exclude>
+    </source>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c80bb641..447a7e3c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -17,9 +17,6 @@
         <testsuite name="Unit">
             <directory>tests/Unit</directory>
         </testsuite>
-        <testsuite name="Arch">
-            <directory>tests/Arch</directory>
-        </testsuite>
     </testsuites>
     <coverage>
         <report>
diff --git a/tests/Unit/Client/FunctionTrapTest.php b/tests/Unit/Client/FunctionTrapTest.php
index 51c51196..72b563fd 100644
--- a/tests/Unit/Client/FunctionTrapTest.php
+++ b/tests/Unit/Client/FunctionTrapTest.php
@@ -11,7 +11,6 @@
 final class FunctionTrapTest extends TestCase
 {
     #[RunInSeparateProcess]
-    #[Group('phpunit-only')]
     public function testLeak(): void
     {
         $object = new \stdClass();
diff --git a/tests/Unit/Client/TrTest.php b/tests/Unit/Client/TrTest.php
index 0ce8b85b..73b023e6 100644
--- a/tests/Unit/Client/TrTest.php
+++ b/tests/Unit/Client/TrTest.php
@@ -21,7 +21,6 @@ public function testLabel(): void
      * Check the stacktrace contains three items and it begins with the right function name.
      */
     #[RunInSeparateProcess]
-    #[Group('phpunit-only')]
     public function testTrAsStackTrace(): void
     {
         tr();