Skip to content

Commit 4077a5f

Browse files
author
DKravtsov
committed
Edited composer.json fixed symfony/webapp-pack issue.
1 parent 0d67493 commit 4077a5f

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,15 @@ endif
8080
test-using-symfony-6:
8181
@make clean
8282
@make exec-bash cmd="composer create-project symfony/skeleton:'6.4.x' ."
83+
@make exec-bash cmd="composer require phpdocumentor/reflection-docblock ^5.2"
8384
@make exec-bash cmd="composer require webapp --no-interaction"
8485
@make install-bundle
8586
@make cache-clear-warmup
8687

8788
test-using-symfony-7:
8889
@make clean
8990
@make exec-bash cmd="composer create-project symfony/skeleton:'7.4.x' ."
91+
@make exec-bash cmd="composer require phpdocumentor/reflection-docblock ^5.2"
9092
@make exec-bash cmd="composer require webapp --no-interaction"
9193
@make install-bundle
9294
@make cache-clear-warmup

composer.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,21 @@
2323
"email": "dmytro.kravtsov@systemsdk.com"
2424
}
2525
],
26-
"conflict": {
27-
"easycorp/easy-log-handler": "*"
28-
},
26+
"funding": [
27+
{
28+
"type": "other",
29+
"url": "https://secure.wayforpay.com/button/b0b1af16db515"
30+
}
31+
],
2932
"require": {
3033
"php": ">=8.1",
3134
"monolog/monolog": "~3.0",
3235
"symfony/yaml": "^6.1|^7.0|^8.0",
3336
"symfony/framework-bundle": "^6.1|^7.0|^8.0"
3437
},
38+
"conflict": {
39+
"easycorp/easy-log-handler": "*"
40+
},
3541
"autoload": {
3642
"psr-4": {
3743
"Systemsdk\\Bundle\\EasyLogBundle\\": "src/"

0 commit comments

Comments
 (0)