From cd42738331d3b4cb5791b761038c7456c02c0c77 Mon Sep 17 00:00:00 2001
From: supahgreg <supahgreg@users.noreply.github.com>
Date: Sat, 11 Oct 2025 15:39:15 +0000
Subject: Update PHPUnit config+test for 12.x.

---
 tests/integration/ApiTest.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'tests/integration')

diff --git a/tests/integration/ApiTest.php b/tests/integration/ApiTest.php
index 5cf364217..3287a7735 100644
--- a/tests/integration/ApiTest.php
+++ b/tests/integration/ApiTest.php
@@ -7,13 +7,6 @@ final class ApiTest extends TestCase {
 	private string $app_url = "";
 	private string $sid = "";
 
-	function __construct() {
-		$this->api_url = getenv('API_URL');
-		$this->app_url = getenv('APP_URL');
-
-		parent::__construct();
-	}
-
 	/** @param array<mixed> $payload
 	 * @return array<mixed>
 	 */
@@ -44,6 +37,8 @@ final class ApiTest extends TestCase {
 	}
 
 	public function setUp(): void {
+		$this->api_url = getenv('API_URL');
+		$this->app_url = getenv('APP_URL');
 		$this->test_login();
 	}
 
-- 
cgit v1.2.3-54-g00ecf


From cb2659b5d56814fbc12027f51bc937af3dae6a34 Mon Sep 17 00:00:00 2001
From: supahgreg <supahgreg@users.noreply.github.com>
Date: Sat, 11 Oct 2025 16:27:34 +0000
Subject: PHPUnit cleanup, get group detection working.

---
 phpunit.xml                         | 2 --
 tests/ConfigTest.php                | 2 +-
 tests/UrlHelperTest.php             | 2 --
 tests/integration/ApiTest.php       | 3 ++-
 tests/integration/SanitizerTest.php | 3 ++-
 5 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'tests/integration')

diff --git a/phpunit.xml b/phpunit.xml
index b7a0247cf..20a3e63ea 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -2,11 +2,9 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/12.0/phpunit.xsd"
          bootstrap="tests/autoload.php"
-         verbose="true"
          cacheDirectory=".phpunit.cache"
          executionOrder="depends,defects"
          beStrictAboutOutputDuringTests="true"
-         beStrictAboutTodoAnnotatedTests="true"
          failOnRisky="true"
          failOnWarning="true">
   <testsuite name="tt-rss">
diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
index ee15df8d3..f36602ae6 100644
--- a/tests/ConfigTest.php
+++ b/tests/ConfigTest.php
@@ -1,7 +1,7 @@
 <?php
 use PHPUnit\Framework\TestCase;
 
-final class SelfUrlPathTest extends TestCase {
+final class ConfigTest extends TestCase {
 	public function test_self_url_a(): void {
 		$_SERVER = [];
 
diff --git a/tests/UrlHelperTest.php b/tests/UrlHelperTest.php
index 249a5b412..961af1b30 100644
--- a/tests/UrlHelperTest.php
+++ b/tests/UrlHelperTest.php
@@ -4,8 +4,6 @@ use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
 use GuzzleHttp\HandlerStack;
 use GuzzleHttp\Psr7\Response;
-use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Exception\RequestException;
 use PHPUnit\Framework\TestCase;
 
 final class UrlHelperTest extends TestCase {
diff --git a/tests/integration/ApiTest.php b/tests/integration/ApiTest.php
index 3287a7735..c7fe534fe 100644
--- a/tests/integration/ApiTest.php
+++ b/tests/integration/ApiTest.php
@@ -1,7 +1,8 @@
 <?php
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
-/** @group integration */
+#[Group('integration')]
 final class ApiTest extends TestCase {
 	private string $api_url = "";
 	private string $app_url = "";
diff --git a/tests/integration/SanitizerTest.php b/tests/integration/SanitizerTest.php
index 421d046af..0f15bf0ca 100644
--- a/tests/integration/SanitizerTest.php
+++ b/tests/integration/SanitizerTest.php
@@ -1,7 +1,8 @@
 <?php
+use PHPUnit\Framework\Attributes\Group;
 use PHPUnit\Framework\TestCase;
 
-/** @group integration */
+#[Group('integration')]
 final class SanitizerTest extends TestCase {
 	public function test_sanitize_non_ascii(): void {
 		$this->assertEquals(
-- 
cgit v1.2.3-54-g00ecf