Merge branch 'PHP-7.0'

weltling · weltling · commit 770a6d1342fc · 2016-05-01T19:27:13.000+02:00
* PHP-7.0:
  fix test if unlink fails occasionally
  fix dir separator in test
diff --git 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
@@ -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
