Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Improve cookbook form unit testing#6203

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Closed
cn0047 wants to merge6 commits intosymfony:masterfromcn0047:improve_cookbook_form_unit_testing
Closed

Improve cookbook form unit testing#6203

cn0047 wants to merge6 commits intosymfony:masterfromcn0047:improve_cookbook_form_unit_testing

Conversation

@cn0047
Copy link
Contributor

QA
Doc fix?yes
New docs?no
Applies toall
Fixed tickets

I tweak this example from cookbook, and receive error:

Symfony\Component\Form\Exception\UnexpectedTypeException: Expected argument of type "string", "AppBundle\Form\CategoryType" given

and i just fix it like in this pr - and all become ok.

@javiereguiluz
Copy link
Member

@cn007b thanks for sending this improvement.

Sadly, there was some error with the pull request and it contains some commits that don't belong to this fix. But don't worry, this happens some times (it has happened to me lots of times). Besides, it's possible to fix it without creating a new pull request.

To fix it, execute these commands:

$ git rebase -i HEAD~7(now delete the lines that correspond to the commits that don'tbelong to this fix ... all except one)(save changes)$ git push -f

The-f in the last command means "force" and it's needed when doing this rebase. If you need any help, just ask.

@cn0047
Copy link
ContributorAuthor

First of all thanks for help!)
And i've done all commands...

@javiereguiluz
Copy link
Member

@cn007b thanks! It seems that the error persist. Let's see if@wouterj or@xabbuh can tell us the right solution for this issue.

@wouterj
Copy link
Member

Either trygit rebase --onto origin/master origin/2.3 (where 2.3 is the original base of this PR, change it to your base, probably 2.3, 2.7 or 2.8).

Or bruteforce things by doing this:

# create a temporary branch from the current branch of this PR$ git checkout -b temp-6203# delete the original branch of the PR$ git branch -D improve_cookbook_form_unit_testing# checkout master and create the PR branch from master$ git checkout master$ git checkout -b improve_cookbook_form_unit_testing# cherry-pick the commit$ git cherry-pick 63d751b# remove the temp branch$ git branch -D temp-6203# push branch to github$ git push -f

@xabbuh
Copy link
Member

closing in favour of#6210

@xabbuhxabbuh closed thisFeb 1, 2016
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@cn0047@javiereguiluz@wouterj@xabbuh@kix@raulconti

[8]ページ先頭

©2009-2025 Movatter.jp