bumped Symfony version to 2.0.19-DEV
bumped Symfony version to 2.1.5-DEV
merged branch Tobion/patch-1 (PR #6164)

This PR was merged into the 2.0 branch.

Commits
-------

d5623b4 removed unused attribute from routing.xsd

Discussion
----------

removed unused attribute from routing.xsd
merged branch Tobion/patch-2 (PR #6166)

This PR was merged into the 2.0 branch.

Commits
-------

57edf56 removed wrong routing xsd statement `mixed="true"`

Discussion
----------

removed wrong routing xsd statement `mixed="true"`

mixed="true" means that the element could contain both text and other elements, e.g.
`<requirement key="_locale">text <subelement /></requirement>`
But this wrong and such a definition would not even validate against the scheme as the xsd does not define which elements would be expected inside.
needs to use simpleContent in xsd to allow empty elements
Fixed form validation

Swapped arguments $groups and $subPath in ExecutionContext::validate and ExecutionContext::validateValue, so they match their interface signatures again.
merged branch Tobion/patch-4 (PR #6175)

This PR was merged into the 2.0 branch.

Commits
-------

eec7885 needs to use simpleContent in xsd to allow empty elements

Discussion
----------

needs to use simpleContent in xsd to allow empty elements
merged branch jankramer/fix-form-validation (PR #6168)

This PR was merged into the master branch.

Commits
-------

109bb7b Fixed form validation

Discussion
----------

[Validator] Fixed form validation

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #6118
License of the code: MIT

Swapped arguments $groups and $subPath in ExecutionContext::validate so it matches its interface again. Should fix #6118

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

by bschussek at 2012-12-03T12:28:42Z

Could you please implement the same change for validateValue() and squash the commits?

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

by jankramer at 2012-12-03T12:40:41Z

@bschussek: done

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

by bschussek at 2012-12-03T12:59:16Z

Thanks.

@fabpot :+1:
fix phpdoc in ExecutionContextInterface
[TwigBundle] Moved the registration of the app global to the environment

This makes the app global variable available also when accessing the Twig
environment directly instead of using the TwigEngine.

Conflicts:
	src/Symfony/Bridge/Twig/CHANGELOG.md
	src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
	src/Symfony/Bundle/TwigBundle/TwigEngine.php
Merge branch '2.0' into 2.1

* 2.0:
  [TwigBundle] Moved the registration of the app global to the environment
  needs to use simpleContent in xsd to allow empty elements
  bumped Symfony version to 2.0.19-DEV
  removed wrong routing xsd statement `mixed="true"`
  removed unused attribute from routing.xsd
  updated VERSION for 2.0.19
  update CONTRIBUTORS for 2.0.19
  updated CHANGELOG for 2.0.19

Conflicts:
	CONTRIBUTORS.md
	src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
	src/Symfony/Bundle/TwigBundle/TwigEngine.php
	src/Symfony/Component/HttpKernel/Kernel.php
Merge branch '2.1'

* 2.1:
  [TwigBundle] Moved the registration of the app global to the environment
  needs to use simpleContent in xsd to allow empty elements
  bumped Symfony version to 2.1.5-DEV
  bumped Symfony version to 2.0.19-DEV
  removed wrong routing xsd statement `mixed="true"`
  removed unused attribute from routing.xsd
  [HttpFoundation] added a small comment about the meaning of Request::hasSession() as this is a recurrent question (refs #4541)
  updated VERSION for 2.1.4
  updated CHANGELOG for 2.1.4
  updated VERSION for 2.0.19
  update CONTRIBUTORS for 2.0.19
  updated CHANGELOG for 2.0.19

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
fixed previous merge
Fix namespace of Validator and BrowserKit Tests
merged branch franmomu/fix_validator_test_namespace (PR #6177)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #6177).

Commits
-------

964074a Fix namespace of Validator and BrowserKit Tests

Discussion
----------

Fix namespace of Validator and BrowserKit Tests

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Todo: -
License of the code: MIT
made ExecutionContext more consistent
trigger errors for deprecated methods in HttpFoundation component
Handle errors using a custom error handler

Without the custom handler, assertions after the first failure wouldn't be executed. This catches E_USER_DEPRECATED errors and passes everything else on to the phpunit error handler.
return value of handleError
merged branch Tobion/getPropertyPath (PR #6178)

This PR was merged into the master branch.

Commits
-------

3d0c70e made ExecutionContext more consistent

Discussion
----------

[Validator] made ExecutionContext more consistent

BC break: no

The default should be an empty string instead of null because
1. a string is expected according to phpdoc
2. its more consistent with `validate($value, $groups = null, $subPath = '', $traverse = false, $deep = false)` and `validateValue($value, $constraints, $groups = null, $subPath = '')` that both have `''` as default for subPath

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

by bschussek at 2012-12-03T21:14:49Z

:+1: