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

Passed

Push — master ( 645109...008e6d )

by Christoph

created 2020-04-09 18:39 UTC

Status

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

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitTesting::getInitializer($loader));
         } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }

Please login to merge, or discard this patch.

apps/files_trashbin/composer/composer/autoload_real.php 1 patch

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

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitFiles_Trashbin::getInitializer($loader));
         } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }

Please login to merge, or discard this patch.

apps/user_ldap/composer/composer/autoload_real.php 1 patch

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

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitUser_LDAP::getInitializer($loader));
         } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }

Please login to merge, or discard this patch.

apps/provisioning_api/composer/composer/autoload_real.php 1 patch

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

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitProvisioning_API::getInitializer($loader));
         } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }

Please login to merge, or discard this patch.

apps/oauth2/composer/composer/autoload_real.php 1 patch

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

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitOAuth2::getInitializer($loader));
         } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }

Please login to merge, or discard this patch.

apps/admin_audit/composer/composer/autoload_real.php 1 patch

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

@@ -9,7 +9,7 @@  discard block
 block discarded – undo
     public static function loadClassLoader($class)
     {
         if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
+            require __DIR__.'/ClassLoader.php';
         }
     }
 
@@ -25,11 +25,11 @@  discard block
 block discarded – undo
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
+            require_once __DIR__.'/autoload_static.php';
 
             call_user_func(\Composer\Autoload\ComposerStaticInitAdminAudit::getInitializer($loader));
         } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
+            $classMap = require __DIR__.'/autoload_classmap.php';
             if ($classMap) {
                 $loader->addClassMap($classMap);
             }

Please login to merge, or discard this patch.

lib/private/Files/ObjectStore/S3Signature.php 1 patch

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

@@ -45,7 +45,7 @@  discard block
 block discarded – undo
 		$request = $this->prepareRequest($request, $credentials);
 		$stringToSign = $this->createCanonicalizedString($request);
 		$auth = 'AWS '
-			. $credentials->getAccessKeyId() . ':'
+			. $credentials->getAccessKeyId().':'
 			. $this->signString($stringToSign, $credentials);
 
 		return $request->withHeader('Authorization', $auth);
@@ -130,11 +130,11 @@  discard block
 block discarded – undo
 		RequestInterface $request,
 		$expires = null
 	) {
-		$buffer = $request->getMethod() . "\n";
+		$buffer = $request->getMethod()."\n";
 
 		// Add the interesting headers
 		foreach ($this->signableHeaders as $header) {
-			$buffer .= $request->getHeaderLine($header) . "\n";
+			$buffer .= $request->getHeaderLine($header)."\n";
 		}
 
 		$date = $expires ?: $request->getHeaderLine('date');
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
 			if (strpos($name, 'x-amz-') === 0) {
 				$value = implode(',', $header);
 				if (strlen($value) > 0) {
-					$headers[$name] = $name . ':' . $value;
+					$headers[$name] = $name.':'.$value;
 				}
 			}
 		}
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
 
 		ksort($headers);
 
-		return implode("\n", $headers) . "\n";
+		return implode("\n", $headers)."\n";
 	}
 
 	private function createCanonicalizedResource(RequestInterface $request)
@@ -175,7 +175,7 @@  discard block
 block discarded – undo
 		if ($data['bucket']) {
 			$buffer .= $data['bucket'];
 			if (!empty($data['key']) || !$data['path_style']) {
-				$buffer .= '/' . $data['key'];
+				$buffer .= '/'.$data['key'];
 			}
 		}
 

Please login to merge, or discard this patch.

lib/private/DB/QueryBuilder/ExpressionBuilder/SqliteExpressionBuilder.php 1 patch

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

@@ -29,7 +29,7 @@
 block discarded – undo
 	 * @inheritdoc
 	 */
 	public function like($x, $y, $type = null) {
-		return parent::like($x, $y, $type) . " ESCAPE '\\'";
+		return parent::like($x, $y, $type)." ESCAPE '\\'";
 	}
 
 	public function iLike($x, $y, $type = null) {

Please login to merge, or discard this patch.

apps/files/lib/Helper.php 1 patch

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

@@ -58,7 +58,7 @@  discard block
 block discarded – undo
 			'freeSpace' => $storageInfo['free'],
 			'quota' => $storageInfo['quota'],
 			'used' => $storageInfo['used'],
-			'usedSpacePercent'  => (int)$storageInfo['relative'],
+			'usedSpacePercent'  => (int) $storageInfo['relative'],
 			'owner' => $storageInfo['owner'],
 			'ownerDisplayName' => $storageInfo['ownerDisplayName'],
 		];
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 	 * @return string icon URL
 	 */
 	public static function determineIcon($file) {
-		if($file['type'] === 'dir') {
+		if ($file['type'] === 'dir') {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
 			// TODO: move this part to the client side, using mountType
 			if ($file->isShared()) {
@@ -79,11 +79,11 @@  discard block
 block discarded – undo
 			} elseif ($file->isMounted()) {
 				$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
 			}
-		}else{
+		} else {
 			$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
 		}
 
-		return substr($icon, 0, -3) . 'svg';
+		return substr($icon, 0, -3).'svg';
 	}
 
 	/**

Please login to merge, or discard this patch.

		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	$request = $this->prepareRequest($request, $credentials);
46	46	$stringToSign = $this->createCanonicalizedString($request);
47	47	$auth = 'AWS '
48		- . $credentials->getAccessKeyId() . ':'
	48	+ . $credentials->getAccessKeyId().':'
49	49	. $this->signString($stringToSign, $credentials);
50	50
51	51	return $request->withHeader('Authorization', $auth);
		@@ -130,11 +130,11 @@ discard block
		block discarded – undo
130	130	RequestInterface $request,
131	131	$expires = null
132	132	) {
133		- $buffer = $request->getMethod() . "\n";
	133	+ $buffer = $request->getMethod()."\n";
134	134
135	135	// Add the interesting headers
136	136	foreach ($this->signableHeaders as $header) {
137		- $buffer .= $request->getHeaderLine($header) . "\n";
	137	+ $buffer .= $request->getHeaderLine($header)."\n";
138	138	}
139	139
140	140	$date = $expires ?: $request->getHeaderLine('date');
		@@ -153,7 +153,7 @@ discard block
		block discarded – undo
153	153	if (strpos($name, 'x-amz-') === 0) {
154	154	$value = implode(',', $header);
155	155	if (strlen($value) > 0) {
156		- $headers[$name] = $name . ':' . $value;
	156	+ $headers[$name] = $name.':'.$value;
157	157	}
158	158	}
159	159	}
		@@ -164,7 +164,7 @@ discard block
		block discarded – undo
164	164
165	165	ksort($headers);
166	166
167		- return implode("\n", $headers) . "\n";
	167	+ return implode("\n", $headers)."\n";
168	168	}
169	169
170	170	private function createCanonicalizedResource(RequestInterface $request)
		@@ -175,7 +175,7 @@ discard block
		block discarded – undo
175	175	if ($data['bucket']) {
176	176	$buffer .= $data['bucket'];
177	177	if (!empty($data['key']) \|\| !$data['path_style']) {
178		- $buffer .= '/' . $data['key'];
	178	+ $buffer .= '/'.$data['key'];
179	179	}
180	180	}
181	181

		@@ -9,7 +9,7 @@ discard block
		block discarded – undo
9	9	public static function loadClassLoader($class)
10	10	{
11	11	if ('Composer\Autoload\ClassLoader' === $class) {
12		- require __DIR__ . '/ClassLoader.php';
	12	+ require __DIR__.'/ClassLoader.php';
13	13	}
14	14	}
15	15
		@@ -25,11 +25,11 @@ discard block
		block discarded – undo
25	25
26	26	$useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') \|\| !zend_loader_file_encoded());
27	27	if ($useStaticLoader) {
28		- require_once __DIR__ . '/autoload_static.php';
	28	+ require_once __DIR__.'/autoload_static.php';
29	29
30	30	call_user_func(\Composer\Autoload\ComposerStaticInitTesting::getInitializer($loader));
31	31	} else {
32		- $classMap = require __DIR__ . '/autoload_classmap.php';
	32	+ $classMap = require __DIR__.'/autoload_classmap.php';
33	33	if ($classMap) {
34	34	$loader->addClassMap($classMap);
35	35	}

		@@ -29,7 +29,7 @@
		block discarded – undo
29	29	* @inheritdoc
30	30	*/
31	31	public function like($x, $y, $type = null) {
32		- return parent::like($x, $y, $type) . " ESCAPE '\\'";
	32	+ return parent::like($x, $y, $type)." ESCAPE '\\'";
33	33	}
34	34
35	35	public function iLike($x, $y, $type = null) {

		@@ -58,7 +58,7 @@ discard block
		block discarded – undo
58	58	'freeSpace' => $storageInfo['free'],
59	59	'quota' => $storageInfo['quota'],
60	60	'used' => $storageInfo['used'],
61		- 'usedSpacePercent' => (int)$storageInfo['relative'],
	61	+ 'usedSpacePercent' => (int) $storageInfo['relative'],
62	62	'owner' => $storageInfo['owner'],
63	63	'ownerDisplayName' => $storageInfo['ownerDisplayName'],
64	64	];
		@@ -71,7 +71,7 @@ discard block
		block discarded – undo
71	71	* @return string icon URL
72	72	*/
73	73	public static function determineIcon($file) {
74		- if($file['type'] === 'dir') {
	74	+ if ($file['type'] === 'dir') {
75	75	$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir');
76	76	// TODO: move this part to the client side, using mountType
77	77	if ($file->isShared()) {
		@@ -79,11 +79,11 @@ discard block
		block discarded – undo
79	79	} elseif ($file->isMounted()) {
80	80	$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon('dir-external');
81	81	}
82		- }else{
	82	+ } else {
83	83	$icon = \OC::$server->getMimeTypeDetector()->mimeTypeIcon($file->getMimetype());
84	84	}
85	85
86		- return substr($icon, 0, -3) . 'svg';
	86	+ return substr($icon, 0, -3).'svg';
87	87	}
88	88
89	89	/**

nextcloud / server

Push — master ( 645109...008e6d )

Status

Category

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

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

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

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

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

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

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

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

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