← All changes | src/UserGroup/AbstractUserGroup.php +12 -12 2.3.15 → 2.3.2 View file →

		@@ -133,9 +133,9 @@
133	133
134	134	/**
135	135	* @throws Exception
136	136	*/
137		- public function addObject(string $objectType, int|string|null $objectId, $fromDate = null, $toDate = null): bool
	137	+ public function addObject(string $objectType, int|string $objectId, $fromDate = null, $toDate = null): bool
138	138	{
139	139	$generalObjectType = $this->objectHandler->getGeneralObjectType($objectType);
140	140
141	141	if ($generalObjectType === null
		@@ -310,9 +310,9 @@
310	310
311	311	return $this->defaultTypes;
312	312	}
313	313
314		- public function isDefaultGroupForObjectType(string $objectType, ?int &$fromTime = null, ?int &$toTime = null): bool
	314	+ public function isDefaultGroupForObjectType(string $objectType, int &$fromTime = null, int &$toTime = null): bool
315	315	{
316	316	$defaultGroupForObjectTypes = $this->getDefaultGroupForObjectTypes();
317	317
318	318	// Reset reference values anyway
		@@ -332,10 +332,10 @@
332	332	}
333	333
334	334	public function isObjectAssignedToGroup(
335	335	string $objectType,
336		- int|string|null $objectId,
337		- ?AssignmentInformation &$assignmentInformation = null
	336	+ int|string $objectId,
	337	+ AssignmentInformation &$assignmentInformation = null
338	338	): bool {
339	339	$assignmentInformation = null;
340	340	$assignedObjects = $this->getAssignedObjects($objectType);
341	341
		@@ -351,10 +351,10 @@
351	351	* @throws Exception
352	352	*/
353	353	public function isObjectMember(
354	354	string $objectType,
355		- int|string|null $objectId,
356		- ?AssignmentInformation &$assignmentInformation = null
	355	+ int|string $objectId,
	356	+ AssignmentInformation &$assignmentInformation = null
357	357	): bool {
358	358	if (isset($this->objectMembership[$objectType][$objectId]) === false) {
359	359	try {
360	360	$isMember = $this->objectHandler->getObjectMembershipHandler($objectType)->isMember(
		@@ -379,9 +379,9 @@
379	379
380	380	/**
381	381	* @throws Exception
382	382	*/
383		- public function isRoleMember(int|string|null $roleId, ?AssignmentInformation &$assignmentInformation = null): bool
	383	+ public function isRoleMember(int|string $roleId, ?AssignmentInformation &$assignmentInformation = null): bool
384	384	{
385	385	return $this->isObjectMember(ObjectHandler::GENERAL_ROLE_OBJECT_TYPE, $roleId, $assignmentInformation);
386	386	}
387	387
		@@ -387,9 +387,9 @@
387	387
388	388	/**
389	389	* @throws Exception
390	390	*/
391		- public function isUserMember(int|string|null $userId, ?AssignmentInformation &$assignmentInformation = null): bool
	391	+ public function isUserMember(int|string $userId, AssignmentInformation &$assignmentInformation = null): bool
392	392	{
393	393	return $this->isObjectMember(ObjectHandler::GENERAL_USER_OBJECT_TYPE, $userId, $assignmentInformation);
394	394	}
395	395
		@@ -395,9 +395,9 @@
395	395
396	396	/**
397	397	* @throws Exception
398	398	*/
399		- public function isTermMember(int|string|null $termId, ?AssignmentInformation &$assignmentInformation = null): bool
	399	+ public function isTermMember(int|string $termId, AssignmentInformation &$assignmentInformation = null): bool
400	400	{
401	401	return $this->isObjectMember(ObjectHandler::GENERAL_TERM_OBJECT_TYPE, $termId, $assignmentInformation);
402	402	}
403	403
		@@ -403,9 +403,9 @@
403	403
404	404	/**
405	405	* @throws Exception
406	406	*/
407		- public function isPostMember(int|string|null $postId, ?AssignmentInformation &$assignmentInformation = null): bool
	407	+ public function isPostMember(int|string $postId, AssignmentInformation &$assignmentInformation = null): bool
408	408	{
409	409	return $this->isObjectMember(ObjectHandler::GENERAL_POST_OBJECT_TYPE, $postId, $assignmentInformation);
410	410	}
411	411
		@@ -411,9 +411,9 @@
411	411
412	412	/**
413	413	* @throws Exception
414	414	*/
415		- public function getRecursiveMembershipForObject(string $objectType, int|string|null $objectId): array
	415	+ public function getRecursiveMembershipForObject(string $objectType, int|string $objectId): array
416	416	{
417	417	/**
418	418	* @var AssignmentInformation $assignmentInformation
419	419	*/
		@@ -426,9 +426,9 @@
426	426
427	427	/**
428	428	* @throws Exception
429	429	*/
430		- public function isLockedRecursive(string $objectType, int|string|null $objectId): bool
	430	+ public function isLockedRecursive(string $objectType, int|string $objectId): bool
431	431	{
432	432	/**
433	433	* @var AssignmentInformation $assignmentInformation
434	434	*/