From 7c1ee524be784bf54d4c09d1310c182593d8b2f2 Mon Sep 17 00:00:00 2001
From: Maxence Lange <maxence@artificial-owl.com>
Date: Fri, 26 Jul 2024 16:35:51 -0100
Subject: fix(migration-attributes): privatizing AttributeException

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
---
 lib/private/Migration/Exceptions/AttributeException.php | 17 +++++++++++++++++
 lib/private/Migration/MetadataManager.php               |  8 ++++----
 2 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 lib/private/Migration/Exceptions/AttributeException.php

(limited to 'lib/private')

diff --git a/lib/private/Migration/Exceptions/AttributeException.php b/lib/private/Migration/Exceptions/AttributeException.php
new file mode 100644
index 00000000000..3daf99032ad
--- /dev/null
+++ b/lib/private/Migration/Exceptions/AttributeException.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OC\Migration\Exceptions;
+
+use Exception;
+
+/**
+ * @since 30.0.0
+ */
+class AttributeException extends Exception {
+}
diff --git a/lib/private/Migration/MetadataManager.php b/lib/private/Migration/MetadataManager.php
index c5061b6fe0c..2558d49f7f8 100644
--- a/lib/private/Migration/MetadataManager.php
+++ b/lib/private/Migration/MetadataManager.php
@@ -10,10 +10,10 @@ namespace OC\Migration;
 
 use OC\DB\Connection;
 use OC\DB\MigrationService;
+use OC\Migration\Exceptions\AttributeException;
 use OCP\App\IAppManager;
 use OCP\Migration\Attributes\GenericMigrationAttribute;
 use OCP\Migration\Attributes\MigrationAttribute;
-use OCP\Migration\Exceptions\AttributeException;
 use Psr\Log\LoggerInterface;
 use ReflectionClass;
 
@@ -58,10 +58,10 @@ class MetadataManager {
 	/**
 	 * convert direct data from release metadata into a list of Migrations' Attribute
 	 *
-	 * @param array $metadata
+	 * @param array<array-key, array<array-key, array>> $metadata
 	 * @param bool $filterKnownMigrations ignore metadata already done in local instance
 	 *
-	 * @return array
+	 * @return array{apps: array<array-key, array<string, MigrationAttribute[]>>, core: array<string, MigrationAttribute[]>}
 	 * @since 30.0.0
 	 */
 	public function getMigrationsAttributesFromReleaseMetadata(
@@ -73,6 +73,7 @@ class MetadataManager {
 			if ($filterKnownMigrations && !$this->appManager->isInstalled($appId)) {
 				continue; // if not interested and app is not installed
 			}
+
 			$done = ($filterKnownMigrations) ? $this->getKnownMigrations($appId) : [];
 			$appsAttributes[$appId] = $this->parseMigrations($metadata['apps'][$appId] ?? [], $done);
 		}
@@ -126,7 +127,6 @@ class MetadataManager {
 		return $ms->getMigratedVersions();
 	}
 
-
 	/**
 	 * generate (deserialize) a MigrationAttribute from a serialized version
 	 *
-- 
cgit v1.2.3