Update conflicts.md

This commit is contained in:
Tomanhez 2020-12-31 11:04:20 +01:00 committed by Kamil Kokot
parent ca19f3a1b5
commit dad3cb12ab
No known key found for this signature in database
GPG key ID: 7BD76F7054D93C89

View file

@ -14,3 +14,35 @@ refereneces related issues.
This version of Doctrine Bridge introduces a bug that causes an issue related to `ChannelPricing` mapping.
References: https://github.com/Sylius/Sylius/issues/11970, https://github.com/symfony/symfony/issues/38861
- `laminas/laminas-code": "^4.0.0`:
Throw many syntax exceptions after running `vendor/bin/psalm --show-info=false` on `php7.4`
```
Error: Syntax error, unexpected T_STRING, expecting T_PAAMAYIM_NEKUDOTAYIM on line 480
Error: Syntax error, unexpected T_VARIABLE, expecting ')' on line 480
Error: Syntax error, unexpected ')' on line 481
Error: Syntax error, unexpected T_STRING, expecting T_PAAMAYIM_NEKUDOTAYIM on line 495
Error: Syntax error, unexpected T_VARIABLE, expecting ')' on line 495
Error: Syntax error, unexpected ')' on line 496
Error: Syntax error, unexpected T_STRING, expecting T_PAAMAYIM_NEKUDOTAYIM on line 59
Error: Syntax error, unexpected T_VARIABLE, expecting ')' on line 59
Error: Syntax error, unexpected ',' on line 59
Error: Syntax error, unexpected ')' on line 63
Error: Syntax error, unexpected T_STRING, expecting T_PAAMAYIM_NEKUDOTAYIM on line 105
Error: Syntax error, unexpected T_VARIABLE, expecting ')' on line 105
Error: Syntax error, unexpected ')' on line 107
Error: Syntax error, unexpected T_VARIABLE, expecting ')' on line 161
Error: Syntax error, unexpected ',' on line 161
Error: Syntax error, unexpected ')' on line 163
Error: Syntax error, unexpected T_VARIABLE, expecting ')' on line 185
Error: Syntax error, unexpected ',' on line 185
Error: Syntax error, unexpected ')' on line 187
Error: Syntax error, unexpected T_STRING, expecting T_PAAMAYIM_NEKUDOTAYIM on line 161
Error: Syntax error, unexpected T_VARIABLE, expecting ')' on line 161
Error: Syntax error, unexpected ')' on line 161
Error: Process completed with exit code 1.
```
References: https://github.com/laminas/laminas-code/issues/67