Commit Graph

31152 Commits

Author SHA1 Message Date
Nicolas Grekas 6311be7157 [travis] Fix 3/4 cross tests 2017-05-24 18:15:01 +02:00
Nicolas Grekas 9a081d83c4 Merge branch '3.3' into 3.4
* 3.3:
  [DI] Check privates before aliases consistently
  [Yaml] Add missing deprecation annotation
  [DI] Check for privates before shared services
2017-05-24 16:44:14 +02:00
Nicolas Grekas b494106e2f Merge branch '3.2' into 3.3
* 3.2:
  [DI] Check privates before aliases consistently
2017-05-24 16:39:04 +02:00
Nicolas Grekas 1d9b1af4a3 [DI] Check privates before aliases consistently 2017-05-24 16:36:51 +02:00
Nicolas Grekas d7981e5838 Merge branch '3.2' into 3.3
* 3.2:
  [Yaml] Add missing deprecation annotation
  [DI] Check for privates before shared services
2017-05-24 16:31:45 +02:00
Fabien Potencier 69583b2403 bug #22866 [DI] Check for privates before shared services (ro0NL)
This PR was merged into the 3.2 branch.

Discussion
----------

[DI] Check for privates before shared services

| Q             | A
| ------------- | ---
| Branch?       | 3.2
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/22801#discussion_r117732213, https://github.com/symfony/symfony/pull/22801#discussion_r117732599
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

cc @stof

Commits
-------

4f683a9a5b [DI] Check for privates before shared services
2017-05-24 16:25:02 +02:00
Nicolas Grekas e2689d42fc Merge branch '3.3' into 3.4
* 3.3:
  [DI] prepare for signature change in 4.0
  [DI] Add missing deprecation on Extension::getClassesToCompile
  [Routing] remove an unused routing fixture
  [Yaml] fix multiline block handling
  [WebProfilerBundle] Fix sub-requests display in time profiler panel
  [FrameworkBundle] Handle project dir in cache:clear command
  [WebServerBundle] Mark ServerCommand as internal
  [DI] Fix autowire error for inlined services
  Close PHP code in phpt file
  [Profiler][VarDumper] Fix searchbar css when in toolbar
  Prevent auto-registration of UserPasswordEncoderCommand
  [Process] Fixed incorrectly escaping arguments on Windows when inheritEnvironmentVariables is set to false
  avoid double blanks while rendering form attributes
  use getProjectDir() when possible
  [PhpUnitBridge] add a changelog file
  [FrameworkBundle][Validator] Deprecate passing validator instances/aliases over using the service locator
2017-05-24 13:37:21 +02:00
Nicolas Grekas feaf5c987e Merge branch '3.2' into 3.3
* 3.2:
  [Routing] remove an unused routing fixture
  [WebProfilerBundle] Fix sub-requests display in time profiler panel
  [PhpUnitBridge] add a changelog file
2017-05-24 13:35:23 +02:00
Nicolas Grekas 667efd251e minor #22818 [DependencyInjection] prepare for signature change in 4.0 (xabbuh)
This PR was submitted for the 3.4 branch but it was merged into the 3.3 branch instead (closes #22818).

Discussion
----------

[DependencyInjection] prepare for signature change in 4.0

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

see failing tests in #22785

Commits
-------

c4b6e20 [DI] prepare for signature change in 4.0
2017-05-24 13:33:24 +02:00
Christian Flothmann c4b6e2014c [DI] prepare for signature change in 4.0 2017-05-24 13:31:33 +02:00
Nicolas Grekas 879c9129b7 feature #22884 [DI] Add missing deprecation on Extension::getClassesToCompile (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Add missing deprecation on Extension::getClassesToCompile

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

Already dropped on master

Commits
-------

95fb929 [DI] Add missing deprecation on Extension::getClassesToCompile
2017-05-24 12:51:20 +02:00
Christian Flothmann cf458fa871 minor #22883 [Yaml] Add missing deprecation annotation (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[Yaml] Add missing deprecation annotation

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

Commits
-------

c67dd38 [Yaml] Add missing deprecation annotation
2017-05-24 11:51:02 +02:00
Nicolas Grekas 95fb929c58 [DI] Add missing deprecation on Extension::getClassesToCompile 2017-05-24 10:46:17 +02:00
Nicolas Grekas c67dd3805b [Yaml] Add missing deprecation annotation 2017-05-24 10:41:50 +02:00
Fabien Potencier df443f023f minor #22881 [Routing] remove an unused routing fixture (xabbuh)
This PR was merged into the 3.2 branch.

Discussion
----------

[Routing] remove an unused routing fixture

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

This was initially removed in #13361 and accidentally added again
in #11394.

Commits
-------

6f67221129 [Routing] remove an unused routing fixture
2017-05-24 08:39:34 +02:00
Fabien Potencier c2ffa619a3 bug #22874 [WebProfilerBundle] Fix sub-requests display in time profiler panel (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[WebProfilerBundle] Fix sub-requests display in time profiler panel

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

Commits
-------

d715cc4a27 [WebProfilerBundle] Fix sub-requests display in time profiler panel
2017-05-24 08:36:19 +02:00
Fabien Potencier a3078804ef feature #22597 [Lock] Re-add the Lock component in 3.4 (jderusse)
This PR was squashed before being merged into the 3.4 branch (closes #22597).

Discussion
----------

[Lock] Re-add the Lock component in 3.4

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

This PR reverts #22590 as decided in  #22580.

Commits
-------

3b6c495c89 [Lock] Re-add the Lock component in 3.4
2017-05-24 08:31:10 +02:00
Jérémy Derussé 3b6c495c89 [Lock] Re-add the Lock component in 3.4 2017-05-24 08:31:08 +02:00
Fabien Potencier 047a06e235 bug #22853 [Yaml] fix multiline block handling (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[Yaml] fix multiline block handling

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #21114, https://github.com/symfony/symfony/pull/22105#issuecomment-288386147
| License       | MIT
| Doc PR        |

Commits
-------

a2079d6e2e [Yaml] fix multiline block handling
2017-05-24 07:58:03 +02:00
Christian Flothmann 6f67221129 [Routing] remove an unused routing fixture
This was initially removed in #13361 and accidentally added again
in #11394.
2017-05-24 00:01:29 +02:00
Christian Flothmann a2079d6e2e [Yaml] fix multiline block handling 2017-05-23 20:34:36 +02:00
Roland Franssen 4f683a9a5b [DI] Check for privates before shared services 2017-05-23 19:58:02 +02:00
Nicolas Grekas d715cc4a27 [WebProfilerBundle] Fix sub-requests display in time profiler panel 2017-05-23 15:50:20 +02:00
Fabien Potencier aef39bcee5 bug #22872 [FrameworkBundle] Handle project dir in cache:clear command (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle] Handle project dir in cache:clear command

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

Commits
-------

fadffad2aa [FrameworkBundle] Handle project dir in cache:clear command
2017-05-23 14:42:40 +02:00
Nicolas Grekas fadffad2aa [FrameworkBundle] Handle project dir in cache:clear command 2017-05-23 13:48:44 +02:00
Fabien Potencier 8f29634c01 minor #22869 [WebServerBundle] Mark ServerCommand as internal (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[WebServerBundle] Mark ServerCommand as internal

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

Commits
-------

c91d19574f [WebServerBundle] Mark ServerCommand as internal
2017-05-23 13:05:50 +02:00
Nicolas Grekas c91d19574f [WebServerBundle] Mark ServerCommand as internal 2017-05-23 11:11:47 +02:00
Nicolas Grekas 4a766693a8 feature #22808 [FrameworkBundle][Validator] Deprecate passing validator instances/aliases over using the service locator (ogizanagi)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle][Validator] Deprecate passing validator instances/aliases over using the service locator

| Q             | A
| ------------- | ---
| Branch?       | 3.3 <!-- see comment below -->
| Bug fix?      | no
| New feature?  | no <!-- don't forget updating src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | yes <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/22800#issuecomment-302865630 <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

Commits
-------

df747ce [FrameworkBundle][Validator] Deprecate passing validator instances/aliases over using the service locator
2017-05-23 11:02:41 +02:00
Nicolas Grekas cbd256135b minor #22845 [Form][3.3] avoid double blanks while rendering form attributes (craue)
This PR was merged into the 3.3 branch.

Discussion
----------

[Form][3.3] avoid double blanks while rendering form attributes

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | kind of
| New feature?  | no
| BC breaks?    | no (rather reverts one)
| Deprecations? | no
| Tests pass?   | we'll see
| Fixed tickets | --
| License       | MIT
| Doc PR        | --

This fix avoids the double blanks introduced by #20365 when using the Twig template. The `attributes` block already renders one blank before each attribute, so there's no need to add another one prior to calling the block.

Commits
-------

a9c11c9 avoid double blanks while rendering form attributes
2017-05-23 10:58:47 +02:00
Nicolas Grekas 2f4dea56b4 bug #22857 [DI] Fix autowire error for inlined services (weaverryan)
This PR was squashed before being merged into the 3.3 branch (closes #22857).

Discussion
----------

[DI] Fix autowire error for inlined services

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

The `AutowirePass` defers autowiring exceptions until later so that we don't throw autowiring exceptions for services that are ultimately removed. But, if a service is *inlined*, then it appears to be removed, and so we don't throw the exception. This fixes that.

It's an easy fix - but it's a bit ugly. We're adding a bit more "state" to the passes... simply because there is some information that needs to be shared through the compiler process. There might be a better way of doing this in the future (e.g. storing some metadata on the `Compiler`), but this *does* work well.

Commits
-------

4bcef3d [DI] Fix autowire error for inlined services
2017-05-23 10:56:47 +02:00
Ryan Weaver 4bcef3d67c [DI] Fix autowire error for inlined services 2017-05-23 10:56:44 +02:00
Nicolas Grekas bca7b41afd bug #22858 [SecurityBundle] Prevent auto-registration of UserPasswordEncoderCommand (chalasr)
This PR was merged into the 3.3 branch.

Discussion
----------

[SecurityBundle] Prevent auto-registration of UserPasswordEncoderCommand

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

Always registers the command as a service even if no encoders are configured so that it is not auto-registered via reflection.
Prevents an irrelevant deprecation when no encoders are configured and, if a day the per-convention command registration is removed, ensures that the command always exists (leading to an exception saying that you have no configured encoder, better than nothing).
ping @ogizanagi

Commits
-------

b39b35b Prevent auto-registration of UserPasswordEncoderCommand
2017-05-23 10:54:54 +02:00
Nicolas Grekas 4d93e144a8 bug #22859 [Profiler][VarDumper] Fix searchbar css when in toolbar (ogizanagi)
This PR was merged into the 3.3 branch.

Discussion
----------

[Profiler][VarDumper] Fix searchbar css when in toolbar

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no <!-- don't forget updating src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | N/A
| License       | MIT
| Doc PR        | N/A

Because css is hard (`.sf-toolbarreset *` has precedence since 4acec8973f moved the `toolbar.css.twig` inclusion from up to bottom):

|Before|After|
|--|--|
|<img width="291" alt="screenshot 2017-05-22 a 19 36 06" src="https://cloud.githubusercontent.com/assets/2211145/26321182/208780c0-3f26-11e7-89bb-7aa64f17c7b5.PNG">|<img width="280" alt="screenshot 2017-05-22 a 19 36 27" src="https://cloud.githubusercontent.com/assets/2211145/26321188/248ed0ce-3f26-11e7-852a-40968fba2e9f.PNG">|

Commits
-------

98b3002 [Profiler][VarDumper] Fix searchbar css when in toolbar
2017-05-23 09:35:31 +02:00
Nicolas Grekas ec54341ee0 minor #22861 Close PHP code in phpt file (keradus)
This PR was merged into the 3.3 branch.

Discussion
----------

Close PHP code in phpt file

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

that's the only phpt file that is not closing php code section
this causes linting via `php -l` to fail

Commits
-------

36f6e05 Close PHP code in phpt file
2017-05-23 09:33:33 +02:00
Fabien Potencier 222325f088 minor #22843 use getProjectDir() when possible (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

use getProjectDir() when possible

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

Commits
-------

a8e298a66c use getProjectDir() when possible
2017-05-23 07:59:48 +02:00
Dariusz Rumiński 36f6e05a2e Close PHP code in phpt file 2017-05-22 22:45:58 +02:00
Maxime Steinhausser 98b3002caf [Profiler][VarDumper] Fix searchbar css when in toolbar 2017-05-22 19:32:12 +02:00
Robin Chalas b39b35b95d Prevent auto-registration of UserPasswordEncoderCommand 2017-05-22 18:58:55 +02:00
Nicolas Grekas 82ec56b40c bug #22614 [Process] Fixed escaping arguments on Windows when inheritEnvironmentVariables is set to false (maryo)
This PR was merged into the 3.3 branch.

Discussion
----------

[Process]  Fixed escaping arguments on Windows when inheritEnvironmentVariables is set to false

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

I've added a FAILING testcase on Windows. It incorrectly substitutes an argument containing a quotation mark probably assuming it's an env var needed to backup when inheritEnvironmentVariables is set to false.

Commits
-------

26032ef [Process] Fixed incorrectly escaping arguments on Windows when inheritEnvironmentVariables is set to false
2017-05-22 14:37:50 +02:00
maryo 26032ef055 [Process] Fixed incorrectly escaping arguments on Windows when inheritEnvironmentVariables is set to false 2017-05-22 14:32:03 +02:00
Nicolas Grekas 5f29144e1b feature #22803 [DI] Deprecate Container::initialized() for privates (ro0NL)
This PR was merged into the 3.4 branch.

Discussion
----------

[DI] Deprecate Container::initialized() for privates

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes-ish
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

See https://github.com/symfony/symfony/pull/22801#issuecomment-302875014

Failing test seems unrelated.

Commits
-------

e0eb247 [DI] Deprecate Container::initialized() for privates
2017-05-22 13:39:38 +02:00
Roland Franssen e0eb247229 [DI] Deprecate Container::initialized() for privates 2017-05-22 13:20:30 +02:00
Nicolas Grekas 98a2d3c429 Merge branch '3.3' into 3.4
* 3.3:
  [Serializer] Remove a useless legacy annotation
  Fixed extra semi-colon
  fix docblock position
  [DependencyInjection] remove unused variable
  [PhpUnitBridge] add changelog entries for #21140
  [DI] Remove dead service_container checks
2017-05-22 11:56:34 +02:00
Nicolas Grekas 1705eebef6 minor #22852 [Serializer] Remove a useless legacy annotation (dunglas)
This PR was merged into the 3.3 branch.

Discussion
----------

[Serializer] Remove a useless legacy annotation

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | no
| New feature?  | no <!-- don't forget updating src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget updating UPGRADE-*.md files -->
| Tests pass?   | yes/no
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

<!--
- Bug fixes must be submitted against the lowest branch where they apply
  (lowest branches are regularly merged to upper ones so they get the fixes too).
- Features and deprecations must be submitted against the 3.4,
  legacy code removals go to the master branch.
- Please fill in this template according to the PR you're about to submit.
- Replace this comment by a description of what your PR is solving.
-->

Commits
-------

987749b [Serializer] Remove a useless legacy annotation
2017-05-22 11:51:09 +02:00
Kévin Dunglas 987749bb99
[Serializer] Remove a useless legacy annotation 2017-05-22 11:36:51 +02:00
Nicolas Grekas e014b8a7a3 minor #22850 [VarDumper] CS Fix extra semi-colon (chalasr)
This PR was merged into the 3.3 branch.

Discussion
----------

[VarDumper] CS Fix extra semi-colon

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

Commits
-------

c252c08 Fixed extra semi-colon
2017-05-22 11:26:56 +02:00
Robin Chalas c252c08d44 Fixed extra semi-colon 2017-05-22 11:10:57 +02:00
Nicolas Grekas d33b6c5306 minor #22846 [FrameworkBundle][Translation] fix docblock position (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle][Translation] fix docblock position

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

The `$defaultLocale` argument is present in the `Translator` class of
the FrameworkBundle, but is not part of the Translation component.

Commits
-------

0829964 fix docblock position
2017-05-22 09:49:45 +02:00
Nicolas Grekas 40b17336fc minor #22825 [DI] Remove dead service_container checks (ro0NL)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Remove dead service_container checks

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

Since #21627

Commits
-------

9a8ea93 [DI] Remove dead service_container checks
2017-05-22 09:45:40 +02:00
Christian Flothmann 082996417d fix docblock position
The `$defaultLocale` argument is present in the `Translator` class of
the FrameworkBundle, but is not part of the Translation component.
2017-05-22 09:42:36 +02:00