-
Notifications
You must be signed in to change notification settings - Fork 8
Add compatibility with symfony 3.* and 4.* #4
Conversation
|
We need to be sure that this works on both 3.x and 4.0, so I would also change the |
83ed14f to
db9824d
Compare
|
@fabpot: Thanks for your feedback, I'll change I fail to see where multiple symfony versions are being used by travis in Somehow the travis builds for this PR don't work. Travis just says "Abuse detected". I've reached out to the support to get this fixed. |
|
Indeed, Silex is a better example: https://github.com/silexphp/Silex/blob/master/.travis.yml |
db9824d to
c61fc16
Compare
|
Closing and re-opening to trigger travis rebuild. |
814465f to
e4bb75d
Compare
|
I finally managed to get the travis "Abuse detected" problem solved and all travis builds passing. @fabpot Is the PR ok like this? |
fabpot
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. I've made some minor comments.
.travis.yml
Outdated
| - $HOME/.composer/cache/files | ||
|
|
||
| before_install: | ||
| # Circumvent a bug in the travis HHVM image - ships with incompatible PHPUnit. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would remove everything related to HHVM as we (Symfony) do not support HHVM anymore anyway.
composer.json
Outdated
| "symfony/http-foundation": "~2.1", | ||
| "symfony/http-kernel": "~2.1" | ||
| "symfony/http-foundation": "~2.1|~3.0|~4.0", | ||
| "symfony/http-kernel": "~2.1|~3.0|~4.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about bumping ~2.1 to ~2.7? 2.1 is very old now, so I don't think we need to support it.
tests/bootstrap.php
Outdated
| @@ -0,0 +1,6 @@ | |||
| <?php | |||
| if (class_exists('PHPUnit_Framework_TestCase') === false && class_exists('PHPUnit\Framework\TestCase') === true) { | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Small thing, but can you add a blank line just after <?php? And add a new line at the end of the file?
tests/bootstrap.php
Outdated
| @@ -0,0 +1,6 @@ | |||
| <?php | |||
| if (class_exists('PHPUnit_Framework_TestCase') === false && class_exists('PHPUnit\Framework\TestCase') === true) { | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could be simplified to if (!class_exists('PHPUnit_Framework_TestCase') && class_exists('PHPUnit\Framework\TestCase')) {
e4bb75d to
c63dbfd
Compare
|
@fabpot I changed the PR according to your suggestions. |
Would be great to have this merged soon.