db: fixed modifier.

- because keeping B.C., protected property DB:: is stayed public

diff --git a/class/DB.php b/class/DB.php
index e025dfa..843ab7f 100644 (file)
--- a/class/DB.php
+++ b/class/DB.php
@@ -26,11 +26,14 @@ class Ethna_DB
      *  @access private
      */
 
-    /** @var    object  DB              DBオブジェクト */
-    var $db;
+    /**
+     * @XXX stay public because of B.C.
+     * @protected    object  DB              DBオブジェクト
+     */
+    public $db;
 
-    /** @var    array   トランザクション管理スタック */
-    var $transaction = array();
+    /** @protected    array   トランザクション管理スタック */
+    protected $transaction = array();
 
     /**#@-*/
 

diff --git a/class/DB/ADOdb.php b/class/DB/ADOdb.php
index cb6090d..e6bba8f 100644 (file)
--- a/class/DB/ADOdb.php
+++ b/class/DB/ADOdb.php
@@ -18,7 +18,7 @@ require_once 'adodb/adodb.inc.php';
 function ethna_adodb_logger ($msg, $newline) {
     $c = Ethna_Controller::getInstance();
     $logger = $c->getLogger();
-    
+
     $logger->log(LOG_DEBUG, strip_tags(str_replace("\n", "", $msg)));
 }
 
@@ -37,11 +37,14 @@ class Ethna_DB_ADOdb extends Ethna_DB
      *  @access private
      */
 
-    /** @var    object  DB              DBオブジェクト */
-    var $db;
+    /**
+     * @XXX stay public because of B.C.
+     * @protected    object  DB              DBオブジェクト
+     */
+    public $db;
 
-    /** @var    string   dsn */
-    var $dsn;
+    /** @protected    string   dsn */
+    protected $dsn;
 
     /**#@-*/
 
@@ -71,7 +74,7 @@ class Ethna_DB_ADOdb extends Ethna_DB
     function connect()
     {
         $dsn = $this->parseDSN($this->dsn);
-        
+
         if ($dsn['phptype'] == 'sqlite') {
             $path = $dsn['database'];
             $this->db = ADONewConnection("sqlite");
@@ -85,7 +88,7 @@ class Ethna_DB_ADOdb extends Ethna_DB
             return true;
         } else {
             return false;
-        }    
+        }
     }
     //}}}
 
@@ -173,7 +176,7 @@ class Ethna_DB_ADOdb extends Ethna_DB
         return $this->_query($query, $inputarr);
     }
     //}}}
-    
+
     //{{{ _query
     /**
      *  クエリを発行する
@@ -257,7 +260,7 @@ class Ethna_DB_ADOdb extends Ethna_DB
         return $this->db->AutoExecute($table, $fields, $mode, $where, $forceUpdate, $magicq);
     }
     //}}}
-    
+
     //{{{ pageExecute
     /**
      * pageExecute

diff --git a/class/DB/Creole.php b/class/DB/Creole.php
index 75b63c2..686c72b 100644 (file)
--- a/class/DB/Creole.php
+++ b/class/DB/Creole.php
@@ -26,11 +26,14 @@ class Ethna_DB_Creole extends Ethna_DB
      *  @access private
      */
 
-    /** @var    object  DB              DBオブジェクト */
-    var $db;
+    /**
+     * @XXX stay public because of B.C.
+     * @protected    object  DB              DBオブジェクト
+     */
+    public $db;
 
-    /** @var    string   dsn */
-    var $dsn;
+    /** @protected    string   dsn */
+    protected $dsn;
 
     /**#@-*/
 

diff --git a/class/DB/PEAR.php b/class/DB/PEAR.php
index c91d003..5e2656e 100644 (file)
--- a/class/DB/PEAR.php
+++ b/class/DB/PEAR.php
@@ -25,30 +25,33 @@ class Ethna_DB_PEAR extends Ethna_DB
      *  @access private
      */
 
-    /** @var    object  DB              PEAR DBオブジェクト */
-    var $db;
+    /**
+     * @XXX stay public because of B.C.
+     * @protected    object  DB              DBオブジェクト
+     */
+    public $db;
 
-    /** @var    array   トランザクション管理スタック */
-    var $transaction = array();
+    /** @protected    array   トランザクション管理スタック */
+    protected $transaction = array();
 
 
-    /** @var    object  Ethna_Logger    ログオブジェクト */
-    var $logger;
+    /** @protected    object  Ethna_Logger    ログオブジェクト */
+    protected $logger;
 
-    /** @var    object  Ethna_AppSQL    SQLオブジェクト */
-    var $sql;
+    /** @protected    object  Ethna_AppSQL    SQLオブジェクト */
+    protected $sql;
 
-    /** @var    string  DBタイプ(mysql, pgsql...) */
-    var $type;
+    /** @protected    string  DBタイプ(mysql, pgsql...) */
+    protected $type;
 
-    /** @var    string  DSN */
-    var $dsn;
+    /** @protected    string  DSN */
+    protected $dsn;
 
-    /** @var    array   DSN (DB::parseDSN()の返り値) */
-    var $dsninfo;
+    /** @protected    array   DSN (DB::parseDSN()の返り値) */
+    protected $dsninfo;
 
-    /** @var    bool    持続接続フラグ */
-    var $persistent;
+    /** @protected    bool    持続接続フラグ */
+    protected $persistent;
 
     /**#@-*/
     // }}}