From 303b43063d56c9a92d6cc7a04c2b9c0156d1c355 Mon Sep 17 00:00:00 2001 From: Wojdylak Date: Tue, 14 Nov 2023 16:09:33 +0100 Subject: [PATCH] Add ignore parse errors to composer require checker --- .github/workflows/ci_static-checks.yaml | 2 +- CONFLICTS.md | 4 ---- composer.json | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci_static-checks.yaml b/.github/workflows/ci_static-checks.yaml index 6af4ce3ce3..2c875f55ad 100644 --- a/.github/workflows/ci_static-checks.yaml +++ b/.github/workflows/ci_static-checks.yaml @@ -109,4 +109,4 @@ jobs: (cat composer.json | jq '.["autoload-dev"]["psr-4"] |= . + {"Sylius\\Behat\\": "src/Sylius/Behat/"}' | jq 'del(.autoload["psr-4"]["Sylius\\Behat\\"])') > _composer.json mv _composer.json composer.json composer dump-autoload - composer-require-checker check --config-file=composer-require-checker.json + composer-require-checker check --config-file=composer-require-checker.json --ignore-parse-errors diff --git a/CONFLICTS.md b/CONFLICTS.md index 2538404bf1..ae548e9100 100644 --- a/CONFLICTS.md +++ b/CONFLICTS.md @@ -70,7 +70,3 @@ references related issues. - https://github.com/stof/StofDoctrineExtensionsBundle/issues/455 - https://github.com/doctrine-extensions/DoctrineExtensions/issues/2600 - -- `doctrine/doctrine-bundle:2.11.0`: - - This version uses the [readonly property](https://github.com/doctrine/DoctrineBundle/blob/2.11.0/Repository/ServiceEntityRepositoryProxy.php#L34), which is available from PHP 8.1 while the package also supports PHP 7.4 and 8.0, leading to compatibility issues. diff --git a/composer.json b/composer.json index 0243a9213e..6d5432e137 100644 --- a/composer.json +++ b/composer.json @@ -180,7 +180,7 @@ }, "conflict": { "api-platform/core": "2.7.0", - "doctrine/doctrine-bundle": "2.3.0 || 2.11.0", + "doctrine/doctrine-bundle": "2.3.0", "doctrine/migrations": "3.5.3", "doctrine/orm": ">= 2.16.0", "jms/serializer-bundle": "4.1.0",