OC_DB_MDB2SchemaManager -> OC\DB\MDB2SchemaManager

diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index aef485ed686252e1c4ccca6907e2c4d83c8402ae..6fa9a63ec0024b1cb5c2c51998e6cefc74fb8ea1 100644 (file)
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -55,7 +55,7 @@ class MDB2SchemaManager {
         * TODO: write more documentation
         */
        public function getDbStructure($file) {
-               return \OC_DB_MDB2SchemaWriter::saveSchemaToFile($file, $this->conn);
+               return \OC\DB\MDB2SchemaWriter::saveSchemaToFile($file, $this->conn);
        }
 
        /**

diff --git a/lib/private/db/mdb2schemawriter.php b/lib/private/db/mdb2schemawriter.php
index 8b74b545b3b773a84f7bdaa74214e4029b4c6e3c..0ff04008b616cad36cea90716a19e978f5feab13 100644 (file)
--- a/lib/private/db/mdb2schemawriter.php
+++ b/lib/private/db/mdb2schemawriter.php
@@ -24,7 +24,12 @@
  *
  */
 
-class OC_DB_MDB2SchemaWriter {
+namespace OC\DB;
+
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\Index;
+
+class MDB2SchemaWriter {
 
        /**
         * @param string $file
@@ -34,7 +39,7 @@ class OC_DB_MDB2SchemaWriter {
        static public function saveSchemaToFile($file, \OC\DB\Connection $conn) {
                $config = \OC::$server->getConfig();
 
-               $xml = new SimpleXMLElement('<database/>');
+               $xml = new \SimpleXMLElement('<database/>');
                $xml->addChild('name', $config->getSystemValue('dbname', 'owncloud'));
                $xml->addChild('create', 'true');
                $xml->addChild('overwrite', 'false');
@@ -56,7 +61,8 @@ class OC_DB_MDB2SchemaWriter {
        }
 
        /**
-        * @param SimpleXMLElement $xml
+        * @param \Doctrine\DBAL\Schema\Table $table
+        * @param \SimpleXMLElement $xml
         */
        private static function saveTable($table, $xml) {
                $xml->addChild('name', $table->getName());
@@ -81,7 +87,8 @@ class OC_DB_MDB2SchemaWriter {
        }
 
        /**
-        * @param SimpleXMLElement $xml
+        * @param Column $column
+        * @param \SimpleXMLElement $xml
         */
        private static function saveColumn($column, $xml) {
                $xml->addChild('name', $column->getName());
@@ -147,7 +154,8 @@ class OC_DB_MDB2SchemaWriter {
        }
 
        /**
-        * @param SimpleXMLElement $xml
+        * @param Index $index
+        * @param \SimpleXMLElement $xml
         */
        private static function saveIndex($index, $xml) {
                $xml->addChild('name', $index->getName());