fixed a circular reference (closes #6730)
merged branch fabpot/circular-reference-fix (PR #6850)

This PR was merged into the master branch.

Commits
-------

65b4112 fixed a circular reference (closes #6730)

Discussion
----------

fixed a circular reference (closes #6730)

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

---------------------------------------------------------------------------

by stof at 2013-01-23T13:56:19Z

shoudln't this be moved to the component ? Someone using the TwigBridge, HttpKernel and the DI component outside the full stack framework (let's say Drupal maybe) would also face the circular reference issue

---------------------------------------------------------------------------

by fabpot at 2013-01-23T13:58:28Z

No, they won't as the problem is only if you are using the templating component. So, Silex or Drupal won't have the problem.

---------------------------------------------------------------------------

by stof at 2013-01-23T14:01:03Z

ah, the issue is indeed with the TwigEngine, not with the Twig_Environment service.
[DIC] Move PrependExtensionInterface to the Extension namespace
merged branch vicb/di/prepext (PR #6853)

This PR was merged into the master branch.

Commits
-------

7944860 [DIC] Move PrependExtensionInterface to the Extension namespace

Discussion
----------

[DIC] Move PrependExtensionInterface to the Extension namespace

@fabpot Please merge before 2.2 (no BC break) /cc @lsmith77
Fix for hardcode (#6384) in choice widget
merged branch MaksSlesarenko/fix-for-choice-widget (PR #6734)

This PR was squashed before being merged into the master branch (closes #6734).

Commits
-------

4d51ec0 Fix for hardcode (#6384) in choice widget

Discussion
----------

Fix for hardcode (#6384) in choice widget

empty_value should not be disabled if field is not required!

#6384

---------------------------------------------------------------------------

by sstok at 2013-01-15T15:51:08Z

You need to revert the file mode changes (100644 → 100755)

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-18T16:44:42Z

fixed tests

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-21T15:36:59Z

ping @fabpot

---------------------------------------------------------------------------

by fabpot at 2013-01-21T15:58:26Z

ping @bschussek

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-23T11:15:37Z

ping @fabpot @bschussek

---------------------------------------------------------------------------

by Tobion at 2013-01-23T12:08:19Z

I think it's good to squash and merge.

---------------------------------------------------------------------------

by fabpot at 2013-01-23T12:16:37Z

Can you rebase and squash before I merge? Thanks.

---------------------------------------------------------------------------

by MaksSlesarenko at 2013-01-23T19:51:36Z

@fabpot done