Skip to content

Commit b8b3bb0

Browse files
cataphractcataphract
committed
Merge branch 'bug64023' into PHP-5.4
* bug64023: Fix bug #64023 (__toString() & SplFileInfo) Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
2 parents 86c1a26 + aa0adce commit b8b3bb0

File tree

4 files changed

+39
-75
lines changed

4 files changed

+39
-75
lines changed

‎Zend/zend_vm_def.h

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -974,27 +974,15 @@ ZEND_VM_HANDLER(40, ZEND_ECHO, CONST|TMP|VAR|CV, ANY)
974974
{
975975
USE_OPLINE
976976
zend_free_op free_op1;
977-
zval z_copy;
978977
zval *z;
979978

980979
SAVE_OPLINE();
981980
z = GET_OP1_ZVAL_PTR(BP_VAR_R);
982981

983-
if (OP1_TYPE != IS_CONST &&
984-
UNEXPECTED(Z_TYPE_P(z) == IS_OBJECT) &&
985-
Z_OBJ_HT_P(z)->get_method != NULL) {
986-
if (OP1_TYPE == IS_TMP_VAR) {
987-
INIT_PZVAL(z);
988-
}
989-
if (zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
990-
zend_print_variable(&z_copy);
991-
zval_dtor(&z_copy);
992-
} else {
993-
zend_print_variable(z);
994-
}
995-
} else {
996-
zend_print_variable(z);
982+
if (OP1_TYPE == IS_TMP_VAR && Z_TYPE_P(z) == IS_OBJECT) {
983+
INIT_PZVAL(z);
997984
}
985+
zend_print_variable(z);
998986

999987
FREE_OP1();
1000988
CHECK_EXCEPTION();

‎Zend/zend_vm_execute.h

Lines changed: 12 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -2024,27 +2024,15 @@ static int ZEND_FASTCALL ZEND_ECHO_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
20242024
{
20252025
USE_OPLINE
20262026

2027-
zval z_copy;
20282027
zval *z;
20292028

20302029
SAVE_OPLINE();
20312030
z = opline->op1.zv;
20322031

2033-
if (IS_CONST != IS_CONST &&
2034-
UNEXPECTED(Z_TYPE_P(z) == IS_OBJECT) &&
2035-
Z_OBJ_HT_P(z)->get_method != NULL) {
2036-
if (IS_CONST == IS_TMP_VAR) {
2037-
INIT_PZVAL(z);
2038-
}
2039-
if (zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
2040-
zend_print_variable(&z_copy);
2041-
zval_dtor(&z_copy);
2042-
} else {
2043-
zend_print_variable(z);
2044-
}
2045-
} else {
2046-
zend_print_variable(z);
2032+
if (IS_CONST == IS_TMP_VAR && Z_TYPE_P(z) == IS_OBJECT) {
2033+
INIT_PZVAL(z);
20472034
}
2035+
zend_print_variable(z);
20482036

20492037
CHECK_EXCEPTION();
20502038
ZEND_VM_NEXT_OPCODE();
@@ -6443,27 +6431,15 @@ static int ZEND_FASTCALL ZEND_ECHO_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
64436431
{
64446432
USE_OPLINE
64456433
zend_free_op free_op1;
6446-
zval z_copy;
64476434
zval *z;
64486435

64496436
SAVE_OPLINE();
64506437
z = _get_zval_ptr_tmp(opline->op1.var, EX_Ts(), &free_op1 TSRMLS_CC);
64516438

6452-
if (IS_TMP_VAR != IS_CONST &&
6453-
UNEXPECTED(Z_TYPE_P(z) == IS_OBJECT) &&
6454-
Z_OBJ_HT_P(z)->get_method != NULL) {
6455-
if (IS_TMP_VAR == IS_TMP_VAR) {
6456-
INIT_PZVAL(z);
6457-
}
6458-
if (zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
6459-
zend_print_variable(&z_copy);
6460-
zval_dtor(&z_copy);
6461-
} else {
6462-
zend_print_variable(z);
6463-
}
6464-
} else {
6465-
zend_print_variable(z);
6439+
if (IS_TMP_VAR == IS_TMP_VAR && Z_TYPE_P(z) == IS_OBJECT) {
6440+
INIT_PZVAL(z);
64666441
}
6442+
zend_print_variable(z);
64676443

64686444
zval_dtor(free_op1.var);
64696445
CHECK_EXCEPTION();
@@ -10761,27 +10737,15 @@ static int ZEND_FASTCALL ZEND_ECHO_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
1076110737
{
1076210738
USE_OPLINE
1076310739
zend_free_op free_op1;
10764-
zval z_copy;
1076510740
zval *z;
1076610741

1076710742
SAVE_OPLINE();
1076810743
z = _get_zval_ptr_var(opline->op1.var, EX_Ts(), &free_op1 TSRMLS_CC);
1076910744

10770-
if (IS_VAR != IS_CONST &&
10771-
UNEXPECTED(Z_TYPE_P(z) == IS_OBJECT) &&
10772-
Z_OBJ_HT_P(z)->get_method != NULL) {
10773-
if (IS_VAR == IS_TMP_VAR) {
10774-
INIT_PZVAL(z);
10775-
}
10776-
if (zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
10777-
zend_print_variable(&z_copy);
10778-
zval_dtor(&z_copy);
10779-
} else {
10780-
zend_print_variable(z);
10781-
}
10782-
} else {
10783-
zend_print_variable(z);
10745+
if (IS_VAR == IS_TMP_VAR && Z_TYPE_P(z) == IS_OBJECT) {
10746+
INIT_PZVAL(z);
1078410747
}
10748+
zend_print_variable(z);
1078510749

1078610750
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
1078710751
CHECK_EXCEPTION();
@@ -26741,27 +26705,15 @@ static int ZEND_FASTCALL ZEND_ECHO_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
2674126705
{
2674226706
USE_OPLINE
2674326707

26744-
zval z_copy;
2674526708
zval *z;
2674626709

2674726710
SAVE_OPLINE();
2674826711
z = _get_zval_ptr_cv_BP_VAR_R(EX_CVs(), opline->op1.var TSRMLS_CC);
2674926712

26750-
if (IS_CV != IS_CONST &&
26751-
UNEXPECTED(Z_TYPE_P(z) == IS_OBJECT) &&
26752-
Z_OBJ_HT_P(z)->get_method != NULL) {
26753-
if (IS_CV == IS_TMP_VAR) {
26754-
INIT_PZVAL(z);
26755-
}
26756-
if (zend_std_cast_object_tostring(z, &z_copy, IS_STRING TSRMLS_CC) == SUCCESS) {
26757-
zend_print_variable(&z_copy);
26758-
zval_dtor(&z_copy);
26759-
} else {
26760-
zend_print_variable(z);
26761-
}
26762-
} else {
26763-
zend_print_variable(z);
26713+
if (IS_CV == IS_TMP_VAR && Z_TYPE_P(z) == IS_OBJECT) {
26714+
INIT_PZVAL(z);
2676426715
}
26716+
zend_print_variable(z);
2676526717

2676626718
CHECK_EXCEPTION();
2676726719
ZEND_VM_NEXT_OPCODE();

‎ext/spl/spl_directory.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,6 +1874,10 @@ static int spl_filesystem_object_cast(zval *readobj, zval *writeobj, int type TS
18741874
spl_filesystem_object *intern = (spl_filesystem_object*)zend_object_store_get_object(readobj TSRMLS_CC);
18751875

18761876
if (type == IS_STRING) {
1877+
if (Z_OBJCE_P(readobj)->__tostring) {
1878+
return std_object_handlers.cast_object(readobj, writeobj, type TSRMLS_CC);
1879+
}
1880+
18771881
switch (intern->type) {
18781882
case SPL_FS_INFO:
18791883
case SPL_FS_FILE:

‎ext/spl/tests/bug64023.phpt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
--TEST--
2+
Bug #64023: Overloading __toString() in SplFileInfo has no effect
3+
--FILE--
4+
<?php
5+
class A extends \SplFileInfo
6+
{
7+
public function __toString() {return ' -expected- ';}
8+
}
9+
10+
$a = new A('/');
11+
12+
// Works
13+
echo $a, $a->__toString(), $a->__toString() . '', "\n";
14+
15+
// Does not work - outputs parent::__toString()
16+
echo $a . '', "\n";
17+
18+
--EXPECT--
19+
-expected- -expected- -expected-
20+
-expected-

0 commit comments

Comments
 (0)