Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 11 additions & 21 deletions CONFLICTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,34 +15,24 @@ refereneces related issues.

References: https://github.com/Sylius/Sylius/issues/11970, https://github.com/symfony/symfony/issues/38861

- `laminas/laminas-code": "^4.0.0`:
- `laminas/laminas-code:^4.0.0`:

Throw many syntax exceptions after running `vendor/bin/psalm --show-info=false` on `php7.4`
Throw many syntax exceptions after running `vendor/bin/psalm --show-info=false` on PHP 7.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

- `symfony/polyfill-mbstring:1.22.0`:

`polyfill-mbstring` 1.22.0 causes a problem with static analysis on PHP 7.3.
After running `vendor/bin/psalm --show-info=false --php-version=7.3`, the following exception is thrown:

`ParseError - vendor/symfony/polyfill-mbstring/bootstrap80.php:125:86 - Syntax error, unexpected '=' on line 125 (see https://psalm.dev/173) function mb_scrub(string $string, string $encoding = null): string { $encoding ??= mb_internal_encoding(); return mb_convert_encoding($string, $encoding, $encoding); }`

References: https://github.com/vimeo/psalm/issues/4961
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@
"conflict": {
"doctrine/inflector": "^1.4",
"laminas/laminas-code": "^4.0.0",
"symfony/doctrine-bridge": "4.4.16"
"symfony/doctrine-bridge": "4.4.16",
"symfony/polyfill-mbstring": "1.22.0"
},
"require-dev": {
"behat/behat": "^3.6.1",
Expand Down