Commit Graph

20691 Commits

Author SHA1 Message Date
Ivan Kurnosov
ea8da6e091 StringUtils::equals() arguments in RememberMe Cookie based implementation are confused
It must be the other way around
2015-03-25 09:38:46 +01:00
Dariusz Ruminski
063ae13fde CS: general fixes 2015-03-25 00:47:08 +01:00
Tobias Schultze
78b1a6803a fix typo 2015-03-24 18:40:46 +01:00
Fabien Potencier
9fe9832049 Merge branch '2.7'
* 2.7: (55 commits)
  CS: fix some license headers
  CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
  Improve triggering of the deprecation error
  [SecurityBundle] Fix typos in LogoutUrlHelper
  [VarDumper] add caster for MongoCursor objects
  make it possible to dump inlined services to XML
  [VarDumper] Fixed notice when Exchange is mocked
  [Translation] keep old array structure of resourcesFiles to avoid BC.
  removed deprecated notices that make the tests fail
  use visited lookup with reference to gain performance
  [VarDumper] with-er interface for Cloner\Data
  Replace GET parameters when changed
  tweaked phpdocs
  [Process] Fix outdated Process->start() docblock
  prevent inlining service configurators
  Improve entropy of generated salt
  Complete the removal of API versions in the validator component
  [Validator] deprecated API version
  Removed 2.5 bc layer
  [SecurityBundle] UserPasswordEncoderCommand: fix help arguments order.
  ...

Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.6.md
	src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php
	src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Console/Helper/DialogHelper.php
	src/Symfony/Component/Console/Tests/Helper/LegacyTableHelperTest.php
	src/Symfony/Component/Form/ResolvedFormType.php
	src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
2015-03-24 18:09:17 +01:00
Fabien Potencier
26ff514323 Merge branch '2.6' into 2.7
* 2.6:
  CS: fix some license headers
  CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
  use visited lookup with reference to gain performance
  Replace GET parameters when changed
  [FrameworkBundle][debug:config] added support for dynamic configurations.
  [WebProfiler] Fix partial search on url in list

Conflicts:
	src/Symfony/Bridge/Propel1/Form/EventListener/TranslationCollectionFormListener.php
	src/Symfony/Bridge/Propel1/Form/EventListener/TranslationFormListener.php
2015-03-24 18:00:58 +01:00
Fabien Potencier
2559628654 Merge branch '2.3' into 2.6
* 2.3:
  CS: fix some license headers
  CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
  use visited lookup with reference to gain performance
  Replace GET parameters when changed

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
2015-03-24 18:00:37 +01:00
Fabien Potencier
36948bb382 minor #14038 CS: fix some license headers (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: fix some license headers

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

Commits
-------

2b74841 CS: fix some license headers
2015-03-24 17:57:18 +01:00
Fabien Potencier
2f726ef95c minor #14037 CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline

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

Changes generated automatically by upcoming PHP CS Fixer.
To keep fabbot.io happy ;)

Commits
-------

6a16d91 CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline
2015-03-24 17:55:26 +01:00
Dariusz Ruminski
2b74841b5b CS: fix some license headers 2015-03-24 17:44:35 +01:00
Dariusz Ruminski
6a16d917fe CS: Ensure there is no code on the same line as the PHP open tag and it is followed by a blankline 2015-03-24 17:36:00 +01:00
Abdellatif Ait boudad
6eb5e7395c [Translation] merge all fallback catalogues messages into current catalogue. 2015-03-24 14:52:57 +00:00
Fabien Potencier
cb7089995d feature #14006 [VarDumper] with-er interface for Cloner\Data (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] with-er interface for Cloner\Data

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

I should have this idea earlier... :)

Commits
-------

2462c5b [VarDumper] with-er interface for Cloner\Data
2015-03-24 12:11:21 +01:00
Fabien Potencier
a464f37734 feature #14034 [VarDumper] add caster for MongoCursor objects (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] add caster for MongoCursor objects

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

This one is inspired from [PsySH's equivalent](https://github.com/bobthecow/psysh/blob/master/src/Psy/Presenter/MongoCursorPresenter.php).
Looking at the interface of the Mongo extension, the other classes may need a caster too.
So if a real Mongo user can write casters for them, that'd be great! (in an other PR, on top of this one)

Commits
-------

1008e6c [VarDumper] add caster for MongoCursor objects
2015-03-24 12:09:28 +01:00
Fabien Potencier
d3b8b8415d minor #13811 [Form] Improve triggering of the setDefaultOptions deprecation error (WouterJ)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Improve triggering of the setDefaultOptions deprecation error

Bundles wanting to support both Sf 2.3 and Sf 2.7 (which is a common requirement as both have at least 2 more years of maintaince) would have custom form types with both option methods defined (`setDefaultOptions` for <2.7 support and `configureOptions` for >2.7,>3.0 support). In such case, I don't think there is anything wrong with the code and a deprecation error shouldn't be triggered.

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

Commits
-------

811b711 Improve triggering of the deprecation error
2015-03-24 12:08:08 +01:00
Fabien Potencier
6f3c6b49e2 minor #14036 [SecurityBundle] Fix typos in LogoutUrlHelper (stloyd)
This PR was merged into the 2.7 branch.

Discussion
----------

[SecurityBundle] Fix typos in LogoutUrlHelper

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| Tests pass?   | yes
| Fixed tickets | #14035
| License       | MIT

Commits
-------

156cda6 [SecurityBundle] Fix typos in LogoutUrlHelper
2015-03-24 12:06:16 +01:00
Wouter J
811b711beb Improve triggering of the deprecation error 2015-03-24 11:57:44 +01:00
Joseph Bielawski
156cda64f6 [SecurityBundle] Fix typos in LogoutUrlHelper 2015-03-24 10:56:45 +01:00
Nicolas Grekas
1008e6cdad [VarDumper] add caster for MongoCursor objects 2015-03-24 09:44:59 +01:00
Fabien Potencier
4a38eb4dad feature #14030 [DependencyInjection] make it possible to dump inlined services to XML (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] make it possible to dump inlined services to XML

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

Commits
-------

504e338 make it possible to dump inlined services to XML
2015-03-24 09:12:32 +01:00
Fabien Potencier
2f399017b2 minor #14022 [Translation] keep old array structure of resourcesFiles to avoid BC. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation] keep old array structure of resourcesFiles to avoid BC.

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

Commits
-------

aa70a94 [Translation] keep old array structure of resourcesFiles to avoid BC.
2015-03-24 08:57:42 +01:00
Fabien Potencier
724528c9dc minor #14023 [VarDumper] Fixed notice when Exchange is mocked (lyrixx)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Fixed notice when Exchange is mocked

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

Commits
-------

b3ed23e [VarDumper] Fixed notice when Exchange is mocked
2015-03-24 08:52:38 +01:00
Hugo Hamon
f24c8ab844 [SecurityBundle] removed a duplicated service definition and simplified others. 2015-03-23 23:38:21 +01:00
Christian Flothmann
504e338c0b make it possible to dump inlined services to XML 2015-03-23 20:17:28 +01:00
Grégoire Pineau
b3ed23eadc [VarDumper] Fixed notice when Exchange is mocked 2015-03-23 12:14:27 +01:00
Abdellatif Ait boudad
aa70a94146 [Translation] keep old array structure of resourcesFiles to avoid BC. 2015-03-23 11:10:33 +00:00
Fabien Potencier
86e9b9409c bug #14010 Replace GET parameters when changed in form (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

Replace GET parameters when changed in form

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

Commits
-------

fa9fb5c Replace GET parameters when changed
2015-03-23 10:09:00 +01:00
Fabien Potencier
1a4d7d7e48 removed deprecated notices that make the tests fail 2015-03-23 10:03:11 +01:00
Fabien Potencier
f5a020e275 feature #14016 Remove the API version in the validator component (saro0h, fabpot, stof)
This PR was merged into the 2.7 branch.

Discussion
----------

  Remove the API version in the validator component

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

This completes the work of #13517

Commits
-------

9438206 Complete the removal of API versions in the validator component
75088c0 [Validator] deprecated API version
0c69f69 Removed 2.5 bc layer
2015-03-23 09:58:54 +01:00
Fabien Potencier
e5e27afc99 bug #13991 [Dependency Injection] Improve PhpDumper Performance for huge Containers (BattleRattle)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #13991).

Discussion
----------

[Dependency Injection] Improve PhpDumper Performance for huge Containers

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

After making public services private, the dumping of the DIC takes much longer. This is due to the reference lookup method. Using the visited lookup as reference speeds up the whole dump (in our case by a factor of ~40).

Some stats from our DIC:
before: 32 sec. for dumping
after: 0.9 sec.

Commits
-------

2cc5011 use visited lookup with reference to gain performance
2015-03-23 09:55:37 +01:00
Norman Soetbeer
2cc5011e2f use visited lookup with reference to gain performance 2015-03-23 09:55:31 +01:00
Nicolas Grekas
2462c5b075 [VarDumper] with-er interface for Cloner\Data 2015-03-23 09:45:39 +01:00
Fabien Potencier
83c6d22ace feature #13960 [VarDumper] Add Caster for XML-parser resources (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Add Caster for XML-parser resources

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

Commits
-------

00701cb [VarDumper] Add Caster for XML-parser resources
2015-03-23 09:44:46 +01:00
Fabien Potencier
7eef5f27a0 minor #14007 [VarDumper] collapse/inline cut structures (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] collapse/inline cut structures

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

This tweaks the dump output to make it a bit prettier (best viewed with `?w=1`)

Commits
-------

8443268 [VarDumper] collapse/inline cut structures
2015-03-23 09:43:43 +01:00
Fabien Potencier
39da732eb0 bug #13886 [FrameworkBundle][debug:config] added support for dynamic configurations... (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle][debug:config] added support for dynamic configurations...

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

Commits
-------

0f9eb7a [FrameworkBundle][debug:config] added support for dynamic configurations.
2015-03-23 09:38:04 +01:00
Fabien Potencier
eda1ab7841 minor #13971 [WebProfiler] Fix partial search on url in list (zerrvox)
This PR was merged into the 2.6 branch.

Discussion
----------

[WebProfiler] Fix partial search on url in list

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

Removed the url type from the url form field as browser validation makes it impossible to do partial text search on the url as the browser will not submit the form because it does not validate as a url.

Commits
-------

c5f1f60 [WebProfiler] Fix partial search on url in list
2015-03-23 09:31:13 +01:00
WouterJ
fa9fb5c1ce Replace GET parameters when changed 2015-03-23 09:29:47 +01:00
Fabien Potencier
e99c09e5ed minor #14011 [Translation][debug mode] refresh cache when resources is changed. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation][debug mode] refresh cache when resources is changed.

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

Commits
-------

e36f1a7 [FrameworkBundle][Translation][debug mode] refresh cache when resources is changed.
2015-03-23 09:26:36 +01:00
Fabien Potencier
707f3d332e tweaked phpdocs 2015-03-23 09:23:11 +01:00
Fabien Potencier
7e9466265c feature #13937 [FrameworkBundle] Allow to disable Kernel reboot (sroze)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Allow to disable Kernel reboot

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

This PR introduce a `disableReboot` method on `Client` class.

A use case of this method is to prevent rebooting kernel if we manually rebooted it before the request to manipulate registered services.

Commits
-------

648aacb [FrameworkBundle] Allow to disable Kernel reboot
2015-03-23 09:21:29 +01:00
Fabien Potencier
95b6c56496 Merge branch '2.6' into 2.7
* 2.6:
  [Process] Fix outdated Process->start() docblock
  prevent inlining service configurators
  [DomCrawler] Improve namespace discovery performance

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
2015-03-23 09:18:05 +01:00
Fabien Potencier
89cbafdcd1 feature #13892 [DependencyInjection] Improved yaml syntax (hason)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] Improved yaml syntax

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

This PR adds support for this:
```yaml
services:
    manager:
        class: UserManager
        arguments:
          - true
        calls:
          - method: setLogger
            arguments:
              - @logger
          - method: setClass
            arguments:
              - User
        tags:
          - name: manager
            alias: user
```

Commits
-------

0eb34f3 [DependencyInjection] Added support for keys "method" and "arguments" in "calls" statement for yaml format
2015-03-23 09:12:33 +01:00
Fabien Potencier
99330cbebc bug #14013 [DependencyInjection] prevent inlining service configurators (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] prevent inlining service configurators

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

Currently, only the `PhpDumper` is able to dump inlined service
configurators. Since Symfony applications dump the compiled container
in XML, inlined configurators will break this process.

We did something similar before with service factories in #13914.

Commits
-------

34619fe prevent inlining service configurators
2015-03-23 09:10:51 +01:00
Fabien Potencier
89a6b95014 minor #14018 [Security] Improve entropy of generated salt (inanimatt)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] Improve entropy of generated salt

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

Using a hash as a salt provides unnecessarily low entropy, especially when using Symfony's recommended password encoder (bcrypt) which truncates salt at 22 chars, giving only 16^22 bits entropy. Using base64 instead provides _up to_ 256^30 bits (256^16 to bcrypt).

This change doesn't break compatibility with the built-in PasswordEncoderInterface implementations (message-digest, pbkdf2, bcrypt, plaintext), but it _might_ not work with some custom encoders if they've been assuming hexit salts. On balance I think it's fine since the commit this patches was only merged a few hours ago :D

Commits
-------

d9b2500 Improve entropy of generated salt
2015-03-23 09:01:10 +01:00
Fabien Potencier
3b9127e55b minor #14019 [Process] Remove outdated docblock @return on Process->start() (johnkary)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14019).

Discussion
----------

[Process] Remove outdated docblock @return on Process->start()

| Q             | A
| ------------- | ---
| Fixed tickets | #14004
| License       | MIT

The original commit that introduced fluent interface for `Process->start()` was https://github.com/symfony/symfony/pull/8723 before Symfony 2.4. I couldn't find exactly where in history the start() `return $this` line was removed but it's not in v2.4.0 or any other stable branch.

Docs do not show start() as having a fluent interface: http://symfony.com/doc/current/components/process.html

Targeting 2.6 as currently maintained version.

🚀

Commits
-------

02a1413 [Process] Fix outdated Process->start() docblock
2015-03-23 08:56:13 +01:00
John Kary
02a141317d [Process] Fix outdated Process->start() docblock 2015-03-23 08:56:12 +01:00
Fabien Potencier
bd7788a106 bug #14012 [DomCrawler] Improve namespace discovery performance (jakzal)
This PR was merged into the 2.6 branch.

Discussion
----------

[DomCrawler] Improve namespace discovery performance

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

Before this quick-fix, xpath axes like `child::*` or `descendant-or-self::*` were considered namespaces. As a result, far too many xpath queries were being executed during namespace discovery.

Here's a full blackfire before/after comparision of @salaman's script:  https://blackfire.io/profiles/compare/a80b9e77-8e55-45d3-a348-7d34a51053b6/graph

![domcrawler-xpath-query](https://cloud.githubusercontent.com/assets/190447/6767384/ba93c57a-d024-11e4-84e1-e58dd7527f03.png)

Commits
-------

b6af002 [DomCrawler] Improve namespace discovery performance
2015-03-23 07:58:55 +01:00
Christian Flothmann
34619fedff prevent inlining service configurators
Currently, only the `PhpDumper` is able to dump inlined service
configurators. Since Symfony applications dump the compiled container
in XML, inlined configurators will break this process.
2015-03-22 22:40:28 +01:00
Matt Robinson
d9b2500a20 Improve entropy of generated salt
Using a hash as a salt provides unnecessarily low entropy, especially when using Symfony's recommended password encoder (bcrypt) which truncates salt at 22 chars, giving only 16^22 bits entropy. Using base64 instead provides _up to_ 256^30 bits (256^16 to bcrypt).

This change doesn't break compatibility with the built-in PasswordEncoderInterface implementations (message-digest, pbkdf2, bcrypt, plaintext), but it _might_ not work with some custom encoders if they've been assuming hexit salts. On balance I think it's fine since the commit this patches was only merged a few hours ago :D
2015-03-22 21:27:19 +00:00
Fabien Potencier
6b02541880 Merge branch '2.6' into 2.7
* 2.6:
  Fix small coding style
  [2.3] Static Code Analysis for Components
  [Form] fixed phpdoc
  CS: Convert double quotes to single quotes
  Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
  [Validator] added Japanese translation for unmatched charset (id: 80)
  [WebProfilerBundle] fixed undefined buttons.
  [WebProfilerBundle] Fix javascript toolbar on IE8
  [DependencyInjection] Highest precedence for user parameters
  bumped Symfony version to 2.6.6
  [Translation][MoFileLoader] fixed load empty translation.
  updated VERSION for 2.6.5
  updated CHANGELOG for 2.6.5
  bumped Symfony version to 2.3.27
  updated VERSION for 2.3.26
  update CONTRIBUTORS for 2.3.26
  updated CHANGELOG for 2.3.26
  [HttpKernel] UriSigner::buildUrl - default params for http_build_query

Conflicts:
	src/Symfony/Bridge/Propel1/Tests/DataCollector/PropelDataCollectorTest.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
2015-03-22 17:57:18 +01:00
Fabien Potencier
618b7dcfb8 Merge branch '2.3' into 2.6
* 2.3:
  Fix small coding style
  [2.3] Static Code Analysis for Components
  [Form] fixed phpdoc
  CS: Convert double quotes to single quotes
  Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader.
  [Validator] added Japanese translation for unmatched charset (id: 80)
  [DependencyInjection] Highest precedence for user parameters
  [Translation][MoFileLoader] fixed load empty translation.
  bumped Symfony version to 2.3.27
  updated VERSION for 2.3.26
  update CONTRIBUTORS for 2.3.26
  updated CHANGELOG for 2.3.26

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
	src/Symfony/Component/Config/Definition/ReferenceDumper.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Compiler/MergeExtensionConfigurationPassTest.php
	src/Symfony/Component/DependencyInjection/Tests/DefinitionTest.php
	src/Symfony/Component/Filesystem/Filesystem.php
	src/Symfony/Component/HttpKernel/DataCollector/DataCollector.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Translation/PluralizationRules.php
	src/Symfony/Component/Validator/Constraints/IssnValidator.php
	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
	src/Symfony/Component/Yaml/Tests/InlineTest.php
2015-03-22 17:55:57 +01:00