Merge pull request #1 from chrometoasters/silverstripe4-update

Update to work with SilverStripe 4
chrometoasters · Dec 20, 2018 · e49a4dc · e49a4dc
2 parents 568070d + 706c1bb
commit e49a4dc
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.0.0]
+
+Update to work with SilverStripe 4.
+
 ## [1.0.0]
 
 Initial module release.

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2017, Chrometoaster New Media Ltd.
+Copyright (c) 2018, Chrometoaster Ltd.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ Comes with Google snippets that need to be included in your theme's templates.
 
 ## Requirements
 
-* SilverStripe 3.1 and above
+* SilverStripe 4.0 and above
 
 ## Installation
 
@@ -33,17 +33,17 @@ Place two template includes into your theme's main template, e.g. Page.ss.
     <meta charset="utf-8">
     <title itemprop="name">$Title</title>
 
-    <% include GA_GTM_head %>
+    <% include Chrometoaster\GA_GTM\GA_GTM_head %>
 ```
 
 #### Body
 
-`<% include GA_GTM_body %>` directly after the opening `<body>` tag:
+`<% include Chrometoaster\GA_GTM\GA_GTM_body %>` directly after the opening `<body>` tag:
 
 ```html
 </head>
 <body>
-    <% include GA_GTM_body %>
+    <% include Chrometoaster\GA_GTM\GA_GTM_body %>
 ```
 
 

diff --git a/_config/config.yml b/_config/config.yml
@@ -1,9 +1,6 @@
 ---
 Name: ga-gtm-singlefield
-After:
-  - 'framework/*'
-  - 'cms/*'
 ---
-SiteConfig:
+SilverStripe\SiteConfig\SiteConfig:
   extensions:
-    - GASiteConfigExtension
+    - Chrometoaster\GA_GTM\Extensions\GASiteConfigExtension
diff --git a/composer.json b/composer.json
@@ -10,9 +10,9 @@
         }
     ],
     "require": {
-        "php": ">=5.4",
-        "silverstripe/framework": "~3.1",
-        "silverstripe/cms": "~3.1"
+        "php": "^7.1",
+        "silverstripe/framework": "~4.0",
+        "silverstripe/cms": "~4.0"
     },
     "minimum-stability": "stable",
     "license": "BSD-3-Clause"

diff --git a/code/extensions/GASiteConfigExtension.php → src/extensions/GASiteConfigExtension.php b/code/extensions/GASiteConfigExtension.php → src/extensions/GASiteConfigExtension.php
@@ -1,5 +1,11 @@
 <?php
 
+namespace Chrometoaster\GA_GTM\Extensions;
+
+use Chrometoaster\GA_GTM\Formfields\GACodeField;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\ORM\DataExtension;
+
 /**
  * Class GASiteConfig
  *

diff --git a/code/formfields/GACodeField.php → src/formfields/GACodeField.php b/code/formfields/GACodeField.php → src/formfields/GACodeField.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace Chrometoaster\GA_GTM\Formfields;
+
+use SilverStripe\Forms\TextField;
+
 /**
  * Class GACodeField
  */

diff --git a/templates/GA_GTM_body.ss → ...lates/Chrometoaster/GA_GTM/GA_GTM_body.ss b/templates/GA_GTM_body.ss → ...lates/Chrometoaster/GA_GTM/GA_GTM_body.ss
@@ -1,10 +1,10 @@
 <% with $SiteConfig %>
     <% if $GoogleCode %>
         <% if $AnalyticType == 'GTM' %>
-            <% include GTM_body %>
+            <% include Chrometoaster\GA_GTM\Includes\GTM_body %>
         <% end_if %>
         <% if $AnalyticType == 'UA' %>
-            <% include GA_body %>
+            <% include Chrometoaster\GA_GTM\Includes\GA_body %>
         <% end_if %>
     <% end_if %>
 <% end_with %>
diff --git a/templates/GA_GTM_head.ss → ...lates/Chrometoaster/GA_GTM/GA_GTM_head.ss b/templates/GA_GTM_head.ss → ...lates/Chrometoaster/GA_GTM/GA_GTM_head.ss
@@ -1,10 +1,10 @@
 <% with $SiteConfig %>
     <% if $GoogleCode %>
         <% if $AnalyticType == 'GTM' %>
-            <% include GTM_head %>
+            <% include Chrometoaster\GA_GTM\Includes\GTM_head %>
         <% end_if %>
         <% if $AnalyticType == 'UA' %>
-            <% include GA_head %>
+            <% include Chrometoaster\GA_GTM\Includes\GA_head %>
         <% end_if %>
     <% end_if %>
 <% end_with %>
diff --git a/templates/includes/GA_body.ss → .../Chrometoaster/GA_GTM/Includes/GA_body.ss b/templates/includes/GA_body.ss → .../Chrometoaster/GA_GTM/Includes/GA_body.ss
diff --git a/templates/includes/GA_head.ss → .../Chrometoaster/GA_GTM/Includes/GA_head.ss b/templates/includes/GA_head.ss → .../Chrometoaster/GA_GTM/Includes/GA_head.ss
diff --git a/templates/includes/GTM_body.ss → ...Chrometoaster/GA_GTM/Includes/GTM_body.ss b/templates/includes/GTM_body.ss → ...Chrometoaster/GA_GTM/Includes/GTM_body.ss
diff --git a/templates/includes/GTM_head.ss → ...Chrometoaster/GA_GTM/Includes/GTM_head.ss b/templates/includes/GTM_head.ss → ...Chrometoaster/GA_GTM/Includes/GTM_head.ss