From 3a4cc0e65db740bcd27561918dfd0d12cf43c9f7 Mon Sep 17 00:00:00 2001
From: August Miller <hello@gusmiller.com>
Date: Mon, 5 Feb 2024 11:36:27 -0800
Subject: [PATCH] Update entry scripts

---
 bootstrap.php | 18 ++++++++++++++++++
 craft         | 30 +++++-------------------------
 web/index.php | 18 ++++--------------
 3 files changed, 27 insertions(+), 39 deletions(-)
 create mode 100644 bootstrap.php

diff --git a/bootstrap.php b/bootstrap.php
new file mode 100644
index 00000000..cae61070
--- /dev/null
+++ b/bootstrap.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Shared bootstrap file
+ */
+
+// Define path constants
+define('CRAFT_BASE_PATH', __DIR__);
+define('CRAFT_VENDOR_PATH', CRAFT_BASE_PATH . '/vendor');
+
+// Load Composer's autoloader
+require_once CRAFT_VENDOR_PATH . '/autoload.php';
+
+// Load dotenv?
+if (class_exists(Dotenv\Dotenv::class)) {
+    // By default, this will allow .env file values to override environment variables
+    // with matching names. Use `createUnsafeImmutable` to disable this.
+    Dotenv\Dotenv::createUnsafeMutable(CRAFT_BASE_PATH)->safeLoad();
+}
diff --git a/craft b/craft
index fa043670..547e5089 100755
--- a/craft
+++ b/craft
@@ -4,31 +4,11 @@
  * Craft console bootstrap file
  */
 
-use craft\helpers\App;
+// Load shared bootstrap
+require __DIR__ . '/bootstrap.php';
 
-define('CRAFT_BASE_PATH', __DIR__);
-define('CRAFT_VENDOR_PATH', CRAFT_BASE_PATH.'/vendor');
-
-// Composer autoloader
-require_once CRAFT_VENDOR_PATH.'/autoload.php';
-
-// dotenv
-if (file_exists(CRAFT_BASE_PATH.'/.env')) {
-    Dotenv\Dotenv::create(CRAFT_BASE_PATH)->load();
-}
-
-define('CRAFT_STREAM_LOG', true);
-define('CRAFT_ENVIRONMENT', getenv('ENVIRONMENT') ?: 'production');
-
-if ($storagePath = getenv('CRAFT_STORAGE_PATH')) {
-    define('CRAFT_STORAGE_PATH', $storagePath);
-}
-
-if ($ephemeral = getenv('CRAFT_EPHEMERAL')) {
-    define('CRAFT_EPHEMERAL', filter_var($ephemeral, FILTER_VALIDATE_BOOL));
-}
-
-// Craft
-$app = require CRAFT_VENDOR_PATH.'/craftcms/cms/bootstrap/console.php';
+// Load and run Craft
+/** @var craft\console\Application $app */
+$app = require CRAFT_VENDOR_PATH . '/craftcms/cms/bootstrap/console.php';
 $exitCode = $app->run();
 exit($exitCode);
diff --git a/web/index.php b/web/index.php
index 4c265da0..774c24f6 100644
--- a/web/index.php
+++ b/web/index.php
@@ -3,20 +3,10 @@
  * Craft web bootstrap file
  */
 
-// Set path constants
-define('CRAFT_BASE_PATH', dirname(__DIR__));
-define('CRAFT_VENDOR_PATH', CRAFT_BASE_PATH.'/vendor');
-
-// Load Composer's autoloader
-require_once CRAFT_VENDOR_PATH.'/autoload.php';
-
-// Load dotenv?
-if (file_exists(CRAFT_BASE_PATH.'/.env')) {
-    Dotenv\Dotenv::create(CRAFT_BASE_PATH)->load();
-}
-
-define('CRAFT_ENVIRONMENT', getenv('CRAFT_ENVIRONMENT') ?: 'production');
+// Load shared bootstrap
+require dirname(__DIR__) . '/bootstrap.php';
 
 // Load and run Craft
-$app = require CRAFT_VENDOR_PATH.'/craftcms/cms/bootstrap/web.php';
+/** @var craft\web\Application $app */
+$app = require CRAFT_VENDOR_PATH . '/craftcms/cms/bootstrap/web.php';
 $app->run();