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

Bump "symfony/phpunit-bridge" constraint to "^5.1" #304

Merged
merged 1 commit into from Jun 14, 2020

Conversation

phansys
Copy link
Member

@phansys phansys commented Jun 13, 2020

Subject

Bump "symfony/phpunit-bridge" constraint to "^5.1", in order to avoid conflicts with TestCase::expectDeprecation().

See symfony/symfony#37153.

I am targeting this branch, because this change respects BC.

Triggered by #302 (comment).

Changelog

### Fixed
- Fixed exception thrown when calling `self::expectDeprecation()` from the test suite.

@phansys phansys added the patch label Jun 13, 2020
@phansys phansys requested a review from a team June 13, 2020 23:02
@jordisala1991
Copy link
Member

Another way to fix it is using ^5.1.1 on require dev

Copy link
Member

@VincentLanglet VincentLanglet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer the @jordisala1991 solution.

Adding conflict for require-dev doesn't seems to be a good idea to me.
If I want to install this bundle and phpunit-bridge@5.1.0 on a project, I should be able to do it because I won't run the sonata test.

A conflict-dev section could be used. But it doesn't exist...

@phansys phansys force-pushed the phpunit_bridge branch 2 times, most recently from 4696c2e to de2b16c Compare June 14, 2020 14:57
@phansys
Copy link
Member Author

phansys commented Jun 14, 2020

Based on your concern, I've removed the global conflict.

VincentLanglet
VincentLanglet previously approved these changes Jun 14, 2020
composer.json Outdated Show resolved Hide resolved
@phansys phansys changed the title Declare conflict against "symfony/phpunit-bridge:5.1.0" Bump "symfony/phpunit-bridge" constraint to "^5.1" Jun 14, 2020
@jordisala1991 jordisala1991 merged commit 6ef2d34 into sonata-project:2.x Jun 14, 2020
@jordisala1991
Copy link
Member

Thank you @phansys

@phansys phansys deleted the phpunit_bridge branch June 15, 2020 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants