Commit Graph

31690 Commits

Author SHA1 Message Date
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
Fabien Potencier
3444d8d88d minor #23514 [FrameworkBundle] remove symfony/process suggestion (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle] remove symfony/process suggestion

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

Commits
-------

101b6815eb remove symfony/process suggestion
2017-07-15 10:00:09 +02:00
Fabien Potencier
8dd172b02f minor #23512 [DI] Remove unused dynamic property (dunglas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Remove unused dynamic property

| 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
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

6de81a7756 [DI] Remove unused dynamic property
2017-07-15 09:58:26 +02:00
Maxime Steinhausser
34e7094d3d [Profiler] Fix data collector getCasters() call 2017-07-15 09:52:13 +02:00
Christian Flothmann
101b6815eb remove symfony/process suggestion 2017-07-15 08:24:25 +02:00
Kévin Dunglas
6de81a7756
[DI] Remove unused dynamic property 2017-07-14 23:11:01 +02:00
Christian Flothmann
813a5377e1 [Cache] add constructor docblocks for clarity 2017-07-14 16:39:18 +02:00
Christian Flothmann
878198cefa [Security] validate empty passwords again 2017-07-14 16:25:02 +02:00
Nicolas Grekas
62fdf9c72b minor #23435 [TwigBridge] cleaner implementation of the TwigRenderer (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[TwigBridge] cleaner implementation of the TwigRenderer

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| 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 | https://github.com/symfony/symfony/pull/23432#discussion_r125880092
| License       | MIT
| Doc PR        |

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

c7c5ba8 [TwigBridge] cleaner implementation of the TwigRenderer
2017-07-13 15:48:31 +02:00
Nicolas Grekas
54435997ee bug #23498 [Process] Fixed issue between process builder and exec (lyrixx)
This PR was merged into the 3.3 branch.

Discussion
----------

[Process] Fixed issue between process builder and exec

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

Commits
-------

8cd1a2d [Process] Fixed issue between process builder and exec
2017-07-13 15:17:20 +02:00
Grégoire Pineau
8cd1a2d527 [Process] Fixed issue between process builder and exec
refs #23495
2017-07-13 15:05:09 +02:00
Fabien Potencier
e8b9e253e8 bug #23490 [DependencyInjection] non-conflicting anonymous service ids across files (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[DependencyInjection] non-conflicting anonymous service ids across files

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

Commits
-------

8289ca6d1a non-conflicting anonymous service ids across files
2017-07-13 00:39:22 +02:00
Christian Flothmann
8289ca6d1a non-conflicting anonymous service ids across files 2017-07-12 20:52:55 +02:00
Nicolas Grekas
d1cfec11c3 Merge branch '3.2' into 3.3
* 3.2:
  [FrameworkBundle] Fix tests
2017-07-12 17:03:57 +02:00
Nicolas Grekas
6304938548 minor #23489 [FrameworkBundle] Fix tests (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[FrameworkBundle] Fix tests

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

Related to the changes introduced in #23440.

Commits
-------

2e0c6bc [FrameworkBundle] Fix tests
2017-07-12 17:03:40 +02:00
Nicolas Grekas
2e0c6bc855 [FrameworkBundle] Fix tests 2017-07-12 16:53:35 +02:00
Nicolas Grekas
8e6accc4d0 fix merge 2017-07-12 16:41:59 +02:00
Nicolas Grekas
d09aeaf0fd Merge branch '3.2' into 3.3
* 3.2:
  fix merge
2017-07-12 16:40:39 +02:00
Nicolas Grekas
2b2c0b7c97 fix merge 2017-07-12 16:37:06 +02:00
Nicolas Grekas
6b5d35f058 Merge branch '3.2' into 3.3
* 3.2:
  [DI] Handle root namespace in service definitions
  Use rawurlencode() to transform the Cookie into a string
  [Security] Fix authentication.failure event not dispatched on AccountStatusException
2017-07-12 15:03:20 +02:00
Nicolas Grekas
e51c1a5658 Merge branch '2.8' into 3.2
* 2.8:
  [DI] Handle root namespace in service definitions
  Use rawurlencode() to transform the Cookie into a string
  [Security] Fix authentication.failure event not dispatched on AccountStatusException
2017-07-12 15:02:55 +02:00
Nicolas Grekas
0c6096fc32 Merge branch '2.7' into 2.8
* 2.7:
  [DI] Handle root namespace in service definitions
  Use rawurlencode() to transform the Cookie into a string
  [Security] Fix authentication.failure event not dispatched on AccountStatusException
2017-07-12 14:59:33 +02:00
Nicolas Grekas
87a6845b4d bug #23468 [DI] Handle root namespace in service definitions (ro0NL)
This PR was squashed before being merged into the 2.7 branch (closes #23468).

Discussion
----------

[DI] Handle root namespace in service definitions

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

Fixes

```
Cannot dump definition because of invalid class name ('\\stdClass')
```

for

```yaml
services:
    foo: {class: '\stdClass' }
```

`ContainerBuilder` allows it, so `PhpDumper` should as well.

Commits
-------

05170c8 [DI] Handle root namespace in service definitions
2017-07-12 13:53:19 +02:00
Roland Franssen
05170c84a2 [DI] Handle root namespace in service definitions 2017-07-12 13:53:12 +02:00
Nicolas Grekas
e659ec175f bug #23477 [Process] Fix parsing args on Windows (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[Process] Fix parsing args on Windows

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

Commits
-------

8826da1 [Process] Fix parsing args on Windows
2017-07-12 08:48:08 +02:00