Commit Graph

25549 Commits

Author SHA1 Message Date
Nicolas Grekas 5b566dae1b Merge branch '2.7' into 2.8
* 2.7:
  [DomCrawler] Optimize DomCrawler::relativize()
  [HttpKernel] Fix source links with latests Twig versions
  [DomCrawler] Allow pipe (|) character in link tags when using Xpath expressions
2016-10-18 17:35:45 +02:00
Nicolas Grekas 4744c3de64 bug #20175 [VarDumper] Fix source links with latests Twig versions (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[VarDumper] Fix source links with latests Twig versions

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

Sibling to #20173

Commits
-------

f3b09d9 [VarDumper] Fix source links with latests Twig versions
2016-10-18 17:35:33 +02:00
Nicolas Grekas 8dee4be6b7 bug #20235 [DomCrawler] Allow pipe (|) character in link tags when using Xpath expressions (klausi, nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[DomCrawler] Allow pipe (|) character in link tags when using Xpath expressions

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

@klausi could you please validate this patch? Is it an improvement over yours? (sorry I don't have the proper use case to test.)

Commits
-------

17757d8 [DomCrawler] Optimize DomCrawler::relativize()
5b26e33 [DomCrawler] Allow pipe (|) character in link tags when using Xpath expressions
2016-10-18 17:34:22 +02:00
Nicolas Grekas f3b09d9ca5 [VarDumper] Fix source links with latests Twig versions 2016-10-18 17:06:24 +02:00
Nicolas Grekas 17757d8114 [DomCrawler] Optimize DomCrawler::relativize() 2016-10-18 15:42:15 +02:00
Nicolas Grekas 0e8b2a3916 minor #20236 [HttpKernel] Fix source links with latests Twig versions (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Fix source links with latests Twig versions

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

Commits
-------

3c21617 [HttpKernel] Fix source links with latests Twig versions
2016-10-18 11:38:25 +02:00
Nicolas Grekas 3c216176e8 [HttpKernel] Fix source links with latests Twig versions 2016-10-18 11:20:54 +02:00
Klaus Purer 5b26e33261 [DomCrawler] Allow pipe (|) character in link tags when using Xpath expressions 2016-10-18 10:27:59 +02:00
Fabien Potencier ee8203a599 Merge branch '2.7' into 2.8
* 2.7:
  [TwigBridge] removed deprecations added in Twig 1.27
  PHP CS Fixer: use php_unit_dedicate_assert
  fixed Filesystem:makePathRelative and added 2 more testcases
  no 304 response if method is not cacheable
  move tags from decorated to decorating service
2016-10-17 21:28:30 -07:00
Fabien Potencier ef48f5924a bug #20224 [Twig] removed deprecations added in Twig 1.27 (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[Twig] removed deprecations added in Twig 1.27

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | see twigphp/Twig#2182
| License       | MIT
| Doc PR        | n/a

Commits
-------

f0849d8 [TwigBridge] removed deprecations added in Twig 1.27
2016-10-17 21:24:28 -07:00
Fabien Potencier f0849d8331 [TwigBridge] removed deprecations added in Twig 1.27 2016-10-17 18:02:36 -07:00
Fabien Potencier bee50d4ba7 minor #20228 PHP CS Fixer: use php_unit_dedicate_assert (keradus)
This PR was merged into the 2.7 branch.

Discussion
----------

PHP CS Fixer: use php_unit_dedicate_assert

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

appendix for #19121

Commits
-------

b0df3a7 PHP CS Fixer: use php_unit_dedicate_assert
2016-10-16 13:31:14 -07:00
Dariusz Ruminski b0df3a7eb9 PHP CS Fixer: use php_unit_dedicate_assert 2016-10-16 22:09:53 +02:00
Fabien Potencier adf20c86fb minor #20204 3.0 Upgrade Guide: Describing how to pass data to a form through options resolver (smithandre)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #20204).

Discussion
----------

3.0 Upgrade Guide: Describing how to pass data to a form through options resolver

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

Enhanced the upgrade guide by adding details regarding passing data to a form through the options resolver.

Commits
-------

b69bd3f 3.0 Upgrade Guide: Added details describing how to pass data to a form through the options resolver
2016-10-14 08:11:06 -07:00
Andre Smith b69bd3f0ed 3.0 Upgrade Guide: Added details describing how to pass data to a form through the options resolver 2016-10-14 08:11:06 -07:00
Fabien Potencier 287713fd6a bug #19478 fixed Filesystem:makePathRelative and added 2 more testcases (muhammedeminakbulut)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #19478).

Discussion
----------

fixed Filesystem:makePathRelative and added 2 more testcases

| Q             | A
| ------------- | ---
| Branch?       |2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT
The 2 new test cases where broken on the old code. The old testcases and the new one succeed with the given code.

Commits
-------

cd3206c fixed Filesystem:makePathRelative and added 2 more testcases
2016-10-14 07:26:34 -07:00
Muhammed Akbulut cd3206c5cb fixed Filesystem:makePathRelative and added 2 more testcases 2016-10-14 07:26:34 -07:00
Fabien Potencier 8d218e7f50 bug #20218 [HttpFoundation] no 304 response if method is not cacheable (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpFoundation] no 304 response if method is not cacheable

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

Since #19321 OPTIONS and TRACE are considered safe methods. But both methods should not lead to "304 Not modified" responses.

Commits
-------

3d6b450 no 304 response if method is not cacheable
2016-10-14 07:10:20 -07:00
Fabien Potencier 7e2f24fc6f bug #20207 [DependencyInjection] move tags from decorated to decorating service (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[DependencyInjection] move tags from decorated to decorating service

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

Commits
-------

7def83c move tags from decorated to decorating service
2016-10-14 07:09:04 -07:00
Christian Flothmann 3d6b4502c8 no 304 response if method is not cacheable 2016-10-14 13:10:27 +02:00
Nicolas Grekas d24c340231 Fix deps merge 2016-10-14 11:42:19 +02:00
Fabien Potencier c0ed0cbdff Merge branch '2.7' into 2.8
* 2.7:
  fixed typo
  [HttpCache] fix: do not cache OPTIONS request
  fixed CS
  Prevent infinite loop in PropertyMetadata
2016-10-13 18:30:48 -07:00
Fabien Potencier f76e77f924 fixed typo 2016-10-13 18:29:00 -07:00
Fabien Potencier 55c3f89ef1 bug #20205 [HttpCache] fix: do not cache OPTIONS request (dmaicher)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpCache] fix: do not cache OPTIONS request

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

The HttpCache should not cache any OPTIONS request as they are by spec not cacheable (mentioned here https://github.com/symfony/symfony/issues/20202#issuecomment-253033144 by @xabbuh).

Commits
-------

c43de7f [HttpCache] fix: do not cache OPTIONS request
2016-10-13 18:28:24 -07:00
David Maicher c43de7f21a [HttpCache] fix: do not cache OPTIONS request 2016-10-13 22:14:35 +02:00
Fabien Potencier df138fb636 fixed CS 2016-10-13 07:02:27 -07:00
Fabien Potencier 705a4f7e91 bug #20146 [Validator] Prevent infinite loop in PropertyMetadata (wesleylancel)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #20146).

Discussion
----------

[Validator] Prevent infinite loop in PropertyMetadata

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

This commit fixes a possible infinite loop in PropertyMetadata when the PropertyMetadata class was constructed with an existing property of class and later used (after being serialized and cached) on that same class while that property no longer existing. `get_parent_class` will return false when there is no parent class and `property_existing` will then keeping return false causing the `while` loop to be infinite.

Commits
-------

c1ae7b6 Prevent infinite loop in PropertyMetadata
2016-10-13 07:00:51 -07:00
Wesley Lancel c1ae7b6ad7 Prevent infinite loop in PropertyMetadata 2016-10-13 07:00:50 -07:00
Nicolas Grekas 7108c375a2 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Test on PHP 7.1
  [FrameworkBundle] Convert null prefix to an empty string in translation:update command
2016-10-13 08:28:24 +02:00
Nicolas Grekas ab6f181cb4 minor #19971 [travis] Test on PHP 7.1 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis] Test on PHP 7.1

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Tests pass?   | let's see
| License       | MIT

PHP 7.1 RC2 has been released today.

Commits
-------

6602e21 [travis] Test on PHP 7.1
2016-10-13 08:03:00 +02:00
Nicolas Grekas 6602e21a9c [travis] Test on PHP 7.1 2016-10-13 07:51:16 +02:00
Fabien Potencier aaab30ea80 simplified code 2016-10-12 18:43:15 -07:00
Fabien Potencier eac27275b1 minor #20185 Remove unused variable (lin-lu)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #20185).

Discussion
----------

Remove unused variable

Remove unused variable $key.

Commits
-------

129694f Remove unused variable
2016-10-12 18:42:27 -07:00
Lin Lu 129694f650 Remove unused variable 2016-10-12 18:42:26 -07:00
Christian Flothmann 7def83c0b1 move tags from decorated to decorating service 2016-10-11 23:07:33 +02:00
Fabien Potencier 3f650f864c bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Convert null prefix to an empty string in translation:update

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

This command needs the ability to use an empty string as prefix, which is not possible using `bin/console translation:update --prefix=""` because `$argv` doesn't parse empty strings thus the value is converted to `null` by `ArgvInput` (only since #19946, before the option was not considered to be set, giving the default `'__'` thus this should be fine from a BC pov).

Here I propose to explicitly convert the `prefix` value to an empty string if set to `null`, as it is a very specific need and we can't guess that from `ArgvInput`.
An other way to fix it could be to add a `--no-prefix` option to the command but I don't think it is worth it, and it couldn't be treated as a bug fix thus not fixed before `3.2`.

Commits
-------

f02b687 [FrameworkBundle] Convert null prefix to an empty string in translation:update command
2016-10-09 04:27:22 -07:00
Robin Chalas f02b6876b4
[FrameworkBundle] Convert null prefix to an empty string in translation:update command 2016-10-09 13:14:32 +02:00
Kévin Dunglas 781c923c93
bug #20154 [PropertyInfo] Fix edge cases in ReflectionExtractor (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[PropertyInfo] Fix edge cases in ReflectionExtractor

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

This should make ReflectionExtractor a bit more robust.

ping @dunglas (~~don't miss the changed test case~~).

Commits
-------

bffdfad [PropertyInfo] Fix edge cases in ReflectionExtractor
2016-10-06 11:22:33 +02:00
Nicolas Grekas 7f56c22076 Merge branch '2.7' into 2.8
* 2.7:
  Minor fixes & cleanups
2016-10-06 10:56:19 +02:00
Nicolas Grekas 962248dbd9 minor #20169 Minor fixes & cleanups (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Minor fixes & cleanups

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

Commits
-------

dcf601f Minor fixes & cleanups
2016-10-06 10:55:03 +02:00
Nicolas Grekas bffdfad41e [PropertyInfo] Fix edge cases in ReflectionExtractor 2016-10-06 10:50:21 +02:00
Nicolas Grekas dcf601f3fa Minor fixes & cleanups 2016-10-06 10:40:01 +02:00
Fabien Potencier f09b1ed561 Merge branch '2.7' into 2.8
* 2.7:
  [HttpFoundation] JSONP callback validation
  [Console] Improved the explanation of the hasOption() method
  add missing use statement
  bug #18042 [Security] $attributes can be anything, but RoleVoter assumes strings
2016-10-05 18:43:09 -07:00
Fabien Potencier a5a91a7fa1 bug #19725 [Security] $attributes can be anything, but RoleVoter assumes strings (Jonatan Männchen)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] $attributes can be anything, but RoleVoter assumes strings

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | yes
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #18042
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

Commits
-------

ad3ac95 bug #18042 [Security] $attributes can be anything, but RoleVoter assumes strings
2016-10-05 18:42:44 -07:00
Fabien Potencier dcc7c41bbb minor #20166 [DependencyInjection] Add missing PHPDoc type (dunglas)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Add missing PHPDoc type

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

Commits
-------

4cae9c0 [DependencyInjection] Add missing PHPDoc type
2016-10-05 16:58:12 -07:00
Fabien Potencier 8f4f40a3d5 minor #20165 Correct a typo in the ReflectionExtractor's description (dunglas)
This PR was merged into the 2.8 branch.

Discussion
----------

Correct a typo in the ReflectionExtractor's description

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

Information is uncountable. Standardize with the description of the `PhpDocExtractor`.

Commits
-------

1427d33 Correct a typo in the ReflectionExtractor's description
2016-10-05 16:56:45 -07:00
Kévin Dunglas 4cae9c0947
[DependencyInjection] Add missing PHPDoc type 2016-10-05 22:47:52 +02:00
Kévin Dunglas 1427d33153
Correct a typo in the ReflectionExtractor's description 2016-10-05 21:27:34 +02:00
Fabien Potencier d040748e16 bug #20127 [HttpFoundation] JSONP callback validation (ro0NL)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #20127).

Discussion
----------

[HttpFoundation] JSONP callback validation

| Q             | A
| ------------- | ---
| Branch?       | "master"
| Bug fix?      | yes
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #17923
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

Maybe this is too small for a new dep, but at least it's stable. Symfony itself will make no assumption on validation by default, ie. things should keep working as usual.

Commits
-------

1159f8b [HttpFoundation] JSONP callback validation
2016-10-05 12:15:52 -07:00
Roland Franssen 1159f8bba6 [HttpFoundation] JSONP callback validation 2016-10-05 12:15:52 -07:00