From ccec4ac9d4cc2f605d1edecc131f8c23f1e51efa Mon Sep 17 00:00:00 2001 From: "y2ksoft@gmail.com" Date: Thu, 23 Feb 2023 13:12:23 +1300 Subject: [PATCH] CMS 5 Upgrade --- code/ControllerExtension.php | 2 +- code/SiteConfigExtension.php | 4 ++-- composer.json | 13 ++++++++++--- javascript/button.js | 2 +- javascript/large_tab.js | 2 +- javascript/small_tab.js | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) diff --git a/code/ControllerExtension.php b/code/ControllerExtension.php index c8d2915..2ff5115 100644 --- a/code/ControllerExtension.php +++ b/code/ControllerExtension.php @@ -19,7 +19,7 @@ class ControllerExtension extends Extension * @var bool * @config */ - private static $use_remote_js = false; + private static bool $use_remote_js = false; public function onAfterInit() { diff --git a/code/SiteConfigExtension.php b/code/SiteConfigExtension.php index f8552de..105bafe 100644 --- a/code/SiteConfigExtension.php +++ b/code/SiteConfigExtension.php @@ -11,12 +11,12 @@ * Class AndrewAndante\WomensRefugeShield\SiteConfigExtension * * @property SiteConfig $owner - * @property int $Pridecode + * @property int $ShieldCode */ class SiteConfigExtension extends DataExtension { - private static $db = [ + private static array $db = [ 'ShieldCode' => 'Int', ]; diff --git a/composer.json b/composer.json index 864153b..23e62eb 100644 --- a/composer.json +++ b/composer.json @@ -13,9 +13,9 @@ ], "require": { - "silverstripe/framework": "^4.0", - "silverstripe/siteconfig": "^4.0", - "silverstripe/cms": "^4.0" + "silverstripe/framework": "^5.0", + "silverstripe/siteconfig": "^5.0", + "silverstripe/cms": "^5.0" }, "extra": { "expose": [ @@ -28,5 +28,12 @@ "psr-4": { "AndrewAndante\\WomensRefugeShield\\": "code/" } + }, + "minimum-stability": "dev", + "config": { + "allow-plugins": { + "composer/installers": true, + "silverstripe/vendor-plugin": true + } } } diff --git a/javascript/button.js b/javascript/button.js index ccb854d..633f6b8 100644 --- a/javascript/button.js +++ b/javascript/button.js @@ -1,6 +1,6 @@ (function () { window.onload = function(){ - var frameName = new ds07o6pcmkorn({ + const frameName = new ds07o6pcmkorn({ openElementId: "#womens-refuge-shield-button" }); frameName.init(); diff --git a/javascript/large_tab.js b/javascript/large_tab.js index a85f672..fbdaea2 100644 --- a/javascript/large_tab.js +++ b/javascript/large_tab.js @@ -1,6 +1,6 @@ (function () { window.onload = function(){ - var frameName = new ds07o6pcmkorn({ + const frameName = new ds07o6pcmkorn({ left: 300, top: 0, iconSize: "big" diff --git a/javascript/small_tab.js b/javascript/small_tab.js index ae9a332..dc9f6a5 100644 --- a/javascript/small_tab.js +++ b/javascript/small_tab.js @@ -1,6 +1,6 @@ (function () { window.onload = function(){ - var frameName = new ds07o6pcmkorn({ + const frameName = new ds07o6pcmkorn({ left: 300, top: 0, iconSize: "small"