Commit Graph

35663 Commits

Author SHA1 Message Date
Nicolas Grekas 6bab0c10bb Merge branch '2.8' into 3.4
* 2.8:
  [travis] fix composer.lock invalidation for deps=low
2018-08-19 10:16:24 +02:00
Nicolas Grekas 68c00ad69d minor #28227 [travis] fix composer.lock invalidation for deps=low (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[travis] fix composer.lock invalidation for deps=low

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

Currently, tests for master on Travis fail for deps=low because an old commit is installed for the `symfony/security-http` depenceny of `SecurityBundle`. The reason is that composer.lock files are cached, but the invalidation logic misses checking the latest valid git commit.
This fixes it.

Commits
-------

02e3ec0539 [travis] fix composer.lock invalidation for deps=low
2018-08-19 10:15:42 +02:00
Nicolas Grekas 02e3ec0539 [travis] fix composer.lock invalidation for deps=low 2018-08-19 10:12:54 +02:00
Robin Chalas 2c863c6545 minor #28224 [Security\Http] Restore laziness of listener iterator (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[Security\Http] Restore laziness of listener iterator

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

Alternative to #28223

Restores laziness that I broke in merge commit 2dedacbc04 (diff-31ca8a8ce837591218082b00363149fc)

Commits
-------

2ebc75b [Security\Http] Restore laziness of listener iterator
2018-08-18 23:44:23 +02:00
Nicolas Grekas 2ebc75b9a1 [Security\Http] Restore laziness of listener iterator 2018-08-18 22:38:48 +02:00
Nicolas Grekas d351daab04 Merge branch '2.8' into 3.4
* 2.8:
  [travis][appveyor] use symfony/flex to accelerate builds
  [Security] Call AccessListener after LogoutListener
2018-08-18 18:47:20 +02:00
Fabien Potencier 1d76f98e28 minor #28199 [travis][appveyor] use symfony/flex to accelerate builds (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[travis][appveyor] use symfony/flex to accelerate builds

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

Playing with https://github.com/symfony/flex/pull/409

The optimization is required because appveyor is transiently failing with OOM errors, see e.g.
https://ci.appveyor.com/project/fabpot/symfony/build/1.0.39377

Commits
-------

940ec8f2d5 [travis][appveyor] use symfony/flex to accelerate builds
2018-08-18 18:26:55 +02:00
Nicolas Grekas 940ec8f2d5 [travis][appveyor] use symfony/flex to accelerate builds 2018-08-18 18:09:18 +02:00
Nicolas Grekas 1757c9c71e minor #28192 [PhpUnitBridge] Add missing stderr redirection (greg0ire)
This PR was merged into the 3.4 branch.

Discussion
----------

[PhpUnitBridge] Add missing stderr redirection

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

This seems to have been overlooked in
6c0e6af47a, and results in the test suite
being polluted on machines where phpdbg is not installed.
I updated the code to mimic other occurences of exec in this file.

Commits
-------

d67b86b9e7 Add missing stderr redirection
2018-08-14 18:01:19 +02:00
Nicolas Grekas 37c39fb9cd minor #28187 [Yaml] clean up unused code (xabbuh)
This PR was merged into the 3.4 branch.

Discussion
----------

[Yaml] clean up unused code

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

The removed lines were added in #17159 to be able to detect comment lines without running into parse errors. Part of that was reverted in #25241 when the logic was overhauled leading to now useless initialisation of variables that are never evaluated.

Commits
-------

a7672bd187 clean up unused code
2018-08-14 17:05:37 +02:00
Grégoire Paris d67b86b9e7
Add missing stderr redirection
This seems to have been overlooked in
6c0e6af47a, and results in the test suite
being polluted on machines where phpdbg is not installed.
I updated the code to mimic other occurences of exec in this file.
2018-08-11 23:22:43 +02:00
Robin Chalas ea0b508c8e bug #28100 [Security] Call AccessListener after LogoutListener (chalasr)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Call AccessListener after LogoutListener

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

Commits
-------

44dbea6 [Security] Call AccessListener after LogoutListener
2018-08-11 13:15:56 +02:00
Christian Flothmann a7672bd187 clean up unused code 2018-08-10 09:34:36 +02:00
Nicolas Grekas e279e2a50d Merge branch '2.8' into 3.4
* 2.8:
  [Filesystem] Add test to prevent regression when using array|resource with dumpFile
2018-08-10 09:29:05 +02:00
Nicolas Grekas 30b24d200b minor #28019 [Filesystem] Add test to prevent regression when using array|resource with dumpFile (thePanz)
This PR was merged into the 2.8 branch.

Discussion
----------

[Filesystem] Add test to prevent regression when using array|resource with dumpFile

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

Commits
-------

db1c21c8ae [Filesystem] Add test to prevent regression when using array|resource with dumpFile
2018-08-10 08:52:30 +02:00
Nicolas Grekas 98d7a9518d minor #28160 [DI] fix analyzing lazy refs involved in circular loops (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[DI] fix analyzing lazy refs involved in circular loops

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

Follow up of #28060 to fix "deps=high" jobs.

Commits
-------

4e92d10b40 [DI] fix analyzing lazy refs involved in circular loops
2018-08-08 13:45:57 +02:00
Nicolas Grekas 4e92d10b40 [DI] fix analyzing lazy refs involved in circular loops 2018-08-08 13:42:34 +02:00
Nicolas Grekas ba31bab47a bug #28060 [DI] Fix false-positive circular ref leading to wrong exceptions or infinite loops at runtime (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[DI] Fix false-positive circular ref leading to wrong exceptions or infinite loops at runtime

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

When circular loops involve references in properties, method calls or configurators, it is possible to properly instantiate the related services.

The current logic is broken: `ContainerBuilder` considers some of these loops as self-referencing circular references, leading to a runtime exception, and in similar situations, `PhpDumper` generates code that turns to infinite loops at runtime 💥. These badly handled situations happen with inlined definitions.

This PR fixes both classes by making them track which references are really part of the constructors' chain, including inline definitions.

It also fixes dumping infinite loops when dumping circular loops involving lazy services while proxy-manager-bridge is not installed.

Commits
-------

e843bb86c8 [DI] Fix false-positive circular ref leading to wrong exceptions or infinite loops at runtime
2018-08-08 10:12:29 +02:00
Nicolas Grekas 2bae1832c7 Merge branch '2.8' into 3.4
* 2.8:
  [HttpFoundation] fix false-positive ConflictingHeadersException
2018-08-08 10:11:13 +02:00
Nicolas Grekas 74a4ceaad6 bug #28144 [HttpFoundation] fix false-positive ConflictingHeadersException (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpFoundation] fix false-positive ConflictingHeadersException

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

Fixes https://jira.ez.no/browse/EZP-29492 & https://jira.ez.no/browse/EZP-29497
Ping @andrerom

Commits
-------

6089290543 [HttpFoundation] fix false-positive ConflictingHeadersException
2018-08-08 10:05:06 +02:00
Nicolas Grekas a852df27ed Merge branch '2.8' into 3.4
* 2.8:
  [travis] ignore ordering when validating composer.lock files for deps=low
2018-08-07 17:21:06 +02:00
Nicolas Grekas a540aee35c [travis] ignore ordering when validating composer.lock files for deps=low 2018-08-07 17:19:50 +02:00
Nicolas Grekas 87fff65cd0 Merge branch '2.8' into 3.4
* 2.8:
  [travis] cache composer.lock files for deps=low
  [Security] Remove wrong sentence about ACL
  Update validators.nl.xlf
2018-08-07 11:33:53 +02:00
Nicolas Grekas fc7fb5cb4a minor #28146 [travis] cache composer.lock files for deps=low (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[travis] cache composer.lock files for deps=low

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

I just realized that the resolved package versions for lowest deps depends only on the root composer.json, and not on transitive deps.
This means we can cache the lock files and save ~10 minutes required to resolve the lowest deps of the SecurityBundle.

Commits
-------

caaa74cd9b [travis] cache composer.lock files for deps=low
2018-08-07 11:32:16 +02:00
Ema Panz db1c21c8ae [Filesystem] Add test to prevent regression when using array|resource with dumpFile 2018-08-07 11:12:42 +02:00
Nicolas Grekas caaa74cd9b [travis] cache composer.lock files for deps=low 2018-08-07 09:58:32 +02:00
Nicolas Grekas 6089290543 [HttpFoundation] fix false-positive ConflictingHeadersException 2018-08-06 21:19:50 +02:00
Fabien Potencier a81d7d980d minor #28135 Update validators.nl.xlf (sstok)
This PR was merged into the 2.8 branch.

Discussion
----------

Update validators.nl.xlf

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

The original translation does not match intended communication.
`Deze waarde is geen geldige UUID waarde.` reads as `This value is not a valid UUID value`.

Commits
-------

7f895abbdd Update validators.nl.xlf
2018-08-06 17:01:40 +02:00
Fabien Potencier 20a818fb13 minor #28136 [Security] Remove wrong sentence about ACL (chalasr)
This PR was merged into the 2.8 branch.

Discussion
----------

[Security] Remove wrong sentence about ACL

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

The security-acl component has been extracted from the core in 2.8.

Commits
-------

67f3e3ff4e [Security] Remove wrong sentence about ACL
2018-08-06 16:59:52 +02:00
Robin Chalas 67f3e3ff4e [Security] Remove wrong sentence about ACL 2018-08-05 19:43:29 +02:00
Sebastiaan Stok 7f895abbdd
Update validators.nl.xlf 2018-08-05 16:25:16 +02:00
Nicolas Grekas b2c2381166 Merge branch '2.8' into 3.4
* 2.8:
  fix ci
2018-08-03 15:17:05 +02:00
Nicolas Grekas 6cb792c9d6 fix ci 2018-08-03 15:16:31 +02:00
Nicolas Grekas f082f41a3c Merge branch '2.8' into 3.4
* 2.8:
  [travis] fix requiring mongodb/mongodb before composer up
2018-08-03 14:54:11 +02:00
Nicolas Grekas f50ee9b3dc [travis] fix requiring mongodb/mongodb before composer up 2018-08-03 14:53:54 +02:00
Nicolas Grekas ff33771af3 Merge branch '2.8' into 3.4
* 2.8:
  [travis] fix CI for sigchild+Process
2018-08-03 13:10:44 +02:00
Nicolas Grekas 0a450d72c5 [travis] fix CI for sigchild+Process 2018-08-03 13:10:36 +02:00
Nicolas Grekas 8818124468 fix merge 2018-08-03 12:58:53 +02:00
Nicolas Grekas c5e91ddeb0 Merge branch '2.8' into 3.4
* 2.8:
  [travis] merge "same Symfony version" jobs in one
2018-08-03 12:42:44 +02:00
Nicolas Grekas 4879d89b54 minor #28114 [travis] merge "same Symfony version" jobs in one (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[travis] merge "same Symfony version" jobs in one

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

Allowing to consume fewer jobs and save the 1 to 2 minutes bootstrap time of workers.

Commits
-------

9857ca07aa [travis] merge "same Symfony version" jobs in one
2018-08-03 12:00:22 +02:00
Nicolas Grekas 9857ca07aa [travis] merge "same Symfony version" jobs in one 2018-08-03 11:45:57 +02:00
Nicolas Grekas fe482ccdb1 fix merge 2018-08-03 10:56:54 +02:00
Fabien Potencier 5cf1befa3c bug #28012 [PropertyInfo] Allow nested collections (jderusse)
This PR was merged into the 3.4 branch.

Discussion
----------

[PropertyInfo] Allow nested collections

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

When a multidimentional collection is defined (in a docblock) the extractor does not resolve the className deeply

```
#input
class Foo {
  /**
   * @var Baz[][]
   */
  public $bar;
}
```
```
# current result
builtinType: array
collectionValueType:
  builtinType: object
  class: Baz[]
```

```
# FIX
builtinType: array
collectionValueType:
  builtinType: array
  collectionValueType:
    builtinType: object
    class: Baz
```

The 2.8 version has also that bug, but the methods have been moved to another class. Should I create an other PR for 2.8?

Commits
-------

ce49036790 Allow multidimensional collection in property info
2018-08-02 11:26:08 +02:00
Fabien Potencier 6e2b128b63 Merge branch '2.8' into 3.4
* 2.8:
  Remove the Expires header when calling Response::expire()
  Allow multidimensional collection in property info
2018-08-02 11:25:32 +02:00
Fabien Potencier 470ac26674 bug #28055 [PropertyInfo] Allow nested collections (jderusse)
This PR was merged into the 2.8 branch.

Discussion
----------

[PropertyInfo] Allow nested collections

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

Duplicate of #28012 for the 2.8 branche (as both code and test have been refactored between 2.8 and 3.x

Commits
-------

6331687f65 Allow multidimensional collection in property info
2018-08-02 11:24:17 +02:00
Fabien Potencier 5d8bf1618a bug #28083 Remove the Expires header when calling Response::expire() (javiereguiluz)
This PR was merged into the 2.8 branch.

Discussion
----------

Remove the Expires header when calling Response::expire()

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #13341   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | -

Commits
-------

ac0cd15402 Remove the Expires header when calling Response::expire()
2018-08-02 11:19:39 +02:00
Robin Chalas 44dbea6330 [Security] Call AccessListener after LogoutListener 2018-08-01 20:49:49 +02:00
Nicolas Grekas 6c1aa4f2e4 Merge branch '2.8' into 3.4
* 2.8:
  bumped Symfony version to 2.8.45
  updated VERSION for 2.8.44
  update CONTRIBUTORS for 2.8.44
  updated CHANGELOG for 2.8.44
2018-08-01 18:17:25 +02:00
Nicolas Grekas b164db517c minor #28044 [DoctrineBridge] allow dev versions of Doctrine again (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[DoctrineBridge] allow dev versions of Doctrine again

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

I don't expect this to be green yet, but let's see progress on Doctrine side.
Submitted against 4.0 for now, but should be merged on 3.4 when green.

Commits
-------

83dcbe9096 [DoctrineBridge] allow dev versions of Doctrine again
2018-08-01 18:10:55 +02:00
Nicolas Grekas 83dcbe9096 [DoctrineBridge] allow dev versions of Doctrine again 2018-08-01 17:25:41 +02:00