Changeset 468 for trunk/lib/DB.inc.php

Timestamp:

Feb 20, 2014 3:03:59 AM (10 years ago)

Author:

anonymous

Message:

Completed integrating ^{/branches/eli_branch into} /trunk. Changes include:

• Removed closing ?> from end of files
• Upgrade old-style contructor methods to use construct() instead.
• Class properties and methods defined as public, private, static or protected
• Ensure code runs under E_ALL with only mysql_* deprecated warnings
• Search for the '@' symbol anywhere it might be used to supress runtime errors, then replace with proper error recovery.
• Run the php cli -l option to check files for syntax errors.
• Bring tests up-to-date with latest version and methods of PHPUnit

Location:

trunk

Files:

• . (modified) (1 prop)
• lib/DB.inc.php (modified) (20 diffs)

trunk/lib/DB.inc.php

@@ -32 +32 @@
 class DB {
 
+    // A place to keep an object instance for the singleton pattern.
+    private static $instance = null;
+
     // If $db->connect has successfully opened a db connection.
-    var $_connected = false;
+    private $_connected = false;
 
     // Database handle.
-    var $dbh;
+    public $dbh;
 
     // Count how many queries run during the whole instance.
-    var $_query_count = 0;
+    private $_query_count = 0;
 
     // Hash of DB parameters.
-    var $_params = array();
+    private $_params = array();
 
     // Default parameters.
-    var $_param_defaults = array(
+    private $_param_defaults = array(
 
         // DB passwords should be set as apache environment variables in httpd.conf, readable only by root.
@@ -64 +67 @@
 
     // Translate between HTML and MySQL character set names.
-    var $mysql_character_sets = array(
+    public $mysql_character_sets = array(
         'utf-8' => 'utf8',
         'iso-8859-1' => 'latin1',
@@ -70 +73 @@
 
     // Caches.
-    var $existing_tables;
-    var $table_columns;
+    private $existing_tables;
+    private $table_columns;
 
     /**
@@ -80 +83 @@
      * @static
      */
-    static function &getInstance()
-    {
-        static $instance = null;
-
-        if ($instance === null) {
-            $instance = new DB();
-        }
-
-        return $instance;
+    public static function &getInstance()
+    {
+        if (self::$instance === null) {
+            self::$instance = new self();
+        }
+
+        return self::$instance;
     }
 
@@ -98 +99 @@
      * @param  array    $params     Array of parameters (key => val pairs).
      */
-    function setParam($params)
+    public function setParam($params)
     {
         $app =& App::getInstance();
@@ -117 +118 @@
      * @return mixed               Configured parameter value.
      */
-    function getParam($param)
+    public function getParam($param)
     {
         $app =& App::getInstance();
@@ -136 +137 @@
      * @since   28 Aug 2005 14:02:49
      */
-    function connect()
+    public function connect()
     {
         $app =& App::getInstance();
@@ -146 +147 @@
 
         // Connect to database. Always create a new link to the server.
-        if ($this->dbh = mysql_connect($this->getParam('db_server'), $this->getParam('db_user'), $this->getParam('db_pass'), true)) {
+        if ($this->dbh = @mysql_connect($this->getParam('db_server'), $this->getParam('db_user'), $this->getParam('db_pass'), true)) {
             // Select database
             mysql_select_db($this->getParam('db_name'), $this->dbh);
@@ -185 +186 @@
      * @since   28 Aug 2005 14:32:01
      */
-    function close()
+    public function close()
     {
         if (!$this->_connected) {
@@ -204 +205 @@
     * @since    03 Jul 2013 14:50:23
     */
-    function reconnect()
+    public function reconnect()
     {
         $this->close();
@@ -221 +222 @@
     * @since    15 Jan 2007 15:59:00
     */
-    function _fail()
+    private function _fail()
     {
         if ($this->getParam('db_die_on_failure')) {
@@ -240 +241 @@
      * @since   20 Aug 2005 13:50:36
      */
-    function getDBH()
+    public function getDBH()
     {
         if (!$this->_connected) {
@@ -256 +257 @@
      * @since   28 Aug 2005 14:58:09
      */
-    function isConnected()
+    public function isConnected()
     {
         return (true === $this->_connected);
@@ -270 +271 @@
      * @since   06 Mar 2006 16:41:32
      */
-    function escapeString($string)
+    public function escapeString($string)
     {
         if (!$this->_connected) {
@@ -287 +288 @@
      * @return resource         Query identifier
      */
-    function query($query, $debug=false)
+    public function query($query, $debug=false)
     {
         $app =& App::getInstance();
@@ -336 +337 @@
      * @return bool                         true if given $table exists.
      */
-    function tableExists($table, $use_cached_results=true)
+    public function tableExists($table, $use_cached_results=true)
     {
         $app =& App::getInstance();
@@ -368 +369 @@
      * @return bool                         true if column(s) exist.
      */
-    function columnExists($table, $columns, $strict=true, $use_cached_results=true)
+    public function columnExists($table, $columns, $strict=true, $use_cached_results=true)
     {
         if (!$this->_connected) {
@@ -416 +417 @@
     * @since    15 Jun 2006 11:46:05
     */
-    function numQueries()
+    public function numQueries()
     {
         return $this->_query_count;
@@ -428 +429 @@
      * @since   28 Aug 2005 22:10:50
      */
-    function resetCache()
+    public function resetCache()
     {
         $this->existing_tables = null;
@@ -436 +437 @@
 } // End.
 
-?>