Revert "chore(deps): add ramsey/uuid again for db migrations"

This reverts commit e6aeaf3.
nextcloud · Apr 22, 2024 · 6b4e2ee · 6b4e2ee
1 parent 9c63410
commit 6b4e2ee
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 234 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,6 @@
 		"php": ">=8.1.0",
 		"ext-json": "*",
 		"bamarni/composer-bin-plugin": "^1.8.2",
-		"ramsey/uuid": "^3.9",
 		"web-auth/webauthn-lib": "^4.8.5"
 	},
 	"require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Service/U2FMigrator.php b/lib/Service/U2FMigrator.php
@@ -26,7 +26,8 @@
 namespace OCA\TwoFactorWebauthn\Service;
 
 use OCA\TwoFactorWebauthn\Db\Registration;
-use Symfony\Component\Uid\Uuid;
+use Ramsey\Uuid\Uuid;
+use Ramsey\Uuid\UuidInterface;
 use Webauthn\AttestationStatement\AttestationStatement;
 use Webauthn\PublicKeyCredentialDescriptor;
 use Webauthn\PublicKeyCredentialSource;
@@ -42,8 +43,8 @@ private function base64_urlsafe_decode(string $data) {
 		return base64_decode(str_replace(['-', '_'], ['+', '/'], $data));
 	}
 
-	private function zeroUuid(): Uuid {
-		return Uuid::fromRfc4122('00000000-0000-0000-0000-000000000000');
+	private function zeroUuid(): UuidInterface {
+		return Uuid::fromString('00000000-0000-0000-0000-000000000000');
 	}
 
 	public function migrateU2FRegistration(Registration $registration): PublicKeyCredentialSource {