Fixed dev-dependencies #66
Conversation
|
See #65 to address the CS issue. |
|
@GrahamCampbell can you consolidate everything in one PR? |
|
@GrahamCampbell I had to force pushed master rolling back to 6.0.3 as the tag 6.0.4 had one issue, could you please rebase your PR with master? thanks |
The changes are unrelated though, and I couldn't be sure which ones you'd actually want. |
|
@GrahamCampbell it's fine, could you please just rebase the PRs with master? thanks |
|
Done. |
|
Just rebased again. |
|
@GrahamCampbell I see two commits |
|
Just pushed a few fixes. |
|
NB, it's important the lock file isn't committed so that php 5.4/5.4 can use phpunit 4, and later versions can use phpunit 5, since, officially, phpunit 4 is marked as not compatible wit php 7. |
|
👍 |
|
could you squash in one commit? thanks |
|
Done. |
| build/ | ||
| build | ||
| composer.lock | ||
| phpunit.xml |
There was a problem hiding this comment.
@GrahamCampbell why do we need yo specify it?
There was a problem hiding this comment.
The whole point of having a phpunit.xml.dist file, if you can locally create a phpunit.xml locally to override the config for your local dev without having it show up in git.
There was a problem hiding this comment.
@GrahamCampbell sure, but usually I put it in the global gitignore
There was a problem hiding this comment.
Ok, I can remove it then.
|
Done, and squashed again. |
|
thanks a lot! Tomorrow I will probably cherry-pick the good commits from the deleted 6.0.4 tag and create a new release. |
|
In terms of the cs stuff, I'd not recommend pulling in php-cs-fixer and all that stuff. I'd recommend just setting the config on styleci's web interface, then forgetting about it, and let styleci handle it all. |
No description provided.