Upgrade phpunit & actions

Author: J-T-McC

.github/workflows/build.yml

@@ -1,11 +1,11 @@
 name: Test
-on: [pull_request]
+on: [push, pull_request]
 
 jobs:
   psalm:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Psalm
         uses: docker://vimeo/psalm-github-actions
@@ -51,16 +51,16 @@ jobs:
     strategy:
       matrix:
         php:
-          - 7.4
-          - 8.0
+          - 8.2
+          - 8.3
         include:
-          - php: 7.4
-            phpunit: 9.5.0
-          - php: 8.0
-            phpunit: 9.5.0
+          - php: 8.2
+            phpunit: 10
+          - php: 8.3
+            phpunit: 10
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cache Composer dependencies
         uses: actions/cache@v2
@@ -72,7 +72,13 @@ jobs:
         with:
           php_version: ${{ matrix.php }}
 
-      - uses: php-actions/phpunit@v9
+      - uses: php-actions/phpunit@v3
         with:
           php_version: ${{ matrix.php }}
           version: ${{ matrix.phpunit }}
+          php_extensions: xdebug
+          coverage_text: true
+          bootstrap: vendor/autoload.php
+          args: --coverage-filter src tests
+        env:
+          XDEBUG_MODE: coverage

composer.json

@@ -19,7 +19,7 @@
         "ext-json": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9",
+        "phpunit/phpunit": "^10",
         "codacy/coverage": "dev-master",
         "symfony/http-foundation": "^2.8|^3.0|^5.0"
     },

phpunit.xml.dist

@@ -1,22 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="./vendor/autoload.php">
-    <testsuites>
-        <testsuite name="phpunit-json-assertions Test Suite">
-            <directory>tests/</directory>
-        </testsuite>
-    </testsuites>
-
-    <coverage>
-        <include>
-            <directory suffix=".php">src/</directory>
-        </include>
-        <report>
-            <clover outputFile="./build/logs/clover.xml"/>
-        </report>
-    </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="./vendor/autoload.php">
+  <testsuites>
+    <testsuite name="phpunit-json-assertions Test Suite">
+      <directory>tests/</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <clover outputFile="./build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <source>
+    <include>
+      <directory suffix=".php">src/</directory>
+    </include>
+  </source>
 </phpunit>

tests/AssertClassTest.php

@@ -18,6 +18,6 @@ class AssertClassTest extends TestCase
 {
     public function testClassInstance()
     {
-        static::assertInstanceOf('EnricoStahn\JsonAssert\AssertClass', new AssertClass());
+        static::assertInstanceOf('EnricoStahn\JsonAssert\AssertClass', new AssertClass('AssertClassTest'));
     }
 }

tests/AssertTraitTest.php

@@ -256,7 +256,7 @@ public function testAssertJsonMatchesSchemaString()
      * @dataProvider assertJsonValueEqualsProvider
      *
      * @param string $expression
-     * @param mixed $value
+     * @param mixed  $value
      */
     public function testAssertJsonValueEquals(string $expression, $value)
     {
@@ -267,16 +267,16 @@ public function testAssertJsonValueEquals(string $expression, $value)
 
     public function testAssertWithSchemaStore()
     {
-        $obj = new AssertTraitImpl();
+        $obj = new AssertTraitImpl('testAssertWithSchemaStore');
         $obj->setUp();
 
-        $schemaStore = $obj->testWithSchemaStore('foobar', (object)['type' => 'string']);
+        $schemaStore = $obj->testWithSchemaStore('foobar', (object) ['type' => 'string']);
 
         self::assertInstanceOf('JsonSchema\SchemaStorage', $schemaStore);
-        self::assertEquals($schemaStore->getSchema('foobar'), (object)['type' => 'string']);
+        self::assertEquals($schemaStore->getSchema('foobar'), (object) ['type' => 'string']);
     }
 
-    public function assertJsonValueEqualsProvider(): array
+    public static function assertJsonValueEqualsProvider(): array
     {
         return [
             ['foo', '123'],
@@ -300,7 +300,7 @@ public function testGetJsonObject($expected, $actual)
         self::assertEquals($expected, AssertTraitImpl::getJsonObject($actual));
     }
 
-    public function jsonObjectProvider(): array
+    public static function jsonObjectProvider(): array
     {
         return [
             [[], []],