Skip to content

Commit 24abbb0

Browse files
authored
bug #254 [Maintenance] Updated composer conflict & config sections, updated GitHub workflow (Rafikooo)
This PR was merged into the 1.4 branch. Discussion ---------- | Q | A | --------------- | ----- | Branch? | 1.4 (bug fixes, improvements) | Bug fix? | no | New feature? | no https://getcomposer.org/doc/06-config.md#allow-plugins "As of Composer 2.2.0, the allow-plugins option adds a layer of security allowing you to restrict which Composer plugins are able to execute code during a Composer run." 1. Due to the fact above the configuration of composer.json has been updated to process dependencies explicitly 2. Conflict with `doctrine/orm:^2.10.0` has been removed 3. Conflict with `doctrine/dbal:^3.0.0` has been added 4. GitHub workflow has been updated based on https://github.com/Sylius/Sylius/pull/14130/files#diff-dc5f32521b4ae99ff8632eb151f06cb36a62fe139292cbbf3f2a4afc79647581 and Sylius/Sylius#14106 Commits ------- 7ec43fd [Maintenance] Removed conflict with doctrine/orm ^2.10.0 310d996 [Maintenance] Allow-plugins config section added 34fce46 [GithubActions] Updated section Restrict Symfony version 278d43c [Maintenance] Added conflict with doctrine/dbal:^3.0.0
2 parents b006828 + 278d43c commit 24abbb0

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ jobs:
8787
name: Restrict Symfony version
8888
if: matrix.symfony != ''
8989
run: |
90-
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:^1.10"
90+
composer global config --no-plugins allow-plugins.symfony/flex true
91+
composer global require --no-progress --no-scripts --no-plugins "symfony/flex:1.18.5"
92+
composer config --no-plugins allow-plugins.symfony/thanks true
9193
composer config extra.symfony.require "${{ matrix.symfony }}"
9294
9395
-

composer.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"conflict": {
4747
"symfony/doctrine-bridge": "4.4.16",
4848
"doctrine/doctrine-bundle": "2.3.0",
49-
"doctrine/orm": "^2.10.0",
49+
"doctrine/dbal": "^3.0.0",
5050
"sylius/invoicing-plugin": "<0.16.0"
5151
},
5252
"autoload": {
@@ -58,6 +58,13 @@
5858
"autoload-dev": {
5959
"classmap": ["tests/Application/Kernel.php"]
6060
},
61+
"config": {
62+
"allow-plugins": {
63+
"dealerdirect/phpcodesniffer-composer-installer": false,
64+
"ocramius/package-versions": false,
65+
"symfony/flex": true
66+
}
67+
},
6168
"extra": {
6269
"branch-alias": {
6370
"dev-master": "1.0-dev"

0 commit comments

Comments
 (0)