Commit Graph

27526 Commits

Author SHA1 Message Date
Fabien Potencier
0c927d74d4 bug #19932 Fixed bad merge (GrahamCampbell)
This PR was submitted for the 3.1 branch but it was merged into the 2.8 branch instead (closes #19932).

Discussion
----------

Fixed bad merge

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

Commits
-------

d30374d Fixed bad merge
2016-09-13 16:47:15 -07:00
Graham Campbell
d30374d7eb Fixed bad merge 2016-09-13 16:47:15 -07:00
Fabien Potencier
946b96b70d bug #19922 [Yaml][TwigBridge] Use JSON_UNESCAPED_SLASHES for lint commands output (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

[Yaml][TwigBridge] Use JSON_UNESCAPED_SLASHES for lint commands output

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

Slashes are escaped when sing the `lint:twig` and `lint:yaml` commands with the `format` option set to `json`, giving such results:

```json
[
    {
        "file": "yaml\/wrong\/1.yml",
        "valid": false,
        "message": "Unable to parse at line 1 (near \";:cc`\")."
    }
]
```

That's not convenient as file paths may be reused (e.g. copy-pasted).
Results stay fine as error messages are already escaped:

```json
[
    {
        "file": "yaml/wrong/1.yml",
        "valid": false,
        "message": "Unable to parse at line 1 (near \";:cc`\")."
    }
]
```

Commits
-------

0427594 Use JSON_UNESCAPED_SLASHES for lint commands output
2016-09-13 16:35:36 -07:00
Nicolas Grekas
0954f3d8a3 bug #19926 [FrameworkBundle] Fix TranslationUpdateCommand tests after a merge (jakzal)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] Fix TranslationUpdateCommand tests after a merge

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

#19325 relied on a wrong count of messages, which was fixed by #19878.
Additionally, the `getContainer()` method on the master branch expect messages to be indexed by domain.

Commits
-------

d093c40 [FrameworkBundle] Fix TranslationUpdateCommand tests after a merge
2016-09-13 14:02:28 +02:00
Nicolas Grekas
929b313cef bug #19927 [Bridge/PhpUnit] Fix running subparts of components (nicolas-grekas)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[Bridge/PhpUnit] Fix running subparts of components

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | yes
| Tests pass?   | yes
| License       | MIT

As spotted by @jakzal in https://github.com/symfony/symfony/issues/19921#issuecomment-246631431

Diff best viewed ignoring white spaces: https://github.com/symfony/symfony/pull/19927/files?w=1

Commits
-------

37e6c1c [Bridge/PhpUnit] Fix running subparts of components
2016-09-13 14:01:12 +02:00
Nicolas Grekas
1d4bee5330 Merge branch '3.1'
* 3.1:
  [ci] Fix build-packages.php
  [Validator] Update IpValidatorTest data set with a valid reserved IP
2016-09-13 13:54:54 +02:00
Nicolas Grekas
476dadcfa1 Merge branch '2.8' into 3.1
* 2.8:
  [ci] Fix build-packages.php
  [Validator] Update IpValidatorTest data set with a valid reserved IP
2016-09-13 13:54:29 +02:00
Nicolas Grekas
fc97aa5e3b Merge branch '2.7' into 2.8
* 2.7:
  [ci] Fix build-packages.php
  [Validator] Update IpValidatorTest data set with a valid reserved IP
2016-09-13 13:53:53 +02:00
Nicolas Grekas
f32198954d bug #19928 [Validator] Update IpValidatorTest data set with a valid reserved IP (jakzal)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] Update IpValidatorTest data set with a valid reserved IP

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

The validator uses PHP filter which was recently fixed (see https://bugs.php.net/bug.php?id=72972).

Commits
-------

86a151c [Validator] Update IpValidatorTest data set with a valid reserved IP
2016-09-13 13:51:44 +02:00
Nicolas Grekas
68b8dab5aa minor #19929 [ci] Fix build-packages.php (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[ci] Fix build-packages.php

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Tests pass?   | yes
| License       | MIT

Already validated in #19927

Commits
-------

221e21c [ci] Fix build-packages.php
2016-09-13 13:48:59 +02:00
Nicolas Grekas
221e21cf40 [ci] Fix build-packages.php 2016-09-13 13:44:15 +02:00
Jakub Zalas
86a151c9f5 [Validator] Update IpValidatorTest data set with a valid reserved IP
The validator uses PHP filter which was recently fixed (see https://bugs.php.net/bug.php?id=72972).
2016-09-13 12:11:56 +01:00
Nicolas Grekas
37e6c1ca28 [Bridge/PhpUnit] Fix running subparts of components 2016-09-13 12:21:41 +02:00
Jakub Zalas
d093c406ca [FrameworkBundle] Fix TranslationUpdateCommand tests after a merge 2016-09-13 11:19:55 +01:00
Teoh Han Hui
62d28f9204
[DoctrineBridge][PropertyInfo] Treat Doctrine decimal type as string 2016-09-13 16:50:50 +08:00
Javier Spagnoletti
4214311a1c [bugfix] [Console] Set Input::$interactive to false when command is executed with --quiet as verbosity level 2016-09-13 00:14:14 -03:00
Robin Chalas
04275945ef
Use JSON_UNESCAPED_SLASHES for lint commands output 2016-09-12 23:15:58 +02:00
Nicolas Grekas
f5c1b1c077 Merge branch '3.1'
* 3.1:
  [travis/appveyor] Wire simple-phpunit
  [Console] fixed PHP7 Errors are now handled and converted to Exceptions
  Fix #19721
  Fix translation:update command count
  bumped Symfony version to 2.8.12
  updated VERSION for 2.8.11
  updated CHANGELOG for 2.8.11
  bumped Symfony version to 2.7.19
  updated VERSION for 2.7.18
  update CONTRIBUTORS for 2.7.18
  updated CHANGELOG for 2.7.18
  [Security] Optimize RoleHierarchy's buildRoleMap method
  [FrameworkBundle] Fix Incorrect line break in exception message (500 debug page)
  [Security] Added note inside phpdoc.
  Minor cleanups and improvements
  [form] lazy trans `post_max_size_message`.
  [DI] Fix setting synthetic services on ContainerBuilder
  [ClassLoader] Fix ClassCollectionLoader inlining with declare(strict_types=1)
2016-09-12 21:03:45 +02:00
Fabien Potencier
99c89888a7 feature #19915 [Bridge/PhpUnit] Add bin/simple-phpunit wrapper (=phpunit - yaml - prophecy) (nicolas-grekas)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[Bridge/PhpUnit] Add bin/simple-phpunit wrapper (=phpunit - yaml - prophecy)

| Q             | A
| ------------- | ---
| Branch?       | master
| New feature?  | yes
| Tests pass?   | not yet
| License       | MIT
| Doc PR | https://github.com/symfony/symfony-docs/pull/6962

So that e.g. [Sami](https://github.com/FriendsOfPHP/Sami/blob/master/phpunit) & [SensioFranmeworkExtraBundle](https://github.com/sensiolabs/SensioFrameworkExtraBundle/blob/master/phpunit) can stop copy/pasting our phpunit wrapper and get it from phpunit-bridge instead.

2 commits to keep the "rename" semantic in the git history.
Diff best viewed by looking directly at each commit.

Commits
-------

0c1c70c [Bridge/PhpUnit] Add bin/simple-phpunit wrapper (=phpunit - yaml - prophecy)
2016-09-12 11:36:05 -07:00
Fabien Potencier
fad40286ee Merge branch '2.8' into 3.1
* 2.8:
  [travis/appveyor] Wire simple-phpunit
  [Console] fixed PHP7 Errors are now handled and converted to Exceptions
  Fix #19721
  Fix translation:update command count
  bumped Symfony version to 2.8.12
  updated VERSION for 2.8.11
  updated CHANGELOG for 2.8.11
  bumped Symfony version to 2.7.19
  updated VERSION for 2.7.18
  update CONTRIBUTORS for 2.7.18
  updated CHANGELOG for 2.7.18
  [Security] Optimize RoleHierarchy's buildRoleMap method
2016-09-12 11:17:37 -07:00
Fabien Potencier
1e91ed7783 Merge branch '2.7' into 2.8
* 2.7:
  [travis/appveyor] Wire simple-phpunit
  [Console] fixed PHP7 Errors are now handled and converted to Exceptions
  Fix #19721
  bumped Symfony version to 2.7.19
  updated VERSION for 2.7.18
  update CONTRIBUTORS for 2.7.18
  updated CHANGELOG for 2.7.18
  [Security] Optimize RoleHierarchy's buildRoleMap method
2016-09-12 11:14:50 -07:00
Fabien Potencier
2a9be06bc8 minor #19917 [travis/appveyor] Wire simple-phpunit (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis/appveyor] Wire simple-phpunit

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

9eb8524 [travis/appveyor] Wire simple-phpunit
2016-09-12 11:10:35 -07:00
Nicolas Grekas
9eb8524d18 [travis/appveyor] Wire simple-phpunit 2016-09-12 17:58:10 +02:00
Nicolas Grekas
0c1c70cb4a [Bridge/PhpUnit] Add bin/simple-phpunit wrapper (=phpunit - yaml - prophecy) 2016-09-12 17:01:49 +02:00
Nicolas Grekas
c4b9f7db67 [FrameworkBundle] Add CachePoolClearerPass for weak cache pool refs in cache clearers 2016-09-11 22:09:22 +02:00
HeahDude
7806e2a05d Fixed collapsed ChoiceType options attributes 2016-09-11 01:56:49 +02:00
Nicolas Grekas
bac2132aeb [DI] Allow injecting ENV parameters at runtime using %env(MY_ENV_VAR)% syntax 2016-09-10 12:12:34 +02:00
David Maicher
a3db5f06c9 [FrameworkBundle] add support for prioritizing form type extension tags 2016-09-09 19:24:04 +02:00
Nicolas Grekas
3ee02a0cac [Cache] Add persistent_id option to RedisAdapter::createConnection() 2016-09-09 15:54:20 +02:00
Nicolas Grekas
193542f84f [FrameworkBundle] Remove cache clearer default value in config 2016-09-09 13:10:26 +02:00
Nicolas Grekas
d739f8d71d [DI] Add corresponding service id in some exception messages 2016-09-09 12:12:11 +02:00
Fabien Potencier
ddf8b27e14 bug #19813 [Console] fixed PHP7 Errors are now handled and converted to Exceptions (fonsecas72)
This PR was squashed before being merged into the 2.7 branch (closes #19813).

Discussion
----------

[Console] fixed PHP7 Errors are now handled and converted to Exceptions

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

Commits
-------

d3c613b [Console] fixed PHP7 Errors are now handled and converted to Exceptions
2016-09-08 08:08:48 -07:00
Hugo Fonseca
d3c613be36 [Console] fixed PHP7 Errors are now handled and converted to Exceptions 2016-09-08 08:08:45 -07:00
Fabien Potencier
d89319218d bug #19879 [Form] Incorrect timezone with DateTimeLocalizedStringTransformer (mbeccati)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Incorrect timezone with DateTimeLocalizedStringTransformer

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #19721
| License       | MIT
| Doc PR        | n.a.

Issue was introduced in #19541

Commits
-------

bf6691c Fix #19721
2016-09-08 07:46:02 -07:00
Leo Feyer
fdd266f28e Consider the umask setting when dumping a file. 2016-09-08 11:14:03 +02:00
Fabien Potencier
dc733f1833 bug #19878 Fix translation:update command count (tgalopin)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix translation:update command count

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

This issue fixes a bad count in the `translation:update` command. Previously, the number was badly calculated and doubled if the translation file didn't exists.

Before:

```
Messages extracted for domain "messages" (2 messages)
-----------------------------------------------------

 * hello.world

 [OK] 2 messages were successfully extracted.
```

After:

```
Messages extracted for domain "messages" (1 message)
-----------------------------------------------------

 * hello.world

 [OK] 1 message was successfully extracted.
```

Commits
-------

ffdd15e Fix translation:update command count
2016-09-07 15:31:09 -07:00
Matteo Beccati
bf6691ca46 Fix #19721
Issue was introduced in #19541
2016-09-07 13:06:20 +02:00
Titouan Galopin
ffdd15ee06 Fix translation:update command count 2016-09-07 10:57:26 +02:00
Fabien Potencier
1f9f87b177 minor #19875 Use DI exceptions in components compiler passes (chalasr)
This PR was merged into the 3.2-dev branch.

Discussion
----------

Use DI exceptions in components compiler passes

| Q             | A
| ------------- | ---
| Branch?       | master
| License       | MIT

Commits
-------

f2e30bc Use DI exceptions in components compiler passes
2016-09-06 21:47:06 -07:00
Fabien Potencier
69afe99f45 bumped Symfony version to 2.8.12 2016-09-06 19:58:32 -07:00
Fabien Potencier
f588c92c3e Merge pull request #19877 from fabpot/release-2.8.11
released v2.8.11
2016-09-07 04:04:25 +02:00
Fabien Potencier
af440e3f92 updated VERSION for 2.8.11 2016-09-06 19:02:58 -07:00
Fabien Potencier
c9ea677719 updated CHANGELOG for 2.8.11 2016-09-06 19:02:53 -07:00
Fabien Potencier
be2a6d1291 bumped Symfony version to 2.7.19 2016-09-06 19:01:26 -07:00
Fabien Potencier
d3ddb1a34e Merge pull request #19876 from fabpot/release-2.7.18
released v2.7.18
2016-09-07 02:55:03 +02:00
Fabien Potencier
59985613b2 updated VERSION for 2.7.18 2016-09-06 17:54:19 -07:00
Fabien Potencier
dbc2ad230c update CONTRIBUTORS for 2.7.18 2016-09-06 17:54:14 -07:00
Fabien Potencier
7735b4eac9 updated CHANGELOG for 2.7.18 2016-09-06 17:54:08 -07:00
Fabien Potencier
a630f14659 minor #19868 [Security] Optimize RoleHierarchy's buildRoleMap method (Enleur)
This PR was squashed before being merged into the 2.7 branch (closes #19868).

Discussion
----------

[Security] Optimize RoleHierarchy's buildRoleMap method

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

I have an issue with a large role hierarchy(~150 roles). Optimized it a little bit

![image](https://cloud.githubusercontent.com/assets/858989/18271257/df6c4ba0-7439-11e6-8406-e13bdcefe9ca.png)

Commits
-------

c3b68b0 [Security] Optimize RoleHierarchy's buildRoleMap method
2016-09-06 17:21:47 -07:00
Enleur
c3b68b0d28 [Security] Optimize RoleHierarchy's buildRoleMap method 2016-09-06 17:21:44 -07:00