Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove conflict to symfony/polyfill-mbstring #6

Merged
merged 1 commit into from
Sep 20, 2022
Merged

Remove conflict to symfony/polyfill-mbstring #6

merged 1 commit into from
Sep 20, 2022

Conversation

Ferror
Copy link
Contributor

@Ferror Ferror commented Sep 14, 2022

I don't know why the conflict existed, and there is no good track about it on git/github but the conflict forbids using the standard composer mechanism to replace the polyfill and use extension instead.

{
    "replace": {
        "symfony/polyfill-mbstring": "*"
    }
}

@lchrusciel lchrusciel merged commit aea1494 into SyliusLabs:master Sep 20, 2022
@Ferror Ferror deleted the patch-1 branch October 13, 2022 18:40
Zales0123 added a commit to SyliusLabs/PolyfillSymfonyFrameworkBundle that referenced this pull request Oct 31, 2022
This PR was merged into the 1.1-dev branch.

Discussion
----------

I don't know why the conflict existed, and there is no sound track about it on git/github but the conflict forbids using the standard composer mechanism to replace the polyfill and use an extension instead.

```json
{
    "replace": {
        "symfony/polyfill-mbstring": "*"
    }
}
```

See the SyliusLabs/PolyfillSymfonySecurity#6

Commits
-------

16f973f Remove conflict to symfony/polyfill-mbstring
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants