Bumped dependencies, removed nette/utils

peldax · peldax · commit 26ddfde5f3b0 · 2023-11-10T19:08:29.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 build/*
 vendor/*
 .phpunit.result.cache
+.phpunit.cache/*
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "infinityloop-dev/graphpinator-constraint-directives",
   "description": "Typesystem directives to declare additional validation on top of GraphQL type system.",
-  "homepage": "https://www.infinityloop.dev/",
+  "homepage": "https://github.com/graphpql/",
   "type": "library",
   "license": ["MIT"],
   "authors": [
@@ -12,17 +12,16 @@
     }
   ],
   "require": {
-    "php": ">=8.0.1",
+    "php": ">=8.1",
     "ext-fileinfo": "*",
-    "infinityloop-dev/graphpinator": "^1.2.1",
-    "infinityloop-dev/utils": "^2.1.2",
-    "nette/utils": "^3.2"
+    "infinityloop-dev/graphpinator": "^1.6",
+    "infinityloop-dev/utils": "^2.3"
   },
   "require-dev": {
-    "infinityloop-dev/graphpinator-upload": "^1.0.2",
-    "phpunit/phpunit": "^9.5",
-    "infection/infection": "^0.26",
-    "phpstan/phpstan": "^1.0",
+    "infinityloop-dev/graphpinator-upload": "^1.1",
+    "phpunit/phpunit": "^10.4",
+    "infection/infection": "^0.27",
+    "phpstan/phpstan": "^1.10",
     "infinityloop-dev/coding-standard": "^0.2"
   },
   "suggest": {
diff --git a/composer.lock b/composer.lock
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">src</directory>
-    </include>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.4/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage>
     <report>
       <clover outputFile="./build/phpunit.clover.xml"/>
       <html outputDirectory="./build/html" lowUpperBound="70" highLowerBound="100"/>
@@ -18,4 +15,9 @@
   <logging>
     <junit outputFile="./build/logfile.xml"/>
   </logging>
+  <source>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/tests/Integration/ConstraintArgumentTest.php b/tests/Integration/ConstraintArgumentTest.php
@@ -8,7 +8,7 @@
 
 final class ConstraintArgumentTest extends \PHPUnit\Framework\TestCase
 {
-    public function argumentDataProvider() : array
+    public static function argumentDataProvider() : array
     {
         return [
             [
@@ -130,7 +130,7 @@ public function testArgument(Json $request, Json $expected) : void
         self::assertNull($result->getErrors());
     }
 
-    public function argumentInvalidDataProvider() : array
+    public static function argumentInvalidDataProvider() : array
     {
         return [
             [
diff --git a/tests/Integration/ConstraintFieldTest.php b/tests/Integration/ConstraintFieldTest.php
@@ -8,7 +8,7 @@
 
 final class ConstraintFieldTest extends \PHPUnit\Framework\TestCase
 {
-    public function fieldDataProvider() : array
+    public static function fieldDataProvider() : array
     {
         return [
             [
@@ -175,7 +175,7 @@ public function testField(array $settings, Json $expected) : void
         );
     }
 
-    public function fieldInvalidDataProvider() : array
+    public static function fieldInvalidDataProvider() : array
     {
         return [
             [
diff --git a/tests/Integration/ConstraintVariableTest.php b/tests/Integration/ConstraintVariableTest.php
@@ -8,7 +8,7 @@
 
 final class ConstraintVariableTest extends \PHPUnit\Framework\TestCase
 {
-    public function variableDataProvider() : array
+    public static function variableDataProvider() : array
     {
         return [
             [
@@ -56,7 +56,7 @@ public function testVariable(Json $request) : void
         );
     }
 
-    public function variableInvalidDataProvider() : array
+    public static function variableInvalidDataProvider() : array
     {
         return [
             [
diff --git a/tests/Integration/FloatVarianceTest.php b/tests/Integration/FloatVarianceTest.php
@@ -6,7 +6,7 @@
 
 final class FloatVarianceTest extends \PHPUnit\Framework\TestCase
 {
-    public function covarianceDataProvider() : array
+    public static function covarianceDataProvider() : array
     {
         return [
             [
diff --git a/tests/Integration/IntVarianceTest.php b/tests/Integration/IntVarianceTest.php
@@ -6,7 +6,7 @@
 
 final class IntVarianceTest extends \PHPUnit\Framework\TestCase
 {
-    public function covarianceDataProvider() : array
+    public static function covarianceDataProvider() : array
     {
         return [
             [
diff --git a/tests/Integration/ListVarianceTest.php b/tests/Integration/ListVarianceTest.php
@@ -6,7 +6,7 @@
 
 final class ListVarianceTest extends \PHPUnit\Framework\TestCase
 {
-    public function covarianceDataProvider() : array
+    public static function covarianceDataProvider() : array
     {
         return [
             [
@@ -112,7 +112,7 @@ protected function getFieldDefinition() : \Graphpinator\Typesystem\Field\FieldSe
         }
     }
 
-    public function covarianceDataProviderInner() : array
+    public static function covarianceDataProviderInner() : array
     {
         return [
             [
diff --git a/tests/Integration/StringVarianceTest.php b/tests/Integration/StringVarianceTest.php
@@ -6,7 +6,7 @@
 
 final class StringVarianceTest extends \PHPUnit\Framework\TestCase
 {
-    public function covarianceDataProvider() : array
+    public static function covarianceDataProvider() : array
     {
         return [
             [
diff --git a/tests/Integration/TestSchema.php b/tests/Integration/TestSchema.php
@@ -6,8 +6,6 @@
 
 final class TestSchema
 {
-    use \Nette\StaticClass;
-
     private static array $types = [];
     private static ?\Graphpinator\ConstraintDirectives\ConstraintDirectiveAccessor $accessor = null;
     private static ?\Graphpinator\Typesystem\Container $container = null;
diff --git a/tests/Integration/UploadTest.php b/tests/Integration/UploadTest.php
@@ -6,7 +6,7 @@
 
 final class UploadTest extends \PHPUnit\Framework\TestCase
 {
-    public function simpleUploadDataProvider() : array
+    public static function simpleUploadDataProvider() : array
     {
         return [
             [
@@ -24,7 +24,7 @@ public function simpleUploadDataProvider() : array
         ];
     }
 
-    public function invalidUploadDataProvider() : array
+    public static function invalidUploadDataProvider() : array
     {
         return [
             [
@@ -38,7 +38,7 @@ public function invalidUploadDataProvider() : array
         ];
     }
 
-    public function requestDataProvider() : array
+    public static function requestDataProvider() : array
     {
         return [
             [
@@ -68,7 +68,7 @@ public function requestDataProvider() : array
         ];
     }
 
-    public function requestInvalidDataProvider() : array
+    public static function requestInvalidDataProvider() : array
     {
         return [
             [
@@ -110,7 +110,7 @@ public function testUploadSimple(array $constraint) : void
         $file->method('getStream')->willReturn($stream);
         $file->method('getSize')->willReturn(5000);
         $fileProvider = $this->createStub(\Graphpinator\Upload\FileProvider::class);
-        $fileProvider->method('getMap')->willReturn(\Infinityloop\Utils\Json\MapJson::fromString('{ "0": ["variables.var1"] }'));
+        $fileProvider->method('getMap')->willReturn(\Infinityloop\Utils\Json::fromString('{ "0": ["variables.var1"] }'));
         $fileProvider->method('getFile')->willReturn($file);
         self::getGraphpinator($fileProvider, $constraint)
             ->run(new \Graphpinator\Request\JsonRequestFactory($request));
@@ -137,11 +137,11 @@ public function testUploadInvalid(array $constraint, string $exception) : void
         $file->method('getStream')->willReturn($stream);
         $file->method('getSize')->willReturn(5000);
         $fileProvider = $this->createStub(\Graphpinator\Upload\FileProvider::class);
-        $fileProvider->method('getMap')->willReturn(\Infinityloop\Utils\Json\MapJson::fromString('{ "0": ["variables.var1"] }'));
+        $fileProvider->method('getMap')->willReturn(\Infinityloop\Utils\Json::fromString('{ "0": ["variables.var1"] }'));
         $fileProvider->method('getFile')->willReturn($file);
 
-        self::expectException($exception);
-        self::expectExceptionMessage(\constant($exception . '::MESSAGE'));
+        $this->expectException($exception);
+        $this->expectExceptionMessage(\constant($exception . '::MESSAGE'));
 
         self::getGraphpinator($fileProvider, $constraint)
             ->run(new \Graphpinator\Request\JsonRequestFactory($request));
@@ -162,7 +162,7 @@ public function testUploadRequest(\Infinityloop\Utils\Json $request, string $map
         $file->method('getStream')->willReturn($stream);
         $file->method('getSize')->willReturn(5000);
         $fileProvider = $this->createStub(\Graphpinator\Upload\FileProvider::class);
-        $fileProvider->method('getMap')->willReturn(\Infinityloop\Utils\Json\MapJson::fromString($map));
+        $fileProvider->method('getMap')->willReturn(\Infinityloop\Utils\Json::fromString($map));
         $fileProvider->method('getFile')->willReturn($file);
         self::getGraphpinator($fileProvider, $constraint)
             ->run(new \Graphpinator\Request\JsonRequestFactory($request));
@@ -185,11 +185,11 @@ public function testUploadRequestInvalid(\Infinityloop\Utils\Json $request, stri
         $file->method('getStream')->willReturn($stream);
         $file->method('getSize')->willReturn(5000);
         $fileProvider = $this->createStub(\Graphpinator\Upload\FileProvider::class);
-        $fileProvider->method('getMap')->willReturn(\Infinityloop\Utils\Json\MapJson::fromString($map));
+        $fileProvider->method('getMap')->willReturn(\Infinityloop\Utils\Json::fromString($map));
         $fileProvider->method('getFile')->willReturn($file);
 
-        self::expectException($exception);
-        self::expectExceptionMessage(\constant($exception . '::MESSAGE'));
+        $this->expectException($exception);
+        $this->expectExceptionMessage(\constant($exception . '::MESSAGE'));
 
         self::getGraphpinator($fileProvider, $constraint)
             ->run(new \Graphpinator\Request\JsonRequestFactory($request));
diff --git a/tests/Integration/UploadVarianceTest.php b/tests/Integration/UploadVarianceTest.php
@@ -32,7 +32,7 @@ static function (?\Psr\Http\Message\UploadedFileInterface $file) : string {
         };
     }
 
-    public function covarianceDataProvider() : array
+    public static function covarianceDataProvider() : array
     {
         return [
             [

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`final class ConstraintArgumentTest extends \PHPUnit\Framework\TestCase`
`10`	`10`	`{`
`11`		`- public function argumentDataProvider() : array`
	`11`	`+ public static function argumentDataProvider() : array`
`12`	`12`	`{`
`13`	`13`	`return [`
`14`	`14`	`[`
`@@ -130,7 +130,7 @@ public function testArgument(Json $request, Json $expected) : void`
`130`	`130`	`self::assertNull($result->getErrors());`
`131`	`131`	`}`
`132`	`132`
`133`		`- public function argumentInvalidDataProvider() : array`
	`133`	`+ public static function argumentInvalidDataProvider() : array`
`134`	`134`	`{`
`135`	`135`	`return [`
`136`	`136`	`[`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`final class ConstraintFieldTest extends \PHPUnit\Framework\TestCase`
`10`	`10`	`{`
`11`		`- public function fieldDataProvider() : array`
	`11`	`+ public static function fieldDataProvider() : array`
`12`	`12`	`{`
`13`	`13`	`return [`
`14`	`14`	`[`
`@@ -175,7 +175,7 @@ public function testField(array $settings, Json $expected) : void`
`175`	`175`	`);`
`176`	`176`	`}`
`177`	`177`
`178`		`- public function fieldInvalidDataProvider() : array`
	`178`	`+ public static function fieldInvalidDataProvider() : array`
`179`	`179`	`{`
`180`	`180`	`return [`
`181`	`181`	`[`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`final class ConstraintVariableTest extends \PHPUnit\Framework\TestCase`
`10`	`10`	`{`
`11`		`- public function variableDataProvider() : array`
	`11`	`+ public static function variableDataProvider() : array`
`12`	`12`	`{`
`13`	`13`	`return [`
`14`	`14`	`[`
`@@ -56,7 +56,7 @@ public function testVariable(Json $request) : void`
`56`	`56`	`);`
`57`	`57`	`}`
`58`	`58`
`59`		`- public function variableInvalidDataProvider() : array`
	`59`	`+ public static function variableInvalidDataProvider() : array`
`60`	`60`	`{`
`61`	`61`	`return [`
`62`	`62`	`[`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`final class FloatVarianceTest extends \PHPUnit\Framework\TestCase`
`8`	`8`	`{`
`9`		`- public function covarianceDataProvider() : array`
	`9`	`+ public static function covarianceDataProvider() : array`
`10`	`10`	`{`
`11`	`11`	`return [`
`12`	`12`	`[`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`final class IntVarianceTest extends \PHPUnit\Framework\TestCase`
`8`	`8`	`{`
`9`		`- public function covarianceDataProvider() : array`
	`9`	`+ public static function covarianceDataProvider() : array`
`10`	`10`	`{`
`11`	`11`	`return [`
`12`	`12`	`[`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`	`final class ListVarianceTest extends \PHPUnit\Framework\TestCase`
`8`	`8`	`{`
`9`		`- public function covarianceDataProvider() : array`
	`9`	`+ public static function covarianceDataProvider() : array`
`10`	`10`	`{`
`11`	`11`	`return [`
`12`	`12`	`[`
`@@ -112,7 +112,7 @@ protected function getFieldDefinition() : \Graphpinator\Typesystem\Field\FieldSe`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`
`115`		`- public function covarianceDataProviderInner() : array`
	`115`	`+ public static function covarianceDataProviderInner() : array`
`116`	`116`	`{`
`117`	`117`	`return [`
`118`	`118`	`[`