CursorId should always serialize id as string

Author: jmikola

src/MongoDB/CursorId.c

@@ -75,11 +75,7 @@ static HashTable* php_phongo_cursorid_get_properties_hash(phongo_compat_object_h
 		zval value;
 
 		if (is_serialize) {
-			if (intern->id > INT32_MAX || intern->id < INT32_MIN) {
-				ZVAL_INT64_STRING(&value, intern->id);
-			} else {
-				ZVAL_LONG(&value, intern->id);
-			}
+			ZVAL_INT64_STRING(&value, intern->id);
 		} else {
 #if SIZEOF_ZEND_LONG == 4
 			if (intern->id > INT32_MAX || intern->id < INT32_MIN) {

tests/cursorid/cursorid-serialization-001.phpt

@@ -8,22 +8,43 @@ MongoDB\Driver\CursorId serialization (Serializable interface)
 
 require_once __DIR__ . "/../utils/basic.inc";
 
-$serialized = 'C:23:"MongoDB\Driver\CursorId":42:{a:1:{s:2:"id";s:19:"7250031947823432848";}}';
+$tests = [
+    unserialize('C:23:"MongoDB\Driver\CursorId":42:{a:1:{s:2:"id";s:19:"7250031947823432848";}}'),
+    unserialize('C:23:"MongoDB\Driver\CursorId":23:{a:1:{s:2:"id";s:1:"0";}}'),
+];
 
-$cursorId = unserialize($serialized);
-
-var_dump($cursorId);
-var_dump($cursorId instanceof Serializable);
-echo serialize($cursorId), "\n";
+foreach ($tests as $test) {
+    var_dump($test);
+    var_dump($test instanceof Serializable);
+    echo $s = serialize($test), "\n";
+    var_dump(unserialize($s));
+    echo "\n";
+}
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
 object(MongoDB\Driver\CursorId)#%d (%d) {
   ["id"]=>
-  %rint\(\d+\)|string\(\d+\) "\d+"%r
+  %rint\(7250031947823432848\)|string\(19\) "7250031947823432848"%r
 }
 bool(true)
 C:23:"MongoDB\Driver\CursorId":42:{a:1:{s:2:"id";s:19:"7250031947823432848";}}
+object(MongoDB\Driver\CursorId)#%d (%d) {
+  ["id"]=>
+  %rint\(7250031947823432848\)|string\(19\) "7250031947823432848"%r
+}
+
+object(MongoDB\Driver\CursorId)#%d (%d) {
+  ["id"]=>
+  int(0)
+}
+bool(true)
+C:23:"MongoDB\Driver\CursorId":23:{a:1:{s:2:"id";s:1:"0";}}
+object(MongoDB\Driver\CursorId)#%d (%d) {
+  ["id"]=>
+  int(0)
+}
+
 ===DONE===

tests/cursorid/cursorid-serialization-002.phpt

@@ -8,22 +8,40 @@ MongoDB\Driver\CursorId serialization (__serialize and __unserialize)
 
 require_once __DIR__ . "/../utils/basic.inc";
 
-$serialized = 'O:23:"MongoDB\Driver\CursorId":1:{s:2:"id";s:19:"7250031947823432848";}';
+$tests = [
+    unserialize('O:23:"MongoDB\Driver\CursorId":1:{s:2:"id";s:19:"7250031947823432848";}'),
+    unserialize('O:23:"MongoDB\Driver\CursorId":1:{s:2:"id";s:1:"0";}'),
+];
 
-$cursorId = unserialize($serialized);
-
-var_dump($cursorId);
-var_dump($cursorId instanceof Serializable);
-echo serialize($cursorId), "\n";
+foreach ($tests as $test) {
+    var_dump($test);
+    echo $s = serialize($test), "\n";
+    var_dump(unserialize($s));
+    echo "\n";
+}
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
 object(MongoDB\Driver\CursorId)#%d (%d) {
   ["id"]=>
-  %rint\(\d+\)|string\(\d+\) "\d+"%r
+  %rint\(7250031947823432848\)|string\(19\) "7250031947823432848"%r
 }
-bool(true)
 O:23:"MongoDB\Driver\CursorId":1:{s:2:"id";s:19:"7250031947823432848";}
+object(MongoDB\Driver\CursorId)#%d (%d) {
+  ["id"]=>
+  %rint\(7250031947823432848\)|string\(19\) "7250031947823432848"%r
+}
+
+object(MongoDB\Driver\CursorId)#%d (%d) {
+  ["id"]=>
+  int(0)
+}
+O:23:"MongoDB\Driver\CursorId":1:{s:2:"id";s:1:"0";}
+object(MongoDB\Driver\CursorId)#%d (%d) {
+  ["id"]=>
+  int(0)
+}
+
 ===DONE===