Merge pull request #15 from webbuilders-group/feature-silverstripe-6

FEATURE: Support Silverstripe 6

Author: axllent

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 Notable changes to this project will be documented in this file.
 
+## [5.0.0]
+
+- Support for Silverstripe 6
+
 ## [4.0.4]
 
 - Add void return type for PHP 8 compatibility with Functional Test

README.md

@@ -13,7 +13,7 @@ It automatically includes optional unobtrusive **event tracking** for all outbou
 - Automatic `pageview` tracking for all configured accounts, including tracking of 404 & 500 page errors (tracked as "Page Not Found" / "Page Error" events).
 - Unobtrusive outbound, download, email & tel: link tracking - monitors all page clicks, rather than on page load (ie: works with links including those generated by Ajax etc on the page after page load).
 - Uses Google Analytics `hitCallback` for tracking for outgoing links to register before load (ie: when no link `target` is set) to ensure tracker is successfully run before redirection.
-- Tracking codes are automatically changed to `UA-DEV-[1-9]` if `SS_ENVIRONMENT_TYPE` is **not** live, or if page URL matches ?flush= to prevent bad data capture.
+- Tracking codes are automatically changed to `G-XXXXXXXX-[1-9]` if `SS_ENVIRONMENT_TYPE` is **not** live, or if page URL matches ?flush= to prevent bad data capture.
 
 ### Event tracking
 
@@ -30,7 +30,9 @@ Event category names (eg: "Outgoing Links", "Downloads" etc) can be configured i
 
 ## Requirements
 
-- Silverstripe ^4 || ^5
+- Silverstripe ^6
+
+For Silverstripe 4 & 5, please refer to the [Silverstripe5 branch](https://github.com/axllent/silverstripe-analytics-js/tree/silverstripe5).
 
 For the deprecated `analytics.js` tracking method for Silverstripe 4, please refer to the [analytics.js branch](https://github.com/axllent/silverstripe-analytics-js/tree/3-analyticsjs).
 
@@ -50,22 +52,22 @@ Once installed the extension is automatically loaded if you provide at least one
 ```yaml
 Axllent\AnalyticsJS\AnalyticsJS:
   tracker:
-    - ['config', 'UA-1234567-1']
+    - ['config', 'G-XXXXXXXX']
 ```
 
 The syntax is very similar to the official documentation, so things like secondary trackers or other configurations can be easily added.
 
 ```yaml
 Axllent\AnalyticsJS\AnalyticsJS:
   tracker:
-    - ['config', 'UA-1234567-1']          # default account [required]
-    - ['config', 'UA-1234567-2']          # add secondary tracker
+    - ['config', 'G-XXXXXXXX']          # default account [required]
+    - ['config', 'G-XXXXXXXX-1']          # add secondary tracker
     - ['set', 'forceSSL', true]           # force tracking to use SSL
     - ['require', 'ecommerce', 'ecommerce.js']  # load ecommerce extension
   track_links: false                      # disable external link & asset tracking
   ignore_link_class:  "notrack"           # if "track_links", then ignore external links with the "notrack" class
   compress_js: false                      # do not compress inline JavaScript
-  primary_gtag_id: "UA-1234567-1"         # set the default tracking id to be used when loading gtag (defaults to the first tracker)
+  primary_gtag_id: "G-XXXXXXXX"         # set the default tracking id to be used when loading gtag (defaults to the first tracker)
 ```
 
 Please refer to the [Configuration.md](docs/en/Configuration.md) for all configuration options.

composer.json

@@ -20,7 +20,7 @@
         "issues": "https://github.com/axllent/silverstripe-analytics-js/issues"
     },
     "require": {
-        "silverstripe/framework": "^4.0 || ^5.0"
+        "silverstripe/framework": "^6.0"
     },
     "autoload": {
         "psr-4": {

docs/en/Configuration.md

@@ -5,7 +5,7 @@
 ```yaml
 Axllent\AnalyticsJS\AnalyticsJS:
   tracker:
-    - ['config', 'UA-1234567-1']
+    - ['config', 'G-XXXXXXXX']
 ```
 
 
@@ -25,5 +25,5 @@ Axllent\AnalyticsJS\AnalyticsJS:
   page_404_category:   "Page Not Found"      # 404 page category name for GA event logging
   page_error_category: "Page Error"          # Error page category (not 404) for GA event logging
   track_in_dev_mode:   true                  # Allow live tracking in dev/staging mode
-  primary_gtag_id: "UA-1234567-1"            # Set the default tracking id to be used when loading gtag (defaults to the first tracker)
+  primary_gtag_id: "G-XXXXXXXX"            # Set the default tracking id to be used when loading gtag (defaults to the first tracker)
 ```

src/AnalyticsJS.php

@@ -6,7 +6,7 @@
 use SilverStripe\Control\Director;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Extension;
-use SilverStripe\View\ArrayData;
+use SilverStripe\Model\ArrayData;
 use SilverStripe\View\Requirements;
 
 /**