Merge pull request #1981 from hemberger/phpunit-updates

Fix PHPUnit deprecations
smrealms · Dec 13, 2024 · 07bec22 · 07bec22
2 parents cc37ab5 + 5b1ea21
commit 07bec22
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,18 +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/10.1/phpunit.xsd"
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
 	beStrictAboutChangesToGlobalState="true"
 	bootstrap="src/bootstrap.php"
 	cacheDirectory=".phpunit.cache"
 	colors="true"
+	displayDetailsOnPhpunitDeprecations="true"
 	displayDetailsOnTestsThatTriggerDeprecations="true"
 	displayDetailsOnTestsThatTriggerErrors="true"
 	displayDetailsOnTestsThatTriggerNotices="true"
 	displayDetailsOnTestsThatTriggerWarnings="true"
 	executionOrder="depends,defects"
 	failOnDeprecation="true"
+	failOnEmptyTestSuite="true"
 	failOnNotice="true"
+	failOnPhpunitDeprecation="true"
 	failOnRisky="true"
 	failOnWarning="true"
 	requireCoverageMetadata="true">
@@ -24,7 +27,7 @@
 	<php>
 		<env name="DISABLE_PHPDI_COMPILATION" value="true" force="true" />
 	</php>
-	<coverage includeUncoveredFiles="true">
+	<coverage>
 		<report>
 			<clover outputFile="test/coverage/clover.xml" />
 			<text outputFile="php://stdout" showOnlySummary="true" />

diff --git a/...ontainer/ResettableContainerTraitTest.php → ...est/Container/ResettableContainerTest.php b/...ontainer/ResettableContainerTraitTest.php → ...est/Container/ResettableContainerTest.php
@@ -2,13 +2,12 @@
 
 namespace SmrTest\Container;
 
-use PHPUnit\Framework\Attributes\CoversTrait;
+use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\TestCase;
 use Smr\Container\ResettableContainer;
-use Smr\Container\ResettableContainerTrait;
 
-#[CoversTrait(ResettableContainerTrait::class)]
-class ResettableContainerTraitTest extends TestCase {
+#[CoversClass(ResettableContainer::class)]
+class ResettableContainerTest extends TestCase {
 
 	public function test_not_initialized_by_definition(): void {
 		$container = new ResettableContainer([