nextcloud / server

apps/user_ldap/templates/part.wizardcontrols.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <div class="ldapWizardControls">
-	<span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
+	<span class="ldap_saving hidden"><?php p($l->t('Saving')); ?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
 	<span class="ldap_config_state_indicator"></span> <span class="ldap_config_state_indicator_sign"></span>
 	<button class="ldap_action_back invisible" name="ldap_action_back"
 			type="button">
-		<?php p($l->t('Back'));?>
+		<?php p($l->t('Back')); ?>
 	</button>
 	<button class="ldap_action_continue primary" name="ldap_action_continue" type="button">
-		<?php p($l->t('Continue'));?>
+		<?php p($l->t('Continue')); ?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
 		target="_blank" rel="noreferrer noopener">
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
 			style="height:1.75ex" />
-		<span class="ldap_grey"><?php p($l->t('Help'));?></span>
+		<span class="ldap_grey"><?php p($l->t('Help')); ?></span>
 	</a>
 </div>

lib/public/Support/CrashReport/IReporter.php

Indentation +8 added lines, -8 removed lines

@@ -30,12 +30,12 @@
  */
 interface IReporter {
 
-	/**
-	 * Report an (unhandled) exception
-	 *
-	 * @since 13.0.0
-	 * @param Exception|Throwable $exception
-	 * @param array $context
-	 */
-	public function report($exception, array $context = []);
+    /**
+     * Report an (unhandled) exception
+     *
+     * @since 13.0.0
+     * @param Exception|Throwable $exception
+     * @param array $context
+     */
+    public function report($exception, array $context = []);
 }

apps/files/lib/Service/TagService.php

Spacing +1 added lines, -1 removed lines

@@ -122,7 +122,7 @@
 		}
 
 		$eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
-		$this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
+		$this->dispatcher->dispatch(self::class.'::'.$eventName, new GenericEvent(null, [
 			'userId' => $user->getUID(),
 			'fileId' => $fileId,
 			'path' => $path,

Indentation +97 added lines, -97 removed lines

@@ -38,110 +38,110 @@
  */
 class TagService {
 
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IManager */
-	private $activityManager;
-	/** @var ITags */
-	private $tagger;
-	/** @var Folder */
-	private $homeFolder;
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
+    /** @var IUserSession */
+    private $userSession;
+    /** @var IManager */
+    private $activityManager;
+    /** @var ITags */
+    private $tagger;
+    /** @var Folder */
+    private $homeFolder;
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
 
-	/**
-	 * @param IUserSession $userSession
-	 * @param IManager $activityManager
-	 * @param ITags $tagger
-	 * @param Folder $homeFolder
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(
-		IUserSession $userSession,
-		IManager $activityManager,
-		ITags $tagger,
-		Folder $homeFolder,
-		EventDispatcherInterface $dispatcher
-	) {
-		$this->userSession = $userSession;
-		$this->activityManager = $activityManager;
-		$this->tagger = $tagger;
-		$this->homeFolder = $homeFolder;
-		$this->dispatcher = $dispatcher;
-	}
+    /**
+     * @param IUserSession $userSession
+     * @param IManager $activityManager
+     * @param ITags $tagger
+     * @param Folder $homeFolder
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(
+        IUserSession $userSession,
+        IManager $activityManager,
+        ITags $tagger,
+        Folder $homeFolder,
+        EventDispatcherInterface $dispatcher
+    ) {
+        $this->userSession = $userSession;
+        $this->activityManager = $activityManager;
+        $this->tagger = $tagger;
+        $this->homeFolder = $homeFolder;
+        $this->dispatcher = $dispatcher;
+    }
 
-	/**
-	 * Updates the tags of the specified file path.
-	 * The passed tags are absolute, which means they will
-	 * replace the actual tag selection.
-	 *
-	 * @param string $path path
-	 * @param array  $tags array of tags
-	 * @return array list of tags
-	 * @throws \OCP\Files\NotFoundException if the file does not exist
-	 */
-	public function updateFileTags($path, $tags) {
-		$fileId = $this->homeFolder->get($path)->getId();
+    /**
+     * Updates the tags of the specified file path.
+     * The passed tags are absolute, which means they will
+     * replace the actual tag selection.
+     *
+     * @param string $path path
+     * @param array  $tags array of tags
+     * @return array list of tags
+     * @throws \OCP\Files\NotFoundException if the file does not exist
+     */
+    public function updateFileTags($path, $tags) {
+        $fileId = $this->homeFolder->get($path)->getId();
 
-		$currentTags = $this->tagger->getTagsForObjects([$fileId]);
+        $currentTags = $this->tagger->getTagsForObjects([$fileId]);
 
-		if (!empty($currentTags)) {
-			$currentTags = current($currentTags);
-		}
+        if (!empty($currentTags)) {
+            $currentTags = current($currentTags);
+        }
 
-		$newTags = array_diff($tags, $currentTags);
-		foreach ($newTags as $tag) {
-			if ($tag === ITags::TAG_FAVORITE) {
-				$this->addActivity(true, $fileId, $path);
-			}
-			$this->tagger->tagAs($fileId, $tag);
-		}
-		$deletedTags = array_diff($currentTags, $tags);
-		foreach ($deletedTags as $tag) {
-			if ($tag === ITags::TAG_FAVORITE) {
-				$this->addActivity(false, $fileId, $path);
-			}
-			$this->tagger->unTag($fileId, $tag);
-		}
+        $newTags = array_diff($tags, $currentTags);
+        foreach ($newTags as $tag) {
+            if ($tag === ITags::TAG_FAVORITE) {
+                $this->addActivity(true, $fileId, $path);
+            }
+            $this->tagger->tagAs($fileId, $tag);
+        }
+        $deletedTags = array_diff($currentTags, $tags);
+        foreach ($deletedTags as $tag) {
+            if ($tag === ITags::TAG_FAVORITE) {
+                $this->addActivity(false, $fileId, $path);
+            }
+            $this->tagger->unTag($fileId, $tag);
+        }
 
-		// TODO: re-read from tagger to make sure the
-		// list is up to date, in case of concurrent changes ?
-		return $tags;
-	}
+        // TODO: re-read from tagger to make sure the
+        // list is up to date, in case of concurrent changes ?
+        return $tags;
+    }
 
-	/**
-	 * @param bool $addToFavorite
-	 * @param int $fileId
-	 * @param string $path
-	 */
-	protected function addActivity($addToFavorite, $fileId, $path) {
-		$user = $this->userSession->getUser();
-		if (!$user instanceof IUser) {
-			return;
-		}
+    /**
+     * @param bool $addToFavorite
+     * @param int $fileId
+     * @param string $path
+     */
+    protected function addActivity($addToFavorite, $fileId, $path) {
+        $user = $this->userSession->getUser();
+        if (!$user instanceof IUser) {
+            return;
+        }
 
-		$eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
-		$this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
-			'userId' => $user->getUID(),
-			'fileId' => $fileId,
-			'path' => $path,
-		]));
+        $eventName = $addToFavorite ? 'addFavorite' : 'removeFavorite';
+        $this->dispatcher->dispatch(self::class . '::' . $eventName, new GenericEvent(null, [
+            'userId' => $user->getUID(),
+            'fileId' => $fileId,
+            'path' => $path,
+        ]));
 
-		$event = $this->activityManager->generateEvent();
-		try {
-			$event->setApp('files')
-				->setObject('files', $fileId, $path)
-				->setType('favorite')
-				->setAuthor($user->getUID())
-				->setAffectedUser($user->getUID())
-				->setTimestamp(time())
-				->setSubject(
-					$addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
-					['id' => $fileId, 'path' => $path]
-				);
-			$this->activityManager->publish($event);
-		} catch (\InvalidArgumentException $e) {
-		} catch (\BadMethodCallException $e) {
-		}
-	}
+        $event = $this->activityManager->generateEvent();
+        try {
+            $event->setApp('files')
+                ->setObject('files', $fileId, $path)
+                ->setType('favorite')
+                ->setAuthor($user->getUID())
+                ->setAffectedUser($user->getUID())
+                ->setTimestamp(time())
+                ->setSubject(
+                    $addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
+                    ['id' => $fileId, 'path' => $path]
+                );
+            $this->activityManager->publish($event);
+        } catch (\InvalidArgumentException $e) {
+        } catch (\BadMethodCallException $e) {
+        }
+    }
 }

lib/public/Federation/ICloudId.php

Indentation +28 added lines, -28 removed lines

@@ -30,35 +30,35 @@
  * @since 12.0.0
  */
 interface ICloudId {
-	/**
-	 * The remote cloud id
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getId(): string;
+    /**
+     * The remote cloud id
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getId(): string;
 
-	/**
-	 * Get a clean representation of the cloud id for display
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getDisplayId(): string;
+    /**
+     * Get a clean representation of the cloud id for display
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getDisplayId(): string;
 
-	/**
-	 * The username on the remote server
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getUser(): string;
+    /**
+     * The username on the remote server
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getUser(): string;
 
-	/**
-	 * The base address of the remote server
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getRemote(): string;
+    /**
+     * The base address of the remote server
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getRemote(): string;
 }

lib/public/Http/Client/IClientService.php

Indentation +5 added lines, -5 removed lines

@@ -31,9 +31,9 @@
  * @since 8.1.0
  */
 interface IClientService {
-	/**
-	 * @return IClient
-	 * @since 8.1.0
-	 */
-	public function newClient(): IClient;
+    /**
+     * @return IClient
+     * @since 8.1.0
+     */
+    public function newClient(): IClient;
 }

lib/public/Http/Client/IResponse.php

Indentation +21 added lines, -21 removed lines

@@ -32,28 +32,28 @@
  * @since 8.1.0
  */
 interface IResponse {
-	/**
-	 * @return string|resource
-	 * @since 8.1.0
-	 */
-	public function getBody();
+    /**
+     * @return string|resource
+     * @since 8.1.0
+     */
+    public function getBody();
 
-	/**
-	 * @return int
-	 * @since 8.1.0
-	 */
-	public function getStatusCode(): int;
+    /**
+     * @return int
+     * @since 8.1.0
+     */
+    public function getStatusCode(): int;
 
-	/**
-	 * @param string $key
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getHeader(string $key): string;
+    /**
+     * @param string $key
+     * @return string
+     * @since 8.1.0
+     */
+    public function getHeader(string $key): string;
 
-	/**
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getHeaders(): array;
+    /**
+     * @return array
+     * @since 8.1.0
+     */
+    public function getHeaders(): array;
 }

lib/public/Security/IHasher.php

Indentation +18 added lines, -18 removed lines

@@ -45,23 +45,23 @@
  * @since 8.0.0
  */
 interface IHasher {
-	/**
-	 * Hashes a message using PHP's `password_hash` functionality.
-	 * Please note that the size of the returned string is not guaranteed
-	 * and can be up to 255 characters.
-	 *
-	 * @param string $message Message to generate hash from
-	 * @return string Hash of the message with appended version parameter
-	 * @since 8.0.0
-	 */
-	public function hash(string $message): string;
+    /**
+     * Hashes a message using PHP's `password_hash` functionality.
+     * Please note that the size of the returned string is not guaranteed
+     * and can be up to 255 characters.
+     *
+     * @param string $message Message to generate hash from
+     * @return string Hash of the message with appended version parameter
+     * @since 8.0.0
+     */
+    public function hash(string $message): string;
 
-	/**
-	 * @param string $message Message to verify
-	 * @param string $hash Assumed hash of the message
-	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
-	 * @return bool Whether $hash is a valid hash of $message
-	 * @since 8.0.0
-	 */
-	public function verify(string $message, string $hash, &$newHash = null): bool ;
+    /**
+     * @param string $message Message to verify
+     * @param string $hash Assumed hash of the message
+     * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+     * @return bool Whether $hash is a valid hash of $message
+     * @since 8.0.0
+     */
+    public function verify(string $message, string $hash, &$newHash = null): bool ;
 }

Spacing +1 added lines, -1 removed lines

@@ -63,5 +63,5 @@
 	 * @return bool Whether $hash is a valid hash of $message
 	 * @since 8.0.0
 	 */
-	public function verify(string $message, string $hash, &$newHash = null): bool ;
+	public function verify(string $message, string $hash, &$newHash = null): bool;
 }

core/Migrations/Version13000Date20170814074715.php

Indentation +41 added lines, -41 removed lines

@@ -29,50 +29,50 @@
 
 class Version13000Date20170814074715 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 
-	/**
-	 * @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('accounts')) {
-			$table = $schema->createTable('accounts');
-			$table->addColumn('uid', 'string', [
-				'notnull' => true,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->addColumn('data', 'text', [
-				'notnull' => true,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['uid']);
-		}
+        if (!$schema->hasTable('accounts')) {
+            $table = $schema->createTable('accounts');
+            $table->addColumn('uid', 'string', [
+                'notnull' => true,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->addColumn('data', 'text', [
+                'notnull' => true,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['uid']);
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
-	}
+    /**
+     * @param IOutput $output
+     * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @since 13.0.0
+     */
+    public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+    }
 }

apps/twofactor_backupcodes/lib/Migration/Version1002Date20170607113030.php

Indentation +62 added lines, -62 removed lines

@@ -31,75 +31,75 @@
 
 class Version1002Date20170607113030 extends SimpleMigrationStep {
 
-	/** @var IDBConnection */
-	protected $connection;
+    /** @var IDBConnection */
+    protected $connection;
 
-	/**
-	 * @param IDBConnection $connection
-	 */
-	public function __construct(IDBConnection $connection) {
-		$this->connection = $connection;
-	}
+    /**
+     * @param IDBConnection $connection
+     */
+    public function __construct(IDBConnection $connection) {
+        $this->connection = $connection;
+    }
 
-	/**
-	 * @param IOutput $output
-	 * @param \Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @since 13.0.0
-	 */
-	public function preSchemaChange(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
+     * @since 13.0.0
+     */
+    public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('twofactor_backup_codes')) {
-			// Legacy table does not exist
-			return;
-		}
+        if (!$schema->hasTable('twofactor_backup_codes')) {
+            // Legacy table does not exist
+            return;
+        }
 
-		$insert = $this->connection->getQueryBuilder();
-		$insert->insert('twofactor_backupcodes')
-			->values([
-				// Inserting with id might fail: 'id' => $insert->createParameter('id'),
-				'user_id' => $insert->createParameter('user_id'),
-				'code' => $insert->createParameter('code'),
-				'used' => $insert->createParameter('used'),
-			]);
+        $insert = $this->connection->getQueryBuilder();
+        $insert->insert('twofactor_backupcodes')
+            ->values([
+                // Inserting with id might fail: 'id' => $insert->createParameter('id'),
+                'user_id' => $insert->createParameter('user_id'),
+                'code' => $insert->createParameter('code'),
+                'used' => $insert->createParameter('used'),
+            ]);
 
-		$query = $this->connection->getQueryBuilder();
-		$query->select('*')
-			->from('twofactor_backup_codes')
-			->orderBy('id', 'ASC');
-		$result = $query->execute();
+        $query = $this->connection->getQueryBuilder();
+        $query->select('*')
+            ->from('twofactor_backup_codes')
+            ->orderBy('id', 'ASC');
+        $result = $query->execute();
 
-		$output->startProgress();
-		while ($row = $result->fetch()) {
-			$output->advance();
+        $output->startProgress();
+        while ($row = $result->fetch()) {
+            $output->advance();
 
-			$insert
-				// Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
-				->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
-				->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
-				->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
-				->execute();
-		}
-		$output->finishProgress();
-	}
+            $insert
+                // Inserting with id might fail: ->setParameter('id', $row['id'], IQueryBuilder::PARAM_INT)
+                ->setParameter('user_id', $row['user_id'], IQueryBuilder::PARAM_STR)
+                ->setParameter('code', $row['code'], IQueryBuilder::PARAM_STR)
+                ->setParameter('used', $row['used'], IQueryBuilder::PARAM_INT)
+                ->execute();
+        }
+        $output->finishProgress();
+    }
 
-	/**
-	 * @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('twofactor_backup_codes')) {
-			$schema->dropTable('twofactor_backup_codes');
-			return $schema;
-		}
-		return null;
-	}
+        if ($schema->hasTable('twofactor_backup_codes')) {
+            $schema->dropTable('twofactor_backup_codes');
+            return $schema;
+        }
+        return null;
+    }
 }