Upgrade PHPUnit to 10.2

getkirby · Dec 27, 2023 · ee2410c · ee2410c
1 parent 9ddc04d
commit ee2410c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 12 deletions.
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
@@ -99,7 +99,7 @@ jobs:
           extensions: ${{ env.extensions }}
           ini-values: ${{ env.ini }}
           coverage: pcov
-          tools: phpunit:9.5.26, psalm:5.15.0
+          tools: phpunit:10.5.2, psalm:5.15.0
 
       - name: Setup problem matchers
         run: |

diff --git a/.gitignore b/.gitignore
@@ -15,7 +15,7 @@
 /.idea
 
 # tests
-.phpunit.result.cache
+.phpunit.cache
 /tests/coverage
 
 # ignore all the vendor cruft

diff --git a/composer.json b/composer.json
@@ -106,7 +106,7 @@
 			"@test"
 		],
 		"fix": "php-cs-fixer fix",
-		"test": "phpunit --stderr",
+		"test": "phpunit --stderr --display-warnings",
 		"test:coverage": "XDEBUG_MODE=coverage phpunit --stderr --coverage-html=tests/coverage",
 		"zip": "composer archive --format=zip --file=dist"
 	}

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <phpunit
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
-
+	xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
 	bootstrap="tests/bootstrap.php"
-	convertDeprecationsToExceptions="true"
 	colors="true"
-	verbose="true"
 	stderr="true"
+	cacheDirectory=".phpunit.cache"
 >
-
-	<coverage ignoreDeprecatedCodeUnits="true">
+	<source>
 		<include>
 			<directory>./config</directory>
 			<directory>./src</directory>
@@ -23,7 +19,7 @@
 			<file>./config/aliases.php</file>
 			<file>./config/setup.php</file>
 		</exclude>
-	</coverage>
+	</source>
 
 	<testsuites>
 		<testsuite name="Classes">
@@ -34,4 +30,6 @@
 	<php>
 		<ini name="memory_limit" value="2048M" />
 	</php>
+
+	<coverage ignoreDeprecatedCodeUnits="true" />
 </phpunit>
diff --git a/tests/Session/FileSessionStoreTest.php b/tests/Session/FileSessionStoreTest.php
@@ -57,7 +57,7 @@ public function tearDown(): void
 		}
 
 		Dir::remove($this->root);
-		$this->assertDirectoryNotExists($this->root);
+		$this->assertDirectoryDoesNotExist($this->root);
 	}
 
 	/**

diff --git a/tests/Uuid/BlockUuidTest.php → tests/Uuid/BlockUuidTest.tmp b/tests/Uuid/BlockUuidTest.php → tests/Uuid/BlockUuidTest.tmp
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,7 +57,7 @@ public function tearDown(): void @@
     		}
     		Dir::remove($this->root);
-    		$this->assertDirectoryNotExists($this->root);
+    		$this->assertDirectoryDoesNotExist($this->root);
     	}
     	/**
@@ Expand Down @@