Composer 2.3 isn't compatible with wallabag

wallabag · Apr 1, 2022 · fea2b46 · fea2b46
1 parent 287eba0
commit fea2b46
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/var/SymfonyRequirements.php b/var/SymfonyRequirements.php
@@ -455,6 +455,12 @@ public function __construct()
             );
         }
 
+        $this->addRequirement(
+            function_exists('iconv'),
+            'iconv() must be available',
+            'Install and enable the <strong>iconv</strong> extension.'
+        );
+
         $this->addRequirement(
             function_exists('json_encode'),
             'json_encode() must be available',