Doctrine

Timestamp:

08/08/08 04:22:07 (20 months ago)

Author:

guilhermeblanco

Message:

fixes #1112. Package sfYaml now handles overflows with int values and consider them as string. Updated tests to add coverage to it.

Location:

branches/1.0

Files:

• lib/Doctrine/Parser/sfYaml/Inline.php (modified) (1 diff)
• tests/Data/ImportTestCase.php (modified) (4 diffs)

branches/1.0/lib/Doctrine/Parser/sfYaml/Inline.php

@@ -371 +371 @@
         return unserialize(substr($scalar, 13));
       case ctype_digit($scalar):
-        return '0' == $scalar[0] ? octdec($scalar) : intval($scalar);
+        $raw = $scalar;
+        $cast = intval($scalar);
+
+        return '0' == $scalar[0]
+          ? octdec($scalar) : (((string) $raw == (string) $cast) ? strval($cast) : $raw);
       case in_array(strtolower($scalar), array('true', 'on', '+', 'yes', 'y')):
         return true;

branches/1.0/tests/Data/ImportTestCase.php

@@ -55 +55 @@
     Phonenumber: 
       Phonenumber_1: 
-        phonenumber: 615-513-9185
+        phonenumber: 6155139185
 END;
         try {
@@ -71 +71 @@
             $this->assertEqual($user->name, 'jwage');
             $this->assertEqual($user->Phonenumber->count(), 1);
-            $this->assertEqual($user->Phonenumber[0]->phonenumber, '615-513-9185');
+            $this->assertEqual($user->Phonenumber[0]->phonenumber, '6155139185');
             
             $data = new Doctrine_Data();
@@ -135 +135 @@
 Phonenumber:
   Phonenumber_1:
-    phonenumber: 615-513-9185
+    phonenumber: 6155139185
   Phonenumber_2:
-    phonenumber: 615-313-7679
+    phonenumber: 6153137679
 END;
         try {
@@ -153 +153 @@
             $this->assertEqual($user->name, 'jwage2');
             $this->assertEqual($user->Phonenumber->count(), 2);
-            $this->assertEqual($user->Phonenumber[0]->phonenumber, '615-513-9185');
-            $this->assertEqual($user->Phonenumber[1]->phonenumber, '615-313-7679');
+            $this->assertEqual($user->Phonenumber[0]->phonenumber, '6155139185');
+            $this->assertEqual($user->Phonenumber[1]->phonenumber, '6153137679');
 
             $this->pass();