Commit Graph

16885 Commits

Author SHA1 Message Date
Guilherme Blanco
529d99c567 Fixed MongoODM entity loader. Improved loading behavior of entities and documents by reusing entity loader. 2015-03-20 20:23:02 +00:00
Issei.M
0ada9e4c16 [Validator] added Japanese translation for unmatched charset (id: 80) 2015-03-20 16:04:18 +01:00
Nicolas Grekas
00701cba8d [VarDumper] Add Caster for XML-parser resources 2015-03-20 14:43:24 +01:00
Nicolas Grekas
2d2cd84783 feature #13980 [VarDumper] Added support for amqp (lyrixx)
This PR was merged into the 2.7 branch.

Discussion
----------

[VarDumper] Added support for amqp

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

![screenshot3](https://cloud.githubusercontent.com/assets/408368/6736802/5bcb2cfe-ce67-11e4-8bce-a5ca5f98239f.png)

Commits
-------

5fa063e [VarDumper] Added support for amqp
2015-03-20 14:28:57 +01:00
Samuel ROZE
648aacbc7c [FrameworkBundle] Allow to disable Kernel reboot 2015-03-20 11:50:15 +01:00
Abdellatif Ait boudad
a8c4da12b8 [WebProfilerBundle] fixed undefined buttons. 2015-03-20 09:01:52 +00:00
Romain Neutron
cbd89f5cd2 [WebProfilerBundle] Fix javascript toolbar on IE8 2015-03-19 22:02:30 +01:00
Fabien Potencier
bd0eaef28d bug #13953 [Translation][MoFileLoader] fixed load empty translation. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translation][MoFileLoader] fixed load empty translation.

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

see https://www.gnu.org/software/gettext/manual/html_node/MO-Files.html

![selection_003](https://cloud.githubusercontent.com/assets/1753742/6690874/fcf04ef6-ccba-11e4-83a4-4f50188709c5.png)

Commits
-------

22f5a73 [Translation][MoFileLoader] fixed load empty translation.
2015-03-19 19:49:28 +01:00
Fabien Potencier
fa11c0637e feature #12818 [2.7][SecurityBundle] Added a command to encode a password (saro0h)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][SecurityBundle] Added a command to encode a password

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

- [x] Give some love to the UI (need your feedbacks)
- [x] Write tests
- [x] Write documentation

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

The encoder got depend directly from the configuration of the user class in the security.yml.
So the user choose the user type, and, using the method `getEncoder($user)` of the `security.encoder_factory` service, I get the right encoder configured.

*Here is the output for `security:encode-password`*:
![capture d ecran 2015-01-01 a 19 48 07](https://cloud.githubusercontent.com/assets/667519/5593008/3af45686-91ef-11e4-8024-e66a2e000fbe.png)

Commits
-------

a7bd0fc Added a command to encode a password
2015-03-19 19:20:49 +01:00
Grégoire Pineau
5fa063e63d [VarDumper] Added support for amqp 2015-03-19 18:42:42 +01:00
Fabien Potencier
3f0fd7ca99 minor #13966 [FrameworkBundle] Remove asset from require-dev (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Remove asset from require-dev

| 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

Not needed because already in `require`.

Commits
-------

3a29bb6 [FrameworkBundle] Remove asset from require-dev
2015-03-19 17:25:15 +01:00
Jesper Pedersen
c5f1f60981 [WebProfiler] Fix partial search on url in list 2015-03-19 10:54:07 +01:00
Kévin Dunglas
efadac065c [FrameworkBundle] Fix regression introduced by #13107 2015-03-18 22:58:41 +01:00
Kévin Dunglas
3a29bb65f5 [FrameworkBundle] Remove asset from require-dev 2015-03-18 21:25:10 +01:00
Fabien Potencier
74ec8953c6 feature #13107 [FrameworkBundle] Serializer groups support (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #13107).

Discussion
----------

[FrameworkBundle] Serializer groups support

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

This PR enables serializer groups in the full stack framework (including XML, YAML, annotations and caching).

Commits
-------

83b56f6 [FrameworkBundle] Serializer groups support
2015-03-18 19:12:38 +01:00
Kévin Dunglas
83b56f60d0 [FrameworkBundle] Serializer groups support 2015-03-18 19:11:46 +01:00
Martin Hasoň
0eb34f326b [DependencyInjection] Added support for keys "method" and "arguments" in "calls" statement for yaml format 2015-03-18 12:09:21 +01:00
Grégoire Pineau
ce2764d416 [DependencyInjection] Highest precedence for user parameters
If `router.request_context.host` is defined in `parameters.yml` and if this
key is used in `globals` section of twig bundle then the value registered in the
DIC/parameters is the default value (`localhost`).

It occurs because generall the framework bundle is defined before the twig
bundle. So after the first loop, the (user) value registered in the
`ContainerBuilder` is overridden by the default value of the framework bundle.
And so, when it comes the time to process twig bundle, the last one gets the
default value, and not the user value.

This patch force the merge of default value, but give an highest precedence of
user parameters for each extensions.
2015-03-18 10:30:04 +01:00
Nicolas Grekas
5999964151 [VarDumper] Add catch-all-objects hook for casters 2015-03-18 09:41:21 +01:00
Saro0h
a7bd0fc98d Added a command to encode a password 2015-03-17 23:11:01 +01:00
Fabien Potencier
d64cb493af bumped Symfony version to 2.6.6 2015-03-17 16:51:12 +01:00
Abdellatif Ait boudad
22f5a735fd [Translation][MoFileLoader] fixed load empty translation. 2015-03-17 15:35:29 +00:00
Fabien Potencier
80833da9d0 updated VERSION for 2.6.5 2015-03-17 15:58:46 +01:00
Fabien Potencier
4b7e5fabf9 bumped Symfony version to 2.3.27 2015-03-17 15:49:54 +01:00
Fabien Potencier
dd70065d94 updated VERSION for 2.3.26 2015-03-17 15:18:00 +01:00
Fabien Potencier
7055091edc bug #13944 [HttpKernel] UriSigner::buildUrl - default params for http_build_query (Jakub Simon)
This PR was squashed before being merged into the 2.6 branch (closes #13944).

Discussion
----------

[HttpKernel] UriSigner::buildUrl - default params for http_build_query

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

UriSigner fail to verify hash when custom ini setting arg_separator.output is used.
It was introduced in https://github.com/symfony/symfony/pull/12574

Commits
-------

3d6933f [HttpKernel] UriSigner::buildUrl - default params for http_build_query
2015-03-17 13:54:34 +01:00
Jakub Simon
3d6933f00c [HttpKernel] UriSigner::buildUrl - default params for http_build_query 2015-03-17 13:54:32 +01:00
Fabien Potencier
59ca5b3af9 Merge branch '2.6' into 2.7
* 2.6:
  Marked the ResolveParameterPlaceHoldersPassTest as legacy
  [ExpressionLanguage] fixed issues when parsing postfix expressions
  remove unused code
  do not inline service factories
  resolve class parameters in service factories
  [Serializer] Fix object normalization exceptions

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
	src/Symfony/Component/Serializer/Normalizer/GetSetMethodNormalizer.php
	src/Symfony/Component/Serializer/Normalizer/PropertyNormalizer.php
	src/Symfony/Component/Serializer/Tests/Normalizer/PropertyNormalizerTest.php
2015-03-17 13:50:07 +01:00
Fabien Potencier
8962d5d3ef minor #13941 [2.6] Marked the ResolveParameterPlaceHoldersPassTest as legacy (saro0h)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Marked the ResolveParameterPlaceHoldersPassTest as legacy

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

Splitted the ResolveParameterPlaceHoldersPassTest to obtain a legacy test to avoid deprecation rise.

Commits
-------

67ca1f4 Marked the ResolveParameterPlaceHoldersPassTest as legacy
2015-03-17 13:44:40 +01:00
Fabien Potencier
d609e4e313 Merge branch '2.3' into 2.6
* 2.3:
  remove unused code
2015-03-17 13:43:30 +01:00
sarah khalil
67ca1f4df3 Marked the ResolveParameterPlaceHoldersPassTest as legacy 2015-03-17 13:42:58 +01:00
Michael Lee
e504ebee24 [ExpressionLanguage] fixed issues when parsing postfix expressions
Exception shall be thrown when parsing the following expressions:

foo."#", foo."bar", foo.**, foo.123

The original parser didn't throw exception for foo."#", foo.** and
foo.123

| 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
2015-03-17 07:52:13 +01:00
Fabien Potencier
051c3de95a minor #13933 [Serializer] Fix object normalization exceptions (dunglas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Serializer] Fix object normalization exceptions

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

Commits
-------

500df47 [Serializer] Fix object normalization exceptions
2015-03-17 07:44:03 +01:00
Fabien Potencier
9b736c8829 bug #13914 [DependencyInjection] do not inline service factories (xabbuh)
This PR was merged into the 2.6 branch.

Discussion
----------

[DependencyInjection] do not inline service factories

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

The `XmlDumper`, which is used in the full-stack framework to dump the
used container, is not capable to dump inlined factories.

Commits
-------

663ae9f do not inline service factories
2015-03-17 07:43:12 +01:00
Christian Flothmann
8529719c01 remove unused code 2015-03-16 15:31:07 +01:00
Christian Flothmann
663ae9f5aa do not inline service factories
The `XmlDumper`, which is used in the full-stack framework to dump the
used container, is not capable to dump inlined factories.
2015-03-16 15:30:23 +01:00
Christian Flothmann
8bda37c390 resolve class parameters in service factories 2015-03-16 14:48:05 +01:00
Kévin Dunglas
500df475a6 [Serializer] Fix object normalization exceptions 2015-03-16 00:12:13 +01:00
Fabien Potencier
17ad6fd90c Merge branch '2.6' into 2.7
* 2.6:
  `ResolveParameterPlaceHoldersPass` unit tests
  Fixing wrong variable name from #13519
  [translation][initialize cache] Remove dead code.

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
2015-03-15 20:44:07 +01:00
Fabien Potencier
be053446bd Merge branch '2.3' into 2.6
* 2.3:
  `ResolveParameterPlaceHoldersPass` unit tests
  Fixing wrong variable name from #13519
2015-03-15 20:43:27 +01:00
Fabien Potencier
d50f0a89cd minor #13930 [DependencyInjection] ResolveParameterPlaceHoldersPass unit tests (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] `ResolveParameterPlaceHoldersPass` unit tests

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

When working #13924, I noticed that there were no tests for the `ResolveParameterPlaceHoldersPass` class. So I decided to add them for the `2.3` branch too.

Commits
-------

b8d42b3 `ResolveParameterPlaceHoldersPass` unit tests
2015-03-15 20:28:56 +01:00
Christian Flothmann
b8d42b368b ResolveParameterPlaceHoldersPass unit tests 2015-03-15 17:33:36 +01:00
Ryan Weaver
3ae52ed739 Fixing wrong variable name from #13519 2015-03-14 19:44:00 -04:00
Abdellatif Ait boudad
bc066fb3e7 [translation][initialize cache] Remove dead code. 2015-03-14 11:42:25 +00:00
Fabien Potencier
a003380c39 Merge branch '2.6' into 2.7
* 2.6:
  [DependencyInjection] fixed service resolution for factories
  [acl][command][SecurityBundle] Fixed user input option mode to be an Array

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
2015-03-14 06:33:51 +01:00
Fabien Potencier
d2fc77e4d1 Merge branch '2.3' into 2.6
* 2.3:
  [DependencyInjection] fixed service resolution for factories

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/ContainerBuilderTest.php
2015-03-14 06:27:59 +01:00
Fabien Potencier
e34387d7b5 bug #13519 [DependencyInjection] fixed service resolution for factories (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] fixed service resolution for factories

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

In the service container, factories can be defined with a class/method pair or a service/method pair.

The class or service value can be a container parameter, but it was not supported everywhere, this PR fixes that.

Note that the method can never be a container parameter as this is supported nowhere in the current code, so this has not been changed.

Another PR will fix the 2.6 way of configuring a factory.

Commits
-------

f86ad95 [DependencyInjection] fixed service resolution for factories
2015-03-14 06:16:41 +01:00
Fabien Potencier
b178ee57e3 feature #13872 [FrameworkBundle] Added domain column when debugging translations (hiddewie)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Added domain column when debugging translations

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

This is my first PR. If I do anything wrong, please let me know and I'll try to fix it.

## Possible TODO:
```
[ ] Update relevant documentation
```

## Explanation for the PR:
While editing a web application, I was changing a LOT of translation files. The debug:translation command helps a lot, but it is hard to find out in which domain the missing/unused translations are located. By adding an extra column with the name of the domain, I get more information about the translations in the table.

## New output:
```
+----------+------------+---------------------+----------------------+
| State(s) | Domain     | Id                  | Message Preview (nl) |
+----------+------------+---------------------+----------------------+
| x        | user_admin | user.iban.incorrect | user.iban.incorrect  |
+----------+------------+---------------------+----------------------+

Legend:
 x Missing message
 o Unused message
 = Same as the fallback message
```

Commits
-------

25ef76f [FrameworkBundle] Added domain column when debugging translations
2015-03-14 06:14:24 +01:00
Fabien Potencier
e5fe2dff01 feature #13780 [HttpKernel] Throw a LogicException when kernel.exception does not lead to a Response (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Throw a LogicException when kernel.exception does not lead to a Response

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

Commits
-------

22f4807 [HttpKernel] Throw a LogicException when kernel.exception does not led to a Response
2015-03-14 06:13:34 +01:00
Fabien Potencier
cc18a594e4 bug #13790 [acl][command][SecurityBundle] Fixed user input option mode to be an Array (benjaminlong)
This PR was merged into the 2.6 branch.

Discussion
----------

[acl][command][SecurityBundle] Fixed user input option mode to be an Array

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

User input option should always return an array, even if only one user is passed.

Commits
-------

bd17ef8 [acl][command][SecurityBundle] Fixed user input option mode to be an Array
2015-03-14 06:08:39 +01:00
Nicolas Grekas
eb728c5e4c [2.7] add @group legacy 2015-03-13 18:50:01 +01:00
Nicolas Grekas
099622deb4 Merge branch '2.6' into 2.7
* 2.6:
  [2.6] add @group legacy
  [2.3] add @group legacy

Conflicts:
	src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/LegacyUniqueEntityValidator2Dot4ApiTest.php
	src/Symfony/Bridge/Propel1/Tests/Form/ChoiceList/ModelChoiceListTest.php
	src/Symfony/Component/Form/Tests/Extension/Validator/Constraints/LegacyFormValidator2Dot4ApiTest.php
	src/Symfony/Component/Security/Core/Tests/Validator/Constraints/LegacyUserPasswordValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyAllValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyBlankValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyCallbackValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyCardSchemeValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyChoiceValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArray2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorArrayObject2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyCollectionValidatorCustomArrayObject2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorArray2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyCountValidatorCountable2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyCurrencyValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyDateTimeValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyDateValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyEmailValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyEqualToValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyExpressionValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyFalseValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorObject2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyFileValidatorPath2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanOrEqualValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyGreaterThanValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyIbanValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyIdenticalToValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyImageValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyIpValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyIsbnValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyIssnValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyLanguageValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyLengthValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanOrEqualValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyLessThanValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyLocaleValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyLuhnValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyNotBlankValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyNotEqualToValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyNotIdenticalToValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyNotNullValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyNullValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyRangeValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyRegexValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyTimeValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyTrueValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyTypeValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyUrlValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/Constraints/LegacyUuidValidator2Dot4ApiTest.php
	src/Symfony/Component/Validator/Tests/ValidatorBuilderTest.php
2015-03-13 18:40:40 +01:00
Nicolas Grekas
ed40c90975 [2.6] add @group legacy 2015-03-13 18:37:22 +01:00
Nicolas Grekas
b5e91071f4 Merge branch '2.3' into 2.6
* 2.3:
  [2.3] add @group legacy
2015-03-13 18:11:24 +01:00
Nicolas Grekas
52ab20607c [2.3] add @group legacy 2015-03-13 18:09:38 +01:00
Nicolas Grekas
5dd40d5b7f Merge branch '2.6' into 2.7
* 2.6:
  [travis] Do no tar in //
  [2.3] Static Code Analysis for Components
2015-03-13 14:22:05 +01:00
Nicolas Grekas
5a781cf631 Merge branch '2.3' into 2.6
* 2.3:
  [travis] Do no tar in //
  [2.3] Static Code Analysis for Components
2015-03-13 14:21:46 +01:00
Fabien Potencier
027a747736 feature #13897 [translation][performances] move loading resources into Translator initialize. (aitboudad)
This PR was squashed before being merged into the 2.7 branch (closes #13897).

Discussion
----------

[translation][performances] move loading resources into Translator initialize.

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

Commits
-------

bf5c583 [translation][performances] move loading resources into Translator initialize.
2015-03-13 13:42:25 +01:00
Abdellatif Ait boudad
bf5c583fe6 [translation][performances] move loading resources into Translator initialize. 2015-03-13 13:42:22 +01:00
Fabien Potencier
0de88bbcc1 feature #13864 Entity type: loader caching by query builder instance (dominikzogg)
This PR was merged into the 2.7 branch.

Discussion
----------

Entity type: loader caching by query builder instance

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

Using entity types within a collection, can get very slow, if a query_builder option is set.

Without this option, the doctrine type handles everything itself, and makes it calls against the manager registry, but using this, calls the getLoader method, which ends in build the choice list again for each collection element, which makes more than twice the time for a page load within my energycalculator.

https://github.com/dominikzogg/symfony/blob/2.7/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php#L68

https://github.com/dominikzogg/symfony/blob/2.7/src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php#L108

https://github.com/dominikzogg/energycalculator/blob/master/src/Dominikzogg/EnergyCalculator/Form/ComestibleWithinDayType.php

Commits
-------

42b682b allow to cache entity loader based on query builder
2015-03-13 13:38:17 +01:00
Dominik Zogg
42b682b883 allow to cache entity loader based on query builder 2015-03-13 12:48:27 +01:00
Fabien Potencier
d8720427d1 bug #13871 [Assets] Make templating.helper.assets service available again for BC reasons (WouterJ)
This PR was squashed before being merged into the 2.7 branch (closes #13871).

Discussion
----------

[Assets] Make templating.helper.assets service available again for BC reasons

This service has always been available and the SonataDoctrinePhpcrOdmBundle relied on this services. Moving it to the templating_php config (which is only loaded when PHP templating is enabled, which is often not the case) is a BC break that makes it very hard to support <2.7 and 2.7.

This should be reverted for the 3.0 branch (master), as it should be removed in 3.0. However, it should be added to the `UPRADE-3.0.md` file.

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

Commits
-------

a4b7da5 [Assets] Make templating.helper.assets service available again for BC reasons
2015-03-13 12:07:03 +01:00
WouterJ
a4b7da57db [Assets] Make templating.helper.assets service available again for BC reasons 2015-03-13 12:07:00 +01:00
sarah khalil
a818ab2fb1 Changed visibility of setUp() and tearDown to protected 2015-03-13 10:59:53 +01:00
Nicolas Grekas
6aa74b8daf Merge branch '2.6' into 2.7
* 2.6:
  Changed visibility of setUp() and tearDown to protected
2015-03-13 10:55:11 +01:00
sarah khalil
48d5e20e7e Changed visibility of setUp() and tearDown to protected 2015-03-13 10:50:03 +01:00
Fabien Potencier
8a18b56c3b minor #13908 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #13908).

Discussion
----------

[2.3] 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), no functional changes:
- unused array fill-in removed (dead code)
- reduced str_replace calls \Symfony\Component\BrowserKit\Response::getHeader

Commits
-------

d05cffb [2.3] Static Code Analysis for Components
2015-03-12 18:51:58 +01:00
Vladimir Reznichenko
d05cffb409 [2.3] Static Code Analysis for Components 2015-03-12 18:51:57 +01:00
Nicolas Grekas
578dccfe1f Merge branch '2.6' into 2.7
* 2.6:
  [Debug] reintroduce charset param to ExceptionHandler
2015-03-12 15:45:07 +01:00
Fabien Potencier
0fc1e9f421 bug #13899 [Debug] deprecate protected ExceptionHandler::utf8Htmlize (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] deprecate protected ExceptionHandler::utf8Htmlize

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

Commits
-------

132b3b1 [Debug] deprecate ExceptionHandler::utf8Htmlize
2015-03-12 15:33:21 +01:00
Fabien Potencier
900558c9c4 bug #13902 [Debug] reintroduce charset param to ExceptionHandler (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] reintroduce charset param to ExceptionHandler

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

For some reason, we removed the charset arg of the constructor in 2.5, then used the same position to add fileLinkFormat in 2.6. This is a BC break with 2.3.
This PR reintroduces charset at second position, with some heuristic to keep compat with 2.6

Commits
-------

c8bd867 [Debug] reintroduce charset param to ExceptionHandler
2015-03-12 15:32:01 +01:00
Fabien Potencier
6d605a7d3e Merge branch '2.6' into 2.7
* 2.6:
  [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
  Changed visibility of setUp() and tearDown to protected
  [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
  Added default button class
  used HTML5 meta charset tag and removed hardcoded ones
  Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
  fixed XSS in the exception handler
  Php Inspections (EA Extended) - static code analysis includes:
  [2.3] Remove most refs uses
  Test with local components instead of waiting for the subtree-splitter when possible

Conflicts:
	.travis.yml
2015-03-12 15:31:07 +01:00
Fabien Potencier
43efb1ac1c Merge branch '2.3' into 2.6
* 2.3:
  [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age
  [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
  used HTML5 meta charset tag and removed hardcoded ones
  Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"

Conflicts:
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/MongoDbSessionHandler.php
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
2015-03-12 15:30:42 +01:00
Fabien Potencier
374b7180bf bug #13901 [Bundle] Fix charset config (nicolas-grekas, bamarni)
This PR was merged into the 2.3 branch.

Discussion
----------

[Bundle] Fix charset config

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

This reverts #13715 and resurrects #7532, which was fine.

Commits
-------

ef41059 [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback
cbd0525 used HTML5 meta charset tag and removed hardcoded ones
6ca7fc9 Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
2015-03-12 15:23:35 +01:00
Benjamin Zikarsky
8289ec35b3 [HttpFoundation] MongoDbSessionHandler::read() now checks for valid session age 2015-03-12 15:15:59 +01:00
Nicolas Grekas
c8bd867414 [Debug] reintroduce charset param to ExceptionHandler 2015-03-12 11:30:29 +01:00
Nicolas Grekas
fc009c16d7 Merge branch '2.3' into 2.6
* 2.3:
  Changed visibility of setUp() and tearDown to protected
  fixed XSS in the exception handler
  Php Inspections (EA Extended) - static code analysis includes:
  [2.3] Remove most refs uses
  Test with local components instead of waiting for the subtree-splitter when possible

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
	src/Symfony/Component/Config/Util/XmlUtils.php
	src/Symfony/Component/Console/Helper/ProgressHelper.php
	src/Symfony/Component/Debug/ExceptionHandler.php
	src/Symfony/Component/Debug/Tests/ErrorHandlerTest.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/OptionsResolver/Options.php
	src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php
	src/Symfony/Component/Yaml/Inline.php
2015-03-12 11:28:44 +01:00
sarah khalil
1e64220b95 Changed visibility of setUp() and tearDown to protected 2015-03-11 19:52:02 +01:00
Nicolas Grekas
ef410597a6 [WebProfilerBundle] Set debug+charset on the ExceptionHandler fallback 2015-03-11 17:56:24 +01:00
Nicolas Grekas
132b3b1e66 [Debug] deprecate ExceptionHandler::utf8Htmlize 2015-03-11 17:29:23 +01:00
Piers Warmers
c07a902d4d Added default button class 2015-03-11 16:48:23 +01:00
Bilal Amarni
cbd0525f8f used HTML5 meta charset tag and removed hardcoded ones
Conflicts:
	src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/Resources/views/base.html.twig
	src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.html.twig
	src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig
2015-03-11 16:27:03 +01:00
Nicolas Grekas
6ca7fc9460 Revert "bug #13715 Enforce UTF-8 charset for core controllers (WouterJ)"
This reverts commit 463b24b27c, reversing
changes made to c475704c8f.
2015-03-11 15:41:28 +01:00
Fabien Potencier
f86ad95683 [DependencyInjection] fixed service resolution for factories 2015-03-11 09:33:49 +01:00
Fabien Potencier
1af6a9ec5a fixed XSS in the exception handler 2015-03-10 14:08:39 +01:00
Nicolas Grekas
22f4807522 [HttpKernel] Throw a LogicException when kernel.exception does not led to a Response 2015-03-09 17:32:01 +01:00
Fabien Potencier
de0bd91c83 minor #13866 [2.3] Remove most refs uses (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Remove most refs uses

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

Removes some references usages. They are error prone, and trigger too many copies-on-writes.

Commits
-------

8862705 [2.3] Remove most refs uses
2015-03-09 08:38:59 +01:00
Fabien Potencier
6963887589 feature #13855 Read validation contraints from Resources/config/validation/ sub-dir (GromNaN)
This PR was merged into the 2.7 branch.

Discussion
----------

Read validation contraints from Resources/config/validation/ sub-dir

When a bundle contains many entities/documents and it uses YAML or XML format instead of annotations, it is convenient to split the validation constraints into several small files.

With this simple PR, every files in the `validation` sub-directory will be loaded by the validator like it's done for doctrine mapping.

```
Resources/
    config/
        doctrine/
            Author.orm.yml
            Post.orm.yml
        validation/
            Author.yml
            Post.yml
```

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | [How to split validation yaml files](http://stackoverflow.com/questions/24064813/how-to-split-validation-yaml-files-in-symfony-2-5/24210501#24210501)
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/5060

Read more: http://blog.kevingomez.fr/2013/10/14/split-symfony2-yaml-validation-configuration-file/

Commits
-------

e41dcb3 [FrameworkBundle] Read config/validation/*.(xml|yml) files
2015-03-09 08:25:49 +01:00
Hidde Wieringa
25ef76fded [FrameworkBundle] Added domain column when debugging translations 2015-03-08 21:28:04 +01:00
Vladimir Reznichenko
968275624a Php Inspections (EA Extended) - static code analysis includes:
Reduce couple count calls in [Yaml]
Modernize type casting, fix several strict comparisons
Unsets merged
Elvis operator usage
Short syntax for applied operations
2015-03-07 20:12:23 +01:00
Nicolas Grekas
88627058c9 [2.3] Remove most refs uses 2015-03-07 13:18:29 +01:00
Fabien Potencier
0f00f7c7e8 Merge branch '2.6' into 2.7
* 2.6:
  Php Inspections (EA Extended): squash all PR-13813 commits
  replaced the last remaining is_integer() call
  [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
  [FrameworkBundle] simplify dep declaration
  [VarDumper] Fix "next element is already occupied"
  [Validator] Added missing galician (gl) translations
  [PropertyAccess] stop overwriting once a reference is reached (3rd)
  [OptionsResolver] Remove Unused Variable from Foreach Cycles
  [travis] Tests Security sub-components
  [Twig] bootstrap_3_layout.html.twig is usable as a trait
  [travis] Tests Security sub-components
  CS fixes
  [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
  [travis] test with php nightly

Conflicts:
	.travis.yml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/Security/Http/Tests/Firewall/ExceptionListenerTest.php
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2015-03-07 08:43:00 +01:00
Fabien Potencier
6cd873447d Merge branch '2.3' into 2.6
* 2.3:
  replaced the last remaining is_integer() call
  [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
  [Validator] Added missing galician (gl) translations
  [travis] Tests Security sub-components
  [travis] Tests Security sub-components
  CS fixes
  [travis] test with php nightly

Conflicts:
	src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php
2015-03-07 08:40:15 +01:00
Vladimir Reznichenko
1530c355d5 Php Inspections (EA Extended): squash all PR-13813 commits 2015-03-07 08:39:22 +01:00
Fabien Potencier
e64b75f7d3 replaced the last remaining is_integer() call 2015-03-07 08:38:33 +01:00
Fabien Potencier
ca0cf15360 minor #13862 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #13862).

Discussion
----------

[2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup

| 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

Split <a href="https://github.com/symfony/symfony/pull/13813">PR 13813</a>: part 1 - targeting v2.3

Following is included (no functional changes, found with <a href="https://plugins.jetbrains.com/plugin/7622?pr=phpStorm">Php Inspections (EA Extended)</a>):
- Fixed couple of concatenation as array index warnings
- Unset calls can be merged inspection fixes
- array_search in in_array context inspection fixes
- Is null usage inspection fixes
- Prefixed increment/decrement inspection fixes
- Elvis operator can be used inspection fixes
- Alias functions usage inspection fixes
- Ternary operator simplification inspection fixes
- _ _ DIR _ _ equivalent inspection fixes

Commits
-------

f13b5f7 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup
2015-03-07 08:38:03 +01:00
Vladimir Reznichenko
f13b5f7583 [2.3] [Config] [Console] [DependencyInjection] [DomCrawler] [Form] [HttpKernel] [PropertyAccess] [Security] [Translation] [Yaml] static code analysis, code cleanup 2015-03-07 08:38:01 +01:00
Fabien Potencier
2f7bd7cf8c minor #13850 [FrameworkBundle] simplify dep declaration (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] simplify dep declaration

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

I'm not sure this will work, travis will tell.

Commits
-------

37035b0 [FrameworkBundle] simplify dep declaration
2015-03-07 08:34:45 +01:00
Nicolas Grekas
37035b0696 [FrameworkBundle] simplify dep declaration 2015-03-06 22:21:22 +01:00
Nicolas Grekas
32a81f79aa [VarDumper] Fix "next element is already occupied" 2015-03-06 17:45:31 +01:00
Kévin Dunglas
0050bbb345 [Serializer] Introduce ObjectNormalizer 2015-03-06 11:52:53 +01:00
Kévin Dunglas
8534505db5 [Serializer] Refactoring of metadata 2015-03-06 11:33:18 +01:00
Kévin Dunglas
37e0fa18c6 minor #13796 [Serializer] Replace BadMethodCallException by MappingException (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Replace BadMethodCallException by MappingException

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no (`AnnotationLoader` will be introduced in 2.7)
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

469b8e7 [Serializer] Replace BadMethodCallException by UnexpectedValueException
2015-03-06 11:22:19 +01:00
Jérôme Tamarelle
e41dcb3acd [FrameworkBundle] Read config/validation/*.(xml|yml) files 2015-03-05 23:00:03 +01:00
Fabien Potencier
700447df8d bug #13806 [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty (ogizanagi)
This PR was merged into the 2.6 branch.

Discussion
----------

[TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty

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

Commits
-------

9689639 [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty
2015-03-05 17:55:29 +01:00
Ruben Gonzalez
ec11915895 [Validator] Added missing galician (gl) translations 2015-03-04 07:58:27 +01:00
Ruben Gonzalez
1ea0f86d9a [WebProfilerBundle] Update ajax calls in toolbar to add the css error class 2015-03-04 00:30:01 +01:00
Tobias Schultze
0cead0f17a bug #13835 [PropertyAccess] stop overwriting once a reference is reached (3rd) (bananer)
This PR was squashed before being merged into the 2.6 branch (closes #13835).

Discussion
----------

[PropertyAccess] stop overwriting once a reference is reached (3rd)

I commited with a different email address in [PR 13831](https://github.com/symfony/symfony/pull/13831), so here is the third attempt. Also removed unnecessary test as suggested by @Tobion

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

I added test cases for the scenario described in my issue. After looking through the PropertyAccessor source my conclusion was that there is no reason to overwrite parents of references, so I changed that. None of the previous test cases disagreed and my new tests also passed.

Or maybe I got it all wrong, I'm willing to learn.

Commits
-------

d733a88 [PropertyAccess] stop overwriting once a reference is reached (3rd)
2015-03-03 20:22:24 +01:00
Philip Frank
d733a887df [PropertyAccess] stop overwriting once a reference is reached (3rd) 2015-03-03 20:22:08 +01:00
Vadim Kharitonov
77f4dbfa10 [OptionsResolver] Remove Unused Variable from Foreach Cycles 2015-03-03 17:59:03 +03:00
Fabien Potencier
12cf04f8f3 minor #13818 [Serializer] Test that normalizers ignore non-existing attributes. (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #13818).

Discussion
----------

[Serializer] Test that normalizers ignore non-existing attributes.

| 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

Test the behavior of normalizers when an attribute doesn't exist.

Commits
-------

df0fe30 [Serializer] Test that normalizers ignore non-existing attributes.
2015-03-03 09:32:45 +01:00
Kévin Dunglas
df0fe30896 [Serializer] Test that normalizers ignore non-existing attributes. 2015-03-03 09:32:43 +01:00
Dusan Kasan
4509d36991 [Twig] bootstrap_3_layout.html.twig is usable as a trait 2015-03-03 09:30:40 +01:00
Fabien Potencier
632cc10d01 minor #13827 [Serializer] Fix ClassMetadataFactory PHPDoc (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Fix ClassMetadataFactory PHPDoc

| 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
-------

0dba547 [Serializer] Fix ClassMetadataFactory PHPDoc
2015-03-03 09:28:49 +01:00
Fabien Potencier
9efec600e0 minor #13819 [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer

| 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
-------

c41346b [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer
2015-03-03 09:27:38 +01:00
Kévin Dunglas
0dba547bc8 [Serializer] Fix ClassMetadataFactory PHPDoc 2015-03-02 23:09:40 +01:00
Kévin Dunglas
c491332e0f minor #13798 [Serializer] rename exception interface (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] rename exception interface

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

Commits
-------

c6bf1de [Serializer] rename exception interface
2015-03-02 22:28:43 +01:00
Dariusz Ruminski
7fd6ba06b1 CS fixes 2015-03-02 15:15:25 +01:00
Tobias Schultze
755ea09a44 Merge branch '2.6' into 2.7 2015-03-02 11:21:01 +01:00
Nicolas Grekas
c6bf1dec2e [Serializer] rename exception interface 2015-03-02 10:36:49 +01:00
Kévin Dunglas
c41346baef [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer 2015-03-01 18:38:38 +01:00
Tobias Schultze
cb37fbe707 [OptionsResolver] fix allowed values with null 2015-03-01 03:42:24 +01:00
Tobias Schultze
e3e9a4d269 [OptionsResolver] add missing deprecated phpdoc for setNormalizers 2015-03-01 03:08:17 +01:00
Tobias Schultze
9607e82c78 replace deprecated options resolver uses by new ones 2015-02-28 13:09:24 +01:00
Tobias Schultze
7e9d2e618b [OptionsResolver] add missing deprecation triggers 2015-02-27 17:11:51 +01:00
Tobias Schultze
469e70d5be [OptionsResolver] remove duplicate deprecation text 2015-02-27 16:20:50 +01:00
ogizanagi
96896390d7 [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty 2015-02-27 01:57:35 +01:00
Kévin Dunglas
469b8e7017 [Serializer] Replace BadMethodCallException by UnexpectedValueException 2015-02-25 23:52:02 +01:00
Benjamin Long
bd17ef8d58 [acl][command][SecurityBundle] Fixed user input option mode to be an Array
Fixed Issue #13789
2015-02-25 15:10:59 +01:00
Nicolas Grekas
2b036ecbb5 Merge branch '2.6' into 2.7
* 2.6:
  [Form] NativeRequestHandler file handling fix
  [VarDumper] Workaround stringy numeric keys
  [HttpKernel] Throw double-bounce exceptions
  minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
  [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 13:51:44 +01:00
Nicolas Grekas
c9da1ae73f Merge branch '2.3' into 2.6
* 2.3:
  [Form] NativeRequestHandler file handling fix
  [HttpKernel] Throw double-bounce exceptions
  minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
  [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 13:51:23 +01:00
Fabien Potencier
e0ba4d65af bug #13744 minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource (bijibox)
This PR was merged into the 2.3 branch.

Discussion
----------

minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource

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

FileResource and tests update

Commits
-------

87800ae minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
2015-02-25 12:39:01 +01:00
Fabien Potencier
46d05ecad4 bug #13708 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-mapping (phansys)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [HttpFoundation] fixed param order for Nginx's x-accel-mapping

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

Inverted path and location directives for x-accel-mapping header (fixes #13502).

Before:
```proxy_set_header X-Accel-Mapping /internal/=/var/www/example.com/```

After:
```proxy_set_header X-Accel-Mapping /var/www/example.com/=/internal/```

It could be a BC break since the response will fail if someone sends this header
honoring the previous signature, thus I need some feedback in order to choose the right branch for this change.

Commits
-------

9f9f230 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 12:23:04 +01:00
Fabien Potencier
7d6c7a3cef bug #13767 [HttpKernel] Throw double-bounce exceptions (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Throw double-bounce exceptions

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

Commits
-------

0ebcf63 [HttpKernel] Throw double-bounce exceptions
2015-02-25 12:22:04 +01:00
Fabien Potencier
ab7b3a8119 bug #13769 [Form] NativeRequestHandler file handling fix (mpajunen)
This PR was squashed before being merged into the 2.3 branch (closes #13769).

Discussion
----------

[Form] NativeRequestHandler file handling fix

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

`NativeRequestHandler` reused the local variable for the form name `$name` as a loop variable for processing the `$_FILES` array. A separate variable is now used.

Two new test cases are included:
- Handling a request with multiple files
- Handling a request with file upload and a nameless form

Both tests fail without the fix. The test cases could probably be better though.

Commits
-------

9b3421f [Form] NativeRequestHandler file handling fix
2015-02-25 09:33:53 +01:00
Mikael Pajunen
9b3421f18a [Form] NativeRequestHandler file handling fix 2015-02-25 09:33:49 +01:00
Nicolas Grekas
46bea3ab30 [VarDumper] Workaround stringy numeric keys 2015-02-25 09:21:12 +01:00
Nicolas Grekas
0ebcf639c3 [HttpKernel] Throw double-bounce exceptions 2015-02-24 20:09:42 +01:00
Nicolas Grekas
2777e965ed Merge branch '2.6' into 2.7
* 2.6:
  [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 20:07:49 +01:00
Nicolas Grekas
9f5a2caf3a Merge branch '2.3' into 2.6
* 2.3:
  [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 20:07:32 +01:00
Nicolas Grekas
7558c232af [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients 2015-02-24 17:59:59 +01:00
Fabien Potencier
f206dfd9e4 bug #13745 Fixed absolute_url for absolute paths (florianv)
This PR was merged into the 2.7 branch.

Discussion
----------

Fixed absolute_url for absolute paths

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

The issue is that `asset()` and `absolute_url()` cannot be composed because `asset()` already returns an absolute path (using the `PathPackage`) and `absolute_url()` still prepends the base path. So the resulting url contains the base path twice.

So this PR removes appending the base path to absolute paths (starting with `/`) passed to `absolute_url()`.

Commits
-------

08aa7bc Fixed absolute_url for absolute paths
2015-02-24 17:24:16 +01:00
Nicolas Grekas
76e736eeb7 [minor] composer.json fix 2015-02-24 14:39:59 +01:00
Nicolas Grekas
decd82eef7 Merge branch '2.3' into 2.6
* 2.3:
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 14:39:25 +01:00
Nicolas Grekas
4a638a4269 [minor] composer.json fix 2015-02-24 14:38:15 +01:00
florianv
08aa7bc223 Fixed absolute_url for absolute paths 2015-02-24 13:11:45 +01:00
Nicolas Grekas
d4802aa92b Merge branch '2.6' into 2.7
* 2.6:
  Minor hot fix
  [PROCESS] make sure /dev/tty is readable
  [2.3] require-dev PHPUnit bridge
  [FrameworkBundle] Fixed Shell logo
  [2.3] Update CONTRIBUTING.md
  [2.3][Process] Fixed PhpProcess::getCommandLine() result
  [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
  [PropertyAccess] unify and fix doc
  Enforce UTF-8 charset for core controllers
  Fix the toolbar JS for IE

Conflicts:
	.travis.yml
	src/Symfony/Bridge/Doctrine/composer.json
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bridge/Propel1/composer.json
	src/Symfony/Bridge/ProxyManager/composer.json
	src/Symfony/Bridge/Swiftmailer/composer.json
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/DebugBundle/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Bundle/WebProfilerBundle/composer.json
	src/Symfony/Component/Asset/Exception/ExceptionInterface.php
	src/Symfony/Component/Asset/Exception/LogicException.php
	src/Symfony/Component/BrowserKit/composer.json
	src/Symfony/Component/ClassLoader/composer.json
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DependencyInjection/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/HttpKernel/composer.json
	src/Symfony/Component/Intl/composer.json
	src/Symfony/Component/Routing/composer.json
	src/Symfony/Component/Security/Acl/composer.json
	src/Symfony/Component/Security/Core/composer.json
	src/Symfony/Component/Security/Csrf/composer.json
	src/Symfony/Component/Security/Http/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Templating/composer.json
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/Validator/composer.json
2015-02-24 13:09:34 +01:00
Nicolas Grekas
2f3692aca7 Merge branch '2.3' into 2.6
* 2.3:
  Minor hot fix
  [PROCESS] make sure /dev/tty is readable
  [2.3] require-dev PHPUnit bridge
  [FrameworkBundle] Fixed Shell logo
  [2.3] Update CONTRIBUTING.md
  [2.3][Process] Fixed PhpProcess::getCommandLine() result
  [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments
  Enforce UTF-8 charset for core controllers

Conflicts:
	CONTRIBUTING.md
	src/Symfony/Bridge/Monolog/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php
	src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
	src/Symfony/Component/Console/composer.json
	src/Symfony/Component/Debug/composer.json
	src/Symfony/Component/DomCrawler/composer.json
	src/Symfony/Component/EventDispatcher/composer.json
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Security/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 12:52:21 +01:00
Nicolas Grekas
4a63bde710 Minor hot fix 2015-02-24 12:41:28 +01:00
Fabien Potencier
98bf339673 minor #13772 [2.3] require-dev PHPUnit bridge (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] require-dev PHPUnit bridge

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

Commits
-------

8b02796 [2.3] require-dev PHPUnit bridge
2015-02-24 12:37:24 +01:00