-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Change method to set count fixes #6430 #6443
Conversation
@@ -1029,4 +1029,17 @@ public function testSettingSomeDataButNoneForCollectionReturnsSpecifiedNumberOfE | |||
|
|||
$this->assertCount(2, $form->get('names')); | |||
} | |||
|
|||
public function testMininumLenghtIsMaintanedWhenSettingAnSmallerCollection() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo : AnSmall -> ASmall
Thanks @samsonasik . How do I remove the failed merge by @ezimuel from this PR? |
You should not use master when create a PR, please read https://github.com/zendframework/zf2/blob/master/README-GIT.md#working-on-zend-framework |
That's strange @samsonasik because when I made the PR I conifgured: Or do you mean I had to commit my changes to my forked |
You've made changes to your master. When you create a PR you should create a new branch. |
@grizzm0 @samsonasik : I forked ZF2, created a new branch collection-count-patch based on the MASTER, edited two files. Should my branch be based on the zf-DEV? |
hm.., I have an issue like this in the pass. what i suggest to you is :
git clone https://github.com/webdevilopers/zf2.git
git branch collection-count-patch
git checkout collection-count-patch
git push origin collection-count-patch
|
But my created branch is based on the zf2-MASTER, right @samsonasik ? The first time I did it the way you described. The second time - after removing my fork - I edited the files online on github. But this time I used a separate branch Again the PR would include the commit by @ezimuel . Can somebody test this procedure to ensure that this is NOT A problem with that commit by @ezimuel on the zf2-MASTER? |
@webdevilopers please redo the PR creating a new branch from a fresh zf2/master, my PR is not the problem. |
Manually merged/rebased. Commit is gone as well :-) |
No description provided.