fixup! fix: Deduplicate code by using DependencyAnalyzer in the AppManager

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

Author: come-nc

tests/lib/App/AppManagerTest.php

@@ -11,12 +11,12 @@
 namespace Test\App;
 
 use OC\App\AppManager;
+use OC\App\DependencyAnalyzer;
 use OC\AppConfig;
 use OC\Config\ConfigManager;
 use OCP\App\AppPathNotFoundException;
 use OCP\App\Events\AppDisableEvent;
 use OCP\App\Events\AppEnableEvent;
-use OCP\App\IAppManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\ICache;
 use OCP\ICacheFactory;
@@ -95,9 +95,9 @@ protected function getAppConfig(): AppConfig&MockObject {
 	protected IURLGenerator&MockObject $urlGenerator;
 	protected ServerVersion&MockObject $serverVersion;
 	protected ConfigManager&MockObject $configManager;
+	protected DependencyAnalyzer&MockObject $dependencyAnalyzer;
 
-	/** @var IAppManager */
-	protected $manager;
+	protected AppManager $manager;
 
 	protected function setUp(): void {
 		parent::setUp();
@@ -113,6 +113,7 @@ protected function setUp(): void {
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 		$this->serverVersion = $this->createMock(ServerVersion::class);
 		$this->configManager = $this->createMock(ConfigManager::class);
+		$this->dependencyAnalyzer = $this->createMock(DependencyAnalyzer::class);
 
 		$this->overwriteService(AppConfig::class, $this->appConfig);
 		$this->overwriteService(IURLGenerator::class, $this->urlGenerator);
@@ -279,6 +280,7 @@ public function testEnableAppForGroups(): void {
 				$this->logger,
 				$this->serverVersion,
 				$this->configManager,
+				$this->dependencyAnalyzer,
 			])
 			->onlyMethods([
 				'getAppPath',
@@ -333,6 +335,7 @@ public function testEnableAppForGroupsAllowedTypes(array $appInfo): void {
 				$this->logger,
 				$this->serverVersion,
 				$this->configManager,
+				$this->dependencyAnalyzer,
 			])
 			->onlyMethods([
 				'getAppPath',
@@ -396,6 +399,7 @@ public function testEnableAppForGroupsForbiddenTypes($type): void {
 				$this->logger,
 				$this->serverVersion,
 				$this->configManager,
+				$this->dependencyAnalyzer,
 			])
 			->onlyMethods([
 				'getAppPath',
@@ -602,6 +606,7 @@ public function testGetAppsNeedingUpgrade(): void {
 				$this->logger,
 				$this->serverVersion,
 				$this->configManager,
+				$this->dependencyAnalyzer,
 			])
 			->onlyMethods(['getAppInfo'])
 			->getMock();
@@ -663,6 +668,7 @@ public function testGetIncompatibleApps(): void {
 				$this->logger,
 				$this->serverVersion,
 				$this->configManager,
+				$this->dependencyAnalyzer,
 			])
 			->onlyMethods(['getAppInfo'])
 			->getMock();
@@ -803,6 +809,7 @@ public function testGetAppVersion() {
 				$this->logger,
 				$this->serverVersion,
 				$this->configManager,
+				$this->dependencyAnalyzer,
 			])
 			->onlyMethods([
 				'getAppInfo',
@@ -835,6 +842,7 @@ public function testGetAppVersionCore() {
 				$this->logger,
 				$this->serverVersion,
 				$this->configManager,
+				$this->dependencyAnalyzer,
 			])
 			->onlyMethods([
 				'getAppInfo',
@@ -866,6 +874,7 @@ public function testGetAppVersionUnknown() {
 				$this->logger,
 				$this->serverVersion,
 				$this->configManager,
+				$this->dependencyAnalyzer,
 			])
 			->onlyMethods([
 				'getAppInfo',