Skip to content

add format to Min Constraint and some minor unification of dots and quotes #2213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1,055 commits into from

Conversation

ricardclau
Copy link
Contributor

Q A
Doc fix? yes
New docs? no
Applies to all
Fixed tickets #2042 (partially)

Following @wouterj initiative at #2042 I think this is the only constraint that was missing formats. Also, small unification in terms of quotes and dots at the end.

weaverryan and others added 30 commits November 26, 2012 09:47
Conflicts:
	reference/forms/types/collection.rst
	reference/twig_reference.rst
Document the mapped form type option
Added note about Service Container parameters inside routes
DataEvent is deprecated since 2.1, to be removed in 2.3.
Changing the getVar method to get (only valid for 2.1)
Conflicts:
	book/controller.rst
	book/forms.rst
	cookbook/map.rst.inc
Remove reference to deprecated DataEvent and FilterDataEvent
Typo in documentation that would cause an exception. setContent can not accept array. Assuming documentation meant setData.
Update components/http_foundation/introduction.rst
weaverryan and others added 18 commits January 27, 2013 11:40
Update reference/constraints/Callback.rst (dont use deprecated method)
[DI] PrependExtensionInterface sync doc with latest Sf2 changes
sf2.2 note: _method override disabled by default
Conflicts:
	book/installation.rst
Conflicts:
	cookbook/security/entity_provider.rst
@wouterj
Copy link
Member

wouterj commented Feb 5, 2013

@ricardclaue, I am really sorry for this, but I already added these formats in a PR (I have cherry pick them in another PR to make it more organized: #2214). The interpuction fixes are good though!

@ricardclau
Copy link
Contributor Author

oh sorry :) my fault for not looking at all PR, closing it then!

@ricardclau ricardclau closed this Feb 5, 2013
@ricardclau
Copy link
Contributor Author

Oh sorry! Maybe I should not have closed because of the interpuction issues.
How should I deal with them? Will you do it in your branch?

@wouterj
Copy link
Member

wouterj commented Feb 5, 2013

@ricarclaue, you can just reopen this PR. Then you go to your local repo and break this commit up into 2 pieces: One commit containing the interpuction fixes and one containing the added formats (in that order). You can read how to do this on stackoverflow. Then you run:

$ git reset --hard HEAD^1

This will delete the last commit (which is the commit where you added the formats). So you now have only one commit for the interpuction issues, then do a forced push to github:

$ git push --force origin NAME_OF_YOUR_BRANCH

This should do the trick.

You have used the 2.0 branch for this PR. The best practise is to create a new branch for each PR:

$ git checkout -b add_min_formats

@ricardclau
Copy link
Contributor Author

Sorry about using 2.0 directly.

I'll split the commit and redo the PR with just the interpuction (although it is really minor)

Let's check my GIT skills with your stackoverflow link and comments!

@ricardclau ricardclau reopened this Feb 5, 2013
@ricardclau
Copy link
Contributor Author

Wow! I clearly screwed up! Let's close this and start all over :)

@ricardclau ricardclau closed this Feb 5, 2013
@wouterj
Copy link
Member

wouterj commented Feb 5, 2013

@ricardclau, this is not your fault. GitHub don't like these tricks and can get really confused, resulting in PRs like this :)

@ricardclau
Copy link
Contributor Author

:) no problem, let's start all over!

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

Successfully merging this pull request may close these issues.