php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 08:12:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adjust assignment line number for match

Browse Source 
Otherwise the assignment will have the same number as the default arm
which will 1. mis-trigger a breakpoint and 2. mark the line as covered
even when it isn't.

Closes GH-6083
This commit is contained in:
Ilija Tovilo
2020-09-05 16:33:22 +02:00
parent af0ba0b2d3
commit 8a49310f4e
5 changed files with 129 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Zend/zend_compile.c
View File

@@ -3063,6 +3063,7 @@ void zend_compile_assign(znode *result, zend_ast *ast) /* {{{ */
zend_delayed_compile_var(&var_node, var_ast, BP_VAR_W, 0);
zend_compile_expr(&expr_node, expr_ast);
zend_delayed_compile_end(offset);
CG(zend_lineno) = zend_ast_get_lineno(var_ast);
zend_emit_op_tmp(result, ZEND_ASSIGN, &var_node, &expr_node);
return;
case ZEND_AST_STATIC_PROP:

30
sapi/phpdbg/tests/match_breakpoints_001.phpt Normal file
View File

@@ -0,0 +1,30 @@
--TEST--
Test match default breakpoint with variable assignment
--INI--
opcache.enable_cli=0
--PHPDBG--
b 5
b 10
r
q
--EXPECTF--
[Successful compilation of %s.php]
prompt> [Breakpoint #0 added at %s.php:5]
prompt> [Breakpoint #1 added at %s.php:10]
prompt> [Breakpoint #1 at %s.php:10, hits: 1]
>00010: default => 'bar', // breakpoint #1
00011: };
00012:
prompt>
--FILE--
<?php
$foo = match (0) {
0 => 'foo',
default => 'bar', // breakpoint #0
};
$foo = match (1) {
0 => 'foo',
default => 'bar', // breakpoint #1
};

32
sapi/phpdbg/tests/match_breakpoints_002.phpt Normal file
View File

@@ -0,0 +1,32 @@
--TEST--
Test match default breakpoint with property assignment
--INI--
opcache.enable_cli=0
--PHPDBG--
b 7
b 12
r
q
--EXPECTF--
[Successful compilation of %s.php]
prompt> [Breakpoint #0 added at %s.php:7]
prompt> [Breakpoint #1 added at %s.php:12]
prompt> [Breakpoint #1 at %s.php:12, hits: 1]
>00012: default => 'bar', // breakpoint #1
00013: };
00014:
prompt>
--FILE--
<?php
$foo = new stdClass();
$foo->bar = match (0) {
0 => 'foo',
default => 'bar', // breakpoint #0
};
$foo->bar = match (1) {
0 => 'foo',
default => 'bar', // breakpoint #1
};

32
sapi/phpdbg/tests/match_breakpoints_003.phpt Normal file
View File

@@ -0,0 +1,32 @@
--TEST--
Test match default breakpoint with dim assignment
--INI--
opcache.enable_cli=0
--PHPDBG--
b 7
b 12
r
q
--EXPECTF--
[Successful compilation of %s.php]
prompt> [Breakpoint #0 added at %s.php:7]
prompt> [Breakpoint #1 added at %s.php:12]
prompt> [Breakpoint #1 at %s.php:12, hits: 1]
>00012: default => 'bar', // breakpoint #1
00013: };
00014:
prompt>
--FILE--
<?php
$foo = [];
$foo['foo'] = match (0) {
0 => 'foo',
default => 'bar', // breakpoint #0
};
$foo->bar = match (1) {
0 => 'foo',
default => 'bar', // breakpoint #1
};

34
sapi/phpdbg/tests/match_breakpoints_004.phpt Normal file
View File

@@ -0,0 +1,34 @@
--TEST--
Test match default breakpoint with static variable assignment
--INI--
opcache.enable_cli=0
--PHPDBG--
b 9
b 14
r
q
--EXPECTF--
[Successful compilation of %s.php]
prompt> [Breakpoint #0 added at %s.php:9]
prompt> [Breakpoint #1 added at %s.php:14]
prompt> [Breakpoint #1 at %s.php:14, hits: 1]
>00014: default => 'bar', // breakpoint #1
00015: };
00016:
prompt>
--FILE--
<?php
class Foo {
public static $bar;
}
Foo::$bar = match (0) {
0 => 'foo',
default => 'bar', // breakpoint #0
};
Foo::$bar = match (1) {
0 => 'foo',
default => 'bar', // breakpoint #1
};