nextcloud / server

apps/files_external/lib/Lib/Storage/SFTPWriteStream.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
 			$this->sftp = $context['session'];
@@ -82,7 +82,7 @@ 
 
 	public function stream_open($path, $mode, $options, &$opened_path) {
 		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
+		$path = '/'.ltrim($path);
 		$path = str_replace('//', '/', $path);
 
 		$this->loadContext('sftp');

Indentation +150 added lines, -150 removed lines

@@ -12,154 +12,154 @@
 use phpseclib\Net\SSH2;
 
 class SFTPWriteStream implements File {
-	/** @var resource */
-	public $context;
-
-	/** @var \phpseclib\Net\SFTP */
-	private $sftp;
-
-	/** @var string */
-	private $handle;
-
-	/** @var int */
-	private $internalPosition = 0;
-
-	/** @var int */
-	private $writePosition = 0;
-
-	/** @var bool */
-	private $eof = false;
-
-	private $buffer = '';
-
-	public static function register($protocol = 'sftpwrite') {
-		if (in_array($protocol, stream_get_wrappers(), true)) {
-			return false;
-		}
-		return stream_wrapper_register($protocol, get_called_class());
-	}
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	protected function loadContext(string $name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
-			$this->sftp = $context['session'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, session not set');
-		}
-		return $context;
-	}
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
-		$path = str_replace('//', '/', $path);
-
-		$this->loadContext('sftp');
-
-		if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
-			return false;
-		}
-
-		$remote_file = $this->sftp->_realpath($path);
-		if ($remote_file === false) {
-			return false;
-		}
-
-		$packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_TRUNCATE, 0);
-		if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-			return false;
-		}
-
-		$response = $this->sftp->_get_sftp_packet();
-		switch ($this->sftp->packet_type) {
-			case NET_SFTP_HANDLE:
-				$this->handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-				$this->sftp->_logError($response);
-				return false;
-			default:
-				user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-				return false;
-		}
-
-		return true;
-	}
-
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		return false;
-	}
-
-	public function stream_tell() {
-		return $this->writePosition;
-	}
-
-	public function stream_read($count) {
-		return false;
-	}
-
-	public function stream_write($data) {
-		$written = strlen($data);
-		$this->writePosition += $written;
-
-		$this->buffer .= $data;
-
-		if (strlen($this->buffer) > 64 * 1024) {
-			if (!$this->stream_flush()) {
-				return false;
-			}
-		}
-
-		return $written;
-	}
-
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	public function stream_stat() {
-		return false;
-	}
-
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	public function stream_flush() {
-		$size = strlen($this->buffer);
-		$packet = pack('Na*N3a*', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size, $this->buffer);
-		if (!$this->sftp->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
-			return false;
-		}
-		$this->internalPosition += $size;
-		$this->buffer = '';
-
-		return $this->sftp->_read_put_responses(1);
-	}
-
-	public function stream_eof() {
-		return $this->eof;
-	}
-
-	public function stream_close() {
-		$this->stream_flush();
-		if (!$this->sftp->_close_handle($this->handle)) {
-			return false;
-		}
-		return true;
-	}
+    /** @var resource */
+    public $context;
+
+    /** @var \phpseclib\Net\SFTP */
+    private $sftp;
+
+    /** @var string */
+    private $handle;
+
+    /** @var int */
+    private $internalPosition = 0;
+
+    /** @var int */
+    private $writePosition = 0;
+
+    /** @var bool */
+    private $eof = false;
+
+    private $buffer = '';
+
+    public static function register($protocol = 'sftpwrite') {
+        if (in_array($protocol, stream_get_wrappers(), true)) {
+            return false;
+        }
+        return stream_wrapper_register($protocol, get_called_class());
+    }
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @throws \BadMethodCallException
+     */
+    protected function loadContext(string $name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
+            $this->sftp = $context['session'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, session not set');
+        }
+        return $context;
+    }
+
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        [, $path] = explode('://', $path);
+        $path = '/' . ltrim($path);
+        $path = str_replace('//', '/', $path);
+
+        $this->loadContext('sftp');
+
+        if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        $remote_file = $this->sftp->_realpath($path);
+        if ($remote_file === false) {
+            return false;
+        }
+
+        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_TRUNCATE, 0);
+        if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
+            return false;
+        }
+
+        $response = $this->sftp->_get_sftp_packet();
+        switch ($this->sftp->packet_type) {
+            case NET_SFTP_HANDLE:
+                $this->handle = substr($response, 4);
+                break;
+            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+                $this->sftp->_logError($response);
+                return false;
+            default:
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
+        }
+
+        return true;
+    }
+
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        return false;
+    }
+
+    public function stream_tell() {
+        return $this->writePosition;
+    }
+
+    public function stream_read($count) {
+        return false;
+    }
+
+    public function stream_write($data) {
+        $written = strlen($data);
+        $this->writePosition += $written;
+
+        $this->buffer .= $data;
+
+        if (strlen($this->buffer) > 64 * 1024) {
+            if (!$this->stream_flush()) {
+                return false;
+            }
+        }
+
+        return $written;
+    }
+
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    public function stream_stat() {
+        return false;
+    }
+
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    public function stream_flush() {
+        $size = strlen($this->buffer);
+        $packet = pack('Na*N3a*', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size, $this->buffer);
+        if (!$this->sftp->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
+            return false;
+        }
+        $this->internalPosition += $size;
+        $this->buffer = '';
+
+        return $this->sftp->_read_put_responses(1);
+    }
+
+    public function stream_eof() {
+        return $this->eof;
+    }
+
+    public function stream_close() {
+        $this->stream_flush();
+        if (!$this->sftp->_close_handle($this->handle)) {
+            return false;
+        }
+        return true;
+    }
 }

apps/files_external/lib/Lib/Storage/SFTPReadStream.php

Spacing +2 added lines, -2 removed lines

@@ -70,7 +70,7 @@ 
 		if (isset($context[$name])) {
 			$context = $context[$name];
 		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+			throw new \BadMethodCallException('Invalid context, "'.$name.'" options not set');
 		}
 		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
 			$this->sftp = $context['session'];
@@ -82,7 +82,7 @@ 
 
 	public function stream_open($path, $mode, $options, &$opened_path) {
 		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
+		$path = '/'.ltrim($path);
 		$path = str_replace('//', '/', $path);
 
 		$this->loadContext('sftp');

Indentation +202 added lines, -202 removed lines

@@ -12,206 +12,206 @@
 use phpseclib\Net\SSH2;
 
 class SFTPReadStream implements File {
-	/** @var resource */
-	public $context;
-
-	/** @var \phpseclib\Net\SFTP */
-	private $sftp;
-
-	/** @var string */
-	private $handle;
-
-	/** @var int */
-	private $internalPosition = 0;
-
-	/** @var int */
-	private $readPosition = 0;
-
-	/** @var bool */
-	private $eof = false;
-
-	private $buffer = '';
-	private bool $pendingRead = false;
-	private int $size = 0;
-
-	public static function register($protocol = 'sftpread') {
-		if (in_array($protocol, stream_get_wrappers(), true)) {
-			return false;
-		}
-		return stream_wrapper_register($protocol, get_called_class());
-	}
-
-	/**
-	 * Load the source from the stream context and return the context options
-	 *
-	 * @throws \BadMethodCallException
-	 */
-	protected function loadContext(string $name) {
-		$context = stream_context_get_options($this->context);
-		if (isset($context[$name])) {
-			$context = $context[$name];
-		} else {
-			throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
-		}
-		if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
-			$this->sftp = $context['session'];
-		} else {
-			throw new \BadMethodCallException('Invalid context, session not set');
-		}
-		if (isset($context['size'])) {
-			$this->size = $context['size'];
-		}
-		return $context;
-	}
-
-	public function stream_open($path, $mode, $options, &$opened_path) {
-		[, $path] = explode('://', $path);
-		$path = '/' . ltrim($path);
-		$path = str_replace('//', '/', $path);
-
-		$this->loadContext('sftp');
-
-		if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
-			return false;
-		}
-
-		$remote_file = $this->sftp->_realpath($path);
-		if ($remote_file === false) {
-			return false;
-		}
-
-		$packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
-		if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
-			return false;
-		}
-
-		$response = $this->sftp->_get_sftp_packet();
-		switch ($this->sftp->packet_type) {
-			case NET_SFTP_HANDLE:
-				$this->handle = substr($response, 4);
-				break;
-			case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-				$this->sftp->_logError($response);
-				return false;
-			default:
-				user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
-				return false;
-		}
-
-		$this->request_chunk(256 * 1024);
-
-		return true;
-	}
-
-	public function stream_seek($offset, $whence = SEEK_SET) {
-		switch ($whence) {
-			case SEEK_SET:
-				$this->seekTo($offset);
-				break;
-			case SEEK_CUR:
-				$this->seekTo($this->readPosition + $offset);
-				break;
-			case SEEK_END:
-				$this->seekTo($this->size + $offset);
-				break;
-		}
-		return true;
-	}
-
-	private function seekTo(int $offset): void {
-		$this->internalPosition = $offset;
-		$this->readPosition = $offset;
-		$this->buffer = '';
-		$this->request_chunk(256 * 1024);
-	}
-
-	public function stream_tell() {
-		return $this->readPosition;
-	}
-
-	public function stream_read($count) {
-		if (!$this->eof && strlen($this->buffer) < $count) {
-			$chunk = $this->read_chunk();
-			$this->buffer .= $chunk;
-			if (!$this->eof) {
-				$this->request_chunk(256 * 1024);
-			}
-		}
-
-		$data = substr($this->buffer, 0, $count);
-		$this->buffer = substr($this->buffer, $count);
-		$this->readPosition += strlen($data);
-
-		return $data;
-	}
-
-	private function request_chunk(int $size) {
-		if ($this->pendingRead) {
-			$this->sftp->_get_sftp_packet();
-		}
-
-		$packet = pack('Na*N3', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size);
-		$this->pendingRead = true;
-		return $this->sftp->_send_sftp_packet(NET_SFTP_READ, $packet);
-	}
-
-	private function read_chunk() {
-		$this->pendingRead = false;
-		$response = $this->sftp->_get_sftp_packet();
-
-		switch ($this->sftp->packet_type) {
-			case NET_SFTP_DATA:
-				$temp = substr($response, 4);
-				$len = strlen($temp);
-				$this->internalPosition += $len;
-				return $temp;
-			case NET_SFTP_STATUS:
-				[1 => $status] = unpack('N', substr($response, 0, 4));
-				if ($status == NET_SFTP_STATUS_EOF) {
-					$this->eof = true;
-				}
-				return '';
-			default:
-				return '';
-		}
-	}
-
-	public function stream_write($data) {
-		return false;
-	}
-
-	public function stream_set_option($option, $arg1, $arg2) {
-		return false;
-	}
-
-	public function stream_truncate($size) {
-		return false;
-	}
-
-	public function stream_stat() {
-		return false;
-	}
-
-	public function stream_lock($operation) {
-		return false;
-	}
-
-	public function stream_flush() {
-		return false;
-	}
-
-	public function stream_eof() {
-		return $this->eof;
-	}
-
-	public function stream_close() {
-		// we still have a read request incoming that needs to be handled before we can close
-		if ($this->pendingRead) {
-			$this->sftp->_get_sftp_packet();
-		}
-		if (!$this->sftp->_close_handle($this->handle)) {
-			return false;
-		}
-		return true;
-	}
+    /** @var resource */
+    public $context;
+
+    /** @var \phpseclib\Net\SFTP */
+    private $sftp;
+
+    /** @var string */
+    private $handle;
+
+    /** @var int */
+    private $internalPosition = 0;
+
+    /** @var int */
+    private $readPosition = 0;
+
+    /** @var bool */
+    private $eof = false;
+
+    private $buffer = '';
+    private bool $pendingRead = false;
+    private int $size = 0;
+
+    public static function register($protocol = 'sftpread') {
+        if (in_array($protocol, stream_get_wrappers(), true)) {
+            return false;
+        }
+        return stream_wrapper_register($protocol, get_called_class());
+    }
+
+    /**
+     * Load the source from the stream context and return the context options
+     *
+     * @throws \BadMethodCallException
+     */
+    protected function loadContext(string $name) {
+        $context = stream_context_get_options($this->context);
+        if (isset($context[$name])) {
+            $context = $context[$name];
+        } else {
+            throw new \BadMethodCallException('Invalid context, "' . $name . '" options not set');
+        }
+        if (isset($context['session']) and $context['session'] instanceof \phpseclib\Net\SFTP) {
+            $this->sftp = $context['session'];
+        } else {
+            throw new \BadMethodCallException('Invalid context, session not set');
+        }
+        if (isset($context['size'])) {
+            $this->size = $context['size'];
+        }
+        return $context;
+    }
+
+    public function stream_open($path, $mode, $options, &$opened_path) {
+        [, $path] = explode('://', $path);
+        $path = '/' . ltrim($path);
+        $path = str_replace('//', '/', $path);
+
+        $this->loadContext('sftp');
+
+        if (!($this->sftp->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        $remote_file = $this->sftp->_realpath($path);
+        if ($remote_file === false) {
+            return false;
+        }
+
+        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
+        if (!$this->sftp->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
+            return false;
+        }
+
+        $response = $this->sftp->_get_sftp_packet();
+        switch ($this->sftp->packet_type) {
+            case NET_SFTP_HANDLE:
+                $this->handle = substr($response, 4);
+                break;
+            case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
+                $this->sftp->_logError($response);
+                return false;
+            default:
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
+        }
+
+        $this->request_chunk(256 * 1024);
+
+        return true;
+    }
+
+    public function stream_seek($offset, $whence = SEEK_SET) {
+        switch ($whence) {
+            case SEEK_SET:
+                $this->seekTo($offset);
+                break;
+            case SEEK_CUR:
+                $this->seekTo($this->readPosition + $offset);
+                break;
+            case SEEK_END:
+                $this->seekTo($this->size + $offset);
+                break;
+        }
+        return true;
+    }
+
+    private function seekTo(int $offset): void {
+        $this->internalPosition = $offset;
+        $this->readPosition = $offset;
+        $this->buffer = '';
+        $this->request_chunk(256 * 1024);
+    }
+
+    public function stream_tell() {
+        return $this->readPosition;
+    }
+
+    public function stream_read($count) {
+        if (!$this->eof && strlen($this->buffer) < $count) {
+            $chunk = $this->read_chunk();
+            $this->buffer .= $chunk;
+            if (!$this->eof) {
+                $this->request_chunk(256 * 1024);
+            }
+        }
+
+        $data = substr($this->buffer, 0, $count);
+        $this->buffer = substr($this->buffer, $count);
+        $this->readPosition += strlen($data);
+
+        return $data;
+    }
+
+    private function request_chunk(int $size) {
+        if ($this->pendingRead) {
+            $this->sftp->_get_sftp_packet();
+        }
+
+        $packet = pack('Na*N3', strlen($this->handle), $this->handle, $this->internalPosition / 4294967296, $this->internalPosition, $size);
+        $this->pendingRead = true;
+        return $this->sftp->_send_sftp_packet(NET_SFTP_READ, $packet);
+    }
+
+    private function read_chunk() {
+        $this->pendingRead = false;
+        $response = $this->sftp->_get_sftp_packet();
+
+        switch ($this->sftp->packet_type) {
+            case NET_SFTP_DATA:
+                $temp = substr($response, 4);
+                $len = strlen($temp);
+                $this->internalPosition += $len;
+                return $temp;
+            case NET_SFTP_STATUS:
+                [1 => $status] = unpack('N', substr($response, 0, 4));
+                if ($status == NET_SFTP_STATUS_EOF) {
+                    $this->eof = true;
+                }
+                return '';
+            default:
+                return '';
+        }
+    }
+
+    public function stream_write($data) {
+        return false;
+    }
+
+    public function stream_set_option($option, $arg1, $arg2) {
+        return false;
+    }
+
+    public function stream_truncate($size) {
+        return false;
+    }
+
+    public function stream_stat() {
+        return false;
+    }
+
+    public function stream_lock($operation) {
+        return false;
+    }
+
+    public function stream_flush() {
+        return false;
+    }
+
+    public function stream_eof() {
+        return $this->eof;
+    }
+
+    public function stream_close() {
+        // we still have a read request incoming that needs to be handled before we can close
+        if ($this->pendingRead) {
+            $this->sftp->_get_sftp_packet();
+        }
+        if (!$this->sftp->_close_handle($this->handle)) {
+            return false;
+        }
+        return true;
+    }
 }

core/Command/Db/Migrations/StatusCommand.php

Spacing +2 added lines, -2 removed lines

@@ -62,10 +62,10 @@
 			if (is_array($value)) {
 				$output->writeln("    <comment>>></comment> $key:");
 				foreach ($value as $subKey => $subValue) {
-					$output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
+					$output->writeln("        <comment>>></comment> $subKey: ".str_repeat(' ', 46 - strlen($subKey)).$subValue);
 				}
 			} else {
-				$output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
+				$output->writeln("    <comment>>></comment> $key: ".str_repeat(' ', 50 - strlen($key)).$value);
 			}
 		}
 		return 0;

Indentation +93 added lines, -93 removed lines

@@ -34,109 +34,109 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class StatusCommand extends Command implements CompletionAwareInterface {
-	public function __construct(
-		private Connection $connection,
-	) {
-		parent::__construct();
-	}
+    public function __construct(
+        private Connection $connection,
+    ) {
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('migrations:status')
-			->setDescription('View the status of a set of migrations.')
-			->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on');
-	}
+    protected function configure() {
+        $this
+            ->setName('migrations:status')
+            ->setDescription('View the status of a set of migrations.')
+            ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on');
+    }
 
-	public function execute(InputInterface $input, OutputInterface $output): int {
-		$appName = $input->getArgument('app');
-		$ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
+    public function execute(InputInterface $input, OutputInterface $output): int {
+        $appName = $input->getArgument('app');
+        $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output));
 
-		$infos = $this->getMigrationsInfos($ms);
-		foreach ($infos as $key => $value) {
-			if (is_array($value)) {
-				$output->writeln("    <comment>>></comment> $key:");
-				foreach ($value as $subKey => $subValue) {
-					$output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
-				}
-			} else {
-				$output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
-			}
-		}
-		return 0;
-	}
+        $infos = $this->getMigrationsInfos($ms);
+        foreach ($infos as $key => $value) {
+            if (is_array($value)) {
+                $output->writeln("    <comment>>></comment> $key:");
+                foreach ($value as $subKey => $subValue) {
+                    $output->writeln("        <comment>>></comment> $subKey: " . str_repeat(' ', 46 - strlen($subKey)) . $subValue);
+                }
+            } else {
+                $output->writeln("    <comment>>></comment> $key: " . str_repeat(' ', 50 - strlen($key)) . $value);
+            }
+        }
+        return 0;
+    }
 
-	/**
-	 * @param string $optionName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeOptionValues($optionName, CompletionContext $context) {
-		return [];
-	}
+    /**
+     * @param string $optionName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeOptionValues($optionName, CompletionContext $context) {
+        return [];
+    }
 
-	/**
-	 * @param string $argumentName
-	 * @param CompletionContext $context
-	 * @return string[]
-	 */
-	public function completeArgumentValues($argumentName, CompletionContext $context) {
-		if ($argumentName === 'app') {
-			$allApps = \OC_App::getAllApps();
-			return array_diff($allApps, \OC_App::getEnabledApps(true, true));
-		}
-		return [];
-	}
+    /**
+     * @param string $argumentName
+     * @param CompletionContext $context
+     * @return string[]
+     */
+    public function completeArgumentValues($argumentName, CompletionContext $context) {
+        if ($argumentName === 'app') {
+            $allApps = \OC_App::getAllApps();
+            return array_diff($allApps, \OC_App::getEnabledApps(true, true));
+        }
+        return [];
+    }
 
-	/**
-	 * @param MigrationService $ms
-	 * @return array associative array of human readable info name as key and the actual information as value
-	 */
-	public function getMigrationsInfos(MigrationService $ms) {
-		$executedMigrations = $ms->getMigratedVersions();
-		$availableMigrations = $ms->getAvailableVersions();
-		$executedUnavailableMigrations = array_diff($executedMigrations, array_keys($availableMigrations));
+    /**
+     * @param MigrationService $ms
+     * @return array associative array of human readable info name as key and the actual information as value
+     */
+    public function getMigrationsInfos(MigrationService $ms) {
+        $executedMigrations = $ms->getMigratedVersions();
+        $availableMigrations = $ms->getAvailableVersions();
+        $executedUnavailableMigrations = array_diff($executedMigrations, array_keys($availableMigrations));
 
-		$numExecutedUnavailableMigrations = count($executedUnavailableMigrations);
-		$numNewMigrations = count(array_diff(array_keys($availableMigrations), $executedMigrations));
-		$pending = $ms->describeMigrationStep('lastest');
+        $numExecutedUnavailableMigrations = count($executedUnavailableMigrations);
+        $numNewMigrations = count(array_diff(array_keys($availableMigrations), $executedMigrations));
+        $pending = $ms->describeMigrationStep('lastest');
 
-		$infos = [
-			'App' => $ms->getApp(),
-			'Version Table Name' => $ms->getMigrationsTableName(),
-			'Migrations Namespace' => $ms->getMigrationsNamespace(),
-			'Migrations Directory' => $ms->getMigrationsDirectory(),
-			'Previous Version' => $this->getFormattedVersionAlias($ms, 'prev'),
-			'Current Version' => $this->getFormattedVersionAlias($ms, 'current'),
-			'Next Version' => $this->getFormattedVersionAlias($ms, 'next'),
-			'Latest Version' => $this->getFormattedVersionAlias($ms, 'latest'),
-			'Executed Migrations' => count($executedMigrations),
-			'Executed Unavailable Migrations' => $numExecutedUnavailableMigrations,
-			'Available Migrations' => count($availableMigrations),
-			'New Migrations' => $numNewMigrations,
-			'Pending Migrations' => count($pending) ? $pending : 'None'
-		];
+        $infos = [
+            'App' => $ms->getApp(),
+            'Version Table Name' => $ms->getMigrationsTableName(),
+            'Migrations Namespace' => $ms->getMigrationsNamespace(),
+            'Migrations Directory' => $ms->getMigrationsDirectory(),
+            'Previous Version' => $this->getFormattedVersionAlias($ms, 'prev'),
+            'Current Version' => $this->getFormattedVersionAlias($ms, 'current'),
+            'Next Version' => $this->getFormattedVersionAlias($ms, 'next'),
+            'Latest Version' => $this->getFormattedVersionAlias($ms, 'latest'),
+            'Executed Migrations' => count($executedMigrations),
+            'Executed Unavailable Migrations' => $numExecutedUnavailableMigrations,
+            'Available Migrations' => count($availableMigrations),
+            'New Migrations' => $numNewMigrations,
+            'Pending Migrations' => count($pending) ? $pending : 'None'
+        ];
 
-		return $infos;
-	}
+        return $infos;
+    }
 
-	/**
-	 * @param MigrationService $migrationService
-	 * @param string $alias
-	 * @return mixed|null|string
-	 */
-	private function getFormattedVersionAlias(MigrationService $migrationService, $alias) {
-		$migration = $migrationService->getMigration($alias);
-		//No version found
-		if ($migration === null) {
-			if ($alias === 'next') {
-				return 'Already at latest migration step';
-			}
+    /**
+     * @param MigrationService $migrationService
+     * @param string $alias
+     * @return mixed|null|string
+     */
+    private function getFormattedVersionAlias(MigrationService $migrationService, $alias) {
+        $migration = $migrationService->getMigration($alias);
+        //No version found
+        if ($migration === null) {
+            if ($alias === 'next') {
+                return 'Already at latest migration step';
+            }
 
-			if ($alias === 'prev') {
-				return 'Already at first migration step';
-			}
-		}
+            if ($alias === 'prev') {
+                return 'Already at first migration step';
+            }
+        }
 
-		return $migration;
-	}
+        return $migration;
+    }
 }

core/Command/Security/ListCertificates.php

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 	protected function execute(InputInterface $input, OutputInterface $output): int {
 		$outputType = $input->getOption('output');
 		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
+			$certificates = array_map(function(ICertificate $certificate) {
 				return [
 					'name' => $certificate->getName(),
 					'common_name' => $certificate->getCommonName(),
@@ -79,7 +79,7 @@ 
 				'Issued By'
 			]);
 
-			$rows = array_map(function (ICertificate $certificate) {
+			$rows = array_map(function(ICertificate $certificate) {
 				return [
 					$certificate->getName(),
 					$certificate->getCommonName(),

Indentation +56 added lines, -56 removed lines

@@ -17,64 +17,64 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCertificates extends Base {
-	protected IL10N $l;
+    protected IL10N $l;
 
-	public function __construct(
-		protected ICertificateManager $certificateManager,
-		IL10NFactory $l10nFactory,
-	) {
-		parent::__construct();
-		$this->l = $l10nFactory->get('core');
-	}
+    public function __construct(
+        protected ICertificateManager $certificateManager,
+        IL10NFactory $l10nFactory,
+    ) {
+        parent::__construct();
+        $this->l = $l10nFactory->get('core');
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates')
-			->setDescription('list trusted certificates');
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates')
+            ->setDescription('list trusted certificates');
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$outputType = $input->getOption('output');
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
-				return [
-					'name' => $certificate->getName(),
-					'common_name' => $certificate->getCommonName(),
-					'organization' => $certificate->getOrganization(),
-					'expire' => $certificate->getExpireDate()->format(\DateTimeInterface::ATOM),
-					'issuer' => $certificate->getIssuerName(),
-					'issuer_organization' => $certificate->getIssuerOrganization(),
-					'issue_date' => $certificate->getIssueDate()->format(\DateTimeInterface::ATOM)
-				];
-			}, $this->certificateManager->listCertificates());
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($certificates)));
-			} else {
-				$output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$table = new Table($output);
-			$table->setHeaders([
-				'File Name',
-				'Common Name',
-				'Organization',
-				'Valid Until',
-				'Issued By'
-			]);
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $outputType = $input->getOption('output');
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $certificates = array_map(function (ICertificate $certificate) {
+                return [
+                    'name' => $certificate->getName(),
+                    'common_name' => $certificate->getCommonName(),
+                    'organization' => $certificate->getOrganization(),
+                    'expire' => $certificate->getExpireDate()->format(\DateTimeInterface::ATOM),
+                    'issuer' => $certificate->getIssuerName(),
+                    'issuer_organization' => $certificate->getIssuerOrganization(),
+                    'issue_date' => $certificate->getIssueDate()->format(\DateTimeInterface::ATOM)
+                ];
+            }, $this->certificateManager->listCertificates());
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($certificates)));
+            } else {
+                $output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $table = new Table($output);
+            $table->setHeaders([
+                'File Name',
+                'Common Name',
+                'Organization',
+                'Valid Until',
+                'Issued By'
+            ]);
 
-			$rows = array_map(function (ICertificate $certificate) {
-				return [
-					$certificate->getName(),
-					$certificate->getCommonName(),
-					$certificate->getOrganization(),
-					$this->l->l('date', $certificate->getExpireDate()),
-					$certificate->getIssuerName()
-				];
-			}, $this->certificateManager->listCertificates());
-			$table->setRows($rows);
-			$table->render();
-		}
-		return 0;
-	}
+            $rows = array_map(function (ICertificate $certificate) {
+                return [
+                    $certificate->getName(),
+                    $certificate->getCommonName(),
+                    $certificate->getOrganization(),
+                    $this->l->l('date', $certificate->getExpireDate()),
+                    $certificate->getIssuerName()
+                ];
+            }, $this->certificateManager->listCertificates());
+            $table->setRows($rows);
+            $table->render();
+        }
+        return 0;
+    }
 }

core/Command/Encryption/SetDefaultModule.php

Spacing +3 added lines, -3 removed lines

@@ -76,11 +76,11 @@
 		$moduleId = $input->getArgument('module');
 
 		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
+			$output->writeln('"'.$moduleId.'"" is already the default module');
 		} elseif ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+			$output->writeln('<info>Set default module to "'.$moduleId.'"</info>');
 		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+			$output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>');
 			return 1;
 		}
 		return 0;

Indentation +41 added lines, -41 removed lines

@@ -15,45 +15,45 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class SetDefaultModule extends Command {
-	public function __construct(
-		protected IManager $encryptionManager,
-		protected IConfig $config,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure() {
-		parent::configure();
-
-		$this
-			->setName('encryption:set-default-module')
-			->setDescription('Set the encryption default module')
-			->addArgument(
-				'module',
-				InputArgument::REQUIRED,
-				'ID of the encryption module that should be used'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
-		if ($isMaintenanceModeEnabled) {
-			$output->writeln('Maintenance mode must be disabled when setting default module,');
-			$output->writeln('in order to load the relevant encryption modules correctly.');
-			return 1;
-		}
-
-		$moduleId = $input->getArgument('module');
-
-		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
-			$output->writeln('"' . $moduleId . '"" is already the default module');
-		} elseif ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
-		} else {
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
-			return 1;
-		}
-		return 0;
-	}
+    public function __construct(
+        protected IManager $encryptionManager,
+        protected IConfig $config,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure() {
+        parent::configure();
+
+        $this
+            ->setName('encryption:set-default-module')
+            ->setDescription('Set the encryption default module')
+            ->addArgument(
+                'module',
+                InputArgument::REQUIRED,
+                'ID of the encryption module that should be used'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $isMaintenanceModeEnabled = $this->config->getSystemValue('maintenance', false);
+        if ($isMaintenanceModeEnabled) {
+            $output->writeln('Maintenance mode must be disabled when setting default module,');
+            $output->writeln('in order to load the relevant encryption modules correctly.');
+            return 1;
+        }
+
+        $moduleId = $input->getArgument('module');
+
+        if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
+            $output->writeln('"' . $moduleId . '"" is already the default module');
+        } elseif ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
+            $output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
+        } else {
+            $output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
+            return 1;
+        }
+        return 0;
+    }
 }

core/Command/Db/ConvertFilecacheBigInt.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
 					$column->setType(Type::getType(Types::BIGINT));
 					$column->setOptions(['length' => 20]);
 
-					$updates[] = '* ' . $tableName . '.' . $columnName;
+					$updates[] = '* '.$tableName.'.'.$columnName;
 				}
 			}
 		}

Indentation +86 added lines, -86 removed lines

@@ -18,90 +18,90 @@
 use Symfony\Component\Console\Question\ConfirmationQuestion;
 
 class ConvertFilecacheBigInt extends Command {
-	public function __construct(
-		private Connection $connection,
-	) {
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('db:convert-filecache-bigint')
-			->setDescription('Convert the ID columns of the filecache to BigInt');
-	}
-
-	/**
-	 * @return array<string,string[]>
-	 */
-	public static function getColumnsByTable(): array {
-		return [
-			'activity' => ['activity_id', 'object_id'],
-			'activity_mq' => ['mail_id'],
-			'authtoken' => ['id'],
-			'bruteforce_attempts' => ['id'],
-			'federated_reshares' => ['share_id'],
-			'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
-			'filecache_extended' => ['fileid'],
-			'files_trash' => ['auto_id'],
-			'file_locks' => ['id'],
-			'file_metadata' => ['id'],
-			'jobs' => ['id'],
-			'mimetypes' => ['id'],
-			'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
-			'share_external' => ['id', 'parent'],
-			'storages' => ['numeric_id'],
-		];
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		$schema = new SchemaWrapper($this->connection);
-		$isSqlite = $this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_SQLITE;
-		$updates = [];
-
-		$tables = static::getColumnsByTable();
-		foreach ($tables as $tableName => $columns) {
-			if (!$schema->hasTable($tableName)) {
-				continue;
-			}
-
-			$table = $schema->getTable($tableName);
-
-			foreach ($columns as $columnName) {
-				$column = $table->getColumn($columnName);
-				$isAutoIncrement = $column->getAutoincrement();
-				$isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
-				if ($column->getType()->getName() !== Types::BIGINT && !$isAutoIncrementOnSqlite) {
-					$column->setType(Type::getType(Types::BIGINT));
-					$column->setOptions(['length' => 20]);
-
-					$updates[] = '* ' . $tableName . '.' . $columnName;
-				}
-			}
-		}
-
-		if (empty($updates)) {
-			$output->writeln('<info>All tables already up to date!</info>');
-			return 0;
-		}
-
-		$output->writeln('<comment>Following columns will be updated:</comment>');
-		$output->writeln('');
-		$output->writeln($updates);
-		$output->writeln('');
-		$output->writeln('<comment>This can take up to hours, depending on the number of files in your instance!</comment>');
-
-		if ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-			$question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', false);
-
-			if (!$helper->ask($input, $output, $question)) {
-				return 1;
-			}
-		}
-
-		$this->connection->migrateToSchema($schema->getWrappedSchema());
-
-		return 0;
-	}
+    public function __construct(
+        private Connection $connection,
+    ) {
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('db:convert-filecache-bigint')
+            ->setDescription('Convert the ID columns of the filecache to BigInt');
+    }
+
+    /**
+     * @return array<string,string[]>
+     */
+    public static function getColumnsByTable(): array {
+        return [
+            'activity' => ['activity_id', 'object_id'],
+            'activity_mq' => ['mail_id'],
+            'authtoken' => ['id'],
+            'bruteforce_attempts' => ['id'],
+            'federated_reshares' => ['share_id'],
+            'filecache' => ['fileid', 'storage', 'parent', 'mimetype', 'mimepart', 'mtime', 'storage_mtime'],
+            'filecache_extended' => ['fileid'],
+            'files_trash' => ['auto_id'],
+            'file_locks' => ['id'],
+            'file_metadata' => ['id'],
+            'jobs' => ['id'],
+            'mimetypes' => ['id'],
+            'mounts' => ['id', 'storage_id', 'root_id', 'mount_id'],
+            'share_external' => ['id', 'parent'],
+            'storages' => ['numeric_id'],
+        ];
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        $schema = new SchemaWrapper($this->connection);
+        $isSqlite = $this->connection->getDatabaseProvider() === IDBConnection::PLATFORM_SQLITE;
+        $updates = [];
+
+        $tables = static::getColumnsByTable();
+        foreach ($tables as $tableName => $columns) {
+            if (!$schema->hasTable($tableName)) {
+                continue;
+            }
+
+            $table = $schema->getTable($tableName);
+
+            foreach ($columns as $columnName) {
+                $column = $table->getColumn($columnName);
+                $isAutoIncrement = $column->getAutoincrement();
+                $isAutoIncrementOnSqlite = $isSqlite && $isAutoIncrement;
+                if ($column->getType()->getName() !== Types::BIGINT && !$isAutoIncrementOnSqlite) {
+                    $column->setType(Type::getType(Types::BIGINT));
+                    $column->setOptions(['length' => 20]);
+
+                    $updates[] = '* ' . $tableName . '.' . $columnName;
+                }
+            }
+        }
+
+        if (empty($updates)) {
+            $output->writeln('<info>All tables already up to date!</info>');
+            return 0;
+        }
+
+        $output->writeln('<comment>Following columns will be updated:</comment>');
+        $output->writeln('');
+        $output->writeln($updates);
+        $output->writeln('');
+        $output->writeln('<comment>This can take up to hours, depending on the number of files in your instance!</comment>');
+
+        if ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+            $question = new ConfirmationQuestion('Continue with the conversion (y/n)? [n] ', false);
+
+            if (!$helper->ask($input, $output, $question)) {
+                return 1;
+            }
+        }
+
+        $this->connection->migrateToSchema($schema->getWrappedSchema());
+
+        return 0;
+    }
 }

core/Migrations/Version16000Date20190212081545.php

Indentation +66 added lines, -66 removed lines

@@ -35,72 +35,72 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version16000Date20190212081545 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 *
-	 * @return ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     *
+     * @return ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable('login_flow_v2');
-		$table->addColumn('id', Types::BIGINT, [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$table->addColumn('timestamp', Types::BIGINT, [
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$table->addColumn('started', Types::SMALLINT, [
-			'notnull' => true,
-			'length' => 1,
-			'unsigned' => true,
-			'default' => 0,
-		]);
-		$table->addColumn('poll_token', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->addColumn('login_token', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->addColumn('public_key', Types::TEXT, [
-			'notnull' => true,
-			'length' => 32768,
-		]);
-		$table->addColumn('private_key', Types::TEXT, [
-			'notnull' => true,
-			'length' => 32768,
-		]);
-		$table->addColumn('client_name', Types::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->addColumn('login_name', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('server', Types::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('app_password', Types::STRING, [
-			'notnull' => false,
-			'length' => 1024,
-		]);
-		$table->setPrimaryKey(['id']);
-		$table->addUniqueIndex(['poll_token'], 'poll_token');
-		$table->addUniqueIndex(['login_token'], 'login_token');
-		$table->addIndex(['timestamp'], 'timestamp');
+        $table = $schema->createTable('login_flow_v2');
+        $table->addColumn('id', Types::BIGINT, [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('timestamp', Types::BIGINT, [
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('started', Types::SMALLINT, [
+            'notnull' => true,
+            'length' => 1,
+            'unsigned' => true,
+            'default' => 0,
+        ]);
+        $table->addColumn('poll_token', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->addColumn('login_token', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->addColumn('public_key', Types::TEXT, [
+            'notnull' => true,
+            'length' => 32768,
+        ]);
+        $table->addColumn('private_key', Types::TEXT, [
+            'notnull' => true,
+            'length' => 32768,
+        ]);
+        $table->addColumn('client_name', Types::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->addColumn('login_name', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('server', Types::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('app_password', Types::STRING, [
+            'notnull' => false,
+            'length' => 1024,
+        ]);
+        $table->setPrimaryKey(['id']);
+        $table->addUniqueIndex(['poll_token'], 'poll_token');
+        $table->addUniqueIndex(['login_token'], 'login_token');
+        $table->addIndex(['timestamp'], 'timestamp');
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

core/Migrations/Version13000Date20170705121758.php

Indentation +54 added lines, -54 removed lines

@@ -30,65 +30,65 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version13000Date20170705121758 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('personal_sections')) {
-			$table = $schema->createTable('personal_sections');
+        if (!$schema->hasTable('personal_sections')) {
+            $table = $schema->createTable('personal_sections');
 
-			$table->addColumn('id', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('priority', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 6,
-				'default' => 0,
-			]);
+            $table->addColumn('id', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('priority', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 6,
+                'default' => 0,
+            ]);
 
-			$table->setPrimaryKey(['id'], 'personal_sections_id_index');
-			$table->addUniqueIndex(['class'], 'personal_sections_class');
-		}
+            $table->setPrimaryKey(['id'], 'personal_sections_id_index');
+            $table->addUniqueIndex(['class'], 'personal_sections_class');
+        }
 
-		if (!$schema->hasTable('personal_settings')) {
-			$table = $schema->createTable('personal_settings');
+        if (!$schema->hasTable('personal_settings')) {
+            $table = $schema->createTable('personal_settings');
 
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 20,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('section', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-			]);
-			$table->addColumn('priority', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 6,
-				'default' => 0,
-			]);
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 20,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('section', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+            ]);
+            $table->addColumn('priority', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 6,
+                'default' => 0,
+            ]);
 
-			$table->setPrimaryKey(['id'], 'personal_settings_id_index');
-			$table->addUniqueIndex(['class'], 'personal_settings_class');
-			$table->addIndex(['section'], 'personal_settings_section');
-		}
+            $table->setPrimaryKey(['id'], 'personal_settings_id_index');
+            $table->addUniqueIndex(['class'], 'personal_settings_class');
+            $table->addIndex(['section'], 'personal_settings_section');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 }

apps/dav/lib/Migration/Version1006Date20180619154313.php

Indentation +53 added lines, -53 removed lines

@@ -35,61 +35,61 @@
  */
 class Version1006Date20180619154313 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 * @since 13.0.0
-	 */
-	public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     * @since 13.0.0
+     */
+    public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('calendar_invitations')) {
-			$table = $schema->createTable('calendar_invitations');
+        if (!$schema->hasTable('calendar_invitations')) {
+            $table = $schema->createTable('calendar_invitations');
 
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('uid', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('recurrenceid', Types::STRING, [
-				'notnull' => false,
-				'length' => 255,
-			]);
-			$table->addColumn('attendee', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('organizer', Types::STRING, [
-				'notnull' => true,
-				'length' => 255,
-			]);
-			$table->addColumn('sequence', Types::BIGINT, [
-				'notnull' => false,
-				'length' => 11,
-				'unsigned' => true,
-			]);
-			$table->addColumn('token', Types::STRING, [
-				'notnull' => true,
-				'length' => 60,
-			]);
-			$table->addColumn('expiration', Types::BIGINT, [
-				'notnull' => true,
-				'length' => 11,
-				'unsigned' => true,
-			]);
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('uid', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('recurrenceid', Types::STRING, [
+                'notnull' => false,
+                'length' => 255,
+            ]);
+            $table->addColumn('attendee', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('organizer', Types::STRING, [
+                'notnull' => true,
+                'length' => 255,
+            ]);
+            $table->addColumn('sequence', Types::BIGINT, [
+                'notnull' => false,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('token', Types::STRING, [
+                'notnull' => true,
+                'length' => 60,
+            ]);
+            $table->addColumn('expiration', Types::BIGINT, [
+                'notnull' => true,
+                'length' => 11,
+                'unsigned' => true,
+            ]);
 
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['token'], 'calendar_invitation_tokens');
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['token'], 'calendar_invitation_tokens');
 
-			return $schema;
-		}
-	}
+            return $schema;
+        }
+    }
 }