Merge pull request #14 from silverstripe-terraformers/upgrade/CMS-5-v…

…ersion CMS 5 Upgrade
andrewandante · Feb 23, 2023 · 19c6a14 · 19c6a14
2 parents 8e8b401 + ccec4ac
commit 19c6a14
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 (function () {
     window.onload = function(){
-        var frameName = new ds07o6pcmkorn({
+        const frameName = new ds07o6pcmkorn({
             left: 300,
             top: 0,
             iconSize: "small"