Inspection of "Merge pull request #26781 from nextcloud/bugfix/no..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( d52ee8...0e6e80 )

by Joas

created 2021-04-27 13:56 UTC

Status

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

@@ -29,10 +29,10 @@
 block discarded – undo
  *
  */
 
-require_once __DIR__ . '/lib/versioncheck.php';
+require_once __DIR__.'/lib/versioncheck.php';
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	OC::handleRequest();
 } catch (\OC\ServiceUnavailableException $ex) {

Please login to merge, or discard this patch.

core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php 1 patch

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

@@ -45,15 +45,15 @@  discard block
 block discarded – undo
 	 *
 	 */
 	public function run($arguments) {
-		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
+		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
 		$instanceId = $this->config->getSystemValue('instanceid', null);
 
 		if (!is_string($instanceId) || empty($instanceId)) {
 			return;
 		}
 
-		$updaterFolderPath = $dataDir . '/updater-' . $instanceId;
-		$backupFolderPath = $updaterFolderPath . '/backups';
+		$updaterFolderPath = $dataDir.'/updater-'.$instanceId;
+		$backupFolderPath = $updaterFolderPath.'/backups';
 		if (file_exists($backupFolderPath)) {
 			$this->log->info("$backupFolderPath exists - start to clean it up");
 
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
 			ksort($dirList);
 			// drop the newest 3 directories
 			$dirList = array_slice($dirList, 0, -3);
-			$this->log->info("List of all directories that will be deleted: " . json_encode($dirList));
+			$this->log->info("List of all directories that will be deleted: ".json_encode($dirList));
 
 			foreach ($dirList as $dir) {
 				$this->log->info("Removing $dir ...");

Please login to merge, or discard this patch.

core/templates/404.php 1 patch

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

@@ -7,7 +7,7 @@
 block discarded – undo
 	require_once '../../lib/base.php';
 
 	$urlGenerator = \OC::$server->getURLGenerator();
-	header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
+	header('Location: '.$urlGenerator->getAbsoluteURL('/'));
 	exit;
 }
 // @codeCoverageIgnoreEnd

Please login to merge, or discard this patch.

core/templates/layout.guest.php 1 patch

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

@@ -23,7 +23,7 @@
 block discarded – undo
 		<?php emit_script_loading_tags($_); ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 		<?php include 'layout.noscript.warning.php'; ?>
 		<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
 			<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">

Please login to merge, or discard this patch.

core/templates/loginflow/authpicker.php 1 patch

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

@@ -30,7 +30,7 @@
 block discarded – undo
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-			'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+			'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 			\OCP\Util::sanitizeHTML($_['instanceName'])
 		])) ?>
 	</p>

Please login to merge, or discard this patch.

core/templates/error.php 1 patch

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

@@ -6,7 +6,7 @@
 block discarded – undo
 			<p><?php p($error['error']) ?></p>
 			<?php if (isset($error['hint']) && $error['hint']): ?>
 				<p class='hint'><?php p($error['hint']) ?></p>
-			<?php endif;?>
+			<?php endif; ?>
 		</li>
 	<?php endforeach ?>
 	</ul>

Please login to merge, or discard this patch.

core/Command/Encryption/ChangeKeyStorageRoot.php 1 patch

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

@@ -142,7 +142,7 @@  discard block
 block discarded – undo
 		}
 
 		$result = $this->rootView->file_put_contents(
-			$newRoot . '/' . Storage::KEY_STORAGE_MARKER,
+			$newRoot.'/'.Storage::KEY_STORAGE_MARKER,
 			'Nextcloud will detect this folder as key storage root only if this file exists'
 		);
 
@@ -160,10 +160,10 @@  discard block
 block discarded – undo
 	 */
 	protected function moveSystemKeys($oldRoot, $newRoot) {
 		if (
-			$this->rootView->is_dir($oldRoot . '/files_encryption') &&
-			$this->targetExists($newRoot . '/files_encryption') === false
+			$this->rootView->is_dir($oldRoot.'/files_encryption') &&
+			$this->targetExists($newRoot.'/files_encryption') === false
 		) {
-			$this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
+			$this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption');
 		}
 	}
 
@@ -217,13 +217,13 @@  discard block
 block discarded – undo
 	 */
 	protected function moveUserEncryptionFolder($user, $oldRoot, $newRoot) {
 		if ($this->userManager->userExists($user)) {
-			$source = $oldRoot . '/' . $user . '/files_encryption';
-			$target = $newRoot . '/' . $user . '/files_encryption';
+			$source = $oldRoot.'/'.$user.'/files_encryption';
+			$target = $newRoot.'/'.$user.'/files_encryption';
 			if (
 				$this->rootView->is_dir($source) &&
 				$this->targetExists($target) === false
 			) {
-				$this->prepareParentFolder($newRoot . '/' . $user);
+				$this->prepareParentFolder($newRoot.'/'.$user);
 				$this->rootView->rename($source, $target);
 			}
 		}
@@ -241,7 +241,7 @@  discard block
 block discarded – undo
 			$sub_dirs = explode('/', ltrim($path, '/'));
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
-				$dir .= '/' . $sub_dir;
+				$dir .= '/'.$sub_dir;
 				if ($this->rootView->file_exists($dir) === false) {
 					$this->rootView->mkdir($dir);
 				}

Please login to merge, or discard this patch.

core/Command/Maintenance/Mimetype/GenerateMimetypeFileBuilder.php 1 patch

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

@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 	 */
 	public function generateFile(array $aliases): string {
 		// Remove comments
-		$keys = array_filter(array_keys($aliases), function ($k) {
+		$keys = array_filter(array_keys($aliases), function($k) {
 			return $k[0] === '_';
 		});
 		foreach ($keys as $key) {
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
 			}
 
 			$theme = $dir->getFilename();
-			$themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
+			$themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
 			// Check if this theme has its own filetype icons
 			if (!file_exists($themeDir)) {
 				continue;
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
 * To regenerate this file run ./occ maintenance:mimetype:update-js
 */
 OC.MimeTypeList={
-	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES) . ',
-	files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
-	themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
+	aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES).',
+	files: ' . json_encode($files, JSON_PRETTY_PRINT).',
+	themes: ' . json_encode($themes, JSON_PRETTY_PRINT).'
 };
 ';
 	}

Please login to merge, or discard this patch.

core/Command/TwoFactorAuth/State.php 1 patch

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

@@ -99,9 +99,9 @@
 block discarded – undo
 			return;
 		}
 
-		$output->writeln($title . ":");
+		$output->writeln($title.":");
 		foreach ($providers as $provider) {
-			$output->writeln("- " . $provider);
+			$output->writeln("- ".$provider);
 		}
 	}
 }

Please login to merge, or discard this patch.

		@@ -142,7 +142,7 @@ discard block
		block discarded – undo
142	142	}
143	143
144	144	$result = $this->rootView->file_put_contents(
145		- $newRoot . '/' . Storage::KEY_STORAGE_MARKER,
	145	+ $newRoot.'/'.Storage::KEY_STORAGE_MARKER,
146	146	'Nextcloud will detect this folder as key storage root only if this file exists'
147	147	);
148	148
		@@ -160,10 +160,10 @@ discard block
		block discarded – undo
160	160	*/
161	161	protected function moveSystemKeys($oldRoot, $newRoot) {
162	162	if (
163		- $this->rootView->is_dir($oldRoot . '/files_encryption') &&
164		- $this->targetExists($newRoot . '/files_encryption') === false
	163	+ $this->rootView->is_dir($oldRoot.'/files_encryption') &&
	164	+ $this->targetExists($newRoot.'/files_encryption') === false
165	165	) {
166		- $this->rootView->rename($oldRoot . '/files_encryption', $newRoot . '/files_encryption');
	166	+ $this->rootView->rename($oldRoot.'/files_encryption', $newRoot.'/files_encryption');
167	167	}
168	168	}
169	169
		@@ -217,13 +217,13 @@ discard block
		block discarded – undo
217	217	*/
218	218	protected function moveUserEncryptionFolder($user, $oldRoot, $newRoot) {
219	219	if ($this->userManager->userExists($user)) {
220		- $source = $oldRoot . '/' . $user . '/files_encryption';
221		- $target = $newRoot . '/' . $user . '/files_encryption';
	220	+ $source = $oldRoot.'/'.$user.'/files_encryption';
	221	+ $target = $newRoot.'/'.$user.'/files_encryption';
222	222	if (
223	223	$this->rootView->is_dir($source) &&
224	224	$this->targetExists($target) === false
225	225	) {
226		- $this->prepareParentFolder($newRoot . '/' . $user);
	226	+ $this->prepareParentFolder($newRoot.'/'.$user);
227	227	$this->rootView->rename($source, $target);
228	228	}
229	229	}
		@@ -241,7 +241,7 @@ discard block
		block discarded – undo
241	241	$sub_dirs = explode('/', ltrim($path, '/'));
242	242	$dir = '';
243	243	foreach ($sub_dirs as $sub_dir) {
244		- $dir .= '/' . $sub_dir;
	244	+ $dir .= '/'.$sub_dir;
245	245	if ($this->rootView->file_exists($dir) === false) {
246	246	$this->rootView->mkdir($dir);
247	247	}

		@@ -99,9 +99,9 @@
		block discarded – undo
99	99	return;
100	100	}
101	101
102		- $output->writeln($title . ":");
	102	+ $output->writeln($title.":");
103	103	foreach ($providers as $provider) {
104		- $output->writeln("- " . $provider);
	104	+ $output->writeln("- ".$provider);
105	105	}
106	106	}
107	107	}

		@@ -29,10 +29,10 @@
		block discarded – undo
29	29	*
30	30	*/
31	31
32		-require_once __DIR__ . '/lib/versioncheck.php';
	32	+require_once __DIR__.'/lib/versioncheck.php';
33	33
34	34	try {
35		- require_once __DIR__ . '/lib/base.php';
	35	+ require_once __DIR__.'/lib/base.php';
36	36
37	37	OC::handleRequest();
38	38	} catch (\OC\ServiceUnavailableException $ex) {

		@@ -45,15 +45,15 @@ discard block
		block discarded – undo
45	45	*
46	46	*/
47	47	public function run($arguments) {
48		- $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data');
	48	+ $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
49	49	$instanceId = $this->config->getSystemValue('instanceid', null);
50	50
51	51	if (!is_string($instanceId) \|\| empty($instanceId)) {
52	52	return;
53	53	}
54	54
55		- $updaterFolderPath = $dataDir . '/updater-' . $instanceId;
56		- $backupFolderPath = $updaterFolderPath . '/backups';
	55	+ $updaterFolderPath = $dataDir.'/updater-'.$instanceId;
	56	+ $backupFolderPath = $updaterFolderPath.'/backups';
57	57	if (file_exists($backupFolderPath)) {
58	58	$this->log->info("$backupFolderPath exists - start to clean it up");
59	59
		@@ -78,7 +78,7 @@ discard block
		block discarded – undo
78	78	ksort($dirList);
79	79	// drop the newest 3 directories
80	80	$dirList = array_slice($dirList, 0, -3);
81		- $this->log->info("List of all directories that will be deleted: " . json_encode($dirList));
	81	+ $this->log->info("List of all directories that will be deleted: ".json_encode($dirList));
82	82
83	83	foreach ($dirList as $dir) {
84	84	$this->log->info("Removing $dir ...");

		@@ -7,7 +7,7 @@
		block discarded – undo
7	7	require_once '../../lib/base.php';
8	8
9	9	$urlGenerator = \OC::$server->getURLGenerator();
10		- header('Location: ' . $urlGenerator->getAbsoluteURL('/'));
	10	+ header('Location: '.$urlGenerator->getAbsoluteURL('/'));
11	11	exit;
12	12	}
13	13	// @codeCoverageIgnoreEnd

		@@ -23,7 +23,7 @@
		block discarded – undo
23	23	<?php emit_script_loading_tags($_); ?>
24	24	<?php print_unescaped($_['headers']); ?>
25	25	</head>
26		- <body id="<?php p($_['bodyid']);?>">
	26	+ <body id="<?php p($_['bodyid']); ?>">
27	27	<?php include 'layout.noscript.warning.php'; ?>
28	28	<?php foreach ($_['initialStates'] as $app => $initialState) { ?>
29	29	<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">

		@@ -30,7 +30,7 @@
		block discarded – undo
30	30	<h2><?php p($l->t('Connect to your account')) ?></h2>
31	31	<p class="info">
32	32	<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
33		- '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
	33	+ '<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
34	34	\OCP\Util::sanitizeHTML($_['instanceName'])
35	35	])) ?>
36	36	</p>

		@@ -6,7 +6,7 @@
		block discarded – undo
6	6	<p><?php p($error['error']) ?></p>
7	7	<?php if (isset($error['hint']) && $error['hint']): ?>
8	8	<p class='hint'><?php p($error['hint']) ?></p>
9		- <?php endif;?>
	9	+ <?php endif; ?>
10	10	</li>
11	11	<?php endforeach ?>
12	12	</ul>

		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	*/
36	36	public function generateFile(array $aliases): string {
37	37	// Remove comments
38		- $keys = array_filter(array_keys($aliases), function ($k) {
	38	+ $keys = array_filter(array_keys($aliases), function($k) {
39	39	return $k[0] === '_';
40	40	});
41	41	foreach ($keys as $key) {
		@@ -67,7 +67,7 @@ discard block
		block discarded – undo
67	67	}
68	68
69	69	$theme = $dir->getFilename();
70		- $themeDir = $dir->getPath() . '/' . $theme . '/core/img/filetypes/';
	70	+ $themeDir = $dir->getPath().'/'.$theme.'/core/img/filetypes/';
71	71	// Check if this theme has its own filetype icons
72	72	if (!file_exists($themeDir)) {
73	73	continue;
		@@ -98,9 +98,9 @@ discard block
		block discarded – undo
98	98	* To regenerate this file run ./occ maintenance:mimetype:update-js
99	99	*/
100	100	OC.MimeTypeList={
101		- aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES) . ',
102		- files: ' . json_encode($files, JSON_PRETTY_PRINT) . ',
103		- themes: ' . json_encode($themes, JSON_PRETTY_PRINT) . '
	101	+ aliases: ' . json_encode($aliases, JSON_PRETTY_PRINT \| JSON_UNESCAPED_SLASHES).',
	102	+ files: ' . json_encode($files, JSON_PRETTY_PRINT).',
	103	+ themes: ' . json_encode($themes, JSON_PRETTY_PRINT).'
104	104	};
105	105	';
106	106	}

nextcloud / server

Push — master ( d52ee8...0e6e80 )

Status

Category

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

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

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

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

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

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

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

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

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