archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0'

Browse source
This commit is contained in:
Bob Weinand 2016-04-16 20:57:45 +02:00
commit 643d6277b3
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/standard/tests/file/fscanf.phpt
View file

@ -7,7 +7,7 @@ $filename = dirname(__FILE__)."/fscanf.dat";
var_dump(fscanf()); var_dump(fscanf());
var_dump(fscanf(array())); var_dump(fscanf(array()));
var_dump(fscanf(array(), array(), new stdclass)); var_dump(fscanf(array(), array()));
file_put_contents($filename, "data"); file_put_contents($filename, "data");

3
tests/lang/030.phpt
View file

@ -24,7 +24,8 @@ $bar1->Name = 'outside';
$bar1->echoName(); $bar1->echoName();
$List->echoName(); $List->echoName();
$bar1 =& foo2(new foo('constructor')); $foo = new foo('constructor');
$bar1 =& foo2($foo);
$bar1->Name = 'outside'; $bar1->Name = 'outside';
$bar1->echoName(); $bar1->echoName();