Merge pull request #30 from nutama/phpunit9

update to phpunit 9

Author: svandervlugt

.github/workflows/main.yaml

@@ -8,7 +8,7 @@ jobs:
 
         strategy:
             matrix:
-                php-versions: ['7.3', '7.4']
+                php-versions: ['7.3', '7.4', '8.0']
         name: PHP ${{ matrix.php-versions }}
         steps:
             -   uses: actions/checkout@v2

composer.json

@@ -16,7 +16,7 @@
     },
     "require-dev": {
         "hostnet/phpcs-tool": "^8.3",
-        "phpunit/phpunit":    "^7.0",
+        "phpunit/phpunit":    "^9.5.6",
         "symfony/finder":     "^5.0"
     },
     "autoload": {

phpunit.xml.dist

@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit
-        xmlns:xsi                     = "http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation = "http://schema.phpunit.de/5.1/phpunit.xsd"
-        colors                        = "true"
-        bootstrap                     = "vendor/autoload.php"
->
-    <php>
-        <server name="KERNEL_CLASS" value="TestKernel"/>
-        <server name="KERNEL_DIR" value="test/Functional/Fixtures"/>
-    </php>
-    <testsuites>
-        <testsuite name="unit-test">
-            <directory>./test</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" colors="true" bootstrap="vendor/autoload.php">
+  <coverage>
+    <include>
+      <directory>src</directory>
+    </include>
+  </coverage>
+  <php>
+    <server name="KERNEL_CLASS" value="TestKernel"/>
+    <server name="KERNEL_DIR" value="test/Functional/Fixtures"/>
+  </php>
+  <testsuites>
+    <testsuite name="unit-test">
+      <directory>./test</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

test/DependencyInjection/EnumTranslationCompilerPassTest.php

@@ -63,9 +63,6 @@ public function testProcess()
         $this->assertEquals(['addResource', ['enum', $resources, 'en', MockEnum::class]], $calls[0]);
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testProcessNotYml()
     {
         $resources  = realpath(__DIR__ . '/../MockXml/Resources/translations/enum.en.xml');
@@ -78,6 +75,8 @@ public function testProcessNotYml()
         $container->setDefinition('translator.default', $translator);
 
         $pass = new EnumTranslationCompilerPass();
+
+        $this->expectException(\RuntimeException::class);
         $pass->process($container);
     }
 
@@ -99,9 +98,6 @@ public function testProcessNoTrans()
         $this->assertEquals(0, count($calls));
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testProcessNoArray()
     {
         $resources  = realpath(__DIR__ . '/../MockNoArray/Resources/translations/enum.en.yml');
@@ -114,6 +110,8 @@ public function testProcessNoArray()
         $container->setDefinition('translator.default', $translator);
 
         $pass = new EnumTranslationCompilerPass();
+
+        $this->expectException(\RuntimeException::class);
         $pass->process($container);
     }
 }

test/Loader/EnumLoaderTest.php

@@ -73,9 +73,6 @@ public function testTranslationArray(): void
         );
     }
 
-    /**
-     * @expectedException \RuntimeException
-     */
     public function testNonEnumLoad(): void
     {
         $yml_loader = new YamlFileLoader();
@@ -89,6 +86,9 @@ public function testNonEnumLoad(): void
             'en',
             'phpunit'
         );
+
+        $this->expectException(\RuntimeException::class);
+
         $translator->trans((string) 0, [], 'phpunit');
     }
 }