Require 16 for collections

Signed-off-by: Julius Härtl <jus@bitgrid.net>

.drone.yml

@@ -5,7 +5,7 @@ clone:
 
 pipeline:
   check-app-compatbility:
-    image: nextcloudci/php7.0:php7.0-17
+    image: nextcloudci/php7.1:php7.1-15
     environment:
       - APP_NAME=deck
       - CORE_BRANCH=stable15
@@ -43,7 +43,7 @@ pipeline:
       - DB=sqlite
     commands:
       - composer install
-      - ./vendor/bin/parallel-lint --exclude ./vendor/ .
+      - ./vendor/bin/parallel-lint --exclude ./vendor/ --exclude ./lib/Collaboration/ .
     when:
       matrix:
         TESTS: syntax-php7.0

lib/AppInfo/Application.php

@@ -154,6 +154,11 @@ class Application extends App {
 	}
 
 	protected function registerCollaborationResources() {
+		$version = \OC_Util::getVersion()[0];
+		if ($version < 16) {
+			return;
+		}
+
 		/**
 		 * Register Collaboration ResourceProvider
 		 */

lib/Service/BoardService.php

@@ -75,7 +75,6 @@ class BoardService {
 		IGroupManager $groupManager,
 		ActivityManager $activityManager,
 		ChangeHelper $changeHelper,
-		ResourceProvider $resourceProvider,
 		$userId
 	) {
 		$this->boardMapper = $boardMapper;
@@ -90,7 +89,6 @@ class BoardService {
 		$this->groupManager = $groupManager;
 		$this->activityManager = $activityManager;
 		$this->changeHelper = $changeHelper;
-		$this->resourceProvider = $resourceProvider;
 		$this->userId = $userId;
 	}
 
@@ -463,7 +461,13 @@ class BoardService {
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $newAcl, ActivityManager::SUBJECT_BOARD_SHARE);
 		$this->boardMapper->mapAcl($newAcl);
 		$this->changeHelper->boardChanged($boardId);
-		$this->resourceProvider->invalidateAccessCache($boardId);
+		$version = \OC_Util::getVersion()[0];
+		if ($version >= 16) {
+			try {
+				$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
+				$resourceProvider->invalidateAccessCache($boardId);
+			} catch (\Exception $e) {}
+		}
 		return $newAcl;
 	}
 
@@ -534,7 +538,13 @@ class BoardService {
 		}
 		$this->activityManager->triggerEvent(ActivityManager::DECK_OBJECT_BOARD, $acl, ActivityManager::SUBJECT_BOARD_UNSHARE);
 		$this->changeHelper->boardChanged($acl->getBoardId());
-		$this->resourceProvider->invalidateAccessCache($acl->getBoardId());
+		$version = \OC_Util::getVersion()[0];
+		if ($version >= 16) {
+			try {
+				$resourceProvider = \OC::$server->query(\OCA\Deck\Collaboration\Resources\ResourceProvider::class);
+				$resourceProvider->invalidateAccessCache($acl->getBoardId());
+			} catch (\Exception $e) {}
+		}
 		return $this->aclMapper->delete($acl);
 	}