Commit Graph

18179 Commits

Author SHA1 Message Date
Nicolas Grekas
249d130549 Merge branch '2.3' into 2.7
* 2.3:
  [Validator] Added Swedish translations
  improve exceptions when parsing malformed files
  Dispatch console.terminate *after* console.exception

Conflicts:
	src/Symfony/Component/Console/Application.php
	src/Symfony/Component/Console/Tests/ApplicationTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.sv.xlf
2015-09-10 10:05:42 +02:00
David Badura
b95b5e217f missing "YAML" in the exception message. 2015-09-10 09:43:17 +02:00
Fabien Potencier
37827a2fef bug #15725 Dispatch console.terminate *after* console.exception (Seldaek)
This PR was merged into the 2.3 branch.

Discussion
----------

Dispatch console.terminate *after* console.exception

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

The problem is when using the ConsoleHandler from MonologBridge, TERMINATE closes it and removes the output, so when EXCEPTION fires if you want to log the exception it's too late and you don't get any output. See ed4fb54901/src/Symfony/Bridge/Monolog/Handler/ConsoleHandler.php (L115-L145)

It is my understanding that TERMINATE is always supposed to come last anyway, so it is a bug in any case, but this particular use case is what prompted the discovery.

Commits
-------

7802345 Dispatch console.terminate *after* console.exception
2015-09-10 08:54:37 +02:00
Fabien Potencier
1e27c85a3b bug #15731 improve exceptions when parsing malformed files (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

improve exceptions when parsing malformed files

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

Commits
-------

3849cd8 improve exceptions when parsing malformed files
2015-09-10 08:51:50 +02:00
Tobias Nyholm
1176d6279a [Validator] Added Swedish translations 2015-09-09 22:42:29 +02:00
Tobias Schultze
4ecbc7053d Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Component/Form/Tests/FormFactoryTest.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-09-09 20:00:08 +02:00
Tobias Schultze
b38e448f42 fix leftover changes from previous merge 2015-09-09 19:53:06 +02:00
Evgeniy Sokolov
f0d40c4559 fix class use and in phpdoc 2015-09-09 19:42:36 +02:00
Abdellatif Ait boudad
cade651915 [Translator][warmup][fallback locales] fixed missing cache file generation. 2015-09-09 14:57:38 +00:00
Christophe Coevoet
36e09da4b9 Fix the injection of the container in invokable controllers 2015-09-09 14:19:27 +02:00
Evgeniy Sokolov
0ffcc4f53d drop unused private methods 2015-09-09 09:30:09 +02:00
Christian Flothmann
3849cd80b9 improve exceptions when parsing malformed files 2015-09-08 22:16:40 +02:00
Tobias Schultze
4b45bb91ab Kernel version constants are integers to actually be comparable numerically 2015-09-08 21:33:18 +02:00
Fabien Potencier
6b08d3eb16 bumped Symfony version to 2.7.5 2015-09-08 20:12:26 +02:00
Fabien Potencier
1fdf23fe28 updated VERSION for 2.7.4 2015-09-08 16:26:39 +02:00
Jordi Boggiano
7802345824 Dispatch console.terminate *after* console.exception 2015-09-08 14:55:10 +01:00
Fabien Potencier
72615e11a2 bug #15552 [ExpressionLanguage] Fixed expressions cache key generation (inso)
This PR was squashed before being merged into the 2.7 branch (closes #15552).

Discussion
----------

[ExpressionLanguage] Fixed expressions cache key generation

| 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

Reworked version of #15537

Difference with original PR:
- sort $names array to ensure its order does not affect caching, added test for it
- minor tweaks for cache key format
- used `foreach` instead of `array_map`

P.S. I'm not proficient with tests so not sure if tests are correct.

Commits
-------

4114a2b [ExpressionLanguage] Fixed expressions cache key generation
2015-09-07 14:45:05 +02:00
Anton Bakai
4114a2bd3e [ExpressionLanguage] Fixed expressions cache key generation 2015-09-07 14:45:02 +02:00
Nicolas Grekas
ae643240bb Merge branch '2.3' into 2.7
* 2.3:
  use new repo location in some readme.md
2015-09-06 10:36:38 +02:00
Nicolas Grekas
e49739c469 [2.7] Clean deprecated interfaces 2015-09-04 22:16:46 +02:00
JakeFr
fa7fe56830 use new repo location in some readme.md 2015-09-03 22:55:07 +02:00
Nicolas Grekas
12ec734845 [Validator] Cleanup a test 2015-09-03 14:38:39 +02:00
Nicolas Grekas
05d9411670 Merge branch '2.3' into 2.7
* 2.3:
  [Intl] Fix test
  [Translator][fallback catalogues] fixed circular reference.
  bumped Symfony version to 2.3.33
  updated VERSION for 2.3.32
  update CONTRIBUTORS for 2.3.32
  updated CHANGELOG for 2.3.32
  [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting
  [console] Use the description when no help is available

Conflicts:
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
	src/Symfony/Component/HttpKernel/Kernel.php
2015-09-03 13:40:38 +02:00
Michael Lee
232f6fd534 [framework-bundle] Add Test for TranslationUpdateCommand
Added the test script as per the discussion in PR #15562

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a
2015-09-03 17:05:39 +08:00
Tobias Schultze
6f18c7573f minor #15672 [Intl] Fix test (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] Fix test

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

Commits
-------

7969503 [Intl] Fix test
2015-09-02 23:17:00 +02:00
Nicolas Grekas
79695037b0 [Intl] Fix test 2015-09-02 18:14:26 +02:00
Abdellatif Ait boudad
79e29c1f23 [Translator][fallback catalogues] fixed circular reference. 2015-09-02 09:56:25 +00:00
Fabien Potencier
fedbf711a1 bumped Symfony version to 2.3.33 2015-09-01 18:03:57 +02:00
Fabien Potencier
221da6edaf updated VERSION for 2.3.32 2015-09-01 17:40:52 +02:00
Nicolas Grekas
2c4860877d Require symfony/intl ~2.4 when Locale::setDefault() is used 2015-09-01 15:39:59 +02:00
Fabien Potencier
db8420e6d5 bug #15662 [Form][2.7][ Choice type] fixed groups with empty array. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form][2.7][ Choice type] fixed groups with empty array.

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

- [x] test

Commits
-------

835aa78 [Form][2.7][ Choice type] fixed groups with empty array.
2015-09-01 09:47:15 +02:00
Nicolas Grekas
33fac1479c minor #15661 [appveyor] PHP 5.3.11 for Symfony 2.7 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[appveyor] PHP 5.3.11 for Symfony 2.7

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

Commits
-------

0f2256e [appveyor] PHP 5.3.11 for Symfony 2.7
2015-09-01 09:32:02 +02:00
Abdellatif Ait boudad
835aa788d4 [Form][2.7][ Choice type] fixed groups with empty array. 2015-08-31 20:22:13 +00:00
Christophe Coevoet
cd167f49dd Mark deprecated Twig functions as deprecated with the Twig feature 2015-08-31 21:21:38 +02:00
Nicolas Grekas
0f2256e85a [appveyor] PHP 5.3.11 for Symfony 2.7 2015-08-31 18:44:53 +02:00
Fabien Potencier
cb303017b4 bug #15601 [console] Use the description when no help is available (Nicofuma)
This PR was merged into the 2.3 branch.

Discussion
----------

[console] Use the description when no help is available

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

Commits
-------

e5d3f25 [console] Use the description when no help is available
2015-08-31 14:48:21 +02:00
Fabien Potencier
e1b7e46c5c minor #15650 [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting

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

Not  bug fix because the fix it fixes has not yet been released in any taggued version, but still a fix.

Commits
-------

de7d4a7 [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting
2015-08-31 14:45:42 +02:00
Nicolas Grekas
8d6e337602 [HttpKernel] Group deprecation notices 2015-08-31 14:42:37 +02:00
Fabien Potencier
a1d0f539ac Merge branch '2.3' into 2.7
* 2.3:
  Do not normalize the kernel root directory path (see symfony/symfony#15474).
  [ci] Run minimal versions on appveyor only
  Fix appveyor file
2015-08-31 14:32:30 +02:00
Nicolas Grekas
b1bd06800a [VarDumper] Fix missing support for dumping PHP7 return type 2015-08-31 14:28:11 +02:00
Fabien Potencier
05b54fe2b1 minor #15639 [ci] Run minimal versions on appveyor only (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Run minimal versions on appveyor only

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

Hopefully the last round of ci optimizations: what do you think about running the minimal supported version on appveyor only? This removes one matrix line on travis, and gives more flexibility in choosing the minimal version because, where travis only supports a limited list of minimal versions, windows.php.net provides a binary for each and every php ever released.

Commits
-------

e564805 [ci] Run minimal versions on appveyor only
2015-08-31 14:20:29 +02:00
Leo Feyer
a53489e49a Do not normalize the kernel root directory path (see symfony/symfony#15474). 2015-08-30 20:55:51 +02:00
Fabien Potencier
5368a4287a minor #15652 Don't trigger deprecation on interfaces (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Don't trigger deprecation on interfaces

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

This can trigger false positives when implementing the interface is required for bc reasons. The DebugClassLoader is able to trigger on demand at runtime when required.

Commits
-------

b5b10b3 Don't trigger deprecation on interfaces
2015-08-30 20:53:28 +02:00
Nicolas Grekas
b5b10b3d54 Don't trigger deprecation on interfaces 2015-08-30 13:26:29 +02:00
Fabien Potencier
9d6fdc3b50 minor #15624 consistently use str_replace to unify directory separators (2.7) (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

consistently use str_replace to unify directory separators (2.7)

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

Remaining ones from #15614

Commits
-------

17ce649 consistently use str_replace to unify directory separators (remaining)
2015-08-29 21:20:26 +02:00
Nicolas Grekas
de7d4a7225 [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting 2015-08-29 20:06:03 +02:00
Nicolas Grekas
ccb3f562c5 [Debug] Ignore silencing for deprecations 2015-08-29 13:12:16 +02:00
Nicolas Grekas
e564805b32 [ci] Run minimal versions on appveyor only 2015-08-29 12:34:03 +02:00
Nicolas Grekas
f42dd21d49 [Console] ProgressBarTest::testAnsiColorsAndEmojis() requires extension mbstring 2015-08-27 23:38:40 +02:00
Nathanael d. Noblet
1f3ea0f8af Use ObjectManager interface instead of EntityManager
If you use the EntityManager Decorator pattern that doctrine provides
then simply specifying a query_builder closure where your decorated
em is used fails as it isn't an instance of Doctrine\ORM\EntityManager.
Testing against the ObjectManager interface fixes the issue.
2015-08-27 13:09:09 -06:00
Nicolas Grekas
95961a5aae [SecurityBundle] Skip SetAclCommandTest when sqlite is not available 2015-08-27 15:21:43 +02:00
Nicolas Grekas
283ba52142 Fix typo 2015-08-27 09:03:44 +02:00
Nicolas Grekas
464a1b3152 Various fixes esp. on Windows 2015-08-27 08:45:45 +02:00
Tobias Schultze
17ce6492d9 consistently use str_replace to unify directory separators (remaining) 2015-08-26 20:02:40 +02:00
Tobias Schultze
755f3c0223 Merge branch '2.3' into 2.7
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Templating/TemplateFilenameParser.php
2015-08-26 19:56:37 +02:00
Tobias Schultze
051cb35c8d bug #15428 Fix the validation of form resources to register the default theme (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix the validation of form resources to register the default theme

| 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

https://github.com/symfony/symfony/pull/14173 made some wrong changes, changing the behavior of the code. This reverts to the right behavior in affected places

Commits
-------

ea92610 Fix the validation of form resources to register the default theme
2015-08-26 19:46:48 +02:00
Christophe Coevoet
ea92610a85 Fix the validation of form resources to register the default theme 2015-08-26 18:52:32 +02:00
Christophe Coevoet
5df64dca52 Fix the retrieval of the value with property path when using a loader 2015-08-26 18:42:09 +02:00
Fabien Potencier
bdfc9dc7b3 minor #15614 consistently use str_replace to unify directory separators (Tobion)
This PR was merged into the 2.3 branch.

Discussion
----------

consistently use str_replace to unify directory separators

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

We used a mix of `str_replace` and `strtr` for the same thing. `str_replace` is faster as [I tested myself](https://3v4l.org/MNrgC) which is logical since strtr adds logic we don't need here.

Commits
-------

b9760ef consistently use str_replace to unify directory separators
2015-08-26 18:41:06 +02:00
Nicolas Grekas
c63bcbe3d3 [Process] Disable failing tests on Windows 2015-08-26 13:41:45 +02:00
Nicolas Grekas
7f4f7131dd Merge branch '2.3' into 2.7
* 2.3:
  [Translation] Fix the string casting in the XliffFileLoader

Conflicts:
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
2015-08-26 12:49:32 +02:00
Nicolas Grekas
e924d567e9 Merge branch '2.3' into 2.7
* 2.3:
  Windows and Intl fixes
  Add appveyor.yml for C.I. on Windows
  [travis] merge php: nightly and deps=high test-matrix lines
  [Security] Add missing docblock in PreAuthenticatedToken

Conflicts:
	.travis.yml
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/HttpFoundation/JsonResponse.php
	src/Symfony/Component/Intl/DateFormatter/IntlDateFormatter.php
2015-08-26 12:48:03 +02:00
Christophe Coevoet
b856f62cd4 [Translation] Fix the string casting in the XliffFileLoader 2015-08-26 11:54:34 +02:00
Fabien Potencier
fed77a3d80 minor #15484 [Security] Add missing docblock in PreAuthenticatedToken (tgalopin)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] Add missing docblock in PreAuthenticatedToken

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

I noticed the `PreAuthenticatedToken` does not provide any dockblock about its constructor parameters so PHPStorm uses the `AbstractToken` parameters and think I'm using `PreAuthenticatedToken` badly.

This fix it by adding the missing docblock and I also added the string[] possibility for roles in `AbstractToken` as it's present in the code and the exception message.

Commits
-------

1dda0a6 [Security] Add missing docblock in PreAuthenticatedToken
2015-08-26 11:25:14 +02:00
Fabien Potencier
c13b5c1a43 bug #15575 Add appveyor.yml for C.I. on Windows (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Add appveyor.yml for C.I. on Windows

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | YES, both on Travis (Linux) and on Appveyor (Windows)!
| Fixed tickets | #13934, #15049, #14259, #15045, #15444
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/5654

- testing two matrix lines:
  - one without mbtring nor fileinfo nor intl
  - one with these ext enables, intl version 51.2 so that almost no test is skipped on our Intl component
- bug fixes thanks to these harder testing conditions
- some display bug on appveyor, [reported here](http://help.appveyor.com/discussions/suggestions/197-support-ansi-color-codes).

Commits
-------

ea5d656 Windows and Intl fixes
8bbd8d9 Add appveyor.yml for C.I. on Windows
2015-08-26 11:00:07 +02:00
Nicolas Grekas
ea5d656ddd Windows and Intl fixes 2015-08-25 23:41:39 +02:00
SaschaDens
cbba07450e [VarDumper] fixed HtmlDumper to target specific the head tag 2015-08-25 18:19:32 +02:00
Abdellatif Ait boudad
ffdab9259a Merge branch '2.3' into 2.7
Conflicts:
	.travis.yml
	src/Symfony/Component/Translation/Loader/XliffFileLoader.php
2015-08-25 12:59:36 +00:00
Tobias Schultze
b9760efb02 consistently use str_replace to unify directory separators 2015-08-25 14:59:33 +02:00
Leo Feyer
3dcda1a8bd Support omitting the <target> node in an .xlf file. 2015-08-25 11:54:38 +00:00
Christophe Coevoet
f31fa8c786 Fix the handling of values for multiple choice types
Choice values must always be strings, but a place was missing the
casting, breaking the comparison of selected choices when the callback
does not return a string.
2015-08-25 11:17:05 +02:00
Tristan Darricau
e5d3f2567d [console] Use the description when no help is available 2015-08-24 18:58:35 +02:00
Fabien Potencier
c25e054d9e minor #15597 fixes CS (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

fixes CS

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

Commits
-------

c0e4495 fixes CS
2015-08-24 09:16:32 +02:00
Fabien Potencier
c0e4495b66 fixes CS 2015-08-24 09:13:45 +02:00
Fabien Potencier
ce93f61437 Merge branch '2.3' into 2.7
* 2.3:
  fixed CS
  [FrameworkBundle] Fix precedence of xdebug.file_link_format
2015-08-24 08:37:42 +02:00
Fabien Potencier
cbe6bc9ac4 fixed CS 2015-08-24 08:32:52 +02:00
Kévin Dunglas
6ad4877cde [DependencyInjection] Add missing file headers 2015-08-24 04:28:49 +02:00
Fabien Potencier
1076a0f551 bug #15549 [FrameworkBundle] Fix precedence of xdebug.file_link_format (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix precedence of xdebug.file_link_format

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/5625

See https://github.com/symfony/symfony-demo/pull/148#issuecomment-131058728

Commits
-------

adb5327 [FrameworkBundle] Fix precedence of xdebug.file_link_format
2015-08-23 23:27:21 +02:00
Fabien Potencier
c9df5953de Merge branch '2.3' into 2.7
* 2.3:
  made Symfony compatible with both Twig 1.x and 2.x
2015-08-23 20:40:15 +02:00
Fabien Potencier
7b64354058 fixed Twig deprecations 2015-08-23 17:59:39 +02:00
Fabien Potencier
99a1fcc3e2 replaced deprecated Twig sameas test by same as 2015-08-23 09:32:15 +02:00
Fabien Potencier
4de4180457 made Symfony compatible with both Twig 1.x and 2.x 2015-08-22 18:18:42 +02:00
Fabien Potencier
e25aca7072 Merge branch '2.3' into 2.7
* 2.3:
  made Symfony compatible with both Twig 1.x and 2.x
2015-08-22 09:41:51 +02:00
Fabien Potencier
b4de379a15 bug #15561 [Form] only use PropertyPath if not already callable (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] only use PropertyPath if not already callable

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | could be in edge cases
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #15542
| License       | MIT
| Doc PR        | -

Currently it uses a PropertyPath even when the string is already a callable. But the callable string should have higher priority since that is also the one documented in ChoiceListFactoryInterface.

Commits
-------

470b140 [Form] only use PropertyPath if not already callable
2015-08-22 09:21:30 +02:00
Fabien Potencier
259bc7837b bug #15588 [WebProfilerBundle] add import for Twig macro (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle] add import for Twig macro

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

Commits
-------

1795071 [WebProfilerBundle] add import for Twig macro
2015-08-22 09:13:13 +02:00
Fabien Potencier
5bede45e29 bug #15546 [Form] fixed BC-break on grouped choice lists (origaminal)
This PR was squashed before being merged into the 2.7 branch (closes #15546).

Discussion
----------

[Form] fixed BC-break on grouped choice lists

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

Commits
-------

12a7dd1 [Form] fixed BC-break on grouped choice lists
2015-08-22 09:11:11 +02:00
origaminal
12a7dd1714 [Form] fixed BC-break on grouped choice lists 2015-08-22 09:11:02 +02:00
Christian Flothmann
17950711a2 [WebProfilerBundle] add import for Twig macro 2015-08-22 09:00:15 +02:00
Tobias Schultze
698341631b minor #15558 [Form] fix reworked choice list phpdoc (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] fix reworked choice list phpdoc

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

Fix leftover phpdoc change from #15061

Commits
-------

747c1a5 [Form] fix reworked choice list phpdoc
2015-08-21 17:30:00 +02:00
Fabien Potencier
a5c7a85b78 made Symfony compatible with both Twig 1.x and 2.x 2015-08-18 14:26:23 +02:00
Nicolas Grekas
f1d379db7d [Debug/VarDumper] minor cleanups 2015-08-17 10:58:33 +02:00
Tobias Schultze
470b1400d6 [Form] only use PropertyPath if not already callable 2015-08-15 21:15:17 +02:00
Tobias Schultze
747c1a5aee [Form] fix reworked choice list phpdoc 2015-08-15 20:22:17 +02:00
Nicolas Grekas
adb5327dbb [FrameworkBundle] Fix precedence of xdebug.file_link_format 2015-08-14 15:34:27 +02:00
Michael Lee
166e1750bc [expression-language] Code Cleanup for GetAttrNode
Use ``$this->nodes['attribute']->attributes['value']`` to
replace ``$this->nodes['attribute']->evaluate($functions, $values)``
for method call and property call.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a
2015-08-13 19:30:11 +08:00
Giorgio Premi
724a54b461 [DoctrineBridge][Form] Add old tests to legacy group 2015-08-13 11:54:16 +02:00
Fabien Potencier
f1d588512f bug #15515 [Console] Fixed warning when command alias is longer than command name (dosten)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Fixed warning when command alias is longer than command name

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

Commits
-------

ecfe944 Fixed warning when command alias is longer than command name
2015-08-12 13:21:35 +02:00
Fabien Potencier
d3a1cb1837 bug #15251 [DoctrineBridge][Form] Fix IdReader when indexing by primary foreign key (giosh94mhz)
This PR was merged into the 2.7 branch.

Discussion
----------

[DoctrineBridge][Form] Fix IdReader when indexing by primary foreign key

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

Port to Symfony 2.7 of PR #14372 . The `IdReader` class can now resolve association and determine the real id value.

There is still room for improvement, though. Since I've added a `new IdReader` in the constructor, it is better to declare `IdReader` as `final` just to be safe.

PS: sorry to keep you waiting, @webmozart . When merging both commit don't forget to add the `@deprecated` annotation, and that `SingleAssociationToIntIdEntity.php` is duplicated.

Commits
-------

799d0e0 [DoctrineBridge][Form] Fix IdReader when indexing by primary foreign key
2015-08-12 11:59:37 +02:00
Fabien Potencier
e8948671a1 Merge branch '2.3' into 2.7
* 2.3:
  Implement the support of timezone objects in the stub IntlDateFormatter
  [DoctrineBridge][Form] Fix EntityChoiceList when indexing by primary foreign key
2015-08-12 11:55:25 +02:00
Fabien Potencier
d6d93dd50a bug #14372 [DoctrineBridge][Form] fix EntityChoiceList when indexing by primary foreign key (giosh94mhz)
This PR was merged into the 2.3 branch.

Discussion
----------

[DoctrineBridge][Form] fix EntityChoiceList when indexing by primary foreign key

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

I've found a bug while using the 'entity' FormType.

Doctrine allow the definition of primary keys which are foreign key of other entities. In this scenario, the `EntityChoiceList` instance check if:
  * the entity has a id composed by a single column and
  * eventually, the column is an integer

When this happens, it use the primary key as "choices indices", but since is an entity it fails in many places, where it expects integer.

The easy solution is to check whether the single-column id is not an association. Anyway, I've fixed it the RightWay™ :), and now it resolve the entity reference to the actual column type, and restart the logic. Code speaks better then words.

Commits
-------

fe4246a [DoctrineBridge][Form] Fix EntityChoiceList when indexing by primary foreign key
2015-08-12 10:05:25 +02:00
Fabien Potencier
b450c8481a bug #15514 removed _self usage when not needed (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

removed _self usage when not needed

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

As those calls are macros, there are already imported via the `from` call, so accessing them directly is not need, nor desired.

Commits
-------

3d0577d removed _self usage when not needed
2015-08-11 22:59:59 +02:00
Diego Saint Esteben
ecfe94465d Fixed warning when command alias is longer than command name 2015-08-11 17:08:57 -03:00
Fabien Potencier
3d0577d1d2 removed _self usage when not needed 2015-08-11 17:34:43 +02:00
Fabien Potencier
0ea11e4639 bug #15489 Implement the support of timezone objects in the stub IntlDateFormatter (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Implement the support of timezone objects in the stub IntlDateFormatter

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

As of PHP 5.5, the IntlDateFormatter accepts to use DateTimeZone or IntlTimeZone objects as timezone in the constructor (and in the new setTimeZone method) rather than timezone ids.
This is even the proper way to pass a timezone from a DateTime object as DateTimeZone names are not all valid ICU identifiers (and there is a PR on the Twig-extensions repo to use such feature to support things properly: https://github.com/twigphp/Twig-extensions/pull/148).

I'm considering this as a bugfix because it is a mismatch between the stub implementation and the real class.
Note that for simplicity, these objects are accepted on all PHP versions, as reproducing the behavior of older versions is not possible in the stub anyway (triggering a warning and making the instantiating with ``new`` return ``null``). We already have such differences anyway (the ``setTimeZone`` method exists in all PHP versions in the stub)

Commits
-------

2856abe Implement the support of timezone objects in the stub IntlDateFormatter
2015-08-11 14:30:44 +02:00
Christophe Coevoet
2856abe87f Implement the support of timezone objects in the stub IntlDateFormatter
As of PHP 5.5, the IntlDateFormatter accepts to use DateTimeZone or
IntlTimeZone objects as timezone in the constructor (and in the new
setTimeZone method) rather than timezone ids.
This is even the proper way to pass a timezone from a DateTime object as
DateTimeZone names are not all valid ICU identifiers.
2015-08-11 11:41:21 +02:00
Nicolas Grekas
c0ff72802c Merge branch '2.3' into 2.7
* 2.3:
  typofix - https://github.com/vlajos/misspell_fixer
  [Yaml] Nested merge keys
  Add support for variadic arguments in the GetSetNormalizer

Conflicts:
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Serializer/Tests/Normalizer/GetSetMethodNormalizerTest.php
	src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataTest.php
	src/Symfony/Component/Yaml/Tests/Fixtures/sfMergeKey.yml
2015-08-11 09:58:34 +02:00
Veres Lajos
0692ca97cd typofix - https://github.com/vlajos/misspell_fixer 2015-08-11 09:25:28 +02:00
Teoh Han Hui
73366d5281 [Yaml] Improve newline handling in folded scalar blocks 2015-08-11 05:02:12 +00:00
Issei.M
729902a33f [Security] InMemoryUserProvider now concerns whether user's password is changed when refreshing 2015-08-10 22:07:21 +09:00
David Buchmann
32f92cc37b make doctrine mappings compiler pass exception message more understandable 2015-08-10 12:05:42 +02:00
Fabien Potencier
620a3d4c69 bug #15426 [Serializer] Add support for variadic arguments in the GetSetNormalizer (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

[Serializer] Add support for variadic arguments in the GetSetNormalizer

| 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

There were 2 broken cases:

- when the value was passed, the array was passed as argument, becoming the first value of the variadic array. The array needs to be spread into multiple arguments when calling the method
- when the value was missing, the code would throw a ReflectionException, similar to the issue reported in #13690, because a variadic argument is optional but does not have a default value

Commits
-------

704760b Add support for variadic arguments in the GetSetNormalizer
2015-08-09 10:58:38 +02:00
Fabien Potencier
0f56497cac bug #15480 [Yaml] Nested merge keys (mathroc)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] Nested merge keys

When trying to use nested merge keys in Yaml, the ref sometimes had the wrong value

eg, with:

```yaml
taz: &taz
    a: Steve
    w:
        p: 1234
nested:
    <<: *taz
    d: Doug
    w: &nestedref
        p: 12345
    z:
        <<: *nestedref
```

in this case, the ref `nestedref` had the value "Doug", which cause this error :

    Symfony\Component\Yaml\Exception\ParseException: YAML merge keys used with a scalar value instead of an array at line 38 (near "<<: *nestedref").

It now works as expected

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

note: this PR replace #15241

Commits
-------

500c57e [Yaml] Nested merge keys
2015-08-09 10:56:25 +02:00
Titouan Galopin
1dda0a615b [Security] Add missing docblock in PreAuthenticatedToken 2015-08-07 09:22:48 +02:00
Nicolas Grekas
7231598b4c bug #15443 [Debug] Enhance DebugClassLoader performance on MacOSX (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Enhance DebugClassLoader performance on MacOSX

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

Commits
-------

af0b8eb [Debug] Enhance DebugClassLoader performance on MacOSX
2015-08-07 08:54:57 +02:00
Elan Ruusamäe
18b6964744 fix debug-ext 003.phpt
in my environment the filename is filled, not "-"

$ php --version
PHP 5.5.27 (cli) (built: Jul 17 2015 12:32:05)
Copyright (c) 1997-2015 The PHP Group
Zend Engine v2.5.0, Copyright (c) 1998-2015 Zend Technologies
2015-08-07 08:53:47 +02:00
Mathieu Rochette
500c57e6df [Yaml] Nested merge keys 2015-08-06 22:04:45 +02:00
Fabien Potencier
19ee814cee minor #15470 [FrameworkBundle] [Command] removed unused variable. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] [Command] removed unused variable.

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

Commits
-------

117e054 [FrameworkBundle] [Command] removed unused variable.
2015-08-06 12:02:52 +02:00
Nicolas Grekas
b08b43e313 Fix one dependency requirement 2015-08-06 11:12:43 +02:00
Nicolas Grekas
500a2c4504 Merge branch '2.3' into 2.7
* 2.3:
  [travis] Build standalone phpunit without symfony/yaml

Conflicts:
	.travis.yml
	src/Symfony/Bundle/TwigBundle/composer.json
2015-08-06 10:34:04 +02:00
Nicolas Grekas
4dd0de6694 [travis] Build standalone phpunit without symfony/yaml 2015-08-06 10:22:42 +02:00
Hugo Hamon
117e054f87 [FrameworkBundle] [Command] removed unused variable. 2015-08-05 19:26:57 -04:00
Nicolas Grekas
9ce3200436 Merge branch '2.3' into 2.7
* 2.3:
  Clean wrong whitespaces
  [travis] Build phpunit with local components
  do not remove space between attributes
  [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate()
  Fix the retrieval of the default value for variadic arguments
  Annotated routes with a variadic parameter
  Fixing DbalSessionHandler to work with a Oracle "limitation" or bug?
  Update EngineInterface.php
  let Travis builds fail when PHP 7 jobs fail

Conflicts:
	.travis.yml
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
2015-08-05 17:45:00 +02:00
Nicolas Grekas
7fdba25e4f Clean wrong whitespaces 2015-08-05 17:43:06 +02:00
Nicolas Grekas
af0b8eb26c [Debug] Enhance DebugClassLoader performance on MacOSX 2015-08-04 12:48:55 +02:00
Grégoire Paris
8d2b8881f5 do not remove space between attributes
This piece of code adds a space then removes it immediately. One could think that only the space after the last element of the loop is removed, but this is not the case. Space between loop elements are also removed.
2015-08-04 12:17:13 +02:00
Christophe Coevoet
328ec0133e bug #15263 [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate() (axiac)
This PR was squashed before being merged into the 2.3 branch (closes #15263).

Discussion
----------

[HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate()

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

'proxy-revalidate' is not a header on its own but a 'Cache-Control' directive
See http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9

Commits
-------

6c22f0a [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate()
2015-08-03 19:22:19 +02:00
Valentin VALCIU
6c22f0af24 [HttpFoundation] fixed the check of 'proxy-revalidate' in Response::mustRevalidate() 2015-08-03 19:22:14 +02:00
Christophe Coevoet
704760b276 Add support for variadic arguments in the GetSetNormalizer 2015-08-01 21:55:55 +02:00
Christophe Coevoet
73c5eff44d Fix the retrieval of the default value for variadic arguments 2015-08-01 21:33:42 +02:00
Walter Dal Mut
9b7d4c7613 Annotated routes with a variadic parameter
There are no variadic default values and that generate a fatal error.
2015-08-01 21:19:19 +02:00
Nicolas Grekas
e23eb56ffe [Locale] Fix Intl requirement 2015-08-01 18:50:08 +02:00
nuncanada
c3146592d9 Fixing DbalSessionHandler to work with a Oracle "limitation" or bug? 2015-08-01 16:15:13 +02:00
Johnny Peck
d60b2bba60 Update EngineInterface.php
Grammer in doc comment.
2015-08-01 16:10:55 +02:00
Fabien Potencier
a4100f95e7 bug #13828 [Validator] Improve Iban Validation (afurculita)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] Improve Iban Validation

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/13802
| License       | MIT
| Doc PR        |

This PR adds 2 more checks for better IBAN validation: the validation of the country code (represented by the first 2 letters) and the format validation according to the country format regex based on http://www.swift.com/dsp/resources/documents/IBAN_Registry.pdf.

Commits
-------

07b38de Better Iban Validation
2015-08-01 14:02:04 +02:00
Nicolas Grekas
07fb308225 [Locale] Add missing @group legacy annotations 2015-08-01 11:35:48 +02:00
Alexandru Furculita
07b38dea1f Better Iban Validation
Added more country-based tests, added new error type

The error type `NOT_SUPPORTED_COUNTRY_CODE_ERROR` has been added for the
IBANs from unsupported countries, for which we don't have defined a
format. We will not check anymore if a country code against the Intl
component.
The tests have been completed with more tests for each contry we have
formats defined.

The  4 character length check and the case check has been removed. The message code constants

`TOO_SHORT_ERROR` and `INVALID_CASE_ERROR` has been deprecated
2015-08-01 12:20:04 +03:00
Nicolas Grekas
3d7d378cbc Merge branch '2.3' into 2.7
* 2.3:
  Fix security-acl deps
  Fix doctrine mapping validation type error
  Remove skipping of tests based on ICU data version whenever possible
  Fix the handling of null as locale in the stub intl classes
  do not dump leading backslashes in class names
  Skip ::class constant
  [Config] type specific check for emptiness

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Component/Config/Tests/Definition/ScalarNodeTest.php
	src/Symfony/Component/DependencyInjection/Dumper/GraphvizDumper.php
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/containers/container9.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
	src/Symfony/Component/Locale/Tests/LocaleTest.php
	src/Symfony/Component/Locale/Tests/Stub/StubLocaleTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CountryValidatorTest.php
	src/Symfony/Component/Validator/Tests/Constraints/CurrencyValidatorTest.php
2015-08-01 11:05:17 +02:00
Nicolas Grekas
1270e72560 Fix security-acl deps 2015-08-01 10:11:30 +02:00
Fabien Potencier
2966cd2b89 minor #15412 Remove skipping of tests based on ICU data version whenever possible (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove skipping of tests based on ICU data version whenever possible

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

Many tests being skipped based on the ICU data version don't actually need it. They might be testing code paths not relying on Intl, or not performing assertions on the values depending on the ICU data and so not dependant on the exact ICU version being used.

this is somewhat related to https://github.com/symfony/symfony/issues/14259 as it allows to reduce the number of tests not running on Travis.

Commits
-------

7994513 Remove skipping of tests based on ICU data version whenever possible
2015-08-01 09:51:56 +02:00
Fabien Potencier
f1fa4238b7 bug #15380 do not dump leading backslashes in class names (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

do not dump leading backslashes in class names

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

Commits
-------

ad6cb10 do not dump leading backslashes in class names
2015-08-01 09:45:23 +02:00
Fabien Potencier
3b6d2a3fa3 bug #15376 [ClassMapGenerator] Skip ::class constant (WouterJ)
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassMapGenerator] Skip ::class constant

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

Commits
-------

a336f0e Skip ::class constant
2015-08-01 09:35:45 +02:00
Fabien Potencier
4c649dcb26 bug #15389 [securityBundle] Compare roles strictly when computing inherited roles (bokonet)
This PR was merged into the 2.7 branch.

Discussion
----------

[securityBundle] Compare roles strictly when computing inherited roles

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

Commits
-------

5179acc fix issue #15377
2015-08-01 08:58:26 +02:00
Fabien Potencier
9293c439a5 bug #15170 [Config] type specific check for emptiness (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Config] type specific check for emptiness

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

Commits
-------

0199fbf [Config] type specific check for emptiness
2015-08-01 08:17:42 +02:00
Fabien Potencier
85c10991d3 bug #15411 Fix the handling of null as locale in the stub intl classes (stof)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix the handling of null as locale in the stub intl classes

The Intl extension accepts null as locale in formatters and the collator and will use the default locale in such case. Given that the stub implementation considers that the default locale is always 'en', it should be supported here too instead of forcing libraries to pass the default locale explicitly. For instance, ``Twig_Extensions_Extension_Intl`` relies on the fact that ``null`` as locale uses the default one: https://github.com/twigphp/Twig-extensions/pull/94

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony-demo/pull/123
| License       | MIT
| Doc PR        | n/a

Commits
-------

d6db6ad Fix the handling of null as locale in the stub intl classes
2015-08-01 08:11:19 +02:00
Fabien Potencier
9058904d2b minor #15417 [Debug] cleanup ExceptionHandlerTest (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] cleanup ExceptionHandlerTest

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

Commits
-------

51bacc6 [Debug] cleanup ExceptionHandlerTest
2015-08-01 07:54:51 +02:00
Nicolas Grekas
51bacc6d41 [Debug] cleanup ExceptionHandlerTest 2015-07-31 17:18:52 +02:00
Fabien Potencier
15d6b8aceb bumped Symfony version to 2.7.4 2015-07-31 15:51:28 +02:00
Fabien Potencier
a9af4708b4 updated VERSION for 2.7.3 2015-07-31 15:24:45 +02:00
Fabien Potencier
c7ca0b3629 Merge branch '2.3' into 2.7
* 2.3:
  Fix the return value on error for intl methods returning arrays
2015-07-31 15:24:29 +02:00
Florent Viel
2c9b1db05a Fix doctrine mapping validation type error
The error tell to implement the service `doctrine.orm.<em_name>.metadata_driver`, but this extensions check for the existence of the `doctrine.orm.<em_name>_metadata_driver` where `<em_name>` the entity manager name.
2015-07-31 15:18:55 +02:00
Fabien Potencier
8d025cbc91 fixed typo in translation keys 2015-07-31 08:49:15 +02:00
Christophe Coevoet
7994513e04 Remove skipping of tests based on ICU data version whenever possible
Many tests being skipped based on the ICU data version don't actually
need it. They might be testing code paths not relying on Intl, or not
performing assertions on the values depending on the ICU data and so not
dependant on the exact ICU version being used.
2015-07-30 18:05:29 +02:00
Christophe Coevoet
801e5e2805 Fix the return value on error for intl methods returning arrays
When the resource is missing, an empty array should be returned rather
than null to respect the interface saying an array is always returned.
2015-07-30 16:28:34 +02:00
Christophe Coevoet
d6db6ad7f7 Fix the handling of null as locale in the stub intl classes
The Intl extension accepts null as locale in formatters and the
collator and will use the default locale in such case. Given that the
stub implementation considers that the default locale is always 'en', it
should be supported here too instead of forcing libraries to pass the
default locale explicitly.
2015-07-30 14:20:01 +02:00
Nicolas Grekas
bf8a923199 Merge branch '2.3' into 2.7
* 2.3:
  Fix merge
  Fix missing _route parameter notice in RouterListener logging case

Conflicts:
	src/Symfony/Component/HttpKernel/EventListener/RouterListener.php
2015-07-30 09:39:20 +02:00
Nicolas Grekas
6b02601e7b Fix merge 2015-07-30 09:37:09 +02:00
Daniel Espendiller
0ce91a6019 Fix missing _route parameter notice in RouterListener logging case 2015-07-29 09:46:44 +02:00
Christian Flothmann
ad6cb10e63 do not dump leading backslashes in class names 2015-07-28 20:25:33 +02:00
Nicolas Grekas
d6dfe9871c [php7] Fix for substr() always returning a string 2015-07-28 17:18:12 +02:00
bokonet
5179acc29b fix issue #15377 2015-07-28 16:52:34 +02:00
Nicolas Grekas
c37387dc02 Merge branch '2.3' into 2.7
* 2.3:
  [php7] Fix for substr() always returning a string
  [Security] Do not save the target path in the session for a stateless firewall
  [DependencyInjection] fixed FrozenParameterBag and improved Parameter…

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Security/Http/Firewall/ExceptionListener.php
2015-07-28 16:07:07 +02:00
Nicolas Grekas
77ee866dd8 [php7] Fix for substr() always returning a string 2015-07-28 14:38:40 +02:00
WouterJ
a336f0e98e Skip ::class constant 2015-07-27 20:12:35 +02:00
Grégoire Pineau
335825363d [Security] Do not save the target path in the session for a stateless firewall 2015-07-26 20:14:09 +02:00
Matt Farmer
32d964ba39 Fix calls to HttpCache#getSurrogate triggering E_USER_DEPRECATED errors. 2015-07-26 20:11:55 +02:00
Fabien Potencier
f1ebfd7b47 minor #15172 [DependencyInjection] fixed FrozenParameterBag and improved Parameter… (Tomaz Ahlin)
This PR was squashed before being merged into the 2.3 branch (closes #15172).

Discussion
----------

[DependencyInjection] fixed FrozenParameterBag and improved Parameter…

The ParameterBagInterface was missing some @throws annotations, so the FrozenParameterBag class was a violation of Liskov subtitution principle. Also the ParameterBagInterface was missing the remove method.

(Optionally the ParameterBagInterface can be later split into two smaller interfaces, because the FrozenParameterBag shouldn't have the add, remove methods in the first place.)

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

I have also fixed removing elements from FrozenParameterBag, as introduced by @satahippy
https://github.com/symfony/DependencyInjection/pull/8

Commits
-------

3ad0794 [DependencyInjection] fixed FrozenParameterBag and improved Parameter…
2015-07-26 20:10:55 +02:00
Tomaz Ahlin
3ad0794aa1 [DependencyInjection] fixed FrozenParameterBag and improved Parameter… 2015-07-26 20:10:26 +02:00
Fabien Potencier
cd8ccffbad Merge branch '2.6' into 2.7
* 2.6:
  [Yaml] throw a ParseException on invalid data type
  #15331 add infos about deprecated classes to UPGRADE-3.0
  [Security] removed useless else condition in SwitchUserListener class.
  [travis] Tests deps=low with PHP 5.6
  [Console] Fix console output with closed stdout
2015-07-26 11:08:49 +02:00
Fabien Potencier
939c305374 Merge branch '2.3' into 2.6
* 2.3:
  #15331 add infos about deprecated classes to UPGRADE-3.0
  [Security] removed useless else condition in SwitchUserListener class.
  [travis] Tests deps=low with PHP 5.6
  [Console] Fix console output with closed stdout
2015-07-26 11:08:40 +02:00
Fabien Potencier
6bb0c4898e bug #15369 [TwigBridge] type-dependent path discovery (marcosdsanchez, xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] type-dependent path discovery

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

With the introduction of the `AbstractFileExtractor` in Symfony 2.7, the
`extract()` method in the `TwigExtractor` class does not necessarily
deal with `SplFileInfo` instances from the Finder component, but also
receives `\SplFileInfo` objects initialized by the base extractor class.

Commits
-------

1e15761 [TwigBridge] type-dependent path discovery
2bf78e5 Resources as string have the same problem
aa7cbbd Introduce failing test case when a SplFileInfo object is passed to the extract() method in the TwigExtractor.
2015-07-26 11:01:14 +02:00
Christian Flothmann
adc6b3067d [Yaml] throw a ParseException on invalid data type
Without this check, PHP would trigger a warning when an array was passed
to `trim()`. The parser must throw a `ParseException` instance on a
malformed YAML string instead.
2015-07-26 10:59:42 +02:00
Christian Flothmann
1e15761ac7 [TwigBridge] type-dependent path discovery
With the introduction of the `AbstractFileExtractor` in Symfony 2.7, the
`extract()` method in the `TwigExtractor` class does not necessarily
deal with `SplFileInfo` instances from the Finder component, but also
receives `\SplFileInfo` objects initialized by the base extractor class.
2015-07-26 08:32:57 +02:00
Marcos Sánchez
2bf78e5f20 Resources as string have the same problem 2015-07-26 08:32:57 +02:00
Marcos Sánchez
aa7cbbd205 Introduce failing test case when a SplFileInfo object is passed to the extract() method in the TwigExtractor.
The problem is that when there's a twig error, symfony expects the `getRelativePath` method that the native object doesn't have.
2015-07-26 08:32:57 +02:00
Hugo Hamon
a1772b6a23 [Asset] removed unused private property. 2015-07-25 23:47:31 +03:00
Nicolas Grekas
38b9a88968 Merge branch '2.6' into 2.7
* 2.6:
  [2.6] Static Code Analysis for Components
  [Security/Http] Fix test relying on a private property
2015-07-24 10:19:55 +02:00
Nicolas Grekas
75dc464db8 [Twig+FrameworkBundle] Fix forward compat with Form 2.8 2015-07-23 11:16:04 +02:00
Fabien Potencier
e60795691c bug #15330 [Console] Fix console output with closed stdout (jakzal)
This PR was merged into the 2.3 branch.

Discussion
----------

[Console] Fix console output with closed stdout

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

Commits
-------

534d9fc [Console] Fix console output with closed stdout
2015-07-23 11:15:22 +02:00
Fabien Potencier
08f696c3e6 minor #15317 [2.6] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.6 branch (closes #15317).

Discussion
----------

[2.6] Static Code Analysis for Components

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

Static Code Analysis with Php Inspections (EA Extended):
    - fixed couple potential issues when code is running in a phar-file

Commits
-------

37a2353 [2.6] Static Code Analysis for Components
2015-07-23 04:17:28 +02:00
Vladimir Reznichenko
37a235394e [2.6] Static Code Analysis for Components 2015-07-23 04:17:26 +02:00
Nicolas Grekas
2d29ac1e10 [Security/Http] Fix test relying on a private property 2015-07-22 23:35:10 +02:00
Kévin Dunglas
65e9f268fe [Serializer] Fix bugs reported in b5990be491 (commitcomment-12301266) 2015-07-22 21:42:44 +02:00
Hugo Hamon
1fc03155d4 [Security] removed useless else condition in SwitchUserListener class. 2015-07-22 15:05:05 +02:00
Nicolas Grekas
5d841a2b03 Merge branch '2.6' into 2.7
* 2.6:
  [HttpKernel] Fix lowest dep

Conflicts:
	src/Symfony/Component/HttpKernel/composer.json
2015-07-22 13:20:14 +02:00
Nicolas Grekas
07b3fa9c1c [HttpKernel] Fix lowest dep 2015-07-22 13:18:53 +02:00
Nicolas Grekas
bf889d3534 Merge branch '2.6' into 2.7
* 2.6:
  [Security] fix check for empty usernames
  [Form] updated exception message of ButtonBuilder::setRequestHandler()
  [travis] Fix deps=high jobs
  [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
  [DependencyInjection] Remove unused code in XmlFileLoader
  [HttpFoundation] Behaviour change in PHP7 for substr
  bumped Symfony version to 2.3.32
  updated VERSION for 2.3.31
  update CONTRIBUTORS for 2.3.31
  updated CHANGELOG for 2.3.31

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
2015-07-22 12:11:00 +02:00
Nicolas Grekas
b0d97b71c5 Merge branch '2.3' into 2.6
* 2.3:
  [Security] fix check for empty usernames
  [Form] updated exception message of ButtonBuilder::setRequestHandler()
  [travis] Fix deps=high jobs
  [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
  [DependencyInjection] Remove unused code in XmlFileLoader
  [HttpFoundation] Behaviour change in PHP7 for substr
  bumped Symfony version to 2.3.32
  updated VERSION for 2.3.31
  update CONTRIBUTORS for 2.3.31
  updated CHANGELOG for 2.3.31

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-07-22 12:08:40 +02:00
Fabien Potencier
18fe999349 minor #15322 [travis] Fix deps=high/low jobs (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Fix deps=high/low jobs

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

Commits
-------

1c9b433 [travis] Fix deps=high jobs
2015-07-22 10:24:19 +02:00
Jakub Zalas
534d9fc560 [Console] Fix console output with closed stdout 2015-07-22 09:03:09 +01:00
Fabien Potencier
0da0f9eb43 bug #15326 [Security] fix check for empty usernames (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] fix check for empty usernames

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

Commits
-------

6585fe4 [Security] fix check for empty usernames
2015-07-22 09:58:47 +02:00
Christian Flothmann
6585fe45a2 [Security] fix check for empty usernames 2015-07-22 08:52:48 +02:00
Issei.M
b483ee2d02 [Form] updated exception message of ButtonBuilder::setRequestHandler() 2015-07-22 05:26:59 +02:00
Nicolas Grekas
1c9b43396f [travis] Fix deps=high jobs 2015-07-21 19:12:21 +02:00
Kévin Dunglas
72dce30309 [Serializer] Simplify AbstractNormalizer::prepareForDenormalization() 2015-07-19 14:40:25 +02:00
Fabien Potencier
99f3475a2a Merge branch '2.6' into 2.7
* 2.6:
  [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3
  bumped Symfony version to 2.6.11
  updated VERSION for 2.6.10
  updated CHANGELOG for 2.6.10
  [PropertyAccess] setValue & isWritable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)
2015-07-16 14:21:55 +02:00
Fabien Potencier
510b2d2de6 bug #15249 [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content (dunglas)
This PR was squashed before being merged into the 2.3 branch (closes #15249).

Discussion
----------

[HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content

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

* Allows to fix tests of https://github.com/symfony/psr-http-message-bridge with PHP 5.6.
* Ease the transition to PSR-7 (in PSR-7, almost everything is stream - #15186)

Maybe should I open it against 2.8 but it can be considered a bug fix at least for the part "returning a string as a resource".

Commits
-------

059964d [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
2015-07-16 13:32:10 +02:00
Kévin Dunglas
059964daf3 [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content 2015-07-16 13:31:59 +02:00
Nicolas Grekas
1adb065d70 [HttpFoundation] Fix Response::closeOutputBuffers() for HHVM 3.3 2015-07-16 10:44:13 +02:00
Fabien Potencier
d6af4ad7bf bug #15282 [HttpFoundation] Behaviour change in PHP7 for substr (Nicofuma)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Behaviour change in PHP7 for substr

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

In PHP7 the behaviour of substr() changed.
To resume: "Truncating an entire string should result in a string."

See: https://bugs.php.net/bug.php?id=62922

Commits
-------

ba6000b [HttpFoundation] Behaviour change in PHP7 for substr
2015-07-16 01:29:21 +02:00
Fabien Potencier
caba8f4cf1 minor #15280 [Console] Set QuestionHelper max attempts in tests (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Set QuestionHelper max attempts in tests

Otherwise the process will block if a test fails.

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

QuestionHelper tests will block the phpunit process if any of tests fails. This is what's currently happening on 2.8 branch. As soon as this is merged to 2.7 and 2.8, I can work on fixing 2.8 tests.

re #14638

Commits
-------

23bc264 [Console] Set QuestionHelper max attempts in tests
2015-07-16 01:18:05 +02:00
Fabien Potencier
be4f2d5b24 bug #15277 [Form] Fix a BC break in the entity (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fix a BC break in the entity

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

@webmozart this brings back the old behaviour. Attached test case passes on 2.3 with no code modifications.

Code [here](73bbaa6cc7/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php (L199-L206)) promises any integer number can be handled with `createChoiceName()`:

```php
            // If the object has a single-column, numeric ID, use that ID as
            // field name. We can only use numeric IDs as names, as we cannot
            // guarantee that a non-numeric ID contains a valid form name
            if ($idReader->isIntId()) {
                return array(__CLASS__, 'createChoiceName');
            }
            // Otherwise, an incrementing integer is used as name automatically
```

While `createChoiceName()` can only handle natural numbers.

Commits
-------

03642b8 [Form] Fix a BC break in the entity
2015-07-16 01:16:36 +02:00
Kévin Dunglas
7fa79dadba [DependencyInjection] Remove unused code in XmlFileLoader 2015-07-15 23:26:13 +02:00
Christian Flothmann
0199fbf545 [Config] type specific check for emptiness 2015-07-15 19:51:32 +02:00
Tristan Darricau
ba6000baff [HttpFoundation] Behaviour change in PHP7 for substr
In PHP7 the behaviour of substr() changed.
To resume: "Truncating an entire string should result in a string."

See: https://bugs.php.net/bug.php?id=62922
2015-07-15 15:30:38 +02:00
Jakub Zalas
23bc2649ba [Console] Set QuestionHelper max attempts in tests
Otherwise the process will block if a test fails.
2015-07-15 08:34:36 +01:00
Jakub Zalas
03642b8ffe [Form] Fix a BC break in the entity 2015-07-14 19:21:52 +01:00
Sebastiaan Stok
3fcf61e664 fix broken ChoiceQuestion 2015-07-14 11:47:38 +02:00
Fabien Potencier
7783573d16 bug #15250 [PropertyAccess] BC Break since 2.6.5 (Nicolas Macherey)
This PR was merged into the 2.6 branch.

Discussion
----------

[PropertyAccess] BC Break since 2.6.5

setValue & isWratable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)

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

This merge request fixes the following cases taht was working with version previous to 2.6.5:

A class with a property myArray which can be a multi dimensional array can now be accesed using myArray[foo][bar][baz]
Previously only myArray[foo] was working the break is since commit e3e4695

Commits
-------

1dcca1a [PropertyAccess] setValue & isWritable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)
2015-07-14 08:51:41 +02:00
Fabien Potencier
095bfd61ca bumped Symfony version to 2.7.3 2015-07-13 22:39:19 +02:00
Fabien Potencier
969d709ad4 updated VERSION for 2.7.2 2015-07-13 21:27:49 +02:00
Fabien Potencier
1e668dd805 bumped Symfony version to 2.6.11 2015-07-13 11:49:29 +02:00
Fabien Potencier
e246af5f3b updated VERSION for 2.6.10 2015-07-13 11:34:32 +02:00
Fabien Potencier
9962f36f97 bumped Symfony version to 2.3.32 2015-07-13 11:30:54 +02:00
Fabien Potencier
bd506a5e84 updated VERSION for 2.3.31 2015-07-13 11:12:26 +02:00
Fabien Potencier
0165636c89 Merge branch '2.6' into 2.7
* 2.6:
  fixed tests
  fixed some tests
  Remove excess whitespace
2015-07-13 11:09:54 +02:00
Fabien Potencier
c57c3f5479 fixed tests 2015-07-13 11:09:47 +02:00
Fabien Potencier
0a2ac57b08 Merge branch '2.3' into 2.6
* 2.3:
  fixed some tests
  Remove excess whitespace
2015-07-13 11:09:24 +02:00
Fabien Potencier
88a2b562fe fixed some tests 2015-07-13 11:08:56 +02:00
Nicolas Macherey
1dcca1a8df [PropertyAccess] setValue & isWritable loops must only stops on reference and object. References can also be arrays and if the loop stops the value is never set in the object. (Breaks since 2.6.5 commit e3e4695)
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

This merge request fixes the following cases taht was working with version previous to 2.6.5:

A class with a property myArray which can be a multi dimensional array can now be accesed using myArray[foo][bar][baz]
Previously only myArray[foo] was working. The break is since commit e3e4695

This commit adds additionnal testing, and is rebased from 2.6 upstream
2015-07-10 06:45:33 +02:00
Ilya Antipenko
b1b52ada41 Remove excess whitespace 2015-07-09 21:38:49 +03:00
Fabien Potencier
c104bc291a fixed merge 2015-07-09 18:32:09 +02:00
Fabien Potencier
175af7f3ac Merge branch '2.6' into 2.7
* 2.6:
  Added 'default' color
  [HttpFoundation] Reload the session after regenerating its id
  [HttpFoundation] Add a test case to confirm a bug in session migration
  [2.6] Static Code Analysis for Components and Bundles
  [Finder] Command::addAtIndex() fails with Command instance argument
  [DependencyInjection] Freeze also FrozenParameterBag::remove
  [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig
  fix CS
  fixed CS
  Add a way to reset the singleton
  [Security] allow to use `method` in XML configs
  Remove duplicate example
  Remove var not used due to returning early (introduced in 8982c32)
  Enhance hhvm test skip message
2015-07-09 18:07:40 +02:00
Fabien Potencier
e6cc4918bf Merge branch '2.3' into 2.6
* 2.3:
  Added 'default' color
  [HttpFoundation] Reload the session after regenerating its id
  [HttpFoundation] Add a test case to confirm a bug in session migration
  [Finder] Command::addAtIndex() fails with Command instance argument
  [DependencyInjection] Freeze also FrozenParameterBag::remove
  fix CS
  fixed CS
  Add a way to reset the singleton
  [Security] allow to use `method` in XML configs
  Remove var not used due to returning early (introduced in 8982c32)
  Enhance hhvm test skip message
2015-07-09 18:02:48 +02:00
Joshua Thijssen
c4bf2e637c Added 'default' color 2015-07-09 17:58:42 +02:00
Giorgio Premi
799d0e0298 [DoctrineBridge][Form] Fix IdReader when indexing by primary foreign key 2015-07-09 14:54:12 +02:00
Giorgio Premi
fe4246aaa0 [DoctrineBridge][Form] Fix EntityChoiceList when indexing by primary foreign key 2015-07-09 14:38:28 +02:00
Jakub Zalas
99b9c78b00 [HttpFoundation] Reload the session after regenerating its id 2015-07-08 20:32:24 +01:00
Jakub Zalas
eda5cb1c27 [HttpFoundation] Add a test case to confirm a bug in session migration 2015-07-08 20:31:33 +01:00
Fabien Potencier
b2fddecde9 bug #15176 [Serializer] Fix ClassMetadata::sleep() (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #15176).

Discussion
----------

[Serializer] Fix ClassMetadata::sleep()

| 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

Fix a bug with the `sleep()` method. It is blocking under when using the APC metadata cache.

Commits
-------

2f42801 [Serializer] Fix ClassMetadata::sleep()
2015-07-08 08:12:51 +02:00
Kévin Dunglas
2f4280110d [Serializer] Fix ClassMetadata::sleep() 2015-07-08 08:12:45 +02:00
Fabien Potencier
6f8a37cbae bug #15202 [Security] allow to use method in XML configs (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Security] allow to use `method` in XML configs

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

Before this change, you always had to use the `methods` key which is
inconsistent compared to other options like `roles` and `ips` for which
it was possible to use their singular versions.

Commits
-------

9b0dfd4 [Security] allow to use `method` in XML configs
2015-07-08 08:08:04 +02:00
Fabien Potencier
ecd8bd9add bug #15218 [Twig][Bridge] replaced extends with use in bootstrap_3_horizontal_layout.html.twig (MatTheCat)
This PR was merged into the 2.6 branch.

Discussion
----------

[Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig

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

The fact `bootstrap_3_horizontal_layout.html.twig` **extends** `bootstrap_3_layout.html.twig` prevent to `use` it while using `{% form_theme form _self %}`.

As form templates don't have any code outside blocks this PR shouldn't induce any BC break.

Commits
-------

15886b6 [Twig][Bridge] replaced `extends` with `use` in bootstrap_3_horizontal_layout.html.twig
2015-07-08 08:01:46 +02:00
Vladimir Reznichenko
1dac1277a3 [2.6] Static Code Analysis for Components and Bundles 2015-07-08 07:59:48 +02:00
Fabien Potencier
63e02b87af bug #15223 [Finder] Command::addAtIndex() fails with Command instance argument (thunderer)
This PR was squashed before being merged into the 2.3 branch (closes #15223).

Discussion
----------

[Finder] Command::addAtIndex() fails with Command instance argument

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

Fixed reported bug #14384 and added test case for it. This is a second PR as previous #14385 went bad after I failed to rebase 2.3 branch properly.

Commits
-------

2aff566 [Finder] Command::addAtIndex() fails with Command instance argument
2015-07-08 07:54:33 +02:00
Tomasz Kowalczyk
2aff5660b2 [Finder] Command::addAtIndex() fails with Command instance argument 2015-07-08 07:54:32 +02:00
Fabien Potencier
e67249e4d5 bug #15220 [DependencyInjection] Freeze also FrozenParameterBag::remove (lyrixx)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Freeze also FrozenParameterBag::remove

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

Commits
-------

4a72c44 [DependencyInjection] Freeze also FrozenParameterBag::remove
2015-07-07 20:27:32 +02:00
Grégoire Pineau
4a72c441d5 [DependencyInjection] Freeze also FrozenParameterBag::remove 2015-07-07 14:38:28 +02:00
MatTheCat
15886b618e [Twig][Bridge] replaced extends with use in bootstrap_3_horizontal_layout.html.twig 2015-07-07 14:03:46 +02:00
Fabien Potencier
4706a90e9d minor #15204 CS fixes for 2.3 (keradus)
This PR was merged into the 2.3 branch.

Discussion
----------

CS fixes for 2.3

| 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

To keep fabbot.io happy ;)

Commits
-------

464b67e fix CS
2015-07-07 09:31:08 +02:00
Dariusz Ruminski
464b67ed09 fix CS 2015-07-05 16:01:47 +02:00
Fabien Potencier
e3b225f4ba fixed CS 2015-07-05 15:20:07 +02:00
Daniel Wehner
0096266009 Add a way to reset the singleton 2015-07-05 15:17:51 +02:00
Christian Flothmann
9b0dfd4267 [Security] allow to use method in XML configs
Before this change, you always had to use the `methods` key which is
inconsistent compared to other options like `roles` and `ips` for which
it was possible to use their singular versions.
2015-07-05 10:40:49 +02:00
Fabien Potencier
5d2cc19fcc bug #15183 [TwigBridge] fix for legacy asset() with EmptyVersionStrategy (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] fix for legacy asset() with EmptyVersionStrategy

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

Commits
-------

cf86a03 fix for legacy asset() with EmptyVersionStrategy
2015-07-04 13:07:22 +02:00
Fabien Potencier
aea7f98107 minor #15193 [Serializer] Fix Groups tests. (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Fix Groups tests.

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

Commits
-------

2bd8fb8 [Serializer] Fix Groups tests.
2015-07-04 12:13:01 +02:00
Kévin Dunglas
2bd8fb8f97 [Serializer] Fix Groups tests. 2015-07-04 12:02:28 +02:00
Dave Hulbert
da5218f2ae Remove var not used due to returning early (introduced in 8982c32) 2015-07-04 00:45:56 +02:00
Kévin Dunglas
3233c2fc14 [Serializer] Fix Groups PHPDoc 2015-07-03 14:45:08 +02:00
Nicolas Grekas
5f4015c3cd Enhance hhvm test skip message 2015-07-03 07:54:45 +02:00
Christian Flothmann
cf86a03b98 fix for legacy asset() with EmptyVersionStrategy 2015-07-02 23:04:32 +02:00
Nicolas Grekas
8c999b5c55 Merge branch '2.6' into 2.7
* 2.6:
  [travis] start hhvm first
  [Validator] always evaluate binary format when changed

Conflicts:
	.travis.yml
2015-07-02 08:17:05 +02:00
Fabien Potencier
c6d9af374f bug #15115 [Validator] always evaluate binary format when changed (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[Validator] always evaluate binary format when changed

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

Commits
-------

2ad7e67 [Validator] always evaluate binary format when changed
2015-07-01 21:58:06 +02:00
Christian Flothmann
2ad7e679cd [Validator] always evaluate binary format when changed 2015-07-01 20:29:17 +02:00
Nicolas Grekas
4b9446edf8 Merge branch '2.6' into 2.7
* 2.6:
  Update DateTimeToArrayTransformer.php
  Mock microtime() and time() in transient tests
  Azerbaijani language pluralization rule
  Move HHVM tests out of the allowed failures
2015-07-01 20:23:16 +02:00
Nicolas Grekas
d5cbc46cd9 Merge branch '2.3' into 2.6
* 2.3:
  Update DateTimeToArrayTransformer.php
  Mock microtime() and time() in transient tests
  Azerbaijani language pluralization rule
  Move HHVM tests out of the allowed failures
2015-07-01 20:23:01 +02:00
Fabien Potencier
6bcdee057e minor #15166 Mock microtime() and time() in transient tests (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Mock microtime() and time() in transient tests

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

Commits
-------

8319ca3 Mock microtime() and time() in transient tests
2015-07-01 19:11:21 +02:00
zhil
27b824a6b7 Update DateTimeToArrayTransformer.php 2015-07-01 19:05:17 +02:00
Nicolas Grekas
8319ca3b05 Mock microtime() and time() in transient tests 2015-07-01 18:07:08 +02:00
Şəhriyar İmanov
efd927a660 Azerbaijani language pluralization rule
In AZ, as in TR, pluralization is always 0: 

0 kitab (zero books)
1 kitab (1 book)
3 kitab (3 books)
104 kitab (104 books)

Apparently ZF ruleset was wrong in the first place :)
2015-07-01 16:29:20 +02:00
Nicolas Grekas
b4fc321912 Fix merge 2015-07-01 14:07:40 +02:00
Nicolas Grekas
eb179f9032 Merge branch '2.6' into 2.7
* 2.6:
  [2.6] Towards 100% HHVM compat
  [Security/Http] Fix test
  [Stopwatch] Fix test
  Minor fixes
  Towards 100% HHVM compat
  unify default AccessDeniedExeption message
  trigger event with right user (add test)
  [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
  [Form] Fixed: Data mappers always receive forms indexed by their names

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2015-07-01 13:25:50 +02:00
Nicolas Grekas
8a782556eb [2.6] Towards 100% HHVM compat 2015-07-01 12:03:42 +02:00
Nicolas Grekas
6a45129b41 [Security/Http] Fix test 2015-06-30 18:51:15 +02:00
Nicolas Grekas
700487002f Merge branch '2.3' into 2.6
* 2.3:
  [Stopwatch] Fix test
2015-06-30 18:49:57 +02:00
Nicolas Grekas
9de0d60b2c [Stopwatch] Fix test 2015-06-30 18:34:54 +02:00
Nicolas Grekas
c53ee35a2e Merge branch '2.3' into 2.6
* 2.3:
  Minor fixes
  Towards 100% HHVM compat
  trigger event with right user (add test)
  [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
  [Form] Fixed: Data mappers always receive forms indexed by their names

Conflicts:
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Filesystem/Filesystem.php
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
2015-06-30 18:10:16 +02:00
Nicolas Grekas
6e1ae53fea Minor fixes 2015-06-30 18:05:31 +02:00
Fabien Potencier
0020680d92 bug #15146 Towards 100% HHVM compat (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Towards 100% HHVM compat

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

Failing components:
- [x] Debug
- [x] DependencyInjection
- [x] Filesystem
- [x] Form
- [x] HttpFoundation
- [x] Process
- [x] Routing

Related HHVM issues:
- https://github.com/facebook/hhvm/issues/5562
- https://github.com/facebook/hhvm/issues/5561
- https://github.com/facebook/hhvm/issues/5330
- https://github.com/facebook/hhvm/issues/3558
- https://github.com/facebook/hhvm/issues/4901

Commits
-------

b9a76ba Towards 100% HHVM compat
2015-06-30 17:31:35 +02:00
Nicolas Grekas
b9a76bab5c Towards 100% HHVM compat 2015-06-30 15:39:12 +02:00
Fabien Potencier
b16fc6c2f6 bug #15061 [Form] Fixed handling of choices passed in choice groups (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fixed handling of choices passed in choice groups

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

I introduced a bug in the 2.7 ChoiceList implementation when choices are passed as groups:

```
$form->add('response', 'choice', array(
    'choices' => array(
        'Decided' => array($yesObj, $noObj),
        'Undecided' => array($maybeObj),
    ),
    // use getName() for the labels
    'choice_label' => 'name',
    'choices_as_values' => true,
));
```

In this example, since the choices `$yesObj` and `$maybeObj` have the same array index `0`, the same label is displayed for the two options. The problem is that we rely on the keys passed in the "choices" option to identify choices in a choice list (which are, as you see, not guaranteed to be free of duplicates).

This PR changes the new choice list implementation to identify choices by values instead. We already have the guarantee that choices can be identified uniquely by their string values.

This PR should be included in 2.7.2 to fix the regression.

Unfortunately, a few BC breaks in the new implementation are necessary to make this fix:

* The legacy `ChoiceListInterface` was reverted to how it was in 2.6 and does *not* extend the new `ChoiceListInterface` anymore.
* As a consequence, legacy choice lists need to be wrapped into a `LegacyChoiceListAdapter` when they are passed to any place in the framework where a new choice list is expected.
* The new `ChoiceListInterface` has two additional methods `getStructuredValues()` and `getOriginalKeys()` now.
* `ArrayKeyChoiceList::toArrayKey()` was marked as internal.
* `ChoiceListFactoryInterface::createView()` does not accept arrays and Traversables anymore for the `$groupBy` parameter (for simplicity).

@fabpot Where should we document the upgrade path for 2.7.1 => 2.7.2?

Commits
-------

7623dc8 [Form] Fixed handling of choices passed in choice groups
2015-06-30 14:46:52 +02:00
Fabien Potencier
bfc174a178 bug #15145 [Bridge/PhpUnit] Enforce a consistent locale (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Bridge/PhpUnit] Enforce a consistent locale

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

Will fix some HHVM failures

Commits
-------

b04fe83 [Bridge/PhpUnit] Enforce a consistent locale
2015-06-30 11:32:10 +02:00
Nicolas Grekas
b04fe832ac [Bridge/PhpUnit] Enforce a consistent locale 2015-06-30 10:16:45 +02:00
Fabien Potencier
38c08d1fb3 bug #15069 [Form] Fixed: Data mappers always receive forms indexed by their names (webmozart)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fixed: Data mappers always receive forms indexed by their names

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

This PR facilitates writing domain-specific data mappers, since it guarantees that you can access forms by name in the data mapper methods. Currently, `Form::add()` does not set the index of the array passed to the data mapper to the form's name.

Commits
-------

86b7fe5 [Form] Fixed: Data mappers always receive forms indexed by their names
2015-06-30 07:54:26 +02:00
Fabien Potencier
c20720f9f6 bug #15142 Fix choice translation domain for expanded choice widget (jvasseur)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix choice translation domain for expanded choice widget

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

This fix the form component using the translation_domain instead of the choice_translation_domain for expanded choice widgets.

I had to add the possibility to skip label translation when using ```translation_domain => false``` to do this fix so this can be considered a new feature to.

Commits
-------

52755ba Fix choice translation domain for expanded choice widget
2015-06-30 07:47:57 +02:00
Dave Hulbert
8e41a5b22a Fix param order of assertEquals (expected, actual) in test for Finder\Glob 2015-06-29 20:56:37 +01:00
Jérôme Vasseur
52755ba26d Fix choice translation domain for expanded choice widget 2015-06-29 21:23:41 +02:00
Christian Flothmann
87e7709b7b unify default AccessDeniedExeption message 2015-06-29 20:24:24 +02:00
Christian Flothmann
f999217a96 trigger event with right user (add test) 2015-06-28 20:33:21 +02:00
Richard van Laak
01ee3f6cda [Security] Initialize SwitchUserEvent::targetUser on attemptExitUser
The `SwitchUserEvent` is triggered in case an account is switched. This works okay while switching to the user, but on exit the `SwitchUserEvent` is triggered again with the original User. That User was not initialized by the provider yet.

load user by UserInterface instead of username
2015-06-28 20:33:21 +02:00
Fabien Potencier
b6dbfa4b73 minor #15136 Fix quoting style consistency (2.7) (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix quoting style consistency (2.7)

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

Follows up #15129.

Commits
-------

2aab007 Fix quoting style consistency.
2015-06-28 19:27:31 +02:00
Fabien Potencier
873e3d9a74 Merge branch '2.6' into 2.7
* 2.6:
  [2.6][Validator] Fix BC for Validator's validate method
  Very small typo fix
  Fix quoting style consistency.
  [DependencyInjection] Fail when dumping a Definition with no class nor factory
  Normalizing recursively - see #9096
  No change - the normalizeParams is a copy-and-paste of the earlier logic
  fixes issue with logging array of non-utf8 data
  fix validation for Maestro UK card numbers

Conflicts:
	src/Symfony/Component/Security/Http/Firewall/DigestAuthenticationListener.php
	src/Symfony/Component/Validator/Validator/LegacyValidator.php
2015-06-28 19:13:14 +02:00
Fabien Potencier
e36e83117b Merge branch '2.3' into 2.6
* 2.3:
  Fix quoting style consistency.
  [DependencyInjection] Fail when dumping a Definition with no class nor factory
  Normalizing recursively - see #9096
  No change - the normalizeParams is a copy-and-paste of the earlier logic
  fixes issue with logging array of non-utf8 data
  fix validation for Maestro UK card numbers
2015-06-28 19:11:14 +02:00
Fabien Potencier
6e4563e7ee bug #15126 [2.6][Validator] Fix BC for Validator's validate method (michalmarcinkowski)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][Validator] Fix BC for Validator's validate method

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

This fix makes method call ``` $validator->validate($value, array()); ``` backward compatible and does not throw

```
[Symfony\Component\Validator\Exception\NoSuchMetadataException]

The class or interface "XXX" does not exist.
```

when the ``` $value ``` is a scalar type.

Commits
-------

ffe25dc [2.6][Validator] Fix BC for Validator's validate method
2015-06-28 19:09:43 +02:00
Fabien Potencier
cf6296b3db bug #15101 [Form] Fixed compatibility with FormTypeInterface implementations that don't extend AbstractType (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fixed compatibility with FormTypeInterface implementations that don't extend AbstractType

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

Commits
-------

4a1ad7e [Form] Fixed compatibility with FormTypeInterface implementations that don't extend AbstractType
2015-06-28 19:06:19 +02:00
Fabien Potencier
26af381433 minor #15132 Very small typo fix (WouterJ)
This PR was merged into the 2.6 branch.

Discussion
----------

Very small typo fix

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

Commits
-------

04deaed Very small typo fix
2015-06-28 19:05:51 +02:00
michalmarcinkowski
ffe25dc921 [2.6][Validator] Fix BC for Validator's validate method 2015-06-28 16:52:59 +02:00
Wouter J
04deaed544 Very small typo fix 2015-06-28 16:17:58 +02:00
ogizanagi
2aab0073bd Fix quoting style consistency. 2015-06-28 12:39:54 +02:00
ogizanagi
57d30f9746 Fix quoting style consistency. 2015-06-28 12:13:08 +02:00
Fabien Potencier
e93a3d7896 bug #15083 [DependencyInjection] Fail when dumping a Definition with no class nor factory (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Fail when dumping a Definition with no class nor factory

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

I tried creating an anonymous inline service with a DefinitionDecorator, but that did not work.
Here is the fix.

Commits
-------

23ad4ad [DependencyInjection] Fail when dumping a Definition with no class nor factory
2015-06-28 09:25:22 +02:00
Nicolas Grekas
23ad4ad133 [DependencyInjection] Fail when dumping a Definition with no class nor factory 2015-06-28 09:23:14 +02:00
Fabien Potencier
77da994658 bug #15127 [Validator] fix validation for Maestro UK card numbers (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] fix validation for Maestro UK card numbers

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

The issue with the fix in #15086 was, that the `[56-69]` part of the regular expression did not cover the numbers from 56 to 69 but only matched one number if it was 5, 6 or 9 which means that the regular expression itself was not only invalid, but also covered only a total maximum length of 18 digits.

Commits
-------

f24532a fix validation for Maestro UK card numbers
2015-06-28 09:11:08 +02:00
Ryan Weaver
1882a2ae47 Normalizing recursively - see #9096 2015-06-27 18:20:43 -04:00
Ryan Weaver
8edd4c6ffb No change - the normalizeParams is a copy-and-paste of the earlier logic 2015-06-27 18:19:06 -04:00
Vladyslav Petrovych
eae907c4ed fixes issue with logging array of non-utf8 data 2015-06-27 18:14:41 -04:00
Christian Flothmann
f24532a04e fix validation for Maestro UK card numbers 2015-06-27 23:20:18 +02:00
Tobias Schultze
dd504d4adf Merge branch '2.6' into 2.7 2015-06-27 22:17:00 +02:00
Tobias Schultze
cbca187a49 Merge branch '2.3' into 2.6
Conflicts:
	src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
2015-06-27 22:15:38 +02:00
Restless-ET
1a5c4c6c93 [Translation][Form][choice] empty_value shouldn't be translated when it has an empty value 2015-06-27 19:52:55 +02:00
Abdellatif Ait boudad
51212acbff [Validator][callback constraint] include class name in ConstraintDefinitionException. 2015-06-27 16:22:07 +02:00
Fabien Potencier
3ef7a1f6d6 bug #15117 [Form] fixed sending non array data on submit to ResizeListener (BruceWouaigne)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] fixed sending non array data on submit to ResizeListener

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

I agree with @Tobion that #13851 is a bug fix and therefore should be applied on the `2.3` branch too.

Commits
-------

0f185c9 [Form] [EventListener] fixed sending non array data on submit to ResizeListener
2015-06-27 16:14:07 +02:00
Fabien Potencier
f5d5a3be96 bug #15122 [Console] respect multi-character shortcuts (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] respect multi-character shortcuts

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

The `TextDescriptor` assumed that shortcuts will only consume one space
when calculating the maximum width needed to display the option's
synopsis.

Commits
-------

bd49f23 [Console] respect multi-character shortcuts
2015-06-27 16:10:25 +02:00
Fabien Potencier
30b2fd2e8b minor #15116 [FrameworkBundle] update type hint in test (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] update type hint in test

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

Commits
-------

96a5653 update type hint
2015-06-27 16:07:54 +02:00
Fabien Potencier
bccfb44171 minor #15112 [2.7][DependencyInjection] improve deprecation messages (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][DependencyInjection] improve deprecation messages

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

Also include the service id in the deprecation message.

Commits
-------

9e41fa7 [DependencyInjection] improve deprecation messages
2015-06-27 16:06:41 +02:00
Christian Flothmann
bd49f23bb1 [Console] respect multi-character shortcuts
The `TextDescriptor` assumed that shortcuts will only consume one space
when calculating the maximum width needed to display the option's
synopsis.
2015-06-26 23:20:39 +02:00
Christian Flothmann
62f12cde7a [Validator] don't trigger deprecation with empty group array 2015-06-26 23:10:48 +02:00
Massimiliano Arione
26c4413f29 Fix typo in Italian translation 2015-06-26 20:04:19 +02:00
BruceWouaigne
0f185c9fef [Form] [EventListener] fixed sending non array data on submit to ResizeListener 2015-06-26 19:11:54 +02:00
Christian Flothmann
96a5653c8d update type hint 2015-06-26 18:55:33 +02:00
Christian Flothmann
9e41fa7852 [DependencyInjection] improve deprecation messages
Also include the service id in the deprecation message.
2015-06-26 16:41:50 +02:00
Tobias Schultze
a0af4ef1bf minor #15066 [FrameworkBundle] Remove unused old_assets.xml (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Remove unused old_assets.xml

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

Commit f74a1f2dc3 removed any reference to old_assets.xml

Commits
-------

18e37c8 [FrameworkBundle] Remove unused old_assets.xml
2015-06-26 11:55:27 +02:00
Abdellatif Ait boudad
d1de40e036 Merge remote-tracking branch 'origin/2.6' into 2.7
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Component/Validator/Constraints/EmailValidator.php
2015-06-25 12:52:11 +00:00
Abdellatif Ait boudad
33413153c9 [Translation][debug cmd] fixed failing tests. 2015-06-25 12:14:41 +00:00
Bernhard Schussek
4a1ad7e4c6 [Form] Fixed compatibility with FormTypeInterface implementations that don't extend AbstractType 2015-06-25 13:34:24 +02:00
Nicolas Grekas
a85ed5097b Merge branch '2.3' into 2.6
* 2.3:
  Fixed the regexp for the validator of Maestro-based credit/debit cards
  [Console] Fix STDERR output text on IBM iSeries OS400
  [HttpFoundation] Use convention to allow throwing from __toString()
  [Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern)
  [bugfix][MonologBridge] WebProcessor: passing  to BaseWebProcessor
  [2.3] Static Code Analysis for Components
  [Translation][update cmd] taken account into bundle overrides path.

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
2015-06-25 13:21:15 +02:00
Fabien Potencier
b812eb05db bug #13750 [DependencyInjection] Fixed decoration of service for service with parent (hason)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] Fixed decoration of service for service with parent

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

Commits
-------

0b8b58c [DependencyInjection] Fixed decoration of service for service with parent
2015-06-25 11:05:26 +02:00
Nicolas Grekas
058bacda10 minor #15077 [HttpFoundation] Use convention to allow throwing from __toString() (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Use convention to allow throwing from __toString()

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

Corollary to #15076, works without it.

Commits
-------

8982c32 [HttpFoundation] Use convention to allow throwing from __toString()
2015-06-25 11:05:04 +02:00
Javier Eguiluz
d37962fb03 Fixed the regexp for the validator of Maestro-based credit/debit cards 2015-06-24 16:17:28 +02:00
Nicolas Grekas
18e37c834e [FrameworkBundle] Remove unused old_assets.xml 2015-06-24 16:11:52 +02:00
Fabien Potencier
18716153ee bug #15058 [Console] Fix STDERR output text on IBM iSeries OS400 (johnkary)
This PR was squashed before being merged into the 2.3 branch (closes #15058).

Discussion
----------

[Console] Fix STDERR output text on IBM iSeries OS400

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

Prior to this PR a Symfony Console command would output error text as random symbols when executed via the IBM console program QSH. Affected error text output such as when a required InputArgument is missing, or when explicitly using `$output->getErrorOutput()->writeln('Some error text here')`.

![Example error output](http://i.imgur.com/PQplK1p.png)

This PR fixes error text so it properly prints to IBM console programs such as QSH and QP2SHELL.

I previously fixed STDOUT for PHP running on IBM iSeries OS400 (Zend Server) using the same approach. Since that PR was merged ConsoleOutput class began using its own output for STDERR which exhibits the same issue STDOUT did.

The following commits and previous Symfony PRs have our relevant discussion about ASCII vs EBCDIC character encoding to fix this issue:

* [Original IBM STDOUT reported in #1434](https://github.com/symfony/symfony/issues/1434)
* [My PR #4152 that fixes #1434](https://github.com/symfony/symfony/pull/4152)

Thanks!
🚀

Commits
-------

23c42ca [Console] Fix STDERR output text on IBM iSeries OS400
2015-06-23 19:48:55 +02:00
John Kary
23c42ca333 [Console] Fix STDERR output text on IBM iSeries OS400 2015-06-23 19:48:52 +02:00
Fabien Potencier
dac15524ea bug #14853 [Validator] more strict e-mail validation regex (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[Validator] more strict e-mail validation regex

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

Commits
-------

6491033 [Validator] more strict e-mail validation regex
2015-06-23 19:31:35 +02:00
Nicolas Grekas
8982c3246c [HttpFoundation] Use convention to allow throwing from __toString() 2015-06-23 13:38:55 +02:00
Bernhard Schussek
86b7fe590b [Form] Fixed: Data mappers always receive forms indexed by their names 2015-06-22 21:00:03 +02:00
Bernhard Schussek
497433cf03 [Form] Fixed: Support objects with __toString() in choice groups 2015-06-22 17:19:42 +02:00
Bernhard Schussek
5571caa305 [Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern) 2015-06-22 17:14:39 +02:00
Abdellatif Ait boudad
2e37ede730 [Translation][update cmd] taken account into bundle overrides path. 2015-06-22 14:30:38 +00:00
Bernhard Schussek
7623dc87e8 [Form] Fixed handling of choices passed in choice groups 2015-06-22 14:31:47 +02:00
Fabien Potencier
25a50f5b55 bug #15039 [Translation][update cmd] taken account into bundle overrides path. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation][update cmd] taken account into bundle overrides path.

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

Commits
-------

a8f315b [Translation][update cmd] taken account into bundle overrides path.
2015-06-21 22:21:25 +02:00
Fabien Potencier
e64b9bbcbd bug #15038 [Translation][debug cmd] taken account into bundle overrides path. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[Translation][debug cmd] taken account into bundle overrides path.

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

Commits
-------

c3a077a [Translation][debug cmd] taken account into bundle overrides path.
2015-06-21 22:20:15 +02:00
Fabien Potencier
7a234429fc bug #14964 [bugfix][MonologBridge] WebProcessor: passing $extraFields to BaseWebProcessor (MacDada)
This PR was squashed before being merged into the 2.3 branch (closes #14964).

Discussion
----------

[bugfix][MonologBridge] WebProcessor: passing $extraFields to BaseWebProcessor

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

Commits
-------

f41d1c9 [bugfix][MonologBridge] WebProcessor: passing  to BaseWebProcessor
2015-06-21 22:16:54 +02:00
Dawid Nowak
f41d1c929f [bugfix][MonologBridge] WebProcessor: passing to BaseWebProcessor 2015-06-21 22:16:53 +02:00
Vladimir Reznichenko
aa5e616511 [2.3] Static Code Analysis for Components 2015-06-21 22:11:32 +02:00
Diego Saint Esteben
8602a4b156 Fixed wrong phpdocs 2015-06-21 15:10:28 -03:00
Abdellatif Ait boudad
c3a077a38b [Translation][debug cmd] taken account into bundle overrides path. 2015-06-19 15:52:10 +00:00
Abdellatif Ait boudad
a8f315b8dd [Translation][update cmd] taken account into bundle overrides path. 2015-06-19 15:48:24 +00:00
Nicolas Grekas
cc13cc5584 Merge branch '2.6' into 2.7
* 2.6:
  [VarDumper] Fix dump output for better readability

Conflicts:
	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2015-06-19 17:09:03 +02:00
Fabien Potencier
ad12251781 bug #14989 [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #14989).

Discussion
----------

[FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer

| 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

Inject the `property_accessor` service if available in the `ObjectNormalize` instead of creating a new instance.

Commits
-------

256d441 [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer
2015-06-19 17:02:37 +02:00
Kévin Dunglas
256d441b21 [FrameworkBundle] Reuse PropertyAccessor service for ObjectNormalizer 2015-06-19 17:02:31 +02:00
Nicolas Grekas
e448fadf98 [VarDumper] Fix dump output for better readability 2015-06-19 14:34:14 +02:00
Nicolas Grekas
9eea9eb848 [PhpUnitBridge] Enforce @-silencing of deprecation notices according to new policy 2015-06-18 21:21:56 +02:00
Nicolas Grekas
338cd02ede Merge branch '2.6' into 2.7
* 2.6:
  [DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader
  [Form] Fixed: Filter non-integers when selecting entities by int ID
  Fix merge

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Form/ChoiceList/ORMQueryBuilderLoaderTest.php
2015-06-18 18:13:27 +02:00
Nicolas Grekas
287db73898 Merge branch '2.3' into 2.6
* 2.3:
  [DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader
  [Form] Fixed: Filter non-integers when selecting entities by int ID
2015-06-18 18:11:37 +02:00
Nicolas Grekas
086c58c716 [DoctrineBridge] Bypass the db when no valid identifier is provided in ORMQueryBuilderLoader 2015-06-18 17:54:01 +02:00
Richard Trebichavský
08a4b80760 [Serializer] Fixed typo in comment 2015-06-18 17:07:16 +02:00
Bernhard Schussek
45579fd7cd [Form] Fixed: Filter non-integers when selecting entities by int ID 2015-06-18 17:05:41 +02:00
Nicolas Grekas
f3d6bbff59 Fix merge 2015-06-18 15:42:09 +02:00
Nicolas Grekas
2a1338ba19 Fix merge 2015-06-18 15:40:06 +02:00
Nicolas Grekas
2e7c2caaf2 Merge branch '2.6' into 2.7
* 2.6:
  Add test for HHVM FatalErrors
  [2.6][Debug] Fix fatal-errors handling on HHVM
  [2.3][Debug] Fix fatal-errors handling on HHVM
  Standardize the name of the exception variables
  [2.3] Static Code Analysis for Components
  Remove duplicated paths

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Security/Http/Firewall/BasicAuthenticationListener.php
	src/Symfony/Component/Security/Http/Firewall/ContextListener.php
	src/Symfony/Component/Security/Http/Firewall/RememberMeListener.php
	src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php
2015-06-18 15:03:50 +02:00
Nicolas Grekas
7617492914 Merge branch '2.3' into 2.6
* 2.3:
  [2.3][Debug] Fix fatal-errors handling on HHVM
  Standardize the name of the exception variables
  [2.3] Static Code Analysis for Components
  Remove duplicated paths

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpFoundation/Session/Storage/MockArraySessionStorage.php
	src/Symfony/Component/Security/Acl/Dbal/AclProvider.php
	src/Symfony/Component/Security/Core/Authentication/Provider/UserAuthenticationProvider.php
2015-06-18 14:58:06 +02:00