Add more verbose var_dump

huotianjun · Jan 17, 2014 · 7150aeb · 7150aeb
1 parent 21d1a0d
commit 7150aeb
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 3 deletions.
diff --git a/amqp_channel.c b/amqp_channel.c
@@ -80,6 +80,10 @@ HashTable *amqp_channel_object_get_debug_info(zval *object, int *is_temp TSRMLS_
 	ZVAL_LONG(value, channel->prefetch_size);
 	zend_hash_add(debug_info, "prefetch_size", sizeof("prefetch_size"), &value, sizeof(zval *), NULL);
 
+	MAKE_STD_ZVAL(value);
+	ZVAL_BOOL(value, channel->is_connected);
+	zend_hash_add(debug_info, "is_connected", sizeof("is_connected"), &value, sizeof(zval *), NULL);
+
 	/* Start adding values */
 	return debug_info;
 }

diff --git a/amqp_connection.c b/amqp_connection.c
@@ -107,6 +107,10 @@ HashTable *amqp_connection_object_get_debug_info(zval *object, int *is_temp TSRM
 	ZVAL_DOUBLE(value, connection->connect_timeout);
 	zend_hash_add(debug_info, "connect_timeout", sizeof("connect_timeout"), &value, sizeof(zval *), NULL);
 
+	MAKE_STD_ZVAL(value);
+	ZVAL_BOOL(value, connection->is_connected);
+	zend_hash_add(debug_info, "is_connected", sizeof("is_connected"), &value, sizeof(zval *), NULL);
+
 	/* Start adding values */
 	return debug_info;
 }

diff --git a/tests/amqpchannel_var_dump.phpt b/tests/amqpchannel_var_dump.phpt
@@ -11,15 +11,30 @@ if (!extension_loaded("amqp") || version_compare(PHP_VERSION, '5.3', '<')) {
 $cnn = new AMQPConnection();
 $cnn->connect();
 $ch = new AMQPChannel($cnn);
+
+var_dump($ch);
+$cnn->disconnect();
 var_dump($ch);
+
 ?>
 --EXPECT--
-object(AMQPChannel)#2 (3) {
+object(AMQPChannel)#2 (4) {
   ["channel_id"]=>
   int(1)
   ["prefetch_count"]=>
   int(3)
   ["prefetch_size"]=>
   int(0)
+  ["is_connected"]=>
+  bool(true)
+}
+object(AMQPChannel)#2 (4) {
+  ["channel_id"]=>
+  int(1)
+  ["prefetch_count"]=>
+  int(3)
+  ["prefetch_size"]=>
+  int(0)
+  ["is_connected"]=>
+  bool(false)
 }
-
diff --git a/tests/amqpconnection_var_dump.phpt b/tests/amqpconnection_var_dump.phpt
@@ -10,9 +10,53 @@ if (!extension_loaded("amqp") || version_compare(PHP_VERSION, '5.3', '<')) {
 <?php
 $cnn = new AMQPConnection();
 var_dump($cnn);
+$cnn->connect();
+var_dump($cnn);
+$cnn->disconnect();
+var_dump($cnn);
 ?>
 --EXPECT--
-object(AMQPConnection)#1 (8) {
+object(AMQPConnection)#1 (9) {
+  ["login"]=>
+  string(5) "guest"
+  ["password"]=>
+  string(5) "guest"
+  ["host"]=>
+  string(9) "localhost"
+  ["vhost"]=>
+  string(1) "/"
+  ["port"]=>
+  int(5672)
+  ["read_timeout"]=>
+  float(0)
+  ["write_timeout"]=>
+  float(0)
+  ["connect_timeout"]=>
+  float(0)
+  ["is_connected"]=>
+  bool(false)
+}
+object(AMQPConnection)#1 (9) {
+  ["login"]=>
+  string(5) "guest"
+  ["password"]=>
+  string(5) "guest"
+  ["host"]=>
+  string(9) "localhost"
+  ["vhost"]=>
+  string(1) "/"
+  ["port"]=>
+  int(5672)
+  ["read_timeout"]=>
+  float(0)
+  ["write_timeout"]=>
+  float(0)
+  ["connect_timeout"]=>
+  float(0)
+  ["is_connected"]=>
+  bool(true)
+}
+object(AMQPConnection)#1 (9) {
   ["login"]=>
   string(5) "guest"
   ["password"]=>
@@ -29,4 +73,6 @@ object(AMQPConnection)#1 (8) {
   float(0)
   ["connect_timeout"]=>
   float(0)
+  ["is_connected"]=>
+  bool(false)
 }