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

Appearance settings

[2.7] [DoctrineBridge] [Form] fix choice_value in EntityType #17694

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

Merged
merged 1 commit into from
Feb 15, 2016

Conversation

HeahDude
Copy link
Contributor

@HeahDude HeahDude commented Feb 4, 2016

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #17693, #17271, #13964
License MIT
Doc PR symfony/symfony-docs#6260

@HeahDude
Copy link
Contributor Author

HeahDude commented Feb 4, 2016

Before :

Time: 10.1 seconds, Memory: 65.50Mb

There was 1 failure:

1) Symfony\Bridge\Doctrine\Tests\Form\Type\EntityTypeTest::testOverrideChoicesValues
Field should be synchronized.
Failed asserting that false is true.

/Users/Heah/Sites/dev/symfony/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php:761

FAILURES!
Tests: 431, Assertions: 625, Failures: 1, Skipped: 11.

Legacy deprecation notices (212)
KO ./src/Symfony/Bridge/Doctrine

After :

Time: 8.92 seconds, Memory: 65.25Mb

OK, but incomplete, skipped, or risky tests!
Tests: 431, Assertions: 627, Skipped: 11.

Legacy deprecation notices (212)
OK ./src/Symfony/Bridge/Doctrine

@nicolas-grekas
Copy link
Member

Please revert the indentation changes...

@HeahDude
Copy link
Contributor Author

HeahDude commented Feb 4, 2016

@nicolas-grekas oupssss

@HeahDude
Copy link
Contributor Author

HeahDude commented Feb 4, 2016

Done
Status: Needs Review

@webmozart
Copy link
Contributor

Thanks for that PR! Looks good to me.

Status: reviewed

@HeahDude
Copy link
Contributor Author

HeahDude commented Feb 5, 2016

thanks @webmozart, just added #13964 as fixed though.

@HeahDude
Copy link
Contributor Author

HeahDude commented Feb 5, 2016

@fabpot @webmozart. Tests in 2.8 need renaming entity to Symfony\Bridge\Doctrine\Form\Type\EntityType, should I make a PR on 2.8 to update only this once 2.7 is merged in 2.8 or do another version of this one right now for the greater branches ?

Also I suggest to use a constant for the fqnc of EntityType in EntityTypeTest as for the fixtures.

@webmozart
Copy link
Contributor

@HeahDude I would create a separate PR and rebase this one once that is merged.

@HeahDude HeahDude changed the title [2.7] [Form] fix choice_value in EntityType [2.7] [DoctrineBridge] [Form] fix choice_value in EntityType Feb 5, 2016
@HeahDude
Copy link
Contributor Author

Updated description with link to the doc PR and tests are ready for 2.8 with #17699.

ping @symfony/deciders

xabbuh added a commit to symfony/symfony-docs that referenced this pull request Feb 12, 2016
…oice_attr` to `EntityType` (HeahDude)

This PR was merged into the 2.7 branch.

Discussion
----------

add missing options `choice_value`, `choice_name` and `choice_attr` to `EntityType`

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no (& yes symfony/symfony#17694)
| Applies to    | 2.7+
| Fixed tickets | #6259

Commits
-------

9785f08 add missing options `choice_value`, `choice_name` and `choice_attr` to `EntityType`
@xabbuh
Copy link
Member

xabbuh commented Feb 15, 2016

👍

@fabpot
Copy link
Member

fabpot commented Feb 15, 2016

Thank you @HeahDude.

@fabpot fabpot merged commit 2336d5c into symfony:2.7 Feb 15, 2016
fabpot added a commit that referenced this pull request Feb 15, 2016
…pe (HeahDude)

This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [DoctrineBridge] [Form] fix choice_value in EntityType

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17693, #17271, #13964
| License       | MIT
| Doc PR        | symfony/symfony-docs#6260

Commits
-------

2336d5c fix choice_value option in EntityType and add some tests
@HeahDude
Copy link
Contributor Author

thanks @fabpot, don't forget to ping me in #17699 for the rebase, when this one gets merged in 2.8 :)

@HeahDude HeahDude deleted the fix-#17693 branch February 15, 2016 08:18
HeahDude added a commit to HeahDude/symfony that referenced this pull request Feb 15, 2016
fabpot added a commit that referenced this pull request Feb 15, 2016
…h FQCN (HeahDude)

This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] [DoctrineBridge] fix tests added in EntityType with FQCN

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | needs #17694
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

- [x] Wait for #17694 to be merged in 2.8

Commits
-------

beb70d9 fix FQCN in tests added by #17694
fabpot added a commit that referenced this pull request Feb 16, 2016
* 2.8:
  [DependencyInjection] fix dumped YAML snytax
  Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called in InputOption::VALUE_NONE mode. In practice the $default value could still be accessed in InputOption::VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method
  [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path
  fix FQCN in tests added by #17694
  Fix locale and written standard inconsistencies for Norwegian translations
  [Form] [Validator] Fix locale inconsistencies in Norwegian translations
  [TwigBridge] Symfony 3.1 forward compatibility
  fixed CS
  [DependencyInjection] fixed exceptions thrown by get method of ContainerBuilder
  [Yaml] properly parse lists in object maps
  [FrameworkBundle] Remove unused private method.
  [Form] remove useless code in ResizeFormListener
  [Config] Fix EnumNodeDefinition to allow building enum nodes with one element
  fix choice_value option in EntityType and add some tests
xabbuh added a commit that referenced this pull request Feb 16, 2016
* 3.0:
  [DependencyInjection] fix dumped YAML snytax
  Remove InputOption::VALUE_REQUIRED mode from $default parameter description as InputOption::setDefault() throws an exception only when called in InputOption::VALUE_NONE mode. In practice the $default value could still be accessed in InputOption::VALUE_REQUIRED mode in case InputOption was never set but accessed from InputDefinition::getOption() method
  [Yaml] always restore the error handler in tests
  [FrameworkBundle] fix YAML syntax
  fix YAML syntax in functional tests config
  [HttpFoundation] [Session] Removed unnecessary PHP version check as minimum requirement is now 5.5.9
  [Form] Fixed violation mapping if multiple forms are using the same (or part of the same) property path
  fix FQCN in tests added by #17694
  Fix locale and written standard inconsistencies for Norwegian translations
  [Form] [Validator] Fix locale inconsistencies in Norwegian translations
  [TwigBridge] Symfony 3.1 forward compatibility
  fixed CS
  [DependencyInjection] fixed exceptions thrown by get method of ContainerBuilder
  [Yaml] properly parse lists in object maps
  [FrameworkBundle] Remove unused private method.
  [Form] remove useless code in ResizeFormListener
  [Config] Fix EnumNodeDefinition to allow building enum nodes with one element
  [Form] remove deprecated empty_value_in_choices
  fix choice_value option in EntityType and add some tests
This was referenced Feb 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants
Morty Proxy This is a proxified and sanitized view of the page, visit original site.