From 2f0eeca78de62386e275e751d136b0099bd10559 Mon Sep 17 00:00:00 2001 From: Hendrik Schaper Date: Wed, 1 Nov 2023 12:43:36 +0100 Subject: [PATCH 1/3] Update composer.json SilverStripe 5 compat --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b7eb05f..92d76ff 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { - "silverstripe/framework": "^4.0" + "silverstripe/framework": "~5" }, "autoload": { "psr-4": { From ad44441333e996ae00486ed826117222054a1ee8 Mon Sep 17 00:00:00 2001 From: Hendrik Schaper Date: Mon, 17 Jun 2024 13:35:04 +0200 Subject: [PATCH 2/3] SS5 compatibility --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 92d76ff..d82549b 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ ], "require": { - "silverstripe/framework": "~5" + "silverstripe/framework": "^4 || ^5" }, "autoload": { "psr-4": { From 774345d46374c89f8fdbc59324d526233c73c643 Mon Sep 17 00:00:00 2001 From: Hendrik Schaper Date: Mon, 17 Jun 2024 13:36:12 +0200 Subject: [PATCH 3/3] SS5 compatibility --- src/SingleObjectAdmin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SingleObjectAdmin.php b/src/SingleObjectAdmin.php index 0e54f73..248debe 100644 --- a/src/SingleObjectAdmin.php +++ b/src/SingleObjectAdmin.php @@ -172,7 +172,7 @@ public function EditForm($request = null) * * @return DBHTMLText|string */ - public function getSilverStripeNavigator() + public function getSilverStripeNavigator(?DataObject $record = null) { return $this->renderWith(SingleObjectAdmin::class . '_SilverStripeNavigator'); } @@ -180,7 +180,7 @@ public function getSilverStripeNavigator() /** * @return PjaxResponseNegotiator */ - public function getResponseNegotiator() + public function getResponseNegotiator(): PjaxResponseNegotiator { $neg = parent::getResponseNegotiator(); $controller = $this;