…efault in the ConsoleFormatter (Seldaek)This PR was merged into the 2.6-dev branch.Discussion----------[MonologBridge] Ignore empty context/extra by default in the ConsoleFormatter| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets || License       | MIT| Doc PR        |This adds support forSeldaek/monolog#388 and turns it on by default since the console output is arguably meant for humans and not for machine readable stuff it makes sense I believe. /cc@Tobion**Note:** This depends on an unreleased version of monolog and should not be merged until 1.11 is out.Commits-------9b69f56 [MonologBridge] Ignore empty context/extra by default in the ConsoleFormatter

This PR was merged into the 2.6-dev branch.Discussion----------[HttpKernel] fix composer.json| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets | -| License       | MIT| Doc PR        | -This fixes the composer.json of HttpKernelCommits-------7bb768d [HttpKernel] fix composer.json

… of a constraint violation (webmozart)This PR was merged into the 2.6-dev branch.Discussion----------[Validator] Made it possible to store the cause of a constraint violation| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | yes| Deprecations? | no| Tests pass?   | yes| Fixed tickets | -| License       | MIT| Doc PR        | TODOThis change makes it possible to store the cause of a violation (e.g. an exception). This way it is possible to follow the trace of violations caused by exceptions up to their root.```phptry {    // ...} catch (Exception $e) {    $this->context->buildViolation('Error!')        ->setCause($e)        ->addViolation();}```This is one step to solvesymfony#5607. Seesymfony#12054.Commits-------499eeb4 [Validator] Made it possible to store the cause of a constraint violation

…d in the profiler (webmozart)This PR was merged into the 2.6-dev branch.Discussion----------[Form] The trace of form errors is now displayed in the profiler| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | yes| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#5607| License       | MIT| Doc PR        | -This is a follow-up PR forsymfony#12052. With this change, the full trace of form errors is now displayed in the web debugger:![error](https://cloud.githubusercontent.com/assets/176399/4419637/85facd14-456d-11e4-8c70-0e8802a586ec.png)If a violation was caused by a TransformationFailedException, the exception is now accessible through the `getCause()` method of the violation. Additionally, you can access `Form::getTransformationFailure()` to retrieve the exception.Commits-------8dbe258 [Form] The trace of form errors is now displayed in the profiler

…causes

…s with multiple error causes (webmozart)This PR was merged into the 2.6-dev branch.Discussion----------[Validator] Added error codes to all constraints with multiple error causes| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#7276| License       | MIT| Doc PR        | TODOThis PR depends onsymfony#12015 andsymfony#12016 being merged first. However, a few changes in52cb7df first must be backported tosymfony#12016.This PR introduces error codes for all constraints with multiple error paths. This lets you determine what exactly the reason was that a constraint failed:```php$validator = Validation::createValidator();$violations = $validator->validate('0-4X19-92619812', new Isbn());foreach ($violations as $violation) {    var_dump($violation->getCode());    // => int(3)    var_dump(Isbn::getErrorName($violation->getCode()));    // => string(24) "ERROR_INVALID_CHARACTERS"    var_dump($violation->getConstraint()->getErrorName($violation->getCode()));    // => string(24) "ERROR_INVALID_CHARACTERS"}```The `getErrorName()` method is especially helpful for REST APIs, where you can return both an error code and a description of that error now.**Todos**- [x] Backport a few structural changes tosymfony#12016- [x] Update constraints outside of the Validator component- [x] Rebase on master (after mergingsymfony#12015 andsymfony#12016)Commits-------3b50bf2 [Validator] Added error codes to all constraints with multiple error causes

This PR was merged into the 2.6-dev branch.Discussion----------[Form] Added "label_format" option| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#11456| License       | MIT| Doc PR        | TODOThis PR replacessymfony#11456. It adds a "label_format" option which allows to configure a format for generating labels. Two placeholders are available: `%name%` and `%id%`.**Feedback wanted**: Should we change the placeholders to `{{ name }}` and `{{ id }}`?The option is inherited from the parent form if not set explicitly on a field:```php$form = $this->createForm('myform', $data, array('label_format' => 'form.label.%id%'));```Follow-up PR: Make the default label format and translation domain configurable in config.yml.Commits-------aad442d [Form] Added "label_format" option

* 2.5:  [Doc] Use Markdown syntax highlighting  [Finder] tweaked docs  [Finder] Add info about possibilities offered by SplFileInfo  fixed CS  [Security][Http][Authentication] Make a test pass on HHVM  fix components tests  [Intl] FIxed failing test  [Intl] Generated the data for ICU version 54-rc  [EventDispatcher] fix doc bloc on EventDispatcherInterface  [Validator] Update validators.zh_CN.xlf, fix translation error  bumped Symfony version to 2.5.6  updated VERSION for 2.5.5  updated CHANGELOG for 2.5.5  bumped Symfony version to 2.3.21  updated VERSION for 2.3.20  update CONTRIBUTORS for 2.3.20  updated CHANGELOG for 2.3.20  [Intl] Integrated ICU data into Intl componentConflicts:src/Symfony/Component/Debug/README.mdsrc/Symfony/Component/DependencyInjection/README.mdsrc/Symfony/Component/HttpKernel/Kernel.phpsrc/Symfony/Component/OptionsResolver/README.md

… exacly the name argument| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#11303| License       | MIT| Doc PR        |If we launch the command "container:debug log" and there is noservice nammed log, it will print something like this :```[0] logger[1] monolog.handler.console[2] monolog.handler.debug```After the service has been chosen, usual container:debug informationsare displayed.

This PR was merged into the 2.6-dev branch.Discussion----------[Debug] expose object_handle| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets | -| License       | MIT| Doc PR        | -This is a small enhancement to the symfony debug C extension that allows fetching an object's handle.This is the `#number` as displayed by var_dump():`class stdClass**#1** (0) {}`This is required for VarDumper to be able to expose objects' handles and thus have more precise dumps.It will allow inspecting "same" relationships between two *different* dumps.Commits-------5f6b676 [Debug] expose object_handle

…es if no service match exacly the name argument (agallou)This PR was merged into the 2.6-dev branch.Discussion----------[FrameworkBundle] container:debug : list services if no service match exacly the name argument| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#11303| License       | MIT| Doc PR        |If we launch the command "container:debug log" and there is noservice nammed log, it will print something like this :```[0] logger[1] monolog.handler.console[2] monolog.handler.debug```After the service has been chosen, usual container:debug informationsare displayed.Commits-------16201b6 [FrameworkBundle] container:debug : list services if no service match exacly the name argument

…ion)This PR was merged into the 2.6-dev branch.Discussion----------[HttpFoundation] enhance PdoSessionHandler| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | yes| BC breaks?    | yes| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#5483,symfony#2067,symfony#2382,symfony#9029| License       | MIT0. [x] Continuation of locking implementation (symfony#10908): Implement different locking strategies  - `PdoSessionHandler::LOCK_TRANSACTIONAL` (default): Issues a real row lock but requires a transaction  - `PdoSessionHandler::LOCK_ADVISORY`: app-level lock, safe as long as only the PdoSessionHandler accesses sessions, advantage is it does not require a transaction (not implemented for oracle or sqlsrv yet)  - `PdoSessionHandler::LOCK_NONE`: basically what is was before, prone to race conditions, means the last session write wins1. [x] Save session data as binary: Encoding session data was definitely the wrong solution. Session data is binary text (esp. when using other session.serialize_handler) that must stay as-is and thus must also be safed in a binary column. Base64 encoding session data just decreses performance and increases storage costs and is semantically wrong because it does not have a character encoding.That saving null bytes in Posgres won't work on a character column is also documented    > First, binary strings specifically allow storing octets of value zero and other "non-printable" octets (usually, octets outside the range 32 to 126). Character strings disallow zero octets, and also disallow any other octet values and sequences of octet values that are invalid according to the database's selected character set encoding.http://www.postgresql.org/docs/9.1/static/datatype-binary.html#DATATYPE-BINARY-TABLE2. [x] Implement lazy connections that are only opened when session is used by either passing a dsn string explicitly or falling back to session.save_path ini setting.Fixessymfony#90293. [x] add a create table method that creates the correct table depending on database vendor. This makes the class self-documenting and standalone useable.5. [x] add lifetime column to session table which allows to have different lifetimes for each session6. [x] add isSessionExpired() method to be able to distinguish between a new session and one that expired due to inactivity, e.g. to display flash message to user7. [x] added upgrade and changelog notesCommits-------1bc6680 [HttpFoundation] implement different locking strategies for sessions6f5748e adjust sqlite table definition5978fcf added upgrade and changelog notes for PdoSessionHandler182a5d3 [HttpFoundation] add create table method to pdo session handlere79229d [HttpFoundation] allow different lifetime per sessionaf1bb1f add test for null byte in session data251238d [HttpFoundation] implement lazy connect for pdo session handler7dad54c [HttpFoundation] remove base64 encoding of session data

This PR was merged into the 2.6-dev branch.Discussion----------[DependencyInjection] Tweaked factories| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#12008| License       | MIT| Doc PR        | n/aThere are some issues with new service factories: * `ContainerBuilder` cannot instantiate service from factory (i.e. currently it works for dumped code only) * Dumped code sometimes is invalid (anonymous services as factories, factories without arguments)Commits-------ee82392 [DependencyInjection] Tweaked factories

…nglas)This PR was merged into the 2.6-dev branch.Discussion----------minor [Serializer] Fix CS. Uniformize PHPDoc.| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| License       | MITCommits-------5be84c4 [Serializer] Fix CS. Uniformize PHPDoc.

…nicolas-grekas)This PR was merged into the 2.6-dev branch.Discussion----------[FrameworkBundle] enable ErrorHandler in prod| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#11053,symfony#8281| License       | MIT| Doc PR        | --  a new debug.error_handler service is the registered PHP error handler, with ErrorHandler::register() as factory- ErrorHandler::register() is patched so that it checks if the currently registered error handler is an instance of ErrorHandler - in which case it returns this instance and don't create a new one.- DebugHandlersListener now listen to ConsoleEvents and re-injects fatal errors within the $app->renderException code path- DebugHandlersListener also has a new $scream parameter to control is silenced errors are logged or notCommits-------fac3cc4 [FrameworkBundle] register ErrorHandler at boot time4acf5d3 [Debug] make screaming configurable4d0ab7d [FrameworkBundle] enable ErrorHandler in prod

This PR was merged into the 2.6-dev branch.Discussion----------[VarDumper] Improved dump in html| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |http://www.w3.org/TR/html5/dom.html#the-id-attribute| License       | MIT| Doc PR        | -Commits-------f214eda [VarDumper] Added unique id for every single dump in html

…in toolbar (hason)This PR was merged into the 2.6-dev branch.Discussion----------[WebProfileBundle], [DebugBundle] Fixed big data in toolbar| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | yes| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets | -| License       | MIT| Doc PR        | -| Before | After| --------- | -------| ![prev-01](https://cloud.githubusercontent.com/assets/288535/4505427/72bd9d08-4af4-11e4-9aed-be4f868c3dfd.png) | ![post-01](https://cloud.githubusercontent.com/assets/288535/4505432/82583746-4af4-11e4-8052-658d4853cfb4.png)| ![prev-02](https://cloud.githubusercontent.com/assets/288535/4505426/72bd9bb4-4af4-11e4-88ad-1949b6201684.png) | ![post-02](https://cloud.githubusercontent.com/assets/288535/4505431/824fb85a-4af4-11e4-88f5-5e01f907c580.png)Commits-------febe836 [DebugBundle] Removed unnecessary div in toolbar513d2d3 [WebProfilerBundle] Showed all ajax calls in toolbar

Fixed typo in PHPDoc

…althaus)This PR was merged into the 2.6 branch.Discussion----------[Security] Fixed typo in SecurityContext PHPDocFixes a simple typo.Commits-------8d7581a Fixed typo in SecurityContext PHPDoc

Modify the expected line value which was affected by the move of the`__LINE__` constant insymfony#12872 to make tests pass again.

``label_attr`` in ``checkbox_radio_label`` is missing a space with ``parent_label_class``

…to add expression providers)

This PR was merged into the 2.6 branch.Discussion----------Fix missing space in label_attr| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets | -| License       | MIT| Doc PR        | -``label_attr`` in ``checkbox_radio_label`` is missing a space with ``parent_label_class``Commits-------90b3f3b Fix missing space in label_attr

This PR was merged into the 2.6 branch.Discussion----------[TwigBundle] avoid risky tests| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#12646| License       | MIT| Doc PR        |Commits-------e7b0b89 avoid risky tests

…et (1ed)This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closessymfony#12899).Discussion----------[WebProfiler] Tweaked ajax requests toolbar css reset| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#12139 (not sure)| License       | MIT| Doc PR        | -Before:![screenshot from 2014-12-08 14 52 42](https://cloud.githubusercontent.com/assets/162986/5340221/7b3f1716-7eea-11e4-81c7-f46768736289.png)After:![screenshot from 2014-12-08 15 14 35](https://cloud.githubusercontent.com/assets/162986/5340443/fbfb3d1a-7eec-11e4-8960-9990937a49a1.png)Commits-------16a51e7 [WebProfiler] Tweaked ajax requests toolbar css reset

…rekas)This PR was merged into the 2.6 branch.Discussion----------[2.6] Remove possible call_user_func()| Q             | A| ------------- | ---| Bug fix?      | no| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets | -| License       | MIT| Doc PR        | -Remove possible call_user_func() introduced in 2.6Commits-------1de4920 [2.6] Remove possible call_user_func()

…ionLanguageProvider (Luca Genuzio)This PR was merged into the 2.6 branch.Discussion----------[2.6] [Security] Fixed ExpressionVoter - addExpressionLanguageProvider| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | ---| Fixed tickets | ---| License       | MIT| Doc PR        | ---Fix missing addExpressionLanguageProvider in [ExpressionVoter](https://github.com/symfony/symfony/blob/2.6/src/Symfony/Component/Security/Core/Authorization/Voter/ExpressionVoter.php), used by [AddExpressionLanguageProvidersPass](https://github.com/symfony/symfony/blob/2.6/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddExpressionLanguageProvidersPass.php) to add expression providers.Commits-------6c70bc5 Fix missing addExpressionLanguageProvider (used by service container to add expression providers)

…hanges (xabbuh)This PR was merged into the 2.6 branch.Discussion----------[HttpKernel] fix DumpDataCollectorTest after CS changes| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets || License       | MIT| Doc PR        |Modify the expected line value which was affected by the move of the`__LINE__` constant insymfony#12872 to make tests pass again.Commits-------1917b70 fix DumpDataCollectorTest after CS changes

* 2.5:  [Form] fixed a maxlength overring on a guessing  [Debug] Show only unique class candidates  [SecurityBundle] Firewall providers building - code cleaning  [Filesystem] symlink use RealPath instead LinkTarget  [DependencyInjection] Remove duplicate  declaration in PhpDumper  terminals are not interactive on Travis  Revert "[DependencyInjection] backport perf optim"  [WebProfilerBundle] replaced pattern to path attribute in routes definitions.  fix phpdoc's alignment  Fixed the AuthenticationProviderInterface alignment  Fixed the proxy-manager version constraint  [FrameworkBundle][Template name] avoid  error message for the shortcut notation.  [DependencyInjection] perf optim: call dirname() at most 5x  [DependencyInjection] backport perf optimFixedsymfony#12845 adding a listener to an event that is currently being dispatched will not result into a fatal error in TraceableEventDispatcher [EventDispatcher]  [2.5] Remove possible call_user_func()  [2.3] Remove possible call_user_func()Conflicts:src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.phpsrc/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.phpsrc/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.phpsrc/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.phpsrc/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services12.phpsrc/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.phpsrc/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php

…ng __invoke on a controller (thewilkybarkid)This PR was merged into the 2.6 branch.Discussion----------[WebProfilerBundle] Avoid missing method when using __invoke on a controller| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets || License       | MIT| Doc PR        |2.6 added support for using `__invoke` on controllers, but the profiler toolbar still expects a method name, leading to:![image](https://cloud.githubusercontent.com/assets/1784740/5412993/4553c4da-820a-11e4-899c-50ef9f330cdd.png)This PR changes it to only include the method section/double dots if the method name is included (and the `link` is moved to the class name).Commits-------fb87558 Avoid missing method when using __invoke

* 2.5:  remove short array syntax  fix session restart on PHP 5.3

* 2.5:  Fix failing tests after merge  fix ocramius/proxy-manager dependency version

This PR was merged into the 2.6 branch.Discussion----------[WebProfilerBundle] Fix placeholder date format| Q             | A| ------------- | ---| Bug fix?      | yes| New feature?  | no| BC breaks?    | no| Deprecations? | no| Tests pass?   | yes| Fixed tickets |symfony#12995| License       | MIT| Doc PR        | -Commits-------9a44aa8 Fix placeholder date format

* symfony/2.5:  Test lowest versions of dependencies  Test components using their lowest possible depsConflicts:src/Symfony/Bridge/Twig/composer.jsonsrc/Symfony/Bundle/FrameworkBundle/composer.jsonsrc/Symfony/Bundle/SecurityBundle/composer.jsonsrc/Symfony/Component/EventDispatcher/composer.jsonsrc/Symfony/Component/HttpKernel/composer.jsonsrc/Symfony/Component/Security/composer.json