From a92d774742886fc9bc6ff629c08321e08440f1bf Mon Sep 17 00:00:00 2001
From: Pierre du Plessis <pierre@pcservice.co.za>
Date: Mon, 22 Jan 2024 23:26:20 +0200
Subject: [PATCH] fix: check for custom php.ini before checking for the
 Caddyfile (#498)

---
 caddy/php-server.go | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/caddy/php-server.go b/caddy/php-server.go
index 7e037bcb..49dd59af 100644
--- a/caddy/php-server.go
+++ b/caddy/php-server.go
@@ -93,6 +93,14 @@ func cmdPHPServer(fs caddycmd.Flags) (int, error) {
 	}
 
 	if frankenphp.EmbeddedAppPath != "" {
+		if _, err := os.Stat(filepath.Join(frankenphp.EmbeddedAppPath, "php.ini")); err == nil {
+			iniScanDir := os.Getenv("PHP_INI_SCAN_DIR")
+
+			if err := os.Setenv("PHP_INI_SCAN_DIR", iniScanDir+":"+frankenphp.EmbeddedAppPath); err != nil {
+				return caddy.ExitCodeFailedStartup, err
+			}
+		}
+
 		if _, err := os.Stat(filepath.Join(frankenphp.EmbeddedAppPath, "Caddyfile")); err == nil {
 			config, _, err := caddycmd.LoadConfig(filepath.Join(frankenphp.EmbeddedAppPath, "Caddyfile"), "")
 			if err != nil {
@@ -111,15 +119,6 @@ func cmdPHPServer(fs caddycmd.Flags) (int, error) {
 		} else if filepath.IsLocal(root) {
 			root = filepath.Join(frankenphp.EmbeddedAppPath, root)
 		}
-
-		if _, err := os.Stat(filepath.Join(frankenphp.EmbeddedAppPath, "php.ini")); err == nil {
-			iniScanDir := os.Getenv("PHP_INI_SCAN_DIR")
-
-			if err := os.Setenv("PHP_INI_SCAN_DIR", iniScanDir+":"+frankenphp.EmbeddedAppPath); err != nil {
-				return caddy.ExitCodeFailedStartup, err
-			}
-		}
-
 	}
 
 	const indexFile = "index.php"