Commit Graph

24352 Commits

Author SHA1 Message Date
Nicolas Grekas
f5db5397a0 Merge branch '2.8' into 3.0
* 2.8:
  [Yaml] Fix tests on PHP 7.0.2
  [FrameworkBundle] Don't log twice with the error handler
  [2.7] Workaround https://bugs.php.net/63206
  [2.3] Workaround https://bugs.php.net/63206
  Add closing parenthesis
  [Serializer] Unset object_to_populate after using it
  [Serializer] Allow to use proxies in object_to_populate

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpFoundation/JsonResponse.php
2016-01-13 11:30:06 +01:00
Nicolas Grekas
26979ed6ca Merge branch '2.7' into 2.8
* 2.7:
  [Yaml] Fix tests on PHP 7.0.2
  [2.7] Workaround https://bugs.php.net/63206
  [2.3] Workaround https://bugs.php.net/63206
  Add closing parenthesis
  [Serializer] Unset object_to_populate after using it
  [Serializer] Allow to use proxies in object_to_populate
2016-01-13 11:28:07 +01:00
Nicolas Grekas
3c6d1a93dd Merge branch '2.3' into 2.7
* 2.3:
  [Yaml] Fix tests on PHP 7.0.2
  [2.3] Workaround https://bugs.php.net/63206
  Add closing parenthesis
2016-01-13 11:26:43 +01:00
Kévin Dunglas
eac37cd4ae bug #17328 [Serializer] Allow to use proxies in object_to_populate (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Allow to use proxies in object_to_populate

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

Allows to populate a proxy (or any class having the given type).

Commits
-------

b16b5b9 [Serializer] Allow to use proxies in object_to_populate
2016-01-13 11:07:31 +01:00
Nicolas Grekas
c60053e0fd bug #17202 [FrameworkBundle] Don't log twice with the error handler (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Don't log twice with the error handler

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

ping @Tobion @yapro does it work as expected with this patch?

Commits
-------

5926ff2 [FrameworkBundle] Don't log twice with the error handler
2016-01-13 10:41:30 +01:00
Nicolas Grekas
fe83ab953e bug #17347 [2.7] Workaround https://bugs.php.net/63206 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] Workaround https://bugs.php.net/63206

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

Commits
-------

d44e0b7 [2.7] Workaround https://bugs.php.net/63206
2016-01-13 10:06:51 +01:00
Nicolas Grekas
26af0ae56b minor #17348 [Yaml] Fix tests on PHP 7.0.2 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Yaml] Fix tests on PHP 7.0.2

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

Related to https://bugs.php.net/66179 that has been fixed in 7.0.2

Commits
-------

902f6dd [Yaml] Fix tests on PHP 7.0.2
2016-01-13 10:03:05 +01:00
Nicolas Grekas
902f6ddb93 [Yaml] Fix tests on PHP 7.0.2 2016-01-13 09:54:41 +01:00
Nicolas Grekas
5926ff2f95 [FrameworkBundle] Don't log twice with the error handler 2016-01-13 09:37:36 +01:00
Nicolas Grekas
d44e0b7212 [2.7] Workaround https://bugs.php.net/63206 2016-01-13 08:57:33 +01:00
Fabien Potencier
7a02f4e43e minor #17346 [2.3] Workaround https://bugs.php.net/63206 (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Workaround https://bugs.php.net/63206

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

This bug has almost no chance to be hit in this code but still, cleaning any potential issue is worth.

Commits
-------

c5479dd [2.3] Workaround https://bugs.php.net/63206
2016-01-13 08:40:10 +01:00
Nicolas Grekas
c5479dde8c [2.3] Workaround https://bugs.php.net/63206 2016-01-13 08:28:48 +01:00
Tobias Schultze
36eb8188ca minor #17344 [Event Dispatcher] Add closing parenthesis (omerida)
This PR was merged into the 2.3 branch.

Discussion
----------

[Event Dispatcher] Add closing parenthesis

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

Commits
-------

5cdccc4 Add closing parenthesis
2016-01-13 00:06:22 +01:00
omerida
5cdccc4350 Add closing parenthesis 2016-01-12 14:46:23 -05:00
Fabien Potencier
4c32c1a0b7 minor #17281 [Serializer] Unset object_to_populate after using it (dunglas)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17281).

Discussion
----------

[Serializer] Unset object_to_populate after using it

| 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

The `object_to_populate` key must be unset after using it to avoid problems when normalizing sub objects. Needed for #17193.

Commits
-------

ff18b68 [Serializer] Unset object_to_populate after using it
2016-01-12 19:26:02 +01:00
Kévin Dunglas
ff18b68e77 [Serializer] Unset object_to_populate after using it 2016-01-12 19:26:02 +01:00
Fabien Potencier
a5c0b8f8b9 Merge branch '2.8' into 3.0
* 2.8:
  Typo fix
  [WebProfiler] Fixed sf-minitoolbar height
  [2.3] Static Code Analysis for Components
  [Serializer] Use $context['cache_key'] to enhance caching
  Fixed erroneous deprecation notice for extended Interfaces
  [Routing] cs fix
  Added support \IteratorAggregate for UniqueEntityValidator
  Update AbstractChoiceListTest.php
  Fix #17306 Paths with % in it are note allowed (like urlencoded)
  Use proper class to fetch $versionStrategy property
  Added sort order SORT_STRING for params in UriSigner
  Remove normalizer cache in Serializer class
  [Serializer] ObjectNormalizer: context can contain not serializable data
2016-01-12 18:46:41 +01:00
Fabien Potencier
4ed54a39ab Merge branch '2.7' into 2.8
* 2.7:
  Typo fix
  [2.3] Static Code Analysis for Components
  Added support \IteratorAggregate for UniqueEntityValidator
  Update AbstractChoiceListTest.php
  Fix #17306 Paths with % in it are note allowed (like urlencoded)
  Use proper class to fetch $versionStrategy property
  Added sort order SORT_STRING for params in UriSigner
  Remove normalizer cache in Serializer class
2016-01-12 18:46:01 +01:00
Fabien Potencier
da655a9368 Merge branch '2.3' into 2.7
* 2.3:
  Typo fix
  [2.3] Static Code Analysis for Components
  Added support \IteratorAggregate for UniqueEntityValidator
  Fix #17306 Paths with % in it are note allowed (like urlencoded)
  Added sort order SORT_STRING for params in UriSigner
  Remove normalizer cache in Serializer class
2016-01-12 18:44:11 +01:00
Fabien Potencier
25a379fa8c bug #17340 [HttpFoundation] Fixed Request HTTP_USER_AGENT on 3.X versions (davelima)
This PR was merged into the 3.0 branch.

Discussion
----------

[HttpFoundation] Fixed Request HTTP_USER_AGENT on 3.X versions

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

[HttpFoundation] Fixed Request HTTP_USER_AGENT on 3.X versions

Commits
-------

1ccc15d [HttpFoundation] Fixed Request HTTP_USER_AGENT on 3.X versions
2016-01-12 18:19:59 +01:00
Fabien Potencier
3331c8ac2a bug #17199 [Serializer] Allow context to contain not serializable data (dunglas, nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[Serializer] Allow context to contain not serializable data

| 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

Allow the context to contain not serializable data even for the `ObjectNormalizer` (BC break fix).

Commits
-------

996f69d Merge pull request #2 from nicolas-grekas/ser-cache
8560c13 [Serializer] Use $context['cache_key'] to enhance caching
c1740fc [Serializer] ObjectNormalizer: context can contain not serializable data
2016-01-12 18:19:17 +01:00
Fabien Potencier
406e260c49 minor #17338 [Documentation] Typo fix (quentint)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17338).

Discussion
----------

[Documentation] Typo fix

Commits
-------

12fd48c Typo fix
2016-01-12 18:16:47 +01:00
Quentin
12fd48c192 Typo fix 2016-01-12 18:16:37 +01:00
Fabien Potencier
51a5a2659c bug #17334 [WebProfiler] Fixed sf-minitoolbar height (yceruto)
This PR was merged into the 2.8 branch.

Discussion
----------

[WebProfiler] Fixed sf-minitoolbar height

| 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

![toolbar-sf-2 8](https://cloud.githubusercontent.com/assets/2028198/12245117/d293c178-b874-11e5-981b-0ca335a8c3aa.png)

EDIT: This bug occurs when we use
```css
* {
    box-sizing: border-box;
}
```
in the stylesheet (TwitterBootstrap for instance)

Commits
-------

9d1e65d [WebProfiler] Fixed sf-minitoolbar height
2016-01-12 18:13:32 +01:00
Yonel Ceruto González
9d1e65dc02 [WebProfiler] Fixed sf-minitoolbar height
added box-sizing

Restore padding box (no visual changes)
2016-01-12 09:10:28 -05:00
David Lima
1ccc15d871 [HttpFoundation] Fixed Request HTTP_USER_AGENT on 3.X versions 2016-01-12 11:37:31 -02:00
Kévin Dunglas
996f69df27 Merge pull request #2 from nicolas-grekas/ser-cache
[Serializer] Use $context['cache_key'] to enhance caching
2016-01-12 13:45:44 +01:00
Tobias Schultze
85d5ed29d7 bug #17140 [Serializer] Remove normalizer cache in Serializer class (jvasseur)
This PR was merged into the 2.3 branch.

Discussion
----------

[Serializer] Remove normalizer cache in Serializer class

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

The serializer cache the normalizer/denormalizer to use based only on the class and format. But the supportsNormalization and supportDenormalization methods can decide based on the data passed leading to hard to find bugs when the serializer used a cached normalizer it shouldn't use.

Commits
-------

8566dc1 Remove normalizer cache in Serializer class
2016-01-12 13:31:34 +01:00
Fabien Potencier
f1cce4e139 minor #17282 [2.3] Static Code Analysis for Components (kalessil)
This PR was squashed before being merged into the 2.3 branch (closes #17282).

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):
    - several code constructs simplification
    - decoupling statements from foreach
    - extra colons/parenthesis removal (code style)
    - correct string functions usage (micro-optimization)
    - variable functions usage (php 5 compatible)

Commits
-------

81f8181 [2.3] Static Code Analysis for Components
2016-01-12 12:31:36 +01:00
Vladimir Reznichenko
81f81812a5 [2.3] Static Code Analysis for Components 2016-01-12 12:31:34 +01:00
Nicolas Grekas
9eb522ecfc bug #17320 [Debug] Fixed erroneous deprecation notice for extended Interfaces (peterrehm)
This PR was merged into the 2.8 branch.

Discussion
----------

[Debug] Fixed erroneous deprecation notice for extended Interfaces

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

Replaces #16775.

Commits
-------

5f4e968 Fixed erroneous deprecation notice for extended Interfaces
2016-01-12 10:07:55 +01:00
Nicolas Grekas
8560c1367e [Serializer] Use $context['cache_key'] to enhance caching 2016-01-12 09:13:32 +01:00
Fabien Potencier
8b6503d150 minor #17337 [3.0] [Bridge] [Swiftmailer] Removed non-existent namespace from composer.json autoload section (paradajozsef)
This PR was submitted for the master branch but it was merged into the 3.0 branch instead (closes #17337).

Discussion
----------

[3.0] [Bridge] [Swiftmailer] Removed non-existent namespace from composer.json autoload section

| 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

After PR #13046 Symfony\Bridge\Swiftmailer\ ns not exists.

Commits
-------

ecf4591 Removed non-existent directory from composer autoload
2016-01-12 08:24:40 +01:00
Paráda József
ecf4591aae Removed non-existent directory from composer autoload 2016-01-12 08:24:40 +01:00
Tobias Schultze
0df74c8ba4 minor #17332 [2.8] [Routing] cs fix (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] [Routing] cs fix

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

- remove unused use statement in `ServiceRouterLoader`
- add missing param in phpdoc in `RouteCollectionBuilder`

Commits
-------

9982f96 [Routing] cs fix
2016-01-12 01:20:05 +01:00
Peter Rehm
5f4e968cb9 Fixed erroneous deprecation notice for extended Interfaces 2016-01-11 19:57:09 +01:00
Jules Pietri
9982f96caa [Routing] cs fix
- remove unused use statement in `ServiceRouterLoader`
- add missing param in phpdoc in `RouteCollectionBuilder`
2016-01-11 17:43:36 +01:00
Fabien Potencier
a02bd4b753 bug #17307 [FrameworkBundle] Fix paths with % in it (like urlencoded) (scaytrase)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix paths with % in it (like urlencoded)

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

Commits
-------

de7b4d7 Fix #17306 Paths with % in it are note allowed (like urlencoded)
2016-01-11 11:07:30 +01:00
Fabien Potencier
aa9801e8a2 bug #17078 [Bridge] [Doctrine] [Validator] Added support \IteratorAggregate for UniqueEntityValidator (Disparity)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #17078).

Discussion
----------

[Bridge] [Doctrine] [Validator] Added support \IteratorAggregate for UniqueEntityValidator

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

Expand the list of supported types of results returned from the repositories.
Added processing of type \IteratorAggregate (and as a consequence doctrine Collection)

Commits
-------

6ebd179 Added support \IteratorAggregate for UniqueEntityValidator
2016-01-11 11:04:47 +01:00
Disparity
6ebd1792d8 Added support \IteratorAggregate for UniqueEntityValidator
Expand the list of supported types of results returned from the repositories.
Added processing of type \IteratorAggregate (and as a consequence doctrine Collection)
2016-01-11 11:04:46 +01:00
Fabien Potencier
ab00f68e2c minor #17319 [Form] fixed phpdoc in tests (mantulo)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17319).

Discussion
----------

[Form] fixed phpdoc in tests

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

fixed phpdoc

Commits
-------

0f8da34 Update AbstractChoiceListTest.php
2016-01-11 11:03:28 +01:00
mantulo
0f8da347f8 Update AbstractChoiceListTest.php
fixed phpdoc namespace
2016-01-11 11:03:27 +01:00
Kévin Dunglas
b16b5b9d86 [Serializer] Allow to use proxies in object_to_populate 2016-01-11 10:59:43 +01:00
Pavel Batanov
de7b4d73c6 Fix #17306 Paths with % in it are note allowed (like urlencoded) 2016-01-09 15:55:11 +03:00
Fabien Potencier
4d536bd09a bug #17298 [FrameworkBundle] Use proper class to fetch $versionStrategy property (dosten)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #17298).

Discussion
----------

[FrameworkBundle] Use proper class to fetch $versionStrategy property

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

This is a replacement of #17260

Commits
-------

e38fa13 Use proper class to fetch $versionStrategy property
2016-01-07 19:01:12 +01:00
Diego Saint Esteben
e38fa135ab Use proper class to fetch $versionStrategy property 2016-01-07 19:01:12 +01:00
Fabien Potencier
5d63c554e8 bug #17287 [HttpKernel] Forcing string comparison on query parameters sort in UriSigner (Tim van Densen)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17287).

Discussion
----------

[HttpKernel] Forcing string comparison on query parameters sort in UriSigner

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

The signing of an url fails when using query parameters with integers as keys.
The ksort function in the ```UriSigner``` class changes the order of the query params and causes to generate a different hash which results in a failed check.

In this PR we force a string comparison for ksort which keeps the correct order of parameters.

Commits
-------

2040139 Added sort order SORT_STRING for params in UriSigner
2016-01-07 14:44:10 +01:00
Tim van Densen
2040139db6 Added sort order SORT_STRING for params in UriSigner 2016-01-07 14:43:59 +01:00
Fabien Potencier
a16c752bbb Merge branch '2.8' into 3.0
* 2.8:
  [WebProfilerBundle] Remove loading status from AJAX toolbar after error
  Add missing apostrophe in setSaveHandler phpdoc
  [VarDumper] Fix typo
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
2016-01-07 14:38:51 +01:00
Fabien Potencier
4555fecf53 Merge branch '2.7' into 2.8
* 2.7:
  Add missing apostrophe in setSaveHandler phpdoc
  [VarDumper] Fix typo
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
  [FrameworkBundle] Add case in Kernel directory guess for PHPUnit
2016-01-07 14:38:40 +01:00