com php-src: Update tests and add NEWS entry for phpdbg opcode dump change: NEWS sapi/phpdbg/tests/exceptions_003.phpt sapi/php dbg/tests/next_001.phpt sapi/phpdbg/tests/print_ 001.phpt sapi/phpdbg/tests/print_002.phpt sapi/phpdbg/tests/stepping_001.phpt
[email protected] (Sara Golemon)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: 2b86a89193c151b5e9b098cc9aa8411abd7f30ea Author: Sara Golemon <[email protected]> Wed, 29 Mar 2017 12:54:38 -0700 Parents: fcc6cbc9c3d119077614db21510bb3068b5255ec Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2b86a89193c151b5e9b098cc9aa8411abd7f30ea Log: Update tests and add NEWS entry for phpdbg opcode dump change Changed paths: M NEWS M sapi/phpdbg/tests/exceptions_003.phpt M sapi/phpdbg/tests/next_001.phpt M sapi/phpdbg/tests/print_001.phpt M sapi/phpdbg/tests/print_002.phpt M sapi/phpdbg/tests/stepping_001.phpt Diff: diff --git a/NEWS b/NEWS index 75593e9..aef8a46 100644 --- a/NEWS +++ b/NEWS @@ -136,6 +136,9 @@ PHP NEWS - PDO_Sqlite . Switch to sqlite3_prepare_v2() and sqlite3_close_v2() functions (rasmus) +- PHPDBG + . Added extended_value to opcode dump output. (Sara) + - posix: . Fixed bug #71219 (configure script incorrectly checks for ttyname_r). (atoh) diff --git a/sapi/phpdbg/tests/exceptions_003.phpt b/sapi/phpdbg/tests/exceptions_003.phpt index 51090c0..1ffcf42 100644 --- a/sapi/phpdbg/tests/exceptions_003.phpt +++ b/sapi/phpdbg/tests/exceptions_003.phpt @@ -20,22 +20,22 @@ prompt> [L0 %s HANDLE_EXCEPTION >00005: x(); 00006: } finally { 00007: print "ok\n"; -prompt> [L7 %s ECHO "ok\n" %s] +prompt> [L7 %s ECHO<1> "ok\n" %s] >00007: print "ok\n"; 00008: } 00009: } catch (Error $e) { prompt> ok [L7 %s FAST_RET ~%d try-catch(0) %s] -[L9 %s CATCH "Error" $e 1 %s] +[L9 %s CATCH<-224> "Error" $e 1 %s] >00005: x(); 00006: } finally { 00007: print "ok\n"; -prompt> [L10 %s ECHO "caught\n" %s] +prompt> [L10 %s ECHO<1> "caught\n" %s] >00010: print "caught\n"; 00011: } 00012: prompt> caught -[L14 %s RETURN 1 %s] +[L14 %s RETURN<-1> 1 %s] >00014: prompt> --FILE-- diff --git a/sapi/phpdbg/tests/next_001.phpt b/sapi/phpdbg/tests/next_001.phpt index b07d954..afc5133 100644 --- a/sapi/phpdbg/tests/next_001.phpt +++ b/sapi/phpdbg/tests/next_001.phpt @@ -15,7 +15,7 @@ prompt> [Breakpoint #0 at %s:4, hits: 1] 00005: } 00006: prompt> 0 -[L5 %s RETURN null %s] +[L5 %s RETURN<-1> null %s] >00005: } 00006: 00007: foo(); @@ -23,7 +23,7 @@ prompt> [L8 %s ECHO 1 >00008: echo 1; 00009: prompt> 1 -[L9 %s RETURN 1 %s] +[L9 %s RETURN<-1> 1 %s] >00009: prompt> --FILE-- diff --git a/sapi/phpdbg/tests/print_001.phpt b/sapi/phpdbg/tests/print_001.phpt index 94ccedc..93a0005 100644 --- a/sapi/phpdbg/tests/print_001.phpt +++ b/sapi/phpdbg/tests/print_001.phpt @@ -19,16 +19,16 @@ L14-16 foo() %s - %s + 8 ops L15 #4 DO_%cCALL @0 L15 #5 SEND_VAR @0 1 L15 #6 DO_%cCALL - L16 #7 RETURN null + L16 #7 RETURN<-1> null prompt> [User Class: Foo\Bar (2 methods)] L5-7 Foo\Bar::Foo() %s - %s + 5 ops L5 #0 RECV 1 $bar - L6 #1 INIT_NS_FCALL_BY_NAME "Foo\\var_dump" + L6 #1 INIT_NS_FCALL_BY_NAME<1> "Foo\\var_dump" L6 #2 SEND_VAR_EX $bar 1 L6 #3 DO_FCALL - L7 #4 RETURN null + L7 #4 RETURN<-1> null L9-9 Foo\Bar::baz() %s - %s + 1 ops - L9 #0 RETURN null + L9 #0 RETURN<-1> null prompt> [Not Executing!] prompt> [Context %s (11 ops)] L1-21 {main}() %s - %s + 11 ops @@ -36,13 +36,13 @@ L1-21 {main}() %s - %s + 11 ops L14 #1 NOP L18 #2 NEW "Foo\\Bar" @1 L18 #3 DO_FCALL - L18 #4 INIT_METHOD_CALL @1 "Foo" + L18 #4 INIT_METHOD_CALL<1> @1 "Foo" L18 #5 SEND_VAL_EX "test" 1 L18 #6 DO_FCALL L19 #7 INIT_FCALL%s %d %s "foo" L19 #8 SEND_VAL "test" 1 L19 #9 DO_FCALL - L21 #10 RETURN 1 + L21 #10 RETURN<-1> 1 prompt> --FILE-- <?php diff --git a/sapi/phpdbg/tests/print_002.phpt b/sapi/phpdbg/tests/print_002.phpt index 3a82498..dfec641 100644 --- a/sapi/phpdbg/tests/print_002.phpt +++ b/sapi/phpdbg/tests/print_002.phpt @@ -25,7 +25,7 @@ L14-16 foo() %s - %s + 8 ops L15 #4 DO_%cCALL @0 L15 #5 SEND_VAR @0 1 L15 #6 DO_%cCALL - L16 #7 RETURN null + L16 #7 RETURN<-1> null prompt> [L15 %s INIT_FCALL%s %d %s "var_dump" %s] prompt> --FILE-- diff --git a/sapi/phpdbg/tests/stepping_001.phpt b/sapi/phpdbg/tests/stepping_001.phpt index 76577b2..2f25acc 100644 --- a/sapi/phpdbg/tests/stepping_001.phpt +++ b/sapi/phpdbg/tests/stepping_001.phpt @@ -25,7 +25,7 @@ prompt> [L0 %s HANDLE_EXCEPTION 00005: } 00006: prompt> [L0 %s HANDLE_EXCEPTION %s] -[L9 %s CATCH "Exception" $e 1 %s] +[L9 %s CATCH<-128> "Exception" $e 1 %s] >00008: foo(); 00009: } catch (Exception $e) { 00010: echo "ok"; @@ -48,7 +48,7 @@ prompt> ... ok >00011: } finally { 00012: echo " ... ok"; 00013: } -prompt> [L14 %s RETURN 1 %s] +prompt> [L14 %s RETURN<-1> 1 %s] >00014: prompt> --FILE--