Inspection of "add anounce- and (pre/|post)RevokeUser signals for..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#8833)

by Blizzz

created 2018-03-19 14:53 UTC

Status

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

@@ -36,133 +36,133 @@
 block discarded – undo
 
 class HookManager {
 
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var SyncService */
-	private $syncService;
-
-	/** @var IUser[] */
-	private $usersToDelete = [];
-
-	/** @var CalDavBackend */
-	private $calDav;
-
-	/** @var CardDavBackend */
-	private $cardDav;
-
-	/** @var array */
-	private $calendarsToDelete = [];
-
-	/** @var array */
-	private $addressBooksToDelete = [];
-
-	/** @var EventDispatcher */
-	private $eventDispatcher;
-
-	public function __construct(IUserManager $userManager,
-								SyncService $syncService,
-								CalDavBackend $calDav,
-								CardDavBackend $cardDav,
-								EventDispatcher $eventDispatcher) {
-		$this->userManager = $userManager;
-		$this->syncService = $syncService;
-		$this->calDav = $calDav;
-		$this->cardDav = $cardDav;
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	public function setup() {
-		Util::connectHook('OC_User',
-			'post_createUser',
-			$this,
-			'postCreateUser');
-		\OC::$server->getUserManager()->listen('\OC\User', 'assignedUserId', function ($uid) {
-			$this->postCreateUser(['uid' => $uid]);
-		});
-		Util::connectHook('OC_User',
-			'pre_deleteUser',
-			$this,
-			'preDeleteUser');
-		\OC::$server->getUserManager()->listen('\OC\User', 'preUnassignedUserId', [$this, 'preUnassignedUserId']);
-		Util::connectHook('OC_User',
-			'post_deleteUser',
-			$this,
-			'postDeleteUser');
-		\OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', function ($uid) {
-			$this->postDeleteUser(['uid' => $uid]);
-		});
-		\OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', [$this, 'postUnassignedUserId']);
-		Util::connectHook('OC_User',
-			'changeUser',
-			$this,
-			'changeUser');
-	}
-
-	public function postCreateUser($params) {
-		$user = $this->userManager->get($params['uid']);
-		$this->syncService->updateUser($user);
-	}
-
-	public function preDeleteUser($params) {
-		$uid = $params['uid'];
-		$this->usersToDelete[$uid] = $this->userManager->get($uid);
-		$this->calendarsToDelete = $this->calDav->getUsersOwnCalendars('principals/users/' . $uid);
-		$this->addressBooksToDelete = $this->cardDav->getUsersOwnAddressBooks('principals/users/' . $uid);
-	}
-
-	public function preUnassignedUserId($uid) {
-		$this->usersToDelete[$uid] = $this->userManager->get($uid);
-	}
-
-	public function postDeleteUser($params) {
-		$uid = $params['uid'];
-		if (isset($this->usersToDelete[$uid])){
-			$this->syncService->deleteUser($this->usersToDelete[$uid]);
-		}
-
-		foreach ($this->calendarsToDelete as $calendar) {
-			$this->calDav->deleteCalendar($calendar['id']);
-		}
-		$this->calDav->deleteAllSharesByUser('principals/users/' . $uid);
-
-		foreach ($this->addressBooksToDelete as $addressBook) {
-			$this->cardDav->deleteAddressBook($addressBook['id']);
-		}
-	}
-
-	public function postUnassignedUserId($uid) {
-		if (isset($this->usersToDelete[$uid])){
-			$this->syncService->deleteUser($this->usersToDelete[$uid]);
-		}
-	}
-
-	public function changeUser($params) {
-		$user = $params['user'];
-		$this->syncService->updateUser($user);
-	}
-
-	public function firstLogin(IUser $user = null) {
-		if (!is_null($user)) {
-			$principal = 'principals/users/' . $user->getUID();
-			if ($this->calDav->getCalendarsForUserCount($principal) === 0) {
-				try {
-					$this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
-						'{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
-					]);
-				} catch (\Exception $ex) {
-					\OC::$server->getLogger()->logException($ex);
-				}
-			}
-			if ($this->cardDav->getAddressBooksForUserCount($principal) === 0) {
-				try {
-					$this->cardDav->createAddressBook($principal, CardDavBackend::PERSONAL_ADDRESSBOOK_URI, [
-						'{DAV:}displayname' => CardDavBackend::PERSONAL_ADDRESSBOOK_NAME,
-					]);
-				} catch (\Exception $ex) {
-					\OC::$server->getLogger()->logException($ex);
-				}
-			}
-		}
-	}
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var SyncService */
+    private $syncService;
+
+    /** @var IUser[] */
+    private $usersToDelete = [];
+
+    /** @var CalDavBackend */
+    private $calDav;
+
+    /** @var CardDavBackend */
+    private $cardDav;
+
+    /** @var array */
+    private $calendarsToDelete = [];
+
+    /** @var array */
+    private $addressBooksToDelete = [];
+
+    /** @var EventDispatcher */
+    private $eventDispatcher;
+
+    public function __construct(IUserManager $userManager,
+                                SyncService $syncService,
+                                CalDavBackend $calDav,
+                                CardDavBackend $cardDav,
+                                EventDispatcher $eventDispatcher) {
+        $this->userManager = $userManager;
+        $this->syncService = $syncService;
+        $this->calDav = $calDav;
+        $this->cardDav = $cardDav;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    public function setup() {
+        Util::connectHook('OC_User',
+            'post_createUser',
+            $this,
+            'postCreateUser');
+        \OC::$server->getUserManager()->listen('\OC\User', 'assignedUserId', function ($uid) {
+            $this->postCreateUser(['uid' => $uid]);
+        });
+        Util::connectHook('OC_User',
+            'pre_deleteUser',
+            $this,
+            'preDeleteUser');
+        \OC::$server->getUserManager()->listen('\OC\User', 'preUnassignedUserId', [$this, 'preUnassignedUserId']);
+        Util::connectHook('OC_User',
+            'post_deleteUser',
+            $this,
+            'postDeleteUser');
+        \OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', function ($uid) {
+            $this->postDeleteUser(['uid' => $uid]);
+        });
+        \OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', [$this, 'postUnassignedUserId']);
+        Util::connectHook('OC_User',
+            'changeUser',
+            $this,
+            'changeUser');
+    }
+
+    public function postCreateUser($params) {
+        $user = $this->userManager->get($params['uid']);
+        $this->syncService->updateUser($user);
+    }
+
+    public function preDeleteUser($params) {
+        $uid = $params['uid'];
+        $this->usersToDelete[$uid] = $this->userManager->get($uid);
+        $this->calendarsToDelete = $this->calDav->getUsersOwnCalendars('principals/users/' . $uid);
+        $this->addressBooksToDelete = $this->cardDav->getUsersOwnAddressBooks('principals/users/' . $uid);
+    }
+
+    public function preUnassignedUserId($uid) {
+        $this->usersToDelete[$uid] = $this->userManager->get($uid);
+    }
+
+    public function postDeleteUser($params) {
+        $uid = $params['uid'];
+        if (isset($this->usersToDelete[$uid])){
+            $this->syncService->deleteUser($this->usersToDelete[$uid]);
+        }
+
+        foreach ($this->calendarsToDelete as $calendar) {
+            $this->calDav->deleteCalendar($calendar['id']);
+        }
+        $this->calDav->deleteAllSharesByUser('principals/users/' . $uid);
+
+        foreach ($this->addressBooksToDelete as $addressBook) {
+            $this->cardDav->deleteAddressBook($addressBook['id']);
+        }
+    }
+
+    public function postUnassignedUserId($uid) {
+        if (isset($this->usersToDelete[$uid])){
+            $this->syncService->deleteUser($this->usersToDelete[$uid]);
+        }
+    }
+
+    public function changeUser($params) {
+        $user = $params['user'];
+        $this->syncService->updateUser($user);
+    }
+
+    public function firstLogin(IUser $user = null) {
+        if (!is_null($user)) {
+            $principal = 'principals/users/' . $user->getUID();
+            if ($this->calDav->getCalendarsForUserCount($principal) === 0) {
+                try {
+                    $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
+                        '{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
+                    ]);
+                } catch (\Exception $ex) {
+                    \OC::$server->getLogger()->logException($ex);
+                }
+            }
+            if ($this->cardDav->getAddressBooksForUserCount($principal) === 0) {
+                try {
+                    $this->cardDav->createAddressBook($principal, CardDavBackend::PERSONAL_ADDRESSBOOK_URI, [
+                        '{DAV:}displayname' => CardDavBackend::PERSONAL_ADDRESSBOOK_NAME,
+                    ]);
+                } catch (\Exception $ex) {
+                    \OC::$server->getLogger()->logException($ex);
+                }
+            }
+        }
+    }
 }

Please login to merge, or discard this patch.

		@@ -36,133 +36,133 @@
		block discarded – undo
36	36
37	37	class HookManager {
38	38
39		- /** @var IUserManager */
40		- private $userManager;
41		-
42		- /** @var SyncService */
43		- private $syncService;
44		-
45		- /** @var IUser[] */
46		- private $usersToDelete = [];
47		-
48		- /** @var CalDavBackend */
49		- private $calDav;
50		-
51		- /** @var CardDavBackend */
52		- private $cardDav;
53		-
54		- /** @var array */
55		- private $calendarsToDelete = [];
56		-
57		- /** @var array */
58		- private $addressBooksToDelete = [];
59		-
60		- /** @var EventDispatcher */
61		- private $eventDispatcher;
62		-
63		- public function __construct(IUserManager $userManager,
64		- SyncService $syncService,
65		- CalDavBackend $calDav,
66		- CardDavBackend $cardDav,
67		- EventDispatcher $eventDispatcher) {
68		- $this->userManager = $userManager;
69		- $this->syncService = $syncService;
70		- $this->calDav = $calDav;
71		- $this->cardDav = $cardDav;
72		- $this->eventDispatcher = $eventDispatcher;
73		- }
74		-
75		- public function setup() {
76		- Util::connectHook('OC_User',
77		- 'post_createUser',
78		- $this,
79		- 'postCreateUser');
80		- \OC::$server->getUserManager()->listen('\OC\User', 'assignedUserId', function ($uid) {
81		- $this->postCreateUser(['uid' => $uid]);
82		- });
83		- Util::connectHook('OC_User',
84		- 'pre_deleteUser',
85		- $this,
86		- 'preDeleteUser');
87		- \OC::$server->getUserManager()->listen('\OC\User', 'preUnassignedUserId', [$this, 'preUnassignedUserId']);
88		- Util::connectHook('OC_User',
89		- 'post_deleteUser',
90		- $this,
91		- 'postDeleteUser');
92		- \OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', function ($uid) {
93		- $this->postDeleteUser(['uid' => $uid]);
94		- });
95		- \OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', [$this, 'postUnassignedUserId']);
96		- Util::connectHook('OC_User',
97		- 'changeUser',
98		- $this,
99		- 'changeUser');
100		- }
101		-
102		- public function postCreateUser($params) {
103		- $user = $this->userManager->get($params['uid']);
104		- $this->syncService->updateUser($user);
105		- }
106		-
107		- public function preDeleteUser($params) {
108		- $uid = $params['uid'];
109		- $this->usersToDelete[$uid] = $this->userManager->get($uid);
110		- $this->calendarsToDelete = $this->calDav->getUsersOwnCalendars('principals/users/' . $uid);
111		- $this->addressBooksToDelete = $this->cardDav->getUsersOwnAddressBooks('principals/users/' . $uid);
112		- }
113		-
114		- public function preUnassignedUserId($uid) {
115		- $this->usersToDelete[$uid] = $this->userManager->get($uid);
116		- }
117		-
118		- public function postDeleteUser($params) {
119		- $uid = $params['uid'];
120		- if (isset($this->usersToDelete[$uid])){
121		- $this->syncService->deleteUser($this->usersToDelete[$uid]);
122		- }
123		-
124		- foreach ($this->calendarsToDelete as $calendar) {
125		- $this->calDav->deleteCalendar($calendar['id']);
126		- }
127		- $this->calDav->deleteAllSharesByUser('principals/users/' . $uid);
128		-
129		- foreach ($this->addressBooksToDelete as $addressBook) {
130		- $this->cardDav->deleteAddressBook($addressBook['id']);
131		- }
132		- }
133		-
134		- public function postUnassignedUserId($uid) {
135		- if (isset($this->usersToDelete[$uid])){
136		- $this->syncService->deleteUser($this->usersToDelete[$uid]);
137		- }
138		- }
139		-
140		- public function changeUser($params) {
141		- $user = $params['user'];
142		- $this->syncService->updateUser($user);
143		- }
144		-
145		- public function firstLogin(IUser $user = null) {
146		- if (!is_null($user)) {
147		- $principal = 'principals/users/' . $user->getUID();
148		- if ($this->calDav->getCalendarsForUserCount($principal) === 0) {
149		- try {
150		- $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
151		- '{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
152		- ]);
153		- } catch (\Exception $ex) {
154		- \OC::$server->getLogger()->logException($ex);
155		- }
156		- }
157		- if ($this->cardDav->getAddressBooksForUserCount($principal) === 0) {
158		- try {
159		- $this->cardDav->createAddressBook($principal, CardDavBackend::PERSONAL_ADDRESSBOOK_URI, [
160		- '{DAV:}displayname' => CardDavBackend::PERSONAL_ADDRESSBOOK_NAME,
161		- ]);
162		- } catch (\Exception $ex) {
163		- \OC::$server->getLogger()->logException($ex);
164		- }
165		- }
166		- }
167		- }
	39	+ /** @var IUserManager */
	40	+ private $userManager;
	41	+
	42	+ /** @var SyncService */
	43	+ private $syncService;
	44	+
	45	+ /** @var IUser[] */
	46	+ private $usersToDelete = [];
	47	+
	48	+ /** @var CalDavBackend */
	49	+ private $calDav;
	50	+
	51	+ /** @var CardDavBackend */
	52	+ private $cardDav;
	53	+
	54	+ /** @var array */
	55	+ private $calendarsToDelete = [];
	56	+
	57	+ /** @var array */
	58	+ private $addressBooksToDelete = [];
	59	+
	60	+ /** @var EventDispatcher */
	61	+ private $eventDispatcher;
	62	+
	63	+ public function __construct(IUserManager $userManager,
	64	+ SyncService $syncService,
	65	+ CalDavBackend $calDav,
	66	+ CardDavBackend $cardDav,
	67	+ EventDispatcher $eventDispatcher) {
	68	+ $this->userManager = $userManager;
	69	+ $this->syncService = $syncService;
	70	+ $this->calDav = $calDav;
	71	+ $this->cardDav = $cardDav;
	72	+ $this->eventDispatcher = $eventDispatcher;
	73	+ }
	74	+
	75	+ public function setup() {
	76	+ Util::connectHook('OC_User',
	77	+ 'post_createUser',
	78	+ $this,
	79	+ 'postCreateUser');
	80	+ \OC::$server->getUserManager()->listen('\OC\User', 'assignedUserId', function ($uid) {
	81	+ $this->postCreateUser(['uid' => $uid]);
	82	+ });
	83	+ Util::connectHook('OC_User',
	84	+ 'pre_deleteUser',
	85	+ $this,
	86	+ 'preDeleteUser');
	87	+ \OC::$server->getUserManager()->listen('\OC\User', 'preUnassignedUserId', [$this, 'preUnassignedUserId']);
	88	+ Util::connectHook('OC_User',
	89	+ 'post_deleteUser',
	90	+ $this,
	91	+ 'postDeleteUser');
	92	+ \OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', function ($uid) {
	93	+ $this->postDeleteUser(['uid' => $uid]);
	94	+ });
	95	+ \OC::$server->getUserManager()->listen('\OC\User', 'postUnassignedUserId', [$this, 'postUnassignedUserId']);
	96	+ Util::connectHook('OC_User',
	97	+ 'changeUser',
	98	+ $this,
	99	+ 'changeUser');
	100	+ }
	101	+
	102	+ public function postCreateUser($params) {
	103	+ $user = $this->userManager->get($params['uid']);
	104	+ $this->syncService->updateUser($user);
	105	+ }
	106	+
	107	+ public function preDeleteUser($params) {
	108	+ $uid = $params['uid'];
	109	+ $this->usersToDelete[$uid] = $this->userManager->get($uid);
	110	+ $this->calendarsToDelete = $this->calDav->getUsersOwnCalendars('principals/users/' . $uid);
	111	+ $this->addressBooksToDelete = $this->cardDav->getUsersOwnAddressBooks('principals/users/' . $uid);
	112	+ }
	113	+
	114	+ public function preUnassignedUserId($uid) {
	115	+ $this->usersToDelete[$uid] = $this->userManager->get($uid);
	116	+ }
	117	+
	118	+ public function postDeleteUser($params) {
	119	+ $uid = $params['uid'];
	120	+ if (isset($this->usersToDelete[$uid])){
	121	+ $this->syncService->deleteUser($this->usersToDelete[$uid]);
	122	+ }
	123	+
	124	+ foreach ($this->calendarsToDelete as $calendar) {
	125	+ $this->calDav->deleteCalendar($calendar['id']);
	126	+ }
	127	+ $this->calDav->deleteAllSharesByUser('principals/users/' . $uid);
	128	+
	129	+ foreach ($this->addressBooksToDelete as $addressBook) {
	130	+ $this->cardDav->deleteAddressBook($addressBook['id']);
	131	+ }
	132	+ }
	133	+
	134	+ public function postUnassignedUserId($uid) {
	135	+ if (isset($this->usersToDelete[$uid])){
	136	+ $this->syncService->deleteUser($this->usersToDelete[$uid]);
	137	+ }
	138	+ }
	139	+
	140	+ public function changeUser($params) {
	141	+ $user = $params['user'];
	142	+ $this->syncService->updateUser($user);
	143	+ }
	144	+
	145	+ public function firstLogin(IUser $user = null) {
	146	+ if (!is_null($user)) {
	147	+ $principal = 'principals/users/' . $user->getUID();
	148	+ if ($this->calDav->getCalendarsForUserCount($principal) === 0) {
	149	+ try {
	150	+ $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
	151	+ '{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
	152	+ ]);
	153	+ } catch (\Exception $ex) {
	154	+ \OC::$server->getLogger()->logException($ex);
	155	+ }
	156	+ }
	157	+ if ($this->cardDav->getAddressBooksForUserCount($principal) === 0) {
	158	+ try {
	159	+ $this->cardDav->createAddressBook($principal, CardDavBackend::PERSONAL_ADDRESSBOOK_URI, [
	160	+ '{DAV:}displayname' => CardDavBackend::PERSONAL_ADDRESSBOOK_NAME,
	161	+ ]);
	162	+ } catch (\Exception $ex) {
	163	+ \OC::$server->getLogger()->logException($ex);
	164	+ }
	165	+ }
	166	+ }
	167	+ }
168	168	}

nextcloud / server

Pull Request — master (#8833)

Status

Category

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