Update to PHPUnit 10

userfrosting · Dec 14, 2023 · 2902222 · 2902222
1 parent ca3c2bb
commit 2902222
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,5 +37,5 @@ node_modules/
 public/assets/
 
 # Ignore dev utils cache
-.phpunit.result.cache
+.phpunit.cache
 .php_cs.cache
diff --git a/app/tests/Sprunje/GroupSprunjeTest.php b/app/tests/Sprunje/GroupSprunjeTest.php
@@ -26,7 +26,7 @@ class GroupSprunjeTest extends AdminTestCase
 {
     use RefreshDatabase;
 
-    protected EloquentCollection $roles;
+    protected EloquentCollection $groups;
 
     public function setUp(): void
     {

diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "phpstan/phpstan-mockery": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
         "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^10.5",
         "mockery/mockery": "^1.2",
         "fakerphp/faker": "^1.17",
         "slam/phpstan-extensions": "^6.0",

diff --git a/phpunit.xml b/phpunit.xml
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    backupGlobals="false" 
-    backupStaticAttributes="false" 
-    bootstrap="vendor/autoload.php" 
-    colors="true" 
-    convertErrorsToExceptions="true" 
-    convertNoticesToExceptions="true" 
-    convertWarningsToExceptions="true" 
-    processIsolation="false" 
-    stderr="true" 
-    stopOnFailure="false" 
-    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
->
-  <coverage includeUncoveredFiles="true" processUncoveredFiles="false">
-    <include>
-      <directory suffix=".php">app/src/</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" bootstrap="vendor/autoload.php" colors="true" processIsolation="false" stderr="true" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
+  <coverage includeUncoveredFiles="true">
     <report>
       <clover outputFile="_meta/coverage.xml"/>
       <html outputDirectory="_meta/coverage"/>
@@ -29,7 +14,9 @@
   <php>
     <env name="UF_MODE" value="testing"/>
   </php>
-  <listeners>
-    <listener class="\Mockery\Adapter\Phpunit\TestListener"></listener>
-  </listeners>
+  <source>
+    <include>
+      <directory suffix=".php">app/src/</directory>
+    </include>
+  </source>
 </phpunit>