refactor: Change callback notation to be more readable

Signed-off-by: provokateurin <kate@provokateurin.de>
nextcloud · Sep 17, 2024 · 490f74f · 490f74f
1 parent b8a6d00
commit 490f74f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/lib/ACL/ACLCacheWrapper.php b/lib/ACL/ACLCacheWrapper.php
@@ -63,19 +63,19 @@ public function getFolderContentsById($fileId) {
 	public function search($pattern) {
 		$results = $this->getCache()->search($pattern);
 		$this->preloadEntries($results);
-		return array_filter(array_map([$this, 'formatCacheEntry'], $results));
+		return array_filter(array_map($this->formatCacheEntry(...), $results));
 	}
 
 	public function searchByMime($mimetype) {
 		$results = $this->getCache()->searchByMime($mimetype);
 		$this->preloadEntries($results);
-		return array_filter(array_map([$this, 'formatCacheEntry'], $results));
+		return array_filter(array_map($this->formatCacheEntry(...), $results));
 	}
 
 	public function searchQuery(ISearchQuery $query) {
 		$results = $this->getCache()->searchQuery($query);
 		$this->preloadEntries($results);
-		return array_filter(array_map([$this, 'formatCacheEntry'], $results));
+		return array_filter(array_map($this->formatCacheEntry(...), $results));
 	}
 
 	/**

diff --git a/lib/CacheListener.php b/lib/CacheListener.php
@@ -18,8 +18,8 @@ public function __construct(private IEventDispatcher $eventDispatcher) {
 	}
 
 	public function listen(): void {
-		$this->eventDispatcher->addListener(CacheInsertEvent::class, [$this, 'onCacheEvent'], 99999);
-		$this->eventDispatcher->addListener(CacheUpdateEvent::class, [$this, 'onCacheEvent'], 99999);
+		$this->eventDispatcher->addListener(CacheInsertEvent::class, $this->onCacheEvent(...), 99999);
+		$this->eventDispatcher->addListener(CacheUpdateEvent::class, $this->onCacheEvent(...), 99999);
 	}
 
 	public function onCacheEvent(ICacheEvent $event): void {

diff --git a/lib/Controller/FolderController.php b/lib/Controller/FolderController.php
@@ -93,7 +93,7 @@ private function formatFolder(array $folder): array {
 	#[ApiRoute(verb: 'GET', url: '/folders')]
 	public function getFolders(bool $applicable = false): DataResponse {
 		$folders = $this->manager->getAllFoldersWithSize($this->getRootFolderStorageId());
-		$folders = array_map([$this, 'formatFolder'], $folders);
+		$folders = array_map($this->formatFolder(...), $folders);
 		$isAdmin = $this->delegationService->isAdminNextcloud() || $this->delegationService->isDelegatedAdmin();
 		if ($isAdmin && !$applicable) {
 			return new DataResponse($folders);
@@ -102,7 +102,7 @@ public function getFolders(bool $applicable = false): DataResponse {
 			$folders = $this->foldersFilter->getForApiUser($folders);
 		}
 		if ($applicable || !$this->delegationService->hasApiAccess()) {
-			$folders = array_map([$this, 'filterNonAdminFolder'], $folders);
+			$folders = array_map($this->filterNonAdminFolder(...), $folders);
 			$folders = array_filter($folders);
 		}
 		return new DataResponse($folders);
@@ -299,7 +299,7 @@ private function buildOCSResponseXML(string $format, DataResponse $data): V1Resp
 			$folderData = $this->folderDataForXML($folderData);
 		} elseif (is_array($folderData) && count($folderData) && isset(current($folderData)['id'])) {
 			// folder list
-			$folderData = array_map([$this, 'folderDataForXML'], $folderData);
+			$folderData = array_map($this->folderDataForXML(...), $folderData);
 		}
 		$data->setData($folderData);
 		return new V1Response($data, $format);

diff --git a/lib/DAV/ACLPlugin.php b/lib/DAV/ACLPlugin.php
@@ -56,8 +56,8 @@ public function initialize(Server $server): void {
 		$this->server = $server;
 		$this->user = $user = $this->userSession->getUser();
 
-		$this->server->on('propFind', [$this, 'propFind']);
-		$this->server->on('propPatch', [$this, 'propPatch']);
+		$this->server->on('propFind', $this->propFind(...));
+		$this->server->on('propPatch', $this->propPatch(...));
 
 		$this->server->xml->elementMap[Rule::ACL] = Rule::class;
 		$this->server->xml->elementMap[self::ACL_LIST] = function (Reader $reader): array {

diff --git a/lib/DAV/GroupFoldersHome.php b/lib/DAV/GroupFoldersHome.php
@@ -94,7 +94,7 @@ public function getChild($name) {
 	 */
 	public function getChildren(): array {
 		$folders = $this->folderManager->getFoldersForUser($this->user, $this->rootFolder->getMountPoint()->getNumericStorageId());
-		return array_map([$this, 'getDirectoryForFolder'], $folders);
+		return array_map($this->getDirectoryForFolder(...), $folders);
 	}
 
 	public function childExists($name): bool {

diff --git a/lib/DAV/PropFindPlugin.php b/lib/DAV/PropFindPlugin.php
@@ -37,7 +37,7 @@ public function getPluginName(): string {
 	}
 
 	public function initialize(Server $server): void {
-		$server->on('propFind', [$this, 'propFind']);
+		$server->on('propFind', $this->propFind(...));
 	}
 
 	public function propFind(PropFind $propFind, INode $node): void {