nextcloud / server

core/Migrations/Version23000Date20211203110726.php

Indentation +17 added lines, -17 removed lines

@@ -32,23 +32,23 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version23000Date20211203110726 extends SimpleMigrationStep {
-	private const TABLE_NAME = 'profile_config';
+    private const TABLE_NAME = 'profile_config';
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|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 null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->getTable(self::TABLE_NAME);
-		if ($table->hasIndex('user_id')) {
-			$table->renameIndex('user_id', self::TABLE_NAME . '_user_id_idx');
-			return $schema;
-		}
-		return null;
-	}
+        $table = $schema->getTable(self::TABLE_NAME);
+        if ($table->hasIndex('user_id')) {
+            $table->renameIndex('user_id', self::TABLE_NAME . '_user_id_idx');
+            return $schema;
+        }
+        return null;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 		$table = $schema->getTable(self::TABLE_NAME);
 		if ($table->hasIndex('user_id')) {
-			$table->renameIndex('user_id', self::TABLE_NAME . '_user_id_idx');
+			$table->renameIndex('user_id', self::TABLE_NAME.'_user_id_idx');
 			return $schema;
 		}
 		return null;

apps/dav/lib/CalDAV/Auth/PublicPrincipalPlugin.php

Indentation +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@
  * Defines the public facing principal option
  */
 class PublicPrincipalPlugin extends Plugin {
-	public function getCurrentPrincipal(): ?string {
-		return 'principals/system/public';
-	}
+    public function getCurrentPrincipal(): ?string {
+        return 'principals/system/public';
+    }
 }

apps/dav/lib/CalDAV/Auth/CustomPrincipalPlugin.php

Indentation +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@
  * Set a custom principal uri to allow public requests to its calendar
  */
 class CustomPrincipalPlugin extends Plugin {
-	public function setCurrentPrincipal(?string $currentPrincipal): void {
-		$this->currentPrincipal = $currentPrincipal;
-	}
+    public function setCurrentPrincipal(?string $currentPrincipal): void {
+        $this->currentPrincipal = $currentPrincipal;
+    }
 }

apps/dav/lib/Settings/CalDAVSettings.php

Spacing +1 added lines, -1 removed lines

@@ -85,7 +85,7 @@
 
 	public function getAuthorizedAppConfig(): array {
 		return [
-			'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
+			'dav' => ['/('.implode('|', array_keys(self::defaults)).')/']
 		];
 	}
 }

Indentation +50 added lines, -50 removed lines

@@ -17,62 +17,62 @@
 
 class CalDAVSettings implements IDelegatedSettings {
 
-	private const defaults = [
-		'sendInvitations' => 'yes',
-		'generateBirthdayCalendar' => 'yes',
-		'sendEventReminders' => 'yes',
-		'sendEventRemindersToSharedUsers' => 'yes',
-		'sendEventRemindersPush' => 'yes',
-	];
+    private const defaults = [
+        'sendInvitations' => 'yes',
+        'generateBirthdayCalendar' => 'yes',
+        'sendEventReminders' => 'yes',
+        'sendEventRemindersToSharedUsers' => 'yes',
+        'sendEventRemindersPush' => 'yes',
+    ];
 
-	/**
-	 * CalDAVSettings constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IInitialState $initialState
-	 */
-	public function __construct(
-		private IConfig $config,
-		private IInitialState $initialState,
-		private IURLGenerator $urlGenerator,
-		private IAppManager $appManager,
-	) {
-	}
+    /**
+     * CalDAVSettings constructor.
+     *
+     * @param IConfig $config
+     * @param IInitialState $initialState
+     */
+    public function __construct(
+        private IConfig $config,
+        private IInitialState $initialState,
+        private IURLGenerator $urlGenerator,
+        private IAppManager $appManager,
+    ) {
+    }
 
-	public function getForm(): TemplateResponse {
-		$this->initialState->provideInitialState('userSyncCalendarsDocUrl', $this->urlGenerator->linkToDocs('user-sync-calendars'));
-		foreach (self::defaults as $key => $default) {
-			$value = $this->config->getAppValue(Application::APP_ID, $key, $default);
-			$this->initialState->provideInitialState($key, $value === 'yes');
-		}
+    public function getForm(): TemplateResponse {
+        $this->initialState->provideInitialState('userSyncCalendarsDocUrl', $this->urlGenerator->linkToDocs('user-sync-calendars'));
+        foreach (self::defaults as $key => $default) {
+            $value = $this->config->getAppValue(Application::APP_ID, $key, $default);
+            $this->initialState->provideInitialState($key, $value === 'yes');
+        }
 
-		Util::addScript(Application::APP_ID, 'settings-admin-caldav');
-		Util::addStyle(Application::APP_ID, 'settings-admin-caldav');
-		return new TemplateResponse(Application::APP_ID, 'settings-admin-caldav');
-	}
+        Util::addScript(Application::APP_ID, 'settings-admin-caldav');
+        Util::addStyle(Application::APP_ID, 'settings-admin-caldav');
+        return new TemplateResponse(Application::APP_ID, 'settings-admin-caldav');
+    }
 
-	public function getSection(): ?string {
-		if (!$this->appManager->isBackendRequired(IAppManager::BACKEND_CALDAV)) {
-			return null;
-		}
+    public function getSection(): ?string {
+        if (!$this->appManager->isBackendRequired(IAppManager::BACKEND_CALDAV)) {
+            return null;
+        }
 
-		return 'groupware';
-	}
+        return 'groupware';
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getPriority() {
-		return 10;
-	}
+    /**
+     * @return int
+     */
+    public function getPriority() {
+        return 10;
+    }
 
-	public function getName(): ?string {
-		return null; // Only setting in this section
-	}
+    public function getName(): ?string {
+        return null; // Only setting in this section
+    }
 
-	public function getAuthorizedAppConfig(): array {
-		return [
-			'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
-		];
-	}
+    public function getAuthorizedAppConfig(): array {
+        return [
+            'dav' => ['/(' . implode('|', array_keys(self::defaults)) . ')/']
+        ];
+    }
 }

apps/user_ldap/lib/PagedResults/TLinkId.php

Indentation +14 added lines, -14 removed lines

@@ -27,18 +27,18 @@
 namespace OCA\User_LDAP\PagedResults;
 
 trait TLinkId {
-	public function getLinkId($link) {
-		if (is_object($link)) {
-			return spl_object_id($link);
-		} elseif (is_resource($link)) {
-			return (int)$link;
-		} elseif (is_array($link) && isset($link[0])) {
-			if (is_object($link[0])) {
-				return spl_object_id($link[0]);
-			} elseif (is_resource($link[0])) {
-				return (int)$link[0];
-			}
-		}
-		throw new \RuntimeException('No resource provided');
-	}
+    public function getLinkId($link) {
+        if (is_object($link)) {
+            return spl_object_id($link);
+        } elseif (is_resource($link)) {
+            return (int)$link;
+        } elseif (is_array($link) && isset($link[0])) {
+            if (is_object($link[0])) {
+                return spl_object_id($link[0]);
+            } elseif (is_resource($link[0])) {
+                return (int)$link[0];
+            }
+        }
+        throw new \RuntimeException('No resource provided');
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -31,12 +31,12 @@
 		if (is_object($link)) {
 			return spl_object_id($link);
 		} elseif (is_resource($link)) {
-			return (int)$link;
+			return (int) $link;
 		} elseif (is_array($link) && isset($link[0])) {
 			if (is_object($link[0])) {
 				return spl_object_id($link[0]);
 			} elseif (is_resource($link[0])) {
-				return (int)$link[0];
+				return (int) $link[0];
 			}
 		}
 		throw new \RuntimeException('No resource provided');

apps/workflowengine/lib/Controller/AWorkflowController.php

Spacing +2 added lines, -2 removed lines

@@ -149,7 +149,7 @@ 
 		} catch (\DomainException $e) {
 			throw new OCSForbiddenException($e->getMessage(), $e);
 		} catch (Exception $e) {
-			$this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
+			$this->logger->error('Error when updating flow with id '.$id, ['exception' => $e]);
 			throw new OCSException('An internal error occurred', $e->getCode(), $e);
 		}
 	}
@@ -168,7 +168,7 @@ 
 		} catch (\DomainException $e) {
 			throw new OCSForbiddenException($e->getMessage(), $e);
 		} catch (Exception $e) {
-			$this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
+			$this->logger->error('Error when deleting flow with id '.$id, ['exception' => $e]);
 			throw new OCSException('An internal error occurred', $e->getCode(), $e);
 		}
 	}

Indentation +126 added lines, -126 removed lines

@@ -22,130 +22,130 @@
 
 abstract class AWorkflowController extends OCSController {
 
-	public function __construct(
-		$appName,
-		IRequest $request,
-		protected Manager $manager,
-		private LoggerInterface $logger,
-	) {
-		parent::__construct($appName, $request);
-	}
-
-	/**
-	 * @throws OCSForbiddenException
-	 */
-	abstract protected function getScopeContext(): ScopeContext;
-
-	/**
-	 * Example: curl -u joann -H "OCS-APIREQUEST: true" "http://my.nc.srvr/ocs/v2.php/apps/workflowengine/api/v1/workflows/global?format=json"
-	 *
-	 * @throws OCSForbiddenException
-	 */
-	public function index(): DataResponse {
-		$operationsByClass = $this->manager->getAllOperations($this->getScopeContext());
-
-		foreach ($operationsByClass as &$operations) {
-			foreach ($operations as &$operation) {
-				$operation = $this->manager->formatOperation($operation);
-			}
-		}
-
-		return new DataResponse($operationsByClass);
-	}
-
-	/**
-	 * Example: curl -u joann -H "OCS-APIREQUEST: true" "http://my.nc.srvr/ocs/v2.php/apps/workflowengine/api/v1/workflows/global/OCA\\Workflow_DocToPdf\\Operation?format=json"
-	 *
-	 * @throws OCSForbiddenException
-	 */
-	public function show(string $id): DataResponse {
-		$context = $this->getScopeContext();
-
-		// The ID corresponds to a class name
-		$operations = $this->manager->getOperations($id, $context);
-
-		foreach ($operations as &$operation) {
-			$operation = $this->manager->formatOperation($operation);
-		}
-
-		return new DataResponse($operations);
-	}
-
-	/**
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSException
-	 */
-	#[PasswordConfirmationRequired]
-	public function create(
-		string $class,
-		string $name,
-		array $checks,
-		string $operation,
-		string $entity,
-		array $events,
-	): DataResponse {
-		$context = $this->getScopeContext();
-		try {
-			$operation = $this->manager->addOperation($class, $name, $checks, $operation, $context, $entity, $events);
-			$operation = $this->manager->formatOperation($operation);
-			return new DataResponse($operation);
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (Exception $e) {
-			$this->logger->error('Error when inserting flow', ['exception' => $e]);
-			throw new OCSException('An internal error occurred', $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSException
-	 */
-	#[PasswordConfirmationRequired]
-	public function update(
-		int $id,
-		string $name,
-		array $checks,
-		string $operation,
-		string $entity,
-		array $events,
-	): DataResponse {
-		try {
-			$context = $this->getScopeContext();
-			$operation = $this->manager->updateOperation($id, $name, $checks, $operation, $context, $entity, $events);
-			$operation = $this->manager->formatOperation($operation);
-			return new DataResponse($operation);
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (Exception $e) {
-			$this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
-			throw new OCSException('An internal error occurred', $e->getCode(), $e);
-		}
-	}
-
-	/**
-	 * @throws OCSBadRequestException
-	 * @throws OCSForbiddenException
-	 * @throws OCSException
-	 */
-	#[PasswordConfirmationRequired]
-	public function destroy(int $id): DataResponse {
-		try {
-			$deleted = $this->manager->deleteOperation($id, $this->getScopeContext());
-			return new DataResponse($deleted);
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (Exception $e) {
-			$this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
-			throw new OCSException('An internal error occurred', $e->getCode(), $e);
-		}
-	}
+    public function __construct(
+        $appName,
+        IRequest $request,
+        protected Manager $manager,
+        private LoggerInterface $logger,
+    ) {
+        parent::__construct($appName, $request);
+    }
+
+    /**
+     * @throws OCSForbiddenException
+     */
+    abstract protected function getScopeContext(): ScopeContext;
+
+    /**
+     * Example: curl -u joann -H "OCS-APIREQUEST: true" "http://my.nc.srvr/ocs/v2.php/apps/workflowengine/api/v1/workflows/global?format=json"
+     *
+     * @throws OCSForbiddenException
+     */
+    public function index(): DataResponse {
+        $operationsByClass = $this->manager->getAllOperations($this->getScopeContext());
+
+        foreach ($operationsByClass as &$operations) {
+            foreach ($operations as &$operation) {
+                $operation = $this->manager->formatOperation($operation);
+            }
+        }
+
+        return new DataResponse($operationsByClass);
+    }
+
+    /**
+     * Example: curl -u joann -H "OCS-APIREQUEST: true" "http://my.nc.srvr/ocs/v2.php/apps/workflowengine/api/v1/workflows/global/OCA\\Workflow_DocToPdf\\Operation?format=json"
+     *
+     * @throws OCSForbiddenException
+     */
+    public function show(string $id): DataResponse {
+        $context = $this->getScopeContext();
+
+        // The ID corresponds to a class name
+        $operations = $this->manager->getOperations($id, $context);
+
+        foreach ($operations as &$operation) {
+            $operation = $this->manager->formatOperation($operation);
+        }
+
+        return new DataResponse($operations);
+    }
+
+    /**
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSException
+     */
+    #[PasswordConfirmationRequired]
+    public function create(
+        string $class,
+        string $name,
+        array $checks,
+        string $operation,
+        string $entity,
+        array $events,
+    ): DataResponse {
+        $context = $this->getScopeContext();
+        try {
+            $operation = $this->manager->addOperation($class, $name, $checks, $operation, $context, $entity, $events);
+            $operation = $this->manager->formatOperation($operation);
+            return new DataResponse($operation);
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (Exception $e) {
+            $this->logger->error('Error when inserting flow', ['exception' => $e]);
+            throw new OCSException('An internal error occurred', $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSException
+     */
+    #[PasswordConfirmationRequired]
+    public function update(
+        int $id,
+        string $name,
+        array $checks,
+        string $operation,
+        string $entity,
+        array $events,
+    ): DataResponse {
+        try {
+            $context = $this->getScopeContext();
+            $operation = $this->manager->updateOperation($id, $name, $checks, $operation, $context, $entity, $events);
+            $operation = $this->manager->formatOperation($operation);
+            return new DataResponse($operation);
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (Exception $e) {
+            $this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
+            throw new OCSException('An internal error occurred', $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * @throws OCSBadRequestException
+     * @throws OCSForbiddenException
+     * @throws OCSException
+     */
+    #[PasswordConfirmationRequired]
+    public function destroy(int $id): DataResponse {
+        try {
+            $deleted = $this->manager->deleteOperation($id, $this->getScopeContext());
+            return new DataResponse($deleted);
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (Exception $e) {
+            $this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
+            throw new OCSException('An internal error occurred', $e->getCode(), $e);
+        }
+    }
 }

apps/workflowengine/lib/Migration/Version2000Date20190808074233.php

Indentation +108 added lines, -108 removed lines

@@ -39,117 +39,117 @@
 
 class Version2000Date20190808074233 extends SimpleMigrationStep {
 
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	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
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options) {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		if (!$schema->hasTable('flow_checks')) {
-			$table = $schema->createTable('flow_checks');
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 256,
-				'default' => '',
-			]);
-			$table->addColumn('operator', Types::STRING, [
-				'notnull' => true,
-				'length' => 16,
-				'default' => '',
-			]);
-			$table->addColumn('value', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$table->addColumn('hash', Types::STRING, [
-				'notnull' => true,
-				'length' => 32,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['hash'], 'flow_unique_hash');
-		}
+        if (!$schema->hasTable('flow_checks')) {
+            $table = $schema->createTable('flow_checks');
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 256,
+                'default' => '',
+            ]);
+            $table->addColumn('operator', Types::STRING, [
+                'notnull' => true,
+                'length' => 16,
+                'default' => '',
+            ]);
+            $table->addColumn('value', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $table->addColumn('hash', Types::STRING, [
+                'notnull' => true,
+                'length' => 32,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['hash'], 'flow_unique_hash');
+        }
 
-		if (!$schema->hasTable('flow_operations')) {
-			$table = $schema->createTable('flow_operations');
-			$table->addColumn('id', Types::INTEGER, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('class', Types::STRING, [
-				'notnull' => true,
-				'length' => 256,
-				'default' => '',
-			]);
-			$table->addColumn('name', Types::STRING, [
-				'notnull' => false,
-				'length' => 256,
-				'default' => '',
-			]);
-			$table->addColumn('checks', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$table->addColumn('operation', Types::TEXT, [
-				'notnull' => false,
-			]);
-			$this->ensureEntityColumns($table);
-			$table->setPrimaryKey(['id']);
-		} else {
-			$table = $schema->getTable('flow_operations');
-			$this->ensureEntityColumns($table);
-		}
+        if (!$schema->hasTable('flow_operations')) {
+            $table = $schema->createTable('flow_operations');
+            $table->addColumn('id', Types::INTEGER, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('class', Types::STRING, [
+                'notnull' => true,
+                'length' => 256,
+                'default' => '',
+            ]);
+            $table->addColumn('name', Types::STRING, [
+                'notnull' => false,
+                'length' => 256,
+                'default' => '',
+            ]);
+            $table->addColumn('checks', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $table->addColumn('operation', Types::TEXT, [
+                'notnull' => false,
+            ]);
+            $this->ensureEntityColumns($table);
+            $table->setPrimaryKey(['id']);
+        } else {
+            $table = $schema->getTable('flow_operations');
+            $this->ensureEntityColumns($table);
+        }
 
-		if (!$schema->hasTable('flow_operations_scope')) {
-			$table = $schema->createTable('flow_operations_scope');
-			$table->addColumn('id', Types::BIGINT, [
-				'autoincrement' => true,
-				'notnull' => true,
-				'length' => 4,
-			]);
-			$table->addColumn('operation_id', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('type', Types::INTEGER, [
-				'notnull' => true,
-				'length' => 4,
-				'default' => 0,
-			]);
-			$table->addColumn('value', Types::STRING, [
-				'notnull' => false,
-				'length' => 64,
-				'default' => '',
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['operation_id', 'type', 'value'], 'flow_unique_scope');
-		}
+        if (!$schema->hasTable('flow_operations_scope')) {
+            $table = $schema->createTable('flow_operations_scope');
+            $table->addColumn('id', Types::BIGINT, [
+                'autoincrement' => true,
+                'notnull' => true,
+                'length' => 4,
+            ]);
+            $table->addColumn('operation_id', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('type', Types::INTEGER, [
+                'notnull' => true,
+                'length' => 4,
+                'default' => 0,
+            ]);
+            $table->addColumn('value', Types::STRING, [
+                'notnull' => false,
+                'length' => 64,
+                'default' => '',
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['operation_id', 'type', 'value'], 'flow_unique_scope');
+        }
 
-		return $schema;
-	}
+        return $schema;
+    }
 
-	protected function ensureEntityColumns(Table $table) {
-		if (!$table->hasColumn('entity')) {
-			$table->addColumn('entity', Types::STRING, [
-				'notnull' => true,
-				'length' => 256,
-				'default' => File::class,
-			]);
-		}
-		if (!$table->hasColumn('events')) {
-			$table->addColumn('events', Types::TEXT, [
-				'notnull' => true,
-				'default' => '[]',
-			]);
-		}
-	}
+    protected function ensureEntityColumns(Table $table) {
+        if (!$table->hasColumn('entity')) {
+            $table->addColumn('entity', Types::STRING, [
+                'notnull' => true,
+                'length' => 256,
+                'default' => File::class,
+            ]);
+        }
+        if (!$table->hasColumn('events')) {
+            $table->addColumn('events', Types::TEXT, [
+                'notnull' => true,
+                'default' => '[]',
+            ]);
+        }
+    }
 }

lib/private/Security/TrustedDomainHelper.php

Spacing +3 added lines, -3 removed lines

@@ -70,7 +70,7 @@ 
 		}
 
 		if (isset($parsedUrl['port']) && $parsedUrl['port']) {
-			return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
+			return $this->isTrustedDomain($parsedUrl['host'].':'.$parsedUrl['port']);
 		}
 
 		return $this->isTrustedDomain($parsedUrl['host']);
@@ -106,9 +106,9 @@ 
 			if (gettype($trusted) !== 'string') {
 				break;
 			}
-			$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
+			$regex = '/^'.implode('[-\.a-zA-Z0-9]*', array_map(function($v) {
 				return preg_quote($v, '/');
-			}, explode('*', $trusted))) . '$/i';
+			}, explode('*', $trusted))).'$/i';
 			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
 				return true;
 			}

Indentation +67 added lines, -67 removed lines

@@ -13,79 +13,79 @@
 use OCP\Security\ITrustedDomainHelper;
 
 class TrustedDomainHelper implements ITrustedDomainHelper {
-	public function __construct(
-		private IConfig $config,
-	) {
-	}
+    public function __construct(
+        private IConfig $config,
+    ) {
+    }
 
-	/**
-	 * Strips a potential port from a domain (in format domain:port)
-	 * @return string $host without appended port
-	 */
-	private function getDomainWithoutPort(string $host): string {
-		$pos = strrpos($host, ':');
-		if ($pos !== false) {
-			$port = substr($host, $pos + 1);
-			if (is_numeric($port)) {
-				$host = substr($host, 0, $pos);
-			}
-		}
-		return $host;
-	}
+    /**
+     * Strips a potential port from a domain (in format domain:port)
+     * @return string $host without appended port
+     */
+    private function getDomainWithoutPort(string $host): string {
+        $pos = strrpos($host, ':');
+        if ($pos !== false) {
+            $port = substr($host, $pos + 1);
+            if (is_numeric($port)) {
+                $host = substr($host, 0, $pos);
+            }
+        }
+        return $host;
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isTrustedUrl(string $url): bool {
-		$parsedUrl = parse_url($url);
-		if (empty($parsedUrl['host'])) {
-			return false;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function isTrustedUrl(string $url): bool {
+        $parsedUrl = parse_url($url);
+        if (empty($parsedUrl['host'])) {
+            return false;
+        }
 
-		if (isset($parsedUrl['port']) && $parsedUrl['port']) {
-			return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
-		}
+        if (isset($parsedUrl['port']) && $parsedUrl['port']) {
+            return $this->isTrustedDomain($parsedUrl['host'] . ':' . $parsedUrl['port']);
+        }
 
-		return $this->isTrustedDomain($parsedUrl['host']);
-	}
+        return $this->isTrustedDomain($parsedUrl['host']);
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isTrustedDomain(string $domainWithPort): bool {
-		// overwritehost is always trusted
-		if ($this->config->getSystemValue('overwritehost') !== '') {
-			return true;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function isTrustedDomain(string $domainWithPort): bool {
+        // overwritehost is always trusted
+        if ($this->config->getSystemValue('overwritehost') !== '') {
+            return true;
+        }
 
-		$domain = $this->getDomainWithoutPort($domainWithPort);
+        $domain = $this->getDomainWithoutPort($domainWithPort);
 
-		// Read trusted domains from config
-		$trustedList = $this->config->getSystemValue('trusted_domains', []);
-		if (!is_array($trustedList)) {
-			return false;
-		}
+        // Read trusted domains from config
+        $trustedList = $this->config->getSystemValue('trusted_domains', []);
+        if (!is_array($trustedList)) {
+            return false;
+        }
 
-		// Always allow access from localhost
-		if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
-			return true;
-		}
-		// Reject malformed domains in any case
-		if (str_starts_with($domain, '-') || str_contains($domain, '..')) {
-			return false;
-		}
-		// Match, allowing for * wildcards
-		foreach ($trustedList as $trusted) {
-			if (gettype($trusted) !== 'string') {
-				break;
-			}
-			$regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
-				return preg_quote($v, '/');
-			}, explode('*', $trusted))) . '$/i';
-			if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
-				return true;
-			}
-		}
-		return false;
-	}
+        // Always allow access from localhost
+        if (preg_match(Request::REGEX_LOCALHOST, $domain) === 1) {
+            return true;
+        }
+        // Reject malformed domains in any case
+        if (str_starts_with($domain, '-') || str_contains($domain, '..')) {
+            return false;
+        }
+        // Match, allowing for * wildcards
+        foreach ($trustedList as $trusted) {
+            if (gettype($trusted) !== 'string') {
+                break;
+            }
+            $regex = '/^' . implode('[-\.a-zA-Z0-9]*', array_map(function ($v) {
+                return preg_quote($v, '/');
+            }, explode('*', $trusted))) . '$/i';
+            if (preg_match($regex, $domain) || preg_match($regex, $domainWithPort)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

apps/user_ldap/lib/Migration/Version1130Date20220110154719.php

Indentation +21 added lines, -21 removed lines

@@ -32,25 +32,25 @@
 use OCP\Migration\SimpleMigrationStep;
 
 class Version1130Date20220110154719 extends SimpleMigrationStep {
-	public function getName() {
-		return 'Drop ldap_group_mapping_backup';
-	}
-
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
-
-		if ($schema->hasTable('ldap_group_mapping_backup')) {
-			$schema->dropTable('ldap_group_mapping_backup');
-			return $schema;
-		}
-
-		return null;
-	}
+    public function getName() {
+        return 'Drop ldap_group_mapping_backup';
+    }
+
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ?ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
+
+        if ($schema->hasTable('ldap_group_mapping_backup')) {
+            $schema->dropTable('ldap_group_mapping_backup');
+            return $schema;
+        }
+
+        return null;
+    }
 }