Merge pull request #69 from brefphp/fpm-dev-fix

Author: mnapoli

layers/fpm-dev/Dockerfile

@@ -35,7 +35,7 @@ COPY --link --from=bref/local-api-gateway /app /local-api-gateway
 EXPOSE 8000
 
 # Add `php/conf.dev.d` to the path where PHP looks for configuration files
-ENV PHP_INI_SCAN_DIR="$PHP_INI_SCAN_DIR:/var/task/php/conf.dev.d"
+ENV PHP_INI_SCAN_DIR="/opt/bref/etc/php/conf.d:/var/task/php/conf.d:/var/task/php/conf.dev.d"
 
 # Originally the entrypoint is `/lambda-entrypoint.sh` and CMD contains the handler name
 # We override the entrypoint to run our own logic

tests/Makefile

@@ -5,11 +5,13 @@ test: test-80 test-81 test-82
 # This rule matches with a wildcard, for example `test-80`.
 # The `$*` variable will contained the matched part, in this case `80`.
 test-%: vendor
-	docker run --platform=${DOCKER_PLATFORM} --rm -v=$(PWD):/var/task:ro --entrypoint=php bref/${CPU_PREFIX}php-$* \
-		   test_1_binary.php $*
+	docker run --platform=${DOCKER_PLATFORM} --rm -v=$(PWD):/var/task:ro --entrypoint=php bref/${CPU_PREFIX}php-$* test_1_binary.php $*
+	docker run --platform=${DOCKER_PLATFORM} --rm -v=$(PWD):/var/task:ro --entrypoint=php bref/${CPU_PREFIX}php-$*-fpm test_1_binary.php $*
+	docker run --platform=${DOCKER_PLATFORM} --rm -v=$(PWD):/var/task:ro --entrypoint=php bref/${CPU_PREFIX}php-$*-fpm-dev test_1_binary.php $*
 
-	docker run --platform=${DOCKER_PLATFORM} --rm -v=$(PWD):/var/task:ro --entrypoint=php bref/${CPU_PREFIX}php-$* \
-		   test_2_extensions.php
+	docker run --platform=${DOCKER_PLATFORM} --rm -v=$(PWD):/var/task:ro --entrypoint=php bref/${CPU_PREFIX}php-$* test_2_extensions.php
+	docker run --platform=${DOCKER_PLATFORM} --rm -v=$(PWD):/var/task:ro --entrypoint=php bref/${CPU_PREFIX}php-$*-fpm test_2_extensions.php
+	docker run --platform=${DOCKER_PLATFORM} --rm -v=$(PWD):/var/task:ro --entrypoint=php bref/${CPU_PREFIX}php-$*-fpm-dev test_2_extensions.php
 
 	docker run --platform=${DOCKER_PLATFORM} --rm -v=$(PWD):/var/task:ro --entrypoint=php \
 		   -e PHP_INI_SCAN_DIR="/opt/bref/etc/php/conf.d/:/var/task/" bref/${CPU_PREFIX}php-$* \

tests/test_2_extensions.php

@@ -98,7 +98,7 @@
     'iconv' => function_exists('iconv_strlen'),
     'mbstring' => function_exists('mb_strlen'),
     'mysqli' => function_exists('mysqli_connect'),
-    'opcache' => ini_get('opcache.enable') == 1 && ini_get('opcache.enable_cli') == 1,
+    'opcache' => ini_get('opcache.enable') == 1,
     'pdo' => class_exists(\PDO::class),
     'pdo_mysql' => extension_loaded('pdo_mysql'),
     'pdo_sqlite' => extension_loaded('pdo_sqlite'),