cvs: pear /Net_UserAgent_Mobile Mobile.php /Net_UserAgent_Mobile/Mobile Common.php Display.php DoCoMo.php EZweb.php NonMobile.php SoftBank.php Willcom.php /Net_UserAgent_Mobile/tests MobileTestCase.php
[email protected] ("KUBO Atsuhiro") Sat, 10 May 2008 12:23:26 -0000
| Newsgroups | php.pear.cvs |
|---|---|
| Message-ID | <cvskuboa1210422206@cvsserver> |
kuboa Sat May 10 12:23:26 2008 UTC
Modified files:
/pear/Net_UserAgent_Mobile Mobile.php
/pear/Net_UserAgent_Mobile/Mobile Common.php Display.php DoCoMo.php
EZweb.php NonMobile.php
SoftBank.php Willcom.php
/pear/Net_UserAgent_Mobile/tests MobileTestCase.php
Log:
- Some minor improvements.
kuboa-20080510122326.txt
(text/plain, 25.6 KB)
http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/Mobile.php?r1=1.38&r2=1.39&diff_format=u Index: pear/Net_UserAgent_Mobile/Mobile.php diff -u pear/Net_UserAgent_Mobile/Mobile.php:1.38 pear/Net_UserAgent_Mobile/Mobile.php:1.39 --- pear/Net_UserAgent_Mobile/Mobile.php:1.38 Sat May 10 03:06:35 2008 +++ pear/Net_UserAgent_Mobile/Mobile.php Sat May 10 12:23:26 2008 @@ -15,7 +15,7 @@ * @author KUBO Atsuhiro <[email protected]> * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Mobile.php,v 1.38 2008/05/10 03:06:35 kuboa Exp $ + * @version CVS: $Id: Mobile.php,v 1.39 2008/05/10 12:23:26 kuboa Exp $ * @since File available since Release 0.1 */ @@ -37,9 +37,9 @@ /** * globals for fallback on no match * - * @global boolean $GLOBALS['_NET_USERAGENT_MOBILE_FALLBACK_ON_NOMATCH'] + * @global boolean $GLOBALS['NET_USERAGENT_MOBILE_FallbackOnNomatch'] */ -$GLOBALS['_NET_USERAGENT_MOBILE_FALLBACK_ON_NOMATCH'] = false; +$GLOBALS['NET_USERAGENT_MOBILE_FallbackOnNomatch'] = false; // }}} // {{{ Net_UserAgent_Mobile @@ -122,9 +122,9 @@ * If no argument is supplied, $_SERVER{'HTTP_*'} is used. * * @param string $userAgent User-Agent string - * @return Net_UserAgent_Mobile_Common|Net_UserAgent_Mobile_Error a newly created - * or an existing Net_UserAgent_Mobile_Common object, or a PEAR error object - * on error + * @return Net_UserAgent_Mobile_Common a newly created or an existing + * Net_UserAgent_Mobile_Common object + * @throws Net_UserAgent_Mobile_Error */ function &factory($userAgent = null) { @@ -162,7 +162,7 @@ $instance = &new $class($userAgent); $error = &$instance->isError(); if (Net_UserAgent_Mobile::isError($error)) { - if ($GLOBALS['_NET_USERAGENT_MOBILE_FALLBACK_ON_NOMATCH'] + if ($GLOBALS['NET_USERAGENT_MOBILE_FallbackOnNomatch'] && $error->getCode() == NET_USERAGENT_MOBILE_ERROR_NOMATCH ) { $instance = &Net_UserAgent_Mobile::factory('Net_UserAgent_Mobile_Fallback_On_NoMatch'); @@ -183,10 +183,9 @@ * a instance from existent ones * * @param string $userAgent User-Agent string - * @return Net_UserAgent_Mobile_Common|Net_UserAgent_Mobile_Error a newly created - * or an existing Net_UserAgent_Mobile_Common object, or a PEAR error object - * on error - * @see Net_UserAgent_Mobile::factory() + * @return Net_UserAgent_Mobile_Common a newly created or an existing + * Net_UserAgent_Mobile_Common object + * @throws Net_UserAgent_Mobile_Error */ function &singleton($userAgent = null) { http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/Mobile/Common.php?r1=1.26&r2=1.27&diff_format=u Index: pear/Net_UserAgent_Mobile/Mobile/Common.php diff -u pear/Net_UserAgent_Mobile/Mobile/Common.php:1.26 pear/Net_UserAgent_Mobile/Mobile/Common.php:1.27 --- pear/Net_UserAgent_Mobile/Mobile/Common.php:1.26 Sat May 10 11:39:46 2008 +++ pear/Net_UserAgent_Mobile/Mobile/Common.php Sat May 10 12:23:26 2008 @@ -15,7 +15,7 @@ * @author KUBO Atsuhiro <[email protected]> * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Common.php,v 1.26 2008/05/10 11:39:46 kuboa Exp $ + * @version CVS: $Id: Common.php,v 1.27 2008/05/10 12:23:26 kuboa Exp $ * @since File available since Release 0.1 */ @@ -71,8 +71,7 @@ var $_display; /** - * {@link Net_UserAgent_Mobile_Error} object for error handling in the - * constructor + * {@link Net_UserAgent_Mobile_Error} object for error handling in the constructor * @var object **/ var $_error; @@ -132,9 +131,8 @@ /** * Returns/set an error when the instance couldn't initialize properly * - * @param object {@link Net_UserAgent_Mobile_Error} object when setting - * an error - * @return object {@link Net_UserAgent_Mobile_Error} object + * @param object {@link Net_UserAgent_Mobile_Error} object when setting an error + * @return Net_UserAgent_Mobile_Error */ function &isError($error = null) { @@ -149,22 +147,18 @@ // {{{ raiseError() /** - * This method is used to communicate an error and invoke error - * callbacks etc. Basically a wrapper for PEAR::raiseError without - * the message string. - * - * @param mixed $code integer error code, or a PEAR error object (all - * other parameters are ignored if this parameter is an object - * @param int $mode error mode, see PEAR_Error docs - * @param mixed $options If error mode is PEAR_ERROR_TRIGGER, this is the - * error level (E_USER_NOTICE etc). If error mode is - * PEAR_ERROR_CALLBACK, this is the callback function, either as a - * function name, or as an array of an object and method name. For - * other error modes this parameter is ignored. - * @param string $userinfo Extra debug information. Defaults to the last - * query and native error code. - * @return object a PEAR error object - * @see PEAR_Error + * This method is used to communicate an error and invoke error callbacks etc. + * Basically a wrapper for PEAR::raiseError without the message string. + * + * @param mixed $code integer error code, or a PEAR error object (all other + * parameters are ignored if this parameter is an object + * @param intteger $mode error mode, see PEAR_Error docs + * @param mixed $options If error mode is PEAR_ERROR_TRIGGER, this is + * the error level (E_USER_NOTICE etc). If error mode is PEAR_ERROR_CALLBACK, + * this is the callback function, either as a function name, or as an array of + * an object and method name. For other error modes this parameter is ignored. + * @param string $userinfo Extra debug information + * @throws Net_UserAgent_Mobile_Error */ function &raiseError($code = NET_USERAGENT_MOBILE_ERROR, $mode = null, $options = null, $userinfo = null @@ -173,16 +167,12 @@ // The error is yet a Net_UserAgent_Mobile error object if (is_object($code)) { - $error = &PEAR::raiseError($code, null, null, null, null, null, - true - ); - return $error; + return PEAR::raiseError($code, null, null, null, null, null, true); } - $error = &PEAR::raiseError(null, $code, $mode, $options, $userinfo, - 'Net_UserAgent_Mobile_Error', true - ); - return $error; + return PEAR::raiseError(null, $code, $mode, $options, $userinfo, + 'Net_UserAgent_Mobile_Error', true + ); } // }}} @@ -231,15 +221,14 @@ /** * returns {@link Net_UserAgent_Mobile_Disply} object * - * @return object a {@link Net_UserAgent_Mobile_Display} object, or a - * PEAR error object on error - * @see Net_UserAgent_Mobile_Display + * @return Net_UserAgent_Mobile_Display */ function getDisplay() { - if (!is_object($this->_display)) { + if (is_null($this->_display)) { $this->_display = $this->makeDisplay(); } + return $this->_display; } @@ -262,7 +251,7 @@ /** * generates a warning message for new variants * - * @return object a PEAR error object + * @throws Net_UserAgent_Mobile_Error */ function noMatch() { @@ -290,12 +279,10 @@ * create a new Net_UserAgent_Mobile_Display class instance (should be * implemented in subclasses) * + * @return Net_UserAgent_Mobile_Display * @abstract */ - function makeDisplay() - { - die(); - } + function makeDisplay() {} // }}} // {{{ isDoCoMo() http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/Mobile/Display.php?r1=1.13&r2=1.14&diff_format=u Index: pear/Net_UserAgent_Mobile/Mobile/Display.php diff -u pear/Net_UserAgent_Mobile/Mobile/Display.php:1.13 pear/Net_UserAgent_Mobile/Mobile/Display.php:1.14 --- pear/Net_UserAgent_Mobile/Mobile/Display.php:1.13 Tue Feb 12 14:36:25 2008 +++ pear/Net_UserAgent_Mobile/Mobile/Display.php Sat May 10 12:23:26 2008 @@ -13,9 +13,9 @@ * @category Networking * @package Net_UserAgent_Mobile * @author KUBO Atsuhiro <[email protected]> - * @copyright 2003-2007 KUBO Atsuhiro <[email protected]> + * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Display.php,v 1.13 2008/02/12 14:36:25 kuboa Exp $ + * @version CVS: $Id: Display.php,v 1.14 2008/05/10 12:23:26 kuboa Exp $ * @since File available since Release 0.1 */ @@ -48,8 +48,8 @@ * </code> * * USING EXTERNAL MAP FILE: - * If the environment variable DOCOMO_MAP exists, the specified XML data will - * be used for DoCoMo display information. + * If the environment variable DOCOMO_MAP exists, the specified XML data will be used + * for DoCoMo display information. * * ex) Please add the following code. * $_SERVER['DOCOMO_MAP'] = '/path/to/DoCoMoMap.xml'; @@ -57,7 +57,7 @@ * @category Networking * @package Net_UserAgent_Mobile * @author KUBO Atsuhiro <[email protected]> - * @copyright 2003-2007 KUBO Atsuhiro <[email protected]> + * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 * @version Release: @package_version@ * @since Class available since Release 0.1 http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/Mobile/DoCoMo.php?r1=1.53&r2=1.54&diff_format=u Index: pear/Net_UserAgent_Mobile/Mobile/DoCoMo.php diff -u pear/Net_UserAgent_Mobile/Mobile/DoCoMo.php:1.53 pear/Net_UserAgent_Mobile/Mobile/DoCoMo.php:1.54 --- pear/Net_UserAgent_Mobile/Mobile/DoCoMo.php:1.53 Sat May 10 11:39:46 2008 +++ pear/Net_UserAgent_Mobile/Mobile/DoCoMo.php Sat May 10 12:23:26 2008 @@ -15,7 +15,7 @@ * @author KUBO Atsuhiro <[email protected]> * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: DoCoMo.php,v 1.53 2008/05/10 11:39:46 kuboa Exp $ + * @version CVS: $Id: DoCoMo.php,v 1.54 2008/05/10 12:23:26 kuboa Exp $ * @link http://www.nttdocomo.co.jp/service/imode/make/content/spec/useragent/index.html * @since File available since Release 0.1 */ @@ -28,9 +28,8 @@ /** * NTT DoCoMo implementation * - * Net_UserAgent_Mobile_DoCoMo is a subclass of - * {@link Net_UserAgent_Mobile_Common}, which implements NTT docomo i-mode - * user agents. + * Net_UserAgent_Mobile_DoCoMo is a subclass of {@link Net_UserAgent_Mobile_Common}, + * which implements NTT docomo i-mode user agents. * * SYNOPSIS: * <code> @@ -223,7 +222,7 @@ * Parses HTTP_USER_AGENT string. * * @param string $userAgent User-Agent string - * @return mixed void, or a PEAR error object on error + * @throws Net_UserAgent_Mobile_Error */ function parse($userAgent) { @@ -259,10 +258,7 @@ /** * create a new {@link Net_UserAgent_Mobile_Display} class instance * - * @return object a newly created {@link Net_UserAgent_Mobile_Display} - * object - * @see Net_UserAgent_Mobile_Display - * @see Net_UserAgent_Mobile_DoCoMoDisplayMap::get() + * @return Net_UserAgent_Mobile_Display */ function makeDisplay() { @@ -506,7 +502,7 @@ * parse main part of HTTP_USER_AGENT string (not FOMA) * * @param string $main main part of HTTP_USER_AGENT string - * @return mixed void, or a PEAR error object on error + * @throws Net_UserAgent_Mobile_Error */ function _parseMain($main) { @@ -553,7 +549,7 @@ * parse main part of HTTP_USER_AGENT string (FOMA) * * @param string $foma main part of HTTP_USER_AGENT string - * @return mixed void, or a PEAR error object on error + * @throws Net_UserAgent_Mobile_Error */ function _parseFOMA($foma) { http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/Mobile/EZweb.php?r1=1.25&r2=1.26&diff_format=u Index: pear/Net_UserAgent_Mobile/Mobile/EZweb.php diff -u pear/Net_UserAgent_Mobile/Mobile/EZweb.php:1.25 pear/Net_UserAgent_Mobile/Mobile/EZweb.php:1.26 --- pear/Net_UserAgent_Mobile/Mobile/EZweb.php:1.25 Sat May 10 11:39:46 2008 +++ pear/Net_UserAgent_Mobile/Mobile/EZweb.php Sat May 10 12:23:26 2008 @@ -15,10 +15,9 @@ * @author KUBO Atsuhiro <[email protected]> * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: EZweb.php,v 1.25 2008/05/10 11:39:46 kuboa Exp $ + * @version CVS: $Id: EZweb.php,v 1.26 2008/05/10 12:23:26 kuboa Exp $ * @link http://www.au.kddi.com/ezfactory/tec/spec/4_4.html * @link http://www.au.kddi.com/ezfactory/tec/spec/new_win/ezkishu.html - * @see Net_UserAgent_Mobile_Common * @since File available since Release 0.1.0 */ @@ -30,9 +29,8 @@ /** * EZweb implementation * - * Net_UserAgent_Mobile_EZweb is a subclass of - * {@link Net_UserAgent_Mobile_Common}, which implements EZweb (WAP1.0/2.0) - * user agents. + * Net_UserAgent_Mobile_EZweb is a subclass of {@link Net_UserAgent_Mobile_Common}, + * which implements EZweb (WAP1.0/2.0) user agents. * * SYNOPSIS: * <code> @@ -63,7 +61,6 @@ * @version Release: @package_version@ * @link http://www.au.kddi.com/ezfactory/tec/spec/4_4.html * @link http://www.au.kddi.com/ezfactory/tec/spec/new_win/ezkishu.html - * @see Net_UserAgent_Mobile_Common * @since Class available since Release 0.1.0 */ class Net_UserAgent_Mobile_EZweb extends Net_UserAgent_Mobile_Common @@ -166,11 +163,9 @@ @list($browser, $this->_serverName, $comment) = explode(' ', $userAgent, 3); list($this->name, $software) = explode('/', $browser); - list($this->version, $this->_rawModel) = - explode('-', $software); + list($this->version, $this->_rawModel) = explode('-', $software); if ($comment) { - $this->_comment = - preg_replace('/^\((.*)\)$/', '$1', $comment); + $this->_comment = preg_replace('/^\((.*)\)$/', '$1', $comment); } } } @@ -181,25 +176,19 @@ /** * create a new {@link Net_UserAgent_Mobile_Display} class instance * - * @return object a newly created {@link Net_UserAgent_Mobile_Display} - * object - * @see Net_UserAgent_Mobile_Display + * @return Net_UserAgent_Mobile_Display */ function makeDisplay() { @list($width, $height) = explode(',', $this->getHeader('X-UP-DEVCAP-SCREENPIXELS')); - $screenDepth = - explode(',', $this->getHeader('X-UP-DEVCAP-SCREENDEPTH')); + $screenDepth = explode(',', $this->getHeader('X-UP-DEVCAP-SCREENDEPTH')); $depth = $screenDepth[0] ? pow(2, (integer)$screenDepth[0]) : 0; - $color = - $this->getHeader('X-UP-DEVCAP-ISCOLOR') === '1' ? true : false; - return new Net_UserAgent_Mobile_Display(array( - 'width' => $width, + $color = $this->getHeader('X-UP-DEVCAP-ISCOLOR') === '1' ? true : false; + return new Net_UserAgent_Mobile_Display(array('width' => $width, 'height' => $height, 'color' => $color, - 'depth' => $depth - ) + 'depth' => $depth) ); } http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/Mobile/NonMobile.php?r1=1.18&r2=1.19&diff_format=u Index: pear/Net_UserAgent_Mobile/Mobile/NonMobile.php diff -u pear/Net_UserAgent_Mobile/Mobile/NonMobile.php:1.18 pear/Net_UserAgent_Mobile/Mobile/NonMobile.php:1.19 --- pear/Net_UserAgent_Mobile/Mobile/NonMobile.php:1.18 Tue Feb 12 14:36:25 2008 +++ pear/Net_UserAgent_Mobile/Mobile/NonMobile.php Sat May 10 12:23:26 2008 @@ -15,8 +15,7 @@ * @author KUBO Atsuhiro <[email protected]> * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: NonMobile.php,v 1.18 2008/02/12 14:36:25 kuboa Exp $ - * @see Net_UserAgent_Mobile_Common + * @version CVS: $Id: NonMobile.php,v 1.19 2008/05/10 12:23:26 kuboa Exp $ * @since File available since Release 0.1.0 */ @@ -29,8 +28,8 @@ * Non-Mobile Agent implementation * * Net_UserAgent_Mobile_NonMobile is a subclass of - * {@link Net_UserAgent_Mobile_Common}, which implements non-mobile or - * unimplemented user agents. + * {@link Net_UserAgent_Mobile_Common}, which implements non-mobile or unimplemented + * user agents. * * SYNOPSIS: * <code> @@ -46,7 +45,6 @@ * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 * @version Release: @package_version@ - * @see Net_UserAgent_Mobile_Common * @since Class available since Release 0.1.0 */ class Net_UserAgent_Mobile_NonMobile extends Net_UserAgent_Mobile_Common @@ -102,9 +100,7 @@ /** * create a new {@link Net_UserAgent_Mobile_Display} class instance * - * @return object a newly created {@link Net_UserAgent_Mobile_Display} - * object - * @see Net_UserAgent_Mobile_Display + * @return Net_UserAgent_Mobile_Display */ function makeDisplay() { http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/Mobile/SoftBank.php?r1=1.11&r2=1.12&diff_format=u Index: pear/Net_UserAgent_Mobile/Mobile/SoftBank.php diff -u pear/Net_UserAgent_Mobile/Mobile/SoftBank.php:1.11 pear/Net_UserAgent_Mobile/Mobile/SoftBank.php:1.12 --- pear/Net_UserAgent_Mobile/Mobile/SoftBank.php:1.11 Sat May 10 11:39:46 2008 +++ pear/Net_UserAgent_Mobile/Mobile/SoftBank.php Sat May 10 12:23:26 2008 @@ -15,7 +15,7 @@ * @author KUBO Atsuhiro <[email protected]> * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: SoftBank.php,v 1.11 2008/05/10 11:39:46 kuboa Exp $ + * @version CVS: $Id: SoftBank.php,v 1.12 2008/05/10 12:23:26 kuboa Exp $ * @link http://creation.mb.softbank.jp/ * @since File available since Release 0.20.0 */ @@ -162,7 +162,7 @@ * Parses HTTP_USER_AGENT string. * * @param string $userAgent User-Agent string - * @return mixed void, or a PEAR error object on error + * @throws Net_UserAgent_Mobile_Error */ function parse($userAgent) { @@ -206,8 +206,7 @@ /** * create a new {@link Net_UserAgent_Mobile_Display} class instance * - * @return object a newly created {@link Net_UserAgent_Mobile_Display} object - * @see Net_UserAgent_Mobile_Display + * @return Net_UserAgent_Mobile_Display */ function makeDisplay() { @@ -444,7 +443,7 @@ * parse HTTP_USER_AGENT string for the Vodafone 3G aegnt * * @param array $agent parts of the User-Agent string - * @return mixed void, or a PEAR error object on error + * @throws Net_UserAgent_Mobile_Error */ function _parseVodafone($agent) { @@ -483,7 +482,7 @@ * parse HTTP_USER_AGENT string for the ancient agent * * @param array $agent parts of the User-Agent string - * @return mixed void, or a PEAR error object on error + * @throws Net_UserAgent_Mobile_Error */ function _parseJphone($agent) { @@ -539,7 +538,6 @@ * parse HTTP_USER_AGENT string for the Motorola 3G aegnt * * @param array $agent parts of the User-Agent string - * @return mixed void, or a PEAR error object on error */ function _parseMotorola($agent) { http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/Mobile/Willcom.php?r1=1.6&r2=1.7&diff_format=u Index: pear/Net_UserAgent_Mobile/Mobile/Willcom.php diff -u pear/Net_UserAgent_Mobile/Mobile/Willcom.php:1.6 pear/Net_UserAgent_Mobile/Mobile/Willcom.php:1.7 --- pear/Net_UserAgent_Mobile/Mobile/Willcom.php:1.6 Tue Feb 12 14:36:25 2008 +++ pear/Net_UserAgent_Mobile/Mobile/Willcom.php Sat May 10 12:23:26 2008 @@ -15,7 +15,7 @@ * @author KUBO Atsuhiro <[email protected]> * @copyright 2003-2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Willcom.php,v 1.6 2008/02/12 14:36:25 kuboa Exp $ + * @version CVS: $Id: Willcom.php,v 1.7 2008/05/10 12:23:26 kuboa Exp $ * @link http://www.willcom-inc.com/ja/service/contents_service/club_air_edge/for_phone/homepage/index.html * @since File available since Release 0.5 */ @@ -28,9 +28,8 @@ /** * AirH"PHONE implementation * - * Net_UserAgent_Mobile_Willcom is a subclass of - * {@link Net_UserAgent_Mobile_Common}, which implements Willcom's user - * agents. + * Net_UserAgent_Mobile_Willcom is a subclass of {@link Net_UserAgent_Mobile_Common}, + * which implements Willcom's user agents. * * SYNOPSIS: * <code> @@ -55,7 +54,6 @@ * @license http://www.php.net/license/3_0.txt PHP License 3.0 * @version Release: @package_version@ * @link http://www.willcom-inc.com/ja/service/contents_service/club_air_edge/for_phone/homepage/index.html - * @see Net_UserAgent_Mobile_Common * @since Class available since Release 0.5 */ class Net_UserAgent_Mobile_Willcom extends Net_UserAgent_Mobile_Common @@ -153,9 +151,7 @@ /** * create a new {@link Net_UserAgent_Mobile_Display} class instance * - * @return object a newly created {@link Net_UserAgent_Mobile_Display} - * object - * @see Net_UserAgent_Mobile_Display + * @return Net_UserAgent_Mobile_Display */ function makeDisplay() { http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/tests/MobileTestCase.php?r1=1.5&r2=1.6&diff_format=u Index: pear/Net_UserAgent_Mobile/tests/MobileTestCase.php diff -u pear/Net_UserAgent_Mobile/tests/MobileTestCase.php:1.5 pear/Net_UserAgent_Mobile/tests/MobileTestCase.php:1.6 --- pear/Net_UserAgent_Mobile/tests/MobileTestCase.php:1.5 Wed Feb 6 02:03:13 2008 +++ pear/Net_UserAgent_Mobile/tests/MobileTestCase.php Sat May 10 12:23:26 2008 @@ -15,7 +15,7 @@ * @author KUBO Atsuhiro <[email protected]> * @copyright 2008 KUBO Atsuhiro <[email protected]> * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: MobileTestCase.php,v 1.5 2008/02/06 02:03:13 kuboa Exp $ + * @version CVS: $Id: MobileTestCase.php,v 1.6 2008/05/10 12:23:26 kuboa Exp $ * @since File available since Release 0.31.0 */ @@ -88,8 +88,6 @@ $this->assertType('Net_UserAgent_Mobile_DoCoMo', Net_UserAgent_Mobile::factory() ); - - unset($_SERVER['HTTP_USER_AGENT']); } public function testShouldReturnTheExistingObjectIfItExistsBySingletonMethod() @@ -118,13 +116,11 @@ $agent->getCode() ); - $GLOBALS['_NET_USERAGENT_MOBILE_FALLBACK_ON_NOMATCH'] = true; + $GLOBALS['NET_USERAGENT_MOBILE_FallbackOnNomatch'] = true; $this->assertType('Net_UserAgent_Mobile_NonMobile', Net_UserAgent_Mobile::factory($ua) ); - - unset($GLOBALS['_NET_USERAGENT_MOBILE_FALLBACK_ON_NOMATCH']); } public function testShouldTellWhetherAUserAgentIsDocomo() @@ -161,8 +157,6 @@ $_SERVER['HTTP_USER_AGENT'] = 'DoCoMo/2.0 P904i(c100;TB;W24H15)'; $this->assertTrue(Net_UserAgent_Mobile::isDoCoMo()); - - unset($_SERVER['HTTP_USER_AGENT']); } public function testShouldTellWhetherAUserAgentIsEzwebByTheHttpHeaderInAnEnvironment() @@ -170,8 +164,6 @@ $_SERVER['HTTP_USER_AGENT'] = 'KDDI-SA31 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0'; $this->assertTrue(Net_UserAgent_Mobile::isEZweb()); - - unset($_SERVER['HTTP_USER_AGENT']); } public function testShouldTellWhetherAUserAgentIsSoftbankByTheHttpHeaderInAnEnvironment() @@ -179,8 +171,6 @@ $_SERVER['HTTP_USER_AGENT'] = 'SoftBank/1.0/706SC/SCJ001 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1'; $this->assertTrue(Net_UserAgent_Mobile::isSoftBank()); - - unset($_SERVER['HTTP_USER_AGENT']); } public function testShouldTellWhetherAUserAgentIsWillcomByTheHttpHeaderInAnEnvironment() @@ -188,8 +178,6 @@ $_SERVER['HTTP_USER_AGENT'] = 'Mozilla/3.0(DDIPOCKET;JRC/AH-J3001V,AH-J3002V/1.0/0100/c50)CNF/2.0'; $this->assertTrue(Net_UserAgent_Mobile::isWillcom()); - - unset($_SERVER['HTTP_USER_AGENT']); } public function testShouldTellWhetherAUserAgentIsMobileByTheHttpHeaderInAnEnvironment() @@ -197,8 +185,6 @@ $_SERVER['HTTP_USER_AGENT'] = 'DoCoMo/2.0 P904i(c100;TB;W24H15)'; $this->assertTrue(Net_UserAgent_Mobile::isMobile()); - - unset($_SERVER['HTTP_USER_AGENT']); } /**#@-*/