Commit Graph

31765 Commits

Author SHA1 Message Date
Nicolas Grekas
f8f5c028d1 Merge branch '2.7' into 2.8
* 2.7:
  [DI] Resolve aliases earlier
  bumped Symfony version to 2.7.33
  updated VERSION for 2.7.32
  update CONTRIBUTORS for 2.7.32
  updated CHANGELOG for 2.7.32
2017-07-18 09:49:35 +02:00
Nicolas Grekas
267970eff3 minor #23560 [DI] Minor dumping logic simplification (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Minor dumping logic simplification

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

Likely not a bug fix because private services should be dealt with by some compiler pass, but anyway, locally, I don't get why non-shared private services should check the "$this->services" property.
Did I miss something?

Commits
-------

37d8495 [DI] Minor dumping logic simplification
2017-07-18 09:48:14 +02:00
Fabien Potencier
910a8debd8 minor #23559 [DI] Resolve aliases earlier (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[DI] Resolve aliases earlier

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

Not a bug fix because a compiler pass already resolves aliases, but makes reasoning locally about the code easier.

Commits
-------

9922827cc2 [DI] Resolve aliases earlier
2017-07-18 09:30:09 +02:00
Fabien Potencier
0ccd2edb21 minor #23565 [DI] Mark Container::$privates as internal (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[DI] Mark Container::$privates as internal

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

As is should have been since its introduction.

Commits
-------

2725fd6080 [DI] Mark Container::$privates as internal
2017-07-18 09:28:01 +02:00
Nicolas Grekas
9922827cc2 [DI] Resolve aliases earlier 2017-07-18 09:15:21 +02:00
Nicolas Grekas
2725fd6080 [DI] Mark Container::$privates as internal 2017-07-18 09:06:47 +02:00
Nicolas Grekas
37d8495a59 [DI] Minor dumping logic simplification 2017-07-17 22:48:54 +02:00
Fabien Potencier
5c2797afd3 bumped Symfony version to 3.3.6 2017-07-17 21:17:46 +02:00
Fabien Potencier
b9a0d3d239 Merge pull request #23555 from fabpot/release-3.3.5
released v3.3.5
2017-07-17 21:08:46 +02:00
Fabien Potencier
d7d9a07917 updated VERSION for 3.3.5 2017-07-17 21:08:23 +02:00
Fabien Potencier
7a608efbed updated CHANGELOG for 3.3.5 2017-07-17 21:08:20 +02:00
Fabien Potencier
95c03f2fb3 bumped Symfony version to 3.2.13 2017-07-17 21:06:44 +02:00
Fabien Potencier
d65d8fad37 Merge pull request #23554 from fabpot/release-3.2.12
released v3.2.12
2017-07-17 20:15:19 +02:00
Fabien Potencier
579203a9f0 updated VERSION for 3.2.12 2017-07-17 20:15:00 +02:00
Fabien Potencier
e81459303b updated CHANGELOG for 3.2.12 2017-07-17 20:14:55 +02:00
Fabien Potencier
53b8579bec bumped Symfony version to 2.8.26 2017-07-17 20:14:06 +02:00
Fabien Potencier
c2452af565 Merge pull request #23553 from fabpot/release-2.8.25
released v2.8.25
2017-07-17 20:00:19 +02:00
Fabien Potencier
5836f0ea64 updated VERSION for 2.8.25 2017-07-17 20:00:03 +02:00
Fabien Potencier
d3098b22ab updated CHANGELOG for 2.8.25 2017-07-17 19:59:59 +02:00
Fabien Potencier
3d4e143619 bumped Symfony version to 2.7.33 2017-07-17 19:58:04 +02:00
Fabien Potencier
f3f7d55052 Merge pull request #23552 from fabpot/release-2.7.32
released v2.7.32
2017-07-17 19:33:37 +02:00
Fabien Potencier
f01f3d328a updated VERSION for 2.7.32 2017-07-17 19:33:19 +02:00
Fabien Potencier
5377fe5d6a update CONTRIBUTORS for 2.7.32 2017-07-17 19:33:09 +02:00
Fabien Potencier
f62dc85fd9 updated CHANGELOG for 2.7.32 2017-07-17 19:33:01 +02:00
Fabien Potencier
72947810a3 fixed double-declaration 2017-07-17 19:27:31 +02:00
Fabien Potencier
26ffb959a1 Merge branch '3.2' into 3.3
* 3.2:
  conflict for phpdocumentor/reflection-docblock 3.2
2017-07-17 18:39:25 +02:00
Fabien Potencier
09446473f9 bug #23549 [PropertyInfo] conflict for phpdocumentor/reflection-docblock 3.2 (xabbuh)
This PR was merged into the 3.2 branch.

Discussion
----------

[PropertyInfo] conflict for phpdocumentor/reflection-docblock 3.2

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

`phpdocumentor/reflection-docblock` included a change in release 3.2.0
which required a tag to be followed by a space. This conflicts with our
use of the `@Group` annotation:

```php
/**
 * @var \DateTime[]
 * @Groups({"a", "b"})
 */
public $collection;
```

Commits
-------

58d49f71f1 conflict for phpdocumentor/reflection-docblock 3.2
2017-07-17 18:38:15 +02:00
Christian Flothmann
58d49f71f1 conflict for phpdocumentor/reflection-docblock 3.2
phpdocumentor/reflection-docblock included a change in release 3.2.0
which required a tag to be followed by a space. This conflicts with our
use of the `@Group` annotation:

```php
/**
 * @var \DateTime[]
 * @Groups({"a", "b"})
 */
public $collection;
```
2017-07-17 17:30:29 +02:00
Fabien Potencier
649e2cd8bb Merge branch '3.2' into 3.3
* 3.2:
  [Security] Fix wrong term in UserProviderInterface
  [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content
  disable inlining deprecated services
  [Cache] add constructor docblocks for clarity
  [Security] validate empty passwords again
  [DI] Remove irrelevant comment from container
  [TwigBridge] cleaner implementation of the TwigRenderer
2017-07-17 16:07:10 +02:00
Fabien Potencier
d3ca5083bf Merge branch '2.8' into 3.2
* 2.8:
  [Security] Fix wrong term in UserProviderInterface
  [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content
  disable inlining deprecated services
  [Security] validate empty passwords again
  [DI] Remove irrelevant comment from container
  [TwigBridge] cleaner implementation of the TwigRenderer
2017-07-17 16:04:01 +02:00
Fabien Potencier
f49cc11021 Merge branch '2.7' into 2.8
* 2.7:
  [Security] Fix wrong term in UserProviderInterface
  [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content
  [Security] validate empty passwords again
  [DI] Remove irrelevant comment from container
  [TwigBridge] cleaner implementation of the TwigRenderer
2017-07-17 16:02:19 +02:00
Fabien Potencier
876f53dbf9 minor #23506 [Cache] add constructor docblocks for clarity (xabbuh)
This PR was merged into the 3.2 branch.

Discussion
----------

[Cache] add constructor docblocks for clarity

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

Commits
-------

813a5377e1 [Cache] add constructor docblocks for clarity
2017-07-17 14:09:17 +02:00
Fabien Potencier
80efd8f950 minor #23505 [Cache] add constructor docblocks for clarity (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[Cache] add constructor docblocks for clarity

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

Commits
-------

d1ce5322a6 [Cache] add constructor docblocks for clarity
2017-07-17 14:07:22 +02:00
Fabien Potencier
7beac82915 bug #23513 [FrameworkBundle] Set default public directory on install assets (yceruto)
This PR was squashed before being merged into the 3.3 branch (closes #23513).

Discussion
----------

[FrameworkBundle] Set default public directory on install assets

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

After https://github.com/symfony/flex/pull/122 and https://github.com/symfony/recipes/pull/106 the default directory to install assets is `public`.

Commits
-------

1bdfe0b39b [FrameworkBundle] Set default public directory on install assets
2017-07-17 13:48:41 +02:00
Yonel Ceruto
1bdfe0b39b [FrameworkBundle] Set default public directory on install assets 2017-07-17 13:48:40 +02:00
Fabien Potencier
559ccb2c66 security #23507 [Security] validate empty passwords again (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Security] validate empty passwords again

| 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/pull/23341#issuecomment-315341226
| License       | MIT
| Doc PR        |

It looks like this part of #23341 causes serious security issues for some users who rely on the validator to also compare the empty string with their user's password (see for example https://github.com/symfony/symfony/pull/23341#issuecomment-315341226). Thus I suggest to revert this part of #23341.

Commits
-------

878198cefa [Security] validate empty passwords again
2017-07-17 12:54:11 +02:00
Fabien Potencier
01cb493ed1 minor #23487 [Security] Fix wrong term in UserProviderInterface (issei-m)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #23487).

Discussion
----------

[Security] Fix wrong term in UserProviderInterface

| Q             | A
| ------------- | ---
| Branch?       | master
| 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
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

The term "account" is the just remnant from the days of AccountInterface, isn't it?

Commits
-------

b5b8c15831 [Security] Fix wrong term in UserProviderInterface
2017-07-17 12:41:14 +02:00
Issei.M
b5b8c15831 [Security] Fix wrong term in UserProviderInterface 2017-07-17 12:41:13 +02:00
Fabien Potencier
0100ca145d minor #23452 [DI] Remove irrelevant comment from container (ro0NL)
This PR was merged into the 2.7 branch.

Discussion
----------

[DI] Remove irrelevant comment from container

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes-ish
| 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-->

Spotted in #22811

Commits
-------

595a225a0f [DI] Remove irrelevant comment from container
2017-07-17 12:28:17 +02:00
Fabien Potencier
d76171ee83 bug #23526 [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content (jnvsor)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #23526).

Discussion
----------

[HttpFoundation] Set meta refresh time to 0 in RedirectResponse content

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

Set meta refresh time to 0 in RedirectResponse content

Commits
-------

5508a00e74 [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content
2017-07-17 12:22:38 +02:00
Jonathan Vollebregt
5508a00e74 [HttpFoundation] Set meta refresh time to 0 in RedirectResponse content 2017-07-17 12:22:37 +02:00
Fabien Potencier
c75d0c56ab bug #23535 Make server:* commands work out of the box with the public/ root dir (fabpot)
This PR was squashed before being merged into the 3.3 branch (closes #23535).

Discussion
----------

Make server:* commands work out of the box with the public/ root dir

| 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

The first commit removes code that is not needed as the WebserverConfig class already throws the exact same error and the display is exactly the same in that case.

The second commit adds support for `public/` along side `web/`.

Commits
-------

34c8566be1 [WebServerBundle] allowed public/ root directory to be auto-discovered along side web/
bc6b57c208 [WebServerBundle] remove duplicate code
2017-07-17 12:18:22 +02:00
Fabien Potencier
a187a32132 bug #23540 Disable inlining deprecated services (alekitto)
This PR was merged into the 2.8 branch.

Discussion
----------

Disable inlining deprecated services

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

Deprecation errors are not triggered for inlined services.
Disabling inlining for those services will fix this issue.

Commits
-------

6ab8ca0d36 disable inlining deprecated services
2017-07-17 12:12:59 +02:00
Fabien Potencier
0d72e822ee minor #23523 [SecurityBundle] Clarify deprecation in UserPasswordEncoderCommand::getContainer (ro0NL)
This PR was merged into the 3.3 branch.

Discussion
----------

[SecurityBundle] Clarify deprecation in UserPasswordEncoderCommand::getContainer

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

@ogizanagi in 4.0 it will simply extend `Command` right.. wdyt?

Also we dont deprecate `setContainer` is that intentional?

Commits
-------

7ea2d0437a [SecurityBundle] Clarify deprecation in UserPasswordEncoderCommand::getContainer
2017-07-17 12:07:08 +02:00
Alessandro Chitolina
6ab8ca0d36
disable inlining deprecated services 2017-07-17 11:57:18 +02:00
Christian Flothmann
d1ce5322a6 [Cache] add constructor docblocks for clarity 2017-07-17 08:54:27 +02:00
Fabien Potencier
34c8566be1 [WebServerBundle] allowed public/ root directory to be auto-discovered along side web/ 2017-07-16 14:41:56 +02:00
Fabien Potencier
bc6b57c208 [WebServerBundle] remove duplicate code 2017-07-16 14:41:56 +02:00
Roland Franssen
7ea2d0437a [SecurityBundle] Clarify deprecation in UserPasswordEncoderCommand::getContainer 2017-07-15 19:48:19 +02:00
Nicolas Grekas
de1143ba28 minor #23516 [Profiler] Fix data collector getCasters() call (ogizanagi)
This PR was merged into the 3.3 branch.

Discussion
----------

[Profiler] Fix data collector getCasters() call

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

Relates to https://github.com/symfony/symfony/pull/23465. Calling `DataCollector::getCasters()` using self results into overridden methods in child classes never been called.

Also removes an unused property.

Commits
-------

34e7094 [Profiler] Fix data collector getCasters() call
2017-07-15 10:52:36 +02:00