Merge branch 'master' of ssh://git.php.net/php-src

2 files changed, 492 insertions, 0 deletions

diff --git a/ext/mysql/tests/mysql_reflection_extension.phpt b/ext/mysql/tests/mysql_reflection_extension.phpt
new file mode 100644
index 0000000000..169036cd54
--- /dev/null
+++ b/ext/mysql/tests/mysql_reflection_extension.phpt
@@ -0,0 +1,105 @@
+--TEST--
+ReflectionExtension basics to check API
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+?>
+--FILE--
+<?php
+	$r = new ReflectionExtension("mysql");
+
+	printf("Name: %s\n", $r->name);
+	printf("Version: %s\n", $r->getVersion());
+	$classes = $r->getClasses();
+	if (!empty($classes)) {
+		printf("[002] Expecting no class\n");
+		asort($classes);
+		var_dump($classes);
+	}
+
+	$ignore = array();
+
+	$functions = $r->getFunctions();
+	asort($functions);
+	printf("Functions:\n");
+	foreach ($functions as $func) {
+		if (isset($ignore[$func->name])) {
+			unset($ignore[$func->name]);
+		} else {
+			printf("  %s\n", $func->name);
+		}
+	}
+	if (!empty($ignore)) {
+		printf("Dumping version dependent and missing functions\n");
+		var_dump($ignore);
+	}
+
+
+	print "done!";
+?>
+--EXPECTF--
+Name: mysql
+Version: 1.0
+Functions:
+  mysql
+  mysql_affected_rows
+  mysql_client_encoding
+  mysql_close
+  mysql_connect
+  mysql_data_seek
+  mysql_db_name
+  mysql_db_query
+  mysql_dbname
+  mysql_errno
+  mysql_error
+  mysql_escape_string
+  mysql_fetch_array
+  mysql_fetch_assoc
+  mysql_fetch_field
+  mysql_fetch_lengths
+  mysql_fetch_object
+  mysql_fetch_row
+  mysql_field_flags
+  mysql_field_len
+  mysql_field_name
+  mysql_field_seek
+  mysql_field_table
+  mysql_field_type
+  mysql_fieldflags
+  mysql_fieldlen
+  mysql_fieldname
+  mysql_fieldtable
+  mysql_fieldtype
+  mysql_free_result
+  mysql_freeresult
+  mysql_get_client_info
+  mysql_get_host_info
+  mysql_get_proto_info
+  mysql_get_server_info
+  mysql_info
+  mysql_insert_id
+  mysql_list_dbs
+  mysql_list_fields
+  mysql_list_processes
+  mysql_list_tables
+  mysql_listdbs
+  mysql_listfields
+  mysql_listtables
+  mysql_num_fields
+  mysql_num_rows
+  mysql_numfields
+  mysql_numrows
+  mysql_pconnect
+  mysql_ping
+  mysql_query
+  mysql_real_escape_string
+  mysql_result
+  mysql_select_db
+  mysql_selectdb
+  mysql_set_charset
+  mysql_stat
+  mysql_table_name
+  mysql_tablename
+  mysql_thread_id
+  mysql_unbuffered_query
+done!
\ No newline at end of file
diff --git a/ext/mysql/tests/mysql_reflection_functions.phpt b/ext/mysql/tests/mysql_reflection_functions.phpt
new file mode 100644
index 0000000000..4f2710d806
--- /dev/null
+++ b/ext/mysql/tests/mysql_reflection_functions.phpt
@@ -0,0 +1,387 @@
+--TEST--
+ReflectionFunction to check API
+--SKIPIF--
+<?php
+require_once('skipif.inc');
+?>
+--FILE--
+<?php
+	$r = new ReflectionExtension("mysql");
+
+	$ignore = array();
+
+	$functions = $r->getFunctions();
+	asort($functions);
+	printf("Functions:\n");
+	foreach ($functions as $func) {
+		if (isset($ignore[$func->name]))
+			continue;
+
+		printf("  %s\n", $func->name);
+		$rf = new ReflectionFunction($func->name);
+		printf("    Deprecated: %s\n", $rf->isDeprecated() ? "yes" : "no");
+		printf("    Accepted parameters: %d\n", $rf->getNumberOfParameters());
+		printf("    Required parameters: %d\n", $rf->getNumberOfRequiredParameters());
+		foreach( $rf->getParameters() as $param ) {
+			printf("      %s\n", $param);
+		}
+	}
+
+	print "done!";
+?>
+--EXPECTF--
+Functions:
+  mysql
+    Deprecated: yes
+    Accepted parameters: 3
+    Required parameters: 2
+      Parameter #0 [ <required> $database_name ]
+      Parameter #1 [ <required> $query ]
+      Parameter #2 [ <optional> $link_identifier ]
+  mysql_affected_rows
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_client_encoding
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_close
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_connect
+    Deprecated: no
+    Accepted parameters: 5
+    Required parameters: 0
+      Parameter #0 [ <optional> $hostname ]
+      Parameter #1 [ <optional> $username ]
+      Parameter #2 [ <optional> $password ]
+      Parameter #3 [ <optional> $new ]
+      Parameter #4 [ <optional> $flags ]
+  mysql_data_seek
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $row_number ]
+  mysql_db_name
+    Deprecated: no
+    Accepted parameters: 3
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $row ]
+      Parameter #2 [ <optional> $field ]
+  mysql_db_query
+    Deprecated: yes
+    Accepted parameters: 3
+    Required parameters: 2
+      Parameter #0 [ <required> $database_name ]
+      Parameter #1 [ <required> $query ]
+      Parameter #2 [ <optional> $link_identifier ]
+  mysql_dbname
+    Deprecated: yes
+    Accepted parameters: 3
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $row ]
+      Parameter #2 [ <optional> $field ]
+  mysql_errno
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_error
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_escape_string
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $string ]
+  mysql_fetch_array
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <optional> $result_type ]
+  mysql_fetch_assoc
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+  mysql_fetch_field
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <optional> $field_offset ]
+  mysql_fetch_lengths
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+  mysql_fetch_object
+    Deprecated: no
+    Accepted parameters: 3
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <optional> $class_name ]
+      Parameter #2 [ <optional> $ctor_params ]
+  mysql_fetch_row
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+  mysql_field_flags
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_offset ]
+  mysql_field_len
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_offset ]
+  mysql_field_name
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_index ]
+  mysql_field_seek
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_offset ]
+  mysql_field_table
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_offset ]
+  mysql_field_type
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_offset ]
+  mysql_fieldflags
+    Deprecated: yes
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_offset ]
+  mysql_fieldlen
+    Deprecated: yes
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_offset ]
+  mysql_fieldname
+    Deprecated: yes
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_index ]
+  mysql_fieldtable
+    Deprecated: yes
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_offset ]
+  mysql_fieldtype
+    Deprecated: yes
+    Accepted parameters: 2
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $field_offset ]
+  mysql_free_result
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+  mysql_freeresult
+    Deprecated: yes
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+  mysql_get_client_info
+    Deprecated: no
+    Accepted parameters: 0
+    Required parameters: 0
+  mysql_get_host_info
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_get_proto_info
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_get_server_info
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_info
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_insert_id
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_list_dbs
+    Deprecated: yes
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_list_fields
+    Deprecated: no
+    Accepted parameters: 3
+    Required parameters: 2
+      Parameter #0 [ <required> $database_name ]
+      Parameter #1 [ <required> $table_name ]
+      Parameter #2 [ <optional> $link_identifier ]
+  mysql_list_processes
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_list_tables
+    Deprecated: yes
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $database_name ]
+      Parameter #1 [ <optional> $link_identifier ]
+  mysql_listdbs
+    Deprecated: yes
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_listfields
+    Deprecated: yes
+    Accepted parameters: 3
+    Required parameters: 2
+      Parameter #0 [ <required> $database_name ]
+      Parameter #1 [ <required> $table_name ]
+      Parameter #2 [ <optional> $link_identifier ]
+  mysql_listtables
+    Deprecated: yes
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $database_name ]
+      Parameter #1 [ <optional> $link_identifier ]
+  mysql_num_fields
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+  mysql_num_rows
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+  mysql_numfields
+    Deprecated: yes
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+  mysql_numrows
+    Deprecated: yes
+    Accepted parameters: 1
+    Required parameters: 1
+      Parameter #0 [ <required> $result ]
+  mysql_pconnect
+    Deprecated: no
+    Accepted parameters: 4
+    Required parameters: 0
+      Parameter #0 [ <optional> $hostname ]
+      Parameter #1 [ <optional> $username ]
+      Parameter #2 [ <optional> $password ]
+      Parameter #3 [ <optional> $flags ]
+  mysql_ping
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_query
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $query ]
+      Parameter #1 [ <optional> $link_identifier ]
+  mysql_real_escape_string
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $string ]
+      Parameter #1 [ <optional> $link_identifier ]
+  mysql_result
+    Deprecated: no
+    Accepted parameters: 3
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $row ]
+      Parameter #2 [ <optional> $field ]
+  mysql_select_db
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $database_name ]
+      Parameter #1 [ <optional> $link_identifier ]
+  mysql_selectdb
+    Deprecated: yes
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $database_name ]
+      Parameter #1 [ <optional> $link_identifier ]
+  mysql_set_charset
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $charset_name ]
+      Parameter #1 [ <optional> $link_identifier ]
+  mysql_stat
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_table_name
+    Deprecated: no
+    Accepted parameters: 3
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $row ]
+      Parameter #2 [ <optional> $field ]
+  mysql_tablename
+    Deprecated: no
+    Accepted parameters: 3
+    Required parameters: 2
+      Parameter #0 [ <required> $result ]
+      Parameter #1 [ <required> $row ]
+      Parameter #2 [ <optional> $field ]
+  mysql_thread_id
+    Deprecated: no
+    Accepted parameters: 1
+    Required parameters: 0
+      Parameter #0 [ <optional> $link_identifier ]
+  mysql_unbuffered_query
+    Deprecated: no
+    Accepted parameters: 2
+    Required parameters: 1
+      Parameter #0 [ <required> $query ]
+      Parameter #1 [ <optional> $link_identifier ]
+done!
\ No newline at end of file