*** features
-- PEAR依存を排除するための変更
+- PEAR依存を排除するための変更。依存を排除する理由は以下の通り。
+ 1. PEAR が PEAR2 に移行するに伴い、APIが不安定になること
+ 2. Ethna が依存している PEAR_Error は既に非推奨であること
+ 3. 外部ライブラリにできうる限り依存しない方がユーザの便宜となる
-- Console_Getopt の代替として、Ethna_Getopt.php を追加 (Public Domain)
-- 性質上依存せざるを得ない以下のファイルを除き、Console_Getopt への依存を排除
--- ETHNA_BASE/bin/ethna_make_package.php
--- ETHNA_BASE/class/Ethna_PearWrapper.php
+-- [Breaking B.C] Ethna から PEAR_Error まわりの依存を排除。これに伴い、Ethnaクラス が持っていた PEARコアコンポーネンツ の機能は使えなくなっている。
+--- Ethnaクラス に PEAR ライクなエラーチェックメソッドを追加し、それに伴う変更
+--- Ethna_Error で PEAR を呼び出していた部分を修正し、PEARに任せていたメンバ設定等を最実装
*** bug fix
* @version $Id$
*/
-/** Ethna depends on PEAR */
-require_once 'PEAR.php';
+// OS_WINDOWS constant was defined
+// in PEAR.
+if (substr(PHP_OS, 0, 3) == 'WIN'
+ && !defined('OS_WINDOWS')) {
+ define('OS_WINDOWS', true);
+} else {
+ define('OS_WINDOWS', false);
+}
if (!defined('PATH_SEPARATOR')) {
if (OS_WINDOWS) {
/** バージョン定義 */
define('ETHNA_VERSION', '2.5.0-preview1');
+/**
+ * ダミーのエラーモード
+ * PEAR非依存、かつ互換性を維持するためのもの
+ */
+define('ETHNA_ERROR_DUMMY', 'dummy');
+
/** Ethnaベースディレクトリ定義 */
define('ETHNA_BASE', dirname(__FILE__));
* @access public
* @package Ethna
*/
-class Ethna extends PEAR
+class Ethna
{
- /**#@+
- * @access private
+ /**
+ * 渡されたオブジェクトが Ethna_Error オブジェクト
+ * かどうかチェックします。
+ *
+ * @param mixed $data チェックする変数
+ * @param mixed $msgcode チェックするエラーメッセージまたはエラーコード
+ * @return mixed 変数が、Ethna_Error の場合に TRUEを返します。
+ * 第2引数が設定された場合は、さらに 所与された $msgcode
+ * を含む場合のみ TRUEを返します。
+ * @static
*/
+ function isError($data, $msgcode = NULL)
+ {
+ if (!is_object($data)) {
+ return false;
+ }
+
+ $class_name = get_class($data);
+ if (strcasecmp($class_name, 'Ethna_Error') === 0
+ || is_subclass_of($data, 'Ethna_Error')) {
+ if ($msgcode == NULL) {
+ return true;
+ } elseif ($data->getCode() == $msgcode) {
+ return true;
+ }
+ }
- /**#@-*/
+ return false;
+ }
/**
* Ethna_Errorオブジェクトを生成する(エラーレベル:E_USER_ERROR)
$userinfo = $userinfo[0];
}
}
- return PEAR::raiseError($message, $code, PEAR_ERROR_RETURN, E_USER_ERROR, $userinfo, 'Ethna_Error');
+ $error = new Ethna_Error($message, $code, ETHNA_ERROR_DUMMY, E_USER_ERROR, $userinfo, 'Ethna_Error');
+ return $error;
}
/**
$userinfo = $userinfo[0];
}
}
- return PEAR::raiseError($message, $code, PEAR_ERROR_RETURN, E_USER_WARNING, $userinfo, 'Ethna_Error');
+
+ $error = new Ethna_Error($message, $code, ETHNA_ERROR_DUMMY, E_USER_WARNING, $userinfo, 'Ethna_Error');
+ return $error;
}
/**
$userinfo = $userinfo[0];
}
}
- return PEAR::raiseError($message, $code, PEAR_ERROR_RETURN, E_USER_NOTICE, $userinfo, 'Ethna_Error');
+
+ $error = new Ethna_Error($message, $code, ETHNA_ERROR_DUMMY, E_USER_NOTICE, $userinfo, 'Ethna_Error');
+ return $error;
}
/**
// perform some more checks?
$object->$method($error);
- } else {
+ } else {
+ // call statically
call_user_func($callback, $error);
}
}
}
}
// }}}
+
?>
set_error_handler('ethna_error_handler');
// }}}
+// {{{ ethna_exception_handler
+ // TODO: Implement ethna_exception_handler function.
+// }}}
+
// {{{ Ethna_Error
/**
* エラークラス
* @access public
* @package Ethna
*/
-class Ethna_Error extends PEAR_Error
+class Ethna_Error
{
/**#@+
* @access private
/** @var object Ethna_Logger loggerオブジェクト */
var $logger;
+ /** @var string エラーメッセージ */
+ var $message;
+
+ /** @var integer エラーコード */
+ var $code;
+
+ /** @var integer エラーモード */
+ var $mode;
+
+ /** @var array エラーモード依存のオプション */
+ var $options;
+
+ /** @var string ユーザー定義もしくはデバッグ関連の追加情報を記した文字列。 */
+ var $userinfo;
+
/**#@-*/
/**
* Ethna_Errorクラスのコンストラクタ
+ * $userinfo は第5引数に設定すること。
*
* @access public
- * @param int $level エラーレベル
* @param string $message エラーメッセージ
* @param int $code エラーコード
- * @param array $userinfo エラー追加情報(エラーコード以降の全ての引数)
+ * @param int $mode エラーモード(PEAR_ERROR_RETURN等だが、
+ * Ethna_Errorはコールバックを常に使用する
+ * ので実質無視される)
+ * @param array $options エラーモード依存のオプション
+ * @param array $userinfo エラー追加情報($options より後の全ての引数)
+ * @see http://pear.php.net/manual/ja/core.pear.pear-error.pear-error.php
*/
function Ethna_Error($message = null, $code = null, $mode = null, $options = null)
{
$this->i18n =& $controller->getI18N();
}
- // $options以降の引数->$userinfo
+ // $options 以降の引数 -> $userinfo
if (func_num_args() > 4) {
$userinfo = array_slice(func_get_args(), 4);
if (count($userinfo) == 1) {
if (is_array($userinfo[0])) {
- $userinfo = $userinfo[0];
+ $this->userinfo = $userinfo[0];
} else if (is_null($userinfo[0])) {
- $userinfo = array();
+ $this->userinfo = array();
}
+ } else {
+ $this->userinfo = $userinfo[0];
}
} else {
- $userinfo = array();
+ $this->userinfo = array();
}
- // メッセージ補正処理
+ // メッセージ補正処理 ($message)
if (is_null($message)) {
// $codeからメッセージを取得する
$message = $controller->getErrorMessage($code);
$message = 'unknown error';
}
}
+ $this->message = $message;
- parent::PEAR_Error($message, $code, $mode, $options, $userinfo);
+ // その他メンバ変数設定
+ $this->code = $code;
+ $this->mode = $mode;
+ $this->options = $options;
+ $this->level = ($this->options === NULL) ? E_USER_NOTICE : $options;
- // Ethnaフレームワークのエラーハンドラ(PEAR_Errorのコールバックとは異なる)
+ // Ethnaフレームワークのエラーハンドラ(PEAR_Errorのコールバックとは異なる)
Ethna::handleError($this);
}
/**
+ * エラーオブジェクトに関連付けられたエラーコードを返します。
+ *
+ * @return integer - エラー番号
+ */
+ function getCode()
+ {
+ return $this->code;
+ }
+
+ /**
* levelへのアクセサ(R)
*
* @access public
/**
* エラー追加情報へのアクセサ(R)
*
- * PEAR_Error::getUserInfo()をオーバーライドして、配列の個々の
- * エントリへのアクセスをサポート
+ * エラー追加情報配列の個々のエントリへのアクセスをサポート
*
* @access public
* @param int $n エラー追加情報のインデックス(省略可)
/**
* エラー追加情報へのアクセサ(W)
*
- * PEAR_Error::addUserInfo()をオーバーライド
- *
* @access public
* @param string $info 追加するエラー情報
*/
}
}
// }}}
+
?>
--- /dev/null
+<?php
+/**
+ * Ethna_Class_Test.php
+ *
+ * @author Yoshinari Takaoka <takaoka@beatcraft.com>
+ * @version $Id$
+ */
+
+class Dummy_Ethna_Error extends Ethna_Error
+{
+ // nothing defined.
+}
+
+function dummy_error_callback_global(&$error)
+{
+ $GLOBALS['_dummy_error_callback_global'] = $error->getMessage();
+}
+
+//{{{ Ethna_Test
+/**
+ * Test Case For Ethna class
+ *
+ * @access public
+ */
+class Ethna_Class_Test extends Ethna_UnitTestBase
+{
+ var $dummy_error_value_class;
+
+ function setUp()
+ {
+ $GLOBALS['_dummy_error_callback_global'] = NULL;
+ $this->dummy_error_value_class = NULL;
+ Ethna::clearErrorCallback();
+ }
+
+ function dummy_error_callback_obj(&$error)
+ {
+ $this->dummy_error_value_class = $error->getMessage();
+ }
+
+ //{{{ isError test
+ function test_isError()
+ {
+ $error = new Ethna_Error();
+ $this->assertTrue(Ethna::isError($error));
+
+ $error = 'this is not object, but string.';
+ $this->assertFalse(Ethna::isError($error));
+
+ $error = new Dummy_Ethna_Error('Error Message', E_CACHE_GENERAL,
+ ETHNA_ERROR_DUMMY, E_USER_ERROR,
+ NULL, 'Ethna_Error'
+ );
+ $this->assertFalse(Ethna::isError($error, E_FORM_REQUIRED));
+ $this->assertTrue(Ethna::isError($error, E_CACHE_GENERAL));
+
+ $error = new stdClass();
+ $this->assertFalse(Ethna::isError($error));
+
+ $error = NULL;
+ $this->assertFalse(Ethna::isError($error));
+ }
+ // }}}
+
+ //{{{ raiseError test
+ function test_raiseError()
+ {
+ $error = Ethna::raiseError('Error!!!!!');
+ $this->assertEqual('Error!!!!!', $error->getMessage());
+ $this->assertEqual(E_USER_ERROR, $error->getLevel());
+ $this->assertEqual(E_GENERAL, $error->getCode());
+
+ $error = Ethna::raiseError('Error', E_CACHE_GENERAL);
+ $this->assertEqual(E_CACHE_GENERAL, $error->getCode());
+ }
+ // }}}
+
+ //{{{ raiseWarning test
+ function test_raiseWarning()
+ {
+ $error = Ethna::raiseWarning('Error!!!!!');
+ $this->assertEqual('Error!!!!!', $error->getMessage());
+ $this->assertEqual(E_USER_WARNING, $error->getLevel());
+ $this->assertEqual(E_GENERAL, $error->getCode());
+
+ $error = Ethna::raiseWarning('Error!!!!!', E_CACHE_GENERAL);
+ $this->assertEqual(E_CACHE_GENERAL, $error->getCode());
+ }
+ // }}}
+
+ //{{{ raiseNotice test
+ function test_raiseNotice()
+ {
+ $error = Ethna::raiseNotice('Error!!!!!');
+ $this->assertEqual('Error!!!!!', $error->getMessage());
+ $this->assertEqual(E_USER_NOTICE, $error->getLevel());
+ $this->assertEqual(E_GENERAL, $error->getCode());
+
+ $error = Ethna::raiseNotice('Error!!!!!', E_CACHE_GENERAL);
+ $this->assertEqual(E_CACHE_GENERAL, $error->getCode());
+ }
+ // }}}
+
+ //{{{ callback test
+ function test_error_callback_obj()
+ {
+ $this->assertNULL($GLOBALS['_dummy_error_callback_global']);
+ $this->assertNULL($this->dummy_error_value_class);
+
+ // array の場合は クラス名|オブジェクト + method
+ Ethna::setErrorCallback(array(&$this, 'dummy_error_callback_obj'));
+ Ethna::raiseError('dummy_error_obj!!!');
+ $this->assertEqual('dummy_error_obj!!!', $this->dummy_error_value_class);
+ $this->assertNULL($GLOBALS['_dummy_error_callback_global']);
+ }
+
+ function test_error_callback_global()
+ {
+ $this->assertNULL($GLOBALS['_dummy_error_callback_global']);
+ $this->assertNULL($this->dummy_error_value_class);
+
+ // string の場合はグローバル関数
+ Ethna::setErrorCallback('dummy_error_callback_global');
+ Ethna::raiseError('dummy_error_global!!!');
+ $this->assertEqual('dummy_error_global!!!', $GLOBALS['_dummy_error_callback_global']);
+ }
+
+ function test_error_callback_mixed()
+ {
+ // string の場合はグローバル関数
+ Ethna::setErrorCallback('dummy_error_callback_global');
+ Ethna::setErrorCallback(array(&$this, 'dummy_error_callback_obj'));
+ Ethna::raiseError('dummy_error_global!!!');
+ $this->assertEqual('dummy_error_global!!!', $GLOBALS['_dummy_error_callback_global']);
+ $this->assertEqual('dummy_error_global!!!', $this->dummy_error_value_class);
+ }
+ // }}}
+}
+// }}}
+
+?>
--- /dev/null
+<?php
+/**
+ * Ethna_Error_Test.php
+ *
+ * @author Yoshinari Takaoka <takaoka@beatcraft.com>
+ * @version $Id$
+ */
+
+//{{{ Ethna_Error_Test
+/**
+ * Test Case For Ethna_Error
+ *
+ * @access public
+ */
+class Ethna_Error_Test extends Ethna_UnitTestBase
+{
+ var $error;
+
+ function setUp()
+ {
+ $this->error = Ethna::raiseError('general error');
+ }
+
+ function tearDown()
+ {
+ $error = NULL;
+ }
+
+ //{{{ getCode
+ function test_getcode()
+ {
+ $this->assertEqual(E_GENERAL, $this->error->getCode());
+ }
+ //}}}
+
+ //{{{ getLevel
+ function test_getlevel()
+ {
+ $this->assertEqual(E_USER_ERROR, $this->error->getLevel());
+ }
+ //}}}
+
+ //{{{ getMessage
+ function test_getmessage()
+ {
+ $this->assertEqual('general error', $this->error->getMessage());
+ }
+ //}}}
+
+ //{{{ setUserInfo, getUserInfo
+ function test_userinfo()
+ {
+ $this->error->addUserInfo('foobarbaz');
+ $this->error->addUserInfo('hoge');
+ $this->assertEqual('foobarbaz', $this->error->getUserInfo(0));
+ $this->assertEqual('hoge', $this->error->getUserInfo(1));
+
+ $info = $this->error->getUserInfo();
+ $this->assertEqual('foobarbaz', $info[0]);
+ $this->assertEqual('hoge', $info[1]);
+ }
+ //}}}
+}
+// }}}
+
+?>
$this->vld->af->setDef('namae_int', $form_int);
$pear_error = $this->vld->validate('namae_int', 9, $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_int', 10, $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_int', '', $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_int', 9.5, $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// maxを超えた値
$pear_error = $this->vld->validate('namae_int', 11, $form_int);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_INT,$pear_error->getCode());
$this->assertEqual($form_int['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('namae_float', $form_float);
$pear_error = $this->vld->validate('namae_float', 10, $form_float);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_float', '', $form_float);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// maxを超えた値
$pear_error = $this->vld->validate('namae_float', 10.11, $form_float);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_FLOAT, $pear_error->getCode());
$this->assertEqual($form_float['error'], $pear_error->getMessage());
// maxを超えた値
$pear_error = $this->vld->validate('namae_float', 11, $form_float);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_FLOAT, $pear_error->getCode());
$this->assertEqual($form_float['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('namae_string', $form_string);
$pear_error = $this->vld->validate('namae_string', '', $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_string', 'as', $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// maxを超えた文字列長
$pear_error = $this->vld->validate('namae_string', 'ddd', $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_STRING, $pear_error->getCode());
$this->assertEqual($form_string['error'], $pear_error->getMessage());
// maxを超えた文字列長
$pear_error = $this->vld->validate('namae_string', 118888, $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_STRING, $pear_error->getCode());
$this->assertEqual($form_string['error'], $pear_error->getMessage());
// multibyte string.
$pear_error = $this->vld->validate('namae_string', 'ああ', $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_string', 'あああ', $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
}
// }}}
$this->vld->af->setDef('namae_datetime', $form_datetime);
$pear_error = $this->vld->validate('namae_datetime', '-2 day', $form_datetime);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_datetime', '-1 day', $form_datetime);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_datetime', '', $form_datetime);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// maxを超えた日付
$pear_error = $this->vld->validate('namae_datetime', '+3 day', $form_datetime);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_DATETIME, $pear_error->getCode());
$this->assertEqual($form_datetime['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('input', $form_def);
$pear_error = $this->vld->validate('input', 9, $form_def);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('input', 'あいう', $form_def);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// encoding に指定された文字コード以外の文字列
$euc_input = mb_convert_encoding('あいう', 'EUC-JP', 'UTF-8');
$pear_error = $this->vld->validate('input', $euc_input, $form_def);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
}
// }}}
$this->vld->af->setDef('namae_mbstr', $form_mbstr);
$pear_error = $this->vld->validate('namae_mbstr', 'あいう', $form_mbstr);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_mbstr', 'あいうえ', $form_mbstr);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_STRING,$pear_error->getCode());
// TODO: Error Message Test.
$this->vld->af->setDef('namae_mbstr', $form_mbstr);
$pear_error = $this->vld->validate('namae_mbstr', 'あいう', $form_mbstr);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_mbstr', 'あい', $form_mbstr);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_STRING,$pear_error->getCode());
// TODO: Error Message Test.
$this->vld->af->setDef('namae_int', $form_int);
$pear_error = $this->vld->validate('namae_int', 12, $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_int', 10, $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_int', '', $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_int', 10.5, $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// minより小さい値
$pear_error = $this->vld->validate('namae_int', -2, $form_int);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_INT,$pear_error->getCode());
$this->assertEqual($form_int['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('namae_float', $form_float);
$pear_error = $this->vld->validate('namae_float', 10.0, $form_float);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_float', '', $form_float);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// minより小さい値
$pear_error = $this->vld->validate('namae_float', 9.11, $form_float);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_FLOAT, $pear_error->getCode());
$this->assertEqual($form_float['error'], $pear_error->getMessage());
// minより小さい値
$pear_error = $this->vld->validate('namae_float', 9, $form_float);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_FLOAT, $pear_error->getCode());
$this->assertEqual($form_float['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('namae_string', $form_string);
$pear_error = $this->vld->validate('namae_string', 'ddd', $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_string', '', $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_string', 'd', $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_STRING, $pear_error->getCode());
$this->assertEqual($form_string['error'], $pear_error->getMessage());
// minを短い文字列長
$pear_error = $this->vld->validate('namae_string', 8, $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_STRING, $pear_error->getCode());
$this->assertEqual($form_string['error'], $pear_error->getMessage());
// multibyte string.
$pear_error = $this->vld->validate('namae_string', 'ああ', $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_string', 'あ', $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
}
// }}}
$this->vld->af->setDef('namae_datetime', $form_datetime);
$pear_error = $this->vld->validate('namae_datetime', '+2 day', $form_datetime);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_datetime', '-1 day', $form_datetime);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_datetime', '', $form_datetime);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// minより古い日付
$pear_error = $this->vld->validate('namae_datetime', '-3 day', $form_datetime);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_DATETIME, $pear_error->getCode());
$this->assertEqual($form_datetime['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('namae_string', $form_string);
$pear_error = $this->vld->validate('namae_string', 'fromA', $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 許されていない文字列
$pear_error = $this->vld->validate('namae_string', '7.6', $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REGEXP, $pear_error->getCode());
$this->assertEqual($form_string['error'], $pear_error->getMessage());
$pear_error = $this->vld->validate('namae_string', '', $form_string);
// requiredとの関係上
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
}
// }}}
}
$this->vld->af->setDef('namae_string', $form_string);
$pear_error = $this->vld->validate('namae_string', 10, $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_string', '', $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_string', false, $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_string', null, $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// required => true でテキストフォームに文字列を入力する場合
$form_string = array(
$this->vld->af->setDef('namae_string', $form_string);
$pear_error = $this->vld->validate('namae_string', 10, $form_string);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 必須フォームに入力がない
$pear_error = $this->vld->validate('namae_string', '', $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_string['error'], $pear_error->getMessage());
$pear_error = $this->vld->validate('namae_string', false, $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual($form_string['error'], $pear_error->getMessage());
$pear_error = $this->vld->validate('namae_string', null, $form_string);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual($form_string['error'], $pear_error->getMessage());
}
// }}}
$this->vld->af->setDef('namae_select', $form_select);
$pear_error = $this->vld->validate('namae_select', 'selection', $form_select);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_select', '', $form_select);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_select', false, $form_select);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_select', null, $form_select);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$form_select = array(
'type' => VAR_TYPE_STRING,
$this->vld->af->setDef('namae_select', $form_select);
$pear_error = $this->vld->validate('namae_select', 'selection', $form_select);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 必須フォームが選択されない
$pear_error = $this->vld->validate('namae_select', '', $form_select);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_select['error'], $pear_error->getMessage());
$pear_error = $this->vld->validate('namae_select', false, $form_select);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_select['error'], $pear_error->getMessage());
$pear_error = $this->vld->validate('namae_select', null, $form_select);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_select['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('namae_radio', $form_radio);
$pear_error = $this->vld->validate('namae_radio', 'radio', $form_radio);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_radio', '', $form_radio);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_radio', false, $form_radio);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_radio', null, $form_radio);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$form_radio = array(
$this->vld->af->setDef('namae_radio', $form_radio);
$pear_error = $this->vld->validate('namae_radio', 'radio', $form_radio);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 必須フォームが選択されない
$pear_error = $this->vld->validate('namae_radio', '', $form_radio);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_radio['error'], $pear_error->getMessage());
$pear_error = $this->vld->validate('namae_radio', false, $form_radio);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_radio['error'], $pear_error->getMessage());
$pear_error = $this->vld->validate('namae_radio', null, $form_radio);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_radio['error'], $pear_error->getMessage());
}
'4th' => 'value'
);
$pear_error = $this->vld->validate('namae_checkbox', $checks, $form_checkbox);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$checks = array();
$pear_error = $this->vld->validate('namae_checkbox', $checks, $form_checkbox);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_checkbox', null, $form_checkbox);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_checkbox', false, $form_checkbox);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$form_checkbox = array(
'4th' => 'value'
);
$pear_error = $this->vld->validate('namae_checkbox', $checks, $form_checkbox);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 必須フォームが選択されない
$checks = array();
$pear_error = $this->vld->validate('namae_checkbox', $checks, $form_checkbox);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_checkbox['error'], $pear_error->getMessage());
$pear_error = $this->vld->validate('namae_checkbox', null, $form_checkbox);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_checkbox['error'], $pear_error->getMessage());
$pear_error = $this->vld->validate('namae_checkbox', false, $form_checkbox);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_checkbox['error'], $pear_error->getMessage());
'4th' => 'value'
);
$pear_error = $this->vld->validate('namae_checkbox', $checks, $form_checkbox);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 何らかの処理でfalseに書き換えてしまった場合はエラー
$checks = array(
'4th' => false
);
$pear_error = $this->vld->validate('namae_checkbox', $checks, $form_checkbox);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_checkbox['error'], $pear_error->getMessage());
'3rd' => 'value'
);
$pear_error = $this->vld->validate('namae_checkbox', $checks, $form_checkbox);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_checkbox['error'], $pear_error->getMessage());
'4' => 3
);
$pear_error = $this->vld->validate('namae_checkbox', $checks, $form_checkbox);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_REQUIRED, $pear_error->getCode());
$this->assertEqual($form_checkbox['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('namae_mbstr', $form_str);
$pear_error = $this->vld->validate('namae_mbstr', 'abc', $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_mbstr', 'abcd', $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_STRING,$pear_error->getCode());
// TODO: Error Message Test.
// ascii.
$input_str = 'abcd';
$pear_error = $this->vld->validate('namae_str', $input_str, $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$error_str = 'abcde';
$pear_error = $this->vld->validate('namae_str', $error_str, $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_STRING,$pear_error->getCode());
// multibyte string
$input_str = 'あい';
$input_str_euc = mb_convert_encoding($input_str, 'EUC-JP', 'UTF-8');
$pear_error = $this->vld->validate('namae_str', $input_str_euc, $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$error_str = 'あいう';
$error_str_euc = mb_convert_encoding($error_str, 'EUC-JP', 'UTF-8');
$pear_error = $this->vld->validate('namae_str', $error_str_euc, $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_STRING,$pear_error->getCode());
} else {
// ascii.
$input_str = 'abcd';
$pear_error = $this->vld->validate('namae_str', $input_str, $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$error_str = 'abcde';
$pear_error = $this->vld->validate('namae_str', $error_str, $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_STRING,$pear_error->getCode());
// multibyte string
$input_str = 'あい';
$input_str_sjis = mb_convert_encoding($input_str, 'SJIS', 'UTF-8');
$pear_error = $this->vld->validate('namae_str', $input_str_sjis, $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$error_str = 'あいう';
$error_str_sjis = mb_convert_encoding($error_str, 'SJIS', 'UTF-8');
$pear_error = $this->vld->validate('namae_str', $error_str_sjis, $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MAX_STRING,$pear_error->getCode());
} else {
$this->vld->af->setDef('namae_str', $form_str);
$pear_error = $this->vld->validate('namae_str', 'abc', $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_str', 'ab', $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_STRING,$pear_error->getCode());
// TODO: Error Message Test.
// ascii.
$input_str = 'abcd';
$pear_error = $this->vld->validate('namae_str', $input_str, $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$error_str = 'abc';
$pear_error = $this->vld->validate('namae_str', $error_str, $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_STRING,$pear_error->getCode());
// multibyte string
$input_str = 'あい';
$input_str_euc = mb_convert_encoding($input_str, 'EUC-JP', 'UTF-8');
$pear_error = $this->vld->validate('namae_str', $input_str_euc, $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$error_str = 'あ';
$error_str_euc = mb_convert_encoding($error_str, 'EUC-JP', 'UTF-8');
$pear_error = $this->vld->validate('namae_str', $error_str_euc, $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_STRING,$pear_error->getCode());
} else {
// ascii.
$input_str = 'abcd';
$pear_error = $this->vld->validate('namae_str', $input_str, $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$error_str = 'abc';
$pear_error = $this->vld->validate('namae_str', $error_str, $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_STRING,$pear_error->getCode());
// multibyte string(sjis)
$input_str = 'あい';
$input_str_sjis = mb_convert_encoding($input_str, 'SJIS', 'UTF-8');
$pear_error = $this->vld->validate('namae_str', $input_str_sjis, $form_str);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$error_str = 'あ';
$error_str_sjis = mb_convert_encoding($error_str, 'SJIS', 'UTF-8');
$pear_error = $this->vld->validate('namae_str', $error_str_sjis, $form_str);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_MIN_STRING,$pear_error->getCode());
} else {
$this->vld->af->setDef('namae_int', $form_int);
$pear_error = $this->vld->validate('namae_int', 10, $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_int', '', $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_int', '76', $form_int);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 整数以外の文字列が入力された
$pear_error = $this->vld->validate('namae_int', '11asd', $form_int);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_WRONGTYPE_INT, $pear_error->getCode());
$this->assertEqual($form_int['error'], $pear_error->getMessage());
// 整数以外の文字列が入力された
$pear_error = $this->vld->validate('namae_int', '7.6', $form_int);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_WRONGTYPE_INT, $pear_error->getCode());
$this->assertEqual($form_int['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('namae_float', $form_float);
$pear_error = $this->vld->validate('namae_float', 10.1, $form_float);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_float', 10, $form_float);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_float', '', $form_float);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 数字以外の文字列が入力された
$pear_error = $this->vld->validate('namae_float', '1-0.1', $form_float);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_WRONGTYPE_FLOAT, $pear_error->getCode());
$this->assertEqual($form_float['error'], $pear_error->getMessage());
}
$this->vld->af->setDef('namae_boolean', $form_boolean);
$pear_error = $this->vld->validate('namae_boolean', 1, $form_boolean);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_boolean', 0, $form_boolean);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_boolean', '', $form_boolean);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 0,1以外の文字が入力された
$pear_error = $this->vld->validate('namae_boolean', 'aaa', $form_boolean);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_WRONGTYPE_BOOLEAN, $pear_error->getCode());
$this->assertEqual($form_boolean['error'], $pear_error->getMessage());
// 0,1以外の文字が入力された
$pear_error = $this->vld->validate('namae_boolean', 10.1, $form_boolean);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_WRONGTYPE_BOOLEAN, $pear_error->getCode());
$this->assertEqual($form_boolean['error'], $pear_error->getMessage());
}
// 正常な日付
$pear_error = $this->vld->validate('namae_datetime', "July 1, 2000 00:00:00 UTC", $form_datetime);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
$pear_error = $this->vld->validate('namae_datetime', "+89 day", $form_datetime);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// empty は required でやるので type ではチェックしない
$pear_error = $this->vld->validate('namae_datetime', "", $form_datetime);
- $this->assertFalse(is_a($pear_error, 'PEAR_Error'));
+ $this->assertFalse(is_a($pear_error, 'Ethna_Error'));
// 日付に変換できない文字列が入力された
$pear_error = $this->vld->validate('namae_datetime', "monkey", $form_datetime);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_WRONGTYPE_DATETIME, $pear_error->getCode());
$this->assertEqual($form_datetime['error'], $pear_error->getMessage());
// 日付に変換できない文字列が入力された
$pear_error = $this->vld->validate('namae_datetime', "--1", $form_datetime);
- $this->assertTrue(is_a($pear_error, 'PEAR_Error'));
+ $this->assertTrue(is_a($pear_error, 'Ethna_Error'));
$this->assertEqual(E_FORM_WRONGTYPE_DATETIME, $pear_error->getCode());
$this->assertEqual($form_datetime['error'], $pear_error->getMessage());
}