This repository has been archived by the owner on Jan 8, 2020. It is now read-only.
Fixed the call to addBranch() to include $branchName #6797
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@delboy1978uk as usual: test case required |
|
@delboy1978uk here's a simple reproducing test case if you're having trouble writing up your own: public function testAddBranchProperyConstructsSubBranchesOfTypeNumeric()
{
$config = new Config(array(), true);
$config->production = array(array('foo'), array('bar'));
$configString = $this->writer->toString($config);
$expected = <<<ECS
<?xml version="1.0" encoding="UTF-8"?>
<zend-config>
<production>foo</production>
<production>bar</production>
</zend-config>
ECS;
$expected = str_replace("\r\n", "\n", $expected);
$this->assertEquals($expected, $configString);
}You can cherry-pick it (adamlundrigan/zf2@fcc0b30) into your fix branch and then push to have it included in the PR. |
|
never done a cherry pick lol! giving it a shot just now, thanks adam :-) |
|
awesome! all is well :-D |
|
bump (ocramius jumping on a koopa) |
| @@ -82,4 +82,24 @@ public function testSectionsToString() | |||
| $expected = str_replace("\r\n", "\n", $expected); | |||
| $this->assertEquals($expected, $configString); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Can you remove this trailing whitespace and add an @group 6797 annotation to the method?
|
@Ocramius, how's that? :-) |
|
Looking good! |
Ocramius
pushed a commit
that referenced
this pull request
Dec 5, 2014
Ocramius
added a commit
that referenced
this pull request
Dec 5, 2014
… carriage return character removal `str_replace()` call
|
@delboy1978uk thanks, merged! |
gianarb
pushed a commit
to zendframework/zend-config
that referenced
this pull request
May 15, 2015
gianarb
pushed a commit
to zendframework/zend-config
that referenced
this pull request
May 15, 2015
…r new test, removing unused carriage return character removal `str_replace()` call
gianarb
pushed a commit
to zendframework/zend-config
that referenced
this pull request
May 15, 2015
…-handle-numeric-branch-names' Close zendframework/zendframework#6797
gianarb
pushed a commit
to zendframework/zend-config
that referenced
this pull request
May 15, 2015
…-handle-numeric-branch-names' into develop Close zendframework/zendframework#6797 Forward port zendframework/zendframework#6797
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.