diff options
| author | zoe slattery <zoe@php.net> | 2012-05-15 11:43:28 +0100 |
|---|---|---|
| committer | zoe slattery <zoe@php.net> | 2012-05-15 11:43:28 +0100 |
| commit | d99203d44bac39a7cc8ee031534ee638545a6753 (patch) | |
| tree | e2deb3e6cf115adb5d4c8998a868b1bcb8de0e21 | |
| parent | 968dfae6d1555ec8e9e9029ee9963579d0993130 (diff) | |
| parent | e35f09d7743defe37f99305a9b1e96b48cdec4b4 (diff) | |
| download | php-git-d99203d44bac39a7cc8ee031534ee638545a6753.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Small fixes to tests, see #62022
| -rwxr-xr-x | ext/dom/tests/DOMAttr_value_basic_001.phpt | 4 | ||||
| -rw-r--r-- | ext/dom/tests/DOMAttr_value_basic_002.phpt | 4 | ||||
| -rwxr-xr-x | ext/dom/tests/DOMCharacterData_data_error_002.phpt | 4 | ||||
| -rwxr-xr-x | ext/dom/tests/DOMCharacterData_length_error_001.phpt | 4 | ||||
| -rw-r--r-- | ext/posix/tests/posix_setgid_error.phpt | 1 | ||||
| -rw-r--r-- | ext/reflection/tests/bug47254.phpt | 1 | ||||
| -rw-r--r-- | ext/standard/tests/file/windows_links/bug48746.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/windows_links/bug48746_1.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/windows_links/bug48746_2.phpt | 2 | ||||
| -rw-r--r-- | ext/standard/tests/file/windows_links/bug48746_3.phpt | 2 |
10 files changed, 12 insertions, 14 deletions
diff --git a/ext/dom/tests/DOMAttr_value_basic_001.phpt b/ext/dom/tests/DOMAttr_value_basic_001.phpt index 40e00bcc4d..51c4ac954d 100755 --- a/ext/dom/tests/DOMAttr_value_basic_001.phpt +++ b/ext/dom/tests/DOMAttr_value_basic_001.phpt @@ -1,6 +1,6 @@ --TEST-- Read empty $value. ---CREDIT-- +--CREDITS-- Jason Bouffard <jbouffard1@yahoo.com> # TestFest Atlanta 2009-05-14 --SKIPIF-- @@ -13,4 +13,4 @@ print $attr->value."\n"; ===DONE=== --EXPECTF-- ===DONE=== -
\ No newline at end of file + diff --git a/ext/dom/tests/DOMAttr_value_basic_002.phpt b/ext/dom/tests/DOMAttr_value_basic_002.phpt index cf71eebf39..384a9ca4af 100644 --- a/ext/dom/tests/DOMAttr_value_basic_002.phpt +++ b/ext/dom/tests/DOMAttr_value_basic_002.phpt @@ -1,6 +1,6 @@ --TEST-- Write non-string $value property ---CREDIT-- +--CREDITS-- Eric Berg <ehberg@gmail.com> # TestFest Atlanta 2009-05-14 --SKIPIF-- @@ -12,4 +12,4 @@ $attr->value = 1; print $attr->value; ?> --EXPECTF-- -1
\ No newline at end of file +1 diff --git a/ext/dom/tests/DOMCharacterData_data_error_002.phpt b/ext/dom/tests/DOMCharacterData_data_error_002.phpt index 9dae096e6f..401e0f2f8c 100755 --- a/ext/dom/tests/DOMCharacterData_data_error_002.phpt +++ b/ext/dom/tests/DOMCharacterData_data_error_002.phpt @@ -1,6 +1,6 @@ --TEST-- Invalid State Error when getting data on DOMCharacterData out of content. ---CREDIT-- +--CREDITS-- Eric Berg <ehberg@gmail.com> # TestFest Atlanta 2009-05-14 --SKIPIF-- @@ -11,4 +11,4 @@ $character_data = new DOMCharacterData(); print $character_data->data; ?> --EXPECTF-- -Warning: main(): Invalid State Error in %s on line %d
\ No newline at end of file +Warning: main(): Invalid State Error in %s on line %d diff --git a/ext/dom/tests/DOMCharacterData_length_error_001.phpt b/ext/dom/tests/DOMCharacterData_length_error_001.phpt index 0dda492ad4..e8bf16ab98 100755 --- a/ext/dom/tests/DOMCharacterData_length_error_001.phpt +++ b/ext/dom/tests/DOMCharacterData_length_error_001.phpt @@ -1,6 +1,6 @@ --TEST-- Invalid State Error when getting length on DOMCharacterData out of content. ---CREDIT-- +--CREDITS-- Jason Bouffard <jbouffard1@yahoo.com> # TestFest Atlanta 2009-05-14 --SKIPIF-- @@ -14,4 +14,4 @@ print $character_data->length; --EXPECTF-- Warning: main(): Invalid State Error in %s ===DONE=== -
\ No newline at end of file + diff --git a/ext/posix/tests/posix_setgid_error.phpt b/ext/posix/tests/posix_setgid_error.phpt index 247435d948..83d727c58a 100644 --- a/ext/posix/tests/posix_setgid_error.phpt +++ b/ext/posix/tests/posix_setgid_error.phpt @@ -1,6 +1,5 @@ --TEST-- Test function posix_setgid() by calling it more than or less than its expected arguments. ---CREDITS-- --SKIPIF-- <?php if(!extension_loaded("posix")) print "skip - POSIX extension not loaded"; diff --git a/ext/reflection/tests/bug47254.phpt b/ext/reflection/tests/bug47254.phpt index 4bcce1bb72..83593a4ff2 100644 --- a/ext/reflection/tests/bug47254.phpt +++ b/ext/reflection/tests/bug47254.phpt @@ -23,7 +23,6 @@ $m = $R->getMethods(); print_r($m); ?> ---CLEAN-- --EXPECT-- Array ( diff --git a/ext/standard/tests/file/windows_links/bug48746.phpt b/ext/standard/tests/file/windows_links/bug48746.phpt index 55465aea86..5978e7f7f1 100644 --- a/ext/standard/tests/file/windows_links/bug48746.phpt +++ b/ext/standard/tests/file/windows_links/bug48746.phpt @@ -1,7 +1,7 @@ --TEST--
Bug#48746 - Junction not working properly
---CREDIT--
+--CREDITS--
Venkat Raman Don (don.raman@microsoft.com)
--SKIPIF--
diff --git a/ext/standard/tests/file/windows_links/bug48746_1.phpt b/ext/standard/tests/file/windows_links/bug48746_1.phpt index 5d8e685e1b..a4277a47a1 100644 --- a/ext/standard/tests/file/windows_links/bug48746_1.phpt +++ b/ext/standard/tests/file/windows_links/bug48746_1.phpt @@ -1,7 +1,7 @@ --TEST--
Bug#48746 - Junction not working properly
---CREDIT--
+--CREDITS--
Venkat Raman Don (don.raman@microsoft.com)
--SKIPIF--
diff --git a/ext/standard/tests/file/windows_links/bug48746_2.phpt b/ext/standard/tests/file/windows_links/bug48746_2.phpt index 56924a59bc..509610f8a4 100644 --- a/ext/standard/tests/file/windows_links/bug48746_2.phpt +++ b/ext/standard/tests/file/windows_links/bug48746_2.phpt @@ -1,7 +1,7 @@ --TEST--
Bug#48746 - Junction not working properly
---CREDIT--
+--CREDITS--
Venkat Raman Don (don.raman@microsoft.com)
--SKIPIF--
diff --git a/ext/standard/tests/file/windows_links/bug48746_3.phpt b/ext/standard/tests/file/windows_links/bug48746_3.phpt index b88ab76ef3..98e81787b8 100644 --- a/ext/standard/tests/file/windows_links/bug48746_3.phpt +++ b/ext/standard/tests/file/windows_links/bug48746_3.phpt @@ -1,7 +1,7 @@ --TEST--
Bug#48746 - Junction not working properly
---CREDIT--
+--CREDITS--
Venkat Raman Don (don.raman@microsoft.com)
--SKIPIF--
|