diff options
| author | Anatol Belski <ab@php.net> | 2016-05-01 19:27:13 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-05-01 19:27:13 +0200 |
| commit | 770a6d1342fcc30bb273ac6d65fc9fc057b1ce21 (patch) | |
| tree | 7b9134529880fe3efdbc60c36122a7982093be9e | |
| parent | 965ff1c9bb62be990fc5b57cb975f1b277fb5445 (diff) | |
| parent | 5360b3de338f2945586ada962ef078ca2e43c5f3 (diff) | |
| download | php-git-770a6d1342fcc30bb273ac6d65fc9fc057b1ce21.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
fix test if unlink fails occasionally
fix dir separator in test
| -rw-r--r-- | Zend/tests/bug72101.phpt | 2 | ||||
| -rw-r--r-- | ext/pdo_sqlite/tests/bug70221.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Zend/tests/bug72101.phpt b/Zend/tests/bug72101.phpt index ed70b962d7..a04425cee4 100644 --- a/Zend/tests/bug72101.phpt +++ b/Zend/tests/bug72101.phpt @@ -77,7 +77,7 @@ $foo->bar($a, $b, $c); Fatal error: Uncaught Error: Class 'DoesNotExists' not found in %sbug72101.php:61 Stack trace: #0 %sbug72101.php(8): {closure}(2, 'Parameter 1 to ...', '%s', 8, Array) -#1 %s/bug72101.php(27): PHPUnit_Framework_MockObject_Stub_ReturnCallback->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static)) +#1 %sbug72101.php(27): PHPUnit_Framework_MockObject_Stub_ReturnCallback->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static)) #2 %sbug72101.php(19): PHPUnit_Framework_MockObject_Matcher->invoked(Object(PHPUnit_Framework_MockObject_Invocation_Static)) #3 %sbug72101.php(51): PHPUnit_Framework_MockObject_InvocationMocker->invoke(Object(PHPUnit_Framework_MockObject_Invocation_Static)) #4 %sbug72101.php(72): Mock_MethodCallbackByReference_7b180d26->bar(0, 0, 0) diff --git a/ext/pdo_sqlite/tests/bug70221.phpt b/ext/pdo_sqlite/tests/bug70221.phpt index bead80d233..2d1aea0e8b 100644 --- a/ext/pdo_sqlite/tests/bug70221.phpt +++ b/ext/pdo_sqlite/tests/bug70221.phpt @@ -12,7 +12,7 @@ function _test() { return 42; } $db->sqliteCreateFunction('test', '_test', 0); print("Everything is fine, no exceptions here\n"); unset($db); -unlink($dbfile); +@unlink($dbfile); ?> --EXPECT-- Everything is fine, no exceptions here |