Completed
Pull Request — master (#3233)
by Jan-Christoph
12:09
created
apps/files_external/lib/Command/Create.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -128,32 +128,32 @@  discard block
 block discarded – undo
128 128
 		$authBackend = $this->backendService->getAuthMechanism($authIdentifier);
129 129
 
130 130
 		if (!Filesystem::isValidPath($mountPoint)) {
131
-			$output->writeln('<error>Invalid mountpoint "' . $mountPoint . '"</error>');
131
+			$output->writeln('<error>Invalid mountpoint "'.$mountPoint.'"</error>');
132 132
 			return 1;
133 133
 		}
134 134
 		if (is_null($storageBackend)) {
135
-			$output->writeln('<error>Storage backend with identifier "' . $storageIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
135
+			$output->writeln('<error>Storage backend with identifier "'.$storageIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>');
136 136
 			return 404;
137 137
 		}
138 138
 		if (is_null($authBackend)) {
139
-			$output->writeln('<error>Authentication backend with identifier "' . $authIdentifier . '" not found (see `occ files_external:backends` for possible values)</error>');
139
+			$output->writeln('<error>Authentication backend with identifier "'.$authIdentifier.'" not found (see `occ files_external:backends` for possible values)</error>');
140 140
 			return 404;
141 141
 		}
142 142
 		$supportedSchemes = array_keys($storageBackend->getAuthSchemes());
143 143
 		if (!in_array($authBackend->getScheme(), $supportedSchemes)) {
144
-			$output->writeln('<error>Authentication backend "' . $authIdentifier . '" not valid for storage backend "' . $storageIdentifier . '" (see `occ files_external:backends storage ' . $storageIdentifier . '` for possible values)</error>');
144
+			$output->writeln('<error>Authentication backend "'.$authIdentifier.'" not valid for storage backend "'.$storageIdentifier.'" (see `occ files_external:backends storage '.$storageIdentifier.'` for possible values)</error>');
145 145
 			return 1;
146 146
 		}
147 147
 
148 148
 		$config = [];
149 149
 		foreach ($configInput as $configOption) {
150 150
 			if (!strpos($configOption, '=')) {
151
-				$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
151
+				$output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>');
152 152
 				return 1;
153 153
 			}
154 154
 			list($key, $value) = explode('=', $configOption, 2);
155 155
 			if (!$this->validateParam($key, $value, $storageBackend, $authBackend)) {
156
-				$output->writeln('<error>Unknown configuration for backends "' . $key . '"</error>');
156
+				$output->writeln('<error>Unknown configuration for backends "'.$key.'"</error>');
157 157
 				return 1;
158 158
 			}
159 159
 			$config[$key] = $value;
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
 
168 168
 		if ($user) {
169 169
 			if (!$this->userManager->userExists($user)) {
170
-				$output->writeln('<error>User "' . $user . '" not found</error>');
170
+				$output->writeln('<error>User "'.$user.'" not found</error>');
171 171
 				return 1;
172 172
 			}
173 173
 			$mount->setApplicableUsers([$user]);
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		} else {
179 179
 			$this->getStorageService($user)->addStorage($mount);
180 180
 			if ($input->getOption('output') === self::OUTPUT_FORMAT_PLAIN) {
181
-				$output->writeln('<info>Storage created with id ' . $mount->getId() . '</info>');
181
+				$output->writeln('<info>Storage created with id '.$mount->getId().'</info>');
182 182
 			} else {
183 183
 				$output->writeln($mount->getId());
184 184
 			}
Please login to merge, or discard this patch.
apps/files_external/lib/Command/Backends.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -71,14 +71,14 @@  discard block
 block discarded – undo
71 71
 		$backend = $input->getArgument('backend');
72 72
 		if ($type) {
73 73
 			if (!isset($data[$type])) {
74
-				$output->writeln('<error>Invalid type "' . $type . '". Possible values are "authentication" or "storage"</error>');
74
+				$output->writeln('<error>Invalid type "'.$type.'". Possible values are "authentication" or "storage"</error>');
75 75
 				return 1;
76 76
 			}
77 77
 			$data = $data[$type];
78 78
 
79 79
 			if ($backend) {
80 80
 				if (!isset($data[$backend])) {
81
-					$output->writeln('<error>Unknown backend "' . $backend . '" of type  "' . $type . '"</error>');
81
+					$output->writeln('<error>Unknown backend "'.$backend.'" of type  "'.$type.'"</error>');
82 82
 					return 1;
83 83
 				}
84 84
 				$data = $data[$backend];
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 			$result['storage_class'] = $backend->getStorageClass();
100 100
 			$authBackends = $this->backendService->getAuthMechanismsByScheme(array_keys($backend->getAuthSchemes()));
101 101
 			$result['supported_authentication_backends'] = array_keys($authBackends);
102
-			$authConfig = array_map(function (AuthMechanism $auth) {
102
+			$authConfig = array_map(function(AuthMechanism $auth) {
103 103
 				return $this->serializeAuthBackend($auth)['configuration'];
104 104
 			}, $authBackends);
105 105
 			$result['authentication_configuration'] = array_combine(array_keys($authBackends), $authConfig);
@@ -112,10 +112,10 @@  discard block
 block discarded – undo
112 112
 	 * @return string[]
113 113
 	 */
114 114
 	private function formatConfiguration(array $parameters) {
115
-		$configuration = array_filter($parameters, function (DefinitionParameter $parameter) {
115
+		$configuration = array_filter($parameters, function(DefinitionParameter $parameter) {
116 116
 			return $parameter->getType() !== DefinitionParameter::VALUE_HIDDEN;
117 117
 		});
118
-		return array_map(function (DefinitionParameter $parameter) {
118
+		return array_map(function(DefinitionParameter $parameter) {
119 119
 			return $parameter->getTypeName();
120 120
 		}, $configuration);
121 121
 	}
Please login to merge, or discard this patch.
apps/files_external/lib/Command/Import.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 			$json = file_get_contents('php://stdin');
113 113
 		} else {
114 114
 			if (!file_exists($path)) {
115
-				$output->writeln('<error>File not found: ' . $path . '</error>');
115
+				$output->writeln('<error>File not found: '.$path.'</error>');
116 116
 				return 1;
117 117
 			}
118 118
 			$json = file_get_contents($path);
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
 					$existingMount->getApplicableUsers() == $mount->getApplicableUsers() &&
165 165
 					$existingMount->getBackendOptions() == $mount->getBackendOptions()
166 166
 				) {
167
-					$output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>");
167
+					$output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>");
168 168
 					return 1;
169 169
 				}
170 170
 			}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/DefinitionParameter.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
 	 * @return bool
141 141
 	 */
142 142
 	public function isFlagSet($flag) {
143
-		return (bool)($this->flags & $flag);
143
+		return (bool) ($this->flags & $flag);
144 144
 	}
145 145
 
146 146
 	/**
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/Password/SessionCredentials.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 			->addParameters([]);
52 52
 	}
53 53
 
54
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
54
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
55 55
 		try {
56 56
 			$credentials = $this->credentialsStore->getLoginCredentials();
57 57
 		} catch (CredentialsUnavailableException $e) {
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@
 block discarded – undo
75 75
 		$this->credentialsManager->store($userId, self::CREDENTIALS_IDENTIFIER, $credentials);
76 76
 	}
77 77
 
78
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
78
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
79 79
 		if (!isset($user)) {
80 80
 			throw new InsufficientDataForMeaningfulAnswerException('No login credentials saved');
81 81
 		}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/Password/UserProvided.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	}
62 62
 
63 63
 	private function getCredentialsIdentifier($storageId) {
64
-		return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId;
64
+		return self::CREDENTIALS_IDENTIFIER_PREFIX.$storageId;
65 65
 	}
66 66
 
67 67
 	public function saveBackendOptions(IUser $user, $id, array $options) {
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		]);
72 72
 	}
73 73
 
74
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
74
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
75 75
 		if (!isset($user)) {
76 76
 			throw new InsufficientDataForMeaningfulAnswerException('No credentials saved');
77 77
 		}
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
 		]);
71 71
 	}
72 72
 
73
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
73
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
74 74
 		if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) {
75 75
 			$uid = '';
76 76
 		} elseif (is_null($user)) {
Please login to merge, or discard this patch.
apps/files_external/lib/Lib/Auth/PublicKey/RSA.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 		;
58 58
 	}
59 59
 
60
-	public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) {
60
+	public function manipulateStorageConfig(StorageConfig & $storage, IUser $user = null) {
61 61
 		$auth = new RSACrypt();
62 62
 		$auth->setPassword($this->config->getSystemValue('secret', ''));
63 63
 		if (!$auth->loadKey($storage->getBackendOption('private_key'))) {
Please login to merge, or discard this patch.