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

Passed

Push — master ( 0e53be...4a2921 )

by Roeland

created 2020-04-04 08:33 UTC

Status

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

@@ -109,7 +109,7 @@
 block discarded – undo
 		$output->writeln('');
 	}
 
-	protected function verifyEnabled () {
+	protected function verifyEnabled() {
 		$isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
 
 		if ($isEnabled !== 'yes') {

Please login to merge, or discard this patch.

apps/dav/lib/CalDAV/Activity/Provider/Todo.php 1 patch

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

@@ -46,26 +46,26 @@  discard block
 block discarded – undo
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
 		}
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
+		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo') {
 			$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo_self') {
 			$subject = $this->l->t('You created todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo') {
 			$subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo_self') {
 			$subject = $this->l->t('You deleted todo {todo} from list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo') {
 			$subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_self') {
 			$subject = $this->l->t('You updated todo {todo} in list {calendar}');
 
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed') {
 			$subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self') {
 			$subject = $this->l->t('You solved todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action') {
 			$subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
-		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
+		} else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self') {
 			$subject = $this->l->t('You reopened todo {todo} in list {calendar}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -90,21 +90,21 @@  discard block
 block discarded – undo
 		// Nextcloud 13+
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_todo':
-				case self::SUBJECT_OBJECT_DELETE . '_todo':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
+				case self::SUBJECT_OBJECT_ADD.'_todo':
+				case self::SUBJECT_OBJECT_DELETE.'_todo':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'todo' => $this->generateObjectParameter($parameters['object']),
 					];
-				case self::SUBJECT_OBJECT_ADD . '_todo_self':
-				case self::SUBJECT_OBJECT_DELETE . '_todo_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
+				case self::SUBJECT_OBJECT_ADD.'_todo_self':
+				case self::SUBJECT_OBJECT_DELETE.'_todo_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'todo' => $this->generateObjectParameter($parameters['object']),
@@ -118,23 +118,23 @@  discard block
 block discarded – undo
 		// Otherwise if people upgrade over multiple releases in a short period,
 		// they will get the dead entries in their stream.
 		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_todo':
-			case self::SUBJECT_OBJECT_DELETE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
+			case self::SUBJECT_OBJECT_ADD.'_todo':
+			case self::SUBJECT_OBJECT_DELETE.'_todo':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'todo' => $this->generateObjectParameter($parameters[2]),
 				];
-			case self::SUBJECT_OBJECT_ADD . '_todo_self':
-			case self::SUBJECT_OBJECT_DELETE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
+			case self::SUBJECT_OBJECT_ADD.'_todo_self':
+			case self::SUBJECT_OBJECT_DELETE.'_todo_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
 				return [
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'todo' => $this->generateObjectParameter($parameters[2]),
 				];
 		}

Please login to merge, or discard this patch.

apps/admin_audit/composer/autoload.php 1 patch

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

@@ -2,6 +2,6 @@
 block discarded – undo
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInitAdminAudit::getLoader();

Please login to merge, or discard this patch.

apps/dav/composer/autoload.php 1 patch

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

@@ -2,6 +2,6 @@
 block discarded – undo
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInitDAV::getLoader();

Please login to merge, or discard this patch.

apps/comments/composer/autoload.php 1 patch

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

@@ -2,6 +2,6 @@
 block discarded – undo
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInitComments::getLoader();

Please login to merge, or discard this patch.

apps/files/composer/composer/autoload_psr4.php 1 patch

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

@@ -6,5 +6,5 @@
 block discarded – undo
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Files\\' => array($baseDir . '/../lib'),
+    'OCA\\Files\\' => array($baseDir.'/../lib'),
 );

Please login to merge, or discard this patch.

apps/files/composer/autoload.php 1 patch

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

@@ -2,6 +2,6 @@
 block discarded – undo
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInitFiles::getLoader();

Please login to merge, or discard this patch.

apps/encryption/composer/composer/autoload_psr4.php 1 patch

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

@@ -6,5 +6,5 @@
 block discarded – undo
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\Encryption\\' => array($baseDir . '/../lib'),
+    'OCA\\Encryption\\' => array($baseDir.'/../lib'),
 );

Please login to merge, or discard this patch.

apps/encryption/composer/autoload.php 1 patch

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

@@ -2,6 +2,6 @@
 block discarded – undo
 
 // autoload.php @generated by Composer
 
-require_once __DIR__ . '/composer/autoload_real.php';
+require_once __DIR__.'/composer/autoload_real.php';
 
 return ComposerAutoloaderInitEncryption::getLoader();

Please login to merge, or discard this patch.

		@@ -109,7 +109,7 @@
		block discarded – undo
109	109	$output->writeln('');
110	110	}
111	111
112		- protected function verifyEnabled () {
	112	+ protected function verifyEnabled() {
113	113	$isEnabled = $this->config->getAppValue('dav', 'generateBirthdayCalendar', 'yes');
114	114
115	115	if ($isEnabled !== 'yes') {

		@@ -46,26 +46,26 @@ discard block
		block discarded – undo
46	46	$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg')));
47	47	}
48	48
49		- if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') {
	49	+ if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo') {
50	50	$subject = $this->l->t('{actor} created todo {todo} in list {calendar}');
51		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo_self') {
	51	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_todo_self') {
52	52	$subject = $this->l->t('You created todo {todo} in list {calendar}');
53		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo') {
	53	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo') {
54	54	$subject = $this->l->t('{actor} deleted todo {todo} from list {calendar}');
55		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_todo_self') {
	55	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_todo_self') {
56	56	$subject = $this->l->t('You deleted todo {todo} from list {calendar}');
57		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo') {
	57	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo') {
58	58	$subject = $this->l->t('{actor} updated todo {todo} in list {calendar}');
59		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_self') {
	59	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_self') {
60	60	$subject = $this->l->t('You updated todo {todo} in list {calendar}');
61	61
62		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed') {
	62	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed') {
63	63	$subject = $this->l->t('{actor} solved todo {todo} in list {calendar}');
64		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self') {
	64	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self') {
65	65	$subject = $this->l->t('You solved todo {todo} in list {calendar}');
66		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action') {
	66	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action') {
67	67	$subject = $this->l->t('{actor} reopened todo {todo} in list {calendar}');
68		- } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self') {
	68	+ } else if ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self') {
69	69	$subject = $this->l->t('You reopened todo {todo} in list {calendar}');
70	70	} else {
71	71	throw new \InvalidArgumentException();
		@@ -90,21 +90,21 @@ discard block
		block discarded – undo
90	90	// Nextcloud 13+
91	91	if (isset($parameters['calendar'])) {
92	92	switch ($subject) {
93		- case self::SUBJECT_OBJECT_ADD . '_todo':
94		- case self::SUBJECT_OBJECT_DELETE . '_todo':
95		- case self::SUBJECT_OBJECT_UPDATE . '_todo':
96		- case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
97		- case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
	93	+ case self::SUBJECT_OBJECT_ADD.'_todo':
	94	+ case self::SUBJECT_OBJECT_DELETE.'_todo':
	95	+ case self::SUBJECT_OBJECT_UPDATE.'_todo':
	96	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
	97	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
98	98	return [
99	99	'actor' => $this->generateUserParameter($parameters['actor']),
100	100	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
101	101	'todo' => $this->generateObjectParameter($parameters['object']),
102	102	];
103		- case self::SUBJECT_OBJECT_ADD . '_todo_self':
104		- case self::SUBJECT_OBJECT_DELETE . '_todo_self':
105		- case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
106		- case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
107		- case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
	103	+ case self::SUBJECT_OBJECT_ADD.'_todo_self':
	104	+ case self::SUBJECT_OBJECT_DELETE.'_todo_self':
	105	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
	106	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
	107	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
108	108	return [
109	109	'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
110	110	'todo' => $this->generateObjectParameter($parameters['object']),
		@@ -118,23 +118,23 @@ discard block
		block discarded – undo
118	118	// Otherwise if people upgrade over multiple releases in a short period,
119	119	// they will get the dead entries in their stream.
120	120	switch ($subject) {
121		- case self::SUBJECT_OBJECT_ADD . '_todo':
122		- case self::SUBJECT_OBJECT_DELETE . '_todo':
123		- case self::SUBJECT_OBJECT_UPDATE . '_todo':
124		- case self::SUBJECT_OBJECT_UPDATE . '_todo_completed':
125		- case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action':
	121	+ case self::SUBJECT_OBJECT_ADD.'_todo':
	122	+ case self::SUBJECT_OBJECT_DELETE.'_todo':
	123	+ case self::SUBJECT_OBJECT_UPDATE.'_todo':
	124	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_completed':
	125	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action':
126	126	return [
127	127	'actor' => $this->generateUserParameter($parameters[0]),
128		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	128	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
129	129	'todo' => $this->generateObjectParameter($parameters[2]),
130	130	];
131		- case self::SUBJECT_OBJECT_ADD . '_todo_self':
132		- case self::SUBJECT_OBJECT_DELETE . '_todo_self':
133		- case self::SUBJECT_OBJECT_UPDATE . '_todo_self':
134		- case self::SUBJECT_OBJECT_UPDATE . '_todo_completed_self':
135		- case self::SUBJECT_OBJECT_UPDATE . '_todo_needs_action_self':
	131	+ case self::SUBJECT_OBJECT_ADD.'_todo_self':
	132	+ case self::SUBJECT_OBJECT_DELETE.'_todo_self':
	133	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_self':
	134	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_completed_self':
	135	+ case self::SUBJECT_OBJECT_UPDATE.'_todo_needs_action_self':
136	136	return [
137		- 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
	137	+ 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
138	138	'todo' => $this->generateObjectParameter($parameters[2]),
139	139	];
140	140	}

		@@ -2,6 +2,6 @@
		block discarded – undo
2	2
3	3	// autoload.php @generated by Composer
4	4
5		-require_once __DIR__ . '/composer/autoload_real.php';
	5	+require_once __DIR__.'/composer/autoload_real.php';
6	6
7	7	return ComposerAutoloaderInitAdminAudit::getLoader();

		@@ -6,5 +6,5 @@
		block discarded – undo
6	6	$baseDir = $vendorDir;
7	7
8	8	return array(
9		- 'OCA\\Files\\' => array($baseDir . '/../lib'),
	9	+ 'OCA\\Files\\' => array($baseDir.'/../lib'),
10	10	);

nextcloud / server

Push — master ( 0e53be...4a2921 )

Status

Category

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

Spacing +32 added lines, -32 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 +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