Input fallback value option #2673

Closed
wants to merge 1 commit into
from

Projects

None yet

3 participants

@fabicz
Contributor
fabicz commented Oct 4, 2012

This adds a support for additional Input option: fallback_value

When validation fails for an input then this fallback values is used. No validation messages is returned.

(Note I'm novice with GIT forking and branching so please excuse if my merge request is somehow crippled. Not sure if it's standard that after test\Zend was rename this pull request shows more then 3K changed files. Only '077943e' commit is importatnt.)

@chrisgahlert

Hi, I think there is something wrong with your merge #4e297a8. Probably your IDE converted all line endings from Linux to Windows (CRLF).

You should have first pulled the newest changed an then start committing. There is no need to do an additional merge.

@weierophinney
Member

I cannot merge this as-is; two many conflicts are raised.

@fabicz I'd recommend the following:

  • git remote add upstream git://github.com/zendframework/zf2.git
  • git fetch upstream
  • git checkout -b develop upstream/develop
  • git checkout -b feature/input-fallback
  • git cherry-pick e1f8b2b
  • git cherry-pick 077943e
  • git push -f origin feature/input-fallback:feature/input-fallback-value-option

Then, delete your local feature/input-fallback-value-option branch. By pushing to the same remote branch, I'll get a new history that hopefully doesn't have the conflicts.

Thanks!

@fabicz
Contributor
fabicz commented Oct 5, 2012

Thanks Matthew. I think I got it sorted out. My branch now contains one commit on top of zf2 upstream. https://github.com/fabicz/zf2/commits/feature/input-fallback-value-option

But your instructions created new branch under feature. Do you want me to create new pull request?

@weierophinney
Member

@fabicz Something is odd in that branch -- even when I pull against feature/input-fallback-value-option, I get around 100 files changed. If I simply cherry-pick the commit, only the two files listed in your commit are changed.

So, we have a couple options:

  • You fiddle with branches some more in the hopes we can get a clean merge.
  • I simply cherry-pick your change (which means the history is slightly re-written -- you still get attribution. You'd need to likely delete the local branch with the change in favor of a fresh pull from the ZF2 repo.)

How would you like to proceed?

@fabicz
Contributor
fabicz commented Oct 10, 2012

I get smarter with every git command. Should be fine now.

@weierophinney weierophinney added a commit that referenced this pull request Oct 10, 2012
@weierophinney weierophinney Merge branch 'hotfix/2673' into develop
Forward port #2673
9520b78
@weierophinney weierophinney added a commit that closed this pull request Oct 10, 2012
@weierophinney weierophinney Merge branch 'hotfix/2673'
Close #2673
23d96eb
@weierophinney
Member

Much better -- thanks @fabicz !

@weierophinney weierophinney added a commit to zendframework/zend-inputfilter that referenced this pull request May 15, 2015
@weierophinney weierophinney Merge branch 'hotfix/2673' 442a604
@weierophinney weierophinney added a commit to zendframework/zend-inputfilter that referenced this pull request May 15, 2015
@weierophinney weierophinney Merge branch 'hotfix/2673' into develop e951b83
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment