Correctly namespace DatabaseSetupException

diff --git a/lib/private/databasesetupexception.php b/lib/private/databasesetupexception.php
new file mode 100644 (file)
index 0000000..9235cda
--- /dev/null
+++ b/lib/private/databasesetupexception.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+class DatabaseSetupException extends HintException {
+}

diff --git a/lib/private/setup.php b/lib/private/setup.php
index 1125933c8e992693540bf671c57427da8cff494d..45c97bbd22574fb311c5b255e95d2e2b540c9c1b 100644 (file)
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -8,9 +8,6 @@
 
 use OCP\IConfig;
 
-class DatabaseSetupException extends \OC\HintException {
-}
-
 class OC_Setup {
        /** @var IConfig */
        protected $config;
@@ -195,7 +192,7 @@ class OC_Setup {
                try {
                        $dbSetup->initialize($options);
                        $dbSetup->setupDatabase($username);
-               } catch (DatabaseSetupException $e) {
+               } catch (\OC\DatabaseSetupException $e) {
                        $error[] = array(
                                'error' => $e->getMessage(),
                                'hint' => $e->getHint()

diff --git a/lib/private/setup/mssql.php b/lib/private/setup/mssql.php
index b8329f9907963d26f8dc6f0b991b7488e6e9eb41..5143545b76ffdbd11bdaa9e138631ecd4815b74e 100644 (file)
--- a/lib/private/setup/mssql.php
+++ b/lib/private/setup/mssql.php
@@ -17,7 +17,7 @@ class MSSQL extends AbstractDatabase {
                        } else {
                                $entry = '';
                        }
-                       throw new \DatabaseSetupException($this->trans->t('MS SQL username and/or password not valid: %s', array($entry)),
+                       throw new \OC\DatabaseSetupException($this->trans->t('MS SQL username and/or password not valid: %s', array($entry)),
                                        $this->trans->t('You need to enter either an existing account or the administrator.'));
                }
 

diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index 5558a2d1e51415dc4821df17adb8e6b048f23979..8f8d86d388ce2963678ac973fb530e4547a14f15 100644 (file)
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -9,7 +9,7 @@ class MySQL extends AbstractDatabase {
                //check if the database user has admin right
                $connection = @mysql_connect($this->dbhost, $this->dbuser, $this->dbpassword);
                if(!$connection) {
-                       throw new \DatabaseSetupException($this->trans->t('MySQL/MariaDB username and/or password not valid'),
+                       throw new \OC\DatabaseSetupException($this->trans->t('MySQL/MariaDB username and/or password not valid'),
                                $this->trans->t('You need to enter either an existing account or the administrator.'));
                }
                //user already specified in config
@@ -96,13 +96,13 @@ class MySQL extends AbstractDatabase {
                $query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
                $result = mysql_query($query, $connection);
                if (!$result) {
-                       throw new \DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'localhost' exists already.", array($name)),
+                       throw new \OC\DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'localhost' exists already.", array($name)),
                                $this->trans->t("Drop this user from MySQL/MariaDB", array($name)));
                }
                $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
                $result = mysql_query($query, $connection);
                if (!$result) {
-                       throw new \DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'%%' already exists", array($name)),
+                       throw new \OC\DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'%%' already exists", array($name)),
                                $this->trans->t("Drop this user from MySQL/MariaDB."));
                }
        }

diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php
index 23b5232438a228431d41e8241154ff61a4550a3a..b75b658bae22b9e67f8e987122b8230a7fc54f8f 100644 (file)
--- a/lib/private/setup/oci.php
+++ b/lib/private/setup/oci.php
@@ -45,14 +45,14 @@ class OCI extends AbstractDatabase {
                if(!$connection) {
                        $errorMessage = $this->getLastError();
                        if ($errorMessage) {
-                               throw new \DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
+                               throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
                                $errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
                                                        .' ORACLE_SID='.getenv('ORACLE_SID')
                                                        .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
                                                        .' NLS_LANG='.getenv('NLS_LANG')
                                                        .' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
                        }
-                       throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+                       throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
                                        'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
                                                        .' ORACLE_SID='.getenv('ORACLE_SID')
                                                        .' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
@@ -124,7 +124,7 @@ class OCI extends AbstractDatabase {
                }
                $connection = @oci_connect($this->dbuser, $this->dbpassword, $easy_connect_string);
                if(!$connection) {
-                       throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+                       throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
                                        $this->trans->t('You need to enter either an existing account or the administrator.'));
                }
                $query = "SELECT count(*) FROM user_tables WHERE table_name = :un";

diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php
index 4d0c9b52a4dfcdd552f4b0784b689e2f85e29c46..3777d1620bcd6ff8256b38b01826b55f11bc4dfa 100644 (file)
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
@@ -27,7 +27,7 @@ class PostgreSQL extends AbstractDatabase {
                        $connection = @pg_connect($connection_string);
 
                        if(!$connection)
-                               throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+                               throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
                                                $this->trans->t('You need to enter either an existing account or the administrator.'));
                }
                $e_user = pg_escape_string($this->dbuser);
@@ -80,7 +80,7 @@ class PostgreSQL extends AbstractDatabase {
                $connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' port='$port' password='$e_password'";
                $connection = @pg_connect($connection_string);
                if(!$connection) {
-                       throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+                       throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
                                        $this->trans->t('You need to enter either an existing account or the administrator.'));
                }
                $query = "select count(*) FROM pg_class WHERE relname='".$this->tableprefix."users' limit 1";