nextcloud / server

lib/public/Security/ICrypto.php

Indentation +25 added lines, -25 removed lines

@@ -37,31 +37,31 @@
  */
 interface ICrypto {
 
-	/**
-	 * @param string $message The message to authenticate
-	 * @param string $password Password to use (defaults to `secret` in config.php)
-	 * @return string Calculated HMAC
-	 * @since 8.0.0
-	 */
-	public function calculateHMAC(string $message, string $password = ''): string;
+    /**
+     * @param string $message The message to authenticate
+     * @param string $password Password to use (defaults to `secret` in config.php)
+     * @return string Calculated HMAC
+     * @since 8.0.0
+     */
+    public function calculateHMAC(string $message, string $password = ''): string;
 
-	/**
-	 * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
-	 * @param string $plaintext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string Authenticated ciphertext
-	 * @since 8.0.0
-	 */
-	public function encrypt(string $plaintext, string $password = ''): string;
+    /**
+     * Encrypts a value and adds an HMAC (Encrypt-Then-MAC)
+     * @param string $plaintext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string Authenticated ciphertext
+     * @since 8.0.0
+     */
+    public function encrypt(string $plaintext, string $password = ''): string;
 
-	/**
-	 * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
-	 * @param string $authenticatedCiphertext
-	 * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
-	 * @return string plaintext
-	 * @throws \Exception If the HMAC does not match
-	 * @throws \Exception If the decryption failed
-	 * @since 8.0.0
-	 */
-	public function decrypt(string $authenticatedCiphertext, string $password = ''): string;
+    /**
+     * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac)
+     * @param string $authenticatedCiphertext
+     * @param string $password Password to encrypt, if not specified the secret from config.php will be taken
+     * @return string plaintext
+     * @throws \Exception If the HMAC does not match
+     * @throws \Exception If the decryption failed
+     * @since 8.0.0
+     */
+    public function decrypt(string $authenticatedCiphertext, string $password = ''): string;
 }

apps/dav/lib/Migration/Version1008Date20181114084440.php

Indentation +23 added lines, -23 removed lines

@@ -33,27 +33,27 @@
 class Version1008Date20181114084440 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();
-
-		if ($schema->hasTable('calendarchanges')) {
-			$calendarChangesTable = $schema->getTable('calendarchanges');
-			if ($calendarChangesTable->hasIndex('calendarid_calendartype_synctoken')) {
-				$calendarChangesTable->dropIndex('calendarid_calendartype_synctoken');
-			}
-
-			if (!$calendarChangesTable->hasIndex('calid_type_synctoken')) {
-				$calendarChangesTable->addIndex(['calendarid', 'calendartype', 'synctoken'], 'calid_type_synctoken');
-			}
-		}
-
-		return $schema;
-	}
+    /**
+     * @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('calendarchanges')) {
+            $calendarChangesTable = $schema->getTable('calendarchanges');
+            if ($calendarChangesTable->hasIndex('calendarid_calendartype_synctoken')) {
+                $calendarChangesTable->dropIndex('calendarid_calendartype_synctoken');
+            }
+
+            if (!$calendarChangesTable->hasIndex('calid_type_synctoken')) {
+                $calendarChangesTable->addIndex(['calendarid', 'calendartype', 'synctoken'], 'calid_type_synctoken');
+            }
+        }
+
+        return $schema;
+    }
 }

lib/public/Authentication/TwoFactorAuth/IActivatableByAdmin.php

Indentation +10 added lines, -10 removed lines

@@ -37,15 +37,15 @@
  */
 interface IActivatableByAdmin extends IProvider {
 
-	/**
-	 * Enable this provider for the given user.
-	 *
-	 * @param IUser $user the user to activate this provider for
-	 *
-	 * @return void
-	 *
-	 * @since 15.0.0
-	 */
-	public function enableFor(IUser $user);
+    /**
+     * Enable this provider for the given user.
+     *
+     * @param IUser $user the user to activate this provider for
+     *
+     * @return void
+     *
+     * @since 15.0.0
+     */
+    public function enableFor(IUser $user);
 
 }

lib/public/Authentication/TwoFactorAuth/IDeactivatableByAdmin.php

Indentation +10 added lines, -10 removed lines

@@ -37,15 +37,15 @@
  */
 interface IDeactivatableByAdmin extends IProvider {
 
-	/**
-	 * Disable this provider for the given user.
-	 *
-	 * @param IUser $user the user to deactivate this provider for
-	 *
-	 * @return void
-	 *
-	 * @since 15.0.0
-	 */
-	public function disableFor(IUser $user);
+    /**
+     * Disable this provider for the given user.
+     *
+     * @param IUser $user the user to deactivate this provider for
+     *
+     * @return void
+     *
+     * @since 15.0.0
+     */
+    public function disableFor(IUser $user);
 
 }

lib/private/RichObjectStrings/Validator.php

Indentation +83 added lines, -83 removed lines

@@ -38,87 +38,87 @@
  */
 class Validator implements IValidator {
 
-	/** @var Definitions */
-	protected $definitions;
-
-	/** @var array[] */
-	protected $requiredParameters = [];
-
-	/**
-	 * Constructor
-	 *
-	 * @param Definitions $definitions
-	 */
-	public function __construct(Definitions $definitions) {
-		$this->definitions = $definitions;
-	}
-
-	/**
-	 * @param string $subject
-	 * @param array[] $parameters
-	 * @throws InvalidObjectExeption
-	 * @since 11.0.0
-	 */
-	public function validate($subject, array $parameters) {
-		$matches = [];
-		$result = preg_match_all('/\{([a-z0-9]+)\}/i', $subject, $matches);
-
-		if ($result === false) {
-			throw new InvalidObjectExeption();
-		}
-
-		if (!empty($matches[1])) {
-			foreach ($matches[1] as $parameter) {
-				if (!isset($parameters[$parameter])) {
-					throw new InvalidObjectExeption('Parameter is undefined');
-				}
-			}
-		}
-
-		foreach ($parameters as $parameter) {
-			if (!\is_array($parameter)) {
-				throw new InvalidObjectExeption('Parameter is malformed');
-			}
-
-			$this->validateParameter($parameter);
-		}
-	}
-
-	/**
-	 * @param array $parameter
-	 * @throws InvalidObjectExeption
-	 */
-	protected function validateParameter(array $parameter) {
-		if (!isset($parameter['type'])) {
-			throw new InvalidObjectExeption('Object type is undefined');
-		}
-
-		$definition = $this->definitions->getDefinition($parameter['type']);
-		$requiredParameters = $this->getRequiredParameters($parameter['type'], $definition);
-
-		$missingKeys = array_diff($requiredParameters, array_keys($parameter));
-		if (!empty($missingKeys)) {
-			throw new InvalidObjectExeption('Object is invalid');
-		}
-	}
-
-	/**
-	 * @param string $type
-	 * @param array $definition
-	 * @return string[]
-	 */
-	protected function getRequiredParameters($type, array $definition) {
-		if (isset($this->requiredParameters[$type])) {
-			return $this->requiredParameters[$type];
-		}
-
-		$this->requiredParameters[$type] = [];
-		foreach ($definition['parameters'] as $parameter => $data) {
-			if ($data['required']) {
-				$this->requiredParameters[$type][] = $parameter;
-			}
-		}
-
-		return $this->requiredParameters[$type];
-	}
+    /** @var Definitions */
+    protected $definitions;
+
+    /** @var array[] */
+    protected $requiredParameters = [];
+
+    /**
+     * Constructor
+     *
+     * @param Definitions $definitions
+     */
+    public function __construct(Definitions $definitions) {
+        $this->definitions = $definitions;
+    }
+
+    /**
+     * @param string $subject
+     * @param array[] $parameters
+     * @throws InvalidObjectExeption
+     * @since 11.0.0
+     */
+    public function validate($subject, array $parameters) {
+        $matches = [];
+        $result = preg_match_all('/\{([a-z0-9]+)\}/i', $subject, $matches);
+
+        if ($result === false) {
+            throw new InvalidObjectExeption();
+        }
+
+        if (!empty($matches[1])) {
+            foreach ($matches[1] as $parameter) {
+                if (!isset($parameters[$parameter])) {
+                    throw new InvalidObjectExeption('Parameter is undefined');
+                }
+            }
+        }
+
+        foreach ($parameters as $parameter) {
+            if (!\is_array($parameter)) {
+                throw new InvalidObjectExeption('Parameter is malformed');
+            }
+
+            $this->validateParameter($parameter);
+        }
+    }
+
+    /**
+     * @param array $parameter
+     * @throws InvalidObjectExeption
+     */
+    protected function validateParameter(array $parameter) {
+        if (!isset($parameter['type'])) {
+            throw new InvalidObjectExeption('Object type is undefined');
+        }
+
+        $definition = $this->definitions->getDefinition($parameter['type']);
+        $requiredParameters = $this->getRequiredParameters($parameter['type'], $definition);
+
+        $missingKeys = array_diff($requiredParameters, array_keys($parameter));
+        if (!empty($missingKeys)) {
+            throw new InvalidObjectExeption('Object is invalid');
+        }
+    }
+
+    /**
+     * @param string $type
+     * @param array $definition
+     * @return string[]
+     */
+    protected function getRequiredParameters($type, array $definition) {
+        if (isset($this->requiredParameters[$type])) {
+            return $this->requiredParameters[$type];
+        }
+
+        $this->requiredParameters[$type] = [];
+        foreach ($definition['parameters'] as $parameter => $data) {
+            if ($data['required']) {
+                $this->requiredParameters[$type][] = $parameter;
+            }
+        }
+
+        return $this->requiredParameters[$type];
+    }
 }

apps/oauth2/lib/Migration/Version010401Date20181207190718.php

Indentation +62 added lines, -62 removed lines

@@ -31,68 +31,68 @@
 
 class Version010401Date20181207190718 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('oauth2_clients')) {
-			$table = $schema->createTable('oauth2_clients');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'unsigned' => true,
-			]);
-			$table->addColumn('name', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('redirect_uri', 'string', [
-				'notnull' => true,
-				'length' => 2000,
-			]);
-			$table->addColumn('client_identifier', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->addColumn('secret', 'string', [
-				'notnull' => true,
-				'length' => 64,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addIndex(['client_identifier'], 'oauth2_client_id_idx');
-		}
+        if (!$schema->hasTable('oauth2_clients')) {
+            $table = $schema->createTable('oauth2_clients');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('name', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('redirect_uri', 'string', [
+                'notnull' => true,
+                'length' => 2000,
+            ]);
+            $table->addColumn('client_identifier', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->addColumn('secret', 'string', [
+                'notnull' => true,
+                'length' => 64,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addIndex(['client_identifier'], 'oauth2_client_id_idx');
+        }
 
-		if (!$schema->hasTable('oauth2_access_tokens')) {
-			$table = $schema->createTable('oauth2_access_tokens');
-			$table->addColumn('id', 'integer', [
-				'autoincrement' => true,
-				'notnull' => true,
-				'unsigned' => true,
-			]);
-			$table->addColumn('token_id', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('client_id', 'integer', [
-				'notnull' => true,
-			]);
-			$table->addColumn('hashed_code', 'string', [
-				'notnull' => true,
-				'length' => 128,
-			]);
-			$table->addColumn('encrypted_token', 'string', [
-				'notnull' => true,
-				'length' => 786,
-			]);
-			$table->setPrimaryKey(['id']);
-			$table->addUniqueIndex(['hashed_code'], 'oauth2_access_hash_idx');
-			$table->addIndex(['client_id'], 'oauth2_access_client_id_idx');
-		}
-		return $schema;
-	}
+        if (!$schema->hasTable('oauth2_access_tokens')) {
+            $table = $schema->createTable('oauth2_access_tokens');
+            $table->addColumn('id', 'integer', [
+                'autoincrement' => true,
+                'notnull' => true,
+                'unsigned' => true,
+            ]);
+            $table->addColumn('token_id', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('client_id', 'integer', [
+                'notnull' => true,
+            ]);
+            $table->addColumn('hashed_code', 'string', [
+                'notnull' => true,
+                'length' => 128,
+            ]);
+            $table->addColumn('encrypted_token', 'string', [
+                'notnull' => true,
+                'length' => 786,
+            ]);
+            $table->setPrimaryKey(['id']);
+            $table->addUniqueIndex(['hashed_code'], 'oauth2_access_hash_idx');
+            $table->addIndex(['client_id'], 'oauth2_access_client_id_idx');
+        }
+        return $schema;
+    }
 }

lib/private/Files/AppData/AppData.php

Spacing +7 added lines, -7 removed lines

@@ -75,7 +75,7 @@ 
 			throw new \RuntimeException('no instance id!');
 		}
 
-		return 'appdata_' . $instanceId;
+		return 'appdata_'.$instanceId;
 	}
 
 	private function getAppDataRootFolder(): Folder {
@@ -103,7 +103,7 @@ 
 			$name = $this->getAppDataFolderName();
 
 			try {
-				$this->folder = $this->rootFolder->get($name . '/' . $this->appId);
+				$this->folder = $this->rootFolder->get($name.'/'.$this->appId);
 			} catch (NotFoundException $e) {
 				$appDataRootFolder = $this->getAppDataRootFolder();
 
@@ -113,7 +113,7 @@ 
 					try {
 						$this->folder = $appDataRootFolder->newFolder($this->appId);
 					} catch (NotPermittedException $e) {
-						throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
+						throw new \RuntimeException('Could not get appdata folder for '.$this->appId);
 					}
 				}
 			}
@@ -123,7 +123,7 @@ 
 	}
 
 	public function getFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
+		$key = $this->appId.'/'.$name;
 		if ($cachedFolder = $this->folders->get($key)) {
 			if ($cachedFolder instanceof \Exception) {
 				throw $cachedFolder;
@@ -136,7 +136,7 @@ 
 			if ($name === '/') {
 				$node = $this->getAppDataFolder();
 			} else {
-				$path = $this->getAppDataFolderName() . '/' . $this->appId . '/' . $name;
+				$path = $this->getAppDataFolderName().'/'.$this->appId.'/'.$name;
 				$node = $this->rootFolder->get($path);
 			}
 		} catch (NotFoundException $e) {
@@ -151,7 +151,7 @@ 
 	}
 
 	public function newFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
+		$key = $this->appId.'/'.$name;
 		$folder = $this->getAppDataFolder()->newFolder($name);
 
 		$simpleFolder = new SimpleFolder($folder);
@@ -162,7 +162,7 @@ 
 	public function getDirectoryListing(): array {
 		$listing = $this->getAppDataFolder()->getDirectoryListing();
 
-		$fileListing = array_map(function (Node $folder) {
+		$fileListing = array_map(function(Node $folder) {
 			if ($folder instanceof Folder) {
 				return new SimpleFolder($folder);
 			}

Indentation +139 added lines, -139 removed lines

@@ -40,143 +40,143 @@
 
 class AppData implements IAppData {
 
-	/** @var IRootFolder */
-	private $rootFolder;
-
-	/** @var SystemConfig */
-	private $config;
-
-	/** @var string */
-	private $appId;
-
-	/** @var Folder */
-	private $folder;
-
-	/** @var (ISimpleFolder|NotFoundException)[]|CappedMemoryCache */
-	private $folders;
-
-	/**
-	 * AppData constructor.
-	 *
-	 * @param IRootFolder $rootFolder
-	 * @param SystemConfig $systemConfig
-	 * @param string $appId
-	 */
-	public function __construct(IRootFolder $rootFolder,
-								SystemConfig $systemConfig,
-								string $appId) {
-		$this->rootFolder = $rootFolder;
-		$this->config = $systemConfig;
-		$this->appId = $appId;
-		$this->folders = new CappedMemoryCache();
-	}
-
-	private function getAppDataFolderName() {
-		$instanceId = $this->config->getValue('instanceid', null);
-		if ($instanceId === null) {
-			throw new \RuntimeException('no instance id!');
-		}
-
-		return 'appdata_' . $instanceId;
-	}
-
-	private function getAppDataRootFolder(): Folder {
-		$name = $this->getAppDataFolderName();
-
-		try {
-			/** @var Folder $node */
-			$node = $this->rootFolder->get($name);
-			return $node;
-		} catch (NotFoundException $e) {
-			try {
-				return $this->rootFolder->newFolder($name);
-			} catch (NotPermittedException $e) {
-				throw new \RuntimeException('Could not get appdata folder');
-			}
-		}
-	}
-
-	/**
-	 * @return Folder
-	 * @throws \RuntimeException
-	 */
-	private function getAppDataFolder(): Folder {
-		if ($this->folder === null) {
-			$name = $this->getAppDataFolderName();
-
-			try {
-				$this->folder = $this->rootFolder->get($name . '/' . $this->appId);
-			} catch (NotFoundException $e) {
-				$appDataRootFolder = $this->getAppDataRootFolder();
-
-				try {
-					$this->folder = $appDataRootFolder->get($this->appId);
-				} catch (NotFoundException $e) {
-					try {
-						$this->folder = $appDataRootFolder->newFolder($this->appId);
-					} catch (NotPermittedException $e) {
-						throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
-					}
-				}
-			}
-		}
-
-		return $this->folder;
-	}
-
-	public function getFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
-		if ($cachedFolder = $this->folders->get($key)) {
-			if ($cachedFolder instanceof \Exception) {
-				throw $cachedFolder;
-			} else {
-				return $cachedFolder;
-			}
-		}
-		try {
-			// Hardening if somebody wants to retrieve '/'
-			if ($name === '/') {
-				$node = $this->getAppDataFolder();
-			} else {
-				$path = $this->getAppDataFolderName() . '/' . $this->appId . '/' . $name;
-				$node = $this->rootFolder->get($path);
-			}
-		} catch (NotFoundException $e) {
-			$this->folders->set($key, $e);
-			throw $e;
-		}
-
-		/** @var Folder $node */
-		$folder = new SimpleFolder($node);
-		$this->folders->set($key, $folder);
-		return $folder;
-	}
-
-	public function newFolder(string $name): ISimpleFolder {
-		$key = $this->appId . '/' . $name;
-		$folder = $this->getAppDataFolder()->newFolder($name);
-
-		$simpleFolder = new SimpleFolder($folder);
-		$this->folders->set($key, $simpleFolder);
-		return $simpleFolder;
-	}
-
-	public function getDirectoryListing(): array {
-		$listing = $this->getAppDataFolder()->getDirectoryListing();
-
-		$fileListing = array_map(function (Node $folder) {
-			if ($folder instanceof Folder) {
-				return new SimpleFolder($folder);
-			}
-			return null;
-		}, $listing);
-
-		$fileListing = array_filter($fileListing);
-
-		return array_values($fileListing);
-	}
-
-	public function getId(): int {
-		return $this->getAppDataFolder()->getId();
-	}
+    /** @var IRootFolder */
+    private $rootFolder;
+
+    /** @var SystemConfig */
+    private $config;
+
+    /** @var string */
+    private $appId;
+
+    /** @var Folder */
+    private $folder;
+
+    /** @var (ISimpleFolder|NotFoundException)[]|CappedMemoryCache */
+    private $folders;
+
+    /**
+     * AppData constructor.
+     *
+     * @param IRootFolder $rootFolder
+     * @param SystemConfig $systemConfig
+     * @param string $appId
+     */
+    public function __construct(IRootFolder $rootFolder,
+                                SystemConfig $systemConfig,
+                                string $appId) {
+        $this->rootFolder = $rootFolder;
+        $this->config = $systemConfig;
+        $this->appId = $appId;
+        $this->folders = new CappedMemoryCache();
+    }
+
+    private function getAppDataFolderName() {
+        $instanceId = $this->config->getValue('instanceid', null);
+        if ($instanceId === null) {
+            throw new \RuntimeException('no instance id!');
+        }
+
+        return 'appdata_' . $instanceId;
+    }
+
+    private function getAppDataRootFolder(): Folder {
+        $name = $this->getAppDataFolderName();
+
+        try {
+            /** @var Folder $node */
+            $node = $this->rootFolder->get($name);
+            return $node;
+        } catch (NotFoundException $e) {
+            try {
+                return $this->rootFolder->newFolder($name);
+            } catch (NotPermittedException $e) {
+                throw new \RuntimeException('Could not get appdata folder');
+            }
+        }
+    }
+
+    /**
+     * @return Folder
+     * @throws \RuntimeException
+     */
+    private function getAppDataFolder(): Folder {
+        if ($this->folder === null) {
+            $name = $this->getAppDataFolderName();
+
+            try {
+                $this->folder = $this->rootFolder->get($name . '/' . $this->appId);
+            } catch (NotFoundException $e) {
+                $appDataRootFolder = $this->getAppDataRootFolder();
+
+                try {
+                    $this->folder = $appDataRootFolder->get($this->appId);
+                } catch (NotFoundException $e) {
+                    try {
+                        $this->folder = $appDataRootFolder->newFolder($this->appId);
+                    } catch (NotPermittedException $e) {
+                        throw new \RuntimeException('Could not get appdata folder for ' . $this->appId);
+                    }
+                }
+            }
+        }
+
+        return $this->folder;
+    }
+
+    public function getFolder(string $name): ISimpleFolder {
+        $key = $this->appId . '/' . $name;
+        if ($cachedFolder = $this->folders->get($key)) {
+            if ($cachedFolder instanceof \Exception) {
+                throw $cachedFolder;
+            } else {
+                return $cachedFolder;
+            }
+        }
+        try {
+            // Hardening if somebody wants to retrieve '/'
+            if ($name === '/') {
+                $node = $this->getAppDataFolder();
+            } else {
+                $path = $this->getAppDataFolderName() . '/' . $this->appId . '/' . $name;
+                $node = $this->rootFolder->get($path);
+            }
+        } catch (NotFoundException $e) {
+            $this->folders->set($key, $e);
+            throw $e;
+        }
+
+        /** @var Folder $node */
+        $folder = new SimpleFolder($node);
+        $this->folders->set($key, $folder);
+        return $folder;
+    }
+
+    public function newFolder(string $name): ISimpleFolder {
+        $key = $this->appId . '/' . $name;
+        $folder = $this->getAppDataFolder()->newFolder($name);
+
+        $simpleFolder = new SimpleFolder($folder);
+        $this->folders->set($key, $simpleFolder);
+        return $simpleFolder;
+    }
+
+    public function getDirectoryListing(): array {
+        $listing = $this->getAppDataFolder()->getDirectoryListing();
+
+        $fileListing = array_map(function (Node $folder) {
+            if ($folder instanceof Folder) {
+                return new SimpleFolder($folder);
+            }
+            return null;
+        }, $listing);
+
+        $fileListing = array_filter($fileListing);
+
+        return array_values($fileListing);
+    }
+
+    public function getId(): int {
+        return $this->getAppDataFolder()->getId();
+    }
 }

apps/user_ldap/lib/Command/ShowRemnants.php

Spacing +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
 				'displayName' => $user->getDisplayName(),
 				'uid' => $user->getUID(),
 				'dn' => $user->getDN(),
-				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
-				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
+				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool) $input->getOption('short-date')),
+				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool) $input->getOption('short-date')),
 				'homePath' => $user->getHomePath(),
 				'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
 			];

Indentation +63 added lines, -63 removed lines

@@ -36,73 +36,73 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ShowRemnants extends Command {
-	/** @var \OCA\User_LDAP\User\DeletedUsersIndex */
-	protected $dui;
+    /** @var \OCA\User_LDAP\User\DeletedUsersIndex */
+    protected $dui;
 
-	/** @var \OCP\IDateTimeFormatter */
-	protected $dateFormatter;
+    /** @var \OCP\IDateTimeFormatter */
+    protected $dateFormatter;
 
-	/**
-	 * @param DeletedUsersIndex $dui
-	 * @param IDateTimeFormatter $dateFormatter
-	 */
-	public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
-		$this->dui = $dui;
-		$this->dateFormatter = $dateFormatter;
-		parent::__construct();
-	}
+    /**
+     * @param DeletedUsersIndex $dui
+     * @param IDateTimeFormatter $dateFormatter
+     */
+    public function __construct(DeletedUsersIndex $dui, IDateTimeFormatter $dateFormatter) {
+        $this->dui = $dui;
+        $this->dateFormatter = $dateFormatter;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('ldap:show-remnants')
-			->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
-			->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
-			->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
-	}
+    protected function configure() {
+        $this
+            ->setName('ldap:show-remnants')
+            ->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
+            ->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
+            ->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
+    }
 
-	protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
-		if (!($timestamp > 0)) {
-			return $default;
-		}
-		if ($showShortDate) {
-			return date('Y-m-d', $timestamp);
-		}
-		return $this->dateFormatter->formatDate($timestamp);
-	}
+    protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
+        if (!($timestamp > 0)) {
+            return $default;
+        }
+        if ($showShortDate) {
+            return date('Y-m-d', $timestamp);
+        }
+        return $this->dateFormatter->formatDate($timestamp);
+    }
 
-	/**
-	 * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
-	 *
-	 * {@inheritdoc}
-	 */
-	protected function execute(InputInterface $input, OutputInterface $output): int {
-		/** @var \Symfony\Component\Console\Helper\Table $table */
-		$table = new Table($output);
-		$table->setHeaders([
-			'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
-			'Detected on', 'Dir', 'Sharer'
-		]);
-		$rows = [];
-		$resultSet = $this->dui->getUsers();
-		foreach ($resultSet as $user) {
-			$rows[] = [
-				'ocName' => $user->getOCName(),
-				'displayName' => $user->getDisplayName(),
-				'uid' => $user->getUID(),
-				'dn' => $user->getDN(),
-				'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
-				'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
-				'homePath' => $user->getHomePath(),
-				'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
-			];
-		}
+    /**
+     * executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
+     *
+     * {@inheritdoc}
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int {
+        /** @var \Symfony\Component\Console\Helper\Table $table */
+        $table = new Table($output);
+        $table->setHeaders([
+            'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
+            'Detected on', 'Dir', 'Sharer'
+        ]);
+        $rows = [];
+        $resultSet = $this->dui->getUsers();
+        foreach ($resultSet as $user) {
+            $rows[] = [
+                'ocName' => $user->getOCName(),
+                'displayName' => $user->getDisplayName(),
+                'uid' => $user->getUID(),
+                'dn' => $user->getDN(),
+                'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
+                'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
+                'homePath' => $user->getHomePath(),
+                'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
+            ];
+        }
 
-		if ($input->getOption('json')) {
-			$output->writeln(json_encode($rows));
-		} else {
-			$table->setRows($rows);
-			$table->render();
-		}
-		return 0;
-	}
+        if ($input->getOption('json')) {
+            $output->writeln(json_encode($rows));
+        } else {
+            $table->setRows($rows);
+            $table->render();
+        }
+        return 0;
+    }
 }

apps/dav/lib/Migration/ChunkCleanup.php

Indentation +47 added lines, -47 removed lines

@@ -37,59 +37,59 @@
 
 class ChunkCleanup implements IRepairStep {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var IJobList */
-	private $jobList;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var IRootFolder */
+    private $rootFolder;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IConfig $config,
-								IUserManager $userManager,
-								IRootFolder $rootFolder,
-								IJobList $jobList) {
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-		$this->jobList = $jobList;
-	}
+    public function __construct(IConfig $config,
+                                IUserManager $userManager,
+                                IRootFolder $rootFolder,
+                                IJobList $jobList) {
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Chunk cleanup scheduler';
-	}
+    public function getName(): string {
+        return 'Chunk cleanup scheduler';
+    }
 
-	public function run(IOutput $output) {
-		// If we already ran this onec there is no need to run it again
-		if ($this->config->getAppValue('dav', 'chunks_migrated', '0') === '1') {
-			$output->info('Cleanup not required');
-		}
+    public function run(IOutput $output) {
+        // If we already ran this onec there is no need to run it again
+        if ($this->config->getAppValue('dav', 'chunks_migrated', '0') === '1') {
+            $output->info('Cleanup not required');
+        }
 
-		$output->startProgress();
-		// Loop over all seen users
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
-			try {
-				$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-				$userRoot = $userFolder->getParent();
-				/** @var Folder $uploadFolder */
-				$uploadFolder = $userRoot->get('uploads');
-			} catch (NotFoundException $e) {
-				// No folder so skipping
-				return;
-			}
+        $output->startProgress();
+        // Loop over all seen users
+        $this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+            try {
+                $userFolder = $this->rootFolder->getUserFolder($user->getUID());
+                $userRoot = $userFolder->getParent();
+                /** @var Folder $uploadFolder */
+                $uploadFolder = $userRoot->get('uploads');
+            } catch (NotFoundException $e) {
+                // No folder so skipping
+                return;
+            }
 
-			// Insert a cleanup job for each folder we find
-			$uploads = $uploadFolder->getDirectoryListing();
-			foreach ($uploads as $upload) {
-				$this->jobList->add(UploadCleanup::class, ['uid' => $user->getUID(), 'folder' => $upload->getName()]);
-			}
-			$output->advance();
-		});
-		$output->finishProgress();
+            // Insert a cleanup job for each folder we find
+            $uploads = $uploadFolder->getDirectoryListing();
+            foreach ($uploads as $upload) {
+                $this->jobList->add(UploadCleanup::class, ['uid' => $user->getUID(), 'folder' => $upload->getName()]);
+            }
+            $output->advance();
+        });
+        $output->finishProgress();
 
 
-		$this->config->setAppValue('dav', 'chunks_migrated', '1');
-	}
+        $this->config->setAppValue('dav', 'chunks_migrated', '1');
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
 
 		$output->startProgress();
 		// Loop over all seen users
-		$this->userManager->callForSeenUsers(function (IUser $user) use ($output) {
+		$this->userManager->callForSeenUsers(function(IUser $user) use ($output) {
 			try {
 				$userFolder = $this->rootFolder->getUserFolder($user->getUID());
 				$userRoot = $userFolder->getParent();