[phpwiki-checkins] SF.net SVN: phpwiki:[8985] trunk/lib/WikiDB

[<var...@us...>]

Revision: 8985
          http://sourceforge.net/p/phpwiki/code/8985
Author:   vargenau
Date:     2014-07-17 17:03:59 +0000 (Thu, 17 Jul 2014)
Log Message:
-----------
Use __construct

Modified Paths:
--------------
    trunk/lib/WikiDB/ADODB.php
    trunk/lib/WikiDB/PDO.php
    trunk/lib/WikiDB/SQL.php
    trunk/lib/WikiDB/dba.php
    trunk/lib/WikiDB/file.php
    trunk/lib/WikiDB/flatfile.php

Modified: trunk/lib/WikiDB/ADODB.php
===================================================================
--- trunk/lib/WikiDB/ADODB.php	2014-07-17 16:58:49 UTC (rev 8984)
+++ trunk/lib/WikiDB/ADODB.php	2014-07-17 17:03:59 UTC (rev 8985)
@@ -12,7 +12,7 @@
  */
 class WikiDB_ADODB extends WikiDB
 {
-    function WikiDB_ADODB($dbparams)
+    function __construct($dbparams)
     {
         $backend = 'ADODB';
         if (is_array($dbparams['dsn']))
@@ -35,7 +35,7 @@
         $backend_class = "WikiDB_backend_" . $backend;
         $backend = new $backend_class($dbparams);
         if (!$backend->_dbh->_connectionID) return false;
-        $this->WikiDB($backend, $dbparams);
+        parent::__construct($backend, $dbparams);
     }
 
     /**

Modified: trunk/lib/WikiDB/PDO.php
===================================================================
--- trunk/lib/WikiDB/PDO.php	2014-07-17 16:58:49 UTC (rev 8984)
+++ trunk/lib/WikiDB/PDO.php	2014-07-17 17:03:59 UTC (rev 8985)
@@ -18,7 +18,7 @@
  */
 class WikiDB_PDO extends WikiDB
 {
-    function WikiDB_PDO($dbparams)
+    function __construct($dbparams)
     {
         if (is_array($dbparams['dsn']))
             $backend = $dbparams['dsn']['phptype'];
@@ -33,7 +33,7 @@
         include_once("lib/WikiDB/backend/$backend.php");
         $backend_class = "WikiDB_backend_$backend";
         $backend = new $backend_class($dbparams);
-        $this->WikiDB($backend, $dbparams);
+        parent::__construct($backend, $dbparams);
     }
 
     /**

Modified: trunk/lib/WikiDB/SQL.php
===================================================================
--- trunk/lib/WikiDB/SQL.php	2014-07-17 16:58:49 UTC (rev 8984)
+++ trunk/lib/WikiDB/SQL.php	2014-07-17 17:03:59 UTC (rev 8985)
@@ -1,12 +1,7 @@
 <?php
 
 require_once 'lib/WikiDB.php';
-//require_once('lib/WikiDB/backend/PearDB.php');
-//require_once('DB.php'); // Always favor use our local pear copy
 
-/**
- *
- */
 class WikiDB_SQL extends WikiDB
 {
     function __construct($dbparams)

Modified: trunk/lib/WikiDB/dba.php
===================================================================
--- trunk/lib/WikiDB/dba.php	2014-07-17 16:58:49 UTC (rev 8984)
+++ trunk/lib/WikiDB/dba.php	2014-07-17 17:03:59 UTC (rev 8985)
@@ -2,15 +2,13 @@
 
 require_once 'lib/WikiDB.php';
 require_once 'lib/WikiDB/backend/dba.php';
-/**
- *
- */
+
 class WikiDB_dba extends WikiDB
 {
-    function WikiDB_dba($dbparams)
+    function __construct($dbparams)
     {
         $backend = new WikiDB_backend_dba($dbparams);
-        $this->WikiDB($backend, $dbparams);
+        parent::__construct($backend, $dbparams);
 
         if (empty($dbparams['directory'])
             || preg_match('@^/tmp\b@', $dbparams['directory'])

Modified: trunk/lib/WikiDB/file.php
===================================================================
--- trunk/lib/WikiDB/file.php	2014-07-17 16:58:49 UTC (rev 8984)
+++ trunk/lib/WikiDB/file.php	2014-07-17 17:03:59 UTC (rev 8985)
@@ -34,7 +34,7 @@
     function __construct($dbparams)
     {
         $backend = new WikiDB_backend_file($dbparams);
-        $this->WikiDB($backend, $dbparams);
+        parent::__construct($backend, $dbparams);
 
         if (empty($dbparams['directory'])
             || preg_match('@^/tmp\b@', $dbparams['directory'])

Modified: trunk/lib/WikiDB/flatfile.php
===================================================================
--- trunk/lib/WikiDB/flatfile.php	2014-07-17 16:58:49 UTC (rev 8984)
+++ trunk/lib/WikiDB/flatfile.php	2014-07-17 17:03:59 UTC (rev 8985)
@@ -34,7 +34,7 @@
     {
         $backend = new WikiDB_backend_flatfile($dbparams);
         $backend->_wikidb =& $this;
-        $this->WikiDB($backend, $dbparams);
+        parent::__construct($backend, $dbparams);
 
         if (empty($dbparams['directory'])
             || preg_match('@^/tmp\b@', $dbparams['directory'])

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.