nextcloud / server

lib/private/Repair.php

Indentation +177 added lines, -177 removed lines

@@ -72,181 +72,181 @@
 
 class Repair implements IOutput {
 
-	/** @var IRepairStep[] */
-	private $repairSteps;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var string */
-	private $currentStep;
-
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher = $dispatcher;
-	}
-
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->emit('\OC\Repair', 'info', ['No repair steps available']);
-
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->emit('\OC\Repair', 'step', [$this->currentStep]);
-			$step->run($this);
-		}
-	}
-
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->query($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					$s = new $repairStep();
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown");
-				}
-			}
-
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
-
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
-			new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
-			new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-			new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
-			new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
-			new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
-			new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
-			\OC::$server->query(ResetGeneratedAvatarFlag::class),
-			\OC::$server->query(EncryptionLegacyCipher::class),
-			\OC::$server->query(EncryptionMigration::class),
-			\OC::$server->get(ShippedDashboardEnable::class),
-			\OC::$server->get(AddBruteForceCleanupJob::class),
-			\OC::$server->get(AddCheckForUserCertificatesJob::class),
-		];
-	}
-
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
-		];
-	}
-
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		$connection = \OC::$server->getDatabaseConnection();
-		$config = \OC::$server->getConfig();
-		$steps = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
-			new SqliteAutoincrement($connection),
-			new SaveAccountsTableData($connection, $config),
-			new DropAccountTermsTable($connection)
-		];
-
-		return $steps;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		if (!is_null($this->dispatcher)) {
-			$this->dispatcher->dispatch("$scope::$method",
-				new GenericEvent("$scope::$method", $arguments));
-		}
-	}
-
-	public function info($string) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'info', [$string]);
-	}
-
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'warning', [$message]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
-	}
-
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'advance', [$step, $description]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'finishProgress', []);
-	}
+    /** @var IRepairStep[] */
+    private $repairSteps;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var string */
+    private $currentStep;
+
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->emit('\OC\Repair', 'info', ['No repair steps available']);
+
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+            $step->run($this);
+        }
+    }
+
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->query($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    $s = new $repairStep();
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown");
+                }
+            }
+
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
+
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
+            new RepairMimeTypes(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
+            new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+            new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
+            new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
+            new RemoveLinkShares(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getGroupManager(), \OC::$server->getNotificationManager(), \OC::$server->query(ITimeFactory::class)),
+            new ClearCollectionsAccessCache(\OC::$server->getConfig(), \OC::$server->query(IManager::class)),
+            \OC::$server->query(ResetGeneratedAvatarFlag::class),
+            \OC::$server->query(EncryptionLegacyCipher::class),
+            \OC::$server->query(EncryptionMigration::class),
+            \OC::$server->get(ShippedDashboardEnable::class),
+            \OC::$server->get(AddBruteForceCleanupJob::class),
+            \OC::$server->get(AddCheckForUserCertificatesJob::class),
+        ];
+    }
+
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
+        ];
+    }
+
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        $connection = \OC::$server->getDatabaseConnection();
+        $config = \OC::$server->getConfig();
+        $steps = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
+            new SqliteAutoincrement($connection),
+            new SaveAccountsTableData($connection, $config),
+            new DropAccountTermsTable($connection)
+        ];
+
+        return $steps;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        if (!is_null($this->dispatcher)) {
+            $this->dispatcher->dispatch("$scope::$method",
+                new GenericEvent("$scope::$method", $arguments));
+        }
+    }
+
+    public function info($string) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'info', [$string]);
+    }
+
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'warning', [$message]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+    }
+
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'advance', [$step, $description]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'finishProgress', []);
+    }
 }

lib/private/Repair/RepairMimeTypes.php

Indentation +193 added lines, -193 removed lines

@@ -40,197 +40,197 @@
 use OCP\Migration\IRepairStep;
 
 class RepairMimeTypes implements IRepairStep {
-	/** @var IConfig */
-	protected $config;
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var int */
-	protected $folderMimeTypeId;
-
-	public function __construct(IConfig $config,
-								IDBConnection $connection) {
-		$this->config = $config;
-		$this->connection = $connection;
-	}
-
-	public function getName() {
-		return 'Repair mime types';
-	}
-
-	private function updateMimetypes($updatedMimetypes) {
-		$query = $this->connection->getQueryBuilder();
-		$query->select('id')
-			->from('mimetypes')
-			->where($query->expr()->eq('mimetype', $query->createParameter('mimetype'), IQueryBuilder::PARAM_INT));
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('mimetypes')
-			->setValue('mimetype', $insert->createParameter('mimetype'));
-
-		if (empty($this->folderMimeTypeId)) {
-			$query->setParameter('mimetype', 'httpd/unix-directory');
-			$result = $query->execute();
-			$this->folderMimeTypeId = (int)$result->fetchColumn();
-			$result->closeCursor();
-		}
-
-		$update = $this->connection->getQueryBuilder();
-		$update->update('filecache')
-			->set('mimetype', $update->createParameter('mimetype'))
-			->where($update->expr()->neq('mimetype', $update->createParameter('mimetype'), IQueryBuilder::PARAM_INT))
-			->andWhere($update->expr()->neq('mimetype', $update->createParameter('folder'), IQueryBuilder::PARAM_INT))
-			->andWhere($update->expr()->iLike('name', $update->createParameter('name')))
-			->setParameter('folder', $this->folderMimeTypeId);
-
-		$count = 0;
-		foreach ($updatedMimetypes as $extension => $mimetype) {
-			// get target mimetype id
-			$query->setParameter('mimetype', $mimetype);
-			$result = $query->execute();
-			$mimetypeId = (int)$result->fetchColumn();
-			$result->closeCursor();
-
-			if (!$mimetypeId) {
-				// insert mimetype
-				$insert->setParameter('mimetype', $mimetype);
-				$insert->execute();
-				$mimetypeId = $insert->getLastInsertId();
-			}
-
-			// change mimetype for files with x extension
-			$update->setParameter('mimetype', $mimetypeId)
-				->setParameter('name', '%' . $this->connection->escapeLikeParameter('.' . $extension));
-			$count += $update->execute();
-		}
-
-		return $count;
-	}
-
-	private function introduceImageTypes() {
-		$updatedMimetypes = [
-			'jp2' => 'image/jp2',
-			'webp' => 'image/webp',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceWindowsProgramTypes() {
-		$updatedMimetypes = [
-			'htaccess' => 'text/plain',
-			'bat' => 'application/x-msdos-program',
-			'cmd' => 'application/cmd',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceLocationTypes() {
-		$updatedMimetypes = [
-			'gpx' => 'application/gpx+xml',
-			'kml' => 'application/vnd.google-earth.kml+xml',
-			'kmz' => 'application/vnd.google-earth.kmz',
-			'tcx' => 'application/vnd.garmin.tcx+xml',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceInternetShortcutTypes() {
-		$updatedMimetypes = [
-			'url' => 'application/internet-shortcut',
-			'webloc' => 'application/internet-shortcut'
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceStreamingTypes() {
-		$updatedMimetypes = [
-			'm3u' => 'audio/mpegurl',
-			'm3u8' => 'audio/mpegurl',
-			'pls' => 'audio/x-scpls'
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceVisioTypes() {
-		$updatedMimetypes = [
-			'vsdm' => 'application/vnd.visio',
-			'vsdx' => 'application/vnd.visio',
-			'vssm' => 'application/vnd.visio',
-			'vssx' => 'application/vnd.visio',
-			'vstm' => 'application/vnd.visio',
-			'vstx' => 'application/vnd.visio',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceComicbookTypes() {
-		$updatedMimetypes = [
-			'cb7' => 'application/comicbook+7z',
-			'cba' => 'application/comicbook+ace',
-			'cbr' => 'application/comicbook+rar',
-			'cbt' => 'application/comicbook+tar',
-			'cbtc' => 'application/comicbook+truecrypt',
-			'cbz' => 'application/comicbook+zip',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	private function introduceOpenDocumentTemplates() {
-		$updatedMimetypes = [
-			'ott' => 'application/vnd.oasis.opendocument.text-template',
-			'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
-			'otp' => 'application/vnd.oasis.opendocument.presentation-template',
-			'otg' => 'application/vnd.oasis.opendocument.graphics-template',
-		];
-
-		return $this->updateMimetypes($updatedMimetypes);
-	}
-
-	/**
-	 * Fix mime types
-	 */
-	public function run(IOutput $out) {
-		$ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
-
-		// NOTE TO DEVELOPERS: when adding new mime types, please make sure to
-		// add a version comparison to avoid doing it every time
-
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) {
-			$out->info('Fixed image mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
-			$out->info('Fixed windows program mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
-			$out->info('Fixed geospatial mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
-			$out->info('Fixed internet-shortcut mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
-			$out->info('Fixed streaming mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
-			$out->info('Fixed visio mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
-			$out->info('Fixed comicbook mime types');
-		}
-
-		if (version_compare($ocVersionFromBeforeUpdate, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) {
-			$out->info('Fixed OpenDocument template mime types');
-		}
-	}
+    /** @var IConfig */
+    protected $config;
+    /** @var IDBConnection */
+    protected $connection;
+
+    /** @var int */
+    protected $folderMimeTypeId;
+
+    public function __construct(IConfig $config,
+                                IDBConnection $connection) {
+        $this->config = $config;
+        $this->connection = $connection;
+    }
+
+    public function getName() {
+        return 'Repair mime types';
+    }
+
+    private function updateMimetypes($updatedMimetypes) {
+        $query = $this->connection->getQueryBuilder();
+        $query->select('id')
+            ->from('mimetypes')
+            ->where($query->expr()->eq('mimetype', $query->createParameter('mimetype'), IQueryBuilder::PARAM_INT));
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('mimetypes')
+            ->setValue('mimetype', $insert->createParameter('mimetype'));
+
+        if (empty($this->folderMimeTypeId)) {
+            $query->setParameter('mimetype', 'httpd/unix-directory');
+            $result = $query->execute();
+            $this->folderMimeTypeId = (int)$result->fetchColumn();
+            $result->closeCursor();
+        }
+
+        $update = $this->connection->getQueryBuilder();
+        $update->update('filecache')
+            ->set('mimetype', $update->createParameter('mimetype'))
+            ->where($update->expr()->neq('mimetype', $update->createParameter('mimetype'), IQueryBuilder::PARAM_INT))
+            ->andWhere($update->expr()->neq('mimetype', $update->createParameter('folder'), IQueryBuilder::PARAM_INT))
+            ->andWhere($update->expr()->iLike('name', $update->createParameter('name')))
+            ->setParameter('folder', $this->folderMimeTypeId);
+
+        $count = 0;
+        foreach ($updatedMimetypes as $extension => $mimetype) {
+            // get target mimetype id
+            $query->setParameter('mimetype', $mimetype);
+            $result = $query->execute();
+            $mimetypeId = (int)$result->fetchColumn();
+            $result->closeCursor();
+
+            if (!$mimetypeId) {
+                // insert mimetype
+                $insert->setParameter('mimetype', $mimetype);
+                $insert->execute();
+                $mimetypeId = $insert->getLastInsertId();
+            }
+
+            // change mimetype for files with x extension
+            $update->setParameter('mimetype', $mimetypeId)
+                ->setParameter('name', '%' . $this->connection->escapeLikeParameter('.' . $extension));
+            $count += $update->execute();
+        }
+
+        return $count;
+    }
+
+    private function introduceImageTypes() {
+        $updatedMimetypes = [
+            'jp2' => 'image/jp2',
+            'webp' => 'image/webp',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceWindowsProgramTypes() {
+        $updatedMimetypes = [
+            'htaccess' => 'text/plain',
+            'bat' => 'application/x-msdos-program',
+            'cmd' => 'application/cmd',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceLocationTypes() {
+        $updatedMimetypes = [
+            'gpx' => 'application/gpx+xml',
+            'kml' => 'application/vnd.google-earth.kml+xml',
+            'kmz' => 'application/vnd.google-earth.kmz',
+            'tcx' => 'application/vnd.garmin.tcx+xml',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceInternetShortcutTypes() {
+        $updatedMimetypes = [
+            'url' => 'application/internet-shortcut',
+            'webloc' => 'application/internet-shortcut'
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceStreamingTypes() {
+        $updatedMimetypes = [
+            'm3u' => 'audio/mpegurl',
+            'm3u8' => 'audio/mpegurl',
+            'pls' => 'audio/x-scpls'
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceVisioTypes() {
+        $updatedMimetypes = [
+            'vsdm' => 'application/vnd.visio',
+            'vsdx' => 'application/vnd.visio',
+            'vssm' => 'application/vnd.visio',
+            'vssx' => 'application/vnd.visio',
+            'vstm' => 'application/vnd.visio',
+            'vstx' => 'application/vnd.visio',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceComicbookTypes() {
+        $updatedMimetypes = [
+            'cb7' => 'application/comicbook+7z',
+            'cba' => 'application/comicbook+ace',
+            'cbr' => 'application/comicbook+rar',
+            'cbt' => 'application/comicbook+tar',
+            'cbtc' => 'application/comicbook+truecrypt',
+            'cbz' => 'application/comicbook+zip',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    private function introduceOpenDocumentTemplates() {
+        $updatedMimetypes = [
+            'ott' => 'application/vnd.oasis.opendocument.text-template',
+            'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+            'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+            'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+        ];
+
+        return $this->updateMimetypes($updatedMimetypes);
+    }
+
+    /**
+     * Fix mime types
+     */
+    public function run(IOutput $out) {
+        $ocVersionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0');
+
+        // NOTE TO DEVELOPERS: when adding new mime types, please make sure to
+        // add a version comparison to avoid doing it every time
+
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.14', '<') && $this->introduceImageTypes()) {
+            $out->info('Fixed image mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '12.0.0.13', '<') && $this->introduceWindowsProgramTypes()) {
+            $out->info('Fixed windows program mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.0', '<') && $this->introduceLocationTypes()) {
+            $out->info('Fixed geospatial mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.3', '<') && $this->introduceInternetShortcutTypes()) {
+            $out->info('Fixed internet-shortcut mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '13.0.0.6', '<') && $this->introduceStreamingTypes()) {
+            $out->info('Fixed streaming mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.8', '<') && $this->introduceVisioTypes()) {
+            $out->info('Fixed visio mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '14.0.0.10', '<') && $this->introduceComicbookTypes()) {
+            $out->info('Fixed comicbook mime types');
+        }
+
+        if (version_compare($ocVersionFromBeforeUpdate, '20.0.0.5', '<') && $this->introduceOpenDocumentTemplates()) {
+            $out->info('Fixed OpenDocument template mime types');
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 		if (empty($this->folderMimeTypeId)) {
 			$query->setParameter('mimetype', 'httpd/unix-directory');
 			$result = $query->execute();
-			$this->folderMimeTypeId = (int)$result->fetchColumn();
+			$this->folderMimeTypeId = (int) $result->fetchColumn();
 			$result->closeCursor();
 		}
 
@@ -87,7 +87,7 @@ 
 			// get target mimetype id
 			$query->setParameter('mimetype', $mimetype);
 			$result = $query->execute();
-			$mimetypeId = (int)$result->fetchColumn();
+			$mimetypeId = (int) $result->fetchColumn();
 			$result->closeCursor();
 
 			if (!$mimetypeId) {
@@ -99,7 +99,7 @@ 
 
 			// change mimetype for files with x extension
 			$update->setParameter('mimetype', $mimetypeId)
-				->setParameter('name', '%' . $this->connection->escapeLikeParameter('.' . $extension));
+				->setParameter('name', '%'.$this->connection->escapeLikeParameter('.'.$extension));
 			$count += $update->execute();
 		}