4 files changed, 12 insertions, 73 deletions
diff --git a/ext/standard/tests/file/flock_basic.phpt b/ext/standard/tests/file/flock_basic.phpt
index 97dd98a36c..7600184bf3 100644
--- a/ext/standard/tests/file/flock_basic.phpt
+++ b/ext/standard/tests/file/flock_basic.phpt
@@ -11,22 +11,26 @@ Description: PHP supports a portable way of locking complete files
 echo "*** Testing flock() fun with file and dir ***\n";
 $file_path = __DIR__;
 
-$file_handle = fopen("$file_path/lock.tmp", "w");
+$lock_file = preg_replace("~\.phpt?$~", null, __FILE__);
+
+$file_handle = fopen($lock_file, "w");
 var_dump(flock($file_handle, LOCK_SH|LOCK_NB));
 var_dump(flock($file_handle, LOCK_UN));
 var_dump(flock($file_handle, LOCK_EX));
 var_dump(flock($file_handle, LOCK_UN));
 fclose($file_handle);
-unlink("$file_path/lock.tmp");
+unlink($lock_file);
+
+$lock_dir = sprintf("%s.dir", preg_replace("~\.phpt?$~", null, __FILE__));
 
-mkdir("$file_path/dir");
-$dir_handle = opendir("$file_path/dir");
+mkdir($lock_dir);
+$dir_handle = opendir($lock_dir);
 var_dump(flock($dir_handle, LOCK_SH|LOCK_NB));
 var_dump(flock($dir_handle, LOCK_UN));
 var_dump(flock($dir_handle, LOCK_EX));
 var_dump(flock($dir_handle, LOCK_UN));
 closedir($dir_handle);
-rmdir("$file_path/dir");
+rmdir($lock_dir);
 
 echo "\n*** Done ***\n";
 ?>
diff --git a/ext/standard/tests/file/flock_error.phpt b/ext/standard/tests/file/flock_error.phpt
index 9f64dd0531..eaf141d573 100644
--- a/ext/standard/tests/file/flock_error.phpt
+++ b/ext/standard/tests/file/flock_error.phpt
@@ -10,7 +10,7 @@ Description: PHP supports a portable way of locking complete files
 
 echo "*** Testing error conditions ***\n";
 
-$file = __DIR__."/flock.tmp";
+$file = preg_replace("~\.phpt?$~", null, __FILE__);
 $fp = fopen($file, "w");
 
 /* array of operatons */
diff --git a/ext/standard/tests/file/flock_variation.phpt b/ext/standard/tests/file/flock_variation.phpt
index 1f7880ec0c..0c66fca7fb 100644
--- a/ext/standard/tests/file/flock_variation.phpt
+++ b/ext/standard/tests/file/flock_variation.phpt
@@ -10,7 +10,8 @@ Description: PHP supports a portable way of locking complete files
 
 echo "*** Testing flock() fun with the various operation and 
             wouldblock values                                ***\n";
-$file = __DIR__."/flock.tmp";
+
+$file = preg_replace("~\.phpt?$~", null, __FILE__);
 $fp = fopen($file, "w");
 
 /* array of operatons */
diff --git a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt b/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
deleted file mode 100644
index 4b0d9a1923..0000000000
--- a/ext/standard/tests/streams/stream_socket_enable_crypto.phpt
+++ /dev/null
@@ -1,66 +0,0 @@
---TEST--
-mixed stream_socket_enable_crypto(resource $stream , bool $enable [, int $crypto_type [, resource $session_stream ]] ) ;
---CREDITS--
-marcosptf - <marcosptf@yahoo.com.br> - #phparty7 - @phpsp - novatec/2015 - sao paulo - br
---SKIPIF--
-<?php
-if (!extension_loaded('openssl')) {
-	die('skip ext/openssl required');
-}
-?>
---FILE--
-<?php
-$serverUri = "tcp://127.0.0.1:31854";
-$sock = stream_socket_server($serverUri, $errno, $errstr);
-
-if (is_resource($sock)) {
-  var_dump(stream_socket_enable_crypto($sock, false));
-  var_dump(stream_socket_enable_crypto($sock, true));
-  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_CLIENT));
-  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT));
-  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_CLIENT));
-  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_CLIENT));
-  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv23_SERVER));
-  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv2_SERVER));
-  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_SSLv3_SERVER));
-  var_dump(stream_socket_enable_crypto($sock, true, STREAM_CRYPTO_METHOD_TLS_SERVER));
-} else {
-  die("Test stream_socket_enable_crypto has failed; Unable to connect: {$errstr} ({$errno})");
-}
-?>
---CLEAN--
-<?php
-unset($serverUri);
-unset($sock);
-unset($errno);
-unset($errstr);
-?>
---EXPECTF--
-bool(false)
-
-Warning: stream_socket_enable_crypto(): When enabling encryption you must specify the crypto type in %s on line %d
-bool(false)
-
-Warning: stream_socket_enable_crypto(): SSL: %a in %s on line %d
-bool(false)
-
-Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream in %s on line %d
-bool(false)
-
-Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream in %s on line %d
-bool(false)
-
-Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream in %s on line %d
-bool(false)
-
-Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream in %s on line %d
-bool(false)
-
-Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream in %s on line %d
-bool(false)
-
-Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream in %s on line %d
-bool(false)
-
-Warning: stream_socket_enable_crypto(): SSL/TLS already set-up for this stream in %s on line %d
-bool(false)