From 8f835060df60f2fdbaedacdbc990371a07f5310e Mon Sep 17 00:00:00 2001
From: krakjoe <joe.watkins@live.co.uk>
Date: Tue, 3 Dec 2013 00:35:20 +0000
Subject: [PATCH] export both types of conditional breakpoint properly

---
 phpdbg_bp.c | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/phpdbg_bp.c b/phpdbg_bp.c
index 5ea78293f3..8fdc9ee99a 100644
--- a/phpdbg_bp.c
+++ b/phpdbg_bp.c
@@ -142,9 +142,35 @@ PHPDBG_API void phpdbg_export_breakpoints(FILE *handle TSRMLS_DC) /* {{{ */
 						} break;
 
 						case PHPDBG_BREAK_COND: {
-							fprintf(handle,
-								"break on %s\n",
-								((phpdbg_breakcond_t*)brake)->code);
+							phpdbg_breakcond_t *conditional = (phpdbg_breakcond_t*) brake;
+							
+							if (conditional->paramed) {
+								switch (conditional->param.type) {
+									case STR_PARAM:
+										fprintf(handle, 
+											"break at %s if %s\n", conditional->param.str, conditional->code);
+									break;
+									
+									case METHOD_PARAM:
+										fprintf(handle, 
+											"break at %s::%s if %s\n", 
+											conditional->param.method.class, conditional->param.method.name,
+											conditional->code);
+									break;
+									
+									case FILE_PARAM:
+										fprintf(handle, 
+											"break at %s:%lu if %s\n", 
+											conditional->param.file.name, conditional->param.file.line,
+											conditional->code);
+									break;
+									
+									default: { /* do nothing */ } break;
+								}
+							} else {
+								fprintf(
+									handle, "break on %s\n", conditional->code);
+							}
 						} break;
 					}
 				}
@@ -427,6 +453,8 @@ PHPDBG_API void phpdbg_set_breakpoint_at(const phpdbg_param_t *param, const phpd
 					phpdbg_clear_param(
 						&new_param TSRMLS_CC);
 					goto usage;
+					
+				default: { /* do nothing */ } break;
 			}
 			
 			expr_hash += phpdbg_hash_param(&new_param TSRMLS_CC);
-- 
2.50.1