Commit Graph

22139 Commits

Author SHA1 Message Date
Nicolas Grekas
a5516fc08d fix merge 2018-08-03 14:20:17 +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
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
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
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
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
Fabien Potencier
75ece97d37 bumped Symfony version to 4.1.4 2018-08-01 17:34:03 +02:00
Fabien Potencier
d8da36c6ed updated VERSION for 4.1.3 2018-08-01 17:30:34 +02:00
Fabien Potencier
9d7d3e7124 bumped Symfony version to 3.4.15 2018-08-01 16:55:31 +02:00
Fabien Potencier
2aa9ef0b48 updated VERSION for 3.4.14 2018-08-01 16:47:47 +02:00
Fabien Potencier
3ff6e333dd bumped Symfony version to 2.8.45 2018-08-01 16:46:30 +02:00
Fabien Potencier
4abd3a8eb0 updated VERSION for 2.8.44 2018-08-01 16:12:31 +02:00
Nicolas Grekas
67044af83d Merge branch '4.1'
* 4.1:
  [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer
2018-08-01 16:08:05 +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
725dee4cd8 [HttpKernel] fix trusted headers management in HttpCache and InlineFragmentRenderer 2018-08-01 15:47:49 +02:00
Nicolas Grekas
c67f2aa291 Merge branch '4.1'
* 4.1:
  [HttpFoundation] Remove support for legacy and risky HTTP headers
2018-08-01 10:41:47 +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
1f629c8789 Merge branch '4.1'
* 4.1:
  [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
  remove unnecessary instanceof in MongoDbSessionHandler
  [HttpFoundation] fixed using _method parameter with invalid type
  Renaming internal test class to help auto-completion
  [Intl] Replace svn with git in the icu data update script
  [Messenger] Fix error message on undefined message class for non-subscriber handler
  [HttpFoundation] Fix Cookie::isCleared
2018-08-01 10:24:20 +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
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
f4951682bf minor #28057 [DI] Improve class named servics error message (ro0NL)
This PR was squashed before being merged into the 3.4 branch (closes #28057).

Discussion
----------

[DI] Improve class named servics error message

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #28006
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->

Commits
-------

61de0601a1 [DI] Improve class named servics error message
2018-07-29 17:19:31 +02:00
Roland Franssen
61de0601a1 [DI] Improve class named servics error message 2018-07-29 17:19:21 +02:00
Nicolas Grekas
81eb54eb78 bug #28045 [HttpFoundation] Fix Cookie::isCleared (ro0NL)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpFoundation] Fix Cookie::isCleared

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #27946
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - 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 master branch.
-->

Commits
-------

d3d7766874 [HttpFoundation] Fix Cookie::isCleared
2018-07-29 17:16:40 +02:00
raplider
3f013a473a remove unnecessary instanceof in MongoDbSessionHandler 2018-07-29 17:15:07 +02:00
Nicolas Grekas
8e5bc07a51 minor #28067 [Intl] Replace svn with git in the icu data update script (jakzal)
This PR was merged into the 2.8 branch.

Discussion
----------

[Intl] Replace svn with git in the icu data update script

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

Quoting http://site.icu-project.org/repository:

> Announcement 07/16/2018: The ICU source code repository has been migrated from Subversion to Git, and is now hosted on GitHub at the following location: https://github.com/unicode-org/icu.

The icu update script will from now on:
* use git
* fetch the latest release tag (no need to maintain the list anymore)

I rebuilt the data files, but since no new ICU releases has been made, none of files were actually updated.

Commits
-------

ebdf972e49 [Intl] Replace svn with git in the icu data update script
2018-07-29 17:14:19 +02:00
Phobetor
63583debd2 [HttpFoundation] fixed using _method parameter with invalid type 2018-07-29 17:13:09 +02:00
Javier Eguiluz
ac0cd15402 Remove the Expires header when calling Response::expire() 2018-07-27 17:20:18 +02:00
Ryan Weaver
b5ffb305a7 Renaming internal test class to help auto-completion 2018-07-27 10:58:22 -04:00
Samuel ROZE
afb17aba09 bug #28059 [Messenger] Fix error message on undefined message class for non-subscriber handler (chalasr)
This PR was merged into the 4.1 branch.

Discussion
----------

[Messenger] Fix error message on undefined message class for non-subscriber handler

| 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

Fixes a wrong hint talking about `getHandledMessages()` while the handler does not implement `MessageSubscriberInterface`.

Commits
-------

e5ea3bc032 [Messenger] Fix error message on undefined message class for non-subscriber handler
2018-07-26 22:05:42 +01:00
Jakub Zalas
ebdf972e49
[Intl] Replace svn with git in the icu data update script 2018-07-26 17:13:28 +01:00
Nicolas Grekas
d0eef33763 Fix tests for legacy phpunit versions 2018-07-26 13:58:24 +02:00