nextcloud / server

lib/private/DB/ConnectionFactory.php

Spacing +3 added lines, -3 removed lines

@@ -140,7 +140,7 @@ 
 				if ($host === '') {
 					$additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name
 				} else {
-					$additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName;
+					$additionalConnectionParams['dbname'] = '//'.$host.(!empty($port) ? ":{$port}" : "").'/'.$dbName;
 				}
 				unset($additionalConnectionParams['host']);
 				break;
@@ -195,8 +195,8 @@ 
 		$name = $this->config->getValue('dbname', self::DEFAULT_DBNAME);
 
 		if ($this->normalizeType($type) === 'sqlite3') {
-			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
-			$connectionParams['path'] = $dataDir . '/' . $name . '.db';
+			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT.'/data');
+			$connectionParams['path'] = $dataDir.'/'.$name.'.db';
 		} else {
 			$host = $this->config->getValue('dbhost', '');
 			$connectionParams = array_merge($connectionParams, $this->splitHostFromPortAndSocket($host));

Indentation +194 added lines, -194 removed lines

@@ -40,219 +40,219 @@
  * Takes care of creating and configuring Doctrine connections.
  */
 class ConnectionFactory {
-	/** @var string default database name */
-	public const DEFAULT_DBNAME = 'owncloud';
+    /** @var string default database name */
+    public const DEFAULT_DBNAME = 'owncloud';
 
-	/** @var string default database table prefix */
-	public const DEFAULT_DBTABLEPREFIX = 'oc_';
+    /** @var string default database table prefix */
+    public const DEFAULT_DBTABLEPREFIX = 'oc_';
 
-	/**
-	 * @var array
-	 *
-	 * Array mapping DBMS type to default connection parameters passed to
-	 * \Doctrine\DBAL\DriverManager::getConnection().
-	 */
-	protected $defaultConnectionParams = [
-		'mysql' => [
-			'adapter' => AdapterMySQL::class,
-			'charset' => 'UTF8',
-			'driver' => 'pdo_mysql',
-			'wrapperClass' => Connection::class,
-		],
-		'oci' => [
-			'adapter' => AdapterOCI8::class,
-			'charset' => 'AL32UTF8',
-			'driver' => 'oci8',
-			'wrapperClass' => OracleConnection::class,
-		],
-		'pgsql' => [
-			'adapter' => AdapterPgSql::class,
-			'driver' => 'pdo_pgsql',
-			'wrapperClass' => Connection::class,
-		],
-		'sqlite3' => [
-			'adapter' => AdapterSqlite::class,
-			'driver' => 'pdo_sqlite',
-			'wrapperClass' => Connection::class,
-		],
-	];
+    /**
+     * @var array
+     *
+     * Array mapping DBMS type to default connection parameters passed to
+     * \Doctrine\DBAL\DriverManager::getConnection().
+     */
+    protected $defaultConnectionParams = [
+        'mysql' => [
+            'adapter' => AdapterMySQL::class,
+            'charset' => 'UTF8',
+            'driver' => 'pdo_mysql',
+            'wrapperClass' => Connection::class,
+        ],
+        'oci' => [
+            'adapter' => AdapterOCI8::class,
+            'charset' => 'AL32UTF8',
+            'driver' => 'oci8',
+            'wrapperClass' => OracleConnection::class,
+        ],
+        'pgsql' => [
+            'adapter' => AdapterPgSql::class,
+            'driver' => 'pdo_pgsql',
+            'wrapperClass' => Connection::class,
+        ],
+        'sqlite3' => [
+            'adapter' => AdapterSqlite::class,
+            'driver' => 'pdo_sqlite',
+            'wrapperClass' => Connection::class,
+        ],
+    ];
 
-	/** @var SystemConfig */
-	private $config;
+    /** @var SystemConfig */
+    private $config;
 
-	/**
-	 * ConnectionFactory constructor.
-	 *
-	 * @param SystemConfig $systemConfig
-	 */
-	public function __construct(SystemConfig $systemConfig) {
-		$this->config = $systemConfig;
-		if ($this->config->getValue('mysql.utf8mb4', false)) {
-			$this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
-		}
-	}
+    /**
+     * ConnectionFactory constructor.
+     *
+     * @param SystemConfig $systemConfig
+     */
+    public function __construct(SystemConfig $systemConfig) {
+        $this->config = $systemConfig;
+        if ($this->config->getValue('mysql.utf8mb4', false)) {
+            $this->defaultConnectionParams['mysql']['charset'] = 'utf8mb4';
+        }
+    }
 
-	/**
-	 * @brief Get default connection parameters for a given DBMS.
-	 * @param string $type DBMS type
-	 * @throws \InvalidArgumentException If $type is invalid
-	 * @return array Default connection parameters.
-	 */
-	public function getDefaultConnectionParams($type) {
-		$normalizedType = $this->normalizeType($type);
-		if (!isset($this->defaultConnectionParams[$normalizedType])) {
-			throw new \InvalidArgumentException("Unsupported type: $type");
-		}
-		$result = $this->defaultConnectionParams[$normalizedType];
-		// \PDO::MYSQL_ATTR_FOUND_ROWS may not be defined, e.g. when the MySQL
-		// driver is missing. In this case, we won't be able to connect anyway.
-		if ($normalizedType === 'mysql' && defined('\PDO::MYSQL_ATTR_FOUND_ROWS')) {
-			$result['driverOptions'] = [
-				\PDO::MYSQL_ATTR_FOUND_ROWS => true,
-			];
-		}
-		return $result;
-	}
+    /**
+     * @brief Get default connection parameters for a given DBMS.
+     * @param string $type DBMS type
+     * @throws \InvalidArgumentException If $type is invalid
+     * @return array Default connection parameters.
+     */
+    public function getDefaultConnectionParams($type) {
+        $normalizedType = $this->normalizeType($type);
+        if (!isset($this->defaultConnectionParams[$normalizedType])) {
+            throw new \InvalidArgumentException("Unsupported type: $type");
+        }
+        $result = $this->defaultConnectionParams[$normalizedType];
+        // \PDO::MYSQL_ATTR_FOUND_ROWS may not be defined, e.g. when the MySQL
+        // driver is missing. In this case, we won't be able to connect anyway.
+        if ($normalizedType === 'mysql' && defined('\PDO::MYSQL_ATTR_FOUND_ROWS')) {
+            $result['driverOptions'] = [
+                \PDO::MYSQL_ATTR_FOUND_ROWS => true,
+            ];
+        }
+        return $result;
+    }
 
-	/**
-	 * @brief Get default connection parameters for a given DBMS.
-	 * @param string $type DBMS type
-	 * @param array $additionalConnectionParams Additional connection parameters
-	 * @return \OC\DB\Connection
-	 */
-	public function getConnection($type, $additionalConnectionParams) {
-		$normalizedType = $this->normalizeType($type);
-		$eventManager = new EventManager();
-		$eventManager->addEventSubscriber(new SetTransactionIsolationLevel());
-		switch ($normalizedType) {
-			case 'mysql':
-				$eventManager->addEventSubscriber(
-					new SQLSessionInit("SET SESSION AUTOCOMMIT=1"));
-				break;
-			case 'oci':
-				$eventManager->addEventSubscriber(new OracleSessionInit);
-				// the driverOptions are unused in dbal and need to be mapped to the parameters
-				if (isset($additionalConnectionParams['driverOptions'])) {
-					$additionalConnectionParams = array_merge($additionalConnectionParams, $additionalConnectionParams['driverOptions']);
-				}
-				$host = $additionalConnectionParams['host'];
-				$port = isset($additionalConnectionParams['port']) ? $additionalConnectionParams['port'] : null;
-				$dbName = $additionalConnectionParams['dbname'];
+    /**
+     * @brief Get default connection parameters for a given DBMS.
+     * @param string $type DBMS type
+     * @param array $additionalConnectionParams Additional connection parameters
+     * @return \OC\DB\Connection
+     */
+    public function getConnection($type, $additionalConnectionParams) {
+        $normalizedType = $this->normalizeType($type);
+        $eventManager = new EventManager();
+        $eventManager->addEventSubscriber(new SetTransactionIsolationLevel());
+        switch ($normalizedType) {
+            case 'mysql':
+                $eventManager->addEventSubscriber(
+                    new SQLSessionInit("SET SESSION AUTOCOMMIT=1"));
+                break;
+            case 'oci':
+                $eventManager->addEventSubscriber(new OracleSessionInit);
+                // the driverOptions are unused in dbal and need to be mapped to the parameters
+                if (isset($additionalConnectionParams['driverOptions'])) {
+                    $additionalConnectionParams = array_merge($additionalConnectionParams, $additionalConnectionParams['driverOptions']);
+                }
+                $host = $additionalConnectionParams['host'];
+                $port = isset($additionalConnectionParams['port']) ? $additionalConnectionParams['port'] : null;
+                $dbName = $additionalConnectionParams['dbname'];
 
-				// we set the connect string as dbname and unset the host to coerce doctrine into using it as connect string
-				if ($host === '') {
-					$additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name
-				} else {
-					$additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName;
-				}
-				unset($additionalConnectionParams['host']);
-				break;
+                // we set the connect string as dbname and unset the host to coerce doctrine into using it as connect string
+                if ($host === '') {
+                    $additionalConnectionParams['dbname'] = $dbName; // use dbname as easy connect name
+                } else {
+                    $additionalConnectionParams['dbname'] = '//' . $host . (!empty($port) ? ":{$port}" : "") . '/' . $dbName;
+                }
+                unset($additionalConnectionParams['host']);
+                break;
 
-			case 'sqlite3':
-				$journalMode = $additionalConnectionParams['sqlite.journal_mode'];
-				$additionalConnectionParams['platform'] = new OCSqlitePlatform();
-				$eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode));
-				break;
-		}
-		/** @var Connection $connection */
-		$connection = DriverManager::getConnection(
-			array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams),
-			new Configuration(),
-			$eventManager
-		);
-		return $connection;
-	}
+            case 'sqlite3':
+                $journalMode = $additionalConnectionParams['sqlite.journal_mode'];
+                $additionalConnectionParams['platform'] = new OCSqlitePlatform();
+                $eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode));
+                break;
+        }
+        /** @var Connection $connection */
+        $connection = DriverManager::getConnection(
+            array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams),
+            new Configuration(),
+            $eventManager
+        );
+        return $connection;
+    }
 
-	/**
-	 * @brief Normalize DBMS type
-	 * @param string $type DBMS type
-	 * @return string Normalized DBMS type
-	 */
-	public function normalizeType($type) {
-		return $type === 'sqlite' ? 'sqlite3' : $type;
-	}
+    /**
+     * @brief Normalize DBMS type
+     * @param string $type DBMS type
+     * @return string Normalized DBMS type
+     */
+    public function normalizeType($type) {
+        return $type === 'sqlite' ? 'sqlite3' : $type;
+    }
 
-	/**
-	 * Checks whether the specified DBMS type is valid.
-	 *
-	 * @param string $type
-	 * @return bool
-	 */
-	public function isValidType($type) {
-		$normalizedType = $this->normalizeType($type);
-		return isset($this->defaultConnectionParams[$normalizedType]);
-	}
+    /**
+     * Checks whether the specified DBMS type is valid.
+     *
+     * @param string $type
+     * @return bool
+     */
+    public function isValidType($type) {
+        $normalizedType = $this->normalizeType($type);
+        return isset($this->defaultConnectionParams[$normalizedType]);
+    }
 
-	/**
-	 * Create the connection parameters for the config
-	 *
-	 * @return array
-	 */
-	public function createConnectionParams() {
-		$type = $this->config->getValue('dbtype', 'sqlite');
+    /**
+     * Create the connection parameters for the config
+     *
+     * @return array
+     */
+    public function createConnectionParams() {
+        $type = $this->config->getValue('dbtype', 'sqlite');
 
-		$connectionParams = [
-			'user' => $this->config->getValue('dbuser', ''),
-			'password' => $this->config->getValue('dbpassword', ''),
-		];
-		$name = $this->config->getValue('dbname', self::DEFAULT_DBNAME);
+        $connectionParams = [
+            'user' => $this->config->getValue('dbuser', ''),
+            'password' => $this->config->getValue('dbpassword', ''),
+        ];
+        $name = $this->config->getValue('dbname', self::DEFAULT_DBNAME);
 
-		if ($this->normalizeType($type) === 'sqlite3') {
-			$dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
-			$connectionParams['path'] = $dataDir . '/' . $name . '.db';
-		} else {
-			$host = $this->config->getValue('dbhost', '');
-			$connectionParams = array_merge($connectionParams, $this->splitHostFromPortAndSocket($host));
-			$connectionParams['dbname'] = $name;
-		}
+        if ($this->normalizeType($type) === 'sqlite3') {
+            $dataDir = $this->config->getValue("datadirectory", \OC::$SERVERROOT . '/data');
+            $connectionParams['path'] = $dataDir . '/' . $name . '.db';
+        } else {
+            $host = $this->config->getValue('dbhost', '');
+            $connectionParams = array_merge($connectionParams, $this->splitHostFromPortAndSocket($host));
+            $connectionParams['dbname'] = $name;
+        }
 
-		$connectionParams['tablePrefix'] = $this->config->getValue('dbtableprefix', self::DEFAULT_DBTABLEPREFIX);
-		$connectionParams['sqlite.journal_mode'] = $this->config->getValue('sqlite.journal_mode', 'WAL');
+        $connectionParams['tablePrefix'] = $this->config->getValue('dbtableprefix', self::DEFAULT_DBTABLEPREFIX);
+        $connectionParams['sqlite.journal_mode'] = $this->config->getValue('sqlite.journal_mode', 'WAL');
 
-		//additional driver options, eg. for mysql ssl
-		$driverOptions = $this->config->getValue('dbdriveroptions', null);
-		if ($driverOptions) {
-			$connectionParams['driverOptions'] = $driverOptions;
-		}
+        //additional driver options, eg. for mysql ssl
+        $driverOptions = $this->config->getValue('dbdriveroptions', null);
+        if ($driverOptions) {
+            $connectionParams['driverOptions'] = $driverOptions;
+        }
 
-		// set default table creation options
-		$connectionParams['defaultTableOptions'] = [
-			'collate' => 'utf8_bin',
-			'tablePrefix' => $connectionParams['tablePrefix']
-		];
+        // set default table creation options
+        $connectionParams['defaultTableOptions'] = [
+            'collate' => 'utf8_bin',
+            'tablePrefix' => $connectionParams['tablePrefix']
+        ];
 
-		if ($this->config->getValue('mysql.utf8mb4', false)) {
-			$connectionParams['defaultTableOptions'] = [
-				'collate' => 'utf8mb4_bin',
-				'charset' => 'utf8mb4',
-				'row_format' => 'compressed',
-				'tablePrefix' => $connectionParams['tablePrefix']
-			];
-		}
+        if ($this->config->getValue('mysql.utf8mb4', false)) {
+            $connectionParams['defaultTableOptions'] = [
+                'collate' => 'utf8mb4_bin',
+                'charset' => 'utf8mb4',
+                'row_format' => 'compressed',
+                'tablePrefix' => $connectionParams['tablePrefix']
+            ];
+        }
 
-		return $connectionParams;
-	}
+        return $connectionParams;
+    }
 
-	/**
-	 * @param string $host
-	 * @return array
-	 */
-	protected function splitHostFromPortAndSocket($host): array {
-		$params = [
-			'host' => $host,
-		];
+    /**
+     * @param string $host
+     * @return array
+     */
+    protected function splitHostFromPortAndSocket($host): array {
+        $params = [
+            'host' => $host,
+        ];
 
-		$matches = [];
-		if (preg_match('/^(.*):([^\]:]+)$/', $host, $matches)) {
-			// Host variable carries a port or socket.
-			$params['host'] = $matches[1];
-			if (is_numeric($matches[2])) {
-				$params['port'] = (int) $matches[2];
-			} else {
-				$params['unix_socket'] = $matches[2];
-			}
-		}
+        $matches = [];
+        if (preg_match('/^(.*):([^\]:]+)$/', $host, $matches)) {
+            // Host variable carries a port or socket.
+            $params['host'] = $matches[1];
+            if (is_numeric($matches[2])) {
+                $params['port'] = (int) $matches[2];
+            } else {
+                $params['unix_socket'] = $matches[2];
+            }
+        }
 
-		return $params;
-	}
+        return $params;
+    }
 }

lib/public/Authentication/TwoFactorAuth/IPersonalProviderSettings.php

Indentation +6 added lines, -6 removed lines

@@ -33,11 +33,11 @@
  */
 interface IPersonalProviderSettings {
 
-	/**
-	 * @return Template
-	 *
-	 * @since 15.0.0
-	 */
-	public function getBody(): Template;
+    /**
+     * @return Template
+     *
+     * @since 15.0.0
+     */
+    public function getBody(): Template;
 
 }

lib/public/Authentication/TwoFactorAuth/IProvidesPersonalSettings.php

Indentation +8 added lines, -8 removed lines

@@ -35,13 +35,13 @@
  */
 interface IProvidesPersonalSettings extends IProvider {
 
-	/**
-	 * @param IUser $user
-	 *
-	 * @return IPersonalProviderSettings
-	 *
-	 * @since 15.0.0
-	 */
-	public function getPersonalSettings(IUser $user): IPersonalProviderSettings;
+    /**
+     * @param IUser $user
+     *
+     * @return IPersonalProviderSettings
+     *
+     * @since 15.0.0
+     */
+    public function getPersonalSettings(IUser $user): IPersonalProviderSettings;
 
 }

lib/public/Calendar/Resource/IManager.php

Indentation +33 added lines, -33 removed lines

@@ -31,41 +31,41 @@
  */
 interface IManager {
 
-	/**
-	 * Registers a resource backend
-	 *
-	 * @param string $backendClass
-	 * @return void
-	 * @since 14.0.0
-	 */
-	public function registerBackend(string $backendClass);
+    /**
+     * Registers a resource backend
+     *
+     * @param string $backendClass
+     * @return void
+     * @since 14.0.0
+     */
+    public function registerBackend(string $backendClass);
 
-	/**
-	 * Unregisters a resource backend
-	 *
-	 * @param string $backendClass
-	 * @return void
-	 * @since 14.0.0
-	 */
-	public function unregisterBackend(string $backendClass);
+    /**
+     * Unregisters a resource backend
+     *
+     * @param string $backendClass
+     * @return void
+     * @since 14.0.0
+     */
+    public function unregisterBackend(string $backendClass);
 
-	/**
-	 * @return IBackend[]
-	 * @since 14.0.0
-	 */
-	public function getBackends():array;
+    /**
+     * @return IBackend[]
+     * @since 14.0.0
+     */
+    public function getBackends():array;
 
-	/**
-	 * @param string $backendId
-	 * @return IBackend|null
-	 * @since 14.0.0
-	 */
-	public function getBackend($backendId);
+    /**
+     * @param string $backendId
+     * @return IBackend|null
+     * @since 14.0.0
+     */
+    public function getBackend($backendId);
 
-	/**
-	 * removes all registered backend instances
-	 * @return void
-	 * @since 14.0.0
-	 */
-	public function clear();
+    /**
+     * removes all registered backend instances
+     * @return void
+     * @since 14.0.0
+     */
+    public function clear();
 }

lib/public/Calendar/Room/IManager.php

Indentation +33 added lines, -33 removed lines

@@ -31,41 +31,41 @@
  */
 interface IManager {
 
-	/**
-	 * Registers a room backend
-	 *
-	 * @param string $backendClass
-	 * @return void
-	 * @since 14.0.0
-	 */
-	public function registerBackend(string $backendClass);
+    /**
+     * Registers a room backend
+     *
+     * @param string $backendClass
+     * @return void
+     * @since 14.0.0
+     */
+    public function registerBackend(string $backendClass);
 
-	/**
-	 * Unregisters a room backend
-	 *
-	 * @param string $backendClass
-	 * @return void
-	 * @since 14.0.0
-	 */
-	public function unregisterBackend(string $backendClass);
+    /**
+     * Unregisters a room backend
+     *
+     * @param string $backendClass
+     * @return void
+     * @since 14.0.0
+     */
+    public function unregisterBackend(string $backendClass);
 
-	/**
-	 * @return IBackend[]
-	 * @since 14.0.0
-	 */
-	public function getBackends():array;
+    /**
+     * @return IBackend[]
+     * @since 14.0.0
+     */
+    public function getBackends():array;
 
-	/**
-	 * @param string $backendId
-	 * @return IBackend|null
-	 * @since 14.0.0
-	 */
-	public function getBackend($backendId);
+    /**
+     * @param string $backendId
+     * @return IBackend|null
+     * @since 14.0.0
+     */
+    public function getBackend($backendId);
 
-	/**
-	 * removes all registered backend instances
-	 * @return void
-	 * @since 14.0.0
-	 */
-	public function clear();
+    /**
+     * removes all registered backend instances
+     * @return void
+     * @since 14.0.0
+     */
+    public function clear();
 }

lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php

Indentation +14 added lines, -14 removed lines

@@ -32,19 +32,19 @@
  */
 class ProviderAlreadyExistsException extends HintException {
 
-	/**
-	 * ProviderAlreadyExistsException constructor.
-	 *
-	 * @since 14.0.0
-	 *
-	 * @param string $newProviderId cloud federation provider ID of the new provider
-	 * @param string $existingProviderName name of cloud federation provider which already use the same ID
-	 */
-	public function __construct($newProviderId, $existingProviderName) {
-		$l = \OC::$server->getL10N('federation');
-		$message = 'ID "' . $newProviderId . '" already used by cloud federation provider "' . $existingProviderName . '"';
-		$hint = $l->t('ID "%1$s" already used by cloud federation provider "%2$s"', [$newProviderId, $existingProviderName]);
-		parent::__construct($message, $hint);
-	}
+    /**
+     * ProviderAlreadyExistsException constructor.
+     *
+     * @since 14.0.0
+     *
+     * @param string $newProviderId cloud federation provider ID of the new provider
+     * @param string $existingProviderName name of cloud federation provider which already use the same ID
+     */
+    public function __construct($newProviderId, $existingProviderName) {
+        $l = \OC::$server->getL10N('federation');
+        $message = 'ID "' . $newProviderId . '" already used by cloud federation provider "' . $existingProviderName . '"';
+        $hint = $l->t('ID "%1$s" already used by cloud federation provider "%2$s"', [$newProviderId, $existingProviderName]);
+        parent::__construct($message, $hint);
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
 	 */
 	public function __construct($newProviderId, $existingProviderName) {
 		$l = \OC::$server->getL10N('federation');
-		$message = 'ID "' . $newProviderId . '" already used by cloud federation provider "' . $existingProviderName . '"';
+		$message = 'ID "'.$newProviderId.'" already used by cloud federation provider "'.$existingProviderName.'"';
 		$hint = $l->t('ID "%1$s" already used by cloud federation provider "%2$s"', [$newProviderId, $existingProviderName]);
 		parent::__construct($message, $hint);
 	}

core/templates/untrustedDomain.php

Spacing +1 added lines, -1 removed lines

@@ -8,6 +8,6 @@
 	</p>
 	<br />
 	<p>
-		<?php print_unescaped($l->t('Further information how to configure this can be found in the %1$sdocumentation%2$s.', ['<a href="' . $_['docUrl'] . '" target="blank">', '</a>'])); ?>
+		<?php print_unescaped($l->t('Further information how to configure this can be found in the %1$sdocumentation%2$s.', ['<a href="'.$_['docUrl'].'" target="blank">', '</a>'])); ?>
 	</p>
 </div>

lib/public/AppFramework/Utility/ITimeFactory.php

Indentation +12 added lines, -12 removed lines

@@ -31,18 +31,18 @@
  */
 interface ITimeFactory {
 
-	/**
-	 * @return int the result of a call to time()
-	 * @since 8.0.0
-	 */
-	public function getTime(): int;
+    /**
+     * @return int the result of a call to time()
+     * @since 8.0.0
+     */
+    public function getTime(): int;
 
-	/**
-	 * @param string $time
-	 * @param \DateTimeZone $timezone
-	 * @return \DateTime
-	 * @since 15.0.0
-	 */
-	public function getDateTime(string $time = 'now', \DateTimeZone $timezone = null): \DateTime;
+    /**
+     * @param string $time
+     * @param \DateTimeZone $timezone
+     * @return \DateTime
+     * @since 15.0.0
+     */
+    public function getDateTime(string $time = 'now', \DateTimeZone $timezone = null): \DateTime;
 
 }

lib/private/AppFramework/Utility/TimeFactory.php

Indentation +16 added lines, -16 removed lines

@@ -34,21 +34,21 @@
 class TimeFactory implements ITimeFactory {
 
 
-	/**
-	 * @return int the result of a call to time()
-	 */
-	public function getTime(): int {
-		return time();
-	}
-
-	/**
-	 * @param string $time
-	 * @param \DateTimeZone $timezone
-	 * @return \DateTime
-	 * @since 15.0.0
-	 */
-	public function getDateTime(string $time = 'now', \DateTimeZone $timezone = null): \DateTime {
-		return new \DateTime($time, $timezone);
-	}
+    /**
+     * @return int the result of a call to time()
+     */
+    public function getTime(): int {
+        return time();
+    }
+
+    /**
+     * @param string $time
+     * @param \DateTimeZone $timezone
+     * @return \DateTime
+     * @since 15.0.0
+     */
+    public function getDateTime(string $time = 'now', \DateTimeZone $timezone = null): \DateTime {
+        return new \DateTime($time, $timezone);
+    }
 
 }