Skip to content

Commit

Permalink
Update conflicts.md
Browse files Browse the repository at this point in the history
  • Loading branch information
Tomanhez committed Dec 31, 2020
1 parent 0ca11c2 commit d5bb0d7
Showing 1 changed file with 32 additions and 0 deletions.
32 changes: 32 additions & 0 deletions CONFLICTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

```
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

0 comments on commit d5bb0d7

Please sign in to comment.