Commit Graph

37946 Commits

Author SHA1 Message Date
Nicolas Grekas
e0a8a7f631 Merge branch '4.1'
* 4.1:
  [Config] minor fix that removes a PHP 7.3 deprecation
  [Translation] fix perf of lint:xliff command
2018-08-08 09:59:30 +02:00
Nicolas Grekas
bf5704559d minor #28151 [Translation] dedup XSD files (nicolas-grekas)
This PR was merged into the 4.2-dev branch.

Discussion
----------

[Translation] dedup XSD files

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

645090d0ae [Translation] dedup XSD files
2018-08-08 09:57:37 +02:00
Nicolas Grekas
9fae8f4609 bug #28152 [Translation] fix perf of lint:xliff command (nicolas-grekas)
This PR was merged into the 4.1 branch.

Discussion
----------

[Translation] fix perf of lint:xliff command

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

#27653 has been merged on master as an improvement, but the perf issue is a killer.
Our CI spends 1 minutes on just a few translation test cases.
Only 4.1 has this behavior. That's a bug.

Commits
-------

02c69b1658 [Translation] fix perf of lint:xliff command
2018-08-08 09:54:59 +02:00
Nicolas Grekas
6b413ab49d [Config] minor fix that removes a PHP 7.3 deprecation 2018-08-08 08:37:38 +02:00
Nicolas Grekas
37a3f0b613 Merge branch '4.1'
* 4.1:
  [travis] ignore ordering when validating composer.lock files for deps=low
2018-08-07 17:21:33 +02:00
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
c1983b203f [ProxyManagerBridge] conflict with zendframework/zend-eventmanager v2.6.0 because of bad "require" 2018-08-07 16:43:33 +02:00
Nicolas Grekas
02c69b1658 [Translation] fix perf of lint:xliff command 2018-08-07 14:45:11 +02:00
Nicolas Grekas
645090d0ae [Translation] dedup XSD files 2018-08-07 14:26:01 +02:00
Nicolas Grekas
4ebecdbc05 Merge branch '4.1'
* 4.1:
  [travis] cache composer.lock files for deps=low
  [Security] Remove wrong sentence about ACL
  Update validators.nl.xlf
  [Routing] Fixed scheme redirecting for root path
  [Form] Remove extra .form-group wrapper around file widget in bootstrap 4
2018-08-07 11:35:17 +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
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
Sebastiaan Stok
7f895abbdd
Update validators.nl.xlf 2018-08-05 16:25:16 +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
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
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