plugin: validator: fixed method modifier

diff --git a/class/Plugin/Validator.php b/class/Plugin/Validator.php
index 532901e..76a1a75 100644 (file)
--- a/class/Plugin/Validator.php
+++ b/class/Plugin/Validator.php
@@ -28,40 +28,12 @@ class Ethna_Plugin_Validator extends Ethna_Plugin_Abstract
      *  @access private
      */
 
-    /** @var    object  Ethna_Backend   backendオブジェクト */
-    //var $backend;
-
-    /** @var    object  Ethna_Logger    ログオブジェクト */
-    //var $logger;
-
-    /** @var    object  Ethna_ActionForm    フォームオブジェクト */
-    //var $action_form;
-
-    /** @var    object  Ethna_ActionForm    フォームオブジェクト */
-    //var $af;
-
     /** @var    bool    配列を受け取るバリデータかどうかのフラグ */
-    var $accept_array = false;
+    public $accept_array = false;
 
     /**#@-*/
 
     /**
-     *  コンストラクタ
-     *
-     *  @access public
-     *  @param  object  Ethna_Controller    $controller コントローラオブジェクト
-     */
-    /*
-    function Ethna_Plugin_Validator(&$controller)
-    {
-        $this->backend = $controller->getBackend();
-        $this->logger = $controller->getLogger();
-        $this->action_form = $controller->getActionForm();
-        $this->af = $this->action_form;
-    }
-    */
-
-    /**
      *  フォーム値検証のためにActionFormから呼び出されるメソッド
      *
      *  @access public
@@ -69,7 +41,7 @@ class Ethna_Plugin_Validator extends Ethna_Plugin_Abstract
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         die('override!');
     }
@@ -80,7 +52,7 @@ class Ethna_Plugin_Validator extends Ethna_Plugin_Abstract
      *  @access public
      *  @param  string  $name       フォームの名前
      */
-    function getFormDef($name)
+    public function getFormDef($name)
     {
         return $this->af->getDef($name);
     }
@@ -91,7 +63,7 @@ class Ethna_Plugin_Validator extends Ethna_Plugin_Abstract
      *  @access public
      *  @param  string  $name       フォームの名前
      */
-    function getFormType($name)
+    public function getFormType($name)
     {
         $def = $this->af->getDef($name);
         if (isset($def['type'])) {
@@ -112,7 +84,7 @@ class Ethna_Plugin_Validator extends Ethna_Plugin_Abstract
      *  @param  mixed   $var       フォームの値 (配列フォームの場合は各要素)
      *  @param  int     $type      フォームのtype
      */
-    function isEmpty($var, $type)
+    protected function isEmpty($var, $type)
     {
         if ($type == VAR_TYPE_FILE) {
             if (isset($var['error']) == false || $var['error'] != UPLOAD_ERR_OK) {
@@ -133,25 +105,25 @@ class Ethna_Plugin_Validator extends Ethna_Plugin_Abstract
     }
 
     /**
-     *  true を参照で返す
+     *  return true
      *
      *  @access protected
      */
-    function &ok()
+    protected function ok()
     {
         $true = true;
         return $true;
     }
 
     /**
-     *  エラーを返す
+     *  return error
      *
      *  @access protected
      *  @param  string  $msg        エラーメッセージ
      *  @param  int     $code       エラーコード
      *  @param  mixed   $info       エラーメッセージにsprintfで渡すパラメータ
      */
-    function &error($msg, $code, $info = null)
+    protected function error($msg, $code, $info = null)
     {
         if ($info != null) {
             if (is_array($info)) {

diff --git a/class/Plugin/Validator/Custom.php b/class/Plugin/Validator/Custom.php
index 3bc0045..7ff8748 100644 (file)
--- a/class/Plugin/Validator/Custom.php
+++ b/class/Plugin/Validator/Custom.php
@@ -30,7 +30,7 @@ class Ethna_Plugin_Validator_Custom extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $false = false;

diff --git a/class/Plugin/Validator/File.php b/class/Plugin/Validator/File.php
index 28f0ee0..ed4dfaf 100644 (file)
--- a/class/Plugin/Validator/File.php
+++ b/class/Plugin/Validator/File.php
@@ -54,7 +54,7 @@ class Ethna_Plugin_Validator_File extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         if ($this->getFormType($name) != VAR_TYPE_FILE) {

diff --git a/class/Plugin/Validator/Max.php b/class/Plugin/Validator/Max.php
index e9eb90f..9dcc9a1 100644 (file)
--- a/class/Plugin/Validator/Max.php
+++ b/class/Plugin/Validator/Max.php
@@ -30,7 +30,7 @@ class Ethna_Plugin_Validator_Max extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Mbregexp.php b/class/Plugin/Validator/Mbregexp.php
index fbb1556..b4066f5 100644 (file)
--- a/class/Plugin/Validator/Mbregexp.php
+++ b/class/Plugin/Validator/Mbregexp.php
@@ -20,7 +20,7 @@ class Ethna_Plugin_Validator_Mbregexp extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Mbstrmax.php b/class/Plugin/Validator/Mbstrmax.php
index c7bbe41..e7338cc 100644 (file)
--- a/class/Plugin/Validator/Mbstrmax.php
+++ b/class/Plugin/Validator/Mbstrmax.php
@@ -35,7 +35,7 @@ class Ethna_Plugin_Validator_Mbstrmax extends Ethna_Plugin_Validator
      *  @param  array   $params     プラグインのパラメータ
      *  @return true: 成功  Ethna_Error: エラー
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Mbstrmin.php b/class/Plugin/Validator/Mbstrmin.php
index b7f4d45..6992e88 100644 (file)
--- a/class/Plugin/Validator/Mbstrmin.php
+++ b/class/Plugin/Validator/Mbstrmin.php
@@ -35,7 +35,7 @@ class Ethna_Plugin_Validator_Mbstrmin extends Ethna_Plugin_Validator
      *  @param  array   $params     プラグインのパラメータ
      *  @return true: 成功  Ethna_Error: エラー
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Min.php b/class/Plugin/Validator/Min.php
index fd1c6e0..c9cc4f1 100644 (file)
--- a/class/Plugin/Validator/Min.php
+++ b/class/Plugin/Validator/Min.php
@@ -30,7 +30,7 @@ class Ethna_Plugin_Validator_Min extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Regexp.php b/class/Plugin/Validator/Regexp.php
index abba7e1..daf744c 100644 (file)
--- a/class/Plugin/Validator/Regexp.php
+++ b/class/Plugin/Validator/Regexp.php
@@ -30,7 +30,7 @@ class Ethna_Plugin_Validator_Regexp extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Required.php b/class/Plugin/Validator/Required.php
index a23d6eb..7f175b6 100644 (file)
--- a/class/Plugin/Validator/Required.php
+++ b/class/Plugin/Validator/Required.php
@@ -33,7 +33,7 @@ class Ethna_Plugin_Validator_Required extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         if (isset($params['required']) && $params['required'] == false) {

diff --git a/class/Plugin/Validator/Strmax.php b/class/Plugin/Validator/Strmax.php
index d64f9b2..24708ec 100644 (file)
--- a/class/Plugin/Validator/Strmax.php
+++ b/class/Plugin/Validator/Strmax.php
@@ -35,7 +35,7 @@ class Ethna_Plugin_Validator_Strmax extends Ethna_Plugin_Validator
      *  @param  array   $params     プラグインのパラメータ
      *  @return true: 成功  Ethna_Error: エラー
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Strmaxcompat.php b/class/Plugin/Validator/Strmaxcompat.php
index 798f22d..b1b8bd0 100644 (file)
--- a/class/Plugin/Validator/Strmaxcompat.php
+++ b/class/Plugin/Validator/Strmaxcompat.php
@@ -38,7 +38,7 @@ class Ethna_Plugin_Validator_Strmaxcompat extends Ethna_Plugin_Validator
      *  @param  array   $params     プラグインのパラメータ
      *  @return true: 成功  Ethna_Error: エラー
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Strmin.php b/class/Plugin/Validator/Strmin.php
index 4ffe927..395c854 100644 (file)
--- a/class/Plugin/Validator/Strmin.php
+++ b/class/Plugin/Validator/Strmin.php
@@ -34,7 +34,7 @@ class Ethna_Plugin_Validator_Strmin extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Strmincompat.php b/class/Plugin/Validator/Strmincompat.php
index bffff17..601fb22 100644 (file)
--- a/class/Plugin/Validator/Strmincompat.php
+++ b/class/Plugin/Validator/Strmincompat.php
@@ -37,7 +37,7 @@ class Ethna_Plugin_Validator_Strmincompat extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $this->getFormType($name);

diff --git a/class/Plugin/Validator/Type.php b/class/Plugin/Validator/Type.php
index fe593ee..1e557b9 100644 (file)
--- a/class/Plugin/Validator/Type.php
+++ b/class/Plugin/Validator/Type.php
@@ -30,7 +30,7 @@ class Ethna_Plugin_Validator_Type extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         $true = true;
         $type = $params['type'];

diff --git a/skel/plugin/skel.plugin.v.php b/skel/plugin/skel.plugin.v.php
index f92b43d..8f19fbc 100644 (file)
--- a/skel/plugin/skel.plugin.v.php
+++ b/skel/plugin/skel.plugin.v.php
@@ -31,7 +31,7 @@ class Ethna_Plugin_Validator_{$plugin_name} extends Ethna_Plugin_Validator
      *  @param  mixed   $var        フォームの値
      *  @param  array   $params     プラグインのパラメータ
      */
-    function &validate($name, $var, $params)
+    public function validate($name, $var, $params)
     {
         //
         //   sample