nextcloud / server

apps/admin_audit/lib/Actions/Auth.php

Indentation +27 added lines, -27 removed lines

@@ -29,33 +29,33 @@
  * @package OCA\AdminAudit\Actions
  */
 class Auth extends Action {
-	public function loginAttempt(array $params) {
-		$this->log(
-			'Login attempt: "%s"',
-			$params,
-			[
-				'uid',
-			],
-			true
-		);
-	}
+    public function loginAttempt(array $params) {
+        $this->log(
+            'Login attempt: "%s"',
+            $params,
+            [
+                'uid',
+            ],
+            true
+        );
+    }
 
-	public function loginSuccessful(array $params) {
-		$this->log(
-			'Login successful: "%s"',
-			$params,
-			[
-				'uid',
-			],
-			true
-		);
-	}
+    public function loginSuccessful(array $params) {
+        $this->log(
+            'Login successful: "%s"',
+            $params,
+            [
+                'uid',
+            ],
+            true
+        );
+    }
 
-	public function logout(array $params) {
-		$this->log(
-			'Logout occurred',
-			[],
-			[]
-		);
-	}
+    public function logout(array $params) {
+        $this->log(
+            'Logout occurred',
+            [],
+            []
+        );
+    }
 }

apps/files_external/lib/Settings/PersonalSection.php

Indentation +18 added lines, -18 removed lines

@@ -29,25 +29,25 @@
 use OCP\IUserSession;
 
 class PersonalSection extends Section {
-	/** @var IUserSession */
-	private $userSession;
+    /** @var IUserSession */
+    private $userSession;
 
-	/** @var UserGlobalStoragesService */
-	private $userGlobalStoragesService;
+    /** @var UserGlobalStoragesService */
+    private $userGlobalStoragesService;
 
-	/** @var BackendService */
-	private $backendService;
+    /** @var BackendService */
+    private $backendService;
 
-	public function __construct(
-		IURLGenerator $url,
-		IL10N $l,
-		IUserSession $userSession,
-		UserGlobalStoragesService $userGlobalStoragesService,
-		BackendService $backendService
-	) {
-		parent::__construct($url, $l);
-		$this->userSession = $userSession;
-		$this->userGlobalStoragesService = $userGlobalStoragesService;
-		$this->backendService = $backendService;
-	}
+    public function __construct(
+        IURLGenerator $url,
+        IL10N $l,
+        IUserSession $userSession,
+        UserGlobalStoragesService $userGlobalStoragesService,
+        BackendService $backendService
+    ) {
+        parent::__construct($url, $l);
+        $this->userSession = $userSession;
+        $this->userGlobalStoragesService = $userGlobalStoragesService;
+        $this->backendService = $backendService;
+    }
 }

apps/encryption/templates/settings-personal.php

Spacing +16 added lines, -16 removed lines

@@ -7,49 +7,49 @@ 
 <form id="ocDefaultEncryptionModule" class="section">
 	<h2 data-anchor-name="basic-encryption-module"><?php p($l->t('Basic encryption module')); ?></h2>
 
-	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED ): ?>
+	<?php if ($_["initialized"] === \OCA\Encryption\Session::NOT_INITIALIZED): ?>
 
 	<?php p($l->t("Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.")); ?>
 
-	<?php elseif ( $_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED ): ?>
+	<?php elseif ($_["initialized"] === \OCA\Encryption\Session::INIT_EXECUTED): ?>
 		<p>
 			<a name="changePKPasswd" />
 			<label for="changePrivateKeyPasswd">
-				<em><?php p( $l->t( "Your private key password no longer matches your log-in password." ) ); ?></em>
+				<em><?php p($l->t("Your private key password no longer matches your log-in password.")); ?></em>
 			</label>
 			<br />
-			<?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?>
-			<?php if (  $_["recoveryEnabledForUser"] ):
-					p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
+			<?php p($l->t("Set your old private key password to your current log-in password:")); ?>
+			<?php if ($_["recoveryEnabledForUser"]):
+					p($l->t(" If you don't remember your old password you can ask your administrator to recover your files."));
 			endif; ?>
 			<br />
 			<input
 				type="password"
 				name="changePrivateKeyPassword"
 				id="oldPrivateKeyPassword" />
-			<label for="oldPrivateKeyPassword"><?php p($l->t( "Old log-in password" )); ?></label>
+			<label for="oldPrivateKeyPassword"><?php p($l->t("Old log-in password")); ?></label>
 			<br />
 			<input
 				type="password"
 				name="changePrivateKeyPassword"
 				id="newPrivateKeyPassword" />
-			<label for="newRecoveryPassword"><?php p($l->t( "Current log-in password" )); ?></label>
+			<label for="newRecoveryPassword"><?php p($l->t("Current log-in password")); ?></label>
 			<br />
 			<button
 				type="button"
 				name="submitChangePrivateKeyPassword"
-				disabled><?php p($l->t( "Update Private Key Password" )); ?>
+				disabled><?php p($l->t("Update Private Key Password")); ?>
 			</button>
 			<span class="msg"></span>
 		</p>
 
-	<?php elseif ( $_["recoveryEnabled"] && $_["privateKeySet"] &&  $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL ): ?>
+	<?php elseif ($_["recoveryEnabled"] && $_["privateKeySet"] && $_["initialized"] === \OCA\Encryption\Session::INIT_SUCCESSFUL): ?>
 		<br />
 		<p id="userEnableRecovery">
-			<label for="userEnableRecovery"><?php p( $l->t( "Enable password recovery:" ) ); ?></label>
+			<label for="userEnableRecovery"><?php p($l->t("Enable password recovery:")); ?></label>
 			<span class="msg"></span>
 			<br />
-			<em><?php p( $l->t( "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" ) ); ?></em>
+			<em><?php p($l->t("Enabling this option will allow you to reobtain access to your encrypted files in case of password loss")); ?></em>
 			<br />
 			<input
 			type="radio"
@@ -57,8 +57,8 @@ 
 			id="userEnableRecoveryCheckbox"
 			name="userEnableRecovery"
 			value="1"
-			<?php echo ( $_["recoveryEnabledForUser"] ? 'checked="checked"' : '' ); ?> />
-			<label for="userEnableRecoveryCheckbox"><?php p( $l->t( "Enabled" ) ); ?></label>
+			<?php echo ($_["recoveryEnabledForUser"] ? 'checked="checked"' : ''); ?> />
+			<label for="userEnableRecoveryCheckbox"><?php p($l->t("Enabled")); ?></label>
 			<br />
 
 			<input
@@ -67,8 +67,8 @@ 
 			id="userDisableRecoveryCheckbox"
 			name="userEnableRecovery"
 			value="0"
-			<?php echo ( $_["recoveryEnabledForUser"] === false ? 'checked="checked"' : '' ); ?> />
-			<label for="userDisableRecoveryCheckbox"><?php p( $l->t( "Disabled" ) ); ?></label>
+			<?php echo ($_["recoveryEnabledForUser"] === false ? 'checked="checked"' : ''); ?> />
+			<label for="userDisableRecoveryCheckbox"><?php p($l->t("Disabled")); ?></label>
 		</p>
 	<?php endif; ?>
 </form>

Indentation +4 added lines, -4 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-	/** @var array $_ */
-	/** @var \OCP\IL10N $l */
+    /** @var array $_ */
+    /** @var \OCP\IL10N $l */
 script('encryption', 'settings-personal');
 ?>
 <form id="ocDefaultEncryptionModule" class="section">
@@ -19,8 +19,8 @@ 
 			<br />
 			<?php p( $l->t( "Set your old private key password to your current log-in password:" ) ); ?>
 			<?php if (  $_["recoveryEnabledForUser"] ):
-					p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
-			endif; ?>
+                    p( $l->t( " If you don't remember your old password you can ask your administrator to recover your files." ) );
+            endif; ?>
 			<br />
 			<input
 				type="password"

lib/private/Files/Cache/Wrapper/JailPropagator.php

Indentation +14 added lines, -14 removed lines

@@ -26,19 +26,19 @@
 use OC\Files\Storage\Wrapper\Jail;
 
 class JailPropagator extends Propagator {
-	/**
-	 * @var Jail
-	 */
-	protected $storage;
+    /**
+     * @var Jail
+     */
+    protected $storage;
 
-	/**
-	 * @param string $internalPath
-	 * @param int $time
-	 * @param int $sizeDifference
-	 */
-	public function propagateChange($internalPath, $time, $sizeDifference = 0) {
-		/** @var \OC\Files\Storage\Storage $storage */
-		list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
-		$storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
-	}
+    /**
+     * @param string $internalPath
+     * @param int $time
+     * @param int $sizeDifference
+     */
+    public function propagateChange($internalPath, $time, $sizeDifference = 0) {
+        /** @var \OC\Files\Storage\Storage $storage */
+        list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
+        $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
+    }
 }

lib/private/Security/Bruteforce/Capabilities.php

Indentation +22 added lines, -22 removed lines

@@ -24,29 +24,29 @@
 use OCP\IRequest;
 
 class Capabilities implements IPublicCapability {
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/** @var Throttler */
-	private $throttler;
+    /** @var Throttler */
+    private $throttler;
 
-	/**
-	 * Capabilities constructor.
-	 *
-	 * @param IRequest $request
-	 * @param Throttler $throttler
-	 */
-	public function __construct(IRequest $request,
-								Throttler $throttler) {
-		$this->request = $request;
-		$this->throttler = $throttler;
-	}
+    /**
+     * Capabilities constructor.
+     *
+     * @param IRequest $request
+     * @param Throttler $throttler
+     */
+    public function __construct(IRequest $request,
+                                Throttler $throttler) {
+        $this->request = $request;
+        $this->throttler = $throttler;
+    }
 
-	public function getCapabilities() {
-		return [
-			'bruteforce' => [
-				'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
-			]
-		];
-	}
+    public function getCapabilities() {
+        return [
+            'bruteforce' => [
+                'delay' => $this->throttler->getDelay($this->request->getRemoteAddress())
+            ]
+        ];
+    }
 }

lib/private/Files/Storage/Wrapper/PermissionsMask.php

Indentation +118 added lines, -118 removed lines

@@ -37,122 +37,122 @@
  * Note that the read permissions can't be masked
  */
 class PermissionsMask extends Wrapper {
-	/**
-	 * @var int the permissions bits we want to keep
-	 */
-	private $mask;
-
-	/**
-	 * @param array $arguments ['storage' => $storage, 'mask' => $mask]
-	 *
-	 * $storage: The storage the permissions mask should be applied on
-	 * $mask: The permission bits that should be kept, a combination of the \OCP\Constant::PERMISSION_ constants
-	 */
-	public function __construct($arguments) {
-		parent::__construct($arguments);
-		$this->mask = $arguments['mask'];
-	}
-
-	private function checkMask($permissions) {
-		return ($this->mask & $permissions) === $permissions;
-	}
-
-	public function isUpdatable($path) {
-		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::isUpdatable($path);
-	}
-
-	public function isCreatable($path) {
-		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::isCreatable($path);
-	}
-
-	public function isDeletable($path) {
-		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::isDeletable($path);
-	}
-
-	public function isSharable($path) {
-		return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($path);
-	}
-
-	public function getPermissions($path) {
-		return $this->storage->getPermissions($path) & $this->mask;
-	}
-
-	public function rename($path1, $path2) {
-		$p = strpos($path1, $path2);
-		if ($p === 0) {
-			$part = substr($path1, strlen($path2));
-			//This is a rename of the transfer file to the original file
-			if (strpos($part, '.ocTransferId') === 0) {
-				return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
-			}
-		}
-		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
-	}
-
-	public function copy($path1, $path2) {
-		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::copy($path1, $path2);
-	}
-
-	public function touch($path, $mtime = null) {
-		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-		return $this->checkMask($permissions) and parent::touch($path, $mtime);
-	}
-
-	public function mkdir($path) {
-		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::mkdir($path);
-	}
-
-	public function rmdir($path) {
-		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::rmdir($path);
-	}
-
-	public function unlink($path) {
-		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::unlink($path);
-	}
-
-	public function file_put_contents($path, $data) {
-		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-		return $this->checkMask($permissions) ? parent::file_put_contents($path, $data) : false;
-	}
-
-	public function fopen($path, $mode) {
-		if ($mode === 'r' or $mode === 'rb') {
-			return parent::fopen($path, $mode);
-		} else {
-			$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
-			return $this->checkMask($permissions) ? parent::fopen($path, $mode) : false;
-		}
-	}
-
-	/**
-	 * get a cache instance for the storage
-	 *
-	 * @param string $path
-	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
-	 * @return \OC\Files\Cache\Cache
-	 */
-	public function getCache($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this;
-		}
-		$sourceCache = parent::getCache($path, $storage);
-		return new CachePermissionsMask($sourceCache, $this->mask);
-	}
-
-	public function getMetaData($path) {
-		$data = parent::getMetaData($path);
-
-		if ($data && isset($data['permissions'])) {
-			$data['scan_permissions'] = isset($data['scan_permissions']) ? $data['scan_permissions'] : $data['permissions'];
-			$data['permissions'] &= $this->mask;
-		}
-		return $data;
-	}
-
-	public function getScanner($path = '', $storage = null) {
-		if (!$storage) {
-			$storage = $this->storage;
-		}
-		return parent::getScanner($path, $storage);
-	}
+    /**
+     * @var int the permissions bits we want to keep
+     */
+    private $mask;
+
+    /**
+     * @param array $arguments ['storage' => $storage, 'mask' => $mask]
+     *
+     * $storage: The storage the permissions mask should be applied on
+     * $mask: The permission bits that should be kept, a combination of the \OCP\Constant::PERMISSION_ constants
+     */
+    public function __construct($arguments) {
+        parent::__construct($arguments);
+        $this->mask = $arguments['mask'];
+    }
+
+    private function checkMask($permissions) {
+        return ($this->mask & $permissions) === $permissions;
+    }
+
+    public function isUpdatable($path) {
+        return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::isUpdatable($path);
+    }
+
+    public function isCreatable($path) {
+        return $this->checkMask(Constants::PERMISSION_CREATE) and parent::isCreatable($path);
+    }
+
+    public function isDeletable($path) {
+        return $this->checkMask(Constants::PERMISSION_DELETE) and parent::isDeletable($path);
+    }
+
+    public function isSharable($path) {
+        return $this->checkMask(Constants::PERMISSION_SHARE) and parent::isSharable($path);
+    }
+
+    public function getPermissions($path) {
+        return $this->storage->getPermissions($path) & $this->mask;
+    }
+
+    public function rename($path1, $path2) {
+        $p = strpos($path1, $path2);
+        if ($p === 0) {
+            $part = substr($path1, strlen($path2));
+            //This is a rename of the transfer file to the original file
+            if (strpos($part, '.ocTransferId') === 0) {
+                return $this->checkMask(Constants::PERMISSION_CREATE) and parent::rename($path1, $path2);
+            }
+        }
+        return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
+    }
+
+    public function copy($path1, $path2) {
+        return $this->checkMask(Constants::PERMISSION_CREATE) and parent::copy($path1, $path2);
+    }
+
+    public function touch($path, $mtime = null) {
+        $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
+        return $this->checkMask($permissions) and parent::touch($path, $mtime);
+    }
+
+    public function mkdir($path) {
+        return $this->checkMask(Constants::PERMISSION_CREATE) and parent::mkdir($path);
+    }
+
+    public function rmdir($path) {
+        return $this->checkMask(Constants::PERMISSION_DELETE) and parent::rmdir($path);
+    }
+
+    public function unlink($path) {
+        return $this->checkMask(Constants::PERMISSION_DELETE) and parent::unlink($path);
+    }
+
+    public function file_put_contents($path, $data) {
+        $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
+        return $this->checkMask($permissions) ? parent::file_put_contents($path, $data) : false;
+    }
+
+    public function fopen($path, $mode) {
+        if ($mode === 'r' or $mode === 'rb') {
+            return parent::fopen($path, $mode);
+        } else {
+            $permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
+            return $this->checkMask($permissions) ? parent::fopen($path, $mode) : false;
+        }
+    }
+
+    /**
+     * get a cache instance for the storage
+     *
+     * @param string $path
+     * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+     * @return \OC\Files\Cache\Cache
+     */
+    public function getCache($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this;
+        }
+        $sourceCache = parent::getCache($path, $storage);
+        return new CachePermissionsMask($sourceCache, $this->mask);
+    }
+
+    public function getMetaData($path) {
+        $data = parent::getMetaData($path);
+
+        if ($data && isset($data['permissions'])) {
+            $data['scan_permissions'] = isset($data['scan_permissions']) ? $data['scan_permissions'] : $data['permissions'];
+            $data['permissions'] &= $this->mask;
+        }
+        return $data;
+    }
+
+    public function getScanner($path = '', $storage = null) {
+        if (!$storage) {
+            $storage = $this->storage;
+        }
+        return parent::getScanner($path, $storage);
+    }
 }

lib/private/Diagnostics/QueryLogger.php

Indentation +55 added lines, -55 removed lines

@@ -29,68 +29,68 @@
 use OCP\Diagnostics\IQueryLogger;
 
 class QueryLogger implements IQueryLogger {
-	/**
-	 * @var \OC\Diagnostics\Query
-	 */
-	protected $activeQuery;
+    /**
+     * @var \OC\Diagnostics\Query
+     */
+    protected $activeQuery;
 
-	/**
-	 * @var CappedMemoryCache
-	 */
-	protected $queries;
+    /**
+     * @var CappedMemoryCache
+     */
+    protected $queries;
 
-	/**
-	 * QueryLogger constructor.
-	 */
-	public function __construct() {
-		$this->queries = new CappedMemoryCache(1024);
-	}
+    /**
+     * QueryLogger constructor.
+     */
+    public function __construct() {
+        $this->queries = new CappedMemoryCache(1024);
+    }
 
 
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function startQuery($sql, array $params = null, array $types = null) {
-		if ($this->activated) {
-			$this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function startQuery($sql, array $params = null, array $types = null) {
+        if ($this->activated) {
+            $this->activeQuery = new Query($sql, $params, microtime(true), $this->getStack());
+        }
+    }
 
-	private function getStack() {
-		$stack = debug_backtrace();
-		array_shift($stack);
-		array_shift($stack);
-		array_shift($stack);
-		return $stack;
-	}
+    private function getStack() {
+        $stack = debug_backtrace();
+        array_shift($stack);
+        array_shift($stack);
+        array_shift($stack);
+        return $stack;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function stopQuery() {
-		if ($this->activated && $this->activeQuery) {
-			$this->activeQuery->end(microtime(true));
-			$this->queries[] = $this->activeQuery;
-			$this->activeQuery = null;
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function stopQuery() {
+        if ($this->activated && $this->activeQuery) {
+            $this->activeQuery->end(microtime(true));
+            $this->queries[] = $this->activeQuery;
+            $this->activeQuery = null;
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getQueries() {
-		return $this->queries->getData();
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getQueries() {
+        return $this->queries->getData();
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }

lib/private/Hooks/LegacyEmitter.php

Indentation +11 added lines, -11 removed lines

@@ -24,15 +24,15 @@
 namespace OC\Hooks;
 
 abstract class LegacyEmitter extends BasicEmitter {
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 *
-	 * @suppress PhanAccessMethodProtected
-	 */
-	protected function emit($scope, $method, array $arguments = array()) {
-		\OC_Hook::emit($scope, $method, $arguments);
-		parent::emit($scope, $method, $arguments);
-	}
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     *
+     * @suppress PhanAccessMethodProtected
+     */
+    protected function emit($scope, $method, array $arguments = array()) {
+        \OC_Hook::emit($scope, $method, $arguments);
+        parent::emit($scope, $method, $arguments);
+    }
 }

core/Command/Db/Migrations/GenerateFromSchemaFileCommand.php

Spacing +4 added lines, -4 removed lines

@@ -60,14 +60,14 @@ 
 		$appName = $input->getArgument('app');
 		$version = $input->getArgument('version');
 
-		if (!preg_match('/^\d{1,16}$/',$version)) {
+		if (!preg_match('/^\d{1,16}$/', $version)) {
 			$output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
 			return 1;
 		}
 
-		$schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
+		$schemaFile = $this->appManager->getAppPath($appName).'/appinfo/database.xml';
 		if (!file_exists($schemaFile)) {
-			$output->writeln('<error>App ' . $appName . ' does not have a database.xml file</error>');
+			$output->writeln('<error>App '.$appName.' does not have a database.xml file</error>');
 			return 2;
 		}
 
@@ -80,7 +80,7 @@ 
 		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
 		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
+		$path = $this->generateMigration($ms, 'Version'.$version.'Date'.$date, $schemaBody);
 
 		$output->writeln("New migration class has been generated to <info>$path</info>");
 		return 0;

Indentation +99 added lines, -99 removed lines

@@ -36,170 +36,170 @@
 
 class GenerateFromSchemaFileCommand extends GenerateCommand {
 
-	/** @var IConfig */
-	protected $config;
+    /** @var IConfig */
+    protected $config;
 
-	public function __construct(IConfig $config, IAppManager $appManager, IDBConnection $connection) {
-		parent::__construct($connection, $appManager);
-		$this->config = $config;
-	}
+    public function __construct(IConfig $config, IAppManager $appManager, IDBConnection $connection) {
+        parent::__construct($connection, $appManager);
+        $this->config = $config;
+    }
 
 
-	protected function configure() {
-		parent::configure();
+    protected function configure() {
+        parent::configure();
 
-		$this->setName('migrations:generate-from-schema');
-	}
+        $this->setName('migrations:generate-from-schema');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output) {
-		$appName = $input->getArgument('app');
-		$version = $input->getArgument('version');
+    public function execute(InputInterface $input, OutputInterface $output) {
+        $appName = $input->getArgument('app');
+        $version = $input->getArgument('version');
 
-		if (!preg_match('/^\d{1,16}$/',$version)) {
-			$output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
-			return 1;
-		}
+        if (!preg_match('/^\d{1,16}$/',$version)) {
+            $output->writeln('<error>The given version is invalid. Only 0-9 are allowed (max. 16 digits)</error>');
+            return 1;
+        }
 
-		$schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
-		if (!file_exists($schemaFile)) {
-			$output->writeln('<error>App ' . $appName . ' does not have a database.xml file</error>');
-			return 2;
-		}
+        $schemaFile = $this->appManager->getAppPath($appName) . '/appinfo/database.xml';
+        if (!file_exists($schemaFile)) {
+            $output->writeln('<error>App ' . $appName . ' does not have a database.xml file</error>');
+            return 2;
+        }
 
-		$reader = new MDB2SchemaReader($this->config, $this->connection->getDatabasePlatform());
-		$schema = new Schema();
-		$reader->loadSchemaFromFile($schemaFile, $schema);
+        $reader = new MDB2SchemaReader($this->config, $this->connection->getDatabasePlatform());
+        $schema = new Schema();
+        $reader->loadSchemaFromFile($schemaFile, $schema);
 
-		$schemaBody = $this->schemaToMigration($schema);
+        $schemaBody = $this->schemaToMigration($schema);
 
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
-		$date = date('YmdHis');
-		$path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
+        $date = date('YmdHis');
+        $path = $this->generateMigration($ms, 'Version' . $version . 'Date' . $date, $schemaBody);
 
-		$output->writeln("New migration class has been generated to <info>$path</info>");
-		return 0;
-	}
+        $output->writeln("New migration class has been generated to <info>$path</info>");
+        return 0;
+    }
 
-	/**
-	 * @param Schema $schema
-	 * @return string
-	 */
-	protected function schemaToMigration(Schema $schema) {
-		$content = <<<'EOT'
+    /**
+     * @param Schema $schema
+     * @return string
+     */
+    protected function schemaToMigration(Schema $schema) {
+        $content = <<<'EOT'
 		/** @var ISchemaWrapper $schema */
 		$schema = $schemaClosure();
 
 EOT;
 
-		foreach ($schema->getTables() as $table) {
-			$content .= str_replace('{{table-name}}', substr($table->getName(), 3), <<<'EOT'
+        foreach ($schema->getTables() as $table) {
+            $content .= str_replace('{{table-name}}', substr($table->getName(), 3), <<<'EOT'
 
 		if (!$schema->hasTable('{{table-name}}')) {
 			$table = $schema->createTable('{{table-name}}');
 
 EOT
-			);
+            );
 
-			foreach ($table->getColumns() as $column) {
-				$content .= str_replace(['{{name}}', '{{type}}'], [$column->getName(), $column->getType()->getName()], <<<'EOT'
+            foreach ($table->getColumns() as $column) {
+                $content .= str_replace(['{{name}}', '{{type}}'], [$column->getName(), $column->getType()->getName()], <<<'EOT'
 			$table->addColumn('{{name}}', '{{type}}', [
 
 EOT
-				);
-				if ($column->getAutoincrement()) {
-					$content .= <<<'EOT'
+                );
+                if ($column->getAutoincrement()) {
+                    $content .= <<<'EOT'
 				'autoincrement' => true,
 
 EOT;
-				}
-				$content .= str_replace('{{notnull}}', $column->getNotnull() ? 'true' : 'false', <<<'EOT'
+                }
+                $content .= str_replace('{{notnull}}', $column->getNotnull() ? 'true' : 'false', <<<'EOT'
 				'notnull' => {{notnull}},
 
 EOT
-				);
-				if ($column->getLength() !== null) {
-					$content .= str_replace('{{length}}', $column->getLength(), <<<'EOT'
+                );
+                if ($column->getLength() !== null) {
+                    $content .= str_replace('{{length}}', $column->getLength(), <<<'EOT'
 				'length' => {{length}},
 
 EOT
-					);
-				}
-				$default = $column->getDefault();
-				if ($default !== null) {
-					if (is_string($default)) {
-						$default = "'$default'";
-					} else if (is_bool($default)) {
-						$default = ($default === true) ? 'true' : 'false';
-					}
-					$content .= str_replace('{{default}}', $default, <<<'EOT'
+                    );
+                }
+                $default = $column->getDefault();
+                if ($default !== null) {
+                    if (is_string($default)) {
+                        $default = "'$default'";
+                    } else if (is_bool($default)) {
+                        $default = ($default === true) ? 'true' : 'false';
+                    }
+                    $content .= str_replace('{{default}}', $default, <<<'EOT'
 				'default' => {{default}},
 
 EOT
-					);
-				}
-				if ($column->getUnsigned()) {
-					$content .= <<<'EOT'
+                    );
+                }
+                if ($column->getUnsigned()) {
+                    $content .= <<<'EOT'
 				'unsigned' => true,
 
 EOT;
-				}
+                }
 
-				$content .= <<<'EOT'
+                $content .= <<<'EOT'
 			]);
 
 EOT;
-			}
+            }
 
-			$content .= <<<'EOT'
+            $content .= <<<'EOT'
 
 EOT;
 
-			$primaryKey = $table->getPrimaryKey();
-			if ($primaryKey !== null) {
-				$content .= str_replace('{{columns}}', implode('\', \'', $primaryKey->getUnquotedColumns()), <<<'EOT'
+            $primaryKey = $table->getPrimaryKey();
+            if ($primaryKey !== null) {
+                $content .= str_replace('{{columns}}', implode('\', \'', $primaryKey->getUnquotedColumns()), <<<'EOT'
 			$table->setPrimaryKey(['{{columns}}']);
 
 EOT
-				);
-			}
-
-			foreach ($table->getIndexes() as $index) {
-				if ($index->isPrimary()) {
-					continue;
-				}
-
-				if ($index->isUnique()) {
-					$content .= str_replace(
-						['{{columns}}', '{{name}}'],
-						[implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
-						<<<'EOT'
+                );
+            }
+
+            foreach ($table->getIndexes() as $index) {
+                if ($index->isPrimary()) {
+                    continue;
+                }
+
+                if ($index->isUnique()) {
+                    $content .= str_replace(
+                        ['{{columns}}', '{{name}}'],
+                        [implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
+                        <<<'EOT'
 			$table->addUniqueIndex(['{{columns}}'], '{{name}}');
 
 EOT
-					);
-				} else {
-					$content .= str_replace(
-						['{{columns}}', '{{name}}'],
-						[implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
-						<<<'EOT'
+                    );
+                } else {
+                    $content .= str_replace(
+                        ['{{columns}}', '{{name}}'],
+                        [implode('\', \'', $index->getUnquotedColumns()), $index->getName()],
+                        <<<'EOT'
 			$table->addIndex(['{{columns}}'], '{{name}}');
 
 EOT
-					);
-				}
-			}
+                    );
+                }
+            }
 
-			$content .= <<<'EOT'
+            $content .= <<<'EOT'
 		}
 
 EOT;
-		}
+        }
 
-		$content .= <<<'EOT'
+        $content .= <<<'EOT'
 		return $schema;
 EOT;
 
-		return $content;
-	}
+        return $content;
+    }
 }