mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-16 12:46:27 +00:00
Merge pull request #5708 from wallabag/fix/composer-2.3
This commit is contained in:
commit
4ff43814bc
6 changed files with 12 additions and 4 deletions
2
.github/workflows/coding-standards.yml
vendored
2
.github/workflows/coding-standards.yml
vendored
|
@ -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:
|
||||
|
|
2
.github/workflows/continuous-integration.yml
vendored
2
.github/workflows/continuous-integration.yml
vendored
|
@ -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"
|
||||
|
||||
|
|
2
.github/workflows/translations.yml
vendored
2
.github/workflows/translations.yml
vendored
|
@ -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:
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
},
|
||||
"require": {
|
||||
"php": ">=7.2.5",
|
||||
"composer": "< 2.3",
|
||||
"ext-ctype": "*",
|
||||
"ext-curl": "*",
|
||||
"ext-dom": "*",
|
||||
|
|
3
composer.lock
generated
3
composer.lock
generated
|
@ -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": "*",
|
||||
|
|
|
@ -455,6 +455,12 @@ class SymfonyRequirements extends RequirementCollection
|
|||
);
|
||||
}
|
||||
|
||||
$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',
|
||||
|
|
Loading…
Reference in a new issue