Skip to content

Conversation

javiereguiluz
Copy link
Member

This finishes and rebases #365.

@bocharsky-bw
Copy link
Contributor

👍

@@ -31,7 +31,8 @@
"white-october/pagerfanta-bundle" : "^1.0"
},
"require-dev": {
"sensio/generator-bundle" : "~3.0",
"phpunit/phpunit" : "^4.8 | ^5.0",
Copy link
Member

Choose a reason for hiding this comment

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

the Composer recommendation is to use || for the OR operator rather than |, because it is the operator used by other semver-based dependency managers

@javiereguiluz
Copy link
Member Author

@bocharsky-bw it's merged now. Thanks for proposing this improvement.

@javiereguiluz javiereguiluz merged commit 41fad4b into symfony:master Aug 31, 2016
javiereguiluz added a commit that referenced this pull request Aug 31, 2016
…ereguiluz)

This PR was merged into the master branch.

Discussion
----------

Use locked PHPUnit from dependencies

This finishes and rebases #365.

Commits
-------

41fad4b Fixed binaries path in AppVeyor script
46ac33e Moved binaries back to vendor/bin/
189eec1 Use the recommended OR operator
239b6b8 Allow to install newer PHPUnit versions
381732d Use locked PHPUnit from dependencies
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants