com php-src: Adjust some test names, remove obsolete and duplicate tests (nikic): Zend/tests/use_const/conflicting_use_alias.php t
Zend/tests/use_const/function_and_cons.phpt Zend/ tests/use_const/shadow_core_null.phpt Zend/tests/use _function/conflicting_use_const_alias.phpt
| From: | Ferenc Kovacs | Date: | Sun, 25 Aug 2013 12:03:07 +0000 |
| Subject: | com php-src: Adjust some test names, remove obsolete and duplicate tests (nikic): Zend/tests/use_const/conflicting_use_alias.php t Zend/tests/use_const/function_and_cons.phpt Zend/ tests/use_const/shadow_core_null.phpt Zend/tests/use _function/conflicting_use_const_alias.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-74290@lists.php.net to get a copy of this message | ||
Commit: bc473228c83a6163350e0362ff3b0722f73b068c
Author: Igor Wiedler <igor@wiedler.ch> Sun, 25 Aug 2013 14:03:07 +0200
Parents: 115c5ec7269c6dd7dfaeaa853a3a78a075d88e17
Branches: PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bc473228c83a6163350e0362ff3b0722f73b068c
Log:
Adjust some test names, remove obsolete and duplicate tests (nikic)
Changed paths:
M Zend/tests/use_const/conflicting_use_alias.phpt
D Zend/tests/use_const/function_and_cons.phpt
D Zend/tests/use_const/shadow_core_null.phpt
M Zend/tests/use_function/conflicting_use_const_alias.phpt
Diff:
diff --git a/Zend/tests/use_const/conflicting_use_alias.phpt
b/Zend/tests/use_const/conflicting_use_alias.phpt
index 91cd020..8b563a4 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 6c975ba..0000000
--- 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 5bbc932..0000000
--- 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 b8472a5..2e0faf0 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