Commit Graph

32049 Commits

Author SHA1 Message Date
Nicolas Grekas
f335451459 bug #23940 [DI] Fix resolving env vars when compiling a ContainerBuilder (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Fix resolving env vars when compiling a ContainerBuilder

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

As spotted by @ro0NL, `$container->compile(true)` doesn't resolve direct env var references found in service definitions. Fixed here.

Commits
-------

9219594 [DI] Fix resolving env vars when compiling a ContainerBuilder
2017-08-21 18:03:59 +02:00
Nicolas Grekas
921959422f [DI] Fix resolving env vars when compiling a ContainerBuilder 2017-08-21 17:49:07 +02:00
Nicolas Grekas
b4612c23e2 minor #23933 [FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4 (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4

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

Current tests on branch 3.3 fail because the "cache:clear" command relies on internal details that did change in HttpKernel 3.4.
I propose to add this soft conflict logic to warn users about it.
I prefer doing so than adding a real conflict in composer.json because that would prevent us from testing other features across versions.

Commits
-------

ec8f56a [FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4
2017-08-21 10:14:42 +02:00
Nicolas Grekas
ec8f56acd0 [FrameworkBundle] Add soft conflict rule of "cache:clear" + HttpKernel 3.4 2017-08-18 18:06:08 +02:00
Grégoire Pineau
1d10857179 [WebProfilerBundle] Re add missing link to the controller 2017-08-18 16:34:09 +02:00
Nicolas Grekas
1732cc8489 bug #23903 [DI] Fix merging of env vars in configs (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Fix merging of env vars in configs

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

Commits
-------

00b9273 [DI] Fix merging of env vars in configs
2017-08-18 16:05:00 +02:00
Nicolas Grekas
00b927322c [DI] Fix merging of env vars in configs 2017-08-18 13:25:49 +02:00
Fabien Potencier
4fdaa3a981 bug #23825 Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)" (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"

This reverts commit 3495b35e4f, reversing
changes made to 7f7b897ee2.

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

Sibling to #23792: there is no need to trigger the deprecation in 3.3 if we un-deprecate in 3.4.

Commits
-------

90099706c6 Revert "feature #21038 [FrameworkBundle] deprecated cache:clear with warmup (fabpot)"
2017-08-18 10:05:51 +02:00
Nicolas Grekas
3f81dd1837 minor #23917 [VarDumper] Fix tests with phpredis 3.1.3 (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[VarDumper] Fix tests with phpredis 3.1.3

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

The "socket" property is gone with phpredis 3.1.3.

Commits
-------

773f166 [VarDumper] Fix tests with phpredis 3.1.3
2017-08-17 15:36:17 +02:00
Nicolas Grekas
773f166d5e [VarDumper] Fix tests with phpredis 3.1.3 2017-08-17 15:29:00 +02:00
Nicolas Grekas
a014222113 bug #23899 [DI] Fix reading env vars from fastcgi params (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Fix reading env vars from fastcgi params

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

Values in fastcgi_param populate `$_SERVER`, never `$_ENV`.
This PR makes `$container->getEnv()` read from `$_SERVER`, excluding any vars whose name start by `HTTP_` as that would be a security issue (values injection via HTTP headers.)

Embeds a few other fixes found meanwhile.

Commits
-------

adff65a [DI] Fix reading env vars from fastcgi params
2017-08-17 14:09:40 +02:00
Robin Chalas
d22d924c3b bug #23909 [Console] Initialize lazily to render exceptions properly (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Initialize lazily to render exceptions properly

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

When an exception occurs in the constructor of an `Application`, exception handling is not yet set up.
This typically happens when the container cannot be build for some reason, where calling `$this->add()` builds the container and fails.

This PR makes initialization lazy so that it happens later on, when exception handling might be OK.

Before:
![before](https://user-images.githubusercontent.com/243674/29403397-7f7a1fce-8338-11e7-8e62-b6302ff0a65e.png)

After:
![after](https://user-images.githubusercontent.com/243674/29403403-83f7b5c0-8338-11e7-9a22-0c5ee702f1ff.png)

Commits
-------

62174fd [Console] Initialize lazily to render exceptions properly
2017-08-17 13:45:57 +02:00
Nicolas Grekas
62174fda10 [Console] Initialize lazily to render exceptions properly 2017-08-17 10:44:22 +02:00
Issei.M
b72ced22ad [Validator] Add a property tag for File::$maxSize 2017-08-17 16:14:13 +09:00
Nicolas Grekas
be7751aba7 bug #23878 [VarDumper] play nice with open_basedir when looking for composer.json (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[VarDumper] play nice with open_basedir when looking for composer.json

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

ping @pounard, can you please confirm this fixes the issue you reported?

Commits
-------

1bea774 [VarDumper] play nice with open_basedir when looking for composer.json
2017-08-16 18:04:18 +02:00
Nicolas Grekas
af0b24e27d bug #23897 Allow phpdocumentor/reflection-docblock 4 (derrabus)
This PR was merged into the 3.3 branch.

Discussion
----------

Allow phpdocumentor/reflection-docblock 4

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

The PHPDocumentor team bumped their reflection-docblock library to version 4 due to a breaking change that should not affect Symfony, as far as I can tell. This PR indicates compatibility with the new major version.

Commits
-------

1a5fd79 Allow phpdocumentor/reflection-docblock 4.
2017-08-16 17:59:07 +02:00
Nicolas Grekas
adff65a602 [DI] Fix reading env vars from fastcgi params 2017-08-16 16:07:29 +02:00
Alexander M. Turek
1a5fd79c21 Allow phpdocumentor/reflection-docblock 4. 2017-08-15 15:32:50 +02:00
Nicolas Grekas
d32c7060f1 Merge branch '2.8' into 3.3
* 2.8:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  Fix testHtml method with regexp
2017-08-15 15:31:09 +02:00
Nicolas Grekas
6434a00f10 Merge branch '2.7' into 2.8
* 2.7:
  Update JsonBundleReader.php
  [HttpKernel] Clean test directory on tear down
  Fix testHtml method with regexp
2017-08-15 15:30:53 +02:00
Nicolas Grekas
f1c65c0fd9 minor #23896 [Inlt] Fix JsonBundleReader exceptions (ksjogo)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #23896).

Discussion
----------

[Inlt] Fix JsonBundleReader exceptions

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

Commits
-------

22a6642 Update JsonBundleReader.php
2017-08-15 15:19:58 +02:00
Johannes Goslar
22a6642632 Update JsonBundleReader.php 2017-08-15 15:19:50 +02:00
Nicolas Grekas
0b613dbb57 minor #23893 [HttpKernel] Clean test directory on tear down (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Clean test directory on tear down

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

I've been bitten by this leftover too often.

Commits
-------

0a3dc11 [HttpKernel] Clean test directory on tear down
2017-08-15 15:15:08 +02:00
Nicolas Grekas
0a3dc11af9 [HttpKernel] Clean test directory on tear down 2017-08-15 15:06:19 +02:00
Nicolas Grekas
712e877d8b minor #23894 [Console] Remove useless http-kernel dev dep (chalasr)
This PR was merged into the 3.3 branch.

Discussion
----------

[Console] Remove useless http-kernel dev dep

| Q             | A
| ------------- | ---
| Branch?       | 3.3
| 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
-------

8cbf094 [Console] Remove useless http-kernel dev dep
2017-08-15 11:36:39 +02:00
Robin Chalas
8cbf094702 [Console] Remove useless http-kernel dev dep 2017-08-15 11:15:06 +02:00
Nicolas Grekas
993546b4ca minor #23859 [DomCrawler] Fix testHtml method with regexp (MatthieuMota)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #23859).

Discussion
----------

[DomCrawler] Fix testHtml method with regexp

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

As explained in this issue #23858, adding a regexp in addition to the trim for the testHtml method of [CrawlerTest](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php#L397) class.

Commits
-------

339592d Fix testHtml method with regexp
2017-08-14 12:36:32 +02:00
Matthieu Mota
339592da14 Fix testHtml method with regexp 2017-08-14 12:36:32 +02:00
Nicolas Grekas
ef038ac48c minor #23881 [DependencyInjection] Fixed some param/return annotations in PHPDOC blocks (derrabus)
This PR was merged into the 3.3 branch.

Discussion
----------

[DependencyInjection] Fixed some param/return annotations in PHPDOC blocks

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

Commits
-------

423656f Fixed some param/return annotations in PHPDOC blocks.
2017-08-14 12:33:09 +02:00
Alexander M. Turek
423656f8ea Fixed some param/return annotations in PHPDOC blocks. 2017-08-14 00:08:09 +02:00
Nicolas Grekas
1bea774f4d [VarDumper] play nice with open_basedir when looking for composer.json 2017-08-13 16:29:04 +02:00
Grégoire Pineau
eea78fdc78 bug #23865 [Workflow] fixed InvalidDefinitionException message for StateMachineValidator (fmata)
This PR was merged into the 3.3 branch.

Discussion
----------

[Workflow] fixed InvalidDefinitionException message for StateMachineValidator

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

Little mistake in the exception message which can be lead to difficult debugging if we don't pay attention in the workflow definition.

Commits
-------

9c29f9c [Workflow] fixed InvalidDefinitionException message for StateMachineValidator
2017-08-11 15:26:24 +02:00
Florent Mata
9c29f9c19b [Workflow] fixed InvalidDefinitionException message for StateMachineValidator 2017-08-11 14:43:59 +02:00
Nicolas Grekas
72791d6fed Merge branch '2.8' into 3.3
* 2.8:
  [DI] Fix dumping abstract with YamlDumper
2017-08-10 16:43:53 +02:00
Nicolas Grekas
daa0251768 Merge branch '2.7' into 2.8
* 2.7:
  [DI] Fix dumping abstract with YamlDumper
2017-08-10 16:42:21 +02:00
Nicolas Grekas
1b9619c6ba bug #23856 [DI] Fix dumping abstract with YamlDumper (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[DI] Fix dumping abstract with YamlDumper

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

Commits
-------

c396e8c [DI] Fix dumping abstract with YamlDumper
2017-08-10 16:40:16 +02:00
Nicolas Grekas
f534315daf bug #23848 restrict reflection doc block (ElectricMaxxx)
This PR was merged into the 3.3 branch.

Discussion
----------

restrict reflection doc block

| Q             | A
| ------------- | ---
| Branch?       | 3.1, 3.2, 3.3, master
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

I think we should have same behavior on 2.8 and 3.0 but there `phpdocumentor/reflection` is required and i whanted to avoid conflicts.

### Reason:

The version 3.2.0 and 3.2.1 of phpdocumentor/reflection-docblock is really broken. All Annotations lide `@api`, means without any bracket, leads to errors like `Uninitialized string offset: 0`. We in the CMF do not require that bundle directly, but symfony does and so we get braking builds.

Commits
-------

6760127 restrict reflection doc block
2017-08-10 16:39:22 +02:00
Nicolas Grekas
c396e8cb9c [DI] Fix dumping abstract with YamlDumper 2017-08-10 16:37:13 +02:00
Nicolas Grekas
3d54c3b6f4 bug #23854 [DI] Fix YamlDumper not dumping abstract and autoconfigure (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Fix YamlDumper not dumping abstract and autoconfigure

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

Commits
-------

685ff0e [DI] Fix YamlDumper not dumping abstract and autoconfigure
2017-08-10 16:18:14 +02:00
ElectricMaxxx
676012748a restrict reflection doc block
The version 3.2.0 and 3.2.1 of reflection-docblock is broken and lower version as 3.1 miss some tags
2017-08-10 15:40:56 +02:00
Nicolas Grekas
685ff0e280 [DI] Fix YamlDumper not dumping abstract and autoconfigure 2017-08-10 13:45:16 +02:00
Fabien Potencier
a670b2b932 Merge branch '3.2' into 3.3
* 3.2:
  [DebugBundle] Reword an outdated comment about var dumper wiring
  Ignore memcached missing key error on dession destroy
  bumped Symfony version to 3.2.14
  updated VERSION for 3.2.13
  updated CHANGELOG for 3.2.13
2017-08-10 09:07:06 +02:00
Fabien Potencier
3306986a5d Merge branch '2.8' into 3.2
* 2.8:
  fixed CS
  [2.8] Modify 2.8 upgrade doc - key option is deprecated.
  [DebugBundle] Reword an outdated comment about var dumper wiring
  [DI] Fix some docblocks
  Ignore memcached missing key error on dession destroy
  Github template: Remove EOM 3.2 from branch suggestion
  [Security] Fix security.interactive_login event const doc block
  Avoid infinite loops when profiler data is malformed
  [Bridge\ProxyManager] Dont call __destruct() on non-instantiated services
  Docblock improvement
  bumped Symfony version to 2.8.27
  updated VERSION for 2.8.26
  updated CHANGELOG for 2.8.26
  bumped Symfony version to 2.7.34
  updated VERSION for 2.7.33
  update CONTRIBUTORS for 2.7.33
  updated CHANGELOG for 2.7.33
  [HttpFoundation] Generate safe fallback filename for wrongly encoded filename
2017-08-10 09:06:25 +02:00
Fabien Potencier
18e5e70afe Merge branch '2.7' into 2.8
* 2.7:
  [DebugBundle] Reword an outdated comment about var dumper wiring
  Ignore memcached missing key error on dession destroy
2017-08-10 09:04:10 +02:00
Fabien Potencier
ac3ee2c3c2 Merge branch '2.8' into 3.3
* 2.8:
  fixed CS
  [2.8] Modify 2.8 upgrade doc - key option is deprecated.
  [DI] Fix some docblocks
2017-08-10 09:03:10 +02:00
Fabien Potencier
4879eb4f36 fixed CS 2017-08-10 08:50:59 +02:00
Fabien Potencier
cbaf5a1a02 minor #23826 [2.8] Modify 2.8 upgrade doc - key option is deprecated. (sampart)
This PR was squashed before being merged into the 2.8 branch (closes #23826).

Discussion
----------

[2.8] Modify 2.8 upgrade doc - key option is deprecated.

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no, but this is only a documentation change - I don't think it's my change that has broken them.
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

The 2.8.0 section of the [CHANGELOG for the Security bundle](https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md#280) has two items in it
> * deprecated the `key` setting of `anonymous`, `remember_me` and `http_digest` in favor of the `secret` setting.
>  * deprecated the `intention` firewall listener setting in favor of the `csrf_token_id`.

The first of these isn't also in the Symfony upgrade guide, but the second is.

This PR adds the missing item (deprecated `key` setting) into the Symfony upgrade guide.

Commits
-------

2309fd91d8 [2.8] Modify 2.8 upgrade doc - key option is deprecated.
2017-08-10 08:49:50 +02:00
Sam Partington
2309fd91d8 [2.8] Modify 2.8 upgrade doc - key option is deprecated. 2017-08-10 08:49:49 +02:00
Nicolas Grekas
c951ca6e5d minor #23841 [DebugBundle] Reword an outdated comment about var dumper wiring (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[DebugBundle] Reword an outdated comment about var dumper wiring

| Q             | A
| ------------- | ---
| Branch?       | 2.7 <!-- see comment below -->
| 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?   | no
| Fixed tickets | N/A <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | N/A

This comment is outdated since #19647, as the default config is now the one used all the way through in HTTP mode, while it's overridden in CLI mode by the `DumpListener` on `console.command` event.

Commits
-------

f876fd9 [DebugBundle] Reword an outdated comment about var dumper wiring
2017-08-09 18:16:35 +02:00
Maxime Steinhausser
f876fd9253 [DebugBundle] Reword an outdated comment about var dumper wiring 2017-08-09 13:56:35 +02:00