Merge pull request #6 from swisnl/shift-141435

PHPUnit 10 Shift
swisnl · Feb 25, 2025 · 3950ab6 · 3950ab6
2 parents 47bac84 + 7204f09
commit 3950ab6
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 15 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 composer.lock
 vendor
 build
-.phpunit.result.cache
+.phpunit.cache
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,14 +1,33 @@
-<phpunit bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false">
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticProperties="false"
+         colors="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         cacheDirectory=".phpunit.cache">
     <testsuites>
         <testsuite name="Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
     <coverage>
+        <report>
+            <clover outputFile="build/logs/clover.xml"/>
+            <html outputDirectory="build/coverage"/>
+            <text outputFile="build/coverage.txt"/>
+        </report>
+    </coverage>
+    <logging>
+        <junit outputFile="build/report.junit.xml"/>
+    </logging>
+    <source>
         <include>
             <directory suffix=".php">src/</directory>
         </include>
-    </coverage>
+    </source>
     <php>
         <env name="APP_ENV" value="testing"/>
     </php>

diff --git a/tests/CommandRegistrationTest.php b/tests/CommandRegistrationTest.php
@@ -2,14 +2,14 @@
 
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
-class CommandRegistrationTest extends TestCase
+final class CommandRegistrationTest extends TestCase
 {
     use DatabaseTransactions;
     const CARWASH_COMMANDS = [
         'carwash:scrub'
     ];
 
-    public function testThatAllComandsGetRegisteredWithTheApplication()
+    public function testThatAllComandsGetRegisteredWithTheApplication(): void
     {
         $registeredCommands = collect(\Artisan::all())->keys();
 

diff --git a/tests/ScrubTest.php b/tests/ScrubTest.php
@@ -4,11 +4,11 @@
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 use PHPUnit\Framework\Assert;
 
-class ScrubTest extends TestCase
+final class ScrubTest extends TestCase
 {
     use DatabaseTransactions;
 
-    public function testThatDesiredUserDataGetsScrubbed()
+    public function testThatDesiredUserDataGetsScrubbed(): void
     {
         $this->addConfig();
         $this->addUser([
@@ -36,7 +36,7 @@ public function testThatDesiredUserDataGetsScrubbed()
         $this->assertNotEquals('cosmo@kramerica.com', $user2->email);
     }
 
-    public function testThatFormattersCanBeAnInvokableClass()
+    public function testThatFormattersCanBeAnInvokableClass(): void
     {
         $formatter = new class ()
         {
@@ -67,7 +67,7 @@ public function __invoke($faker, $attribute)
         $this->assertEquals('Foo', $user1->first_name);
     }
 
-    public function testThatFormattersCanBeAnInvokableClassString()
+    public function testThatFormattersCanBeAnInvokableClassString(): void
     {
         $formatter = new class ()
         {
@@ -98,7 +98,7 @@ public function __invoke($faker, $attribute)
         $this->assertEquals('Foo', $user1->first_name);
     }
 
-    public function testThatArgumentsCanBePassedToFormatters()
+    public function testThatArgumentsCanBePassedToFormatters(): void
     {
         $this->app->config['carwash'] = [
             'users' => [
@@ -119,7 +119,7 @@ public function testThatArgumentsCanBePassedToFormatters()
         $this->assertEquals(3, str_word_count($user1->first_name));
     }
 
-    public function testThatTheTableConfigurationCanBeAnInvokableClass()
+    public function testThatTheTableConfigurationCanBeAnInvokableClass(): void
     {
         $user = [
             'id' => 1,
@@ -163,7 +163,7 @@ public function __invoke($faker, $record)
         $this->assertEquals('Foo', $user1->first_name);
     }
 
-    public function testThatTheTableConfigurationCanBeAnInvokableClassString()
+    public function testThatTheTableConfigurationCanBeAnInvokableClassString(): void
     {
         $user = [
             'id' => 1,
@@ -200,7 +200,7 @@ public function __invoke($faker, $record)
         $this->assertEquals('Foo', $user1->first_name);
     }
 
-    public function testThatTheTableConfigurationCanBeAnAnonymousFunction()
+    public function testThatTheTableConfigurationCanBeAnAnonymousFunction(): void
     {
         $user = [
             'id' => 1,

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,9 +2,9 @@
 
 use Orchestra\Testbench\TestCase as Orchestra;
 
-class TestCase extends Orchestra
+abstract class TestCase extends Orchestra
 {
-    public function setUp(): void
+    protected function setUp(): void
     {
         parent::setUp();
         $this->setUpDatabase($this->app);