From 394f7b14c788ab36a46ea91f656df51ba569f3d0 Mon Sep 17 00:00:00 2001 From: Maciej Lew Date: Fri, 27 Mar 2026 15:00:14 +0100 Subject: [PATCH 1/2] Remove xdebug from test images. Mitigate pecl installation issues. --- build/php-7.1/Dockerfile | 9 +-------- build/php-7.2/Dockerfile | 9 +-------- build/php-7.3/Dockerfile | 9 +-------- build/php-7.4/Dockerfile | 9 +-------- build/php-8.0/Dockerfile | 9 +-------- build/php-8.1/Dockerfile | 9 +-------- build/php-8.2/Dockerfile | 10 +--------- build/php-8.3/Dockerfile | 10 +--------- build/php-8.4/Dockerfile | 10 +--------- 9 files changed, 9 insertions(+), 75 deletions(-) diff --git a/build/php-7.1/Dockerfile b/build/php-7.1/Dockerfile index 690c835..2a0487e 100644 --- a/build/php-7.1/Dockerfile +++ b/build/php-7.1/Dockerfile @@ -3,14 +3,7 @@ FROM php:7.1-cli-alpine RUN apk update && \ apk upgrade && \ - apk add --no-cache \ - autoconf \ - g++ \ - make - -RUN pecl install xdebug-2.9.8 && \ - pecl clear-cache && \ - docker-php-ext-enable xdebug + apk add --no-cache make COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/build/php-7.2/Dockerfile b/build/php-7.2/Dockerfile index 0876175..bd7b230 100644 --- a/build/php-7.2/Dockerfile +++ b/build/php-7.2/Dockerfile @@ -3,14 +3,7 @@ FROM php:7.2-cli-alpine RUN apk update && \ apk upgrade && \ - apk add --no-cache \ - autoconf \ - g++ \ - make - -RUN pecl install xdebug-2.9.8 && \ - pecl clear-cache && \ - docker-php-ext-enable xdebug + apk add --no-cache make COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/build/php-7.3/Dockerfile b/build/php-7.3/Dockerfile index e2dee2e..28ef4fc 100644 --- a/build/php-7.3/Dockerfile +++ b/build/php-7.3/Dockerfile @@ -3,14 +3,7 @@ FROM php:7.3-cli-alpine RUN apk update && \ apk upgrade && \ - apk add --no-cache \ - autoconf \ - g++ \ - make - -RUN pecl install xdebug-2.9.8 && \ - pecl clear-cache && \ - docker-php-ext-enable xdebug + apk add --no-cache make COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/build/php-7.4/Dockerfile b/build/php-7.4/Dockerfile index 24a17d3..d810922 100644 --- a/build/php-7.4/Dockerfile +++ b/build/php-7.4/Dockerfile @@ -3,14 +3,7 @@ FROM php:7.4-cli-alpine RUN apk update && \ apk upgrade && \ - apk add --no-cache \ - autoconf \ - g++ \ - make - -RUN pecl install xdebug-2.9.8 && \ - pecl clear-cache && \ - docker-php-ext-enable xdebug + apk add --no-cache make COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/build/php-8.0/Dockerfile b/build/php-8.0/Dockerfile index b75744e..04a6435 100644 --- a/build/php-8.0/Dockerfile +++ b/build/php-8.0/Dockerfile @@ -3,14 +3,7 @@ FROM php:8.0-cli-alpine RUN apk update && \ apk upgrade && \ - apk add --no-cache \ - autoconf \ - g++ \ - make - -RUN pecl install xdebug-3.1.6 && \ - pecl clear-cache && \ - docker-php-ext-enable xdebug + apk add --no-cache make COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/build/php-8.1/Dockerfile b/build/php-8.1/Dockerfile index a68b5e2..70aea88 100644 --- a/build/php-8.1/Dockerfile +++ b/build/php-8.1/Dockerfile @@ -3,14 +3,7 @@ FROM php:8.1-cli-alpine RUN apk update && \ apk upgrade && \ - apk add --no-cache \ - autoconf \ - g++ \ - make - -RUN pecl install xdebug-3.1.6 && \ - pecl clear-cache && \ - docker-php-ext-enable xdebug + apk add --no-cache make COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/build/php-8.2/Dockerfile b/build/php-8.2/Dockerfile index 9092d51..677d0ad 100644 --- a/build/php-8.2/Dockerfile +++ b/build/php-8.2/Dockerfile @@ -3,15 +3,7 @@ FROM php:8.2-cli-alpine RUN apk update && \ apk upgrade && \ - apk add --no-cache \ - autoconf \ - g++ \ - make \ - linux-headers - -RUN pecl install xdebug-3.2.2 && \ - pecl clear-cache && \ - docker-php-ext-enable xdebug + apk add --no-cache make COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/build/php-8.3/Dockerfile b/build/php-8.3/Dockerfile index 97fdde4..94ac096 100644 --- a/build/php-8.3/Dockerfile +++ b/build/php-8.3/Dockerfile @@ -3,15 +3,7 @@ FROM php:8.3-cli-alpine RUN apk update && \ apk upgrade && \ - apk add --no-cache \ - autoconf \ - g++ \ - make \ - linux-headers - -RUN pecl install xdebug-3.3.1 && \ - pecl clear-cache && \ - docker-php-ext-enable xdebug + apk add --no-cache make COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/build/php-8.4/Dockerfile b/build/php-8.4/Dockerfile index 30effb1..ba691e0 100644 --- a/build/php-8.4/Dockerfile +++ b/build/php-8.4/Dockerfile @@ -3,15 +3,7 @@ FROM php:8.4-cli-alpine RUN apk update && \ apk upgrade && \ - apk add --no-cache \ - autoconf \ - g++ \ - make \ - linux-headers - -RUN pecl install xdebug-3.4.4 && \ - pecl clear-cache && \ - docker-php-ext-enable xdebug + apk add --no-cache make COPY --from=composer /usr/bin/composer /usr/bin/composer From 740353da4bd89d26adeaca0e7621d688bec073b5 Mon Sep 17 00:00:00 2001 From: Maciej Lew Date: Fri, 27 Mar 2026 15:03:32 +0100 Subject: [PATCH 2/2] Switch to non-blocking dependencies audit. --- .github/workflows/tests.yml | 3 +++ composer.json | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1657a68..9385edd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -49,5 +49,8 @@ jobs: - name: Install dependencies run: composer update --prefer-dist --no-interaction + - name: Audit dependencies + run: composer audit || true + - name: Running unit tests run: php vendor/bin/phpunit --configuration tests-resources/phpunit.dist.xml --testsuite unit diff --git a/composer.json b/composer.json index dd8d42e..8c5dad5 100644 --- a/composer.json +++ b/composer.json @@ -32,8 +32,7 @@ "phpdocumentor/reflection-docblock": "^4.3 || ^5.2.0", "phpdocumentor/type-resolver": "^0.5 || ^1.3.0", "guzzlehttp/psr7": "^1 || ^2", - "ext-curl": "*", - "roave/security-advisories": "dev-latest" + "ext-curl": "*" }, "suggest": { "ext-curl": "To use Curl HttpClient",