summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-08-02 15:09:50 +0200
committerRobin Appelman <icewind@owncloud.com>2013-08-02 15:09:50 +0200
commit258e54182a9d68191a721ddc904e3e0299438b70 (patch)
tree82f27753cd8026d6a1aa16a3ef83248c55c0cc31
parent59c5529a2ba966b49622706eddce43f04b4a25b4 (diff)
downloadnextcloud-server-258e54182a9d68191a721ddc904e3e0299438b70.tar.gz
nextcloud-server-258e54182a9d68191a721ddc904e3e0299438b70.zip
remove invalid type hinting and cleanup namespaces a bit
-rw-r--r--lib/db/mdb2schemamanager.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/db/mdb2schemamanager.php b/lib/db/mdb2schemamanager.php
index 2f828beb824..a34bc9dae75 100644
--- a/lib/db/mdb2schemamanager.php
+++ b/lib/db/mdb2schemamanager.php
@@ -14,7 +14,10 @@ class MDB2SchemaManager {
*/
protected $conn;
- public function __construct(Connection $conn) {
+ /**
+ * @param \Doctrine\DBAL\Connection $conn
+ */
+ public function __construct($conn) {
$this->conn = $conn;
}
@@ -26,7 +29,7 @@ class MDB2SchemaManager {
*
* TODO: write more documentation
*/
- public function getDbStructure( $file, $mode=MDB2_SCHEMA_DUMP_STRUCTURE) {
+ public function getDbStructure( $file, $mode = MDB2_SCHEMA_DUMP_STRUCTURE) {
$sm = $this->conn->getSchemaManager();
return \OC_DB_MDB2SchemaWriter::saveSchemaToFile($file, $sm);
@@ -40,7 +43,7 @@ class MDB2SchemaManager {
* TODO: write more documentation
*/
public function createDbFromStructure( $file ) {
- $schemaReader = new \OC\DB\MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
+ $schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
$toSchema = $schemaReader->loadSchemaFromFile($file);
return $this->executeSchemaChange($toSchema);
}
@@ -54,7 +57,7 @@ class MDB2SchemaManager {
$sm = $this->conn->getSchemaManager();
$fromSchema = $sm->createSchema();
- $schemaReader = new \OC\DB\MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
+ $schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
$toSchema = $schemaReader->loadSchemaFromFile($file);
// remove tables we don't know about
@@ -100,7 +103,7 @@ class MDB2SchemaManager {
* @param string $file the xml file describing the tables
*/
public function removeDBStructure($file) {
- $schemaReader = new \OC\DB\MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
+ $schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
$fromSchema = $schemaReader->loadSchemaFromFile($file);
$toSchema = clone $fromSchema;
foreach($toSchema->getTables() as $table) {