diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-04-16 20:57:45 +0200 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-04-16 20:57:45 +0200 |
| commit | 643d6277b3410367f3437fce478b3a5601828a71 (patch) | |
| tree | 51c43904a777c75474a3ca605d81fc6f9b2ffbe8 | |
| parent | 3ed4a592aa803851649b193ed474e50b4d49ade8 (diff) | |
| parent | 6bb81d2c5fb15c7506d0d7293727ab7463243afb (diff) | |
| download | php-git-643d6277b3410367f3437fce478b3a5601828a71.tar.gz | |
Merge branch 'PHP-7.0'
| -rw-r--r-- | ext/standard/tests/file/fscanf.phpt | 2 | ||||
| -rw-r--r-- | tests/lang/030.phpt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ext/standard/tests/file/fscanf.phpt b/ext/standard/tests/file/fscanf.phpt index c37bdeb20a..003dd53dfa 100644 --- 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"); diff --git a/tests/lang/030.phpt b/tests/lang/030.phpt index 9ee40ea5aa..7f94b2eb74 100644 --- 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(); |