Skip to content

Commit aef958b

Browse files
committed
Remove deprecated (real) cast
1 parent 06750d7 commit aef958b

File tree

4 files changed

+5
-23
lines changed

4 files changed

+5
-23
lines changed

Zend/tests/real_cast_deprecation.phpt

Lines changed: 0 additions & 11 deletions
This file was deleted.

Zend/zend_language_scanner.l

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1494,13 +1494,6 @@ NEWLINE ("\r"|"\n"|"\r\n")
14941494
RETURN_TOKEN(T_DOUBLE_CAST);
14951495
}
14961496

1497-
<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}"real"{TABS_AND_SPACES}")" {
1498-
if (PARSER_MODE()) {
1499-
zend_error(E_DEPRECATED, "The (real) cast is deprecated, use (float) instead");
1500-
}
1501-
RETURN_TOKEN(T_DOUBLE_CAST);
1502-
}
1503-
15041497
<ST_IN_SCRIPTING>"("{TABS_AND_SPACES}("string"|"binary"){TABS_AND_SPACES}")" {
15051498
RETURN_TOKEN(T_STRING_CAST);
15061499
}

ext/tokenizer/tests/token_get_all_variation8.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Test token_get_all() function : usage variations - with type casting operators
1818

1919
echo "*** Testing token_get_all() : 'source' string with different type casting operators ***\n";
2020

21-
// type casting operators : (int), (integer), (float), (real), (double), (string), (array), (object), (bool), (boolean),(unset)
21+
// type casting operators : (int), (integer), (float), (double), (string), (array), (object), (bool), (boolean),(unset)
2222
$source = '<?php
2323
$a = 1, $b = 10.5
2424
$c = (int)$b + $a;
@@ -27,7 +27,7 @@ $e = (string)$a.(string)$b;
2727
if((bool)$a) echo "true";
2828
if(!(boolean)$b) echo "false";
2929
$c = $c + (integer) 123.4e2;
30-
$d = $c - (real) 12;
30+
$d = $c - (double) 12;
3131
$b = (unset)$a;
3232
?>';
3333
var_dump( token_get_all($source));
@@ -719,7 +719,7 @@ array(107) {
719719
[0]=>
720720
int(%d)
721721
[1]=>
722-
string(6) "(real)"
722+
string(8) "(double)"
723723
[2]=>
724724
int(9)
725725
}

ext/tokenizer/tokenizer_data.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) {
7070
REGISTER_LONG_CONSTANT("T_BOOL_CAST", T_BOOL_CAST, CONST_CS | CONST_PERSISTENT);
7171
REGISTER_LONG_CONSTANT("T_UNSET_CAST", T_UNSET_CAST, CONST_CS | CONST_PERSISTENT);
7272
REGISTER_LONG_CONSTANT("T_POW", T_POW, CONST_CS | CONST_PERSISTENT);
73-
REGISTER_LONG_CONSTANT("T_NEW", T_NEW, CONST_CS | CONST_PERSISTENT);
7473
REGISTER_LONG_CONSTANT("T_CLONE", T_CLONE, CONST_CS | CONST_PERSISTENT);
7574
REGISTER_LONG_CONSTANT("T_ELSEIF", T_ELSEIF, CONST_CS | CONST_PERSISTENT);
7675
REGISTER_LONG_CONSTANT("T_ELSE", T_ELSE, CONST_CS | CONST_PERSISTENT);
@@ -86,6 +85,7 @@ void tokenizer_register_constants(INIT_FUNC_ARGS) {
8685
REGISTER_LONG_CONSTANT("T_EVAL", T_EVAL, CONST_CS | CONST_PERSISTENT);
8786
REGISTER_LONG_CONSTANT("T_INC", T_INC, CONST_CS | CONST_PERSISTENT);
8887
REGISTER_LONG_CONSTANT("T_DEC", T_DEC, CONST_CS | CONST_PERSISTENT);
88+
REGISTER_LONG_CONSTANT("T_NEW", T_NEW, CONST_CS | CONST_PERSISTENT);
8989
REGISTER_LONG_CONSTANT("T_EXIT", T_EXIT, CONST_CS | CONST_PERSISTENT);
9090
REGISTER_LONG_CONSTANT("T_IF", T_IF, CONST_CS | CONST_PERSISTENT);
9191
REGISTER_LONG_CONSTANT("T_ENDIF", T_ENDIF, CONST_CS | CONST_PERSISTENT);
@@ -213,7 +213,6 @@ char *get_token_type_name(int token_type)
213213
case T_BOOL_CAST: return "T_BOOL_CAST";
214214
case T_UNSET_CAST: return "T_UNSET_CAST";
215215
case T_POW: return "T_POW";
216-
case T_NEW: return "T_NEW";
217216
case T_CLONE: return "T_CLONE";
218217
case T_ELSEIF: return "T_ELSEIF";
219218
case T_ELSE: return "T_ELSE";
@@ -229,6 +228,7 @@ char *get_token_type_name(int token_type)
229228
case T_EVAL: return "T_EVAL";
230229
case T_INC: return "T_INC";
231230
case T_DEC: return "T_DEC";
231+
case T_NEW: return "T_NEW";
232232
case T_EXIT: return "T_EXIT";
233233
case T_IF: return "T_IF";
234234
case T_ENDIF: return "T_ENDIF";

0 commit comments

Comments
 (0)