Merge pull request #106 from bjornpost/fix-domainobject-set

Make sure variable can be set to NULL if empty string before
lox · Apr 18, 2014 · e0f78a1 · e0f78a1
2 parents 9f59f08 + 945762e
commit e0f78a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/Pheasant/DomainObject.php b/lib/Pheasant/DomainObject.php
@@ -429,7 +429,7 @@ public function get($prop)
      */
     public function set($prop, $value)
     {
-        if (!isset($this->_data[$prop]) || $this->_data[$prop] != $value) {
+        if (!isset($this->_data[$prop]) || $this->_data[$prop] !== $value) {
             $this->_data[$prop] = $value;
             $this->_changed[] = $prop;
         }

diff --git a/tests/Pheasant/Tests/TypeMarshallingTest.php b/tests/Pheasant/Tests/TypeMarshallingTest.php
@@ -129,4 +129,13 @@ public function testDecimalTypesAreMarshalledCorrectInLocale()
 
         setlocale(LC_ALL, $prevLocale);
     }
+
+    public function testVariableIsNullable() {
+        $object = new DomainObject;
+        $object->weight = 88.5; // var type = double
+        $object->weight = ''; // var type = string
+        $object->weight = null;
+
+        $this->assertSame($object->weight, null);
+    }
 }