xoops-svn

[xoops-svn] SF.net SVN: xoops-svn:[11955] XoopsCore/branches/2.6.x/2.6.0_doctrine/ htdocs/class/database

[<rgr...@us...>]

Revision: 11955
          http://sourceforge.net/p/xoops/svn/11955
Author:   rgriffith
Date:     2013-08-21 02:39:43 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Rename from xoopsdatabase to connection

We already have a xoopdatabase class, and this class is xoopsconnection. This will still need attention to get to PSR-0, but it is much closer.

Added Paths:
-----------
    XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/connection.php

Removed Paths:
-------------
    XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/xoopsdatabase.php

Copied: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/connection.php (from rev 11954, XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/xoopsdatabase.php)
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/connection.php	                        (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/connection.php	2013-08-21 02:39:43 UTC (rev 11955)
@@ -0,0 +1,38 @@
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * MySQL access
+ *
+ * @copyright       The XOOPS project http://sourceforge.net/projects/xoops/
+ * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
+ * @package         class
+ * @subpackage      database
+ * @since           1.0.0
+ * @author          Kazumi Ono <on...@xo...>
+ * @version         $Id: mysqldatabase.php 10328 2012-12-07 00:56:07Z trabis $
+ */
+
+defined('XOOPS_ROOT_PATH') or die('Restricted access');
+
+/**
+ * connection to a mysql database
+ *
+ * @abstract
+ * @author Kazumi Ono <on...@xo...>
+ * @copyright copyright (c) 2000-2003 XOOPS.org
+ * @package class
+ * @subpackage database
+ */
+class XoopsConnection extends \Doctrine\DBAL\Connection
+{
+
+}
\ No newline at end of file

Deleted: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/xoopsdatabase.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/xoopsdatabase.php	2013-08-20 17:12:12 UTC (rev 11954)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/xoopsdatabase.php	2013-08-21 02:39:43 UTC (rev 11955)
@@ -1,38 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * MySQL access
- *
- * @copyright       The XOOPS project http://sourceforge.net/projects/xoops/
- * @license         GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html)
- * @package         class
- * @subpackage      database
- * @since           1.0.0
- * @author          Kazumi Ono <on...@xo...>
- * @version         $Id: mysqldatabase.php 10328 2012-12-07 00:56:07Z trabis $
- */
-
-defined('XOOPS_ROOT_PATH') or die('Restricted access');
-
-/**
- * connection to a mysql database
- *
- * @abstract
- * @author Kazumi Ono <on...@xo...>
- * @copyright copyright (c) 2000-2003 XOOPS.org
- * @package class
- * @subpackage database
- */
-class XoopsConnection extends Doctrine\DBAL\Connection
-{
-
-}
\ No newline at end of file

[xoops-svn] SF.net SVN: xoops-svn:[11980] XoopsCore/branches/2.6.x/2.6.0_doctrine/ htdocs/class/database

[<red...@us...>]

Revision: 11980
          http://sourceforge.net/p/xoops/svn/11980
Author:   redheadedrod
Date:     2013-08-25 22:26:28 +0000 (Sun, 25 Aug 2013)
Log Message:
-----------
Fixed missed typos.

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php
    XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php

Modified: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php	2013-08-25 20:45:24 UTC (rev 11979)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/databasefactory.php	2013-08-25 22:26:28 UTC (rev 11980)
@@ -75,17 +75,14 @@
                     $class = 'Xoops' . ucfirst(XOOPS_DB_TYPE) . 'DatabaseProxy';
                 }
                 $xoopsPreload = XoopsPreload::getInstance();
-                $xoopsPreload->triggerEvent(
-                    'core.class.database.databasefactory.connection',
-                    array(&$class)
-                );
+                $xoopsPreload->triggerEvent('core.class.database.databasefactory.connection', array(&$class));
                 $xoopsDB = new $class();
                 $xoopsDB->setPrefix(XOOPS_DB_PREFIX);
                 $xoopsDB->conn = $instance;
             } else {
                 $xoopsDB = null;
                 $xoopsPreload = XoopsPreload::getInstance();
-                trigger_error('notrace:Unable to connect to database', E_USER_ERROR);
+                $xoopsPreload->trigger_error('notrace:Unable to connect to database', E_USER_ERROR);
             }
         }
         return $instance;

Modified: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php	2013-08-25 20:45:24 UTC (rev 11979)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php	2013-08-25 22:26:28 UTC (rev 11980)
@@ -71,8 +71,8 @@
      */
     public function connect($selectdb = true)
     {
-        $this->_connect = (is_object($this->conn));
-        $this->_selectdb = $selectdb;
+        $this->connect = (is_object($this->conn));
+        $this->selectdb = $selectdb;
         $this->allowWebChanges = ($_SERVER['REQUEST_METHOD'] != 'GET');
         return $this->connect;
     }