Merge pull request propelorm#768 from rvitaliy/fix-typehinting

fixed type-hinting in addDefaultMutator and added tests for it
cedriclombardot · Nov 11, 2013 · 93f9fc8 · 93f9fc8
2 parents 15384ff + 7b073a2
commit 93f9fc8
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 1 deletion.
diff --git a/generator/lib/builder/om/PHP5ObjectBuilder.php b/generator/lib/builder/om/PHP5ObjectBuilder.php
@@ -1986,8 +1986,16 @@ protected function addDefaultMutator(&$script, Column $col)
         // Perform type-casting to ensure that we can use type-sensitive
         // checking in mutators.
         if ($col->isPhpPrimitiveType()) {
+            if($col->isTextType()) {
+              $script .= "
+        if (\$v !== null) {";
+            } else {
+              $script .= "
+        if (\$v !== null && is_numeric(\$v)) {"; 
+            }
+
+
             $script .= "
-        if (\$v !== null && is_numeric(\$v)) {
             \$v = (" . $col->getPhpType() . ") \$v;
         }
 ";

diff --git a/test/testsuite/generator/builder/om/GeneratedObjectTest.php b/test/testsuite/generator/builder/om/GeneratedObjectTest.php
@@ -100,6 +100,48 @@ public function testDefaultValues()
         $acct->setPassword("testpass");
         $this->assertTrue($acct->isModified());
     }
+
+
+    public function testTypeHintingValues()
+    {
+        $test_name = 'test name';
+        $a = new Author();
+        $a2 = new Author();
+        $a2->setFirstName($test_name);
+
+
+        $a->setAge(2);
+        $this->assertEquals(2, $a->getAge());
+        $this->assertTrue(is_int($a->getAge()));
+
+
+        $a->clear();
+        $a->setAge('2');
+        $this->assertEquals(2, $a->getAge());
+        $this->assertTrue(is_int($a->getAge()));
+
+
+        $a->clear();
+        $a->setAge('wrong integer');
+        $this->assertTrue(!is_int($a->getAge()));
+
+
+        $a->clear();
+        $a->setFirstName($test_name);
+        $this->assertEquals($test_name, $a->getFirstName());
+        $this->assertTrue(is_string($a->getFirstName()));
+
+
+        $a->clear();
+        $a->setFirstName($a2);
+        $this->assertTrue(is_string($a->getFirstName()));
+        $this->assertEquals($a->getFirstName(), (string)$a2);
+
+
+        $a->clear();
+        $a->setFirstName(true);
+        $this->assertTrue(is_string($a->getFirstName()));
+    }
 
     /**
      * Tests the use of default expressions and the reloadOnInsert and reloadOnUpdate attributes.