Fix for issue #3347 #3424

Closed
wants to merge 2 commits into
from

Projects

None yet

2 participants

@Deserved

Fix for issue #3347

@weierophinney weierophinney added a commit that referenced this pull request Jan 14, 2013
@weierophinney weierophinney [#3424] CS fixes
- Trailing whitespace
- whitespace following operators
bef0ba6
@weierophinney weierophinney added a commit that referenced this pull request Jan 14, 2013
@weierophinney weierophinney Merge branch 'hotfix/3424' into develop
Forward port #3424
5bbef56
@weierophinney weierophinney added a commit that closed this pull request Jan 14, 2013
@weierophinney weierophinney Merge branch 'hotfix/3424'
Close #3424
Fixes #3347
c8c6375
@weierophinney weierophinney added a commit that referenced this pull request Jan 29, 2013
@weierophinney weierophinney Revert "Merge branch 'ZF-3347' of git://github.com/Deserved/zf2 into …
…hotfix/3424"

This reverts commit b9d1977, reversing
changes made to 054f7a0.

Reverts #3424 due to BC breaks reported in #3576

Conflicts:
	tests/ZendTest/ServiceManager/ServiceManagerTest.php
2a2cfcb
@weierophinney weierophinney added a commit that referenced this pull request Jan 29, 2013
@weierophinney weierophinney Revert "Merge branch 'hotfix/3424'"
Reverts #3424 due to BC issue reported in #3576

This reverts commit c8c6375, reversing
changes made to 054f7a0.
c562e2c
@weierophinney
Zend Framework member

Reverted; see #3576 for details.

@Deserved

Probably this one has to be reopened than?

@weierophinney
Zend Framework member

I'm not seeing any option to reopen, @Deserved -- I think since it's been merged previously, github is still considering it merged despite the revert.

If you want to try this again, open a new PR, and reference this one.

@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney [#3424] CS fixes
- Trailing whitespace
- whitespace following operators
c5f6af1
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney Merge branch 'hotfix/3424'
Close #3424
Fixes #3347
3cbaa0c
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney Merge branch 'hotfix/3424' into develop
Forward port #3424
4b99822
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney Revert "Merge branch 'ZF-3347' of git://github.com/Deserved/zf2 into …
…hotfix/3424"

This reverts commit b9d1977, reversing
changes made to 054f7a0.

Reverts #3424 due to BC breaks reported in #3576

Conflicts:
	tests/ZendTest/ServiceManager/ServiceManagerTest.php
a33b114
@ghost Unknown pushed a commit that referenced this pull request Jul 14, 2013
@weierophinney weierophinney Revert "Merge branch 'hotfix/3424'"
Reverts #3424 due to BC issue reported in #3576

This reverts commit c8c6375, reversing
changes made to 054f7a0.
5e4b3f0
@weierophinney weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@weierophinney weierophinney [zendframework/zendframework#3424] CS fixes
- Trailing whitespace
- whitespace following operators
6ba3916
@weierophinney weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@weierophinney weierophinney Merge branch 'hotfix/3424' 86f0f77
@weierophinney weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@weierophinney weierophinney Merge branch 'hotfix/3424' into develop b28d0cf
@weierophinney weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@weierophinney weierophinney Revert "Merge branch 'ZF-3347' of git://github.com/Deserved/zf2 into …
…hotfix/3424"

This reverts commit b9d19770186be6b50e9908c94d495db42034f6df, reversing
changes made to 054f7a0f95bb919cce95faa53ced0a525017602f.

Reverts zendframework/zendframework#3424 due to BC breaks reported in zendframework/zendframework#3576

Conflicts:
	tests/ZendTest/ServiceManager/ServiceManagerTest.php
5b5a4de
@weierophinney weierophinney added a commit to zendframework/zend-servicemanager that referenced this pull request May 15, 2015
@weierophinney weierophinney Revert "Merge branch 'hotfix/3424'"
Reverts zendframework/zendframework#3424 due to BC issue reported in zendframework/zendframework#3576

This reverts commit c8c637523fe1a5705ba01684386a8ef63e675464, reversing
changes made to 054f7a0f95bb919cce95faa53ced0a525017602f.
30d8776
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment