search

zendframework / zend-test

Test component from Zend Framework
BSD 3-Clause "New" or "Revised" License
18 stars 38 forks source link

New coding standard #39

Closed Koopzington closed 7 years ago

Koopzington commented 8 years ago

Usage of the newly introduced zendframework/zend-coding-standard for CS checks.

samsonasik commented 7 years ago

move phpunit to "require" section in composer.json, also, this should belongs to develop branch, after it pointed to develop, please rebase agains develop.

Koopzington commented 7 years ago

https://github.com/zendframework/zend-mail/pull/121 every other PR regarding the coding standard was against master, why should we do it differently in this case?

samsonasik commented 7 years ago

upping phpunit was went to develop, and I think goes to master without coding fix will go bugs, please check #43 for the phpunit 5 & 6 compat fix

Koopzington commented 7 years ago

not entirely sure but i think i just screwed up, didn't i?

samsonasik commented 7 years ago

You can do with the following steps:

git checkout develop
git pull git@github.com:zendframework/zend-test.git develop
git checkout new-coding-standard
git rebase develop

at this stage, you can fixes the conflicts (don't commit), then do

git add .
git rebase --continue

Next, do force push:

git push --force origin new-coding-standard

Lastly, point the PR to develop branch via "Edit" button in PR title, select "base" branch to develop.

Koopzington commented 7 years ago

seems to look good now