Skip to content

Commit

Permalink
Fix the build after upgrade to Symfony 5.3 in GitHub Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
pamil committed Jun 10, 2021
1 parent bfc1a2b commit 14bd63d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 75 deletions.
22 changes: 0 additions & 22 deletions CONFLICTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,28 +31,6 @@ references 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 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: 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

- `symfony/property-info:4.4.22|5.2.7`:

Expand Down
2 changes: 0 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,7 @@
"conflict": {
"doctrine/doctrine-bundle": "2.3.0",
"jms/serializer-bundle": "3.9.0",
"laminas/laminas-code": "^4.0.0",
"symfony/doctrine-bridge": "4.4.16",
"symfony/polyfill-mbstring": "^1.22.0",
"symfony/property-info": "4.4.22 || 5.2.7",
"symfony/serializer": "4.4.19 || 5.2.2"
},
Expand Down
51 changes: 0 additions & 51 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -188,18 +188,6 @@
"friends-of-behat/variadic-extension": {
"version": "v1.3.0"
},
"friendsofphp/php-cs-fixer": {
"version": "2.2",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "master",
"version": "2.2",
"ref": "cc05ab6abf6894bddb9bbd6a252459010ebe040b"
},
"files": [
".php_cs.dist"
]
},
"friendsofphp/proxy-manager-lts": {
"version": "v1.0.2"
},
Expand Down Expand Up @@ -242,9 +230,6 @@
"instaclick/php-webdriver": {
"version": "1.4.7"
},
"jean85/pretty-package-versions": {
"version": "1.5.0"
},
"jms/metadata": {
"version": "1.7.0"
},
Expand Down Expand Up @@ -375,18 +360,9 @@
"netresearch/jsonmapper": {
"version": "v2.1.0"
},
"nette/finder": {
"version": "v2.5.2"
},
"nette/neon": {
"version": "v3.2.2"
},
"nette/robot-loader": {
"version": "v3.3.0"
},
"nette/utils": {
"version": "v3.1.3"
},
"nikic/php-parser": {
"version": "v4.6.0"
},
Expand Down Expand Up @@ -426,9 +402,6 @@
"php": {
"version": "7.3"
},
"php-cs-fixer/diff": {
"version": "v1.3.0"
},
"php-http/client-common": {
"version": "1.7.0"
},
Expand Down Expand Up @@ -534,9 +507,6 @@
"psr/log": {
"version": "1.0.2"
},
"psr/simple-cache": {
"version": "1.0.1"
},
"ralouphie/getallheaders": {
"version": "3.0.3"
},
Expand Down Expand Up @@ -849,9 +819,6 @@
"symfony/polyfill-php56": {
"version": "v1.15.0"
},
"symfony/polyfill-php70": {
"version": "v1.9.0"
},
"symfony/polyfill-php72": {
"version": "v1.18.1"
},
Expand Down Expand Up @@ -1021,18 +988,9 @@
"symfony/yaml": {
"version": "v4.4.13"
},
"symplify/autowire-array-parameter": {
"version": "v8.2.9"
},
"symplify/coding-standard": {
"version": "v8.1.19"
},
"symplify/composer-json-manipulator": {
"version": "v9.3.0"
},
"symplify/console-color-diff": {
"version": "v8.2.9"
},
"symplify/console-package-builder": {
"version": "v9.3.0"
},
Expand All @@ -1042,21 +1000,12 @@
"symplify/easy-testing": {
"version": "v9.3.0"
},
"symplify/package-builder": {
"version": "8.2.21"
},
"symplify/rule-doc-generator-contracts": {
"version": "v9.3.0"
},
"symplify/set-config-resolver": {
"version": "8.2.21"
},
"symplify/skipper": {
"version": "v9.3.0"
},
"symplify/smart-file-system": {
"version": "8.2.21"
},
"symplify/symplify-kernel": {
"version": "v9.3.0"
},
Expand Down

0 comments on commit 14bd63d

Please sign in to comment.