Skip to content

Commit

Permalink
refactor #13263 Remove undocumented conflict on laminas-code ^4.0 (4c0n)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.9 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.9 1.10 master
| Bug fix?        | no
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| License         | MIT

https://sylius-devs.slack.com/archives/C3EGDG9LY/p1634735181098300

This conflict is not documented in `CONFLICTS.md` anymore, was brought back in this commit:
f80f42d

However according laminas/laminas-code#67 and considering:
https://github.com/Sylius/Sylius/blob/49b070933b32761de08475fafd6d86dca10d40ff/.github/workflows/application.yml#L104 should no longer be an issue.

If it still is, then I guess the build will show it and there should be a new issue opened somewhere.

Commits
-------

0ec9161 Remove undocumented conflict on laminas-code ^4.0
  • Loading branch information
lchrusciel committed Nov 2, 2021
2 parents 5ae0970 + 0ec9161 commit 88c0869
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@
"doctrine/doctrine-bundle": "2.3.0",
"doctrine/orm": "^2.10.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",
Expand Down

0 comments on commit 88c0869

Please sign in to comment.