Fixes

Author: mnapoli

layers/bootstrap.php

@@ -14,12 +14,19 @@
 require $autoloadPath;
 
 // `RUNTIME_CLASS` is for backwards compatibility with Bref v2's environment variable
-$runtimeClass = $_SERVER['BREF_RUNTIME'] ?? $_SERVER['RUNTIME_CLASS'];
+$runtime = $_SERVER['BREF_RUNTIME'] ?? $_SERVER['RUNTIME_CLASS'] ?? null;
 
-if (empty($runtimeClass)) {
+if (empty($runtime)) {
     throw new RuntimeException('The environment variable `BREF_RUNTIME` is not set, are you trying to use Bref v2 with Bref v3 layers? Make sure to follow the Bref documentation to use the right layers for your current Bref version.');
 }
 
+$runtimeClass = match ($runtime) {
+    'function' => 'Bref\FunctionRuntime\Main',
+    'fpm' => 'Bref\FpmRuntime\Main',
+    'console' => 'Bref\ConsoleRuntime\Main',
+    default => $runtime,
+};
+
 if (! class_exists($runtimeClass)) {
     throw new RuntimeException("Bref is not installed in your application (could not find the class \"$runtimeClass\" in Composer dependencies). Did you run \"composer require bref/bref\"?");
 }

layers/php.ini

@@ -1,6 +1,6 @@
-; We want errors to be sent to stderr -> those will end up in CloudWatch
-; We don't want them on stdout because FPM would then send them to the browser
-display_errors=stderr
+; On the CLI we want errors to be sent to stdout -> those will end up in CloudWatch
+; In FPM workers we don't want that, but that is overridden by Bref when it starts PHP-FPM
+display_errors=1
 
 ; Since PHP 7.4 the default value is E_ALL
 ; We override it to set the recommended configuration value for production.

tests/Makefile

@@ -18,6 +18,7 @@ test-%: vendor
 	# Test function handler
 	docker stop test-${CPU_PREFIX}php-$* 2> /dev/null || true # silence errors
 	docker run --platform=${DOCKER_PLATFORM} --rm --detach -v=$(PWD):/var/task:ro --name test-${CPU_PREFIX}php-$* \
+		   -e BREF_RUNTIME=function \
 		   bref/${CPU_PREFIX}php-$* test_4_function_handler.php
 	docker exec test-${CPU_PREFIX}php-$* php test_4_function_invocation.php \
         || (docker logs test-${CPU_PREFIX}php-$* && exit 1)
@@ -26,6 +27,7 @@ test-%: vendor
 	# Test FPM handler
 	docker stop test-${CPU_PREFIX}php-$* 2> /dev/null || true # silence errors
 	docker run --platform=${DOCKER_PLATFORM} --rm --detach -v=$(PWD):/var/task:ro --name test-${CPU_PREFIX}php-$* \
+		   -e BREF_RUNTIME=fpm \
 		   bref/${CPU_PREFIX}php-$* test_5_fpm_handler.php
 	docker exec test-${CPU_PREFIX}php-$* php test_5_fpm_invocation.php \
 		|| (docker logs test-${CPU_PREFIX}php-$* && exit 1) # print logs in case of failure
@@ -34,6 +36,7 @@ test-%: vendor
 	# Test console handler
 	docker stop test-${CPU_PREFIX}php-$* 2> /dev/null || true # silence errors
 	docker run --platform=${DOCKER_PLATFORM} --rm --detach -v=$(PWD):/var/task:ro --name test-${CPU_PREFIX}php-$* \
+		   -e BREF_RUNTIME=console \
 		   bref/${CPU_PREFIX}php-$* test_6_console_handler.php
 	docker exec test-${CPU_PREFIX}php-$* php test_6_console_invocation.php \
 		|| (docker logs test-${CPU_PREFIX}php-$* && exit 1) # print logs in case of failure
@@ -42,6 +45,7 @@ test-%: vendor
 	# Test that we can override PHP_INI_SCAN_DIR
 	docker stop test-${CPU_PREFIX}php-$*-test7 2> /dev/null || true # silence errors
 	docker run --platform=${DOCKER_PLATFORM} --rm --detach -v=$(PWD):/var/task:ro --name test-${CPU_PREFIX}php-$*-test7 \
+		   -e BREF_RUNTIME=function \
 		   -e PHP_INI_SCAN_DIR="/opt/bref/etc/php/conf.d/:/var/task/" \
 		   bref/${CPU_PREFIX}php-$* test_4_function_handler.php
 	docker exec test-${CPU_PREFIX}php-$*-test7 php test_7_custom_ini_scan_dir.php \

tests/composer.json

@@ -1,10 +1,10 @@
 {
     "require": {
-        "bref/bref": "dev-master"
+        "bref/bref": "dev-single-layer"
     },
     "config": {
         "platform": {
-            "php": "8.0.7"
+            "php": "8.2.0"
         }
     }
 }