Inspection of "Fix comments num index" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#8355)

by Blizzz

created 2018-02-14 14:00 UTC

Status

Indentation +89 added lines, -89 removed lines patch added patch discarded remove patch

@@ -34,101 +34,101 @@
 block discarded – undo
 use OCP\Share\IShareHelper;
 
 class Listener {
-	/** @var IManager */
-	protected $activityManager;
-	/** @var IUserSession */
-	protected $session;
-	/** @var \OCP\App\IAppManager */
-	protected $appManager;
-	/** @var \OCP\Files\Config\IMountProviderCollection */
-	protected $mountCollection;
-	/** @var \OCP\Files\IRootFolder */
-	protected $rootFolder;
-	/** @var IShareHelper */
-	protected $shareHelper;
+    /** @var IManager */
+    protected $activityManager;
+    /** @var IUserSession */
+    protected $session;
+    /** @var \OCP\App\IAppManager */
+    protected $appManager;
+    /** @var \OCP\Files\Config\IMountProviderCollection */
+    protected $mountCollection;
+    /** @var \OCP\Files\IRootFolder */
+    protected $rootFolder;
+    /** @var IShareHelper */
+    protected $shareHelper;
 
-	/**
-	 * Listener constructor.
-	 *
-	 * @param IManager $activityManager
-	 * @param IUserSession $session
-	 * @param IAppManager $appManager
-	 * @param IMountProviderCollection $mountCollection
-	 * @param IRootFolder $rootFolder
-	 * @param IShareHelper $shareHelper
-	 */
-	public function __construct(IManager $activityManager,
-								IUserSession $session,
-								IAppManager $appManager,
-								IMountProviderCollection $mountCollection,
-								IRootFolder $rootFolder,
-								IShareHelper $shareHelper) {
-		$this->activityManager = $activityManager;
-		$this->session = $session;
-		$this->appManager = $appManager;
-		$this->mountCollection = $mountCollection;
-		$this->rootFolder = $rootFolder;
-		$this->shareHelper = $shareHelper;
-	}
+    /**
+     * Listener constructor.
+     *
+     * @param IManager $activityManager
+     * @param IUserSession $session
+     * @param IAppManager $appManager
+     * @param IMountProviderCollection $mountCollection
+     * @param IRootFolder $rootFolder
+     * @param IShareHelper $shareHelper
+     */
+    public function __construct(IManager $activityManager,
+                                IUserSession $session,
+                                IAppManager $appManager,
+                                IMountProviderCollection $mountCollection,
+                                IRootFolder $rootFolder,
+                                IShareHelper $shareHelper) {
+        $this->activityManager = $activityManager;
+        $this->session = $session;
+        $this->appManager = $appManager;
+        $this->mountCollection = $mountCollection;
+        $this->rootFolder = $rootFolder;
+        $this->shareHelper = $shareHelper;
+    }
 
-	/**
-	 * @param CommentsEvent $event
-	 */
-	public function commentEvent(CommentsEvent $event) {
-		if ($event->getComment()->getObjectType() !== 'files'
-			|| $event->getEvent() !== CommentsEvent::EVENT_ADD
-			|| !$this->appManager->isInstalled('activity')) {
-			// Comment not for file, not adding a comment or no activity-app enabled (save the energy)
-			return;
-		}
+    /**
+     * @param CommentsEvent $event
+     */
+    public function commentEvent(CommentsEvent $event) {
+        if ($event->getComment()->getObjectType() !== 'files'
+            || $event->getEvent() !== CommentsEvent::EVENT_ADD
+            || !$this->appManager->isInstalled('activity')) {
+            // Comment not for file, not adding a comment or no activity-app enabled (save the energy)
+            return;
+        }
 
-		// Get all mount point owners
-		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
-		if (empty($mounts)) {
-			return;
-		}
+        // Get all mount point owners
+        $cache = $this->mountCollection->getMountCache();
+        $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
+        if (empty($mounts)) {
+            return;
+        }
 
-		$users = [];
-		foreach ($mounts as $mount) {
-			$owner = $mount->getUser()->getUID();
-			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
-			if (!empty($nodes)) {
-				/** @var Node $node */
-				$node = array_shift($nodes);
-				$al = $this->shareHelper->getPathsForAccessList($node);
-				$users += $al['users'];
-			}
-		}
+        $users = [];
+        foreach ($mounts as $mount) {
+            $owner = $mount->getUser()->getUID();
+            $ownerFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+            if (!empty($nodes)) {
+                /** @var Node $node */
+                $node = array_shift($nodes);
+                $al = $this->shareHelper->getPathsForAccessList($node);
+                $users += $al['users'];
+            }
+        }
 
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('comments')
-			->setType('comments')
-			->setAuthor($actor)
-			->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
-			->setMessage('add_comment_message', [
-				'commentId' => $event->getComment()->getId(),
-			]);
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('comments')
+            ->setType('comments')
+            ->setAuthor($actor)
+            ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
+            ->setMessage('add_comment_message', [
+                'commentId' => $event->getComment()->getId(),
+            ]);
 
-		foreach ($users as $user => $path) {
-			// numerical user ids end up as integers from array keys, but string
-			// is required
-			$activity->setAffectedUser((string)$user);
+        foreach ($users as $user => $path) {
+            // numerical user ids end up as integers from array keys, but string
+            // is required
+            $activity->setAffectedUser((string)$user);
 
-			$activity->setSubject('add_comment_subject', [
-				'actor' => $actor,
-				'fileId' => (int) $event->getComment()->getObjectId(),
-				'filePath' => trim($path, '/'),
-			]);
-			$this->activityManager->publish($activity);
-		}
-	}
+            $activity->setSubject('add_comment_subject', [
+                'actor' => $actor,
+                'fileId' => (int) $event->getComment()->getObjectId(),
+                'filePath' => trim($path, '/'),
+            ]);
+            $this->activityManager->publish($activity);
+        }
+    }
 }

Please login to merge, or discard this patch.

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

@@ -84,7 +84,7 @@  discard block
 block discarded – undo
 
 		// Get all mount point owners
 		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
+		$mounts = $cache->getMountsForFileId((int) $event->getComment()->getObjectId());
 		if (empty($mounts)) {
 			return;
 		}
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
 		foreach ($mounts as $mount) {
 			$owner = $mount->getUser()->getUID();
 			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
+			$nodes = $ownerFolder->getById((int) $event->getComment()->getObjectId());
 			if (!empty($nodes)) {
 				/** @var Node $node */
 				$node = array_shift($nodes);
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
 		foreach ($users as $user => $path) {
 			// numerical user ids end up as integers from array keys, but string
 			// is required
-			$activity->setAffectedUser((string)$user);
+			$activity->setAffectedUser((string) $user);
 
 			$activity->setSubject('add_comment_subject', [
 				'actor' => $actor,

Please login to merge, or discard this patch.

		@@ -34,101 +34,101 @@
		block discarded – undo
34	34	use OCP\Share\IShareHelper;
35	35
36	36	class Listener {
37		- /** @var IManager */
38		- protected $activityManager;
39		- /** @var IUserSession */
40		- protected $session;
41		- /** @var \OCP\App\IAppManager */
42		- protected $appManager;
43		- /** @var \OCP\Files\Config\IMountProviderCollection */
44		- protected $mountCollection;
45		- /** @var \OCP\Files\IRootFolder */
46		- protected $rootFolder;
47		- /** @var IShareHelper */
48		- protected $shareHelper;
	37	+ /** @var IManager */
	38	+ protected $activityManager;
	39	+ /** @var IUserSession */
	40	+ protected $session;
	41	+ /** @var \OCP\App\IAppManager */
	42	+ protected $appManager;
	43	+ /** @var \OCP\Files\Config\IMountProviderCollection */
	44	+ protected $mountCollection;
	45	+ /** @var \OCP\Files\IRootFolder */
	46	+ protected $rootFolder;
	47	+ /** @var IShareHelper */
	48	+ protected $shareHelper;
49	49
50		- /**
51		- * Listener constructor.
52		- *
53		- * @param IManager $activityManager
54		- * @param IUserSession $session
55		- * @param IAppManager $appManager
56		- * @param IMountProviderCollection $mountCollection
57		- * @param IRootFolder $rootFolder
58		- * @param IShareHelper $shareHelper
59		- */
60		- public function __construct(IManager $activityManager,
61		- IUserSession $session,
62		- IAppManager $appManager,
63		- IMountProviderCollection $mountCollection,
64		- IRootFolder $rootFolder,
65		- IShareHelper $shareHelper) {
66		- $this->activityManager = $activityManager;
67		- $this->session = $session;
68		- $this->appManager = $appManager;
69		- $this->mountCollection = $mountCollection;
70		- $this->rootFolder = $rootFolder;
71		- $this->shareHelper = $shareHelper;
72		- }
	50	+ /**
	51	+ * Listener constructor.
	52	+ *
	53	+ * @param IManager $activityManager
	54	+ * @param IUserSession $session
	55	+ * @param IAppManager $appManager
	56	+ * @param IMountProviderCollection $mountCollection
	57	+ * @param IRootFolder $rootFolder
	58	+ * @param IShareHelper $shareHelper
	59	+ */
	60	+ public function __construct(IManager $activityManager,
	61	+ IUserSession $session,
	62	+ IAppManager $appManager,
	63	+ IMountProviderCollection $mountCollection,
	64	+ IRootFolder $rootFolder,
	65	+ IShareHelper $shareHelper) {
	66	+ $this->activityManager = $activityManager;
	67	+ $this->session = $session;
	68	+ $this->appManager = $appManager;
	69	+ $this->mountCollection = $mountCollection;
	70	+ $this->rootFolder = $rootFolder;
	71	+ $this->shareHelper = $shareHelper;
	72	+ }
73	73
74		- /**
75		- * @param CommentsEvent $event
76		- */
77		- public function commentEvent(CommentsEvent $event) {
78		- if ($event->getComment()->getObjectType() !== 'files'
79		- \|\| $event->getEvent() !== CommentsEvent::EVENT_ADD
80		- \|\| !$this->appManager->isInstalled('activity')) {
81		- // Comment not for file, not adding a comment or no activity-app enabled (save the energy)
82		- return;
83		- }
	74	+ /**
	75	+ * @param CommentsEvent $event
	76	+ */
	77	+ public function commentEvent(CommentsEvent $event) {
	78	+ if ($event->getComment()->getObjectType() !== 'files'
	79	+ \|\| $event->getEvent() !== CommentsEvent::EVENT_ADD
	80	+ \|\| !$this->appManager->isInstalled('activity')) {
	81	+ // Comment not for file, not adding a comment or no activity-app enabled (save the energy)
	82	+ return;
	83	+ }
84	84
85		- // Get all mount point owners
86		- $cache = $this->mountCollection->getMountCache();
87		- $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
88		- if (empty($mounts)) {
89		- return;
90		- }
	85	+ // Get all mount point owners
	86	+ $cache = $this->mountCollection->getMountCache();
	87	+ $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
	88	+ if (empty($mounts)) {
	89	+ return;
	90	+ }
91	91
92		- $users = [];
93		- foreach ($mounts as $mount) {
94		- $owner = $mount->getUser()->getUID();
95		- $ownerFolder = $this->rootFolder->getUserFolder($owner);
96		- $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
97		- if (!empty($nodes)) {
98		- /** @var Node $node */
99		- $node = array_shift($nodes);
100		- $al = $this->shareHelper->getPathsForAccessList($node);
101		- $users += $al['users'];
102		- }
103		- }
	92	+ $users = [];
	93	+ foreach ($mounts as $mount) {
	94	+ $owner = $mount->getUser()->getUID();
	95	+ $ownerFolder = $this->rootFolder->getUserFolder($owner);
	96	+ $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
	97	+ if (!empty($nodes)) {
	98	+ /** @var Node $node */
	99	+ $node = array_shift($nodes);
	100	+ $al = $this->shareHelper->getPathsForAccessList($node);
	101	+ $users += $al['users'];
	102	+ }
	103	+ }
104	104
105		- $actor = $this->session->getUser();
106		- if ($actor instanceof IUser) {
107		- $actor = $actor->getUID();
108		- } else {
109		- $actor = '';
110		- }
	105	+ $actor = $this->session->getUser();
	106	+ if ($actor instanceof IUser) {
	107	+ $actor = $actor->getUID();
	108	+ } else {
	109	+ $actor = '';
	110	+ }
111	111
112		- $activity = $this->activityManager->generateEvent();
113		- $activity->setApp('comments')
114		- ->setType('comments')
115		- ->setAuthor($actor)
116		- ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
117		- ->setMessage('add_comment_message', [
118		- 'commentId' => $event->getComment()->getId(),
119		- ]);
	112	+ $activity = $this->activityManager->generateEvent();
	113	+ $activity->setApp('comments')
	114	+ ->setType('comments')
	115	+ ->setAuthor($actor)
	116	+ ->setObject($event->getComment()->getObjectType(), (int) $event->getComment()->getObjectId())
	117	+ ->setMessage('add_comment_message', [
	118	+ 'commentId' => $event->getComment()->getId(),
	119	+ ]);
120	120
121		- foreach ($users as $user => $path) {
122		- // numerical user ids end up as integers from array keys, but string
123		- // is required
124		- $activity->setAffectedUser((string)$user);
	121	+ foreach ($users as $user => $path) {
	122	+ // numerical user ids end up as integers from array keys, but string
	123	+ // is required
	124	+ $activity->setAffectedUser((string)$user);
125	125
126		- $activity->setSubject('add_comment_subject', [
127		- 'actor' => $actor,
128		- 'fileId' => (int) $event->getComment()->getObjectId(),
129		- 'filePath' => trim($path, '/'),
130		- ]);
131		- $this->activityManager->publish($activity);
132		- }
133		- }
	126	+ $activity->setSubject('add_comment_subject', [
	127	+ 'actor' => $actor,
	128	+ 'fileId' => (int) $event->getComment()->getObjectId(),
	129	+ 'filePath' => trim($path, '/'),
	130	+ ]);
	131	+ $this->activityManager->publish($activity);
	132	+ }
	133	+ }
134	134	}

		@@ -84,7 +84,7 @@ discard block
		block discarded – undo
84	84
85	85	// Get all mount point owners
86	86	$cache = $this->mountCollection->getMountCache();
87		- $mounts = $cache->getMountsForFileId((int)$event->getComment()->getObjectId());
	87	+ $mounts = $cache->getMountsForFileId((int) $event->getComment()->getObjectId());
88	88	if (empty($mounts)) {
89	89	return;
90	90	}
		@@ -93,7 +93,7 @@ discard block
		block discarded – undo
93	93	foreach ($mounts as $mount) {
94	94	$owner = $mount->getUser()->getUID();
95	95	$ownerFolder = $this->rootFolder->getUserFolder($owner);
96		- $nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
	96	+ $nodes = $ownerFolder->getById((int) $event->getComment()->getObjectId());
97	97	if (!empty($nodes)) {
98	98	/** @var Node $node */
99	99	$node = array_shift($nodes);
		@@ -121,7 +121,7 @@ discard block
		block discarded – undo
121	121	foreach ($users as $user => $path) {
122	122	// numerical user ids end up as integers from array keys, but string
123	123	// is required
124		- $activity->setAffectedUser((string)$user);
	124	+ $activity->setAffectedUser((string) $user);
125	125
126	126	$activity->setSubject('add_comment_subject', [
127	127	'actor' => $actor,

nextcloud / server

Pull Request — master (#8355)

Status

Category

Indentation +89 added lines, -89 removed lines patch added patch discarded remove patch

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