Commit Graph

25415 Commits

Author SHA1 Message Date
Fabien Potencier
b9cd91d342 Merge branch '2.8' into 3.0
* 2.8:
  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
  Fix bug when using an private aliased factory service
  ChoiceFormField of type "select" could be "disabled"
  Update contributing docs
  [Console] Fix escaping of trailing backslashes
  Fix constraint validator alias being required
  [ci] clone with depth=1 to kill push-forced PRs
  Add check on If-Range header
2016-02-28 17:24:34 +01:00
Fabien Potencier
caf2871b87 Merge branch '2.7' into 2.8
* 2.7:
  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
  Fix bug when using an private aliased factory service
  ChoiceFormField of type "select" could be "disabled"
  Update contributing docs
  [Console] Fix escaping of trailing backslashes
  Fix constraint validator alias being required
  [ci] clone with depth=1 to kill push-forced PRs
  Add check on If-Range header
2016-02-28 17:20:50 +01:00
Fabien Potencier
51a71ab74a Merge branch '2.3' into 2.7
* 2.3:
  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
  Fix bug when using an private aliased factory service
  ChoiceFormField of type "select" could be "disabled"
  Update contributing docs
  [Console] Fix escaping of trailing backslashes
  Fix constraint validator alias being required
  [ci] clone with depth=1 to kill push-forced PRs
  Add check on If-Range header
2016-02-28 17:19:47 +01:00
Fabien Potencier
fe4362cf39 bug #17947 Fix - #17676 (backport #17919 to 2.3) (Ocramius)
This PR was merged into the 2.3 branch.

Discussion
----------

Fix - #17676 (backport #17919 to 2.3)

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

This is a backport of #17919

Commits
-------

0c6400a  #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features
2016-02-28 17:10:13 +01:00
Marco Pivetta
0c6400a428 #17676 - making the proxy instantiation compatible with ProxyManager 2.x by detecting proxy features 2016-02-28 10:53:30 -05:00
Fabien Potencier
85c4b06211 bug #17942 Fix bug when using an private aliased factory service (WouterJ)
This PR was squashed before being merged into the 2.3 branch (closes #17942).

Discussion
----------

Fix bug when using an private aliased factory service

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

/cc @xabbuh

Commits
-------

de406c0 Fix bug when using an private aliased factory service
2016-02-28 16:06:54 +01:00
WouterJ
de406c0e38 Fix bug when using an private aliased factory service 2016-02-28 16:06:53 +01:00
Jules Pietri
bff19d5c42 [Form] fix tests added by #17798 by removing choices_as_values 2016-02-28 16:06:03 +01:00
Fabien Potencier
1d711899b6 Merge branch '2.8' into 3.0
* 2.8:
  [Form] fix FQCN in tests added by #17798
  bug #17798 [Form] allow `choice_label` option to be `false`
  [DependencyInjection] Simplified code in AutowirePass
2016-02-28 16:05:39 +01:00
Jules Pietri
feed60785e [Form] fix FQCN in tests added by #17798 2016-02-28 16:05:09 +01:00
Fabien Potencier
82eb951186 Merge branch '2.7' into 2.8
* 2.7:
  bug #17798 [Form] allow `choice_label` option to be `false`
2016-02-28 15:59:45 +01:00
Fabien Potencier
b630ac733b bug #17798 [2.7] [Form] Fix BC break by allowing 'choice_label' option to be 'false' in ChoiceType (HeahDude)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [Form] Fix BC break by allowing 'choice_label' option to be 'false' in ChoiceType

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

- [x] Make tests pass
- [x] Adress a doc PR
- [x] Replace alias by FQCN in tests for 2.8, see #17890
- [x] Remove `choices_as_values` in tests for 3.0, see #17891

Commits
-------

017e1d9 bug #17798 [Form] allow `choice_label` option to be `false`
2016-02-28 15:58:25 +01:00
Fabien Potencier
34f3294336 feature #17728 [Yaml] add option to dump objects as maps (xabbuh)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Yaml] add option to dump objects as maps

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #9870, #12860, #15781, #15937, #16266
| License       | MIT
| Doc PR        | TODO

Commits
-------

3941d2e [Yaml] add option to dump objects as maps
2016-02-28 11:09:55 +01:00
Fabien Potencier
0ca4ec2b2f minor #17916 Update contributing docs (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Update contributing docs

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

I propose adding the branch to the pull request template so that submitters have some hint about the branch selection workflow, and so that we can edit it for mergers.

I'd also like to add a link to the "running tests" doc, which made me rewrite the full contributing file, with links to the sections of the contributing documentation.

Commits
-------

852f999 Update contributing docs
2016-02-28 11:04:35 +01:00
Fabien Potencier
c74f1aa614 feature #17863 [Yaml] add support for parsing the !!binary tag (xabbuh)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Yaml] add support for parsing the !!binary tag

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

Commits
-------

79a63d5 [Yaml] add support for the !!binary tag
2016-02-28 11:02:06 +01:00
Fabien Potencier
a0fd6371b7 minor #17936 [FrameworkBundle] Fix test for JsonSerializableNormalizer (dunglas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[FrameworkBundle] Fix test for JsonSerializableNormalizer

| 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

Fix a test failure introduced by #17603

Commits
-------

a696107 [FrameworkBundle] Fix test for JsonSerializableNormalizer
2016-02-28 10:56:00 +01:00
Fabien Potencier
248b4cfa7e minor #17941 [DependencyInjection] Remove unused parameter of private property (paradajozsef)
This PR was merged into the 3.0 branch.

Discussion
----------

[DependencyInjection] Remove unused parameter of private property

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

Commits
-------

d5129d2 [DependencyInjection] Remove unused parameter of private property
2016-02-28 10:55:03 +01:00
Fabien Potencier
992a69684d minor #17940 [Process] Remove unreachable return statement. (paradajozsef)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Process] Remove unreachable return statement.

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

[This return](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Process/Process.php#L1267) is [unreachable](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Process/Process.php#L1255) after #17427.

Commits
-------

8f2d5bb [Process] Remove unreachable return statement.
2016-02-28 10:54:29 +01:00
Fabien Potencier
2544162041 minor #17932 [PropertyInfo] Allow to use a custom DocBlock factory with the PHPDoc extractor (dunglas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[PropertyInfo] Allow to use a custom DocBlock factory with the PHPDoc extractor

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

Minor tweak to #17531.

Commits
-------

3c32a2f [PropertyInfo] Allow to use a custom DocBlock factory with the PHPDoc extractor
2016-02-28 10:51:52 +01:00
Christian Flothmann
79a63d50a1 [Yaml] add support for the !!binary tag 2016-02-27 17:28:09 +01:00
Christian Flothmann
3941d2ee4b [Yaml] add option to dump objects as maps 2016-02-27 09:17:39 +01:00
Paráda József
d5129d2ac3 [DependencyInjection] Remove unused parameter of private property 2016-02-26 23:05:30 +01:00
Paráda József
8f2d5bbccb [Process] Remove unreachable return statement. 2016-02-26 22:16:08 +01:00
Kévin Dunglas
a696107126 [FrameworkBundle] Fix test for JsonSerializableNormalizer 2016-02-26 18:18:07 +01:00
Jules Pietri
017e1d9e6e bug #17798 [Form] allow choice_label option to be false
When `ChoiceType`is expanded, `choice_label` option can be `false`
or return `false` for one or more choices by a callable.
2016-02-26 16:42:52 +01:00
Kévin Dunglas
3c32a2fb4f [PropertyInfo] Allow to use a custom DocBlock factory with the PHPDoc extractor 2016-02-26 13:56:19 +01:00
Fabien Potencier
cc9f6b0a95 minor #17900 [DependencyInjection] Simplified code in AutowirePass (hason)
This PR was merged into the 2.8 branch.

Discussion
----------

[DependencyInjection] Simplified code in AutowirePass

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

Commits
-------

ce0357e [DependencyInjection] Simplified code in AutowirePass
2016-02-26 07:30:51 +01:00
Fabien Potencier
809723fe1f Merge branch '2.8' into 3.0
* 2.8:
  [Form] fix tests added by #17760 with FQCN
2016-02-26 07:25:40 +01:00
Fabien Potencier
1f33be2cd2 minor #17759 [WIP] [2.8] [Form] fix FQCN in tests added by #17760 (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[WIP] [2.8] [Form] fix FQCN in tests added by #17760

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

- [x] Update tests from #17760
- [x] Wait for #17760 to be merged in 2.8

Commits
-------

acdd7db [Form] fix tests added by #17760 with FQCN
2016-02-26 07:25:19 +01:00
Fabien Potencier
48f05ecad2 feature #17738 [PropertyAccess] Throw an InvalidArgumentException when the type do not match (dunglas)
This PR was squashed before being merged into the 3.1-dev branch (closes #17738).

Discussion
----------

[PropertyAccess] Throw an InvalidArgumentException when the type do not match

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

Currently, when the Property Access Component call a setter with a value not matching its typehint, a `\TypeError` is thrown with PHP 7 and a `PHP Catchable fatal error` with PHP 5.

This PR make the component returning an `InvalidArgumentException` with both version. It's a (better) alternative to #17660 (the hardening part) to make the Symfony Serializer (and probably many other pieces of code) more robust when types do not match.

/cc @csarrazi @mRoca @blazarecki

Commits
-------

e70fdbc [PropertyAccess] Throw an InvalidArgumentException when the type do not match
2016-02-26 07:20:42 +01:00
Kévin Dunglas
e70fdbc8cb [PropertyAccess] Throw an InvalidArgumentException when the type do not match 2016-02-26 07:20:38 +01:00
Jules Pietri
acdd7db377 [Form] fix tests added by #17760 with FQCN 2016-02-26 07:14:25 +01:00
Fabien Potencier
07aa280bc1 Merge branch '3.0'
* 3.0:
  fixed tests
  [Security] added some tests
2016-02-26 07:08:19 +01:00
Fabien Potencier
e4607e2fd3 minor #17930 fixed tests (fabpot)
This PR was merged into the 3.0 branch.

Discussion
----------

fixed tests

Commits
-------

70bba10 fixed tests
2016-02-26 07:08:08 +01:00
Fabien Potencier
70bba10d79 fixed tests 2016-02-26 07:06:39 +01:00
Fabien Potencier
d1d5dd737b Merge branch '2.8' into 3.0
* 2.8:
  [Security] added some tests
2016-02-26 07:05:24 +01:00
Fabien Potencier
e899fa3f10 Merge branch '2.7' into 2.8
* 2.7:
  [Security] added some tests
2016-02-26 07:05:14 +01:00
Fabien Potencier
22383987e0 minor #17929 [Security] added some tests (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] added some tests

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

Commits
-------

7aec568 [Security] added some tests
2016-02-26 07:04:58 +01:00
Fabien Potencier
7aec568c05 [Security] added some tests 2016-02-26 07:03:43 +01:00
Fabien Potencier
8fc9dd94af Merge branch '3.0'
* 3.0:
  [WIP] [3.0] [Form] fix tests added by #17760 by removing
  removed obsolete code
  [HttpFoundation] Remove @throws from ParameterBag::get() PHPDoc. This was for the now removed deep flag.
  [Form] refactor `RadioListMapper::mapDataToForm()`
  [Form] fix choice value "false" in ChoiceType
2016-02-26 06:59:04 +01:00
Fabien Potencier
039980c254 minor #17886 [WIP] [3.0] [Form] fix tests added by #17760 by removing choices_as_values (HeahDude)
This PR was squashed before being merged into the 3.0 branch (closes #17886).

Discussion
----------

[WIP] [3.0] [Form] fix tests added by #17760 by removing `choices_as_values`

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

- [x] Wait for #17760 being merged in 3.0

Commits
-------

03a7705 [WIP] [3.0] [Form] fix tests added by #17760 by removing
2016-02-26 06:58:41 +01:00
Jules Pietri
03a7705932 [WIP] [3.0] [Form] fix tests added by #17760 by removing 2016-02-26 06:58:36 +01:00
Fabien Potencier
d0cac39932 bug #17542 ChoiceFormField of type "select" could be "disabled" (bouland)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #17542).

Discussion
----------

ChoiceFormField of type "select" could be "disabled"

Hi,

New PR to add tests from the closed PR #15952

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

Commits
-------

576c4b9 ChoiceFormField of type "select" could be "disabled"
2016-02-26 06:48:23 +01:00
Simon Bouland
576c4b9b42 ChoiceFormField of type "select" could be "disabled" 2016-02-26 06:48:23 +01:00
Fabien Potencier
be30748bc9 bug #17602 [HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header (bburnichon)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpFoundation] Fix BinaryFileResponse incorrect behavior with if-range header

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

Commits
-------

aaad5bd Add check on If-Range header
2016-02-26 06:44:02 +01:00
Fabien Potencier
88e6e3d10f minor #17928 removed obsolete code (fabpot)
This PR was merged into the 3.0 branch.

Discussion
----------

removed obsolete code

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

6f5322e removed obsolete code
2016-02-26 06:39:54 +01:00
Fabien Potencier
6f5322ed8a removed obsolete code 2016-02-26 06:37:50 +01:00
Fabien Potencier
c2d1c02e93 feature #17531 [PropertyInfo] Use last version of reflection docblock (joelwurtz)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[PropertyInfo] Use last version of reflection docblock

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

This PR improve the PhpDocExtractor to use https://github.com/phpDocumentor/ReflectionDocBlock 3.0 dev branch instead of https://github.com/phpDocumentor/ReflectionDocBlock 1.0.7 which is not maintained since 2014

I don't know if it's a BC break since it's only a suggested dependency.

This is somehow mandatory (we can maybe use a more stable, but also not maintained version of this repository) for #17516 as it does not have a dependency on php-parser 0.9.4 which is very old and not really suitable for the new component.

Commits
-------

d642eae Use last version of reflection dockblock, avoid extra dependancy if library needed
2016-02-26 06:32:11 +01:00
Fabien Potencier
aa770e163d feature #17782 Support autowiring for Doctrine\Common\Annotations\Reader (maryo)
This PR was merged into the 3.1-dev branch.

Discussion
----------

Support autowiring for Doctrine\Common\Annotations\Reader

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

I've added support for autowiring based on `Doctrine\Common\Annotations\Reader` interface simmilar to https://github.com/symfony/symfony/pull/17703/files

The `annotations.cached_reader` service is injected when cache is enabled.

Commits
-------

b325f9c Support autowiring for Doctrine\Common\Annotations\Reader
2016-02-26 06:17:41 +01:00
Fabien Potencier
8ae5dc35f5 minor #17889 [ci] clone with depth=1 to kill push-forced PRs (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] clone with depth=1 to kill push-forced PRs

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

As documented in https://github.com/travis-ci/travis-ci/issues/4575#issuecomment-125200308, setting a clone depth of 1 will make push-forced PRs to fail quickly so that our CI won't spend too much time on them.

Commits
-------

562d4d6 [ci] clone with depth=1 to kill push-forced PRs
2016-02-26 06:14:49 +01:00