Merge pull request #578 from owncloud/adjust-for-symfony5

[full-ci] Adjust dispatch calls for Symfony 5
owncloud · May 22, 2023 · 8cc7d32 · 8cc7d32
2 parents 3785634 + 6748962
commit 8cc7d32
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/lib/Dav/GroupMembershipCollection.php b/lib/Dav/GroupMembershipCollection.php
@@ -118,7 +118,7 @@ public function delete() {
 		$event = new GenericEvent(null, [
 			'groupName' => $this->groupInfo['display_name'],
 			'groupId' => $groupId]);
-		$this->dispatcher->dispatch('\OCA\CustomGroups::deleteGroup', $event);
+		$this->dispatcher->dispatch($event, '\OCA\CustomGroups::deleteGroup');
 	}
 
 	/**
@@ -216,7 +216,7 @@ public function createFile($userId, $data = null) {
 			'groupName' => $this->groupInfo['display_name'],
 			'groupId' => $groupId,
 			'user' => $userId]);
-		$this->dispatcher->dispatch('\OCA\CustomGroups::addUserToGroup', $event);
+		$this->dispatcher->dispatch($event, '\OCA\CustomGroups::addUserToGroup');
 	}
 
 	/**
@@ -330,7 +330,7 @@ public function updateDisplayName($displayName) {
 			'oldGroupName' => $this->groupInfo['display_name'],
 			'newGroupName' => $displayName,
 			'groupId' => $this->groupInfo['group_id']]);
-		$this->dispatcher->dispatch('\OCA\CustomGroups::updateGroupName', $event);
+		$this->dispatcher->dispatch($event, '\OCA\CustomGroups::updateGroupName');
 
 		$result = $this->groupsHandler->updateGroup(
 			$this->groupInfo['group_id'],

diff --git a/lib/Dav/GroupsCollection.php b/lib/Dav/GroupsCollection.php
@@ -193,7 +193,7 @@ private function createGroup($name, $displayName) {
 			'groupName' => $name,
 			'groupId' => $groupId,
 			'user' => $this->helper->getUserId()]);
-		$this->dispatcher->dispatch('\OCA\CustomGroups::addGroupAndUser', $event);
+		$this->dispatcher->dispatch($event, '\OCA\CustomGroups::addGroupAndUser');
 	}
 
 	/**

diff --git a/lib/Dav/MembershipNode.php b/lib/Dav/MembershipNode.php
@@ -141,15 +141,15 @@ public function delete() {
 			 * This event is deprecated. The keys of the event array are not using camel case.
 			 */
 			$event = new GenericEvent(null, ['user_displayName' => $userId, 'group_displayName' => $this->groupInfo['display_name']]);
-			$this->dispatcher->dispatch('\OCA\CustomGroups::removeUserFromGroup', $event);
+			$this->dispatcher->dispatch($event, '\OCA\CustomGroups::removeUserFromGroup');
 			/**
 			 * The new event which has camel case for arguments in event array.
 			 */
 			$newEvent = new GenericEvent(null, [
 				'user' => $userId,
 				'groupName' => $this->groupInfo['display_name'],
 				'groupId' => $groupId]);
-			$this->dispatcher->dispatch('customGroups.removeUserFromGroup', $newEvent);
+			$this->dispatcher->dispatch($newEvent, 'customGroups.removeUserFromGroup');
 		}
 
 		//Send dispatcher event if the removal is self
@@ -159,15 +159,15 @@ public function delete() {
 			 * as key for event argument
 			 */
 			$event = new GenericEvent(null, ['userId' => $userId, 'groupName' => $this->groupInfo['display_name']]);
-			$this->dispatcher->dispatch('\OCA\CustomGroups::leaveFromGroup', $event);
+			$this->dispatcher->dispatch($event, '\OCA\CustomGroups::leaveFromGroup');
 			/**
 			 * From now on use this event 'customGroups.leaveFromGroup'
 			 */
 			$newEvent = new GenericEvent(null, [
 				'user' => $userId,
 				'groupName' => $this->groupInfo['display_name'],
 				'groupId' => $groupId]);
-			$this->dispatcher->dispatch('customGroups.leaveFromGroup', $newEvent);
+			$this->dispatcher->dispatch($newEvent, 'customGroups.leaveFromGroup');
 		}
 	}
 

diff --git a/lib/Service/MembershipHelper.php b/lib/Service/MembershipHelper.php
@@ -298,7 +298,7 @@ public function notifyUserRoleChange($targetUserId, array $groupInfo, array $mem
 			'roleNumber' => $memberInfo['role'],
 			'roleDisaplayName' => $roleName,
 			'groupId' => $memberInfo['group_id']]);
-		$this->dispatcher->dispatch('\OCA\CustomGroups::changeRoleInGroup', $event);
+		$this->dispatcher->dispatch($event, '\OCA\CustomGroups::changeRoleInGroup');
 	}
 
 	/**

diff --git a/vendor-bin/phan/composer.json b/vendor-bin/phan/composer.json
@@ -0,0 +1,5 @@
+{
+	"require": {
+		"phan/phan": "^5.2"
+	}
+}