Add SORT_STRICT option to array_unique()

Provide a way to request the use of strict comparison (===) when
using `array_unique`.

Author: cscott

ext/standard/array.c

@@ -103,6 +103,7 @@ PHP_MINIT_FUNCTION(array) /* {{{ */
 
 	REGISTER_LONG_CONSTANT("SORT_REGULAR", PHP_SORT_REGULAR, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SORT_NUMERIC", PHP_SORT_NUMERIC, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("SORT_STRICT", PHP_SORT_STRICT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SORT_STRING", PHP_SORT_STRING, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SORT_LOCALE_STRING", PHP_SORT_LOCALE_STRING, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SORT_NATURAL", PHP_SORT_NATURAL, CONST_CS | CONST_PERSISTENT);
@@ -349,6 +350,22 @@ static zend_always_inline int php_array_data_compare_unstable_i(Bucket *f, Bucke
 }
 /* }}} */
 
+static zend_always_inline int php_array_data_compare_strict_unstable_i(Bucket *f, Bucket *s) /* {{{ */
+{
+	if (zend_is_identical(&f->val, &s->val)) {
+		return 0;
+	}
+	int c = zend_compare(&f->val, &s->val);
+	if (c != 0) {
+		return c;
+	}
+	// types must be different; compare based on type.
+	int t1 = Z_TYPE_P(&f->val);
+	int t2 = Z_TYPE_P(&s->val);
+	return (t1 < t2) ? -1 : 1;
+}
+/* }}} */
+
 static zend_always_inline int php_array_data_compare_numeric_unstable_i(Bucket *f, Bucket *s) /* {{{ */
 {
 	return numeric_compare_function(&f->val, &s->val);
@@ -405,6 +422,7 @@ DEFINE_SORT_VARIANTS(key_compare_string_case);
 DEFINE_SORT_VARIANTS(key_compare_string);
 DEFINE_SORT_VARIANTS(key_compare_string_locale);
 DEFINE_SORT_VARIANTS(data_compare);
+DEFINE_SORT_VARIANTS(data_compare_strict);
 DEFINE_SORT_VARIANTS(data_compare_numeric);
 DEFINE_SORT_VARIANTS(data_compare_string_case);
 DEFINE_SORT_VARIANTS(data_compare_string);
@@ -527,6 +545,14 @@ static bucket_compare_func_t php_get_data_compare_func(zend_long sort_type, int
 			}
 			break;
 
+		case PHP_SORT_STRICT:
+			if (reverse) {
+				return php_array_reverse_data_compare_strict;
+			} else {
+				return php_array_data_compare_strict;
+			}
+			break;
+
 		case PHP_SORT_REGULAR:
 		default:
 			if (reverse) {
@@ -591,6 +617,14 @@ static bucket_compare_func_t php_get_data_compare_func_unstable(zend_long sort_t
 			}
 			break;
 
+		case PHP_SORT_STRICT:
+			if (reverse) {
+				return php_array_reverse_data_compare_strict_unstable;
+			} else {
+				return php_array_data_compare_strict_unstable;
+			}
+			break;
+
 		case PHP_SORT_REGULAR:
 		default:
 			if (reverse) {

ext/standard/php_array.h

@@ -36,6 +36,7 @@ PHPAPI zend_long php_count_recursive(HashTable *ht);
 #define PHP_SORT_ASC                4
 #define PHP_SORT_LOCALE_STRING      5
 #define PHP_SORT_NATURAL            6
+#define PHP_SORT_STRICT             7
 #define PHP_SORT_FLAG_CASE          8
 
 #define COUNT_NORMAL      0

ext/standard/tests/array/array_unique_strict.phpt

@@ -0,0 +1,48 @@
+--TEST--
+Test array_unique() function : SORT_STRICT functionality
+--FILE--
+<?php
+echo "*** Testing array_unique() : SORT_STRICT functionality ***\n";
+
+var_dump( array_unique( [ "1234", 1234 ] ) );
+var_dump( array_unique( [ "1234", "1234" ], SORT_STRICT ) );
+var_dump( array_unique( [ "1234", 1234 ], SORT_STRICT ) );
+
+var_dump( array_unique( [ 0, "0", 0.0, '', null, null ] ) );
+var_dump( array_unique( [ 0, "0", 0.0, '', null, null ], SORT_STRICT ) );
+
+?>
+--EXPECT--
+*** Testing array_unique() : SORT_STRICT functionality ***
+array(1) {
+  [0]=>
+  string(4) "1234"
+}
+array(1) {
+  [0]=>
+  string(4) "1234"
+}
+array(2) {
+  [0]=>
+  string(4) "1234"
+  [1]=>
+  int(1234)
+}
+array(2) {
+  [0]=>
+  int(0)
+  [3]=>
+  string(0) ""
+}
+array(5) {
+  [0]=>
+  int(0)
+  [1]=>
+  string(1) "0"
+  [2]=>
+  float(0)
+  [3]=>
+  string(0) ""
+  [4]=>
+  NULL
+}