Completed
Pull Request — master (#6788)
by Markus
77:53 queued 63:49
created
apps/files_external/lib/Config/ConfigAdapter.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 * @param StorageConfig $storage
75 75
 	 * @param IUser $user
76 76
 	 */
77
-	private function prepareStorageConfig(StorageConfig &$storage, IUser $user) {
77
+	private function prepareStorageConfig(StorageConfig & $storage, IUser $user) {
78 78
 		foreach ($storage->getBackendOptions() as $option => $value) {
79 79
 			$storage->setBackendOption($option, \OC_Mount_Config::setUserVars(
80 80
 				$user->getUID(), $value
@@ -141,12 +141,12 @@  discard block
 block discarded – undo
141 141
 			return $storage->getId();
142 142
 		}, $storages));
143 143
 
144
-		$availableStorages = array_map(function (Storage\IStorage $storage, StorageConfig $storageConfig) {
144
+		$availableStorages = array_map(function(Storage\IStorage $storage, StorageConfig $storageConfig) {
145 145
 			try {
146 146
 				$availability = $storage->getAvailability();
147 147
 				if (!$availability['available'] && !Availability::shouldRecheck($availability)) {
148 148
 					$storage = new FailedStorage([
149
-						'exception' => new StorageNotAvailableException('Storage with mount id ' . $storageConfig->getId() . ' is not available')
149
+						'exception' => new StorageNotAvailableException('Storage with mount id '.$storageConfig->getId().' is not available')
150 150
 					]);
151 151
 				}
152 152
 			} catch (\Exception $e) {
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
 					$this->userStoragesService,
163 163
 					$storageConfig->getId(),
164 164
 					$storage,
165
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
165
+					'/'.$user->getUID().'/files'.$storageConfig->getMountPoint(),
166 166
 					null,
167 167
 					$loader,
168 168
 					$storageConfig->getMountOptions()
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
170 170
 			} else {
171 171
 				return new MountPoint(
172 172
 					$storage,
173
-					'/' . $user->getUID() . '/files' . $storageConfig->getMountPoint(),
173
+					'/'.$user->getUID().'/files'.$storageConfig->getMountPoint(),
174 174
 					null,
175 175
 					$loader,
176 176
 					$storageConfig->getMountOptions(),
Please login to merge, or discard this patch.
apps/files_external/lib/Command/Applicable.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
103 103
 		try {
104 104
 			$mount = $this->globalService->getStorage($mountId);
105 105
 		} catch (NotFoundException $e) {
106
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>');
106
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts</error>');
107 107
 			return 404;
108 108
 		}
109 109
 
@@ -123,13 +123,13 @@  discard block
 block discarded – undo
123 123
 		if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) {
124 124
 			foreach ($addUsers as $addUser) {
125 125
 				if (!$this->userManager->userExists($addUser)) {
126
-					$output->writeln('<error>User "' . $addUser . '" not found</error>');
126
+					$output->writeln('<error>User "'.$addUser.'" not found</error>');
127 127
 					return 404;
128 128
 				}
129 129
 			}
130 130
 			foreach ($addGroups as $addGroup) {
131 131
 				if (!$this->groupManager->groupExists($addGroup)) {
132
-					$output->writeln('<error>Group "' . $addGroup . '" not found</error>');
132
+					$output->writeln('<error>Group "'.$addGroup.'" not found</error>');
133 133
 					return 404;
134 134
 				}
135 135
 			}
Please login to merge, or discard this patch.
apps/files_external/lib/Command/ListCommand.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -156,11 +156,11 @@  discard block
 block discarded – undo
156 156
 		}
157 157
 
158 158
 		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
159
-			$keys = array_map(function ($header) {
159
+			$keys = array_map(function($header) {
160 160
 				return strtolower(str_replace(' ', '_', $header));
161 161
 			}, $headers);
162 162
 
163
-			$pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
163
+			$pairs = array_map(function(StorageConfig $config) use ($keys, $userId) {
164 164
 				$values = [
165 165
 					$config->getId(),
166 166
 					$config->getMountPoint(),
@@ -193,23 +193,23 @@  discard block
 block discarded – undo
193 193
 				'enable_sharing' => false,
194 194
 				'encoding_compatibility' => false
195 195
 			];
196
-			$rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
196
+			$rows = array_map(function(StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
197 197
 				$storageConfig = $config->getBackendOptions();
198 198
 				$keys = array_keys($storageConfig);
199 199
 				$values = array_values($storageConfig);
200 200
 
201 201
 				if (!$full) {
202
-					$values = array_map(function ($value) {
202
+					$values = array_map(function($value) {
203 203
 						if (is_string($value) && strlen($value) > 32) {
204
-							return substr($value, 0, 6) . '...' . substr($value, -6, 6);
204
+							return substr($value, 0, 6).'...'.substr($value, -6, 6);
205 205
 						} else {
206 206
 							return $value;
207 207
 						}
208 208
 					}, $values);
209 209
 				}
210 210
 
211
-				$configStrings = array_map(function ($key, $value) {
212
-					return $key . ': ' . json_encode($value);
211
+				$configStrings = array_map(function($key, $value) {
212
+					return $key.': '.json_encode($value);
213 213
 				}, $keys, $values);
214 214
 				$configString = implode(', ', $configStrings);
215 215
 
@@ -223,8 +223,8 @@  discard block
 block discarded – undo
223 223
 				$keys = array_keys($mountOptions);
224 224
 				$values = array_values($mountOptions);
225 225
 
226
-				$optionsStrings = array_map(function ($key, $value) {
227
-					return $key . ': ' . json_encode($value);
226
+				$optionsStrings = array_map(function($key, $value) {
227
+					return $key.': '.json_encode($value);
228 228
 				}, $keys, $values);
229 229
 				$optionsString = implode(', ', $optionsStrings);
230 230
 
Please login to merge, or discard this patch.
apps/files_external/lib/Command/Config.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 		try {
69 69
 			$mount = $this->globalService->getStorage($mountId);
70 70
 		} catch (NotFoundException $e) {
71
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
71
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
72 72
 			return 404;
73 73
 		}
74 74
 
Please login to merge, or discard this patch.
apps/files_external/lib/Command/Verify.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 		try {
72 72
 			$mount = $this->globalService->getStorage($mountId);
73 73
 		} catch (NotFoundException $e) {
74
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
74
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
75 75
 			return 404;
76 76
 		}
77 77
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 		$backend->manipulateStorageConfig($storage);
94 94
 	}
95 95
 
96
-	private function updateStorageStatus(StorageConfig &$storage, $configInput, OutputInterface $output) {
96
+	private function updateStorageStatus(StorageConfig & $storage, $configInput, OutputInterface $output) {
97 97
 		try {
98 98
 			try {
99 99
 				$this->manipulateStorageConfig($storage);
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 
106 106
 			foreach ($configInput as $configOption) {
107 107
 				if (!strpos($configOption, '=')) {
108
-					$output->writeln('<error>Invalid mount configuration option "' . $configOption . '"</error>');
108
+					$output->writeln('<error>Invalid mount configuration option "'.$configOption.'"</error>');
109 109
 					return;
110 110
 				}
111 111
 				list($key, $value) = explode('=', $configOption, 2);
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 			// FIXME: convert storage exceptions to StorageNotAvailableException
138 138
 			$storage->setStatus(
139 139
 				StorageNotAvailableException::STATUS_ERROR,
140
-				get_class($e) . ': ' . $e->getMessage()
140
+				get_class($e).': '.$e->getMessage()
141 141
 			);
142 142
 		}
143 143
 	}
Please login to merge, or discard this patch.
apps/files_external/lib/Command/Notify.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 			return 1;
121 121
 		}
122 122
 		if (!$storage instanceof INotifyStorage) {
123
-			$output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>');
123
+			$output->writeln('<error>Mount of type "'.$mount->getBackend()->getText().'" does not support active update notifications</error>');
124 124
 			return 1;
125 125
 		}
126 126
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 		$path = trim($input->getOption('path'), '/');
130 130
 		$notifyHandler = $storage->notify($path);
131 131
 		$this->selfTest($storage, $notifyHandler, $verbose, $output);
132
-		$notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) {
132
+		$notifyHandler->listen(function(IChange $change) use ($mount, $verbose, $output) {
133 133
 			if ($verbose) {
134 134
 				$this->logUpdate($change, $output);
135 135
 			}
@@ -171,9 +171,9 @@  discard block
 block discarded – undo
171 171
 				return;
172 172
 		}
173 173
 
174
-		$text .= ' ' . $change->getPath();
174
+		$text .= ' '.$change->getPath();
175 175
 		if ($change instanceof IRenameChange) {
176
-			$text .= ' to ' . $change->getTargetPath();
176
+			$text .= ' to '.$change->getTargetPath();
177 177
 		}
178 178
 
179 179
 		$output->writeln($text);
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/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.