wip

sixlive · sixlive · commit 5a2fd2e1fac6 · 2024-09-02T10:52:08.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ composer.lock
 vendor/
 coverage/
 .php-cs-fixer.cache
-.phpunit.result.cache
+.phpunit*.cache
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" backupStaticAttributes="false" colors="true" verbose="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="vendor/autoload.php" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.3/phpunit.xsd" cacheDirectory=".phpunit.cache" backupStaticProperties="false">
   <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
     <report>
       <clover outputFile="build/logs/clover.xml"/>
       <html outputDirectory="build/coverage"/>
@@ -18,4 +15,9 @@
   <logging>
     <junit outputFile="build/report.junit.xml"/>
   </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/AssertResponseTest.php b/tests/AssertResponseTest.php
@@ -18,8 +18,7 @@ public function setUp(): void
         });
     }
 
-    /** @test */
-    public function valid_schema_passes_as_json()
+    public function test_valid_schema_passes_as_json()
     {
         $schema = [
             'type' => 'object',
@@ -36,8 +35,7 @@ public function valid_schema_passes_as_json()
         $this->get('foo')->assertJsonSchema(json_encode($schema));
     }
 
-    /** @test */
-    public function valid_schema_passes_as_array()
+    public function test_valid_schema_passes_as_array()
     {
         $schema = [
             'type' => 'object',
@@ -54,15 +52,13 @@ public function valid_schema_passes_as_array()
         $this->get('foo')->assertJsonSchema($schema);
     }
 
-    /** @test */
-    public function valid_schema_passes_as_file_path()
+    public function test_valid_schema_passes_as_file_path()
     {
         $this->get('foo')
-             ->assertJsonSchema(__DIR__.'/Support/Schemas/foo.json');
+            ->assertJsonSchema(__DIR__.'/Support/Schemas/foo.json');
     }
 
-    /** @test */
-    public function invalid_schema_fails_with_message()
+    public function test_invalid_schema_fails_with_message()
     {
         $this->expectException(AssertionFailedError::class);
 
@@ -81,8 +77,7 @@ public function invalid_schema_fails_with_message()
         $this->get('foo')->assertJsonSchema(json_encode($schema));
     }
 
-    /** @test */
-    public function valid_schema_passes_as_config_path()
+    public function test_valid_schema_passes_as_config_path()
     {
         $this->get('foo')->assertJsonSchema('foo');
     }

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@ public function setUp(): void`
`18`	`18`	`});`
`19`	`19`	`}`
`20`	`20`
`21`		`- /** @test */`
`22`		`- public function valid_schema_passes_as_json()`
	`21`	`+ public function test_valid_schema_passes_as_json()`
`23`	`22`	`{`
`24`	`23`	`$schema = [`
`25`	`24`	`'type' => 'object',`
`@@ -36,8 +35,7 @@ public function valid_schema_passes_as_json()`
`36`	`35`	`$this->get('foo')->assertJsonSchema(json_encode($schema));`
`37`	`36`	`}`
`38`	`37`
`39`		`- /** @test */`
`40`		`- public function valid_schema_passes_as_array()`
	`38`	`+ public function test_valid_schema_passes_as_array()`
`41`	`39`	`{`
`42`	`40`	`$schema = [`
`43`	`41`	`'type' => 'object',`
`@@ -54,15 +52,13 @@ public function valid_schema_passes_as_array()`
`54`	`52`	`$this->get('foo')->assertJsonSchema($schema);`
`55`	`53`	`}`
`56`	`54`
`57`		`- /** @test */`
`58`		`- public function valid_schema_passes_as_file_path()`
	`55`	`+ public function test_valid_schema_passes_as_file_path()`
`59`	`56`	`{`
`60`	`57`	`$this->get('foo')`
`61`		`- ->assertJsonSchema(__DIR__.'/Support/Schemas/foo.json');`
	`58`	`+ ->assertJsonSchema(__DIR__.'/Support/Schemas/foo.json');`
`62`	`59`	`}`
`63`	`60`
`64`		`- /** @test */`
`65`		`- public function invalid_schema_fails_with_message()`
	`61`	`+ public function test_invalid_schema_fails_with_message()`
`66`	`62`	`{`
`67`	`63`	`$this->expectException(AssertionFailedError::class);`
`68`	`64`
`@@ -81,8 +77,7 @@ public function invalid_schema_fails_with_message()`
`81`	`77`	`$this->get('foo')->assertJsonSchema(json_encode($schema));`
`82`	`78`	`}`
`83`	`79`
`84`		`- /** @test */`
`85`		`- public function valid_schema_passes_as_config_path()`
	`80`	`+ public function test_valid_schema_passes_as_config_path()`
`86`	`81`	`{`
`87`	`82`	`$this->get('foo')->assertJsonSchema('foo');`
`88`	`83`	`}`