Fix PHPUnit, use new config for it

yiisoft · Dec 11, 2023 · 25aeacf · 25aeacf
1 parent 57e665f
commit 25aeacf
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 30 deletions.
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,31 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     bootstrap="vendor/autoload.php"
     colors="true"
-    verbose="true"
     failOnRisky="true"
     failOnWarning="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
     stopOnFailure="false"
     executionOrder="random"
     resolveDependencies="true"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+    cacheDirectory=".phpunit.cache"
 >
-    <php>
-        <ini name="error_reporting" value="-1"/>
-    </php>
-
-    <testsuites>
-        <testsuite name="Yii Role-Based Access Control tests">
-            <directory>./tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <coverage>
-        <include>
-            <directory>./src</directory>
-        </include>
-    </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+  <testsuites>
+    <testsuite name="Yii Role-Based Access Control tests">
+      <directory>./tests</directory>
+    </testsuite>
+  </testsuites>
+  <source>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Common/AssignmentsStorageTestTrait.php b/tests/Common/AssignmentsStorageTestTrait.php
@@ -22,7 +22,7 @@ trait AssignmentsStorageTestTrait
 
     protected function setUp(): void
     {
-        if ($this->getName() === 'testAdd') {
+        if ($this->name() === 'testAdd') {
             ClockMock::freeze(new DateTime('2023-05-10 08:24:39'));
         }
 
@@ -32,7 +32,7 @@ protected function setUp(): void
 
     protected function tearDown(): void
     {
-        if ($this->getName() === 'testAdd') {
+        if ($this->name() === 'testAdd') {
             ClockMock::reset();
         }
 

diff --git a/tests/Common/ItemsStorageTestTrait.php b/tests/Common/ItemsStorageTestTrait.php
@@ -81,7 +81,7 @@ public function testGetWithNonExistingName(): void
         $this->assertNull($storage->get('Non-existing name'));
     }
 
-    public function existsProvider(): array
+    public static function dataExists(): array
     {
         return [
             ['Parent 1', true],
@@ -95,7 +95,7 @@ public function existsProvider(): array
     }
 
     /**
-     * @dataProvider existsProvider
+     * @dataProvider dataExists
      */
     public function testExists(string $name, bool $expectedExists): void
     {
@@ -345,7 +345,7 @@ public function testRemove(): void
         $this->assertFalse($storage->hasChildren('Parent 2'));
     }
 
-    public function getParentsProvider(): array
+    public static function dataGetParents(): array
     {
         return [
             ['Child 1', ['Parent 1']],
@@ -362,7 +362,7 @@ public function getParentsProvider(): array
     }
 
     /**
-     * @dataProvider getParentsProvider
+     * @dataProvider dataGetParents
      */
     public function testGetParents(string $childName, array $expectedParents): void
     {

diff --git a/tests/Common/ManagerLogicTestTrait.php b/tests/Common/ManagerLogicTestTrait.php
@@ -31,14 +31,14 @@ trait ManagerLogicTestTrait
 
     protected function setUp(): void
     {
-        if (in_array($this->getName(), self::$frozenTimeTests, strict: true)) {
+        if (in_array($this->name(), self::$frozenTimeTests, strict: true)) {
             ClockMock::freeze(new DateTime('2023-05-10 08:24:39'));
         }
     }
 
     protected function tearDown(): void
     {
-        if (in_array($this->getName(), self::$frozenTimeTests, strict: true)) {
+        if (in_array($this->name(), self::$frozenTimeTests, strict: true)) {
             ClockMock::reset();
         }
     }

diff --git a/tests/CompositeRuleTest.php b/tests/CompositeRuleTest.php
@@ -14,7 +14,7 @@
 
 final class CompositeRuleTest extends TestCase
 {
-    public function compositeRuleDataProvider(): array
+    public static function dataCompositeRule(): array
     {
         return [
             'AND empty' => [CompositeRule::AND, [], true],
@@ -28,7 +28,7 @@ public function compositeRuleDataProvider(): array
     }
 
     /**
-     * @dataProvider compositeRuleDataProvider
+     * @dataProvider dataCompositeRule
      */
     public function testCompositeRule(string $operator, array $rules, bool $expected): void
     {