diff options
author | Zoe Slattery <zoe@php.net> | 2009-07-17 08:18:27 +0000 |
---|---|---|
committer | Zoe Slattery <zoe@php.net> | 2009-07-17 08:18:27 +0000 |
commit | 29b557ae61326f62cf7c1d042c608c83c5e92cfb (patch) | |
tree | 25ba5112b596acba8579df8c09274c6fb9c88106 | |
parent | 4fdd6bacb7da3c0c165c40a3045dab94084d0898 (diff) | |
download | php-git-29b557ae61326f62cf7c1d042c608c83c5e92cfb.tar.gz |
fix tests
-rw-r--r-- | Zend/tests/constants_002.phpt | 6 | ||||
-rw-r--r-- | Zend/tests/each_003.phpt | 13 | ||||
-rw-r--r-- | Zend/tests/get_parent_class_001.phpt | 3 | ||||
-rw-r--r-- | Zend/tests/globals_001.phpt | 2 | ||||
-rw-r--r-- | Zend/tests/globals_002.phpt | 2 | ||||
-rw-r--r-- | Zend/tests/globals_003.phpt | 2 | ||||
-rw-r--r-- | Zend/tests/globals_004.phpt | 2 | ||||
-rwxr-xr-x | Zend/tests/ns_023.phpt | 2 | ||||
-rwxr-xr-x | Zend/tests/ns_024.phpt | 2 |
9 files changed, 4 insertions, 30 deletions
diff --git a/Zend/tests/constants_002.phpt b/Zend/tests/constants_002.phpt index 2e769f5dbf..5acca981ff 100644 --- a/Zend/tests/constants_002.phpt +++ b/Zend/tests/constants_002.phpt @@ -16,9 +16,3 @@ Warning: Constants may only evaluate to scalar values in %s on line %d Notice: Use of undefined constant foo - assumed 'foo' in %s on line %d string(%d) "foo" resource(%d) of type (stream) ---UEXPECTF-- -Warning: Constants may only evaluate to scalar values in %s on line %d - -Notice: Use of undefined constant foo - assumed 'foo' in %s on line %d -unicode(%d) "foo" -resource(%d) of type (stream) diff --git a/Zend/tests/each_003.phpt b/Zend/tests/each_003.phpt index 8c0c32a7f7..2361d6a314 100644 --- a/Zend/tests/each_003.phpt +++ b/Zend/tests/each_003.phpt @@ -22,16 +22,3 @@ array(4) { ["key"]=> int(0) } ---UEXPECTF-- -array(4) { - [1]=> - array(0) { - } - [u"value"]=> - array(0) { - } - [0]=> - int(0) - [u"key"]=> - int(0) -} diff --git a/Zend/tests/get_parent_class_001.phpt b/Zend/tests/get_parent_class_001.phpt index 5115fe16d8..dfef5e08cc 100644 --- a/Zend/tests/get_parent_class_001.phpt +++ b/Zend/tests/get_parent_class_001.phpt @@ -26,6 +26,3 @@ $a->foo(); --EXPECT-- string(3) "bar" bool(false) ---UEXPECT-- -unicode(3) "bar" -bool(false) diff --git a/Zend/tests/globals_001.phpt b/Zend/tests/globals_001.phpt index 0f77104ac1..8efa71d31b 100644 --- a/Zend/tests/globals_001.phpt +++ b/Zend/tests/globals_001.phpt @@ -1,6 +1,6 @@ --TEST-- globals in global scope ---INIT-- +--INI-- variables_order="egpcs" --FILE-- <?php diff --git a/Zend/tests/globals_002.phpt b/Zend/tests/globals_002.phpt index 8074eb1dbd..e5d518ac56 100644 --- a/Zend/tests/globals_002.phpt +++ b/Zend/tests/globals_002.phpt @@ -1,6 +1,6 @@ --TEST-- globals in local scope ---INIT-- +--INI-- variables_order="egpcs" --FILE-- <?php diff --git a/Zend/tests/globals_003.phpt b/Zend/tests/globals_003.phpt index 9ddae33a1f..6de7c53e35 100644 --- a/Zend/tests/globals_003.phpt +++ b/Zend/tests/globals_003.phpt @@ -1,6 +1,6 @@ --TEST-- globals in local scope - 2 ---INIT-- +--INI-- variables_order="egpcs" --FILE-- <?php diff --git a/Zend/tests/globals_004.phpt b/Zend/tests/globals_004.phpt index f5da018f7b..07dfc7806d 100644 --- a/Zend/tests/globals_004.phpt +++ b/Zend/tests/globals_004.phpt @@ -1,6 +1,6 @@ --TEST-- globals in local scope - 3 ---INIT-- +--INI-- variables_order="egpcs" --FILE-- <?php diff --git a/Zend/tests/ns_023.phpt b/Zend/tests/ns_023.phpt index bc1681c122..34fbb56f2a 100755 --- a/Zend/tests/ns_023.phpt +++ b/Zend/tests/ns_023.phpt @@ -7,5 +7,3 @@ namespace test\foo; var_dump(__NAMESPACE__); --EXPECT-- string(8) "test\foo" ---UEXPECT-- -unicode(8) "test\foo" diff --git a/Zend/tests/ns_024.phpt b/Zend/tests/ns_024.phpt index 6e4f8bb22c..019a89c470 100755 --- a/Zend/tests/ns_024.phpt +++ b/Zend/tests/ns_024.phpt @@ -5,5 +5,3 @@ var_dump(__NAMESPACE__); --EXPECT-- string(0) "" ---UEXPECT-- -unicode(0) "" |