Merge pull request #41094 from nextcloud/fix/indirect-safe-dep

fix(dav): Remove usage of indirect thecodingmachine/safe dependency
nextcloud · Oct 25, 2023 · 460954a · 460954a
2 parents 2e25247 + 5281623
commit 460954a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/apps/dav/lib/UserMigration/CalendarMigrator.php b/apps/dav/lib/UserMigration/CalendarMigrator.php
@@ -26,7 +26,7 @@
 
 namespace OCA\DAV\UserMigration;
 
-use function Safe\substr;
+use function substr;
 use OCA\DAV\AppInfo\Application;
 use OCA\DAV\CalDAV\CalDavBackend;
 use OCA\DAV\CalDAV\ICSExportPlugin\ICSExportPlugin;
@@ -50,7 +50,6 @@
 use Sabre\VObject\Property\ICalendar\DateTime;
 use Sabre\VObject\Reader as VObjectReader;
 use Sabre\VObject\UUIDUtil;
-use Safe\Exceptions\StringsException;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;
@@ -185,12 +184,13 @@ function (ICalendar $calendar) use ($user, $output) {
 
 	private function getUniqueCalendarUri(IUser $user, string $initialCalendarUri): string {
 		$principalUri = $this->getPrincipalUri($user);
-		try {
-			$initialCalendarUri = substr($initialCalendarUri, 0, strlen(CalendarMigrator::MIGRATED_URI_PREFIX)) === CalendarMigrator::MIGRATED_URI_PREFIX
-				? $initialCalendarUri
-				: CalendarMigrator::MIGRATED_URI_PREFIX . $initialCalendarUri;
-		} catch (StringsException $e) {
-			throw new CalendarMigratorException('Failed to get unique calendar URI', 0, $e);
+
+		$initialCalendarUri = substr($initialCalendarUri, 0, strlen(CalendarMigrator::MIGRATED_URI_PREFIX)) === CalendarMigrator::MIGRATED_URI_PREFIX
+			? $initialCalendarUri
+			: CalendarMigrator::MIGRATED_URI_PREFIX . $initialCalendarUri;
+
+		if ($initialCalendarUri === '') {
+			throw new CalendarMigratorException('Failed to get unique calendar URI');
 		}
 
 		$existingCalendarUris = array_map(

diff --git a/apps/dav/lib/UserMigration/ContactsMigrator.php b/apps/dav/lib/UserMigration/ContactsMigrator.php
@@ -26,8 +26,8 @@
 
 namespace OCA\DAV\UserMigration;
 
-use function Safe\sort;
-use function Safe\substr;
+use function sort;
+use function substr;
 use OCA\DAV\AppInfo\Application;
 use OCA\DAV\CardDAV\CardDavBackend;
 use OCA\DAV\CardDAV\Plugin as CardDAVPlugin;
@@ -46,8 +46,6 @@
 use Sabre\VObject\Reader as VObjectReader;
 use Sabre\VObject\Splitter\VCard as VCardSplitter;
 use Sabre\VObject\UUIDUtil;
-use Safe\Exceptions\ArrayException;
-use Safe\Exceptions\StringsException;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
 use Throwable;
@@ -165,12 +163,12 @@ function (array $addressBookInfo) use ($user, $output) {
 	private function getUniqueAddressBookUri(IUser $user, string $initialAddressBookUri): string {
 		$principalUri = $this->getPrincipalUri($user);
 
-		try {
-			$initialAddressBookUri = substr($initialAddressBookUri, 0, strlen(ContactsMigrator::MIGRATED_URI_PREFIX)) === ContactsMigrator::MIGRATED_URI_PREFIX
-				? $initialAddressBookUri
-				: ContactsMigrator::MIGRATED_URI_PREFIX . $initialAddressBookUri;
-		} catch (StringsException $e) {
-			throw new ContactsMigratorException('Failed to get unique address book URI', 0, $e);
+		$initialAddressBookUri = substr($initialAddressBookUri, 0, strlen(ContactsMigrator::MIGRATED_URI_PREFIX)) === ContactsMigrator::MIGRATED_URI_PREFIX
+			? $initialAddressBookUri
+			: ContactsMigrator::MIGRATED_URI_PREFIX . $initialAddressBookUri;
+
+		if ($initialAddressBookUri === '') {
+			throw new ContactsMigratorException('Failed to get unique address book URI');
 		}
 
 		$existingAddressBookUris = array_map(
@@ -303,11 +301,10 @@ private function getAddressBookImports(array $importFiles): array {
 			fn (string $filename) => pathinfo($filename, PATHINFO_EXTENSION) === ContactsMigrator::METADATA_EXT,
 		);
 
-		try {
-			sort($addressBookImports);
-			sort($metadataImports);
-		} catch (ArrayException $e) {
-			throw new ContactsMigratorException('Failed to sort address book files in ' . ContactsMigrator::PATH_ROOT, 0, $e);
+		$addressBookSort = sort($addressBookImports);
+		$metadataSort = sort($metadataImports);
+		if ($addressBookSort === false || $metadataSort === false) {
+			throw new ContactsMigratorException('Failed to sort address book files in ' . ContactsMigrator::PATH_ROOT);
 		}
 
 		if (count($addressBookImports) !== count($metadataImports)) {