Commit Graph

25014 Commits

Author SHA1 Message Date
Fabien Potencier
04ca6a2771 Merge branch '2.7' into 2.8
* 2.7:
  fixed test
  [Request] Ignore invalid IP addresses sent by proxies
  Throw for missing container extensions
  [TwigBridge] add missing unit tests (AppVariable)
  Able to load big xml files with DomCrawler
  fixed typo
  [Form] Fix constraints could be null if not set
  [Finder] Check PHP version before applying a workaround for a PHP bug
  fixed CS
  add defaultNull to version
  sort bundles in config:dump-reference command
  Fixer findings.
  [Translation][Writer] avoid calling setBackup if the dumper is not an instance of FileDumper.
  [FrameworkBundle] Compute the kernel root hash only one time
2016-01-25 10:56:46 +01:00
Fabien Potencier
0fe08a800e fixed test 2016-01-25 10:56:38 +01:00
Fabien Potencier
2173c78da2 Merge branch '2.3' into 2.7
* 2.3:
  [Request] Ignore invalid IP addresses sent by proxies
  Able to load big xml files with DomCrawler
  fixed typo
  [Form] Fix constraints could be null if not set
  [Finder] Check PHP version before applying a workaround for a PHP bug
  fixed CS
  sort bundles in config:dump-reference command
  Fixer findings.
2016-01-25 10:55:53 +01:00
Fabien Potencier
50b48f6516 bug #16736 [Request] Ignore invalid IP addresses sent by proxies (GromNaN)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16736).

Discussion
----------

[Request] Ignore invalid IP addresses sent by proxies

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

The [RFC 7239](https://tools.ietf.org/html/rfc7239#section-6.2) allows other values that IP addresses to be passed in `Forwarded`header and [Nginx can add `unknown` to the `X-Forwarded-For`header](http://www.squid-cache.org/Doc/config/forwarded_for/).

To prevent these invalid IP addresses from being returned as "Client IP", this PR ensure that they are excluded.

Commits
-------

6578806 [Request] Ignore invalid IP addresses sent by proxies
2016-01-25 10:51:01 +01:00
Jérôme Tamarelle
6578806fc3 [Request] Ignore invalid IP addresses sent by proxies
Fixes symfony/symfony#15525
2016-01-25 10:50:55 +01:00
Fabien Potencier
65d0bb36f0 bug #17459 [EventDispatcher] TraceableEventDispatcher resets event listener priorities (c960657)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #17459).

Discussion
----------

[EventDispatcher] TraceableEventDispatcher resets event listener priorities

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

Commits
-------

233e5b8 [EventDispatcher] TraceableEventDispatcher resets listener priorities
2016-01-25 10:45:09 +01:00
Christian Schmidt
233e5b8df7 [EventDispatcher] TraceableEventDispatcher resets listener priorities 2016-01-25 10:45:09 +01:00
Fabien Potencier
2ab5edbf48 bug #17486 [FrameworkBundle] Throw for missing container extensions (kix)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #17486).

Discussion
----------

[FrameworkBundle] Throw for missing container extensions

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

This covers the case when an existing bundle does not have an extension, and its config is dumped. Before, calling `app/console config:dump` on such bundle lead to FatalErrorException with ```Call to a member function getAlias() on null```, now we process such cases and throw an exception with some explanatory text.

Commits
-------

884368e Throw for missing container extensions
2016-01-25 10:38:11 +01:00
Stepan Anchugov
884368e709 Throw for missing container extensions
This covers cases when a bundle does not have an extension, which
lead to FatalErrorException with ```Call to a member function getAlias() on null```
2016-01-25 10:38:10 +01:00
Fabien Potencier
8c51a94e13 fixed CS 2016-01-25 10:20:12 +01:00
Fabien Potencier
8ecc322c56 feature #17327 Added support links to exception and toolbar (peterrehm)
This PR was squashed before being merged into the 3.1-dev branch (closes #17327).

Discussion
----------

Added support links to exception and toolbar

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

Exception Page:
<img width="1041" alt="bildschirmfoto 2016-01-10 um 17 33 09" src="https://cloud.githubusercontent.com/assets/2010989/12222567/528ed2f6-b7c0-11e5-9e48-d136a8ac0767.png">

Toolbar:
<img width="568" alt="bildschirmfoto 2016-01-10 um 17 35 09" src="https://cloud.githubusercontent.com/assets/2010989/12222582/a1bec0b6-b7c0-11e5-8bf8-325c0ed806c1.png">

I am not yet sure if the link at the top of the exception is visible enough.

Commits
-------

1d05157 Added support links to exception and toolbar
2016-01-25 10:19:49 +01:00
Peter Rehm
1d0515790b Added support links to exception and toolbar 2016-01-25 10:19:46 +01:00
Fabien Potencier
cf1bc50385 bug #16961 Overriding profiler position in CSS breaks JS positioning (aschempp)
This PR was merged into the 2.8 branch.

Discussion
----------

Overriding profiler position in CSS breaks JS positioning

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

The positioning of a profiler info block (open to the left or right) is [calculated using Javascript](https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig#L35). Since Symfony 2.8, the config/version panel is right-aligned and opens to the left. If another panel is added to the right of it, the panel cannot open correctly.

Styles are unset in https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig#L46-L47 but that means it is set back to the stylesheet settings, which results in `right:0, left:0` on the element.

Manual testing is fairly easy: Just add a CSS class `sf-toolbar-block-right` on one or multiple panels (e.g. Doctrine) that result in the Config panel to have enough room to open to the right.

Here's a screenshot of the problem:
![bildschirmfoto 2015-12-11 um 10 27 55](https://cloud.githubusercontent.com/assets/1073273/11740305/e2c94cfc-9ff1-11e5-86ae-1fd94ec5a93e.png)

The other option would be to set the position in javascript to `right: auto` instead of unsetting, but I prefer to fix invalid CSS ;-)

Commits
-------

79474a6 Profiler CSS position conflicts with JS detection
2016-01-25 09:39:54 +01:00
Fabien Potencier
fc56a5cefa minor #16859 [TwigBridge] add missing unit tests (AppVariable) (FlorianLB)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #16859).

Discussion
----------

[TwigBridge] add missing unit tests (AppVariable)

Just add few missing unit 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
-------

156cdb5 [TwigBridge] add missing unit tests (AppVariable)
2016-01-25 09:30:57 +01:00
FlorianLB
156cdb5ab0 [TwigBridge] add missing unit tests (AppVariable) 2016-01-25 09:30:56 +01:00
Fabien Potencier
ec26f6ece0 bug #16873 Able to load big xml files with DomCrawler (zorn-v)
This PR was submitted for the 2.8 branch but it was merged into the 2.3 branch instead (closes #16873).

Discussion
----------

Able to load big xml files with DomCrawler

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

Commits
-------

3dae825 Able to load big xml files with DomCrawler
2016-01-25 09:23:30 +01:00
zorn
3dae8257f2 Able to load big xml files with DomCrawler 2016-01-25 09:23:17 +01:00
Fabien Potencier
898f3890ff fixed typo 2016-01-25 09:20:12 +01:00
Fabien Potencier
07d99c2b6f bug #16897 [Form] Fix constraints could be null if not set (DZunke)
This PR was squashed before being merged into the 2.3 branch (closes #16897).

Discussion
----------

[Form] Fix constraints could be null if not set

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

If the form options has no key for constraints the default should be an empty array to be ignored by the loop in the FormValidator. The default without this fix is ```null``` and foreach will throw an error.

The "Bug" also still exists in master-Branch.

Commits
-------

f80e0eb [Form] Fix constraints could be null if not set
2016-01-25 09:19:47 +01:00
DZunke
f80e0eb143 [Form] Fix constraints could be null if not set 2016-01-25 09:19:45 +01:00
Fabien Potencier
36c2961def feature #16909 Allows access to payload in callback validator (conradkleinespel)
This PR was merged into the 3.1-dev branch.

Discussion
----------

Allows access to payload in callback validator

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

Commits
-------

26cd91d allows access to payload in callback validator
2016-01-25 09:16:45 +01:00
Fabien Potencier
9c5a6f5770 bug #16912 [Translation][Writer] avoid calling setBackup if the dumper is not FileDumper (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation][Writer] avoid calling setBackup if the dumper is not FileDumper

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

Commits
-------

369b2d4 [Translation][Writer] avoid calling setBackup if the dumper is not an instance of FileDumper.
2016-01-25 09:14:19 +01:00
Fabien Potencier
c738085cb3 minor #16941 [FrameworkBundle] Compute the kernel root hash only one time (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Compute the kernel root hash only one time

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

23431e9 [FrameworkBundle] Compute the kernel root hash only one time
2016-01-25 09:11:55 +01:00
Fabien Potencier
414365d8ef minor #17134 [Finder] Check PHP version before applying a workaround for a PHP bug (alebo)
This PR was squashed before being merged into the 2.3 branch (closes #17134).

Discussion
----------

[Finder] Check PHP version before applying a workaround for a PHP bug

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

Commits
-------

cba206a [Finder] Check PHP version before applying a workaround for a PHP bug
2016-01-25 08:55:01 +01:00
Alex Bogomazov
cba206ab18 [Finder] Check PHP version before applying a workaround for a PHP bug 2016-01-25 08:54:54 +01:00
Fabien Potencier
e23804e1e9 feature #17402 [Profiler] make it possible to omit the link var (xabbuh)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Profiler] make it possible to omit the link var

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

Currently, when you do not want to have a section in the web profiler,
you would have to explicitly pass `false` as value for the `link`
variable. With this change you can omit it when including the toolbar
item template.

Commits
-------

c430a47 [Profiler] make it possible to omit the link var
2016-01-25 08:44:31 +01:00
Fabien Potencier
d44add24b2 bug #17505 sort bundles in config:dump-reference command (xabbuh)
This PR was merged into the 2.3 branch.

Discussion
----------

sort bundles in config:dump-reference command

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

This backports #17495 to the `2.3` branch.

Commits
-------

a5c8811 sort bundles in config:dump-reference command
2016-01-25 08:33:31 +01:00
Fabien Potencier
4cc91ec2f7 bug #17506 [FrameworkBundle] enable assets when templates are enabled (xabbuh)
This PR was submitted for the master branch but it was merged into the 3.0 branch instead (closes #17506).

Discussion
----------

[FrameworkBundle] enable assets when templates are enabled

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

This puts back the default behavior of Symfony 2.8 where the Asset
component features were implicitly configured with sensible default
values when no explicit configuration was present but the templating
section was enabled.

Commits
-------

d0de425 enable assets when templates are enabled
2016-01-25 08:32:08 +01:00
Christian Flothmann
d0de425072 enable assets when templates are enabled
This puts back the default behavior of Symfony 2.8 where the Asset
component features were implicitly configured with sensible default
values when no explicit configuration was present but the templating
section was enabled.
2016-01-25 08:32:08 +01:00
Fabien Potencier
fb729eecfa fixed CS 2016-01-25 08:27:56 +01:00
Fabien Potencier
4b9f6c7aa8 minor #17487 [2.3] [CS] MethodSeparationFixer - findings. (SpacePossum)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [CS] MethodSeparationFixer - findings.

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

Th goal of this PR is _not_ to have it merged, but to see if the `MethodSeparationFixer` (https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1426) is suitable for SF level/configuration in the PHP-CS-Fixer (and thereby might later become part of `fabbot.io`).

Commits
-------

d7b730f Fixer findings.
2016-01-25 08:27:13 +01:00
Fabien Potencier
e68ebab1b1 bug #17514 [2.7][Asset] Add defaultNull to version configuration (ewgRa)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][Asset] Add defaultNull to version configuration

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

In #16511 PR was omitted defaultNull version for one case.

Commits
-------

65adb72 add defaultNull to version
2016-01-25 08:26:37 +01:00
Evgeniy Sokolov
65adb7282c add defaultNull to version 2016-01-25 01:05:43 +01:00
Fabien Potencier
65e378d01b Merge branch '2.8' into 3.0
* 2.8:
  Ability to set empty version strategy in packages
  Display Ajax request from newest to oldest in the toolbar
  CLI: use request context to generate absolute URLs
  [SecurityBundle] Optimize dependency injection tests
  Sort bundles in config commands
  [HttpFoundation] Do not overwrite the Authorization header if it is already set
  tag for dumped PHP objects must be a local one
2016-01-24 12:11:10 +01:00
Fabien Potencier
dc6645593e Merge branch '2.7' into 2.8
* 2.7:
  Ability to set empty version strategy in packages
  CLI: use request context to generate absolute URLs
  [SecurityBundle] Optimize dependency injection tests
  Sort bundles in config commands
  [HttpFoundation] Do not overwrite the Authorization header if it is already set
  tag for dumped PHP objects must be a local one
2016-01-24 12:06:16 +01:00
Fabien Potencier
93d5bf7424 Merge branch '2.3' into 2.7
* 2.3:
  [SecurityBundle] Optimize dependency injection tests
  [HttpFoundation] Do not overwrite the Authorization header if it is already set
  tag for dumped PHP objects must be a local one
2016-01-24 12:05:56 +01:00
Fabien Potencier
683037d06c minor #17508 Fix repeated "has been" in two sentences of UPGRADE-3.0 file (aferrandini)
This PR was submitted for the master branch but it was merged into the 3.0 branch instead (closes #17508).

Discussion
----------

Fix repeated "has been" in two sentences of UPGRADE-3.0 file

| 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

In file UPGRADE-3.0 `has been` is repeated in two sentences.

Commits
-------

d83c92c Fix repeated has been in two sentences
2016-01-24 11:32:54 +01:00
Ariel Ferrandini
d83c92c8bc Fix repeated has been in two sentences 2016-01-24 11:32:53 +01:00
Fabien Potencier
c1b091702a bug #16511 [2.7][Asset] Ability to set empty version strategy in packages (ewgRa)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][Asset] Ability to set empty version strategy in packages

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no, but not sure, as for me test was wrong
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14832
| License       | MIT
| Doc PR        |

Comment about '' thing. As you can see in xml test - we can't for attribute set null value. And for xml version '' empty string considered as null value, that affect all others formats and test is changed.

Commits
-------

646fc9c Ability to set empty version strategy in packages
2016-01-24 11:31:00 +01:00
Evgeniy Sokolov
646fc9caaa Ability to set empty version strategy in packages 2016-01-23 23:57:07 +01:00
Christian Flothmann
a5c881182f sort bundles in config:dump-reference command
This backports #17495 to the `2.3` branch.
2016-01-23 17:38:15 +01:00
Fabien Potencier
fee0435fa0 bug #17457 Display Ajax requests from newest to oldest in the toolbar (javiereguiluz)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #17457).

Discussion
----------

Display Ajax requests from newest to oldest in the toolbar

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

### Before

![ajax_before](https://cloud.githubusercontent.com/assets/73419/12452801/953133ec-bf90-11e5-94d5-1aa76ef580cb.gif)

### After

![ajax_after](https://cloud.githubusercontent.com/assets/73419/12452806/98ce32c0-bf90-11e5-9302-2e9cc5b72848.gif)

Commits
-------

124d150 Display Ajax request from newest to oldest in the toolbar
2016-01-23 12:34:58 +01:00
Javier Eguiluz
124d150774 Display Ajax request from newest to oldest in the toolbar 2016-01-23 12:34:57 +01:00
Fabien Potencier
870b40cf59 minor #17495 [2.7] [FrameworkBundle] [DX] Sort bundles in config commands (kix)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] [FrameworkBundle] [DX] Sort bundles in config commands

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

Reopened against `2.7` instead of #17490

This makes the behaviour of config commands a bit more user-friendly. Scanning through an ordered list should be a lot easier for the user, especially if she knows what's the exact bundle they're looking for. The sort is applied to the bundle name, as the extension alias might not always be present.

Before:
![before](https://cloud.githubusercontent.com/assets/345754/12498061/8e0ff30a-c0c1-11e5-9c96-561065eedc79.png)
After:
![after](https://cloud.githubusercontent.com/assets/345754/12498064/93019bde-c0c1-11e5-8bbc-c85a74b3f5e8.png)

Commits
-------

80d51e0 Sort bundles in config commands
2016-01-23 11:38:31 +01:00
Fabien Potencier
7afb784e9e bug #17503 [Asset] CLI: use request context to generate absolute URLs (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Asset] CLI: use request context to generate absolute URLs

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

Commits
-------

766a648 CLI: use request context to generate absolute URLs
2016-01-23 11:36:09 +01:00
Christian Flothmann
766a648ded CLI: use request context to generate absolute URLs 2016-01-23 11:02:39 +01:00
Fabien Potencier
93b831b395 minor #17497 [SecurityBundle] Optimize dependency injection tests (paradajozsef)
This PR was squashed before being merged into the 2.3 branch (closes #17497).

Discussion
----------

[SecurityBundle] Optimize dependency injection tests

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

Tests building the same container multiple times. The same solution can be applied as here: #17399. This time I ran comparison tests only on 2.3. (my laptop is really slow)

**2.3 before**

```go
Time: 14.79 seconds, Memory: 48.25Mb
OK (77 tests, 227 assertions)
OK src/Symfony/Bundle/SecurityBundle/
```
**2.3 after**

```go
Time: 9.78 seconds, Memory: 48.75Mb
OK (77 tests, 227 assertions)
OK src/Symfony/Bundle/SecurityBundle/
```

Commits
-------

bf56d2f [SecurityBundle] Optimize dependency injection tests
2016-01-23 10:46:31 +01:00
Paráda József
bf56d2fc17 [SecurityBundle] Optimize dependency injection tests 2016-01-23 10:46:30 +01:00
Issei.M
68292bb52b [Form] ArrayChoiceList can now deal with a null in choices 2016-01-23 17:56:23 +09:00
Stepan Anchugov
80d51e0d18 Sort bundles in config commands 2016-01-22 18:33:13 +05:00