From 17cb029df46347a453c77ba8d7f43501e03c65d3 Mon Sep 17 00:00:00 2001
From: "a.stecher" <a.stecher@sportradar.com>
Date: Sat, 18 Jan 2025 01:00:42 +0100
Subject: [PATCH] Remove unnecessary file-exists checks.

---
 .../PHP/laravel/deploy/franken/Caddyfile      | 24 +++++++++++++++++++
 .../laravel-octane-frankenphp.dockerfile      |  3 +--
 frameworks/PHP/php/deploy/franken/Caddyfile   |  7 ++++--
 frameworks/PHP/symfony/deploy/Caddyfile       | 17 +++++--------
 .../PHP/symfony/symfony-franken.dockerfile    |  1 -
 5 files changed, 36 insertions(+), 16 deletions(-)
 create mode 100644 frameworks/PHP/laravel/deploy/franken/Caddyfile

diff --git a/frameworks/PHP/laravel/deploy/franken/Caddyfile b/frameworks/PHP/laravel/deploy/franken/Caddyfile
new file mode 100644
index 00000000000..6c4cc54627c
--- /dev/null
+++ b/frameworks/PHP/laravel/deploy/franken/Caddyfile
@@ -0,0 +1,24 @@
+{
+	{$CADDY_GLOBAL_OPTIONS}
+
+	admin {$CADDY_SERVER_ADMIN_HOST}:{$CADDY_SERVER_ADMIN_PORT}
+
+	frankenphp {
+		worker "{$APP_PUBLIC_PATH}/frankenphp-worker.php" {$CADDY_SERVER_WORKER_COUNT}
+	}
+}
+
+{$CADDY_SERVER_SERVER_NAME} {
+	route {
+		# Mercure configuration is injected here...
+		{$CADDY_SERVER_EXTRA_DIRECTIVES}
+
+		# FrankenPHP!
+		# disable static files for this benchmark
+		# by using php instead of php_server
+		rewrite frankenphp-worker.php
+		php {
+			root "{$APP_PUBLIC_PATH}"
+		}
+	}
+}
diff --git a/frameworks/PHP/laravel/laravel-octane-frankenphp.dockerfile b/frameworks/PHP/laravel/laravel-octane-frankenphp.dockerfile
index 2ad30a612e3..c21eeeacf8a 100644
--- a/frameworks/PHP/laravel/laravel-octane-frankenphp.dockerfile
+++ b/frameworks/PHP/laravel/laravel-octane-frankenphp.dockerfile
@@ -1,7 +1,6 @@
 FROM dunglas/frankenphp
  
 RUN install-php-extensions \
-    intl \
 	opcache \
 	pcntl \
     pdo_mysql \
@@ -26,4 +25,4 @@ RUN frankenphp -v
 
 EXPOSE 8080
 
-ENTRYPOINT ["php", "artisan", "octane:frankenphp", "--port=8080"]
+ENTRYPOINT ["php", "artisan", "octane:frankenphp", "--port=8080", "--caddyfile=/app/deploy/franken/Caddyfile"]
diff --git a/frameworks/PHP/php/deploy/franken/Caddyfile b/frameworks/PHP/php/deploy/franken/Caddyfile
index b6aa805f871..72400a7e489 100644
--- a/frameworks/PHP/php/deploy/franken/Caddyfile
+++ b/frameworks/PHP/php/deploy/franken/Caddyfile
@@ -11,11 +11,14 @@
 :8080
 
 route {
-    root * /php
 
     # FrankenPHP!
+    # disable static files for this benchmark
+    # by using php instead of php_server
     @phpFiles path *.php
-    php @phpFiles
+    php @phpFiles {
+        root /php
+    }
 
     respond 404
 }
\ No newline at end of file
diff --git a/frameworks/PHP/symfony/deploy/Caddyfile b/frameworks/PHP/symfony/deploy/Caddyfile
index f794fd3d647..6faa66909af 100644
--- a/frameworks/PHP/symfony/deploy/Caddyfile
+++ b/frameworks/PHP/symfony/deploy/Caddyfile
@@ -11,18 +11,13 @@
 :8080
 
 route {
-    root * /symfony/public
 
-    # If the requested file does not exist, try index files
-    @indexFiles file {
-        try_files {path} {path}/runtime.php runtime.php
-        split_path .php
+	# FrankenPHP!
+	# disable static files for this benchmark
+	# by using php instead of php_server
+    rewrite runtime.php
+    php {
+        root /symfony/public
     }
-    rewrite @indexFiles {http.matchers.file.relative}
-    
-    # FrankenPHP!
-    @phpFiles path *.php
-    php @phpFiles
 
-    respond 404
 }
diff --git a/frameworks/PHP/symfony/symfony-franken.dockerfile b/frameworks/PHP/symfony/symfony-franken.dockerfile
index 967b9370514..05b8267409b 100644
--- a/frameworks/PHP/symfony/symfony-franken.dockerfile
+++ b/frameworks/PHP/symfony/symfony-franken.dockerfile
@@ -2,7 +2,6 @@ FROM dunglas/frankenphp
 
 # add additional extensions here:
 RUN install-php-extensions \
-    intl \
     opcache \
     pdo_pgsql \
     zip > /dev/null