Update supported php versions and phpunit

samizdam · samizdam · commit a8ea5f871ccb · 2024-11-24T02:15:17.000+03:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,6 @@ jobs:
     strategy:
       matrix:
         php:
-          - 8.0
           - 8.1
           - 8.2
           - 8.3
diff --git a/.gitignore b/.gitignore
@@ -2,7 +2,7 @@
 
 /.idea/
 
-/.phpunit.result.cache
+/.phpunit.cache/
 
 /composer.lock
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Best composer dependencies compatibility: allow more versions
 
 ## Removed
-- php 7.4 support
+- php 7.4 and 8.0 support
 
 ## [0.0.14] - 2021-02-02
 ### Added
diff --git a/composer.json b/composer.json
@@ -35,7 +35,7 @@
     "require-dev": {
         "helmich/phpunit-psr7-assert": "^4",
         "nyholm/psr7": "^1.2",
-        "phpunit/phpunit": "^9.0"
+        "phpunit/phpunit": "^10.5.38|^11.0"
     },
     "suggest": {
         "doctrine/orm": "^2.7",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,19 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-    <report>
-      <html outputDirectory="_coverage" lowUpperBound="70" highLowerBound="99"/>
-      <text outputFile="php://stdout"/>
-    </report>
-  </coverage>
-  <php>
-    <ini name="error_reporting" value="E_ALL"/>
-  </php>
-    <testsuite name="">
-        <directory>tests/</directory>
-    </testsuite>
-  <logging/>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         cacheDirectory=".phpunit.cache"
+         executionOrder="depends,defects"
+         requireCoverageMetadata="false"
+         beStrictAboutCoverageMetadata="true"
+         beStrictAboutOutputDuringTests="true"
+         displayDetailsOnPhpunitDeprecations="true"
+         failOnPhpunitDeprecation="true"
+         failOnRisky="true"
+         failOnWarning="true">
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <source restrictDeprecations="true" restrictNotices="true" restrictWarnings="true">
+        <include>
+            <directory>src</directory>
+        </include>
+    </source>
+
+
+    <coverage includeUncoveredFiles="true">
+        <report>
+            <html outputDirectory="_coverage" lowUpperBound="70" highLowerBound="99"/>
+            <text outputFile="php://stdout"/>
+        </report>
+    </coverage>
+
 </phpunit>
diff --git a/tests/FreeElephants/JsonApiToolkit/JsonApi/Request/Route/RouteFactoryTest.php b/tests/FreeElephants/JsonApiToolkit/JsonApi/Request/Route/RouteFactoryTest.php
@@ -19,10 +19,10 @@ public function testCreateCorrect(string $path, RouteRulesProvider $routeRulesPr
         $this->assertTrue(is_a($actual, $expected));
     }
 
-    public function correctDataProvider()
+    public static function correctDataProvider(): array
     {
-        $routeRulesProviderWithoutApiVersion = $this->getRouteRulesProviderWithoutApiVersion();
-        $routeRulesProviderWithApiVersion = $this->getRouteRulesProviderWithApiVersion();
+        $routeRulesProviderWithoutApiVersion = self::getRouteRulesProviderWithoutApiVersion();
+        $routeRulesProviderWithApiVersion = self::getRouteRulesProviderWithApiVersion();
         $uuid = Uuid::uuid4()->toString();
 
         return [
@@ -49,10 +49,10 @@ public function testCreateIncorrect(string $path, RouteRulesProvider $routeRules
         $factory->create($path);
     }
 
-    public function incorrectDataProvider()
+    public static function incorrectDataProvider(): array
     {
-        $routeRulesProviderWithoutApiVersion = $this->getRouteRulesProviderWithoutApiVersion();
-        $routeRulesProviderWithApiVersion = $this->getRouteRulesProviderWithApiVersion();
+        $routeRulesProviderWithoutApiVersion = self::getRouteRulesProviderWithoutApiVersion();
+        $routeRulesProviderWithApiVersion = self::getRouteRulesProviderWithApiVersion();
         $uuid = Uuid::uuid4()->toString();
 
         return [
@@ -91,7 +91,7 @@ private function getMappingProvider(): MappingConfigProvider
         );
     }
 
-    private function getRouteRulesProviderWithoutApiVersion(): RouteRulesProvider
+    private static function getRouteRulesProviderWithoutApiVersion(): RouteRulesProvider
     {
         $resourceRegex = '([a-z][A-Za-z\d]+)';
         $hexRegex = '[\da-f]';
@@ -108,7 +108,7 @@ private function getRouteRulesProviderWithoutApiVersion(): RouteRulesProvider
         );
     }
 
-    private function getRouteRulesProviderWithApiVersion(): RouteRulesProvider
+    private static function getRouteRulesProviderWithApiVersion(): RouteRulesProvider
     {
         $versionRegex = '(v\d+)';
         $resourceRegex = '([a-z][A-Za-z\d]+)';

-Original file line number
+Diff line change
     strategy:
       matrix:
         php:
 -          - 8.0
           - 8.1
           - 8.2
           - 8.3
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@ public function testCreateCorrect(string $path, RouteRulesProvider $routeRulesPr`
`19`	`19`	`$this->assertTrue(is_a($actual, $expected));`
`20`	`20`	`}`
`21`	`21`
`22`		`- public function correctDataProvider()`
	`22`	`+ public static function correctDataProvider(): array`
`23`	`23`	`{`
`24`		`- $routeRulesProviderWithoutApiVersion = $this->getRouteRulesProviderWithoutApiVersion();`
`25`		`- $routeRulesProviderWithApiVersion = $this->getRouteRulesProviderWithApiVersion();`
	`24`	`+ $routeRulesProviderWithoutApiVersion = self::getRouteRulesProviderWithoutApiVersion();`
	`25`	`+ $routeRulesProviderWithApiVersion = self::getRouteRulesProviderWithApiVersion();`
`26`	`26`	`$uuid = Uuid::uuid4()->toString();`
`27`	`27`
`28`	`28`	`return [`
`@@ -49,10 +49,10 @@ public function testCreateIncorrect(string $path, RouteRulesProvider $routeRules`
`49`	`49`	`$factory->create($path);`
`50`	`50`	`}`
`51`	`51`
`52`		`- public function incorrectDataProvider()`
	`52`	`+ public static function incorrectDataProvider(): array`
`53`	`53`	`{`
`54`		`- $routeRulesProviderWithoutApiVersion = $this->getRouteRulesProviderWithoutApiVersion();`
`55`		`- $routeRulesProviderWithApiVersion = $this->getRouteRulesProviderWithApiVersion();`
	`54`	`+ $routeRulesProviderWithoutApiVersion = self::getRouteRulesProviderWithoutApiVersion();`
	`55`	`+ $routeRulesProviderWithApiVersion = self::getRouteRulesProviderWithApiVersion();`
`56`	`56`	`$uuid = Uuid::uuid4()->toString();`
`57`	`57`
`58`	`58`	`return [`
`@@ -91,7 +91,7 @@ private function getMappingProvider(): MappingConfigProvider`
`91`	`91`	`);`
`92`	`92`	`}`
`93`	`93`
`94`		`- private function getRouteRulesProviderWithoutApiVersion(): RouteRulesProvider`
	`94`	`+ private static function getRouteRulesProviderWithoutApiVersion(): RouteRulesProvider`
`95`	`95`	`{`
`96`	`96`	`$resourceRegex = '([a-z][A-Za-z\d]+)';`
`97`	`97`	`$hexRegex = '[\da-f]';`
`@@ -108,7 +108,7 @@ private function getRouteRulesProviderWithoutApiVersion(): RouteRulesProvider`
`108`	`108`	`);`
`109`	`109`	`}`
`110`	`110`
`111`		`- private function getRouteRulesProviderWithApiVersion(): RouteRulesProvider`
	`111`	`+ private static function getRouteRulesProviderWithApiVersion(): RouteRulesProvider`
`112`	`112`	`{`
`113`	`113`	`$versionRegex = '(v\d+)';`
`114`	`114`	`$resourceRegex = '([a-z][A-Za-z\d]+)';`