mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 20:56:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5708 from wallabag/fix/composer-2.3

Browse source
This commit is contained in:
Jérémy Benoist 2022-04-04 06:52:29 +02:00 committed by GitHub
commit 4ff43814bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/coding-standards.yml vendored
View file

@ -21,7 +21,7 @@ jobs:
with: with:
coverage: "none" coverage: "none"
php-version: "7.4" 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 extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
ini-values: "date.timezone=Europe/Paris" ini-values: "date.timezone=Europe/Paris"
env: env:

2
.github/workflows/continuous-integration.yml vendored
View file

@ -50,7 +50,7 @@ jobs:
with: with:
php-version: "${{ matrix.php }}" php-version: "${{ matrix.php }}"
coverage: none 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 extensions: json, pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
ini-values: "date.timezone=Europe/Paris" ini-values: "date.timezone=Europe/Paris"

2
.github/workflows/translations.yml vendored
View file

@ -26,7 +26,7 @@ jobs:
with: with:
coverage: "none" coverage: "none"
php-version: "${{ matrix.php }}" 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 extensions: pdo, pdo_mysql, pdo_sqlite, pdo_pgsql, curl, imagick, pgsql, gd, tidy
ini-values: "date.timezone=Europe/Paris" ini-values: "date.timezone=Europe/Paris"
env: env:

1
composer.json
View file

@ -34,6 +34,7 @@
}, },
"require": { "require": {
"php": ">=7.2.5", "php": ">=7.2.5",
"composer": "< 2.3",
"ext-ctype": "*", "ext-ctype": "*",
"ext-curl": "*", "ext-curl": "*",
"ext-dom": "*", "ext-dom": "*",

3
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "bc4de754a149aefb830b843e23cdbaff", "content-hash": "3db24875e7ef009b7598c36bafac8a3a",
"packages": [ "packages": [
{ {
"name": "babdev/pagerfanta-bundle", "name": "babdev/pagerfanta-bundle",
@ -12924,6 +12924,7 @@
"prefer-lowest": false, "prefer-lowest": false,
"platform": { "platform": {
"php": ">=7.2.5", "php": ">=7.2.5",
"composer": "< 2.3",
"ext-ctype": "*", "ext-ctype": "*",
"ext-curl": "*", "ext-curl": "*",
"ext-dom": "*", "ext-dom": "*",

6
var/SymfonyRequirements.php
View file

@ -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( $this->addRequirement(
function_exists('json_encode'), function_exists('json_encode'),
'json_encode() must be available', 'json_encode() must be available',