Merge pull request silverstripe#126 from unclecheese/pulls/1.0/defaul…

…t-in-our-stars BUGFIX: Prevent defaultValue from being added to args when null
open-sausages · Jan 15, 2018 · 4e75efe · 4e75efe
2 parents 8dae954 + 8981b68
commit 4e75efe
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/Scaffolding/Scaffolders/ArgumentScaffolder.php b/src/Scaffolding/Scaffolders/ArgumentScaffolder.php
@@ -141,10 +141,15 @@ public function applyConfig(array $config)
      */
     public function toArray()
     {
-        return [
+        $args = [
             'description' => $this->description,
             'type' => $this->required ? Type::nonNull($this->type) : $this->type,
-            'defaultValue' => $this->defaultValue
         ];
+
+        if ($this->defaultValue !== null) {
+            $args['defaultValue'] = $this->defaultValue;
+        }
+
+        return $args;
     }
 }
diff --git a/tests/Scaffolding/Scaffolders/ArgumentScaffolderTest.php b/tests/Scaffolding/Scaffolders/ArgumentScaffolderTest.php
@@ -36,5 +36,9 @@ public function testArgumentScaffolder()
         $this->assertEquals('Bar', $arr['defaultValue']);
         $this->assertInstanceOf(NonNull::class, $arr['type']);
         $this->assertInstanceOf(StringType::class, $arr['type']->getWrappedType());
+
+        $scaffolder->setDefaultValue(null);
+        $arr = $scaffolder->toArray();
+        $this->assertArrayNotHasKey('defaultValue', $arr);
     }
 }