From bc473228c83a6163350e0362ff3b0722f73b068c Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 25 Aug 2013 14:03:07 +0200
Subject: [PATCH] Adjust some test names, remove obsolete and duplicate tests
 (nikic)

---
 .../use_const/conflicting_use_alias.phpt      |  2 +-
 Zend/tests/use_const/function_and_cons.phpt   | 25 -------------------
 Zend/tests/use_const/shadow_core_null.phpt    | 12 ---------
 .../conflicting_use_const_alias.phpt          |  2 +-
 4 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 Zend/tests/use_const/function_and_cons.phpt
 delete mode 100644 Zend/tests/use_const/shadow_core_null.phpt

diff --git a/Zend/tests/use_const/conflicting_use_alias.phpt b/Zend/tests/use_const/conflicting_use_alias.phpt
index 91cd020968e..8b563a4ca97 100644
--- a/Zend/tests/use_const/conflicting_use_alias.phpt
+++ b/Zend/tests/use_const/conflicting_use_alias.phpt
@@ -1,5 +1,5 @@
 --TEST--
-use and use function with the same alias
+use and use const with the same alias
 --FILE--
 <?php
 
diff --git a/Zend/tests/use_const/function_and_cons.phpt b/Zend/tests/use_const/function_and_cons.phpt
deleted file mode 100644
index 6c975ba923c..00000000000
--- a/Zend/tests/use_const/function_and_cons.phpt
+++ /dev/null
@@ -1,25 +0,0 @@
---TEST--
-use function and use const in the same block
---FILE--
-<?php
-
-namespace foo {
-    const bar = 'local const';
-    function bar() {
-        return 'local function';
-    }
-}
-
-namespace {
-    use const foo\bar;
-    use function foo\bar;
-    var_dump(bar);
-    var_dump(bar());
-    echo "Done\n";
-}
-
-?>
---EXPECT--
-string(11) "local const"
-string(14) "local function"
-Done
diff --git a/Zend/tests/use_const/shadow_core_null.phpt b/Zend/tests/use_const/shadow_core_null.phpt
deleted file mode 100644
index 5bbc9329dfd..00000000000
--- a/Zend/tests/use_const/shadow_core_null.phpt
+++ /dev/null
@@ -1,12 +0,0 @@
---TEST--
-shadowing null with a local version
---FILE--
-<?php
-
-namespace foo {
-    const null = 42;
-}
-
-?>
---EXPECTF--
-Fatal error: Cannot redeclare constant 'null' in %s on line %d
diff --git a/Zend/tests/use_function/conflicting_use_const_alias.phpt b/Zend/tests/use_function/conflicting_use_const_alias.phpt
index b8472a58212..2e0faf0da21 100644
--- a/Zend/tests/use_function/conflicting_use_const_alias.phpt
+++ b/Zend/tests/use_function/conflicting_use_const_alias.phpt
@@ -1,5 +1,5 @@
 --TEST--
-use and use function with the same alias
+use const and use function with the same alias
 --FILE--
 <?php