Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Improve cleanup

Author: weltling

ext/pdo_sqlite/tests/bug70221.phpt

@@ -12,7 +12,11 @@ function _test() { return 42; }
 $db->sqliteCreateFunction('test', '_test', 0);
 print("Everything is fine, no exceptions here\n");
 unset($db);
-@unlink($dbfile);
+?>
+--CLEAN--
+<?php
+$dbfile = __DIR__ . '/test.sqlite';
+unlink($dbfile);
 ?>
 --EXPECT--
 Everything is fine, no exceptions here