Skip to content

Commit 9a90bd7

Browse files
committed
1 parent 829f297 commit 9a90bd7

File tree

76 files changed

+195
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+195
-140
lines changed

UPGRADING

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ PHP 8.2 UPGRADE NOTES
106106

107107
RFC: https://wiki.php.net/rfc/deprecate_partially_supported_callables
108108

109+
. The "${var}" and "${expr}" style string interpolations are deprecated and
110+
will be removed in PHP 9. Use "$var"/"{$var}" or "${expr}", respectively.
111+
RFC: https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation
112+
109113
- Mbstring:
110114
. Use of QPrint, Base64, Uuencode, and HTML-ENTITIES 'text encodings' is
111115
deprecated for all Mbstring functions. Unlike all the other text

Zend/tests/bug61681.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ $la = "ooxx";
77
echo "${substr('laruence', 0, 2)}";
88

99
?>
10-
--EXPECT--
10+
--EXPECTF--
11+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
1112
ooxx
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--TEST--
2+
"${}" emits a deprecation
3+
--FILE--
4+
<?php
5+
6+
$foo = 'bar';
7+
var_dump("${foo}");
8+
9+
?>
10+
--EXPECTF--
11+
Deprecated: Using ${var} in strings is deprecated, use {$var} instead in %s on line %d
12+
string(3) "bar"

Zend/tests/exception_in_nested_rope.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@ try {
1313
}
1414

1515
?>
16-
--EXPECT--
16+
--EXPECTF--
17+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
1718
Exception

Zend/tests/flexible-heredoc-complex-test1.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ var_dump(<<<DOC1
2121
DOC1);
2222
2323
?>
24-
--EXPECT--
24+
--EXPECTF--
25+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
26+
27+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
2528
string(5) "a
2629
b
2730
c"

Zend/tests/flexible-heredoc-complex-test2.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ var_dump(<<<DOC1
2121
DOC1);
2222
2323
?>
24-
--EXPECT--
24+
--EXPECTF--
25+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
26+
27+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
2528
string(5) "a
2629
b
2730
c"

Zend/tests/flexible-heredoc-complex-test3.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,10 @@ var_dump(<<<DOC1
2121
DOC1);
2222
2323
?>
24-
--EXPECT--
24+
--EXPECTF--
25+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
26+
27+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
2528
string(8) " a
2629
b
2730
c"

Zend/tests/flexible-heredoc-complex-test4.phpt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ the same delimiter name as the heredoc
2828
}
2929

3030
?>
31-
--EXPECT--
31+
--EXPECTF--
32+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
33+
34+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
3235
string(8) "Test
3336
FOO"
3437
string(16) " Test

Zend/tests/temporary_cleaning_016.phpt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ try {
1111
}
1212
?>
1313
DONE
14-
--EXPECT--
14+
--EXPECTF--
15+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
1516
DONE

Zend/tests/warning_during_heredoc_scan_ahead.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ Warning: Octal escape sequence overflow \400 is greater than \377 in %s on line
1414

1515
Warning: Octal escape sequence overflow \400 is greater than \377 in %s on line %d
1616

17+
Deprecated: Using ${expr} (variable variables) in strings is deprecated, use {${expr}} instead in %s on line %d
18+
1719
Warning: Undefined variable $ in %s on line %d

0 commit comments

Comments
 (0)