From fea2b4649680047294770103b4be825799e06ff8 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 1 Apr 2022 16:09:59 +0200 Subject: [PATCH] Composer 2.3 isn't compatible with wallabag --- .github/workflows/coding-standards.yml | 2 +- .github/workflows/continuous-integration.yml | 2 +- .github/workflows/translations.yml | 2 +- composer.json | 1 + composer.lock | 3 ++- var/SymfonyRequirements.php | 6 ++++++ 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml index 19723f711..c0c4fb319 100644 --- a/.github/workflows/coding-standards.yml +++ b/.github/workflows/coding-standards.yml @@ -21,7 +21,7 @@ jobs: with: coverage: "none" php-version: "7.4" - tools: cs2pr, pecl, composer:v2 + tools: cs2pr, pecl, composer:2.2 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 7d2857210..8fedde388 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -50,7 +50,7 @@ jobs: with: php-version: "${{ matrix.php }}" coverage: none - tools: pecl, composer:v2 + tools: pecl, composer:2.2 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 7a355d323..bfc91bf7d 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -26,7 +26,7 @@ jobs: with: coverage: "none" php-version: "${{ matrix.php }}" - tools: pecl, composer:v2 + tools: pecl, composer:2.2 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 0a42525cb..0c22c58d0 100644 --- a/composer.json +++ b/composer.json @@ -34,6 +34,7 @@ }, "require": { "php": ">=7.2.5", + "composer": "< 2.3", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", diff --git a/composer.lock b/composer.lock index 7ca1066e8..86fc4211b 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": "bc4de754a149aefb830b843e23cdbaff", + "content-hash": "3db24875e7ef009b7598c36bafac8a3a", "packages": [ { "name": "babdev/pagerfanta-bundle", @@ -12924,6 +12924,7 @@ "prefer-lowest": false, "platform": { "php": ">=7.2.5", + "composer": "< 2.3", "ext-ctype": "*", "ext-curl": "*", "ext-dom": "*", diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php index c1c530775..4a1fcc621 100644 --- a/var/SymfonyRequirements.php +++ b/var/SymfonyRequirements.php @@ -455,6 +455,12 @@ class SymfonyRequirements extends RequirementCollection ); } + $this->addRequirement( + function_exists('iconv'), + 'iconv() must be available', + 'Install and enable the iconv extension.' + ); + $this->addRequirement( function_exists('json_encode'), 'json_encode() must be available',