RFC: UUID (Namespaced)

Zend/zend_API.h

@@ -107,12 +107,67 @@ typedef struct _zend_fcall_info_cache {
 #define ZEND_ARG_VARIADIC_TYPE_INFO(pass_by_ref, name, type_hint, allow_null) { #name, ZEND_TYPE_ENCODE(type_hint, allow_null), pass_by_ref, 1 },
 #define ZEND_ARG_VARIADIC_OBJ_INFO(pass_by_ref, name, classname, allow_null)  { #name, ZEND_TYPE_ENCODE_CLASS_CONST(#classname, allow_null), pass_by_ref, 1 },
 
-
-#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, classname, allow_null) \
+/**
+ * Start extended argument information block with an object return type
+ * declaration.
+ *
+ * ## Examples
+ * ```c
+ * ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arg_info_f, 0, 0, T, 0)
+ * ZEND_END_ARG_INFO()
+ * ```
+ *
+ * Above example argument information applied to a function _f_ would result in
+ * the following PHP function signature:
+ *
+ * ```php
+ * function f(): T {}
+ * ```
+ *
+ * @param[in] name
+ *     of the variable where the argument information should be assigned to.
+ * @param[in] return_reference
+ *     whether the routine returns by reference (`1`) or not (`0`).
+ * @param[in] required_num_args
+ *     total amount of required (non-optional) arguments of the routine.
+ * @param[in] class_name
+ *     of the object that this routine must return.
+ * @param[in] allow_null
+ *     whether the routine's return type is nullable (`1`) or not (`0`).
+ * @see ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO
+ *     for routines that do not take any arguments.
+ */
+#define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, return_reference, required_num_args, class_name, allow_null) \
 	static const zend_internal_arg_info name[] = { \
-		{ (const char*)(zend_uintptr_t)(required_num_args), ZEND_TYPE_ENCODE_CLASS_CONST(#classname, allow_null), return_reference, 0 },
+		{ (const char*)(zend_uintptr_t)(required_num_args), ZEND_TYPE_ENCODE_CLASS_CONST(#class_name, allow_null), return_reference, 0 },
+
+/**
+ * Start argument information block with return object return type declaration.
+ *
+ * ## Examples
+ * ```c
+ * ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(arg_info_f, T, 0)
+ * ZEND_END_ARG_INFO()
+ * ```
+ *
+ * Above example argument information applied to a function _f_ would result
+ * in the following PHP function signature:
+ *
+ * ```php
+ * function f(): T {}
+ * ```
+ *
+ * @param[in] name
+ *     of the variable where the argument information should be assigned to.
+ * @param[in] class_name
+ *     of the object that this routine must return.
+ * @param[in] allow_null
+ *     whether the routine's return type is nullable (`1`) or not (`0`).
+ * @see ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX
+ *     which allows the specification of the total amount of required arguments.
+ */
 #define ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO(name, class_name, allow_null) \
-	ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, 0, -1, class_name, allow_null)
+	ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(name, 0, -1, class_name, allow_null)
 
 #define ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, allow_null) \
 	static const zend_internal_arg_info name[] = { \

ext/reflection/tests/ReflectionExtension_getClassNames_basic.phpt

@@ -2,21 +2,24 @@
 ReflectionExtension::getClassNames() method on an extension which actually returns some information
 --CREDITS--
 Felix De Vliegher <felix.devliegher@gmail.com>
+Richard Fussenegger <php@fleshgrinder.com>
 --FILE--
 <?php
 $standard = new ReflectionExtension('standard');
 var_dump($standard->getClassNames());
 ?>
-==DONE==
---EXPECTF--
-array(4) {
+--EXPECT--
+array(6) {
   [0]=>
-  %s(22) "__PHP_Incomplete_Class"
+  string(22) "__PHP_Incomplete_Class"
   [1]=>
-  %s(15) "php_user_filter"
+  string(15) "php_user_filter"
   [2]=>
-  %s(9) "Directory"
+  string(9) "Directory"
   [3]=>
-  %s(14) "AssertionError"
+  string(14) "AssertionError"
+  [4]=>
+  string(12) "PHP\Std\UUID"
+  [5]=>
+  string(26) "PHP\Std\UUIDParseException"
 }
-==DONE==

ext/standard/basic_functions.c

@@ -3707,6 +3707,7 @@ PHP_MINIT_FUNCTION(basic) /* {{{ */
 #endif
 
 	BASIC_MINIT_SUBMODULE(random)
+	BASIC_MINIT_SUBMODULE(uuid)
 
 	return SUCCESS;
 }

ext/standard/config.m4

@@ -455,7 +455,7 @@ PHP_NEW_EXTENSION(standard, array.c base64.c basic_functions.c browscap.c crc32.
                             http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \
                             var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \
                             filters.c proc_open.c streamsfuncs.c http.c password.c \
-                            random.c,,,
+                            random.c uuid.c,,,
 			    -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
 
 PHP_ADD_MAKEFILE_FRAGMENT

ext/standard/config.w32

@@ -31,7 +31,7 @@ EXTENSION("standard", "array.c base64.c basic_functions.c browscap.c \
 	url_scanner_ex.c ftp_fopen_wrapper.c http_fopen_wrapper.c \
 	php_fopen_wrapper.c credits.c css.c var_unserializer.c ftok.c sha1.c \
 	user_filters.c uuencode.c filters.c proc_open.c password.c \
-	streamsfuncs.c http.c flock_compat.c random.c", false /* never shared */,
+	streamsfuncs.c http.c flock_compat.c random.c uuid.c", false /* never shared */,
 	'/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1');
 	PHP_INSTALL_HEADERS("", "ext/standard");
 if (PHP_MBREGEX != "no") {

ext/standard/php_standard.h

@@ -60,10 +60,14 @@
 #include "php_type.h"
 #include "php_password.h"
 #include "php_random.h"
+#include "php_uuid.h"
 
 #include "php_version.h"
 #define PHP_STANDARD_VERSION PHP_VERSION
 
+/* PHP standard module namespace. */
+#define PHP_STD_NAMESPACE PHP_NAMESPACE PHP_NAMESPACE_SEPARATOR "Std"
+
 #define phpext_standard_ptr basic_functions_module_ptr
 PHP_MINIT_FUNCTION(standard_filters);
 PHP_MSHUTDOWN_FUNCTION(standard_filters);