Commit Graph

22346 Commits

Author SHA1 Message Date
Nicolas Grekas 6a41f11fac Merge branch '2.8'
* 2.8:
  [travis] Add PHP 7 to allowed failures until segfaults are fixed
  [Intl] Fix test
  [Translator][fallback catalogues] fixed circular reference.
  bumped Symfony version to 2.3.33
  updated VERSION for 2.3.32
  update CONTRIBUTORS for 2.3.32
  updated CHANGELOG for 2.3.32
  Require symfony/intl ~2.4 when Locale::setDefault() is used
  [Form][2.7][ Choice type] fixed groups with empty array.
  [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting
  [Config] Prototypes info
  [console] Use the description when no help is available

Conflicts:
	.travis.yml
	CHANGELOG-2.3.md
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
	src/Symfony/Component/Intl/Tests/DateFormatter/AbstractIntlDateFormatterTest.php
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/Validator/composer.json
2015-09-03 13:51:32 +02:00
Nicolas Grekas 22b17b2c93 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Add PHP 7 to allowed failures until segfaults are fixed
  [Intl] Fix test
  [Translator][fallback catalogues] fixed circular reference.
  bumped Symfony version to 2.3.33
  updated VERSION for 2.3.32
  update CONTRIBUTORS for 2.3.32
  updated CHANGELOG for 2.3.32
  [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting
  [console] Use the description when no help is available
2015-09-03 13:42:45 +02:00
Nicolas Grekas 323178e28b Merge branch '2.3' into 2.7
* 2.3:
  [travis] Add PHP 7 to allowed failures until segfaults are fixed
2015-09-03 13:42:06 +02:00
Nicolas Grekas 05d9411670 Merge branch '2.3' into 2.7
* 2.3:
  [Intl] Fix test
  [Translator][fallback catalogues] fixed circular reference.
  bumped Symfony version to 2.3.33
  updated VERSION for 2.3.32
  update CONTRIBUTORS for 2.3.32
  updated CHANGELOG for 2.3.32
  [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting
  [console] Use the description when no help is available

Conflicts:
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_asxml2.txt
	src/Symfony/Component/HttpKernel/Kernel.php
2015-09-03 13:40:38 +02:00
Fabien Potencier 823bce0193 minor #15678 [travis] Add PHP 7 to allowed failures until segfaults are fixed (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Add PHP 7 to allowed failures until segfaults are fixed

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

Commits
-------

57232ef [travis] Add PHP 7 to allowed failures until segfaults are fixed
2015-09-03 13:32:40 +02:00
Nicolas Grekas 57232ef44f [travis] Add PHP 7 to allowed failures until segfaults are fixed 2015-09-03 13:24:41 +02:00
Tobias Schultze 6f18c7573f minor #15672 [Intl] Fix test (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Intl] Fix test

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

Commits
-------

7969503 [Intl] Fix test
2015-09-02 23:17:00 +02:00
Nicolas Grekas 79695037b0 [Intl] Fix test 2015-09-02 18:14:26 +02:00
Fabien Potencier 59ade353a4 bug #15527 [Translator][fallback catalogues] fixed circular reference. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translator][fallback catalogues] fixed circular reference.

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

Commits
-------

79e29c1 [Translator][fallback catalogues] fixed circular reference.
2015-09-02 14:57:57 +02:00
Abdellatif Ait boudad 79e29c1f23 [Translator][fallback catalogues] fixed circular reference. 2015-09-02 09:56:25 +00:00
Fabien Potencier fedbf711a1 bumped Symfony version to 2.3.33 2015-09-01 18:03:57 +02:00
Fabien Potencier ab13ed4f49 fixed composer.json 2015-09-01 17:52:18 +02:00
Fabien Potencier 221da6edaf updated VERSION for 2.3.32 2015-09-01 17:40:52 +02:00
Fabien Potencier a988449e4e update CONTRIBUTORS for 2.3.32 2015-09-01 17:39:15 +02:00
Fabien Potencier 7c87baab77 updated CHANGELOG for 2.3.32 2015-09-01 17:38:42 +02:00
Nicolas Grekas d76cc03382 Merge branch '2.7' into 2.8
* 2.7:
  Require symfony/intl ~2.4 when Locale::setDefault() is used
  [Form][2.7][ Choice type] fixed groups with empty array.

Conflicts:
	src/Symfony/Component/Form/composer.json
	src/Symfony/Component/Translation/composer.json
	src/Symfony/Component/Validator/composer.json
2015-09-01 15:59:44 +02:00
Nicolas Grekas 2c4860877d Require symfony/intl ~2.4 when Locale::setDefault() is used 2015-09-01 15:39:59 +02:00
Fabien Potencier 8fbab1e6ad feature #15635 [Config] Prototypes info (ogizanagi)
This PR was merged into the 2.8 branch.

Discussion
----------

[Config] Prototypes info

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

Prototypes info is currently ignored by dumpers. It might be useful to add extra informations to the `# Prototype` comment in the `config:dump-reference` output.

Commits
-------

599fcb4 [Config] Prototypes info
2015-09-01 13:35:06 +02:00
Fabien Potencier db8420e6d5 bug #15662 [Form][2.7][ Choice type] fixed groups with empty array. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form][2.7][ Choice type] fixed groups with empty array.

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

- [x] test

Commits
-------

835aa78 [Form][2.7][ Choice type] fixed groups with empty array.
2015-09-01 09:47:15 +02:00
Nicolas Grekas 73a31966ea Merge branch '2.8'
* 2.8:
  Mark deprecated Twig functions as deprecated with the Twig feature
  [appveyor] PHP 5.3.11 for Symfony 2.7
  [HttpKernel] Group deprecation notices
  [Translation] added <tool> element metadata to XliffFileDumper

Conflicts:
	appveyor.yml
	src/Symfony/Bridge/Twig/AppVariable.php
	src/Symfony/Bridge/Twig/Extension/AssetExtension.php
	src/Symfony/Bridge/Twig/Extension/FormExtension.php
2015-09-01 09:37:41 +02:00
Nicolas Grekas 922a534427 Merge branch '2.7' into 2.8
* 2.7:
  Mark deprecated Twig functions as deprecated with the Twig feature
  [appveyor] PHP 5.3.11 for Symfony 2.7
  [HttpKernel] Group deprecation notices

Conflicts:
	appveyor.yml
2015-09-01 09:33:03 +02:00
Nicolas Grekas 33fac1479c minor #15661 [appveyor] PHP 5.3.11 for Symfony 2.7 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[appveyor] PHP 5.3.11 for Symfony 2.7

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

Commits
-------

0f2256e [appveyor] PHP 5.3.11 for Symfony 2.7
2015-09-01 09:32:02 +02:00
Fabien Potencier d4441e97fe feature #15551 [Translation] added <tool> element metadata to XliffFileDumper (aitboudad)
This PR was merged into the 2.8 branch.

Discussion
----------

[Translation] added <tool> element metadata to XliffFileDumper

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

Commits
-------

f667a34 [Translation] added <tool> element metadata to XliffFileDumper
2015-09-01 08:00:57 +02:00
Fabien Potencier f972fa49d9 minor #15663 Mark deprecated Twig functions as deprecated with the Twig feature (stof)
This PR was merged into the 2.7 branch.

Discussion
----------

Mark deprecated Twig functions as deprecated with the Twig feature

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

We were not able to trigger the deprecation for ``form_enctype`` because we were trying to trigger it at runtime, and we failed at it.
Twig now has a builtin way to mark functions as deprecated so here is the PR using it.

Commits
-------

cd167f4 Mark deprecated Twig functions as deprecated with the Twig feature
2015-09-01 07:50:14 +02:00
Abdellatif Ait boudad 835aa788d4 [Form][2.7][ Choice type] fixed groups with empty array. 2015-08-31 20:22:13 +00:00
Christophe Coevoet cd167f49dd Mark deprecated Twig functions as deprecated with the Twig feature 2015-08-31 21:21:38 +02:00
Nicolas Grekas 0f2256e85a [appveyor] PHP 5.3.11 for Symfony 2.7 2015-08-31 18:44:53 +02:00
Fabien Potencier cb303017b4 bug #15601 [console] Use the description when no help is available (Nicofuma)
This PR was merged into the 2.3 branch.

Discussion
----------

[console] Use the description when no help is available

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

Commits
-------

e5d3f25 [console] Use the description when no help is available
2015-08-31 14:48:21 +02:00
Fabien Potencier e1b7e46c5c minor #15650 [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting

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

Not  bug fix because the fix it fixes has not yet been released in any taggued version, but still a fix.

Commits
-------

de7d4a7 [FrameworkBundle] Fix templating.helper.code.file_link_format when defined by ini setting
2015-08-31 14:45:42 +02:00
Fabien Potencier 3b9756c0a7 minor #15654 [HttpKernel] Group deprecation notices (nicolas-grekas)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #15654).

Discussion
----------

[HttpKernel] Group deprecation notices

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

Let's remove duplicate deprecation messages.

![capture du 2015-08-30 14 15 45](https://cloud.githubusercontent.com/assets/243674/9567210/d45c6124-4f22-11e5-9d93-714f924be677.png)

Commits
-------

8d6e337 [HttpKernel] Group deprecation notices
2015-08-31 14:42:38 +02:00
Nicolas Grekas 8d6e337602 [HttpKernel] Group deprecation notices 2015-08-31 14:42:37 +02:00
Fabien Potencier 98b714b30d Merge branch '2.8'
* 2.8:
  bumped minimal version in appveyor to 5.3.9
  [VarDumper] Fix missing support for dumping PHP7 return type
  Require security-acl 2.7 for BC
  [travis] disable symfony_debug ext when deps!=no
  Require actual version of ACL component until ACL/2.8 branch released
  Do not normalize the kernel root directory path (see symfony/symfony#15474).
  Don't trigger deprecation on interfaces
  [Debug] Ignore silencing for deprecations
  [ci] Run minimal versions on appveyor only
  Deprecated Security ClassUtils in favor of Acl ClassUtils
  Fix appveyor file
  consistently use str_replace to unify directory separators (remaining)
2015-08-31 14:39:32 +02:00
Fabien Potencier c6e5830a96 bumped minimal version in appveyor to 5.3.9 2015-08-31 14:36:41 +02:00
Fabien Potencier 82ed1bed6b Merge branch '2.7' into 2.8
* 2.7:
  [VarDumper] Fix missing support for dumping PHP7 return type
  [travis] disable symfony_debug ext when deps!=no
  Do not normalize the kernel root directory path (see symfony/symfony#15474).
  Don't trigger deprecation on interfaces
  [Debug] Ignore silencing for deprecations
  [ci] Run minimal versions on appveyor only
  Fix appveyor file
  consistently use str_replace to unify directory separators (remaining)
2015-08-31 14:33:08 +02:00
Fabien Potencier a1d0f539ac Merge branch '2.3' into 2.7
* 2.3:
  Do not normalize the kernel root directory path (see symfony/symfony#15474).
  [ci] Run minimal versions on appveyor only
  Fix appveyor file
2015-08-31 14:32:30 +02:00
Fabien Potencier db8ced4d8f bug #15649 [VarDumper] Fix missing support for dumping PHP7 return type (nicolas-grekas)
This PR was submitted for the 2.8 branch but it was merged into the 2.7 branch instead (closes #15649).

Discussion
----------

[VarDumper] Fix missing support for dumping PHP7 return type

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

Commits
-------

b1bd068 [VarDumper] Fix missing support for dumping PHP7 return type
2015-08-31 14:28:11 +02:00
Nicolas Grekas b1bd06800a [VarDumper] Fix missing support for dumping PHP7 return type 2015-08-31 14:28:11 +02:00
Fabien Potencier 7dc224cdf6 minor #15660 [travis] disable symfony_debug ext when deps!=no (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis] disable symfony_debug ext when deps!=no

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

Commits
-------

cd446f5 [travis] disable symfony_debug ext when deps!=no
2015-08-31 14:23:27 +02:00
Fabien Potencier 05b54fe2b1 minor #15639 [ci] Run minimal versions on appveyor only (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Run minimal versions on appveyor only

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

Hopefully the last round of ci optimizations: what do you think about running the minimal supported version on appveyor only? This removes one matrix line on travis, and gives more flexibility in choosing the minimal version because, where travis only supports a limited list of minimal versions, windows.php.net provides a binary for each and every php ever released.

Commits
-------

e564805 [ci] Run minimal versions on appveyor only
2015-08-31 14:20:29 +02:00
Tobias Schultze 6376d281a1 minor #15658 Require security-acl 2.7 for BC (scaytrase)
This PR was squashed before being merged into the 2.8 branch (closes #15658).

Discussion
----------

Require security-acl 2.7 for BC

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

Commits
-------

6117c42 Require security-acl 2.7 for BC
2015-08-31 11:25:20 +02:00
Pavel Batanov 6117c425c1 Require security-acl 2.7 for BC 2015-08-31 11:25:15 +02:00
Nicolas Grekas cd446f5e2f [travis] disable symfony_debug ext when deps!=no 2015-08-31 08:55:10 +02:00
Fabien Potencier d25be883f6 minor #15651 Require actual version of ACL component until ACL/2.8 branch released (scaytrase)
This PR was squashed before being merged into the 2.8 branch (closes #15651).

Discussion
----------

Require actual version of ACL component until ACL/2.8 branch released

symfony/2.8@stable is not released, so version reference is incorrect.

This will allow require 2.8.x-dev version alongside with symfony/symfony:2.8.x-dev

Fix #15648

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | BC fix
| Deprecations? | no
| Tests pass?   | [not sure](https://travis-ci.org/scaytrase/symfony/builds/77840665)
| Fixed tickets | 15648
| License       | MIT
| Doc PR        | none

Commits
-------

2c7caaa Require actual version of ACL component until ACL/2.8 branch released
2015-08-30 21:01:56 +02:00
Pavel Batanov 2c7caaa096 Require actual version of ACL component until ACL/2.8 branch released 2015-08-30 21:01:54 +02:00
Fabien Potencier 43f5b9ea61 bug #15603 [HttpKernel] Do not normalize the kernel root directory path #15567 (leofeyer)
This PR was submitted for the 2.7 branch but it was merged into the 2.3 branch instead (closes #15603).

Discussion
----------

[HttpKernel] Do not normalize the kernel root directory path #15567

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

Commits
-------

a53489e Do not normalize the kernel root directory path (see symfony/symfony#15474).
2015-08-30 20:55:52 +02:00
Leo Feyer a53489e49a Do not normalize the kernel root directory path (see symfony/symfony#15474). 2015-08-30 20:55:51 +02:00
Fabien Potencier 5368a4287a minor #15652 Don't trigger deprecation on interfaces (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Don't trigger deprecation on interfaces

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

This can trigger false positives when implementing the interface is required for bc reasons. The DebugClassLoader is able to trigger on demand at runtime when required.

Commits
-------

b5b10b3 Don't trigger deprecation on interfaces
2015-08-30 20:53:28 +02:00
Nicolas Grekas b5b10b3d54 Don't trigger deprecation on interfaces 2015-08-30 13:26:29 +02:00
Fabien Potencier 9d6fdc3b50 minor #15624 consistently use str_replace to unify directory separators (2.7) (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

consistently use str_replace to unify directory separators (2.7)

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

Remaining ones from #15614

Commits
-------

17ce649 consistently use str_replace to unify directory separators (remaining)
2015-08-29 21:20:26 +02:00
Fabien Potencier ce0e99300b bug #15647 [Debug] Ignore silencing for deprecations (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Ignore silencing for deprecations

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

Since the best practice is now to always silence deprecations, we should ignore the silencing level. This allows collecting the backtrace of deprecations.

Commits
-------

ccb3f56 [Debug] Ignore silencing for deprecations
2015-08-29 21:19:10 +02:00