Skip to content
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

[2.2][Propel1] re-factor Propel1 ModelChoiceList #9469

Merged
merged 1 commit into from
Nov 14, 2013

Conversation

havvg
Copy link
Contributor

@havvg havvg commented Nov 8, 2013

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets fixes propelorm/Propel#789
License MIT

replaces #9458

@havvg
Copy link
Contributor Author

havvg commented Nov 8, 2013

The tests pass on my local machine.

 symfony2 git:2.2 ✗ ≠ vendor/bin/phpunit src/Symfony/Bridge/Propel1/                     ~/Web Development/symfony2
PHPUnit 3.8-gc1fe4b7 by Sebastian Bergmann.

Configuration read from /Users/havvg/Web Development/symfony2/phpunit.xml.dist

................................................................. 65 / 67 ( 97%)
..

Time: 412 ms, Memory: 10.75Mb

OK (67 tests, 130 assertions)

use Symfony\Bridge\Propel1\Tests\Fixtures\ReadOnlyItem;
use Symfony\Bridge\Propel1\Tests\Propel1TestCase;

Copy link
Member

Choose a reason for hiding this comment

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

Please remove the extra empty lines

* add BaseModelChoiceListTest ensuring compatibility
* fix keys and order are preserved
* fix lazy-load to use filters of initial query
@auss
Copy link

auss commented Nov 14, 2013

👍 it fixes the issue with many to many form types on symfony 2.3.7

fabpot added a commit that referenced this pull request Nov 14, 2013
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2][Propel1] re-factor Propel1 ModelChoiceList

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | fixes propelorm/Propel#789
| License       | MIT

replaces #9458

Commits
-------

613b5f6 re-factor Propel1 ModelChoiceList
@fabpot fabpot merged commit 613b5f6 into symfony:2.2 Nov 14, 2013
fabpot added a commit that referenced this pull request Nov 16, 2013
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2] Fixed ModelChoiceList tests in Propel1 bridge

Tests on 2.2 are broken since #9469 was merged.

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

Commits
-------

1e2d14e Fixed ModelChoiceList tests in Propel1 bridge.
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.

None yet

4 participants