disable cloning and use different functions

Author: BogdanUngureanu

ext/intl/listformatter/listformatter_class.c

@@ -113,19 +113,18 @@ PHP_METHOD(IntlListFormatter, __construct)
 PHP_METHOD(IntlListFormatter, format)
 {
     ListFormatter_object *obj = Z_INTL_LISTFORMATTER_P(ZEND_THIS);
-    zval *strings;
+    HashTable *ht;
 
     ZEND_PARSE_PARAMETERS_START(1, 1)
-        Z_PARAM_ARRAY(strings)
+        Z_PARAM_ARRAY_HT(ht)
     ZEND_PARSE_PARAMETERS_END();
 
     if (!LISTFORMATTER_OBJECT(obj)) {
         zend_throw_exception(NULL, "ListFormatter not properly constructed", 0);
         RETURN_FALSE;
     }
 
-    HashTable *ht = Z_ARRVAL_P(strings);
-    uint32_t count = zend_array_count(ht);
+    uint32_t count = zend_hash_num_elements(ht);
     if (count == 0) {
         RETURN_EMPTY_STRING();
     }
@@ -238,4 +237,5 @@ void listformatter_register_class(void)
     memcpy(&listformatter_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
     listformatter_handlers.offset = XtOffsetOf(ListFormatter_object, zo);
     listformatter_handlers.free_obj = listformatter_free_obj;
+    listformatter_handlers.clone_obj = NULL;
 }

ext/intl/listformatter/listformatter_class.h

@@ -49,4 +49,4 @@ static inline ListFormatter_object *php_intl_listformatter_fetch_object(zend_obj
 void listformatter_register_class( void );
 extern zend_class_entry *ListFormatter_ce_ptr;
 
-#endif // LISTFORMATTER_CLASS_H 
+#endif // LISTFORMATTER_CLASS_H 

ext/intl/tests/listformatter/listformatter_basic.phpt

@@ -58,4 +58,4 @@ test, test2, and test
 FR
 1, 2 et 3
 1, 2 et 3
-1.2, 2.3 et 3.4
+1.2, 2.3 et 3.4

ext/intl/tests/listformatter/listformatter_clone.phpt

@@ -0,0 +1,22 @@
+--TEST--
+Test IntlListFormatter cannot be cloned
+--SKIPIF--
+<?php
+if (!extension_loaded('intl')) {
+    die('skip intl extension not available');
+}
+?>
+--FILE--
+<?php
+
+$formatter = new IntlListFormatter('en_US', IntlListFormatter::TYPE_AND, IntlListFormatter::WIDTH_WIDE);
+
+try {
+    $clonedFormatter = clone $formatter;
+} catch(Error $error) {
+    echo $error->getMessage();
+}
+
+?>
+--EXPECT--
+Trying to clone an uncloneable object of class IntlListFormatter

ext/intl/tests/listformatter/listformatter_error.phpt

@@ -35,4 +35,4 @@ try {
 IntlListFormatter::__construct(): Argument #1 ($locale) "f" is invalid
 IntlListFormatter::__construct(): Argument #1 ($locale) Locale string too long, should be no longer than 156 characters
 Object of class stdClass could not be converted to string
-Object of class stdClass could not be converted to string
+Object of class stdClass could not be converted to string

ext/intl/tests/listformatter/listformatter_with_paramaters.phpt

@@ -123,4 +123,4 @@ FR
 1, 2 ou 3
 1, 2 et 3
 1, 2 et 3
-1 2 3
+1 2 3