Update with main (only PHP 8.3)

Author: mnapoli

layers/bootstrap.php

@@ -2,11 +2,15 @@
 
 $appRoot = getenv('LAMBDA_TASK_ROOT');
 
-if (getenv('BREF_AUTOLOAD_PATH')) {
-    require getenv('BREF_AUTOLOAD_PATH');
-} elseif (file_exists($appRoot . '/vendor/autoload.php')) {
-    require $appRoot . '/vendor/autoload.php';
+$autoloadPath = $_SERVER['BREF_AUTOLOAD_PATH'] ?? null;
+if (! $autoloadPath) {
+    $autoloadPath = $appRoot . '/vendor/autoload.php';
 }
+if (! file_exists($autoloadPath)) {
+    throw new RuntimeException('Could not find the Composer vendor directory. Did you run "composer require bref/bref"? Read https://bref.sh/docs/environment/php#custom-vendor-path if your Composer vendor directory is in a custom path.');
+}
+
+require $autoloadPath;
 
 $runtimeClass = getenv('RUNTIME_CLASS');
 

layers/fpm-dev/Dockerfile

@@ -36,6 +36,9 @@ EXPOSE 8000
 # Add `php/conf.dev.d` to the path where PHP looks for configuration files
 ENV PHP_INI_SCAN_DIR="/opt/bref/etc/php/conf.d:/var/task/php/conf.d:/var/task/php/conf.dev.d"
 
+# Add composer
+COPY --link --from=composer/composer:2-bin /composer /usr/bin/composer
+
 # Originally the entrypoint is `/lambda-entrypoint.sh` and CMD contains the handler name
 # We override the entrypoint to run our own logic
 ENTRYPOINT [ "/bref-entrypoint.sh" ]

php-83/Dockerfile

@@ -4,7 +4,7 @@
 ARG IMAGE_VERSION_SUFFIX
 
 # https://www.php.net/downloads
-ARG VERSION_PHP=8.3.6
+ARG VERSION_PHP=8.3.12
 
 
 # Lambda uses a custom AMI named Amazon Linux 2

tests/test_2_extensions.php

@@ -91,6 +91,16 @@
     'curl-openssl-certificates-backwards-compatibility' => file_exists('/opt/bref/ssl/cert.pem'),
     // Make sure we are using curl with our compiled libssh
     'curl-libssh' => version_compare(str_replace('libssh2/', '', curl_version()['libssh_version']), '1.10.0', '>='),
+    'openssl' => (function() {
+        $private_key = openssl_pkey_new(['private_key_bits' => 2048]);
+        if ($private_key === false) {
+            return false;
+        }
+
+        $public_key_pem = openssl_pkey_get_details($private_key)['key'];
+        $details = openssl_pkey_get_details(openssl_pkey_get_public($public_key_pem));
+        return $details['bits'] === 2048;
+    })(),
     'json' => function_exists('json_encode'),
     'bcmath' => function_exists('bcadd'),
     'ctype' => function_exists('ctype_digit'),

utils/lib-copy/copy-dependencies.php

@@ -36,7 +36,13 @@
 $librariesThatExistOnLambda = array_map('trim', $librariesThatExistOnLambda);
 // For some reason some libraries are actually not in Lambda, despite being in the docker image 🤷
 $librariesThatExistOnLambda = array_filter($librariesThatExistOnLambda, function ($library) {
-    return ! str_contains($library, 'libgcrypt.so') && ! str_contains($library, 'libgpg-error.so');
+    return ! str_contains($library, 'libgcrypt.so')
+        && ! str_contains($library, 'libassuan.so')
+        && ! str_contains($library, 'libgobject-2.0.so')
+        && ! str_contains($library, 'libgpg-error.so')
+        && ! str_contains($library, 'libgpgme-pthread.so')
+        && ! str_contains($library, 'libgpgme.so')
+    ;
 });
 
 $requiredLibraries = listDependencies($pathToCheck);