cvs: pear /Net_UserAgent_Mobile/Mobile/DoCoMo ScreenInfo.php /Net_UserAgent_Mobile/tests/Mobile DoCoMoTestCase.php SoftBankTestCase.php
[email protected] ("KUBO Atsuhiro") Sat, 10 May 2008 13:14:17 -0000
| Newsgroups | php.pear.cvs |
|---|---|
| Message-ID | <cvskuboa1210425257@cvsserver> |
kuboa Sat May 10 13:14:17 2008 UTC
Modified files:
/pear/Net_UserAgent_Mobile/Mobile/DoCoMo ScreenInfo.php
/pear/Net_UserAgent_Mobile/tests/Mobile DoCoMoTestCase.php
SoftBankTestCase.php
Log:
- Some minor fixes for tests.
http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/Mobile/DoCoMo/ScreenInfo.php?r1=1.2&r2=1.3&diff_format=u
Index: pear/Net_UserAgent_Mobile/Mobile/DoCoMo/ScreenInfo.php
diff -u pear/Net_UserAgent_Mobile/Mobile/DoCoMo/ScreenInfo.php:1.2 pear/Net_UserAgent_Mobile/Mobile/DoCoMo/ScreenInfo.php:1.3
--- pear/Net_UserAgent_Mobile/Mobile/DoCoMo/ScreenInfo.php:1.2 Sat May 10 11:39:46 2008
+++ pear/Net_UserAgent_Mobile/Mobile/DoCoMo/ScreenInfo.php Sat May 10 13:14:17 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: ScreenInfo.php,v 1.2 2008/05/10 11:39:46 kuboa Exp $
+ * @version CVS: $Id: ScreenInfo.php,v 1.3 2008/05/10 13:14:17 kuboa Exp $
* @link http://www.nttdocomo.co.jp/service/imode/make/content/spec/screen_area/index.html
* @since File available since Release 1.0.0RC1
*/
@@ -1707,7 +1707,7 @@
*/
function &singleton()
{
- if (is_null($GLOBALS['NET_USERAGENT_MOBILE_DoCoMo_ScreenInfo_Instance'])) {
+ if (@is_null($GLOBALS['NET_USERAGENT_MOBILE_DoCoMo_ScreenInfo_Instance'])) {
$GLOBALS['NET_USERAGENT_MOBILE_DoCoMo_ScreenInfo_Instance'] = &new Net_UserAgent_Mobile_DoCoMo_ScreenInfo();
}
http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/tests/Mobile/DoCoMoTestCase.php?r1=1.16&r2=1.17&diff_format=u
Index: pear/Net_UserAgent_Mobile/tests/Mobile/DoCoMoTestCase.php
diff -u pear/Net_UserAgent_Mobile/tests/Mobile/DoCoMoTestCase.php:1.16 pear/Net_UserAgent_Mobile/tests/Mobile/DoCoMoTestCase.php:1.17
--- pear/Net_UserAgent_Mobile/tests/Mobile/DoCoMoTestCase.php:1.16 Sat May 10 11:39:46 2008
+++ pear/Net_UserAgent_Mobile/tests/Mobile/DoCoMoTestCase.php Sat May 10 13:14:17 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: DoCoMoTestCase.php,v 1.16 2008/05/10 11:39:46 kuboa Exp $
+ * @version CVS: $Id: DoCoMoTestCase.php,v 1.17 2008/05/10 13:14:17 kuboa Exp $
* @since File available since Release 0.31.0
*/
@@ -1286,7 +1286,7 @@
'DoCoMo/2.0 N2001(c10;ser0123456789abcde;icc01234567890123456789)' => array('serialNumber' => '0123456789abcde'),
'DoCoMo/2.0 NM850iG(c100;TB;W22H10;ser123456789012345;icc)' => array('serialNumber' => '123456789012345')
);
- while (list($userAgent, $profile) = each($this->_profiles)) {
+ while (list($userAgent, $profile) = each($profiles)) {
$agent = new Net_UserAgent_Mobile_DoCoMo($userAgent);
$this->assertEquals($profile['serialNumber'], $agent->getSerialNumber());
http://cvs.php.net/viewvc.cgi/pear/Net_UserAgent_Mobile/tests/Mobile/SoftBankTestCase.php?r1=1.6&r2=1.7&diff_format=u
Index: pear/Net_UserAgent_Mobile/tests/Mobile/SoftBankTestCase.php
diff -u pear/Net_UserAgent_Mobile/tests/Mobile/SoftBankTestCase.php:1.6 pear/Net_UserAgent_Mobile/tests/Mobile/SoftBankTestCase.php:1.7
--- pear/Net_UserAgent_Mobile/tests/Mobile/SoftBankTestCase.php:1.6 Sat May 10 11:39:46 2008
+++ pear/Net_UserAgent_Mobile/tests/Mobile/SoftBankTestCase.php Sat May 10 13:14:17 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: SoftBankTestCase.php,v 1.6 2008/05/10 11:39:46 kuboa Exp $
+ * @version CVS: $Id: SoftBankTestCase.php,v 1.7 2008/05/10 13:14:17 kuboa Exp $
* @since File available since Release 0.31.0
*/
@@ -248,7 +248,7 @@
if (array_key_exists('Ext-Profile', $profile)) {
$this->assertEquals($profile['Ext-Profile'], $javaInfo['Ext-Profile']);
} else {
- if (!is_null($javaInfo['Ext-Profile'])) {
+ if (array_key_exists('Ext-Profile', $javaInfo)) {
$this->fail($agent->getModel());
}
}