Passed
Push — master ( 139055...9d4e71 )
by Roeland
10:30
created
lib/private/InitialStateService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 			return;
50 50
 		}
51 51
 
52
-		$this->logger->warning('Invalid data provided to provideInitialState by ' . $appName);
52
+		$this->logger->warning('Invalid data provided to provideInitialState by '.$appName);
53 53
 	}
54 54
 
55 55
 	public function provideLazyInitialState(string $appName, \Closure $closure) {
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
62 62
 			$state = $lazyState();
63 63
 
64 64
 			if (!($lazyState instanceof \JsonSerializable)) {
65
-				$this->logger->warning($app . ' provided an invalid lazy state');
65
+				$this->logger->warning($app.' provided an invalid lazy state');
66 66
 			}
67 67
 
68 68
 			$states[$app] = json_encode($state);
Please login to merge, or discard this patch.
core/templates/layout.public.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 	<meta charset="utf-8">
5 5
 	<title>
6 6
 		<?php
7
-		p(!empty($_['application'])?$_['application'].' - ':'');
7
+		p(!empty($_['application']) ? $_['application'].' - ' : '');
8 8
 		p($theme->getTitle());
9 9
 		?>
10 10
 	</title>
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 	<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
15 15
 	<meta name="apple-mobile-web-app-capable" content="yes">
16 16
 	<meta name="apple-mobile-web-app-status-bar-style" content="black">
17
-	<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!=='files')? $_['application']:$theme->getTitle()); ?>">
17
+	<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] !== 'files') ? $_['application'] : $theme->getTitle()); ?>">
18 18
 	<meta name="mobile-web-app-capable" content="yes">
19 19
 	<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
20 20
 	<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	<?php emit_script_loading_tags($_); ?>
26 26
 	<?php print_unescaped($_['headers']); ?>
27 27
 </head>
28
-<body id="<?php p($_['bodyid']);?>">
28
+<body id="<?php p($_['bodyid']); ?>">
29 29
 <?php include('layout.noscript.warning.php'); ?>
30 30
 <?php foreach ($_['initialStates'] as $app => $initialState) { ?>
31 31
 	<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 			<span id="nextcloud">
39 39
 				<div class="logo logo-icon svg"></div>
40 40
 				<h1 class="header-appname">
41
-					<?php if (isset($template)) { p($template->getHeaderTitle()); } else { p($theme->getName());} ?>
41
+					<?php if (isset($template)) { p($template->getHeaderTitle()); } else { p($theme->getName()); } ?>
42 42
 				</h1>
43 43
 				<div class="header-shared-by">
44 44
 					<?php if (isset($template)) { p($template->getHeaderDetails()); } ?>
@@ -48,24 +48,24 @@  discard block
 block discarded – undo
48 48
 
49 49
 		<?php
50 50
 		/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
51
-		if(isset($template) && $template->getActionCount() !== 0) {
51
+		if (isset($template) && $template->getActionCount() !== 0) {
52 52
 			$primary = $template->getPrimaryAction();
53 53
 			$others = $template->getOtherActions();
54 54
 			?>
55 55
 		<div class="header-right">
56
-			<span id="header-primary-action" class="<?php if($template->getActionCount() === 1) {  p($primary->getIcon()); } ?>">
56
+			<span id="header-primary-action" class="<?php if ($template->getActionCount() === 1) {  p($primary->getIcon()); } ?>">
57 57
 				<a href="<?php p($primary->getLink()); ?>" class="primary button">
58 58
 					<span><?php p($primary->getLabel()) ?></span>
59 59
 				</a>
60 60
 			</span>
61
-			<?php if($template->getActionCount() > 1) { ?>
61
+			<?php if ($template->getActionCount() > 1) { ?>
62 62
 			<div id="header-secondary-action">
63 63
 				<span id="header-actions-toggle" class="menutoggle icon-more-white"></span>
64 64
 				<div id="header-actions-menu" class="popovermenu menu">
65 65
 					<ul>
66 66
 						<?php
67 67
 							/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
68
-							foreach($others as $action) {
68
+							foreach ($others as $action) {
69 69
 								print_unescaped($action->render());
70 70
 							}
71 71
 						?>
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	<div id="content" class="app-<?php p($_['appid']) ?>" role="main">
80 80
 		<?php print_unescaped($_['content']); ?>
81 81
 	</div>
82
-	<?php if(isset($template) && $template->getFooterVisible()) { ?>
82
+	<?php if (isset($template) && $template->getFooterVisible()) { ?>
83 83
 	<footer>
84 84
 		<p><?php print_unescaped($theme->getLongFooter()); ?></p>
85 85
 		<?php
Please login to merge, or discard this patch.
core/templates/layout.guest.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,21 +18,21 @@
 block discarded – undo
18 18
 		<?php emit_script_loading_tags($_); ?>
19 19
 		<?php print_unescaped($_['headers']); ?>
20 20
 	</head>
21
-	<body id="<?php p($_['bodyid']);?>">
21
+	<body id="<?php p($_['bodyid']); ?>">
22 22
 		<?php include 'layout.noscript.warning.php'; ?>
23 23
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
24 24
 			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
25 25
 		<?php }?>
26 26
 		<div class="wrapper">
27 27
 			<div class="v-align">
28
-				<?php if ($_['bodyid'] === 'body-login' ): ?>
28
+				<?php if ($_['bodyid'] === 'body-login'): ?>
29 29
 					<header role="banner">
30 30
 						<div id="header">
31 31
 							<div class="logo">
32 32
 								<h1 class="hidden-visually">
33 33
 									<?php p($theme->getName()); ?>
34 34
 								</h1>
35
-								<?php if(\OC::$server->getConfig()->getSystemValue('installed', false)
35
+								<?php if (\OC::$server->getConfig()->getSystemValue('installed', false)
36 36
 									&& \OC::$server->getConfig()->getAppValue('theming', 'logoMime', false)): ?>
37 37
 									<img src="<?php p($theme->getLogo()); ?>"/>
38 38
 								<?php endif; ?>
Please login to merge, or discard this patch.
core/templates/layout.user.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 		<meta charset="utf-8">
5 5
 		<title>
6 6
 			<?php
7
-				p(!empty($_['application'])?$_['application'].' - ':'');
7
+				p(!empty($_['application']) ? $_['application'].' - ' : '');
8 8
 				p($theme->getTitle());
9 9
 			?>
10 10
 		</title>
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
15 15
 		<meta name="apple-mobile-web-app-capable" content="yes">
16 16
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
17
-		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>">
17
+		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>">
18 18
 		<meta name="mobile-web-app-capable" content="yes">
19 19
 		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
20 20
 		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 		<?php emit_script_loading_tags($_); ?>
26 26
 		<?php print_unescaped($_['headers']); ?>
27 27
 	</head>
28
-	<body id="<?php p($_['bodyid']);?>">
28
+	<body id="<?php p($_['bodyid']); ?>">
29 29
 	<?php include 'layout.noscript.warning.php'; ?>
30 30
 
31 31
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 					id="nextcloud">
45 45
 					<div class="logo logo-icon">
46 46
 						<h1 class="hidden-visually">
47
-							<?php p($theme->getName()); ?> <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
47
+							<?php p($theme->getName()); ?> <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
48 48
 						</h1>
49 49
 					</div>
50 50
 				</a>
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 										<?php if ($_['themingInvertMenu']) { ?>
60 60
 										<defs><filter id="invertMenuMain-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" /></filter></defs>
61 61
 										<?php } ?>
62
-										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon" />
62
+										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon" />
63 63
 									</svg>
64 64
 								<div class="icon-loading-small-dark"
65 65
 									 style="display:none;"></div>
@@ -82,14 +82,14 @@  discard block
 block discarded – undo
82 82
 					<div id="navigation" style="display: none;"  aria-label="<?php p($l->t('More apps menu')); ?>">
83 83
 						<div id="apps">
84 84
 							<ul>
85
-								<?php foreach($_['navigation'] as $entry): ?>
85
+								<?php foreach ($_['navigation'] as $entry): ?>
86 86
 									<li data-id="<?php p($entry['id']); ?>">
87 87
 									<a href="<?php print_unescaped($entry['href']); ?>"
88
-										<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>
88
+										<?php if ($entry['active']): ?> class="active"<?php endif; ?>
89 89
 										aria-label="<?php p($entry['name']); ?>">
90 90
 										<svg width="16" height="16" viewBox="0 0 16 16" alt="">
91 91
 											<defs><filter id="invertMenuMore-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
92
-											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
92
+											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
93 93
 										</svg>
94 94
 										<div class="icon-loading-small" style="display:none;"></div>
95 95
 										<span><?php p($entry['name']); ?></span>
@@ -106,43 +106,43 @@  discard block
 block discarded – undo
106 106
 			<div class="header-right">
107 107
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
108 108
 					<label for="searchbox" class="hidden-visually">
109
-						<?php p($l->t('Search'));?>
109
+						<?php p($l->t('Search')); ?>
110 110
 					</label>
111 111
 					<input id="searchbox" type="search" name="query"
112 112
 						value="" required class="hidden icon-search-white"
113 113
 						autocomplete="off">
114
-					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
114
+					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search')); ?></span></button>
115 115
 				</form>
116 116
 				<div id="contactsmenu">
117 117
 					<div class="icon-contacts menutoggle" tabindex="0" role="button"
118 118
 					aria-haspopup="true" aria-controls="contactsmenu-menu" aria-expanded="false">
119
-						<span class="hidden-visually"><?php p($l->t('Contacts'));?></span>
119
+						<span class="hidden-visually"><?php p($l->t('Contacts')); ?></span>
120 120
 					</div>
121 121
 					<div id="contactsmenu-menu" class="menu"
122
-						aria-label="<?php p($l->t('Contacts menu'));?>"></div>
122
+						aria-label="<?php p($l->t('Contacts menu')); ?>"></div>
123 123
 				</div>
124 124
 				<div id="settings">
125 125
 					<div id="expand" tabindex="0" role="button" class="menutoggle"
126
-						aria-label="<?php p($l->t('Settings'));?>"
126
+						aria-label="<?php p($l->t('Settings')); ?>"
127 127
 						aria-haspopup="true" aria-controls="expanddiv" aria-expanded="false">
128 128
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
129 129
 							<?php if ($_['userAvatarSet']): ?>
130 130
 								<img alt="" width="32" height="32"
131
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
132
-								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
131
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
132
+								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']])); ?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']])); ?> 4x"
133 133
 								>
134 134
 							<?php endif; ?>
135 135
 						</div>
136 136
 						<div id="expandDisplayName" class="icon-settings-white"></div>
137 137
 					</div>
138 138
 					<nav id="expanddiv" style="display:none;"
139
-						aria-label="<?php p($l->t('Settings menu'));?>">
139
+						aria-label="<?php p($l->t('Settings menu')); ?>">
140 140
 					<ul>
141
-					<?php foreach($_['settingsnavigation'] as $entry):?>
141
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
142 142
 						<li data-id="<?php p($entry['id']); ?>">
143 143
 							<a href="<?php print_unescaped($entry['href']); ?>"
144
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
145
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
144
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
145
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
146 146
 								<?php p($entry['name']) ?>
147 147
 							</a>
148 148
 						</li>
Please login to merge, or discard this patch.