From 098312d3c86dfcd79c79cef1b24d24ab585866f6 Mon Sep 17 00:00:00 2001
From: Ross Wintle <rosswintle@users.noreply.github.com>
Date: Fri, 12 Nov 2021 16:49:13 +0000
Subject: [PATCH 1/2] Update oscarotero/env package to v2.1.x

---
 app/App.php                         | 3 ++-
 composer.json                       | 2 +-
 config/app.php                      | 5 +----
 config/environments/development.php | 3 ++-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/App.php b/app/App.php
index 60391c2..5d60c73 100644
--- a/app/App.php
+++ b/app/App.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace DeliciousBrains\SpinupWPComposerSite;
+use function Env\env;
 
 class App {
 
@@ -36,4 +37,4 @@ public static function __callStatic( $name, $arguments ) {
 			return $env === env( 'WP_ENV' );
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/composer.json b/composer.json
index 5d4dfe2..b37a061 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     "php": ">=7.3",
     "composer/installers": "^1.4",
     "johnpbloch/wordpress": "5.*",
-    "oscarotero/env": "^1.1.0",
+    "oscarotero/env": "^2.1.0",
     "vlucas/phpdotenv": "^5.3",
     "wpackagist-plugin/limit-login-attempts-reloaded": "*",
     "wpackagist-plugin/spinupwp": "*",
diff --git a/config/app.php b/config/app.php
index 19e8f41..99f0332 100644
--- a/config/app.php
+++ b/config/app.php
@@ -10,14 +10,11 @@
  */
 
 use \DeliciousBrains\SpinupWPComposerSite\App;
+use function Env\env;
 
 $root_dir    = dirname( __DIR__ );
 $webroot_dir = $root_dir . '/public';
 
-/**
- * Expose global env() function from oscarotero/env
- */
-Env::init();
 
 /**
  * Use Dotenv to set required environment variables and load .env file in root
diff --git a/config/environments/development.php b/config/environments/development.php
index 10e32f6..446e600 100644
--- a/config/environments/development.php
+++ b/config/environments/development.php
@@ -1,4 +1,5 @@
 <?php
+use \DeliciousBrains\SpinupWPComposerSite\App;
 
 define('WP_DEBUG', true);
 define('WP_DEBUG_LOG', true);
@@ -7,4 +8,4 @@
 
 @ini_set( 'display_errors', E_ALL );
 
-define( 'DISALLOW_FILE_MODS', false );
\ No newline at end of file
+define( 'DISALLOW_FILE_MODS', false );

From 742132fad7ad182017bfc3ceae0f0a0264821180 Mon Sep 17 00:00:00 2001
From: Ross Wintle <rosswintle@users.noreply.github.com>
Date: Fri, 12 Nov 2021 16:53:34 +0000
Subject: [PATCH 2/2] Remove an un-needed use declaration

This was intended for a subsequent PR
---
 config/environments/development.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config/environments/development.php b/config/environments/development.php
index 446e600..e4aaadb 100644
--- a/config/environments/development.php
+++ b/config/environments/development.php
@@ -1,6 +1,4 @@
 <?php
-use \DeliciousBrains\SpinupWPComposerSite\App;
-
 define('WP_DEBUG', true);
 define('WP_DEBUG_LOG', true);
 define('WP_DEBUG_DISPLAY', false);