Merge pull request #39 from tt-rss/composer-lock-and-phpunit

Composer cleanup, PHPUnit 9 --> 12

4 files changed, 7 insertions, 12 deletions

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 5cf364217..c7fe534fe 100644
--- a/tests/integration/ApiTest.php
+++ b/tests/integration/ApiTest.php
@@ -1,19 +1,13 @@
 <?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 = "";
 	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 +38,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();
 	}
 
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(