Merge branch 'PHP-7.0'

10 years ago · 643d6277b3
2 changed files with 3 additions and 2 deletions
--- a/ext/standard/tests/file/fscanf.phpt
+++ b/ext/standard/tests/file/fscanf.phpt
@ -7,7 +7,7 @@ $filename = dirname(__FILE__)."/fscanf.dat";

 var_dump(fscanf());
 var_dump(fscanf(array()));
-var_dump(fscanf(array(), array(), new stdclass));
+var_dump(fscanf(array(), array()));

 file_put_contents($filename, "data");

--- a/tests/lang/030.phpt
+++ b/tests/lang/030.phpt
@ -24,7 +24,8 @@ $bar1->Name = 'outside';
 $bar1->echoName();
 $List->echoName();

-$bar1 =& foo2(new foo('constructor'));
+$foo = new foo('constructor');
+$bar1 =& foo2($foo);
 $bar1->Name = 'outside';
 $bar1->echoName();