From b5992a8a2b295627a3b5d1ccd2b0dc6cba248c57 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Thu, 18 Jun 2020 17:54:26 +1200
Subject: [PATCH 01/24] feat: Add site config extension.

 - add boolean to indicate if display should be disabled
 - add tab with checkbox in settings panel to provide override value
---
 src/Extensions/EnvBarSiteConfigExtension.php | 48 ++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 src/Extensions/EnvBarSiteConfigExtension.php

diff --git a/src/Extensions/EnvBarSiteConfigExtension.php b/src/Extensions/EnvBarSiteConfigExtension.php
new file mode 100644
index 0000000..2a03bad
--- /dev/null
+++ b/src/Extensions/EnvBarSiteConfigExtension.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Signify\EnvBar\Extensions;
+
+use BadMethodCallException;
+use SilverStripe\Forms\CheckboxField;
+use SilverStripe\Forms\FieldList;
+use SilverStripe\ORM\DataExtension;
+
+/**
+ * Add override boolean to the site config settings
+ * @see SilverStripe\SiteConfig\SiteConfig 
+ * to allow CMS admin to disable automatic display of the Environment Indicator
+ * bar on the frontend pages.
+ * 
+ * @author Lani Field <lani.field@signify.co.nz>
+ * @version 1.1.0
+ * @package Signify\EnvBar\Extensions
+ */
+class EnvBarSiteConfigExtension extends DataExtension
+{
+    /**
+     * Add override column to SiteConfig db record.
+     * 
+     * @var string[]
+     */
+    private static $db = [
+        'EnvBarOverride' => 'Boolean',
+    ];
+
+    /**
+     * Add Checkbox field for override value to new Environment Indicator tab
+     * in CMS Settings.
+     * 
+     * @param FieldList $fields 
+     * @return void 
+     * @throws BadMethodCallException 
+     */
+    public function updateCMSFields(FieldList $fields)
+    {
+        $fields->addFieldsToTab('Root.EnvironmentIndicator', [
+            CheckboxField::create(
+                'EnvBarOverride',
+                'Tick to turn off the environment indicator bar displayed by default'
+            ),
+        ]);
+    }
+}

From e3d6074854da5010bb9ec1e1e1bed716cdf9eb96 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Thu, 18 Jun 2020 17:58:28 +1200
Subject: [PATCH 02/24] feat: Add yml to apply site config extension.

---
 _config/environmentindicatorconfig.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/_config/environmentindicatorconfig.yml b/_config/environmentindicatorconfig.yml
index 4ddf89f..60130d8 100644
--- a/_config/environmentindicatorconfig.yml
+++ b/_config/environmentindicatorconfig.yml
@@ -9,4 +9,7 @@ After: "framework/*, cms/*"
 ---
 SilverStripe\CMS\Controllers\ContentController:
   extensions:
-    - Signify\EnvBar\Extensions\EnvBarExtension
\ No newline at end of file
+    - Signify\EnvBar\Extensions\EnvBarExtension
+SilverStripe\SiteConfig\SiteConfig:
+  extensions:
+    - Signify\EnvBar\Extensions\EnvBarSiteConfigExtension
\ No newline at end of file

From 91932a7498a12579afc2164e63f97acb79c661bc Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Thu, 18 Jun 2020 17:59:08 +1200
Subject: [PATCH 03/24] feat: Modify afterCallActionHandler function.

 - add condition to check for site config override and return original html without insertion of EnvBar if true
---
 src/Extensions/EnvBarExtension.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Extensions/EnvBarExtension.php b/src/Extensions/EnvBarExtension.php
index b956fc9..732f134 100644
--- a/src/Extensions/EnvBarExtension.php
+++ b/src/Extensions/EnvBarExtension.php
@@ -7,6 +7,7 @@
 use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\Security\Permission;
 use SilverStripe\Security\Security;
+use SilverStripe\SiteConfig\SiteConfig;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\Requirements;
 
@@ -60,6 +61,9 @@ public function afterCallActionHandler($request, $action, $result)
         if (!($result instanceof DBHTMLText)) {
             return $result;
         }
+        if (SiteConfig::current_site_config()->EnvBarOverride) {
+            return $result;
+        }
         $html = $result->getValue();
         $envBar = $this->generateEnvBar()->getValue();
         $html = preg_replace(

From 0af768f15c5ae0d9247fa2a72898f5782cf9dd28 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Thu, 18 Jun 2020 19:35:11 +1200
Subject: [PATCH 04/24] style: Reword EnvBarOverride field label.

---
 src/Extensions/EnvBarSiteConfigExtension.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Extensions/EnvBarSiteConfigExtension.php b/src/Extensions/EnvBarSiteConfigExtension.php
index 2a03bad..b6c4612 100644
--- a/src/Extensions/EnvBarSiteConfigExtension.php
+++ b/src/Extensions/EnvBarSiteConfigExtension.php
@@ -41,7 +41,7 @@ public function updateCMSFields(FieldList $fields)
         $fields->addFieldsToTab('Root.EnvironmentIndicator', [
             CheckboxField::create(
                 'EnvBarOverride',
-                'Tick to turn off the environment indicator bar displayed by default'
+                'Tick to turn off the environment indicator bar'
             ),
         ]);
     }

From c7719f1079b3357c92a00d0477de89ffdd60562a Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Thu, 18 Jun 2020 19:36:29 +1200
Subject: [PATCH 05/24] feat: Add disable_auto_insert config variable check and
 $EnvBar template variable.

 - allow developer to configure to fit themes where the auto insert would be inappropriate
---
 src/Extensions/EnvBarExtension.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/Extensions/EnvBarExtension.php b/src/Extensions/EnvBarExtension.php
index 732f134..8e7985e 100644
--- a/src/Extensions/EnvBarExtension.php
+++ b/src/Extensions/EnvBarExtension.php
@@ -3,6 +3,7 @@
 namespace Signify\EnvBar\Extensions;
 
 use SilverStripe\Control\Director;
+use SilverStripe\Core\Config\Config;
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\ORM\FieldType\DBHTMLText;
 use SilverStripe\Security\Permission;
@@ -64,6 +65,9 @@ public function afterCallActionHandler($request, $action, $result)
         if (SiteConfig::current_site_config()->EnvBarOverride) {
             return $result;
         }
+        if (Config::inst()->get(__CLASS__, 'disable_auto_insert')) {
+            return $result;
+        }
         $html = $result->getValue();
         $envBar = $this->generateEnvBar()->getValue();
         $html = preg_replace(
@@ -125,6 +129,21 @@ public function getCanAccess()
         }
     }
 
+    /**
+     * Get EnvBar html as a template variable.
+     *
+     * @return DBHTMLText
+     */
+    public function getEnvBar()
+    {
+        if (
+            Config::inst()->get(__CLASS__, 'disable_auto_insert')
+            && !(SiteConfig::current_site_config()->EnvBarOverride)
+        ) {
+            return $this->generateEnvBar();
+        }
+    }
+
     /**
      * Generate the HTML to inject using the EnvBar.ss template.
      *

From 8315c4f3a96487759d5c887f2fe02c534d0ce4a4 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Thu, 18 Jun 2020 19:39:20 +1200
Subject: [PATCH 06/24] docs: Update documentation and changelog.

 - add usage instructions for CMS override setting
 - add developer instructions for yml configuration and template variable usage
---
 CHANGELOG.md                     |  11 +++++++++--
 README.md                        |  20 +++++++++++++++++---
 docs/en/img/Override_Setting.png | Bin 0 -> 14506 bytes
 3 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 docs/en/img/Override_Setting.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 466c55f..fb7729a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,11 @@
 # Changelog
 
-1.0.0 (2020-02-03)
-- Initial release
\ No newline at end of file
+1.1.0 (2020-06-18)
+- Add override to settings to disable automatic frontend display
+- Add yml config and template variable to enable developer repositioning
+
+1.0.0 (2020-05-26)
+- Initial release
+
+(2020-02-03)
+- Initial development
\ No newline at end of file
diff --git a/README.md b/README.md
index b8e3c56..c3f9f0b 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,20 @@ __Composer:__
 
 ## Documentation
 
-No further configuration is required.
+No further configuration is required, however customisation is optional.
 
-Customisation can be achieved by editing the EnvBar.ss template or the envbar- .js and .css files. Functional tests are available in the tests directory. These will need to be updated if you modify the template.
+### Developer
+
+To disable the automatic placement of the bar as the first element of the body (if, for example, you have a fixed notification bar in your theme design), please add the following to a yml file in your site _config directory:
+
+```yml
+Signify\EnvBar\Extensions\EnvBarExtension:
+  disable_auto_insert: true
+```
+
+You can then use the template variable `$EnvBar` in a more suitable position (recommended placement is in the Page.ss file or an include that is visible sitewide).
+
+Customisation of the content and/or appearance can be achieved by editing the EnvBar.ss template or the envbar- .js and .css files. Functional tests are available in the tests directory. These will need to be updated if you modify the template.
 
 * [Changelog](CHANGELOG.md)
 * [Contributing](CONTRIBUTING.md)
@@ -34,7 +45,10 @@ Customisation can be achieved by editing the EnvBar.ss template or the envbar- .
 
 ## Usage
 
-This module performs an informative function only. No special usage instructions are available.
+This module performs an informative function only.
+
+There is a setting in the CMS to disable the bar from being visible on the frontend.
+![Override Setting](docs/en/img/Override Setting.png)
 
 ![Live Published Anonymous](docs/en/img/Live_Pub_Anon.png)
 ![Live Published Editor](docs/en/img/Live_Pub_Edit.png)
diff --git a/docs/en/img/Override_Setting.png b/docs/en/img/Override_Setting.png
new file mode 100644
index 0000000000000000000000000000000000000000..11b77a1475fcd295f5de34dfff64d0db5e28acda
GIT binary patch
literal 14506
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
RS1(B^$f~?5e);yp{{jPq8<7A2

literal 0
HcmV?d00001


From cd967cb807e4486ef4f3b9fa39232d10e56d00f8 Mon Sep 17 00:00:00 2001
From: sig-lani <67132697+sig-lani@users.noreply.github.com>
Date: Fri, 19 Jun 2020 17:02:52 +1200
Subject: [PATCH 07/24] Update README.md

Fix link to Override Setting screenshot
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c3f9f0b..0fd5665 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Customisation of the content and/or appearance can be achieved by editing the En
 This module performs an informative function only.
 
 There is a setting in the CMS to disable the bar from being visible on the frontend.
-![Override Setting](docs/en/img/Override Setting.png)
+![Override Setting](docs/en/img/Override_Setting.png)
 
 ![Live Published Anonymous](docs/en/img/Live_Pub_Anon.png)
 ![Live Published Editor](docs/en/img/Live_Pub_Edit.png)

From e2cbb18e30392ee320b385b6ab0d22773315ca84 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@gmail.com>
Date: Sun, 21 Jun 2020 15:33:26 +1200
Subject: [PATCH 08/24] Update EnvBarExtension.php documentation

Modifies the documentation to use SilverStripe namespacing in params and returns.
Also minor changes to formatting of doc blocks for stylistics preference.
---
 src/Extensions/EnvBarExtension.php | 48 +++++++++++++++++-------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/Extensions/EnvBarExtension.php b/src/Extensions/EnvBarExtension.php
index b956fc9..f5001ac 100644
--- a/src/Extensions/EnvBarExtension.php
+++ b/src/Extensions/EnvBarExtension.php
@@ -20,24 +20,25 @@
  * and user access (member permissions) and returns values to populate the
  * EnvBar.
  *
- * It also contains methods to modify the HTTPResponse before and after the
- * @see SilverStripe\Control\RequestHandler inserting the CSS and HTML required
- * to produce the EnvBar.
+ * It also contains methods to modify the @see SilverStripe\Control\HTTPResponse
+ * before and after the @see SilverStripe\Control\RequestHandler
+ * inserting the CSS and HTML required to produce the EnvBar.
  *
  * @package Signify\EnvBar\Extensions
- * @author Lani Field <lani.field@signify.co.nz>
- * @version 1.0.0
+ * @author  Lani Field <lani.field@signify.co.nz>
+ * @version 1.0.1
  *
- * @param  HTTPRequest $request
- * @return HTTPResponse $result with the EnvBar CSS and HTML inserted.
+ * @param  SilverStripe\Control\HTTPRequest $request
+ * @return SilverStripe\Control\HTTPResponse $result
+ *         with the EnvBar CSS and HTML inserted.
  */
 class EnvBarExtension extends DataExtension
 {
     /**
      * Load the CSS requirement.
      *
-     * @param HTTPRequest $request
-     * @param string $action
+     * @param  SilverStripe\Control\HTTPRequest $request
+     * @param  string $action
      * @return void
      * @see SilverStripe\Control\RequestHandler::handleAction
      */
@@ -49,10 +50,12 @@ public function beforeCallActionHandler($request, $action)
     /**
      * Rewrite the HTML of the viewed page to insert the EnvBar.
      *
-     * @param HTTPRequest $request
-     * @param string $action
-     * @param DBHTMLText $result from the original RequestHandler
-     * @return HTTPResponse $result with the EnvBar CSS and HTML inserted
+     * @param  SilverStripe\Control\HTTPRequest $request
+     * @param  string $action
+     * @param  SilverStripe\ORM\FieldType\DBHTMLText $result
+     *         from the original RequestHandler
+     * @return SilverStripe\ORM\FieldType\DBHTMLText $result
+     *         with the EnvBar HTML inserted
      * @see SilverStripe\Control\RequestHandler::handleAction
      */
     public function afterCallActionHandler($request, $action, $result)
@@ -74,8 +77,10 @@ public function afterCallActionHandler($request, $action, $result)
     /**
      * Check the environment type.
      *
-     * @return string "dev" if the site is in dev mode, "test" if the site is
-     * in test mode (e.g. QA or UAT), "live" otherwise (e.g. Production)
+     * @return string
+     *         "dev" if the site is in dev mode,
+     *         "test" if the site is in test mode (e.g. QA or UAT),
+     *         "live" otherwise (e.g. Production)
      */
     public function getEnvironment()
     {
@@ -91,9 +96,10 @@ public function getEnvironment()
     /**
      * Check the version of the page being viewed.
      *
-     * @return string "published" if it is the current live version in this
-     * environment, "draft" if it is a modified or unpublished version,
-     * "not staged" otherwise
+     * @return string
+     *         "published" if it is the current live version in this environment,
+     *         "draft" if it is a modified or unpublished version,
+     *         "not staged" otherwise
      */
     public function getPageStatus()
     {
@@ -109,7 +115,9 @@ public function getPageStatus()
     /**
      * Check whether CurrentUser has access to edit pages.
      *
-     * @return boolean "true" if the user can edit pages, "false" otherwise
+     * @return boolean
+     *         "true" if the user can edit pages,
+     *         "false" otherwise
      */
     public function getCanAccess()
     {
@@ -124,7 +132,7 @@ public function getCanAccess()
     /**
      * Generate the HTML to inject using the EnvBar.ss template.
      *
-     * @return DBHTMLText
+     * @return SilverStripe\ORM\FieldType\DBHTMLText
      */
     private function generateEnvBar()
     {

From 0d6a63ba4808f40cd2b5ccff6475100067be998a Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@gmail.com>
Date: Sun, 21 Jun 2020 15:51:16 +1200
Subject: [PATCH 09/24] Update README.md

Add Scrutinizer Code Quality badge.
Remove codecov badge.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b8e3c56..de3f14d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/signify-nz/silverstripe-environmentindicator.svg?branch=master)](https://travis-ci.org/signify-nz/silverstripe-environmentindicator)
-[![codecov](https://codecov.io/gh/signify-nz/silverstripe-environmentindicator/branch/master/graph/badge.svg)](https://codecov.io/gh/signify-nz/silverstripe-environmentindicator)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/signify-nz/silverstripe-environmentindicator/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/signify-nz/silverstripe-environmentindicator/?branch=master)
 
 # Environment Indicator
 

From afc85c7b5db6d8dd311c25cbeaceebd51551e8b4 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@gmail.com>
Date: Sun, 21 Jun 2020 16:12:30 +1200
Subject: [PATCH 10/24] fix: Correct type issues in DocBlocks

---
 src/Extensions/EnvBarExtension.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Extensions/EnvBarExtension.php b/src/Extensions/EnvBarExtension.php
index f5001ac..8ecd456 100644
--- a/src/Extensions/EnvBarExtension.php
+++ b/src/Extensions/EnvBarExtension.php
@@ -28,8 +28,8 @@
  * @author  Lani Field <lani.field@signify.co.nz>
  * @version 1.0.1
  *
- * @param  SilverStripe\Control\HTTPRequest $request
- * @return SilverStripe\Control\HTTPResponse $result
+ * @param  \SilverStripe\Control\HTTPRequest $request
+ * @return \SilverStripe\Control\HTTPResponse $result
  *         with the EnvBar CSS and HTML inserted.
  */
 class EnvBarExtension extends DataExtension
@@ -37,7 +37,7 @@ class EnvBarExtension extends DataExtension
     /**
      * Load the CSS requirement.
      *
-     * @param  SilverStripe\Control\HTTPRequest $request
+     * @param  \SilverStripe\Control\HTTPRequest $request
      * @param  string $action
      * @return void
      * @see SilverStripe\Control\RequestHandler::handleAction
@@ -50,11 +50,11 @@ public function beforeCallActionHandler($request, $action)
     /**
      * Rewrite the HTML of the viewed page to insert the EnvBar.
      *
-     * @param  SilverStripe\Control\HTTPRequest $request
+     * @param  \SilverStripe\Control\HTTPRequest $request
      * @param  string $action
-     * @param  SilverStripe\ORM\FieldType\DBHTMLText $result
+     * @param  \SilverStripe\ORM\FieldType\DBHTMLText $result
      *         from the original RequestHandler
-     * @return SilverStripe\ORM\FieldType\DBHTMLText $result
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText $result
      *         with the EnvBar HTML inserted
      * @see SilverStripe\Control\RequestHandler::handleAction
      */
@@ -132,7 +132,7 @@ public function getCanAccess()
     /**
      * Generate the HTML to inject using the EnvBar.ss template.
      *
-     * @return SilverStripe\ORM\FieldType\DBHTMLText
+     * @return \SilverStripe\ORM\FieldType\DBHTMLText
      */
     private function generateEnvBar()
     {

From 399f2a32e3d1e0da8495e08895c3f65a775e129e Mon Sep 17 00:00:00 2001
From: sig-lani <67132697+sig-lani@users.noreply.github.com>
Date: Tue, 23 Jun 2020 17:20:45 +1200
Subject: [PATCH 11/24] fix: Remove whitespaces found at end of lines

---
 src/Extensions/EnvBarSiteConfigExtension.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Extensions/EnvBarSiteConfigExtension.php b/src/Extensions/EnvBarSiteConfigExtension.php
index b6c4612..0e744ae 100644
--- a/src/Extensions/EnvBarSiteConfigExtension.php
+++ b/src/Extensions/EnvBarSiteConfigExtension.php
@@ -9,10 +9,10 @@
 
 /**
  * Add override boolean to the site config settings
- * @see SilverStripe\SiteConfig\SiteConfig 
+ * @see SilverStripe\SiteConfig\SiteConfig
  * to allow CMS admin to disable automatic display of the Environment Indicator
  * bar on the frontend pages.
- * 
+ *
  * @author Lani Field <lani.field@signify.co.nz>
  * @version 1.1.0
  * @package Signify\EnvBar\Extensions
@@ -21,7 +21,7 @@ class EnvBarSiteConfigExtension extends DataExtension
 {
     /**
      * Add override column to SiteConfig db record.
-     * 
+     *
      * @var string[]
      */
     private static $db = [
@@ -31,10 +31,10 @@ class EnvBarSiteConfigExtension extends DataExtension
     /**
      * Add Checkbox field for override value to new Environment Indicator tab
      * in CMS Settings.
-     * 
-     * @param FieldList $fields 
-     * @return void 
-     * @throws BadMethodCallException 
+     *
+     * @param FieldList $fields
+     * @return void
+     * @throws BadMethodCallException
      */
     public function updateCMSFields(FieldList $fields)
     {

From 974173142cb8750b4911f7f3bf90d2164f0938dc Mon Sep 17 00:00:00 2001
From: sig-lani <67132697+sig-lani@users.noreply.github.com>
Date: Tue, 23 Jun 2020 18:39:43 +1200
Subject: [PATCH 12/24] Update travis.yml

Modify tests to better reflect current status of PHP and SilverStripe.

Also loosen script to check tests directory (to allow for more unit tests to run in future).
---
 .travis.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f9d86a..dbcb082 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,18 +6,27 @@ services:
 
 env:
     global:
+        - COMPOSER_ROOT_VERSION=4.3.x-dev
         - TRAVIS_NODE_VERSION="10"
 
 matrix:
     include:
-        - php: 5.6
-          env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
-        - php: 7.0
+        - php: 7.1
           env: DB=PGSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
         - php: 7.1
           env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
+        - php: 7.1
+          env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
         - php: 7.2
           env: DB=PGSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
+        - php: 7.2
+          env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
+        - php: 7.2
+          env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1
+        - php: 7.3
+          env: DB=PGSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1
+        - php: 7.3
+          env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
         - php: 7.3
           env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_COVERAGE_TEST=1
 
@@ -30,11 +39,11 @@ before_script:
 
     - composer validate
     - composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION"
-    - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi
+    - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:^2 --no-update; fi
     - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:
-    - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests/EnvBarExtensionTest.php; fi
+    - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests/; fi
     - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
     - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ *.php; fi
 

From 437f0d89c6c68e3d7dcd954beaf667f3c37c8a6e Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Fri, 10 Jul 2020 14:24:13 +1200
Subject: [PATCH 13/24] refactor: Modify site config field from EnvBarOverride
 to EnvBarDisplay

---
 src/Extensions/EnvBarExtension.php           | 16 +++++++++-------
 src/Extensions/EnvBarSiteConfigExtension.php |  9 +++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/Extensions/EnvBarExtension.php b/src/Extensions/EnvBarExtension.php
index 8e7985e..42b5874 100644
--- a/src/Extensions/EnvBarExtension.php
+++ b/src/Extensions/EnvBarExtension.php
@@ -49,7 +49,8 @@ public function beforeCallActionHandler($request, $action)
     }
 
     /**
-     * Rewrite the HTML of the viewed page to insert the EnvBar.
+     * Rewrite the HTML of the viewed page to insert the EnvBar if the
+     * two conditions (display and auto-insert enabled) have been met.
      *
      * @param HTTPRequest $request
      * @param string $action
@@ -59,15 +60,15 @@ public function beforeCallActionHandler($request, $action)
      */
     public function afterCallActionHandler($request, $action, $result)
     {
-        if (!($result instanceof DBHTMLText)) {
-            return $result;
-        }
-        if (SiteConfig::current_site_config()->EnvBarOverride) {
+        // Check if display is turned on in the CMS
+        if (!SiteConfig::current_site_config()->EnvBarDisplay) {
             return $result;
         }
+        // Check if automatic placement has been turned off in a _config yml
         if (Config::inst()->get(__CLASS__, 'disable_auto_insert')) {
             return $result;
         }
+
         $html = $result->getValue();
         $envBar = $this->generateEnvBar()->getValue();
         $html = preg_replace(
@@ -76,6 +77,7 @@ public function afterCallActionHandler($request, $action, $result)
             $html
         );
         $result->setValue($html);
+
         return $result;
     }
 
@@ -130,7 +132,7 @@ public function getCanAccess()
     }
 
     /**
-     * Get EnvBar html as a template variable.
+     * Get EnvBar HTML as a template variable.
      *
      * @return DBHTMLText
      */
@@ -138,7 +140,7 @@ public function getEnvBar()
     {
         if (
             Config::inst()->get(__CLASS__, 'disable_auto_insert')
-            && !(SiteConfig::current_site_config()->EnvBarOverride)
+            && SiteConfig::current_site_config()->EnvBarDisplay
         ) {
             return $this->generateEnvBar();
         }
diff --git a/src/Extensions/EnvBarSiteConfigExtension.php b/src/Extensions/EnvBarSiteConfigExtension.php
index 0e744ae..c8416a6 100644
--- a/src/Extensions/EnvBarSiteConfigExtension.php
+++ b/src/Extensions/EnvBarSiteConfigExtension.php
@@ -25,7 +25,7 @@ class EnvBarSiteConfigExtension extends DataExtension
      * @var string[]
      */
     private static $db = [
-        'EnvBarOverride' => 'Boolean',
+        'EnvBarDisplay' => 'Boolean',
     ];
 
     /**
@@ -40,9 +40,10 @@ public function updateCMSFields(FieldList $fields)
     {
         $fields->addFieldsToTab('Root.EnvironmentIndicator', [
             CheckboxField::create(
-                'EnvBarOverride',
-                'Tick to turn off the environment indicator bar'
-            ),
+                'EnvBarDisplay',
+                'Display the environment indicator bar?'
+            )->setDescription('Check to show the environment indicator bar on'
+                . ' all pages being viewed in this environment.'),
         ]);
     }
 }

From ef0e452256244ead6d2a4e49660d87fb23e9d40b Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Fri, 10 Jul 2020 14:28:08 +1200
Subject: [PATCH 14/24] test: Add tests for CMS display control functionality

---
 tests/EnvBarSiteConfigExtensionTest.php | 98 +++++++++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 tests/EnvBarSiteConfigExtensionTest.php

diff --git a/tests/EnvBarSiteConfigExtensionTest.php b/tests/EnvBarSiteConfigExtensionTest.php
new file mode 100644
index 0000000..2f95168
--- /dev/null
+++ b/tests/EnvBarSiteConfigExtensionTest.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Signify\EnvBar\Tests;
+
+use SilverStripe\Dev\FunctionalTest;
+use SilverStripe\SiteConfig\SiteConfig;
+
+/**
+ * Tests the display of the EnvBar according to the environment type,
+ * page stage and the user's access
+ */
+class EnvBarSiteConfigExtensionTest extends FunctionalTest
+{
+    protected static $fixture_file = 'EnvBarExtensionTest.yml';
+
+    /**
+     * Test EnvBar present when display is enabled in CMS
+     */
+    public function testDisplayEnabled()
+    {
+        SiteConfig::current_site_config()->setField('EnvBarDisplay', 1);
+
+        $url = $this->objFromFixture(
+            'SilverStripe\CMS\Model\SiteTree',
+            'default'
+        )->URLSegment;
+
+        $user = $this->objFromFixture(
+            'SilverStripe\Security\Member',
+            'admin'
+        );
+
+        $this->EnvBarVisible(
+            $url,
+            $user
+        );
+    }
+
+    /**
+     * Test EnvBar NOT present when display is disabled in CMS
+     */
+    public function testDisplayDisabled()
+    {
+        SiteConfig::current_site_config()->setField('EnvBarDisplay', 0);
+
+        $url = $this->objFromFixture(
+            'SilverStripe\CMS\Model\SiteTree',
+            'default'
+        )->URLSegment;
+
+        $user = $this->objFromFixture(
+            'SilverStripe\Security\Member',
+            'admin'
+        );
+
+        $this->EnvBarNotVisible(
+            $url,
+            $user
+        );
+    }
+
+
+    /**
+     * Test EnvBar is present somewhere on page
+     */
+    public function EnvBarVisible($url, $user)
+    {
+        if ($user) {
+            $this->logInAs($user);
+        }
+        $testPage = $this->get($url);
+        $this->assertContains(
+            '.page__envbar',
+            $testPage->getBody()
+        );
+        if ($user) {
+            $this->logOut();
+        }
+    }
+
+    /**
+     * Test EnvBar is not injected into the page
+     */
+    public function EnvBarNotVisible($url, $user)
+    {
+        if ($user) {
+            $this->logInAs($user);
+        }
+        $testPage = $this->get($url);
+        $this->assertNotContains(
+            '.page__envbar',
+            $testPage->getBody()
+        );
+        if ($user) {
+            $this->logOut();
+        }
+    }
+}

From 187f91a211215064adb68576037a0e05d6c7134d Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Fri, 10 Jul 2020 14:29:11 +1200
Subject: [PATCH 15/24] test: Modify list of tests run by travis

---
 .travis.yml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dbcb082..56a54f7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,28 +7,19 @@ services:
 env:
     global:
         - COMPOSER_ROOT_VERSION=4.3.x-dev
-        - TRAVIS_NODE_VERSION="10"
 
 matrix:
     include:
-        - php: 7.1
-          env: DB=PGSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
         - php: 7.1
           env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
-        - php: 7.1
-          env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
-        - php: 7.2
-          env: DB=PGSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
         - php: 7.2
           env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
-        - php: 7.2
-          env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1
         - php: 7.3
-          env: DB=PGSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1
+          env: DB=PGSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
         - php: 7.3
           env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
         - php: 7.3
-          env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_COVERAGE_TEST=1
+          env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 PHPUNIT_COVERAGE_TEST=1 PHPCS_TEST=1
 
 before_install:
     - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'

From 588acffd7bfecd8476ca290df28f2446d679eaf4 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Mon, 24 Aug 2020 16:15:00 +1200
Subject: [PATCH 16/24] fix: Change EnvBarDisplay default value to 1

---
 tests/EnvBarExtensionTest.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/EnvBarExtensionTest.yml b/tests/EnvBarExtensionTest.yml
index b00e17d..d3ef759 100644
--- a/tests/EnvBarExtensionTest.yml
+++ b/tests/EnvBarExtensionTest.yml
@@ -3,6 +3,7 @@ SilverStripe\SiteConfig\SiteConfig:
     Title: Test site
     CanViewType: Anyone
     CanEditType: LoggedInUsers
+    EnvBarDisplay: 1
 
 SilverStripe\Security\Group:
   admins:

From df30167cbc9ecffd1cfbe5097a537c4631007c90 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Mon, 24 Aug 2020 16:39:31 +1200
Subject: [PATCH 17/24] fix: Change EnvBarDisplay default value to true

---
 tests/EnvBarExtensionTest.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/EnvBarExtensionTest.yml b/tests/EnvBarExtensionTest.yml
index d3ef759..37ab931 100644
--- a/tests/EnvBarExtensionTest.yml
+++ b/tests/EnvBarExtensionTest.yml
@@ -3,7 +3,7 @@ SilverStripe\SiteConfig\SiteConfig:
     Title: Test site
     CanViewType: Anyone
     CanEditType: LoggedInUsers
-    EnvBarDisplay: 1
+    EnvBarDisplay: true
 
 SilverStripe\Security\Group:
   admins:

From 0fcd61ca56fd8ab1de616e1ef0929a17f33f1719 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Mon, 24 Aug 2020 16:58:23 +1200
Subject: [PATCH 18/24] fix: Modify test to show or hide EnvBar via CMS
 checkbox

---
 tests/EnvBarSiteConfigExtensionTest.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/EnvBarSiteConfigExtensionTest.php b/tests/EnvBarSiteConfigExtensionTest.php
index 2f95168..ea48307 100644
--- a/tests/EnvBarSiteConfigExtensionTest.php
+++ b/tests/EnvBarSiteConfigExtensionTest.php
@@ -18,8 +18,6 @@ class EnvBarSiteConfigExtensionTest extends FunctionalTest
      */
     public function testDisplayEnabled()
     {
-        SiteConfig::current_site_config()->setField('EnvBarDisplay', 1);
-
         $url = $this->objFromFixture(
             'SilverStripe\CMS\Model\SiteTree',
             'default'
@@ -41,8 +39,6 @@ public function testDisplayEnabled()
      */
     public function testDisplayDisabled()
     {
-        SiteConfig::current_site_config()->setField('EnvBarDisplay', 0);
-
         $url = $this->objFromFixture(
             'SilverStripe\CMS\Model\SiteTree',
             'default'
@@ -68,6 +64,7 @@ public function EnvBarVisible($url, $user)
         if ($user) {
             $this->logInAs($user);
         }
+        SiteConfig::current_site_config()->setField('EnvBarDisplay', 'true');
         $testPage = $this->get($url);
         $this->assertContains(
             '.page__envbar',
@@ -86,6 +83,7 @@ public function EnvBarNotVisible($url, $user)
         if ($user) {
             $this->logInAs($user);
         }
+        SiteConfig::current_site_config()->setField('EnvBarDisplay', 'false');
         $testPage = $this->get($url);
         $this->assertNotContains(
             '.page__envbar',

From f26f2e1a4d4e43db43fda304a8e8a41b4e4b77d9 Mon Sep 17 00:00:00 2001
From: GuySartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Tue, 1 Dec 2020 16:59:44 +1300
Subject: [PATCH 19/24] chore: Use stable versions of SilverStripe in CI

The travis tests are failing to build due to unresolvable requirements - it seems likely this is a result of using unstable versions of SilverStripe.
---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3f9d86a..3836a77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,15 +11,15 @@ env:
 matrix:
     include:
         - php: 5.6
-          env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
+          env: DB=MYSQL RECIPE_VERSION=~4.3.0 PHPUNIT_TEST=1
         - php: 7.0
-          env: DB=PGSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
+          env: DB=PGSQL RECIPE_VERSION=~4.3.0 PHPUNIT_TEST=1
         - php: 7.1
-          env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
+          env: DB=MYSQL RECIPE_VERSION=~4.3.0 PHPUNIT_TEST=1 PHPCS_TEST=1
         - php: 7.2
-          env: DB=PGSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
+          env: DB=PGSQL RECIPE_VERSION=~4.4.0 PHPUNIT_TEST=1
         - php: 7.3
-          env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_COVERAGE_TEST=1
+          env: DB=MYSQL RECIPE_VERSION=^4 PHPUNIT_COVERAGE_TEST=1
 
 before_install:
     - mysql -e 'CREATE DATABASE IF NOT EXISTS test;'

From 6857783dfe444729f0d745de33be5b15cd9cd192 Mon Sep 17 00:00:00 2001
From: GuySartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Tue, 1 Dec 2020 17:09:17 +1300
Subject: [PATCH 20/24] chore: Update PHP versions in travis config.

The tests using PHP 5.6 and PHP 7.0 do not build because the version of SilverStripe being built does not support PHP<7.1
Also add PHP 7.4.
---
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3836a77..1a72a95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,15 +10,13 @@ env:
 
 matrix:
     include:
-        - php: 5.6
-          env: DB=MYSQL RECIPE_VERSION=~4.3.0 PHPUNIT_TEST=1
-        - php: 7.0
-          env: DB=PGSQL RECIPE_VERSION=~4.3.0 PHPUNIT_TEST=1
         - php: 7.1
           env: DB=MYSQL RECIPE_VERSION=~4.3.0 PHPUNIT_TEST=1 PHPCS_TEST=1
         - php: 7.2
           env: DB=PGSQL RECIPE_VERSION=~4.4.0 PHPUNIT_TEST=1
         - php: 7.3
+          env: DB=MYSQL RECIPE_VERSION=^4
+        - php: 7.4
           env: DB=MYSQL RECIPE_VERSION=^4 PHPUNIT_COVERAGE_TEST=1
 
 before_install:

From f294b64c5c767d7262356e89eec7b8b677cbebd4 Mon Sep 17 00:00:00 2001
From: GuySartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Tue, 1 Dec 2020 17:13:58 +1300
Subject: [PATCH 21/24] chore: Require stable version of postgresql

silverstripe/postgresql 2.1.x-dev was not resolving to an installable package. Prefer using a stable tagged version.
Also remove --no-suggest while we're at it, as this is deprecated in composer 2.
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1a72a95..76bf913 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,8 @@ before_script:
 
     - composer validate
     - composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION"
-    - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi
-    - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
+    - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2.1.0; fi
+    - composer install --prefer-source --no-interaction --no-progress --optimize-autoloader --verbose --profile
 
 script:
     - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests/EnvBarExtensionTest.php; fi

From d358920106572b60095f8acc96f6ccebf4d53f22 Mon Sep 17 00:00:00 2001
From: Lani Field <lani.field@signify.co.nz>
Date: Wed, 16 Dec 2020 09:44:26 +1300
Subject: [PATCH 22/24] fix: Modify testDisplayDisabled to request draft staged
 page.

---
 tests/EnvBarSiteConfigExtensionTest.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/EnvBarSiteConfigExtensionTest.php b/tests/EnvBarSiteConfigExtensionTest.php
index ea48307..65f5146 100644
--- a/tests/EnvBarSiteConfigExtensionTest.php
+++ b/tests/EnvBarSiteConfigExtensionTest.php
@@ -39,10 +39,11 @@ public function testDisplayEnabled()
      */
     public function testDisplayDisabled()
     {
-        $url = $this->objFromFixture(
+        $page = $this->objFromFixture(
             'SilverStripe\CMS\Model\SiteTree',
             'default'
-        )->URLSegment;
+        );
+        $url = $page->URLSegment . '?stage=Stage';
 
         $user = $this->objFromFixture(
             'SilverStripe\Security\Member',

From 696523876d15f4e1e33b7d3f4629d24742bedb84 Mon Sep 17 00:00:00 2001
From: Steve Piner <steve.piner@signify.co.nz>
Date: Thu, 28 Apr 2022 17:47:28 +1200
Subject: [PATCH 23/24] feat: Allow plugins for composer 2.

---
 composer.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6df944d..a8bdf62 100644
--- a/composer.json
+++ b/composer.json
@@ -48,7 +48,11 @@
         }
     },
     "config": {
-        "process-timeout": 600
+        "process-timeout": 600,
+        "allow-plugins": {
+            "composer/installers": true,
+            "silverstripe/vendor-plugin": true
+        }
     },
     "prefer-stable": true,
     "minimum-stability": "dev"

From 97c8d23e45d9572d9aa7af55bee07dbe72da1e22 Mon Sep 17 00:00:00 2001
From: Steve Piner <steve.piner@signify.co.nz>
Date: Thu, 28 Apr 2022 17:50:57 +1200
Subject: [PATCH 24/24] test: Fix SiteConfig tests.

---
 tests/EnvBarSiteConfigExtensionTest.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/EnvBarSiteConfigExtensionTest.php b/tests/EnvBarSiteConfigExtensionTest.php
index 65f5146..9df5239 100644
--- a/tests/EnvBarSiteConfigExtensionTest.php
+++ b/tests/EnvBarSiteConfigExtensionTest.php
@@ -18,10 +18,11 @@ class EnvBarSiteConfigExtensionTest extends FunctionalTest
      */
     public function testDisplayEnabled()
     {
-        $url = $this->objFromFixture(
+        $page = $this->objFromFixture(
             'SilverStripe\CMS\Model\SiteTree',
             'default'
-        )->URLSegment;
+        );
+        $url = $page->URLSegment . '?stage=Stage';
 
         $user = $this->objFromFixture(
             'SilverStripe\Security\Member',
@@ -65,10 +66,10 @@ public function EnvBarVisible($url, $user)
         if ($user) {
             $this->logInAs($user);
         }
-        SiteConfig::current_site_config()->setField('EnvBarDisplay', 'true');
+        SiteConfig::current_site_config()->setField('EnvBarDisplay', true);
         $testPage = $this->get($url);
         $this->assertContains(
-            '.page__envbar',
+            'page__envbar',
             $testPage->getBody()
         );
         if ($user) {
@@ -84,10 +85,10 @@ public function EnvBarNotVisible($url, $user)
         if ($user) {
             $this->logInAs($user);
         }
-        SiteConfig::current_site_config()->setField('EnvBarDisplay', 'false');
+        SiteConfig::current_site_config()->setField('EnvBarDisplay', false);
         $testPage = $this->get($url);
         $this->assertNotContains(
-            '.page__envbar',
+            'page__envbar',
             $testPage->getBody()
         );
         if ($user) {