Commit Graph

37620 Commits

Author SHA1 Message Date
Nicolas Grekas
cfc112a484 Merge branch '3.4' into 4.1
* 3.4:
  [travis] ignore ordering when validating composer.lock files for deps=low
2018-08-07 17:21:26 +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
9654de3527 Merge branch '3.4' into 4.1
* 3.4:
  [travis] cache composer.lock files for deps=low
  [Security] Remove wrong sentence about ACL
  Update validators.nl.xlf
2018-08-07 11:35:05 +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
Nicolas Grekas
3e47827c98 bug #28115 [Form] Remove extra .form-group wrapper around file widget in bootstrap 4 (MrMitch)
This PR was merged into the 4.1 branch.

Discussion
----------

[Form] Remove extra .form-group wrapper around file widget in bootstrap 4

| Q             | A
| ------------- | ---
| Branch?       | 4.1
| 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 is a follow-up to https://github.com/symfony/symfony/pull/27958 and https://github.com/symfony/symfony/pull/27919 by @apfelbox .

It fixes an extra space between the help text of a FileType widget and the widget itself. The extra space was caused by a `.form-group` wrapper in the `file_widget` block.

Commits
-------

01e7fe4fb0 [Form] Remove extra .form-group wrapper around file widget in bootstrap 4
2018-08-07 10:53:53 +02:00
Nicolas Grekas
d59e97f707 bug #28120 [Routing] Fixed scheme redirecting for root path (twoleds)
This PR was merged into the 4.1 branch.

Discussion
----------

[Routing] Fixed scheme redirecting for root path

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

I and my friend found a bug with routing / matching and redirecting from http to https by forcing routes (https://symfony.com/doc/current/routing/scheme.html). It works good for all routes except the homepage (root path /). The problem is probably here (6912cfebc0/Matcher/Dumper/PhpMatcherDumper.php (L196-L199)). Symfony tries to display the welcome page instead of redirecting to https.

Commits
-------

2d7fdff021 [Routing] Fixed scheme redirecting for root path
2018-08-07 10:43:56 +02:00
Nicolas Grekas
caaa74cd9b [travis] cache composer.lock files for deps=low 2018-08-07 09:58:32 +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
d8da0a0d89 Merge branch '3.4' into 4.1
* 3.4:
  fix ci
2018-08-03 15:18:41 +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
89bf201e55 Merge branch '3.4' into 4.1
* 3.4:
  [travis] fix requiring mongodb/mongodb before composer up
2018-08-03 14:54:53 +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
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
Jaroslav Kuba
2d7fdff021 [Routing] Fixed scheme redirecting for root path 2018-08-03 09:58:40 +02:00
Mickael GOETZ
01e7fe4fb0 [Form] Remove extra .form-group wrapper around file widget in bootstrap 4
This is a follow-up to https://github.com/symfony/symfony/pull/27958 and
https://github.com/symfony/symfony/pull/27919.

It fixes an extra space between the help text of a FileType widget and the
widget itself. The extra space was cause by a .form-group wrapper in the
file_widget block.
2018-08-02 14:20:32 +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