diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index cc7f030ec..1f5e652e5 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -24,7 +24,7 @@ jobs: with: coverage: "none" php-version: "7.4" - tools: cs2pr, pecl, composer:2.2 + tools: cs2pr, pecl extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy ini-values: "date.timezone=Europe/Paris" env: diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d2de81748..44e10c59d 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -48,7 +48,7 @@ jobs: with: php-version: "${{ matrix.php }}" coverage: none - tools: pecl, composer:2.2 + tools: pecl extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy ini-values: "date.timezone=Europe/Paris" diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index b5de2b372..2194f49e6 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -29,7 +29,7 @@ jobs: with: coverage: "none" php-version: "${{ matrix.php }}" - tools: pecl, composer:2.2 + tools: pecl extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy ini-values: "date.timezone=Europe/Paris" env: diff --git a/composer.json b/composer.json index 0dce4fd55..f951bc214 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,6 @@ }, "require": { "php": ">=7.4", - "composer": "< 2.3", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", diff --git a/composer.lock b/composer.lock index 0ae0c92d4..fc43e9b6a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "598bc98358673f361673a95b75c1ffa3", + "content-hash": "590ed41c623b7ee7204d486fc0412d99", "packages": [ { "name": "babdev/pagerfanta-bundle", @@ -13001,7 +13001,6 @@ "prefer-lowest": false, "platform": { "php": ">=7.4", - "composer": "< 2.3", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", @@ -13023,5 +13022,5 @@ "platform-overrides": { "php": "7.4.29" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index c2884f23b..f96b9d6b4 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -65,7 +65,7 @@ RUN npm install -g yarn RUN curl -L -o /usr/local/bin/envsubst https://github.com/a8m/envsubst/releases/download/v1.1.0/envsubst-`uname -s`-`uname -m`; \ chmod +x /usr/local/bin/envsubst -COPY --from=composer:2.2.12 /usr/bin/composer /usr/local/bin/composer +COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer COPY entrypoint.sh /entrypoint.sh COPY config/ /opt/wallabag/config/