Completed
Pull Request — master (#9222)
by Joas
71:57 queued 42:38
created
core/Command/Encryption/Enable.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -70,9 +70,9 @@
 block discarded – undo
70 70
 			if ($defaultModule === null) {
71 71
 				$output->writeln('<error>No default module is set</error>');
72 72
 			} else if (!isset($modules[$defaultModule])) {
73
-				$output->writeln('<error>The current default module does not exist: ' . $defaultModule . '</error>');
73
+				$output->writeln('<error>The current default module does not exist: '.$defaultModule.'</error>');
74 74
 			} else {
75
-				$output->writeln('Default module: ' . $defaultModule);
75
+				$output->writeln('Default module: '.$defaultModule);
76 76
 			}
77 77
 		}
78 78
 	}
Please login to merge, or discard this patch.
core/Command/Encryption/ListModules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@
 block discarded – undo
71 71
 				if (!$item['default']) {
72 72
 					$item = $item['displayName'];
73 73
 				} else {
74
-					$item = $item['displayName'] . ' [default*]';
74
+					$item = $item['displayName'].' [default*]';
75 75
 				}
76 76
 			});
77 77
 		}
Please login to merge, or discard this patch.
core/Command/Encryption/SetDefaultModule.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -59,11 +59,11 @@
 block discarded – undo
59 59
 		$moduleId = $input->getArgument('module');
60 60
 
61 61
 		if ($moduleId === $this->encryptionManager->getDefaultEncryptionModuleId()) {
62
-			$output->writeln('"' . $moduleId . '"" is already the default module');
62
+			$output->writeln('"'.$moduleId.'"" is already the default module');
63 63
 		} else if ($this->encryptionManager->setDefaultEncryptionModule($moduleId)) {
64
-			$output->writeln('<info>Set default module to "' . $moduleId . '"</info>');
64
+			$output->writeln('<info>Set default module to "'.$moduleId.'"</info>');
65 65
 		} else {
66
-			$output->writeln('<error>The specified module "' . $moduleId . '" does not exist</error>');
66
+			$output->writeln('<error>The specified module "'.$moduleId.'" does not exist</error>');
67 67
 		}
68 68
 	}
69 69
 }
Please login to merge, or discard this patch.
core/Command/Group/ListCommand.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	}
72 72
 
73 73
 	protected function execute(InputInterface $input, OutputInterface $output) {
74
-		$groups = $this->groupManager->search('', (int)$input->getOption('limit'), (int)$input->getOption('offset'));
74
+		$groups = $this->groupManager->search('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
75 75
 		$this->writeArrayInOutputFormat($input, $output, $this->formatGroups($groups));
76 76
 	}
77 77
 
@@ -80,10 +80,10 @@  discard block
 block discarded – undo
80 80
 	 * @return array
81 81
 	 */
82 82
 	private function formatGroups(array $groups) {
83
-		$keys = array_map(function (IGroup $group) {
83
+		$keys = array_map(function(IGroup $group) {
84 84
 			return $group->getGID();
85 85
 		}, $groups);
86
-		$values = array_map(function (IGroup $group) {
86
+		$values = array_map(function(IGroup $group) {
87 87
 			return array_keys($group->getUsers());
88 88
 		}, $groups);
89 89
 		return array_combine($keys, $values);
Please login to merge, or discard this patch.
settings/templates/users/part.setquota.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -1,35 +1,35 @@
 block discarded – undo
1 1
 <div class="quota">
2 2
 	<!-- Default storage -->
3
-	<span><?php p($l->t('Default quota'));?></span>
4
-	<?php if((bool) $_['isAdmin']): ?>
3
+	<span><?php p($l->t('Default quota')); ?></span>
4
+	<?php if ((bool) $_['isAdmin']): ?>
5 5
 		<select id='default_quota' data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>" data-tipsy-gravity="s">
6
-			<option <?php if($_['default_quota'] === 'none') print_unescaped('selected="selected"');?> value='none'>
7
-				<?php p($l->t('Unlimited'));?>
6
+			<option <?php if ($_['default_quota'] === 'none') print_unescaped('selected="selected"'); ?> value='none'>
7
+				<?php p($l->t('Unlimited')); ?>
8 8
 			</option>
9
-			<?php foreach($_['quota_preset'] as $preset):?>
10
-				<?php if($preset !== 'default'):?>
11
-					<option <?php if($_['default_quota']==$preset) print_unescaped('selected="selected"');?> value='<?php p($preset);?>'>
12
-						<?php p($preset);?>
9
+			<?php foreach ($_['quota_preset'] as $preset):?>
10
+				<?php if ($preset !== 'default'):?>
11
+					<option <?php if ($_['default_quota'] == $preset) print_unescaped('selected="selected"'); ?> value='<?php p($preset); ?>'>
12
+						<?php p($preset); ?>
13 13
 					</option>
14
-				<?php endif;?>
15
-			<?php endforeach;?>
16
-			<?php if($_['defaultQuotaIsUserDefined']):?>
17
-				<option selected="selected" value='<?php p($_['default_quota']);?>'>
18
-					<?php p($_['default_quota']);?>
14
+				<?php endif; ?>
15
+			<?php endforeach; ?>
16
+			<?php if ($_['defaultQuotaIsUserDefined']):?>
17
+				<option selected="selected" value='<?php p($_['default_quota']); ?>'>
18
+					<?php p($_['default_quota']); ?>
19 19
 				</option>
20
-			<?php endif;?>
20
+			<?php endif; ?>
21 21
 			<option data-new value='other'>
22
-				<?php p($l->t('Other'));?>
22
+				<?php p($l->t('Other')); ?>
23 23
 				...
24 24
 			</option>
25 25
 		</select>
26 26
 	<?php endif; ?>
27
-	<?php if((bool) !$_['isAdmin']): ?>
27
+	<?php if ((bool) !$_['isAdmin']): ?>
28 28
 		:
29
-		<?php if( $_['default_quota'] === 'none'): ?>
30
-			<?php p($l->t('Unlimited'));?>
29
+		<?php if ($_['default_quota'] === 'none'): ?>
30
+			<?php p($l->t('Unlimited')); ?>
31 31
 		<?php else: ?>
32
-			<?php p($_['default_quota']);?>
32
+			<?php p($_['default_quota']); ?>
33 33
 		<?php endif; ?>
34 34
 	<?php endif; ?>
35 35
 </div>
Please login to merge, or discard this patch.
settings/help.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -31,28 +31,28 @@
 block discarded – undo
31 31
 OC_Util::checkLoggedIn();
32 32
 
33 33
 // Load the files we need
34
-OC_Util::addStyle( "settings", "settings" );
34
+OC_Util::addStyle("settings", "settings");
35 35
 \OC::$server->getNavigationManager()->setActiveEntry('help');
36 36
 
37 37
 
38
-if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
39
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
40
-	$style1='';
41
-	$style2=' active';
42
-}else{
43
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
44
-	$style1=' active';
45
-	$style2='';
38
+if (isset($_GET['mode']) and $_GET['mode'] === 'admin') {
39
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/admin/index.html');
40
+	$style1 = '';
41
+	$style2 = ' active';
42
+} else {
43
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/user/index.html');
44
+	$style1 = ' active';
45
+	$style2 = '';
46 46
 }
47 47
 
48
-$url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
49
-$url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
48
+$url1 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
49
+$url2 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
50 50
 
51
-$tmpl = new OC_Template( "settings", "help", "user" );
52
-$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser()));
53
-$tmpl->assign( "url", $url );
54
-$tmpl->assign( "url1", $url1 );
55
-$tmpl->assign( "url2", $url2 );
56
-$tmpl->assign( "style1", $style1 );
57
-$tmpl->assign( "style2", $style2 );
51
+$tmpl = new OC_Template("settings", "help", "user");
52
+$tmpl->assign("admin", OC_User::isAdminUser(OC_User::getUser()));
53
+$tmpl->assign("url", $url);
54
+$tmpl->assign("url1", $url1);
55
+$tmpl->assign("url2", $url2);
56
+$tmpl->assign("style1", $style1);
57
+$tmpl->assign("style2", $style2);
58 58
 $tmpl->printPage();
Please login to merge, or discard this patch.
lib/public/AppFramework/Db/DoesNotExistException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	 * @param string $msg the error message
38 38
 	 * @since 7.0.0
39 39
 	 */
40
-	public function __construct($msg){
40
+	public function __construct($msg) {
41 41
 		parent::__construct($msg);
42 42
 	}
43 43
 
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/Base.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
 	protected function setSubjects(IEvent $event, $subject, array $parameters) {
198 198
 		$placeholders = $replacements = [];
199 199
 		foreach ($parameters as $placeholder => $parameter) {
200
-			$placeholders[] = '{' . $placeholder . '}';
200
+			$placeholders[] = '{'.$placeholder.'}';
201 201
 			if ($parameter['type'] === 'file') {
202 202
 				$replacements[] = $parameter['path'];
203 203
 			} else {
Please login to merge, or discard this patch.
apps/files_external/lib/Command/Delete.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.