Require webonyx/graphql-php:^15 (#10)

Co-authored-by: Simon Podlipsky <[email protected]>

Author: spawnia

CHANGELOG.md

@@ -5,10 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-[GitHub Releases](https://github.com/mll-lab/graphql-php-scalars/releases).
+[See GitHub Releases](https://github.com/mll-lab/graphql-php-scalars/releases).
 
 ## Unreleased
 
+### Changed
+
+- Require `webonyx/graphql-php:^15`
+
+### Removed
+
+- Drop support for PHP 7.4
+
 ## v5.4.1
 
 ### Changed

composer.json

@@ -19,7 +19,7 @@
     "egulias/email-validator": "^2.1.17 || ^3",
     "spatie/regex": "^1.4 || ^2 || ^3",
     "thecodingmachine/safe": "^1.3 || ^2",
-    "webonyx/graphql-php": "^0.13.9 || ^14"
+    "webonyx/graphql-php": "^15"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.16",

phpunit.xml

@@ -1,22 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+    bootstrap="vendor/autoload.php"
+    colors="true">
     <testsuites>
         <testsuite name="mll-lab/graphql-php-scalars Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">src</directory>
-        </whitelist>
-    </filter>
+    <coverage>
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
 </phpunit>

src/Date.php

@@ -4,7 +4,7 @@
 
 class Date extends DateScalar
 {
-    public $description /** @lang Markdown */
+    public ?string $description /** @lang Markdown */
         = 'A date string with format `Y-m-d`, e.g. `2011-05-23`.';
 
     protected static function outputFormat(): string

src/DateTime.php

@@ -4,7 +4,7 @@
 
 class DateTime extends DateScalar
 {
-    public $description /** @lang Markdown */
+    public ?string $description /** @lang Markdown */
         = 'A datetime string with format `Y-m-d H:i:s`, e.g. `2018-05-23 13:43:32`.';
 
     protected static function outputFormat(): string

src/DateTimeTz.php

@@ -4,7 +4,7 @@
 
 class DateTimeTz extends DateScalar
 {
-    public $description /** @lang Markdown */
+    public ?string $description /** @lang Markdown */
         = 'A datetime string with format `Y-m-d\TH:i:s.uP`, e.g. `2020-04-20T16:20:04.000000+04:00`.';
 
     protected static function outputFormat(): string

src/Email.php

@@ -7,7 +7,7 @@
 
 class Email extends StringScalar
 {
-    public $description /** @lang Markdown */
+    public ?string $description /** @lang Markdown */
         = 'A [RFC 5321](https://tools.ietf.org/html/rfc5321) compliant email.';
 
     protected function isValid(string $stringValue): bool

src/JSON.php

@@ -9,7 +9,7 @@
 
 class JSON extends ScalarType
 {
-    public $description /** @lang Markdown */
+    public ?string $description /** @lang Markdown */
         = 'Arbitrary data encoded in JavaScript Object Notation. See https://www.json.org.';
 
     public function serialize($value): string

src/MixedScalar.php

@@ -7,9 +7,9 @@
 
 class MixedScalar extends ScalarType
 {
-    public $name = 'Mixed';
+    public string $name = 'Mixed';
 
-    public $description = /** @lang Markdown */ <<<'DESCRIPTION'
+    public ?string $description = /** @lang Markdown */ <<<'DESCRIPTION'
         Loose type that allows any value. Be careful when passing in large `Int` or `Float` literals,
         as they may not be parsed correctly on the server side. Use `String` literals if you are
         dealing with really large numbers to be on the safe side.

src/NullScalar.php

@@ -6,19 +6,20 @@
 use GraphQL\Error\InvariantViolation;
 use GraphQL\Language\AST\NullValueNode;
 use GraphQL\Type\Definition\ScalarType;
-use GraphQL\Utils\Utils;
 
 class NullScalar extends ScalarType
 {
-    public $name = 'Null';
+    public const ONLY_NULL_IS_ALLOWED = 'Only null is allowed.';
 
-    public $description /** @lang Markdown */
+    public string $name = 'Null';
+
+    public ?string $description /** @lang Markdown */
         = 'Always `null`. Strictly validates value is non-null, no coercion.';
 
     public function serialize($value)
     {
         if (null !== $value) {
-            throw new InvariantViolation(static::notNullMessage($value));
+            throw new InvariantViolation(self::ONLY_NULL_IS_ALLOWED);
         }
 
         return null;
@@ -27,7 +28,7 @@ public function serialize($value)
     public function parseValue($value)
     {
         if (null !== $value) {
-            throw new Error(static::notNullMessage($value));
+            throw new Error(self::ONLY_NULL_IS_ALLOWED);
         }
 
         return null;
@@ -36,20 +37,9 @@ public function parseValue($value)
     public function parseLiteral($valueNode, ?array $variables = null)
     {
         if (! $valueNode instanceof NullValueNode) {
-            // Intentionally without message, as all information is already present in the wrapped error
-            throw new Error('');
+            throw new Error(self::ONLY_NULL_IS_ALLOWED);
         }
 
         return null;
     }
-
-    /**
-     * @param mixed $value any non-null value
-     */
-    public static function notNullMessage($value): string
-    {
-        $notNull = Utils::printSafeJson($value);
-
-        return "Expected null, got: {$notNull}.";
-    }
 }