Commit Graph

37599 Commits

Author SHA1 Message Date
Nicolas Grekas 613ca3c19c [travis] test with latest PHP 7.1 to hopefully get rid of segfaults 2018-08-03 14:33:38 +02:00
Nicolas Grekas ed36e64bd4 fix merge 2018-08-03 13:22:40 +02:00
Nicolas Grekas 694178e279 Merge branch '3.4' into 4.1
* 3.4:
  [travis] fix CI for sigchild+Process
  fix merge
  [travis] merge "same Symfony version" jobs in one
  fix merge
  Remove the Expires header when calling Response::expire()
  Allow multidimensional collection in property info
  Allow multidimensional collection in property info
2018-08-03 13:13:38 +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 f68cb81316 bug #28112 Fix CSS property typo (AhmedAbdulrahman)
This PR was merged into the 4.1 branch.

Discussion
----------

Fix CSS property typo

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

Commits
-------

da2af57e06 🐛 Fix typo
2018-08-02 11:32:12 +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
Ahmed Abdulrahman da2af57e06 🐛 Fix typo 2018-08-02 11:24:26 +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
Nicolas Grekas d0a97b40ae Merge branch '3.4' into 4.1
* 3.4:
  [DoctrineBridge] allow dev versions of Doctrine again
  bumped Symfony version to 3.4.15
  updated VERSION for 3.4.14
  updated CHANGELOG for 3.4.14
  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:22:14 +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
Fabien Potencier 75ece97d37 bumped Symfony version to 4.1.4 2018-08-01 17:34:03 +02:00
Fabien Potencier 75be8b747d
Merge pull request #28104 from fabpot/release-4.1.3
released v4.1.3
2018-08-01 17:30:46 +02:00
Fabien Potencier d8da36c6ed updated VERSION for 4.1.3 2018-08-01 17:30:34 +02:00
Fabien Potencier 4c5cb3fc62 updated CHANGELOG for 4.1.3 2018-08-01 17:30:22 +02:00
Nicolas Grekas 83dcbe9096 [DoctrineBridge] allow dev versions of Doctrine again 2018-08-01 17:25:41 +02:00
Fabien Potencier 9d7d3e7124 bumped Symfony version to 3.4.15 2018-08-01 16:55:31 +02:00
Fabien Potencier f50e17fa4e
Merge pull request #28102 from fabpot/release-3.4.14
released v3.4.14
2018-08-01 16:48:04 +02:00
Fabien Potencier 2aa9ef0b48 updated VERSION for 3.4.14 2018-08-01 16:47:47 +02:00
Fabien Potencier 22cb50a7ad updated CHANGELOG for 3.4.14 2018-08-01 16:47:43 +02:00
Fabien Potencier 3ff6e333dd bumped Symfony version to 2.8.45 2018-08-01 16:46:30 +02:00
Fabien Potencier 789dc7eb57
Merge pull request #28101 from fabpot/release-2.8.44
released v2.8.44
2018-08-01 16:12:49 +02:00
Fabien Potencier 4abd3a8eb0 updated VERSION for 2.8.44 2018-08-01 16:12:31 +02:00
Fabien Potencier 282e062226 update CONTRIBUTORS for 2.8.44 2018-08-01 16:12:26 +02:00
Fabien Potencier 15835bc7df updated CHANGELOG for 2.8.44 2018-08-01 16:12:10 +02:00
Nicolas Grekas 96504fb8c9 Merge branch '4.0' into 4.1
* 4.0:
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
2018-08-01 16:07:44 +02:00
Nicolas Grekas 974240e178 Merge branch '3.4' into 4.0
* 3.4:
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
2018-08-01 16:06:38 +02:00
Nicolas Grekas bcf5897bb1 Merge branch '2.8' into 3.4
* 2.8:
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
2018-08-01 16:04:26 +02:00
Nicolas Grekas 0f7667d643 security #cve-2018-14774 [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer (nicolas-grekas)
* commit '725dee4cd8':
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
2018-08-01 15:48:20 +02:00
Nicolas Grekas 725dee4cd8 [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer 2018-08-01 15:47:49 +02:00
Nicolas Grekas bde8a7fca4 Merge branch '4.0' into 4.1
* 4.0:
  [HttpFoundation] Remove support for legacy and risky HTTP headers
2018-08-01 10:41:27 +02:00
Nicolas Grekas 45d6729ddc Merge branch '3.4' into 4.0
* 3.4:
  [HttpFoundation] Remove support for legacy and risky HTTP headers
2018-08-01 10:38:58 +02:00
Nicolas Grekas 768abbfe64 Merge branch '2.8' into 3.4
* 2.8:
  [HttpFoundation] Remove support for legacy and risky HTTP headers
2018-08-01 10:38:11 +02:00
Nicolas Grekas 6604978f83 security #cve-2018-14773 [HttpFoundation] Remove support for legacy and risky HTTP headers (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpFoundation] Remove support for legacy and risky HTTP headers

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

Commits
-------

e447e8b921 [HttpFoundation] Remove support for legacy and risky HTTP headers
2018-08-01 10:34:59 +02:00
Nicolas Grekas 1d3f835e05 Merge branch '4.0' into 4.1
* 4.0:
  [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet
  [FrameworkBundle] fixed guard event names for transitions
  [DI] Improve class named servics error message
  [HttpFoundation] fixed using _method parameter with invalid type
  [Intl] Replace svn with git in the icu data update script
  [HttpFoundation] Fix Cookie::isCleared
2018-08-01 10:24:03 +02:00
Nicolas Grekas e0ce427aef Merge branch '3.4' into 4.0
* 3.4:
  [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet
  [FrameworkBundle] fixed guard event names for transitions
  [DI] Improve class named servics error message
  [HttpFoundation] fixed using _method parameter with invalid type
  [Intl] Replace svn with git in the icu data update script
  [HttpFoundation] Fix Cookie::isCleared
2018-08-01 10:23:45 +02:00
Nicolas Grekas e447e8b921 [HttpFoundation] Remove support for legacy and risky HTTP headers 2018-07-31 23:38:46 +02:00
Nicolas Grekas 7e3603dc38 Merge branch '2.8' into 3.4
* 2.8:
  [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet
  [HttpFoundation] fixed using _method parameter with invalid type
  [Intl] Replace svn with git in the icu data update script
  [HttpFoundation] Fix Cookie::isCleared
2018-07-31 11:47:14 +02:00
Nicolas Grekas 9d0ff4f22a bug #28003 [HttpKernel] Fixes invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet (netiul)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpKernel] Fixes invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #28000    <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | n/a

When trusted proxies are configured including a subnet a subrequest initiated by the InlineFragmentRenderer would contain an invalid REMOTE_ADDR server variable.

Commits
-------

f657dd2444 [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet
2018-07-31 11:44:51 +02:00
Zacharias Luiten f657dd2444 [HttpKernel] Fixed invalid REMOTE_ADDR in inline subrequest when configuring trusted proxy with subnet 2018-07-31 11:18:51 +02:00
Nicolas Grekas 4081bc6a50 bug #28007 [FrameworkBundle] fixed guard event names for transitions (destillat)
This PR was submitted for the 3.3 branch but it was merged into the 3.4 branch instead (closes #28007).

Discussion
----------

[FrameworkBundle] fixed guard event names for transitions

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

Framework yaml configuration support workflow transitions as both indexed and associative array e.g
```yaml
transitions:
    -    name: test
         from: open
         to: test
    -
```
```yaml
transitions:
    test:
         from: open
         to: test
```
Then it's used in foreach loop to register guard event listeners 4b92b96796/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php (L609)
Array keys are used as transition names but it's wrong for indexed array so we get event names like these
workflow.workflow_name.guard.transition_index instead of workflow.workflow_name.guard.tranision_name

Commits
-------

9bbb1e5cff [FrameworkBundle] fixed guard event names for transitions
2018-07-29 17:24:27 +02:00
Ivan Nikolaev 9bbb1e5cff [FrameworkBundle] fixed guard event names for transitions 2018-07-29 17:24:21 +02:00