DEP PHP Support in CMS5

silverstripe · Jan 17, 2023 · 2295eb7 · 2295eb7
1 parent 92ec2e8
commit 2295eb7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/composer.json b/composer.json
@@ -8,11 +8,11 @@
     ],
     "license": "BSD-3-Clause",
     "require": {
-        "php": "^7.4 || ^8.0",
+        "php": "^8.1",
         "ext-bcmath": "*",
-        "silverstripe/framework": "^4.12",
-        "silverstripe/mfa": "^4.6",
-        "web-auth/webauthn-lib": "^3.3",
+        "silverstripe/framework": "^5",
+        "silverstripe/mfa": "^5",
+        "web-auth/webauthn-lib": "^4.4",
         "guzzlehttp/psr7": "^2"
     },
     "require-dev": {

diff --git a/src/BaseHandlerTrait.php b/src/BaseHandlerTrait.php
@@ -6,7 +6,7 @@
 
 use CBOR\Decoder;
 use CBOR\OtherObject\OtherObjectManager;
-use CBOR\Tag\TagObjectManager;
+use CBOR\Tag\TagManager;
 use Webauthn\AttestationStatement\AttestationObjectLoader;
 use Webauthn\AttestationStatement\AttestationStatementSupportManager;
 use Webauthn\AttestationStatement\FidoU2FAttestationStatementSupport;
@@ -33,7 +33,7 @@ protected function getDecoder(): Decoder
     {
         return Deprecation::withNoReplacement(function () {
             Deprecation::notice('4.5.0', 'Will be removed without equivalent functionality to replace it');
-            return new Decoder(new TagObjectManager(), new OtherObjectManager());
+            return new Decoder(new TagManager(), new OtherObjectManager());
         });
     }
 

diff --git a/src/RegisterHandler.php b/src/RegisterHandler.php
@@ -283,8 +283,7 @@ protected function getCredentialCreationOptions(
      */
     protected function getAuthenticatorSelectionCriteria(): AuthenticatorSelectionCriteria
     {
-        return new AuthenticatorSelectionCriteria(
-            (string) $this->config()->get('authenticator_attachment')
-        );
-    }
+        return AuthenticatorSelectionCriteria::create()
+            ->setAuthenticatorAttachment((string) $this->config()->get('authenticator_attachment'));
+        }
 }