Obey PSR-2 #3130

Closed
wants to merge 3 commits into
from

Conversation

Projects
None yet
3 participants
@localheinz

This comment has been minimized.

Show comment Hide comment
@localheinz

localheinz Dec 2, 2012

Member

As I understood it, ZF2 has adopted PSR-2.

Member

localheinz commented Dec 2, 2012

As I understood it, ZF2 has adopted PSR-2.

@ghost ghost assigned Maks3w Dec 3, 2012

@Maks3w

This comment has been minimized.

Show comment Hide comment
@Maks3w

Maks3w Dec 3, 2012

Member

@localheinz Can you rebase the PR?

Member

Maks3w commented Dec 3, 2012

@localheinz Can you rebase the PR?

@localheinz

This comment has been minimized.

Show comment Hide comment
@localheinz

localheinz Dec 3, 2012

Member

@Maks3w How?

Member

localheinz commented Dec 3, 2012

@Maks3w How?

@Maks3w

This comment has been minimized.

Show comment Hide comment
@Maks3w

Maks3w Dec 3, 2012

Member
git fetch upstream
git rebase -f upstream/master
git add ....
git rebase --continue
git push -f origin ...

This process can be dangerous if is your first time. So just merge the most recent version of master branch into your PR branch.

Member

Maks3w commented Dec 3, 2012

git fetch upstream
git rebase -f upstream/master
git add ....
git rebase --continue
git push -f origin ...

This process can be dangerous if is your first time. So just merge the most recent version of master branch into your PR branch.

@localheinz

This comment has been minimized.

Show comment Hide comment
@localheinz

localheinz Dec 3, 2012

Member

Thanks a lot, @Maks3w!

Member

localheinz commented Dec 3, 2012

Thanks a lot, @Maks3w!

weierophinney added a commit that referenced this pull request Dec 5, 2012

Merge branch 'hotfix/3130' into develop
Forward port #3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

@ghost ghost assigned weierophinney Dec 5, 2012

weierophinney pushed a commit to zendframework/zend-mail that referenced this pull request May 14, 2015

weierophinney added a commit to zendframework/zend-mail that referenced this pull request May 14, 2015

weierophinney added a commit to zendframework/zend-mail that referenced this pull request May 14, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-uri that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-uri that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-uri that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-eventmanager that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-eventmanager that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-eventmanager that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-loader that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-loader that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-loader that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-modulemanager that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-modulemanager that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-modulemanager that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-config that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-config that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-config that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-stdlib that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-i18n that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-i18n that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-i18n that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-inputfilter that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-inputfilter that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-inputfilter that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-di that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-di that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-di that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-http that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-http that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-http that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-filter that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-filter that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-filter that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-validator that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-validator that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-validator that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-session that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-session that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-session that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-log that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-log that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-log that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-view that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-view that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php

gianarb pushed a commit to zendframework/zend-navigation that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-navigation that referenced this pull request May 15, 2015

weierophinney added a commit to zendframework/zend-navigation that referenced this pull request May 15, 2015

Merge branch 'hotfix/3130' into develop
Forward port zendframework/zendframework#3130

Conflicts:
	README.md
	library/Zend/Version/Version.php
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment