Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Change method to set count fixes #6430 #6443

Closed
wants to merge 4 commits into from
Closed

Change method to set count fixes #6430 #6443

wants to merge 4 commits into from

Conversation

webdevilopers
Copy link
Contributor

No description provided.

@@ -1029,4 +1029,17 @@ public function testSettingSomeDataButNoneForCollectionReturnsSpecifiedNumberOfE

$this->assertCount(2, $form->get('names'));
}

public function testMininumLenghtIsMaintanedWhenSettingAnSmallerCollection()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

typo : AnSmall -> ASmall

@webdevilopers
Copy link
Contributor Author

Thanks @samsonasik . How do I remove the failed merge by @ezimuel from this PR?

@samsonasik
Copy link
Contributor

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

@webdevilopers
Copy link
Contributor Author

That's strange @samsonasik because when I made the PR I conifgured:
zendframework:develop ... webdevilopers:master

Or do you mean I had to commit my changes to my forked webdevilopers:develop?

@grizzm0
Copy link
Contributor

grizzm0 commented Jul 9, 2014

You've made changes to your master. When you create a PR you should create a new branch.

@webdevilopers
Copy link
Contributor Author

@grizzm0 @samsonasik :
I still have a problem with creating the PR.

I forked ZF2, created a new branch collection-count-patch based on the MASTER, edited two files.
Than I make a PR with my new branch on the zf2-DEV.
Again the commit by @ezimuel is appearing.

Should my branch be based on the zf-DEV?

@samsonasik
Copy link
Contributor

hm.., I have an issue like this in the pass. what i suggest to you is :

git clone https://github.com/webdevilopers/zf2.git
  • create a branch
git branch collection-count-patch
  • checkout to your branch
git checkout collection-count-patch
  • make a patch and commit
  • do git push to origin/collection-count-patch
git push origin collection-count-patch
  • make a NEW PR from this branch pointing to master branch ( fixes, not a feature )
  • close this PR.

@webdevilopers
Copy link
Contributor Author

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 collection-count-patch.

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?

@ezimuel
Copy link
Contributor

ezimuel commented Aug 6, 2014

@webdevilopers please redo the PR creating a new branch from a fresh zf2/master, my PR is not the problem.

@Ocramius Ocramius added this to the 2.3.2 milestone Aug 6, 2014
@Ocramius Ocramius self-assigned this Aug 6, 2014
Ocramius added a commit that referenced this pull request Aug 6, 2014
@Ocramius Ocramius closed this in 1345a77 Aug 6, 2014
@Ocramius
Copy link
Member

Ocramius commented Aug 6, 2014

Manually merged/rebased. Commit is gone as well :-)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants