nextcloud / server

lib/private/Repair/MoveUpdaterStepFile.php

Indentation +39 added lines, -39 removed lines

@@ -28,53 +28,53 @@
 
 class MoveUpdaterStepFile implements IRepairStep {
 
-	/** @var \OCP\IConfig */
-	protected $config;
+    /** @var \OCP\IConfig */
+    protected $config;
 
-	/**
-	 * @param \OCP\IConfig $config
-	 */
-	public function __construct($config) {
-		$this->config = $config;
-	}
+    /**
+     * @param \OCP\IConfig $config
+     */
+    public function __construct($config) {
+        $this->config = $config;
+    }
 
-	public function getName() {
-		return 'Move .step file of updater to backup location';
-	}
+    public function getName() {
+        return 'Move .step file of updater to backup location';
+    }
 
-	public function run(IOutput $output) {
+    public function run(IOutput $output) {
 
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$instanceId = $this->config->getSystemValue('instanceid', null);
+        $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+        $instanceId = $this->config->getSystemValue('instanceid', null);
 
-		if(!is_string($instanceId) || empty($instanceId)) {
-			return;
-		}
+        if(!is_string($instanceId) || empty($instanceId)) {
+            return;
+        }
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$stepFile = $updaterFolderPath . '/.step';
-		if(file_exists($stepFile)) {
-			$output->info('.step file exists');
+        $updaterFolderPath = $dataDir . '/updater-' . $instanceId;
+        $stepFile = $updaterFolderPath . '/.step';
+        if(file_exists($stepFile)) {
+            $output->info('.step file exists');
 
-			$previousStepFile = $updaterFolderPath . '/.step-previous-update';
+            $previousStepFile = $updaterFolderPath . '/.step-previous-update';
 
-			// cleanup
-			if(file_exists($previousStepFile)) {
-				if(\OC_Helper::rmdirr($previousStepFile)) {
-					$output->info('.step-previous-update removed');
-				} else {
-					$output->info('.step-previous-update can\'t be removed - abort move of .step file');
-					return;
-				}
-			}
+            // cleanup
+            if(file_exists($previousStepFile)) {
+                if(\OC_Helper::rmdirr($previousStepFile)) {
+                    $output->info('.step-previous-update removed');
+                } else {
+                    $output->info('.step-previous-update can\'t be removed - abort move of .step file');
+                    return;
+                }
+            }
 
-			// move step file
-			if(rename($stepFile, $previousStepFile)) {
-				$output->info('.step file moved to .step-previous-update');
-			} else {
-				$output->warning('.step file can\'t be moved');
-			}
-		}
-	}
+            // move step file
+            if(rename($stepFile, $previousStepFile)) {
+                $output->info('.step file moved to .step-previous-update');
+            } else {
+                $output->warning('.step file can\'t be moved');
+            }
+        }
+    }
 }
 

lib/private/Repair/NC11/CleanPreviews.php

Indentation +34 added lines, -34 removed lines

@@ -31,43 +31,43 @@
 
 class CleanPreviews implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * MoveAvatars constructor.
-	 *
-	 * @param IJobList $jobList
-	 * @param IUserManager $userManager
-	 * @param IConfig $config
-	 */
-	public function __construct(IJobList $jobList,
-								IUserManager $userManager,
-								IConfig $config) {
-		$this->jobList = $jobList;
-		$this->userManager = $userManager;
-		$this->config = $config;
-	}
+    /**
+     * MoveAvatars constructor.
+     *
+     * @param IJobList $jobList
+     * @param IUserManager $userManager
+     * @param IConfig $config
+     */
+    public function __construct(IJobList $jobList,
+                                IUserManager $userManager,
+                                IConfig $config) {
+        $this->jobList = $jobList;
+        $this->userManager = $userManager;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Add preview cleanup background jobs';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Add preview cleanup background jobs';
+    }
 
-	public function run(IOutput $output) {
-		if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
-			$this->userManager->callForSeenUsers(function (IUser $user) {
-				$this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
-			});
-			$this->config->setAppValue('core', 'previewsCleanedUp', 1);
-		}
-	}
+    public function run(IOutput $output) {
+        if (!$this->config->getAppValue('core', 'previewsCleanedUp', false)) {
+            $this->userManager->callForSeenUsers(function (IUser $user) {
+                $this->jobList->add(CleanPreviewsBackgroundJob::class, ['uid' => $user->getUID()]);
+            });
+            $this->config->setAppValue('core', 'previewsCleanedUp', 1);
+        }
+    }
 }

lib/private/Repair/NC11/MoveAvatars.php

Indentation +36 added lines, -36 removed lines

@@ -29,44 +29,44 @@
 
 class MoveAvatars implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * MoveAvatars constructor.
-	 *
-	 * @param IJobList $jobList
-	 * @param IConfig $config
-	 */
-	public function __construct(IJobList $jobList,
-								IConfig $config) {
-		$this->jobList = $jobList;
-		$this->config = $config;
-	}
+    /**
+     * MoveAvatars constructor.
+     *
+     * @param IJobList $jobList
+     * @param IConfig $config
+     */
+    public function __construct(IJobList $jobList,
+                                IConfig $config) {
+        $this->jobList = $jobList;
+        $this->config = $config;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Add move avatar background job';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Add move avatar background job';
+    }
 
-	public function run(IOutput $output) {
-		// only run once
-		if ($this->config->getAppValue('core', 'moveavatarsdone') === 'yes') {
-			$output->info('Repair step already executed');
-			return;
-		}
-		if ($this->config->getSystemValue('enable_avatars', true) === false) {
-			$output->info('Avatars are disabled');
-		} else {
-			$output->info('Add background job');
-			$this->jobList->add(MoveAvatarsBackgroundJob::class);
-			// if all were done, no need to redo the repair during next upgrade
-			$this->config->setAppValue('core', 'moveavatarsdone', 'yes');
-		}
-	}
+    public function run(IOutput $output) {
+        // only run once
+        if ($this->config->getAppValue('core', 'moveavatarsdone') === 'yes') {
+            $output->info('Repair step already executed');
+            return;
+        }
+        if ($this->config->getSystemValue('enable_avatars', true) === false) {
+            $output->info('Avatars are disabled');
+        } else {
+            $output->info('Add background job');
+            $this->jobList->add(MoveAvatarsBackgroundJob::class);
+            // if all were done, no need to redo the repair during next upgrade
+            $this->config->setAppValue('core', 'moveavatarsdone', 'yes');
+        }
+    }
 }

lib/private/Repair/NC11/CleanPreviewsBackgroundJob.php

Indentation +86 added lines, -86 removed lines

@@ -32,90 +32,90 @@
 use OCP\ILogger;
 
 class CleanPreviewsBackgroundJob extends QueuedJob {
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * CleanPreviewsBackgroundJob constructor.
-	 *
-	 * @param IRootFolder $rootFolder
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IRootFolder $rootFolder,
-								ILogger $logger,
-								IJobList $jobList,
-								ITimeFactory $timeFactory) {
-		$this->rootFolder = $rootFolder;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->timeFactory = $timeFactory;
-	}
-
-	public function run($arguments) {
-		$uid = $arguments['uid'];
-		$this->logger->info('Started preview cleanup for ' . $uid);
-		$empty = $this->cleanupPreviews($uid);
-
-		if (!$empty) {
-			$this->jobList->add(self::class, ['uid' => $uid]);
-			$this->logger->info('New preview cleanup scheduled for ' . $uid);
-		} else {
-			$this->logger->info('Preview cleanup done for ' . $uid);
-		}
-	}
-
-	/**
-	 * @param $uid
-	 * @return bool
-	 */
-	private function cleanupPreviews($uid) {
-		try {
-			$userFolder = $this->rootFolder->getUserFolder($uid);
-		} catch (NotFoundException $e) {
-			return true;
-		}
-
-		$userRoot = $userFolder->getParent();
-
-		try {
-			/** @var Folder $thumbnailFolder */
-			$thumbnailFolder = $userRoot->get('thumbnails');
-		} catch (NotFoundException $e) {
-			return true;
-		}
-
-		$thumbnails = $thumbnailFolder->getDirectoryListing();
-
-		$start = $this->timeFactory->getTime();
-		foreach ($thumbnails as $thumbnail) {
-			try {
-				$thumbnail->delete();
-			} catch (NotPermittedException $e) {
-				// Ignore
-			}
-
-			if (($this->timeFactory->getTime() - $start) > 15) {
-				return false;
-			}
-		}
-
-		try {
-			$thumbnailFolder->delete();
-		} catch (NotPermittedException $e) {
-			// Ignore
-		}
-
-		return true;
-	}
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * CleanPreviewsBackgroundJob constructor.
+     *
+     * @param IRootFolder $rootFolder
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IRootFolder $rootFolder,
+                                ILogger $logger,
+                                IJobList $jobList,
+                                ITimeFactory $timeFactory) {
+        $this->rootFolder = $rootFolder;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->timeFactory = $timeFactory;
+    }
+
+    public function run($arguments) {
+        $uid = $arguments['uid'];
+        $this->logger->info('Started preview cleanup for ' . $uid);
+        $empty = $this->cleanupPreviews($uid);
+
+        if (!$empty) {
+            $this->jobList->add(self::class, ['uid' => $uid]);
+            $this->logger->info('New preview cleanup scheduled for ' . $uid);
+        } else {
+            $this->logger->info('Preview cleanup done for ' . $uid);
+        }
+    }
+
+    /**
+     * @param $uid
+     * @return bool
+     */
+    private function cleanupPreviews($uid) {
+        try {
+            $userFolder = $this->rootFolder->getUserFolder($uid);
+        } catch (NotFoundException $e) {
+            return true;
+        }
+
+        $userRoot = $userFolder->getParent();
+
+        try {
+            /** @var Folder $thumbnailFolder */
+            $thumbnailFolder = $userRoot->get('thumbnails');
+        } catch (NotFoundException $e) {
+            return true;
+        }
+
+        $thumbnails = $thumbnailFolder->getDirectoryListing();
+
+        $start = $this->timeFactory->getTime();
+        foreach ($thumbnails as $thumbnail) {
+            try {
+                $thumbnail->delete();
+            } catch (NotPermittedException $e) {
+                // Ignore
+            }
+
+            if (($this->timeFactory->getTime() - $start) > 15) {
+                return false;
+            }
+        }
+
+        try {
+            $thumbnailFolder->delete();
+        } catch (NotPermittedException $e) {
+            // Ignore
+        }
+
+        return true;
+    }
 }

lib/private/Repair/NC11/FixMountStorages.php

Indentation +39 added lines, -39 removed lines

@@ -29,50 +29,50 @@
 
 class FixMountStorages implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
+    /** @var IDBConnection */
+    private $db;
 
-	/**
-	 * @param IDBConnection $db
-	 */
-	public function __construct(IDBConnection $db) {
-		$this->db = $db;
-	}
+    /**
+     * @param IDBConnection $db
+     */
+    public function __construct(IDBConnection $db) {
+        $this->db = $db;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getName() {
-		return 'Fix potential broken mount points';
-	}
+    /**
+     * @return string
+     */
+    public function getName() {
+        return 'Fix potential broken mount points';
+    }
 
-	public function run(IOutput $output) {
-		$query = $this->db->getQueryBuilder();
-		$query->select('m.id', 'f.storage')
-			->from('mounts', 'm')
-			->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid'))
-			->where($query->expr()->neq('m.storage_id', 'f.storage'));
+    public function run(IOutput $output) {
+        $query = $this->db->getQueryBuilder();
+        $query->select('m.id', 'f.storage')
+            ->from('mounts', 'm')
+            ->leftJoin('m', 'filecache', 'f', $query->expr()->eq('m.root_id', 'f.fileid'))
+            ->where($query->expr()->neq('m.storage_id', 'f.storage'));
 
-		$update = $this->db->getQueryBuilder();
-		$update->update('mounts')
-			->set('storage_id', $update->createParameter('storage'))
-			->where($query->expr()->eq('id', $update->createParameter('mount')));
+        $update = $this->db->getQueryBuilder();
+        $update->update('mounts')
+            ->set('storage_id', $update->createParameter('storage'))
+            ->where($query->expr()->eq('id', $update->createParameter('mount')));
 
-		$result = $query->execute();
-		$entriesUpdated = 0;
-		while ($row = $result->fetch()) {
-			$update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT)
-				->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT);
-			$update->execute();
-			$entriesUpdated++;
-		}
-		$result->closeCursor();
+        $result = $query->execute();
+        $entriesUpdated = 0;
+        while ($row = $result->fetch()) {
+            $update->setParameter('storage', $row['storage'], IQueryBuilder::PARAM_INT)
+                ->setParameter('mount', $row['id'], IQueryBuilder::PARAM_INT);
+            $update->execute();
+            $entriesUpdated++;
+        }
+        $result->closeCursor();
 
-		if ($entriesUpdated > 0) {
-			$output->info($entriesUpdated . ' mounts updated');
-			return;
-		}
+        if ($entriesUpdated > 0) {
+            $output->info($entriesUpdated . ' mounts updated');
+            return;
+        }
 
-		$output->info('No mounts updated');
-	}
+        $output->info('No mounts updated');
+    }
 }

lib/private/Repair/SqliteAutoincrement.php

Indentation +52 added lines, -52 removed lines

@@ -36,66 +36,66 @@
  * altered in order to retrigger SQL schema generation through OCSqlitePlatform.
  */
 class SqliteAutoincrement implements IRepairStep {
-	/**
-	 * @var \OC\DB\Connection
-	 */
-	protected $connection;
+    /**
+     * @var \OC\DB\Connection
+     */
+    protected $connection;
 
-	/**
-	 * @param \OC\DB\Connection $connection
-	 */
-	public function __construct($connection) {
-		$this->connection = $connection;
-	}
+    /**
+     * @param \OC\DB\Connection $connection
+     */
+    public function __construct($connection) {
+        $this->connection = $connection;
+    }
 
-	public function getName() {
-		return 'Repair SQLite autoincrement';
-	}
+    public function getName() {
+        return 'Repair SQLite autoincrement';
+    }
 
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $out) {
-		if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
-			return;
-		}
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $out) {
+        if (!$this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
+            return;
+        }
 
-		$sourceSchema = $this->connection->getSchemaManager()->createSchema();
+        $sourceSchema = $this->connection->getSchemaManager()->createSchema();
 
-		$schemaDiff = new SchemaDiff();
+        $schemaDiff = new SchemaDiff();
 
-		foreach ($sourceSchema->getTables() as $tableSchema) {
-			$primaryKey = $tableSchema->getPrimaryKey();
-			if (!$primaryKey) {
-				continue;
-			}
+        foreach ($sourceSchema->getTables() as $tableSchema) {
+            $primaryKey = $tableSchema->getPrimaryKey();
+            if (!$primaryKey) {
+                continue;
+            }
 
-			$columnNames = $primaryKey->getColumns();
+            $columnNames = $primaryKey->getColumns();
 
-			// add a column diff for every primary key column,
-			// but do not actually change anything, this will
-			// force the generation of SQL statements to alter
-			// those tables, which will then trigger the
-			// specific SQL code from OCSqlitePlatform
-			try {
-				$tableDiff = new TableDiff($tableSchema->getName());
-				$tableDiff->fromTable = $tableSchema;
-				foreach ($columnNames as $columnName) {
-					$columnSchema = $tableSchema->getColumn($columnName);
-					$columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
-					$tableDiff->changedColumns[] = $columnDiff;
-					$schemaDiff->changedTables[] = $tableDiff;
-				}
-			} catch (SchemaException $e) {
-				// ignore
-			}
-		}
+            // add a column diff for every primary key column,
+            // but do not actually change anything, this will
+            // force the generation of SQL statements to alter
+            // those tables, which will then trigger the
+            // specific SQL code from OCSqlitePlatform
+            try {
+                $tableDiff = new TableDiff($tableSchema->getName());
+                $tableDiff->fromTable = $tableSchema;
+                foreach ($columnNames as $columnName) {
+                    $columnSchema = $tableSchema->getColumn($columnName);
+                    $columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
+                    $tableDiff->changedColumns[] = $columnDiff;
+                    $schemaDiff->changedTables[] = $tableDiff;
+                }
+            } catch (SchemaException $e) {
+                // ignore
+            }
+        }
 
-		$this->connection->beginTransaction();
-		foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
-			$this->connection->query($sql);
-		}
-		$this->connection->commit();
-	}
+        $this->connection->beginTransaction();
+        foreach ($schemaDiff->toSql($this->connection->getDatabasePlatform()) as $sql) {
+            $this->connection->query($sql);
+        }
+        $this->connection->commit();
+    }
 }
 

lib/private/RichObjectStrings/Validator.php

Indentation +77 added lines, -77 removed lines

@@ -34,81 +34,81 @@
  */
 class Validator implements IValidator {
 
-	/** @var Definitions */
-	protected $definitions;
-
-	/** @var array[] */
-	protected $requiredParameters = [];
-
-	/**
-	 * Constructor
-	 *
-	 * @param Definitions $definitions
-	 */
-	public function __construct(Definitions $definitions) {
-		$this->definitions = $definitions;
-	}
-
-	/**
-	 * @param string $subject
-	 * @param array[] $parameters
-	 * @throws InvalidObjectExeption
-	 * @since 11.0.0
-	 */
-	public function validate($subject, array $parameters) {
-		$matches = [];
-		$result = preg_match_all('/\{([a-z0-9]+)\}/i', $subject, $matches);
-
-		if ($result === false) {
-			throw new InvalidObjectExeption();
-		}
-
-		if (!empty($matches[1])) {
-			foreach ($matches[1] as $parameter) {
-				if (!isset($parameters[$parameter])) {
-					throw new InvalidObjectExeption('Parameter is undefined');
-				} else {
-					$this->validateParameter($parameters[$parameter]);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param array $parameter
-	 * @throws InvalidObjectExeption
-	 */
-	protected function validateParameter(array $parameter) {
-		if (!isset($parameter['type'])) {
-			throw new InvalidObjectExeption('Object type is undefined');
-		}
-
-		$definition = $this->definitions->getDefinition($parameter['type']);
-		$requiredParameters = $this->getRequiredParameters($parameter['type'], $definition);
-
-		$missingKeys = array_diff($requiredParameters, array_keys($parameter));
-		if (!empty($missingKeys)) {
-			throw new InvalidObjectExeption('Object is invalid');
-		}
-	}
-
-	/**
-	 * @param string $type
-	 * @param array $definition
-	 * @return string[]
-	 */
-	protected function getRequiredParameters($type, array $definition) {
-		if (isset($this->requiredParameters[$type])) {
-			return $this->requiredParameters[$type];
-		}
-
-		$this->requiredParameters[$type] = [];
-		foreach ($definition['parameters'] as $parameter => $data) {
-			if ($data['required']) {
-				$this->requiredParameters[$type][] = $parameter;
-			}
-		}
-
-		return $this->requiredParameters[$type];
-	}
+    /** @var Definitions */
+    protected $definitions;
+
+    /** @var array[] */
+    protected $requiredParameters = [];
+
+    /**
+     * Constructor
+     *
+     * @param Definitions $definitions
+     */
+    public function __construct(Definitions $definitions) {
+        $this->definitions = $definitions;
+    }
+
+    /**
+     * @param string $subject
+     * @param array[] $parameters
+     * @throws InvalidObjectExeption
+     * @since 11.0.0
+     */
+    public function validate($subject, array $parameters) {
+        $matches = [];
+        $result = preg_match_all('/\{([a-z0-9]+)\}/i', $subject, $matches);
+
+        if ($result === false) {
+            throw new InvalidObjectExeption();
+        }
+
+        if (!empty($matches[1])) {
+            foreach ($matches[1] as $parameter) {
+                if (!isset($parameters[$parameter])) {
+                    throw new InvalidObjectExeption('Parameter is undefined');
+                } else {
+                    $this->validateParameter($parameters[$parameter]);
+                }
+            }
+        }
+    }
+
+    /**
+     * @param array $parameter
+     * @throws InvalidObjectExeption
+     */
+    protected function validateParameter(array $parameter) {
+        if (!isset($parameter['type'])) {
+            throw new InvalidObjectExeption('Object type is undefined');
+        }
+
+        $definition = $this->definitions->getDefinition($parameter['type']);
+        $requiredParameters = $this->getRequiredParameters($parameter['type'], $definition);
+
+        $missingKeys = array_diff($requiredParameters, array_keys($parameter));
+        if (!empty($missingKeys)) {
+            throw new InvalidObjectExeption('Object is invalid');
+        }
+    }
+
+    /**
+     * @param string $type
+     * @param array $definition
+     * @return string[]
+     */
+    protected function getRequiredParameters($type, array $definition) {
+        if (isset($this->requiredParameters[$type])) {
+            return $this->requiredParameters[$type];
+        }
+
+        $this->requiredParameters[$type] = [];
+        foreach ($definition['parameters'] as $parameter => $data) {
+            if ($data['required']) {
+                $this->requiredParameters[$type][] = $parameter;
+            }
+        }
+
+        return $this->requiredParameters[$type];
+    }
 }

lib/private/DB/MySQLMigrator.php

Indentation +19 added lines, -19 removed lines

@@ -29,28 +29,28 @@
 use Doctrine\DBAL\Schema\Table;
 
 class MySQLMigrator extends Migrator {
-	/**
-	 * @param Schema $targetSchema
-	 * @param \Doctrine\DBAL\Connection $connection
-	 * @return \Doctrine\DBAL\Schema\SchemaDiff
-	 */
-	protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
-		$platform = $connection->getDatabasePlatform();
-		$platform->registerDoctrineTypeMapping('enum', 'string');
-		$platform->registerDoctrineTypeMapping('bit', 'string');
+    /**
+     * @param Schema $targetSchema
+     * @param \Doctrine\DBAL\Connection $connection
+     * @return \Doctrine\DBAL\Schema\SchemaDiff
+     */
+    protected function getDiff(Schema $targetSchema, \Doctrine\DBAL\Connection $connection) {
+        $platform = $connection->getDatabasePlatform();
+        $platform->registerDoctrineTypeMapping('enum', 'string');
+        $platform->registerDoctrineTypeMapping('bit', 'string');
 
-		$schemaDiff = parent::getDiff($targetSchema, $connection);
+        $schemaDiff = parent::getDiff($targetSchema, $connection);
 
-		// identifiers need to be quoted for mysql
-		foreach ($schemaDiff->changedTables as $tableDiff) {
-			$tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
-			foreach ($tableDiff->changedColumns as $column) {
-				$column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
-			}
-		}
+        // identifiers need to be quoted for mysql
+        foreach ($schemaDiff->changedTables as $tableDiff) {
+            $tableDiff->name = $this->connection->quoteIdentifier($tableDiff->name);
+            foreach ($tableDiff->changedColumns as $column) {
+                $column->oldColumnName = $this->connection->quoteIdentifier($column->oldColumnName);
+            }
+        }
 
-		return $schemaDiff;
-	}
+        return $schemaDiff;
+    }
 	
         /**
          * Speed up migration test by disabling autocommit and unique indexes check

lib/private/DB/OCSqlitePlatform.php

Indentation +22 added lines, -22 removed lines

@@ -23,27 +23,27 @@
 namespace OC\DB;
 
 class OCSqlitePlatform extends \Doctrine\DBAL\Platforms\SqlitePlatform {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getColumnDeclarationSQL($name, array $field) {
-		$def = parent::getColumnDeclarationSQL($name, $field);
-		if (!empty($field['autoincrement'])) {
-			$def .= ' PRIMARY KEY AUTOINCREMENT';
-		}
-		return $def;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getColumnDeclarationSQL($name, array $field) {
+        $def = parent::getColumnDeclarationSQL($name, $field);
+        if (!empty($field['autoincrement'])) {
+            $def .= ' PRIMARY KEY AUTOINCREMENT';
+        }
+        return $def;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	protected function _getCreateTableSQL($name, array $columns, array $options = array()){
-		// if auto increment is set the column is already defined as primary key
-		foreach ($columns as $column) {
-			if (!empty($column['autoincrement'])) {
-				$options['primary'] = null;
-			}
-		}
-		return parent::_getCreateTableSQL($name, $columns, $options);
-	}
+    /**
+     * {@inheritDoc}
+     */
+    protected function _getCreateTableSQL($name, array $columns, array $options = array()){
+        // if auto increment is set the column is already defined as primary key
+        foreach ($columns as $column) {
+            if (!empty($column['autoincrement'])) {
+                $options['primary'] = null;
+            }
+        }
+        return parent::_getCreateTableSQL($name, $columns, $options);
+    }
 }