bjori Thu May 7 08:09:36 2009 UTC
Removed files:
/php-src/ext/standard/tests/misc browsernames.php
Modified files:
/php-src/ext/standard/tests/misc browsernames.inc
get_browser_basic.phpt
get_browser_error.phpt
get_browser_variation1.phpt
Log:
MFB5.3: Fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/browsernames.inc?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/standard/tests/misc/browsernames.inc
diff -u /dev/null php-src/ext/standard/tests/misc/browsernames.inc:1.2
--- /dev/null Thu May 7 08:09:36 2009
+++ php-src/ext/standard/tests/misc/browsernames.inc Thu May 7 08:09:36 2009
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Common browser names. Used with: get_browser()
+*/
+return array(
+ "Opera/7.11 (Windows NT 5.1; U) [en]",
+ "Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 5.0) Opera
7.02 Bork-edition [en]",
+ "Mozilla/4.0 (compatible; MSIE 6.0; MSIE 5.5; Windows NT 4.0) Opera 7.0
[en]",
+ "Mozilla/4.0 (compatible; MSIE 5.0; Windows 2000) Opera 6.0 [en]",
+ "Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC) Opera 5.0 [en]",
+ "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) Opera 8.60
[en]",
+ "Opera/9.00 (Windows NT 5.1; U; en)",
+ "Opera/9.26 (Macintosh; PPC Mac OS X; U; en)",
+
+ "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; Q312461)",
+ "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.0.3705)",
+ "Mozilla/4.0 (compatible; MSIE 5.22; Mac_PowerPC)",
+ "Mozilla/4.0 (compatible; MSIE 5.0; Mac_PowerPC; e504460WanadooNL)",
+ "Mozilla/4.0 (Mozilla/4.0; MSIE 7.0; Windows NT 5.1; FDM; SV1; .NET CLR
3.0.04506.30)",
+ "Mozilla/4.0 (Mozilla/4.0; MSIE 7.0; Windows NT 5.1; FDM; SV1)",
+ "Mozilla/4.0 (compatible;MSIE 7.0;Windows NT 6.0)",
+
+ "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/74 (KHTML,
like Gecko) Safari/74",
+ "Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/51 (like
Gecko) Safari/51",
+ "Mozilla/5.0 (Windows; U; Windows NT 6.0; en) AppleWebKit/522.11.3
(KHTML, like Gecko) Version/3.0 Safari/522.11.3",
+ "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+
(KHTML, like Gecko) Version/3.0 Mobile/1C28 Safari/419.3",
+ "Mozilla/5.0 (iPod; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML,
like Gecko) Version/3.0 Mobile/3A100a Safari/419.3",
+ "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_4_11; ru-ru)
AppleWebKit/525.18 (KHTML, like Gecko) Version/3.1.1 Safari/525.18",
+ "Mozilla/5.0 (Windows; U; Windows NT 5.1; en) AppleWebKit/526.9 (KHTML,
like Gecko) Version/4.0dp1 Safari/526.8",
+ "Mozilla/5.0 (Macintosh; U; PPC Mac OS X Mach-O; en; rv:1.8.1.12)
Gecko/20080206 Camino/1.5.5",
+
+ "Mozilla/5.0 (compatible; Konqueror/3.1; Linux; X11; i686)",
+ "Mozilla/5.0 (compatible; Konqueror/3.1; Linux 2.4.19-32mdkenterprise;
X11; i686; ar, en_US)",
+ "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)",
+
+ "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.4b)
Gecko/20030504 Mozilla",
+ "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.2a)
Gecko/20020910",
+ "Mozilla/5.0 (X11; U; Linux 2.4.3-20mdk i586; en-US; rv:0.9.1)
Gecko/20010611",
+ "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.9) Gecko/20050711",
+ "Mozilla/5.0 (Windows; U; Windows NT 5.1; cs; rv:1.9) Gecko/2008052906",
+
+ "Mozilla/5.0 (Windows; U; WinNT4.0; en-US; rv:1.3a) Gecko/20021207
Phoenix/0.5",
+ "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4b) Gecko/20030516
Mozilla Firebird/0.6",
+ "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.4a) Gecko/20030423
Firebird Browser/0.6",
+ "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.6) Gecko/20040206
Firefox/0.8",
+ "Mozilla/5.0 (Windows 98; U; en; rv:1.8.0) Gecko/20060728
Firefox/1.5.0",
+ "Mozilla/5.0 (Macintosh; PPC Mac OS X; U; en; rv:1.8.0) Gecko/20060728
Firefox/1.5.0",
+ "Mozilla/5.0 (X11; U; SunOS sun4u; en-US; rv:1.8.1.12) Gecko/20080210
Firefox/2.0.0.12",
+ "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.8.1.12) Gecko/20080214
Firefox/2.0.0.12",
+);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/get_browser_basic.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/misc/get_browser_basic.phpt
diff -u php-src/ext/standard/tests/misc/get_browser_basic.phpt:1.2
php-src/ext/standard/tests/misc/get_browser_basic.phpt:1.3
--- php-src/ext/standard/tests/misc/get_browser_basic.phpt:1.2 Sat Sep 6
23:20:53 2008
+++ php-src/ext/standard/tests/misc/get_browser_basic.phpt Thu May 7
08:09:36 2009
@@ -25,7 +25,7 @@
* Alias to functions:
*/
-$browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR .
'browsernames.php';
+$browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR .
'browsernames.inc';
/* Needed for the unicode_decode() call later */
unicode_set_error_mode( TO_UNICODE, U_CONV_ERROR_ESCAPE_UNICODE );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/get_browser_error.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/misc/get_browser_error.phpt
diff -u php-src/ext/standard/tests/misc/get_browser_error.phpt:1.2
php-src/ext/standard/tests/misc/get_browser_error.phpt:1.3
--- php-src/ext/standard/tests/misc/get_browser_error.phpt:1.2 Sat Sep 6
23:20:53 2008
+++ php-src/ext/standard/tests/misc/get_browser_error.phpt Thu May 7
08:09:36 2009
@@ -25,7 +25,7 @@
* Alias to functions:
*/
-$browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR .
'browsernames.php';
+$browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR .
'browsernames.inc';
/* Needed for the unicode_decode() call later */
unicode_set_error_mode( TO_UNICODE, U_CONV_ERROR_ESCAPE_UNICODE );
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/misc/get_browser_variation1.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/standard/tests/misc/get_browser_variation1.phpt
diff -u php-src/ext/standard/tests/misc/get_browser_variation1.phpt:1.2
php-src/ext/standard/tests/misc/get_browser_variation1.phpt:1.3
--- php-src/ext/standard/tests/misc/get_browser_variation1.phpt:1.2 Sat Sep
6 23:20:53 2008
+++ php-src/ext/standard/tests/misc/get_browser_variation1.phpt Thu May 7
08:09:36 2009
@@ -25,7 +25,7 @@
* Alias to functions:
*/
-$browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR .
'browsernames.php';
+$browsers = include dirname(__FILE__) . DIRECTORY_SEPARATOR .
'browsernames.inc';
/* Needed for the unicode_decode() call later */
unicode_set_error_mode( TO_UNICODE, U_CONV_ERROR_ESCAPE_UNICODE );
@@ -1405,4 +1405,4 @@
["aolversion"]=>
unicode(1) "0"
}
-===DONE===
\ No newline at end of file
+===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php