fix(dav): Remove usage of indirect thecodingmachine/safe dependency

Signed-off-by: Christopher Ng <chrng8@gmail.com>

diff --git a/apps/dav/lib/UserMigration/CalendarMigrator.php b/apps/dav/lib/UserMigration/CalendarMigrator.php
index e5b404e785f961349e22acffd6f401658e368726..7666dc99eea97954f3e5b3f411c35bd412c2c1d2 100644 (file)
--- a/apps/dav/lib/UserMigration/CalendarMigrator.php
+++ b/apps/dav/lib/UserMigration/CalendarMigrator.php
@@ -26,7 +26,7 @@ declare(strict_types=1);
 
 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\Component\VTimeZone;
 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 @@ class CalendarMigrator implements IMigrator, ISizeEstimationMigrator {
 
        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
index 58e267ab28c155be86e1b4976ce818eeda6236de..53aac0a4cfa3c68e60c2fb49365787820495c141 100644 (file)
--- a/apps/dav/lib/UserMigration/ContactsMigrator.php
+++ b/apps/dav/lib/UserMigration/ContactsMigrator.php
@@ -26,8 +26,8 @@ declare(strict_types=1);
 
 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\Parser\Parser as VObjectParser;
 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 @@ class ContactsMigrator implements IMigrator, ISizeEstimationMigrator {
        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 @@ class ContactsMigrator implements IMigrator, ISizeEstimationMigrator {
                        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)) {