PHPC-654: Timestamp comparison handler

Author: jmikola

src/BSON/Timestamp.c

@@ -427,6 +427,25 @@ phongo_create_object_retval php_phongo_timestamp_create_object(zend_class_entry
 #endif
 } /* }}} */
 
+static int php_phongo_timestamp_compare_objects(zval *o1, zval *o2 TSRMLS_DC) /* {{{ */
+{
+	php_phongo_timestamp_t *intern1, *intern2;
+
+	intern1 = Z_TIMESTAMP_OBJ_P(o1);
+	intern2 = Z_TIMESTAMP_OBJ_P(o2);
+
+	/* MongoDB compares the timestamp before the increment. */
+	if (intern1->timestamp != intern2->timestamp) {
+		return intern1->timestamp < intern2->timestamp ? -1 : 1;
+	}
+
+	if (intern1->increment != intern2->increment) {
+		return intern1->increment < intern2->increment ? -1 : 1;
+	}
+
+	return 0;
+} /* }}} */
+
 HashTable *php_phongo_timestamp_get_properties(zval *object TSRMLS_DC) /* {{{ */
 {
 	php_phongo_timestamp_t *intern;
@@ -490,6 +509,7 @@ PHP_MINIT_FUNCTION(Timestamp)
 	zend_class_implements(php_phongo_timestamp_ce TSRMLS_CC, 1, zend_ce_serializable);
 
 	memcpy(&php_phongo_handler_timestamp, phongo_get_std_object_handlers(), sizeof(zend_object_handlers));
+	php_phongo_handler_timestamp.compare_objects = php_phongo_timestamp_compare_objects;
 	php_phongo_handler_timestamp.get_properties = php_phongo_timestamp_get_properties;
 #if PHP_VERSION_ID >= 70000
 	php_phongo_handler_timestamp.free_obj = php_phongo_timestamp_free_object;

tests/bson/bson-timestamp-compare-001.phpt

@@ -0,0 +1,29 @@
+--TEST--
+MongoDB\BSON\Timestamp comparisons
+--FILE--
+<?php
+
+var_dump(new MongoDB\BSON\Timestamp(1234, 5678) == new MongoDB\BSON\Timestamp(1234, 5678));
+var_dump(new MongoDB\BSON\Timestamp(1234, 5678) < new MongoDB\BSON\Timestamp(1234, 5678));
+var_dump(new MongoDB\BSON\Timestamp(1234, 5678) > new MongoDB\BSON\Timestamp(1234, 5678));
+
+// Timestamp is compared first
+var_dump(new MongoDB\BSON\Timestamp(1234, 5678) < new MongoDB\BSON\Timestamp(1233, 5679));
+var_dump(new MongoDB\BSON\Timestamp(1234, 5678) > new MongoDB\BSON\Timestamp(1235, 5677));
+
+// Increment is compared second
+var_dump(new MongoDB\BSON\Timestamp(1234, 5678) < new MongoDB\BSON\Timestamp(1235, 5678));
+var_dump(new MongoDB\BSON\Timestamp(1234, 5678) > new MongoDB\BSON\Timestamp(1233, 5678));
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+bool(true)
+bool(false)
+bool(false)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+===DONE===