Merge pull request #625 from brefphp/v3

v3: Bref v3 compatibility

Author: mnapoli

.prettyci.composer.json

@@ -1,5 +1,19 @@
 # Change log
 
+## 3.0.0
+
+- Bref v3 compatibility.
+- No longer compatible with Bref v2. If you use Bref v2, use the `1.x` version of the Bref extra extensions.
+
+## 2.0.0
+
+There is no 2.0.0 version. We're skipping v2 to jump to v3 to align with the version of Bref.
+
+As a reminder:
+
+- v1 of the extra extensions is compatible with Bref v2 (that was confusing).
+- v3 of the extra extensions is compatible with Bref v3.
+
 ## 1.8.7
 
 - Updated Blackfire to version 1.92.53.

CHANGELOG.md

@@ -2,7 +2,7 @@ SHELL := /bin/bash
 layer ?= *
 resolve_php_versions = $(or $(php_versions),`jq -r '.php | join(" ")' ${1}/config.json`)
 resolve_tags = `./new-docker-tags.php $(DOCKER_TAG)`
-BREF_VERSION = 2
+BREF_VERSION = 3
 
 define build_docker_image
 	docker build -t bref/${1}-php-${2} --build-arg PHP_VERSION=${2} --build-arg BREF_VERSION=${BREF_VERSION} ${DOCKER_BUILD_FLAGS} ${1}

Makefile

@@ -8,14 +8,16 @@ a limit of 5 layers per Lambda. You can also utilise the provided docker images
 
 > **Note**
 >
-> If you are using Bref v2, you need to use version `1.x` of the `bref/extra-php-extensions` package.
+> If you are using Bref v3, you need to use version `3.x` of the `bref/extra-php-extensions` package.
+>
+> There is no version `2.x` of the `bref/extra-php-extensions` package.
 >
-> If you are using Bref v1, you need to use version `0.x` of the `bref/extra-php-extensions` package.
+> If you are using Bref v2, you need to use version `1.x` of the `bref/extra-php-extensions` package.
 
 
 > **Warning**
 >
-> **ARM64 is not supported yet with Bref v2.**
+> **ARM64 is not supported with extra extensions.**
 
 
 We are happy to get contributions for other extensions. Sky is the limit! (And also your knowledge with Docker...)
@@ -43,7 +45,7 @@ functions:
         handler: bin/console
         runtime: php-81
         layers:
-            - ${bref-extra:amqp-php-81} # <----- Example for AMQP layer
+            - ${bref-extra:amqp-php-83} # <----- Example for AMQP layer
 ```
 
 ### Available layers

Readme.md

@@ -11,15 +11,15 @@
         "async-aws/core": "^1.7",
         "symfony/http-client": "^5.4",
         "async-aws/lambda": "^1.1",
-        "bref/logger": "^1.0"
+        "bref/logger": "^2.0"
     },
     "autoload-dev": {
         "psr-4": {
             "Bref\\Extra\\": "src/"
         }
     },
     "conflict": {
-        "bref/bref": "<2.1.15"
+        "bref/bref": "<3.0.0"
     },
     "license": "MIT",
     "authors": [

composer.json

@@ -9,8 +9,7 @@ RUN mkdir -p ${AMQP_BUILD_DIR}
 
 # Compile rabbitmq
 WORKDIR ${AMQP_BUILD_DIR}
-# Currently it is not possible to use newer rabbitmq-c version than 0.13.0 because this is
-# last version which supports CMake 3.17 which is latest available version in Amazon Linux 2.
+RUN LD_LIBRARY_PATH= dnf install -y cmake
 RUN curl -Ls -o rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v0.13.0.tar.gz
 RUN tar xzf rabbitmq-c.tar.gz
 WORKDIR ${AMQP_BUILD_DIR}/rabbitmq-c-0.13.0
@@ -19,9 +18,9 @@ RUN cmake --build . --target install
 
 # Compile the php amqp extension
 WORKDIR ${AMQP_BUILD_DIR}
-RUN git clone https://github.com/php-amqp/php-amqp
+RUN curl -Ls -o php-amqp.tar.gz https://github.com/php-amqp/php-amqp/archive/refs/tags/v2.1.2.tar.gz && \
+    tar xzf php-amqp.tar.gz && mv php-amqp-2.1.2 php-amqp
 WORKDIR ${AMQP_BUILD_DIR}/php-amqp
-RUN git checkout v2.1.2
 RUN phpize
 RUN ./configure
 RUN make -j $(nproc)

layers/amqp/Dockerfile

@@ -1,7 +1,5 @@
 {
     "php": [
-        "80",
-        "81",
         "82",
         "83",
         "84"

layers/amqp/config.json

@@ -1,7 +1,5 @@
 {
     "php": [
-        "80",
-        "81",
         "82",
         "83",
         "84"

layers/blackfire/config.json

@@ -4,7 +4,7 @@ FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext
 
 RUN set -ex && \
     LD_LIBRARY_PATH= && \
-    yum -y install bzip2-devel && \
+    dnf -y install bzip2-devel && \
     pecl channel-update pecl.php.net && \
     yes '' | pecl install bsdiff-stable && \
     cp "$(php-config --extension-dir)/bsdiff.so" /tmp/bsdiff.so && \

layers/bsdiff/Dockerfile

@@ -1,7 +1,5 @@
 {
     "php": [
-        "80",
-        "81",
         "82",
         "83",
         "84"