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

Passed

Push — master ( 7f49a2...82625e )

by Morris

created 2019-02-20 12:21 UTC

Status

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

@@ -57,41 +57,41 @@  discard block
 block discarded – undo
 	 * @param string $renderAs
 	 * @param string $appId application id
 	 */
-	public function __construct( $renderAs, $appId = '' ) {
+	public function __construct($renderAs, $appId = '') {
 
 		// yes - should be injected ....
 		$this->config = \OC::$server->getConfig();
 
-		if(\OCP\Util::isIE()) {
+		if (\OCP\Util::isIE()) {
 			\OC_Util::addStyle('ie');
 		}
 
 		// Decide which page we show
-		if($renderAs == 'user') {
-			parent::__construct( 'core', 'layout.user' );
-			if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
+		if ($renderAs == 'user') {
+			parent::__construct('core', 'layout.user');
+			if (in_array(\OC_App::getCurrentApp(), ['settings', 'admin', 'help']) !== false) {
 				$this->assign('bodyid', 'body-settings');
-			}else{
+			} else {
 				$this->assign('bodyid', 'body-user');
 			}
 
 			// Add navigation entry
-			$this->assign( 'application', '');
-			$this->assign( 'appid', $appId );
+			$this->assign('application', '');
+			$this->assign('appid', $appId);
 			$navigation = \OC::$server->getNavigationManager()->getAll();
-			$this->assign( 'navigation', $navigation);
+			$this->assign('navigation', $navigation);
 			$settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings');
-			$this->assign( 'settingsnavigation', $settingsNavigation);
-			foreach($navigation as $entry) {
+			$this->assign('settingsnavigation', $settingsNavigation);
+			foreach ($navigation as $entry) {
 				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
+					$this->assign('application', $entry['name']);
 					break;
 				}
 			}
 
-			foreach($settingsNavigation as $entry) {
+			foreach ($settingsNavigation as $entry) {
 				if ($entry['active']) {
-					$this->assign( 'application', $entry['name'] );
+					$this->assign('application', $entry['name']);
 					break;
 				}
 			}
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
 			$this->assign('user_uid', \OC_User::getUser());
 		} else if ($renderAs == 'public') {
 			parent::__construct('core', 'layout.public');
-			$this->assign( 'appid', $appId );
+			$this->assign('appid', $appId);
 			$this->assign('bodyid', 'body-public');
 			$this->assign('showSimpleSignUpLink', $this->config->getSystemValue('simpleSignUpLink.shown', true) !== false);
 		} else {
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
 		$this->assign('language', $lang);
 		$this->assign('locale', $locale);
 
-		if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
+		if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
 			if (empty(self::$versionHash)) {
 				$v = \OC_App::getAppVersions();
 				$v['core'] = implode('.', \OCP\Util::getVersion());
@@ -176,10 +176,10 @@  discard block
 block discarded – undo
 				$this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
 			}
 		}
-		foreach($jsFiles as $info) {
+		foreach ($jsFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
-			$this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
+			$this->append('jsfiles', $web.'/'.$file.$this->getVersionHashSuffix());
 		}
 
 		try {
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
 
 		// Do not initialise scss appdata until we have a fully installed instance
 		// Do not load scss for update, errors, installation or login page
-		if(\OC::$server->getSystemConfig()->getValue('installed', false)
+		if (\OC::$server->getSystemConfig()->getValue('installed', false)
 			&& !\OCP\Util::needUpgrade()
 			&& $pathInfo !== ''
 			&& !preg_match('/^\/login/', $pathInfo)
@@ -207,19 +207,19 @@  discard block
 block discarded – undo
 		$this->assign('cssfiles', array());
 		$this->assign('printcssfiles', []);
 		$this->assign('versionHash', self::$versionHash);
-		foreach($cssFiles as $info) {
+		foreach ($cssFiles as $info) {
 			$web = $info[1];
 			$file = $info[2];
 
 			if (substr($file, -strlen('print.css')) === 'print.css') {
-				$this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
+				$this->append('printcssfiles', $web.'/'.$file.$this->getVersionHashSuffix());
 			} else {
 				$suffix = $this->getVersionHashSuffix($web, $file);
 
 				if (strpos($file, '?v=') == false) {
-					$this->append( 'cssfiles', $web.'/'.$file . $suffix);
+					$this->append('cssfiles', $web.'/'.$file.$suffix);
 				} else {
-					$this->append( 'cssfiles', $web.'/'.$file . '-' . substr($suffix, 3));
+					$this->append('cssfiles', $web.'/'.$file.'-'.substr($suffix, 3));
 				}
 
 			}
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
 
 		if ($this->config->getSystemValue('installed', false)) {
 			if (\OC::$server->getAppManager()->isInstalled('theming')) {
-				$themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
+				$themingSuffix = '-'.$this->config->getAppValue('theming', 'cachebuster', '0');
 			}
 			$v = \OC_App::getAppVersions();
 		}
@@ -253,21 +253,21 @@  discard block
 block discarded – undo
 		// Try the webroot path for a match
 		if ($path !== false && $path !== '') {
 			$appName = $this->getAppNamefromPath($path);
-			if(array_key_exists($appName, $v)) {
+			if (array_key_exists($appName, $v)) {
 				$appVersion = $v[$appName];
-				return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
+				return '?v='.substr(md5($appVersion), 0, 8).$themingSuffix;
 			}
 		}
 		// fallback to the file path instead
 		if ($file !== false && $file !== '') {
 			$appName = $this->getAppNamefromPath($file);
-			if(array_key_exists($appName, $v)) {
+			if (array_key_exists($appName, $v)) {
 				$appVersion = $v[$appName];
-				return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
+				return '?v='.substr(md5($appVersion), 0, 8).$themingSuffix;
 			}
 		}
 
-		return '?v=' . self::$versionHash . $themingSuffix;
+		return '?v='.self::$versionHash.$themingSuffix;
 	}
 
 	/**
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
 		// Read the selected theme from the config file
 		$theme = \OC_Util::getTheme();
 
-		if($compileScss) {
+		if ($compileScss) {
 			$SCSSCacher = \OC::$server->query(SCSSCacher::class);
 		} else {
 			$SCSSCacher = null;
@@ -287,8 +287,8 @@  discard block
 block discarded – undo
 		$locator = new \OC\Template\CSSResourceLocator(
 			\OC::$server->getLogger(),
 			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
 			$SCSSCacher
 		);
 		$locator->find($styles);
@@ -323,8 +323,8 @@  discard block
 block discarded – undo
 		$locator = new \OC\Template\JSResourceLocator(
 			\OC::$server->getLogger(),
 			$theme,
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
-			array( \OC::$SERVERROOT => \OC::$WEBROOT ),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
+			array(\OC::$SERVERROOT => \OC::$WEBROOT),
 			\OC::$server->query(JSCombiner::class)
 			);
 		$locator->find($scripts);
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
 	 */
 	public static function convertToRelativePath($filePath) {
 		$relativePath = explode(\OC::$SERVERROOT, $filePath);
-		if(count($relativePath) !== 2) {
+		if (count($relativePath) !== 2) {
 			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
 		}
 

Please login to merge, or discard this patch.

		@@ -57,41 +57,41 @@ discard block
		block discarded – undo
57	57	* @param string $renderAs
58	58	* @param string $appId application id
59	59	*/
60		- public function __construct( $renderAs, $appId = '' ) {
	60	+ public function __construct($renderAs, $appId = '') {
61	61
62	62	// yes - should be injected ....
63	63	$this->config = \OC::$server->getConfig();
64	64
65		- if(\OCP\Util::isIE()) {
	65	+ if (\OCP\Util::isIE()) {
66	66	\OC_Util::addStyle('ie');
67	67	}
68	68
69	69	// Decide which page we show
70		- if($renderAs == 'user') {
71		- parent::__construct( 'core', 'layout.user' );
72		- if(in_array(\OC_App::getCurrentApp(), ['settings','admin', 'help']) !== false) {
	70	+ if ($renderAs == 'user') {
	71	+ parent::__construct('core', 'layout.user');
	72	+ if (in_array(\OC_App::getCurrentApp(), ['settings', 'admin', 'help']) !== false) {
73	73	$this->assign('bodyid', 'body-settings');
74		- }else{
	74	+ } else {
75	75	$this->assign('bodyid', 'body-user');
76	76	}
77	77
78	78	// Add navigation entry
79		- $this->assign( 'application', '');
80		- $this->assign( 'appid', $appId );
	79	+ $this->assign('application', '');
	80	+ $this->assign('appid', $appId);
81	81	$navigation = \OC::$server->getNavigationManager()->getAll();
82		- $this->assign( 'navigation', $navigation);
	82	+ $this->assign('navigation', $navigation);
83	83	$settingsNavigation = \OC::$server->getNavigationManager()->getAll('settings');
84		- $this->assign( 'settingsnavigation', $settingsNavigation);
85		- foreach($navigation as $entry) {
	84	+ $this->assign('settingsnavigation', $settingsNavigation);
	85	+ foreach ($navigation as $entry) {
86	86	if ($entry['active']) {
87		- $this->assign( 'application', $entry['name'] );
	87	+ $this->assign('application', $entry['name']);
88	88	break;
89	89	}
90	90	}
91	91
92		- foreach($settingsNavigation as $entry) {
	92	+ foreach ($settingsNavigation as $entry) {
93	93	if ($entry['active']) {
94		- $this->assign( 'application', $entry['name'] );
	94	+ $this->assign('application', $entry['name']);
95	95	break;
96	96	}
97	97	}
		@@ -128,7 +128,7 @@ discard block
		block discarded – undo
128	128	$this->assign('user_uid', \OC_User::getUser());
129	129	} else if ($renderAs == 'public') {
130	130	parent::__construct('core', 'layout.public');
131		- $this->assign( 'appid', $appId );
	131	+ $this->assign('appid', $appId);
132	132	$this->assign('bodyid', 'body-public');
133	133	$this->assign('showSimpleSignUpLink', $this->config->getSystemValue('simpleSignUpLink.shown', true) !== false);
134	134	} else {
		@@ -144,7 +144,7 @@ discard block
		block discarded – undo
144	144	$this->assign('language', $lang);
145	145	$this->assign('locale', $locale);
146	146
147		- if(\OC::$server->getSystemConfig()->getValue('installed', false)) {
	147	+ if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
148	148	if (empty(self::$versionHash)) {
149	149	$v = \OC_App::getAppVersions();
150	150	$v['core'] = implode('.', \OCP\Util::getVersion());
		@@ -176,10 +176,10 @@ discard block
		block discarded – undo
176	176	$this->append('jsfiles', \OC::$server->getURLGenerator()->linkToRoute('core.OCJS.getConfig', ['v' => self::$versionHash]));
177	177	}
178	178	}
179		- foreach($jsFiles as $info) {
	179	+ foreach ($jsFiles as $info) {
180	180	$web = $info[1];
181	181	$file = $info[2];
182		- $this->append( 'jsfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
	182	+ $this->append('jsfiles', $web.'/'.$file.$this->getVersionHashSuffix());
183	183	}
184	184
185	185	try {
		@@ -190,7 +190,7 @@ discard block
		block discarded – undo
190	190
191	191	// Do not initialise scss appdata until we have a fully installed instance
192	192	// Do not load scss for update, errors, installation or login page
193		- if(\OC::$server->getSystemConfig()->getValue('installed', false)
	193	+ if (\OC::$server->getSystemConfig()->getValue('installed', false)
194	194	&& !\OCP\Util::needUpgrade()
195	195	&& $pathInfo !== ''
196	196	&& !preg_match('/^\/login/', $pathInfo)
		@@ -207,19 +207,19 @@ discard block
		block discarded – undo
207	207	$this->assign('cssfiles', array());
208	208	$this->assign('printcssfiles', []);
209	209	$this->assign('versionHash', self::$versionHash);
210		- foreach($cssFiles as $info) {
	210	+ foreach ($cssFiles as $info) {
211	211	$web = $info[1];
212	212	$file = $info[2];
213	213
214	214	if (substr($file, -strlen('print.css')) === 'print.css') {
215		- $this->append( 'printcssfiles', $web.'/'.$file . $this->getVersionHashSuffix() );
	215	+ $this->append('printcssfiles', $web.'/'.$file.$this->getVersionHashSuffix());
216	216	} else {
217	217	$suffix = $this->getVersionHashSuffix($web, $file);
218	218
219	219	if (strpos($file, '?v=') == false) {
220		- $this->append( 'cssfiles', $web.'/'.$file . $suffix);
	220	+ $this->append('cssfiles', $web.'/'.$file.$suffix);
221	221	} else {
222		- $this->append( 'cssfiles', $web.'/'.$file . '-' . substr($suffix, 3));
	222	+ $this->append('cssfiles', $web.'/'.$file.'-'.substr($suffix, 3));
223	223	}
224	224
225	225	}
		@@ -245,7 +245,7 @@ discard block
		block discarded – undo
245	245
246	246	if ($this->config->getSystemValue('installed', false)) {
247	247	if (\OC::$server->getAppManager()->isInstalled('theming')) {
248		- $themingSuffix = '-' . $this->config->getAppValue('theming', 'cachebuster', '0');
	248	+ $themingSuffix = '-'.$this->config->getAppValue('theming', 'cachebuster', '0');
249	249	}
250	250	$v = \OC_App::getAppVersions();
251	251	}
		@@ -253,21 +253,21 @@ discard block
		block discarded – undo
253	253	// Try the webroot path for a match
254	254	if ($path !== false && $path !== '') {
255	255	$appName = $this->getAppNamefromPath($path);
256		- if(array_key_exists($appName, $v)) {
	256	+ if (array_key_exists($appName, $v)) {
257	257	$appVersion = $v[$appName];
258		- return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
	258	+ return '?v='.substr(md5($appVersion), 0, 8).$themingSuffix;
259	259	}
260	260	}
261	261	// fallback to the file path instead
262	262	if ($file !== false && $file !== '') {
263	263	$appName = $this->getAppNamefromPath($file);
264		- if(array_key_exists($appName, $v)) {
	264	+ if (array_key_exists($appName, $v)) {
265	265	$appVersion = $v[$appName];
266		- return '?v=' . substr(md5($appVersion), 0, 8) . $themingSuffix;
	266	+ return '?v='.substr(md5($appVersion), 0, 8).$themingSuffix;
267	267	}
268	268	}
269	269
270		- return '?v=' . self::$versionHash . $themingSuffix;
	270	+ return '?v='.self::$versionHash.$themingSuffix;
271	271	}
272	272
273	273	/**
		@@ -278,7 +278,7 @@ discard block
		block discarded – undo
278	278	// Read the selected theme from the config file
279	279	$theme = \OC_Util::getTheme();
280	280
281		- if($compileScss) {
	281	+ if ($compileScss) {
282	282	$SCSSCacher = \OC::$server->query(SCSSCacher::class);
283	283	} else {
284	284	$SCSSCacher = null;
		@@ -287,8 +287,8 @@ discard block
		block discarded – undo
287	287	$locator = new \OC\Template\CSSResourceLocator(
288	288	\OC::$server->getLogger(),
289	289	$theme,
290		- array( \OC::$SERVERROOT => \OC::$WEBROOT ),
291		- array( \OC::$SERVERROOT => \OC::$WEBROOT ),
	290	+ array(\OC::$SERVERROOT => \OC::$WEBROOT),
	291	+ array(\OC::$SERVERROOT => \OC::$WEBROOT),
292	292	$SCSSCacher
293	293	);
294	294	$locator->find($styles);
		@@ -323,8 +323,8 @@ discard block
		block discarded – undo
323	323	$locator = new \OC\Template\JSResourceLocator(
324	324	\OC::$server->getLogger(),
325	325	$theme,
326		- array( \OC::$SERVERROOT => \OC::$WEBROOT ),
327		- array( \OC::$SERVERROOT => \OC::$WEBROOT ),
	326	+ array(\OC::$SERVERROOT => \OC::$WEBROOT),
	327	+ array(\OC::$SERVERROOT => \OC::$WEBROOT),
328	328	\OC::$server->query(JSCombiner::class)
329	329	);
330	330	$locator->find($scripts);
		@@ -339,7 +339,7 @@ discard block
		block discarded – undo
339	339	*/
340	340	public static function convertToRelativePath($filePath) {
341	341	$relativePath = explode(\OC::$SERVERROOT, $filePath);
342		- if(count($relativePath) !== 2) {
	342	+ if (count($relativePath) !== 2) {
343	343	throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
344	344	}
345	345

nextcloud / server

Push — master ( 7f49a2...82625e )

Status

Category

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