From 7ec43fd5288d9e7bb76899f285b3cccd894cfacb Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Sat, 9 Jul 2022 23:33:18 +0200 Subject: [PATCH 1/4] [Maintenance] Removed conflict with doctrine/orm ^2.10.0 --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index a9a86fd1..63494cb1 100644 --- a/composer.json +++ b/composer.json @@ -46,7 +46,6 @@ "conflict": { "symfony/doctrine-bridge": "4.4.16", "doctrine/doctrine-bundle": "2.3.0", - "doctrine/orm": "^2.10.0", "sylius/invoicing-plugin": "<0.16.0" }, "autoload": { From 310d99695ed7bdc132a0dfdf6436b233b19a7f82 Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Sat, 9 Jul 2022 23:56:56 +0200 Subject: [PATCH 2/4] [Maintenance] Allow-plugins config section added --- composer.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/composer.json b/composer.json index 63494cb1..928d2231 100644 --- a/composer.json +++ b/composer.json @@ -57,6 +57,13 @@ "autoload-dev": { "classmap": ["tests/Application/Kernel.php"] }, + "config": { + "allow-plugins": { + "dealerdirect/phpcodesniffer-composer-installer": false, + "ocramius/package-versions": false, + "symfony/flex": true + } + }, "extra": { "branch-alias": { "dev-master": "1.0-dev" From 34fce464cccabbae75a86336b50482ace8d0d299 Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Sun, 10 Jul 2022 00:07:30 +0200 Subject: [PATCH 3/4] [GithubActions] Updated section Restrict Symfony version --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e6aa29df..da8639e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,9 @@ jobs: name: Restrict Symfony version if: matrix.symfony != '' run: | - composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10" + composer global config --no-plugins allow-plugins.symfony/flex true + composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5" + composer config --no-plugins allow-plugins.symfony/thanks true composer config extra.symfony.require "${{ matrix.symfony }}" - From 278d43ccbb180a7937815ac2985700be95b8f7cb Mon Sep 17 00:00:00 2001 From: Rafikooo Date: Tue, 12 Jul 2022 10:07:50 +0200 Subject: [PATCH 4/4] [Maintenance] Added conflict with doctrine/dbal:^3.0.0 --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 928d2231..858e04b4 100644 --- a/composer.json +++ b/composer.json @@ -46,6 +46,7 @@ "conflict": { "symfony/doctrine-bridge": "4.4.16", "doctrine/doctrine-bundle": "2.3.0", + "doctrine/dbal": "^3.0.0", "sylius/invoicing-plugin": "<0.16.0" }, "autoload": {