Merge pull request #87 from spatie/fix-null-values

Fix null values
spatie · Aug 7, 2019 · ad8d92d · ad8d92d
2 parents de66a62 + fc204c7
commit ad8d92d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ before_script:
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
 
 script:
-  - phpunit --coverage-text --coverage-clover=coverage.clover
+  - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
   - php vendor/bin/ocular code-coverage:upload --format=php-clover coverage.clover
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     "require-dev": {
         "graham-campbell/analyzer": "^2.1.1",
         "league/flysystem": "^1.0",
-        "phpunit/phpunit": "^6.0",
+        "phpunit/phpunit": "^6.0|^7.0|^8.0",
         "scrutinizer/ocular": "^1.5",
         "symfony/console": "^3.2",
         "symfony/css-selector": "^3.2",

diff --git a/generator/templates/static/BaseType.php b/generator/templates/static/BaseType.php
@@ -24,7 +24,9 @@ public function getType(): string
 
     public function setProperty(string $property, $value)
     {
-        $this->properties[$property] = $value;
+        if ($value !== null) {
+            $this->properties[$property] = $value;
+        }
 
         return $this;
     }

diff --git a/src/BaseType.php b/src/BaseType.php
@@ -24,7 +24,9 @@ public function getType(): string
 
     public function setProperty(string $property, $value)
     {
-        $this->properties[$property] = $value;
+        if ($value !== null) {
+            $this->properties[$property] = $value;
+        }
 
         return $this;
     }

diff --git a/tests/BaseTypeTest.php b/tests/BaseTypeTest.php
@@ -39,6 +39,16 @@ public function it_can_set_and_retrieve_a_property()
         $this->assertEquals(['foo' => 'bar'], $type->getProperties());
     }
 
+    /** @test */
+    public function it_can_not_set_a_null_value()
+    {
+        $type = new DummyType();
+
+        $type->setProperty('foo', null);
+
+        $this->assertEquals([], $type->getProperties());
+    }
+
     /** @test */
     public function it_can_conditionally_set_and_retrieve_a_property()
     {