Allow opitonal upload

overblog · Feb 4, 2018 · e24f44a · e24f44a
1 parent aa38205
commit e24f44a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/Tests/Functional/App/config/upload/mapping/schema.types.yaml b/Tests/Functional/App/config/upload/mapping/schema.types.yaml
@@ -15,9 +15,9 @@ Mutation:
         fields:
             singleUpload:
                 type: String!
-                resolve: '@=args["file"].getBasename()'
+                resolve: '@=null===args["file"] ? "Sorry, No file was uploaded." : args["file"].getBasename()'
                 args:
-                    file: Upload!
+                    file: Upload
             multipleUpload:
                 type: '[String!]'
                 resolve: '@=[args["files"][0].getBasename(), args["files"][1].getBasename()]'

diff --git a/Tests/Functional/Upload/UploadTest.php b/Tests/Functional/Upload/UploadTest.php
@@ -23,6 +23,21 @@ public function testSingleUpload()
         );
     }
 
+    public function testOptionalUpload()
+    {
+        $this->assertUpload(
+            ['data' => ['singleUpload' => 'Sorry, No file was uploaded.']],
+            [
+                'operations' => [
+                    'query' => 'mutation($file: Upload) { singleUpload(file: $file) }',
+                    'variables' => ['file' => null],
+                ],
+                'map' => [],
+            ],
+            []
+        );
+    }
+
     public function testMultipleUpload()
     {
         $this->assertUpload(

diff --git a/Upload/Type/GraphQLUploadType.php b/Upload/Type/GraphQLUploadType.php
@@ -27,9 +27,9 @@ public function __construct($name = null)
      */
     public function parseValue($value)
     {
-        if (!$value instanceof File) {
+        if (null !== $value && !$value instanceof File) {
             throw new InvariantViolation(sprintf(
-                'Upload should be instance of "%s" but %s given.',
+                'Upload should be null or instance of "%s" but %s given.',
                 File::class,
                 is_object($value) ? get_class($value) : gettype($value)
             ));