Commit Graph

37922 Commits

Author SHA1 Message Date
Robin Chalas b6f17f4606 minor #28123 [SecurityBundle] reference individual security-* packages (nicolas-grekas)
This PR was merged into the 4.2-dev branch.

Discussion
----------

[SecurityBundle] reference individual security-* packages

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

Commits
-------

903fd33 [SecurityBundle] reference individual security-* packages
2018-08-05 19:31:58 +02:00
Nicolas Grekas 2ea56a6b8b Merge branch '4.1'
* 4.1:
  fix ci
2018-08-03 15:18:47 +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 682c5bb059 Merge branch '4.1'
* 4.1:
  [travis] fix requiring mongodb/mongodb before composer up
2018-08-03 14:54:58 +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 5f4918a9b3 Merge branch '4.1'
* 4.1:
  [travis] test with latest PHP 7.1 to hopefully get rid of segfaults
2018-08-03 14:33:55 +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 a5516fc08d fix merge 2018-08-03 14:20:17 +02:00
Nicolas Grekas 3b9009e3cc Merge branch '4.1'
* 4.1:
  fix merge
2018-08-03 13:22:47 +02:00
Nicolas Grekas ed36e64bd4 fix merge 2018-08-03 13:22:40 +02:00
Nicolas Grekas 7b0b73c2e1 Merge branch '4.1'
* 4.1:
  [travis] fix CI for sigchild+Process
  fix merge
  [travis] merge "same Symfony version" jobs in one
  fix merge
  🐛 Fix typo
  Remove the Expires header when calling Response::expire()
  Allow multidimensional collection in property info
  Allow multidimensional collection in property info
2018-08-03 13:20:06 +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
Nicolas Grekas 903fd33640 [SecurityBundle] reference individual security-* packages 2018-08-03 10:34:59 +02:00
Fabien Potencier dd2f83012f feature #21002 [Form] Added options for separate date/time labels in DateTimeType. (mktcode)
This PR was squashed before being merged into the 4.2-dev branch (closes #21002).

Discussion
----------

[Form] Added options for separate date/time labels in DateTimeType.

If your render date and time separately you need options for each label.

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Let's say you have the following form field:

```
$builder
    ->add('start', DateTimeType::class, [
        'date_widget' => 'single_text',
        ...
    ])
    ...
```
Then you can render the date and time widgets/rows/etc. separately:

```
<div>{{ form_row(form.start.date) }}</div>
<div>{{ form_row(form.start.time) }}</div>
```
But you can't provide labels for each, so what is displayed is just the uppercased field name ("Date" and "Time").

This PR adds 'date_label' and 'time_label' options, so you can do:
```
$builder
    ->add('start', DateTimeType::class, [
        'date_widget' => 'single_text',
        'date_label' => 'The Start Date',
        'time_label' => 'The Start Time',
        ...
    ])
    ...
```

Commits
-------

df191552b4 [Form] Added options for separate date/time labels in DateTimeType.
2018-08-02 12:33:38 +02:00
Markus df191552b4 [Form] Added options for separate date/time labels in DateTimeType. 2018-08-02 12:33:29 +02:00
Fabien Potencier 6198223a81 feature #27763 [WebProfilerBundle] Append new ajax request to the end of the list (BoShurik)
This PR was squashed before being merged into the 4.2-dev branch (closes #27763).

Discussion
----------

[WebProfilerBundle] Append new ajax request to the end of the list

Append new ajax request to the end of the list instead of adding it to the beginning

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

Didn't find why this behavior was changed with web profiler design.
In current version it is hard to click to the latest ajax request.

Commits
-------

45d4559ab2 [WebProfilerBundle] Append new ajax request to the end of the list
2018-08-02 11:52:49 +02:00
BoShurik 45d4559ab2 [WebProfilerBundle] Append new ajax request to the end of the list 2018-08-02 11:52:42 +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 924f7f9736 feature #28035 [DomCrawler] Allow using non-absolute base URIs (javiereguiluz)
This PR was squashed before being merged into the 4.2-dev branch (closes #28035).

Discussion
----------

[DomCrawler] Allow using non-absolute base URIs

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

@xabbuh @stof I implemented in this PR your comments from https://github.com/symfony/symfony/issues/12318

Commits
-------

130119ff6a [DomCrawler] Allow using non-absolute base URIs
2018-08-02 11:30:19 +02:00
Javier Eguiluz 130119ff6a [DomCrawler] Allow using non-absolute base URIs 2018-08-02 11:30:11 +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 fbe4bc1b5a feature #28106 [Yaml] save preg_match() calls when possible (xabbuh)
This PR was merged into the 4.2-dev branch.

Discussion
----------

[Yaml] save preg_match() calls when possible

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

Commits
-------

e6bea97b6d save preg_match() calls when possible
2018-08-02 11:22:11 +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
Christian Flothmann e6bea97b6d save preg_match() calls when possible 2018-08-01 20:44:58 +02:00
Nicolas Grekas aaa3bb323e Merge branch '4.1'
* 4.1:
  bumped Symfony version to 4.1.4
  updated VERSION for 4.1.3
  updated CHANGELOG for 4.1.3
  [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:24:26 +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 7fd8e981bb minor #28038 Remove direct dependencies on doctrine/common (Majkl578)
This PR was merged into the 4.2-dev branch.

Discussion
----------

Remove direct dependencies on doctrine/common

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

Resubmitting #27609 now that Doctrine should be deprecation free.

Commits
-------

cb91cdef91 Remove direct dependencies on doctrine/common
2018-08-01 18:12:16 +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