From 1f647ab4caf6b095759a65d2c31becc26938c3d8 Mon Sep 17 00:00:00 2001
From: George Peter Banyard <girgias@php.net>
Date: Thu, 29 Aug 2019 01:35:29 +0200
Subject: [PATCH] Move and fix scandir related bug test

---
 ext/standard/tests/dir/bug41693.phpt  | 14 ++++++++++++++
 ext/standard/tests/file/bug41693.phpt | 13 -------------
 2 files changed, 14 insertions(+), 13 deletions(-)
 create mode 100644 ext/standard/tests/dir/bug41693.phpt
 delete mode 100644 ext/standard/tests/file/bug41693.phpt

diff --git a/ext/standard/tests/dir/bug41693.phpt b/ext/standard/tests/dir/bug41693.phpt
new file mode 100644
index 0000000000..c42ca2faea
--- /dev/null
+++ b/ext/standard/tests/dir/bug41693.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #41693 (scandir() allows empty directory names)
+--FILE--
+<?php
+
+try {
+    var_dump(scandir(''));
+} catch (\Error $e) {
+    echo $e->getMessage() . "\n";
+}
+
+?>
+--EXPECT--
+Directory name cannot be empty
diff --git a/ext/standard/tests/file/bug41693.phpt b/ext/standard/tests/file/bug41693.phpt
deleted file mode 100644
index ea074fa4fd..0000000000
--- a/ext/standard/tests/file/bug41693.phpt
+++ /dev/null
@@ -1,13 +0,0 @@
---TEST--
-Bug #41693 (scandir() allows empty directory names)
---FILE--
-<?php
-
-var_dump(scandir(''));
-
-echo "Done\n";
-?>
---EXPECTF--
-Warning: scandir(): Directory name cannot be empty in %s on line %d
-bool(false)
-Done
-- 
2.40.0