Inspection of "Moving the inline js before the CSS" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#4054)

by Roeland

created 2017-03-28 20:02 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -15,7 +15,7 @@
 block discarded – undo
 		<?php foreach ($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
 		<?php endforeach; ?>
-		<?php foreach($_['printcssfiles'] as $cssfile): ?>
+		<?php foreach ($_['printcssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
 		<?php endforeach; ?>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>

Please login to merge, or discard this patch.

core/templates/layout.guest.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -18,22 +18,22 @@
 block discarded – undo
 				<?php print_unescaped($_['inline_ocjs']); ?>
 			</script>
 		<?php endif; ?>
-		<?php foreach($_['cssfiles'] as $cssfile): ?>
+		<?php foreach ($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
 		<?php endforeach; ?>
-		<?php foreach($_['printcssfiles'] as $cssfile): ?>
+		<?php foreach ($_['printcssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
 		<?php endforeach; ?>
-		<?php foreach($_['jsfiles'] as $jsfile): ?>
+		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 		<?php include('layout.noscript.warning.php'); ?>
 		<div class="wrapper">
 			<div class="v-align">
-				<?php if ($_['bodyid'] === 'body-login' ): ?>
+				<?php if ($_['bodyid'] === 'body-login'): ?>
 					<header role="banner">
 						<div id="header">
 							<div class="logo">

Please login to merge, or discard this patch.

core/templates/layout.user.php 1 patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
 		<meta charset="utf-8">
 		<title>
 			<?php
-				p(!empty($_['application'])?$_['application'].' - ':'');
+				p(!empty($_['application']) ? $_['application'].' - ' : '');
 				p($theme->getTitle());
 			?>
 		</title>
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>">
+		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>">
 		<meta name="mobile-web-app-capable" content="yes">
 		<meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>">
 		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
@@ -25,18 +25,18 @@  discard block
 block discarded – undo
 				<?php print_unescaped($_['inline_ocjs']); ?>
 			</script>
 		<?php endif; ?>
-		<?php foreach($_['cssfiles'] as $cssfile): ?>
+		<?php foreach ($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
 		<?php endforeach; ?>
-		<?php foreach($_['printcssfiles'] as $cssfile): ?>
+		<?php foreach ($_['printcssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
 		<?php endforeach; ?>
-		<?php foreach($_['jsfiles'] as $jsfile): ?>
+		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 	<?php include('layout.noscript.warning.php'); ?>
 	<div id="notification-container">
 		<div id="notification"></div>
@@ -54,18 +54,18 @@  discard block
 block discarded – undo
 
 				<a href="#" class="header-appname-container menutoggle" tabindex="2">
 					<h1 class="header-appname">
-						<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
+						<?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
 					</h1>
 					<div class="icon-caret"></div>
 				</a>
 
 				<div id="appmenu">
 					<ul>
-						<?php foreach($_['headernavigation'] as $entry): ?>
+						<?php foreach ($_['headernavigation'] as $entry): ?>
 							<li data-id="<?php p($entry['id']); ?>">
 								<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
-									<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
-									<img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon" />
+									<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
+									<img src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon" />
 									<div class="icon-loading-dark" style="display:none;"></div>
 									<span>
 								<?php p($entry['name']); ?>
@@ -85,17 +85,17 @@  discard block
 block discarded – undo
 				<nav role="navigation"><div id="navigation">
 						<div id="apps">
 							<ul>
-								<?php foreach($_['navigation'] as $entry): ?>
-									<?php if($entry['showInHeader']): ?>
+								<?php foreach ($_['navigation'] as $entry): ?>
+									<?php if ($entry['showInHeader']): ?>
 										<li data-id="<?php p($entry['id']); ?>" class="in-header">
 									<?php else: ?>
 										<li data-id="<?php p($entry['id']); ?>">
 									<?php endif; ?>
 									<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
-										<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
+										<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
 										<svg width="32" height="32" viewBox="0 0 32 32">
 											<defs><filter id="invert-<?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>
-											<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
+											<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
 										</svg>
 										<div class="icon-loading-dark" style="display:none;"></div>
 										<span>
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
 			<div id="header-right">
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
 					<label for="searchbox" class="hidden-visually">
-						<?php p($l->t('Search'));?>
+						<?php p($l->t('Search')); ?>
 					</label>
 					<input id="searchbox" type="search" name="query"
 						value="" required
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
 							<?php if ($_['userAvatarSet']): ?>
 								<img alt="" width="32" height="32"
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
-								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"
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
+								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"
 								>
 							<?php endif; ?>
 						</div>
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
 					</div>
 					<div id="expanddiv">
 					<ul>
-					<?php foreach($_['settingsnavigation'] as $entry):?>
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
 						<li>
 							<a href="<?php print_unescaped($entry['href']); ?>"
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
 								<?php p($entry['name']) ?>
 							</a>
 						</li>

Please login to merge, or discard this patch.

		@@ -15,7 +15,7 @@
		block discarded – undo
15	15	<?php foreach ($_['cssfiles'] as $cssfile): ?>
16	16	<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
17	17	<?php endforeach; ?>
18		- <?php foreach($_['printcssfiles'] as $cssfile): ?>
	18	+ <?php foreach ($_['printcssfiles'] as $cssfile): ?>
19	19	<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
20	20	<?php endforeach; ?>
21	21	<?php foreach ($_['jsfiles'] as $jsfile): ?>

		@@ -18,22 +18,22 @@
		block discarded – undo
18	18	<?php print_unescaped($_['inline_ocjs']); ?>
19	19	</script>
20	20	<?php endif; ?>
21		- <?php foreach($_['cssfiles'] as $cssfile): ?>
	21	+ <?php foreach ($_['cssfiles'] as $cssfile): ?>
22	22	<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
23	23	<?php endforeach; ?>
24		- <?php foreach($_['printcssfiles'] as $cssfile): ?>
	24	+ <?php foreach ($_['printcssfiles'] as $cssfile): ?>
25	25	<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
26	26	<?php endforeach; ?>
27		- <?php foreach($_['jsfiles'] as $jsfile): ?>
	27	+ <?php foreach ($_['jsfiles'] as $jsfile): ?>
28	28	<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script>
29	29	<?php endforeach; ?>
30	30	<?php print_unescaped($_['headers']); ?>
31	31	</head>
32		- <body id="<?php p($_['bodyid']);?>">
	32	+ <body id="<?php p($_['bodyid']); ?>">
33	33	<?php include('layout.noscript.warning.php'); ?>
34	34	<div class="wrapper">
35	35	<div class="v-align">
36		- <?php if ($_['bodyid'] === 'body-login' ): ?>
	36	+ <?php if ($_['bodyid'] === 'body-login'): ?>
37	37	<header role="banner">
38	38	<div id="header">
39	39	<div class="logo">

		@@ -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->getMailHeaderColor()); ?>">
20	20	<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
		@@ -25,18 +25,18 @@ discard block
		block discarded – undo
25	25	<?php print_unescaped($_['inline_ocjs']); ?>
26	26	</script>
27	27	<?php endif; ?>
28		- <?php foreach($_['cssfiles'] as $cssfile): ?>
	28	+ <?php foreach ($_['cssfiles'] as $cssfile): ?>
29	29	<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
30	30	<?php endforeach; ?>
31		- <?php foreach($_['printcssfiles'] as $cssfile): ?>
	31	+ <?php foreach ($_['printcssfiles'] as $cssfile): ?>
32	32	<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
33	33	<?php endforeach; ?>
34		- <?php foreach($_['jsfiles'] as $jsfile): ?>
	34	+ <?php foreach ($_['jsfiles'] as $jsfile): ?>
35	35	<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script>
36	36	<?php endforeach; ?>
37	37	<?php print_unescaped($_['headers']); ?>
38	38	</head>
39		- <body id="<?php p($_['bodyid']);?>">
	39	+ <body id="<?php p($_['bodyid']); ?>">
40	40	<?php include('layout.noscript.warning.php'); ?>
41	41	<div id="notification-container">
42	42	<div id="notification"></div>
		@@ -54,18 +54,18 @@ discard block
		block discarded – undo
54	54
55	55	<a href="#" class="header-appname-container menutoggle" tabindex="2">
56	56	<h1 class="header-appname">
57		- <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
	57	+ <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
58	58	</h1>
59	59	<div class="icon-caret"></div>
60	60	</a>
61	61
62	62	<div id="appmenu">
63	63	<ul>
64		- <?php foreach($_['headernavigation'] as $entry): ?>
	64	+ <?php foreach ($_['headernavigation'] as $entry): ?>
65	65	<li data-id="<?php p($entry['id']); ?>">
66	66	<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
67		- <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
68		- <img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon" />
	67	+ <?php if ($entry['active']): ?> class="active"<?php endif; ?>>
	68	+ <img src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>" class="app-icon" />
69	69	<div class="icon-loading-dark" style="display:none;"></div>
70	70	<span>
71	71	<?php p($entry['name']); ?>
		@@ -85,17 +85,17 @@ discard block
		block discarded – undo
85	85	<nav role="navigation"><div id="navigation">
86	86	<div id="apps">
87	87	<ul>
88		- <?php foreach($_['navigation'] as $entry): ?>
89		- <?php if($entry['showInHeader']): ?>
	88	+ <?php foreach ($_['navigation'] as $entry): ?>
	89	+ <?php if ($entry['showInHeader']): ?>
90	90	<li data-id="<?php p($entry['id']); ?>" class="in-header">
91	91	<?php else: ?>
92	92	<li data-id="<?php p($entry['id']); ?>">
93	93	<?php endif; ?>
94	94	<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
95		- <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
	95	+ <?php if ($entry['active']): ?> class="active"<?php endif; ?>>
96	96	<svg width="32" height="32" viewBox="0 0 32 32">
97	97	<defs><filter id="invert-<?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>
98		- <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image>
	98	+ <image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>" class="app-icon"></image>
99	99	</svg>
100	100	<div class="icon-loading-dark" style="display:none;"></div>
101	101	<span>
		@@ -113,7 +113,7 @@ discard block
		block discarded – undo
113	113	<div id="header-right">
114	114	<form class="searchbox" action="#" method="post" role="search" novalidate>
115	115	<label for="searchbox" class="hidden-visually">
116		- <?php p($l->t('Search'));?>
	116	+ <?php p($l->t('Search')); ?>
117	117	</label>
118	118	<input id="searchbox" type="search" name="query"
119	119	value="" required
		@@ -125,8 +125,8 @@ discard block
		block discarded – undo
125	125	<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
126	126	<?php if ($_['userAvatarSet']): ?>
127	127	<img alt="" width="32" height="32"
128		- src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
129		- 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"
	128	+ src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
	129	+ 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"
130	130	>
131	131	<?php endif; ?>
132	132	</div>
		@@ -134,11 +134,11 @@ discard block
		block discarded – undo
134	134	</div>
135	135	<div id="expanddiv">
136	136	<ul>
137		- <?php foreach($_['settingsnavigation'] as $entry):?>
	137	+ <?php foreach ($_['settingsnavigation'] as $entry):?>
138	138	<li>
139	139	<a href="<?php print_unescaped($entry['href']); ?>"
140		- <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
141		- <img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
	140	+ <?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
	141	+ <img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
142	142	<?php p($entry['name']) ?>
143	143	</a>
144	144	</li>

nextcloud / server

Pull Request — master (#4054)

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch