Update PHPUnit, remove deprecations

lmc-eu · Jan 15, 2024 · 840277a · 840277a
1 parent 05ccf55
commit 840277a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-phpunit": "^1.3",
-        "phpunit/phpunit": "^7.5.20 || ^8.0 || ^9.0",
+        "phpunit/phpunit": "^9.0",
         "symfony/var-dumper": "^3.3 || ^4.0 || ^5.0"
     },
     "minimum-stability": "stable",

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,8 +1,9 @@
+<?xml version="1.0"?>
 <phpunit
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    bootstrap="./vendor/autoload.php"
-    colors="true"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+        bootstrap="./vendor/autoload.php"
+        colors="true"
 >
     <testsuites>
         <testsuite name="unit">
@@ -13,11 +14,11 @@
         </testsuite>
     </testsuites>
 
-    <filter>
-        <whitelist>
+    <coverage>
+        <include>
             <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
 
     <php>
         <!-- E_ALL = 30719 -->

diff --git a/tests/unit/Http/RequestManagerTest.php b/tests/unit/Http/RequestManagerTest.php
@@ -45,7 +45,7 @@ public function shouldSendAndDecodeRequest(): void
         // Assert properties of the send request
         $recordedRequests = $mockClient->getRequests();
         $this->assertCount(1, $recordedRequests);
-        $this->assertRegExp(
+        $this->assertMatchesRegularExpression(
             '~https\://account\-id\.matej\.lmc\.cz/foo/endpoint\?hmac_timestamp\=[0-9]+&hmac_sign\=[[:alnum:]]~',
             $recordedRequests[0]->getUri()->__toString()
         );

diff --git a/tests/unit/Http/ResponseDecoderTest.php b/tests/unit/Http/ResponseDecoderTest.php
@@ -111,8 +111,8 @@ public function shouldDecodeRecommendationResponse(): void
         $this->assertContainsOnlyInstancesOf(\stdClass::class, $decodedResponse->getRecommendation()->getData());
 
         foreach ($decodedResponse->getRecommendation()->getData() as $recommendedItem) {
-            $this->assertObjectHasAttribute('item_id', $recommendedItem);
-            $this->assertObjectHasAttribute('item_url', $recommendedItem);
+            $this->assertObjectHasProperty('item_id', $recommendedItem);
+            $this->assertObjectHasProperty('item_url', $recommendedItem);
         }
     }
 }