Commit Graph

20899 Commits

Author SHA1 Message Date
Nicolas Grekas be3844998c Fix travis file for deps=2.7 2015-04-07 12:26:12 +02:00
Nicolas Grekas fea6eabd44 Fix typo 2015-04-07 11:51:50 +02:00
Fabien Potencier 1de61fad0d minor #14241 [travis] Test latest PRs on 3.0 with 2.7 (nicolas-grekas)
This PR was merged into the 3.0-dev branch.

Discussion
----------

[travis] Test latest PRs on 3.0 with 2.7

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

We do not need deps=high tests on 3.0.
But checking out 2.7 and testing it with the current PR on 3.0 is required.

Commits
-------

e1ac75c [travis] Test latest PRs on 3.0 with 2.7
2015-04-07 11:43:05 +02:00
Nicolas Grekas e1ac75c47d [travis] Test latest PRs on 3.0 with 2.7 2015-04-07 11:34:22 +02:00
Nicolas Grekas 48522b8483 Merge branch '2.7'
* 2.7:
  Fix composer.json dependencies
  [Translation][Profiler] reduce memory usage for collected messages.
  [FrameworkBundle] Enable translation debugging in directories

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/SecurityBundle/composer.json
	src/Symfony/Bundle/TwigBundle/composer.json
	src/Symfony/Component/Form/composer.json
2015-04-06 19:58:49 +02:00
Nicolas Grekas aa82fb065d Fix composer.json dependencies 2015-04-06 19:55:01 +02:00
Abdellatif Ait boudad 874346ffeb bug #14236 [Translation][Profiler] reduce memory usage for collected messages. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation][Profiler] reduce memory usage for collected messages.

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

for 1000 translated messages:

![selection_025](https://cloud.githubusercontent.com/assets/1753742/7006976/7df77336-dc7d-11e4-8e35-78d3bc42d324.png)

Commits
-------

21526ea [Translation][Profiler] reduce memory usage for collected messages.
2015-04-06 18:43:11 +01:00
Abdellatif Ait boudad cc13ae45f2 feature #13443 [Translation][Command][FrameworkBundle] Enable translation debugging in directories (xelaris)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation][Command][FrameworkBundle] Enable translation debugging in directories

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

This PR follows up #13340 and enables not only to inspect Bundles, but also directories, like the `app/` directory.

Additionally it harmonizes the TranslationDebugCommand and TranslationUpdateCommand to expect an optional bundle name or a directory and fall back to kernel root dir if none of them is given.

Commits
-------

2662244 [FrameworkBundle] Enable translation debugging in directories
2015-04-06 17:05:53 +01:00
Abdellatif Ait boudad 21526ea583 [Translation][Profiler] reduce memory usage for collected messages. 2015-04-06 16:49:58 +01:00
Alexander Schwenn 2662244eb8 [FrameworkBundle] Enable translation debugging in directories
Harmonize TranslationDebugCommand and TranslationUpdateCommand to
expect an optional bundle name or a directory and fall back to kernel
root dir if none of them is given.
2015-04-06 17:04:12 +02:00
Nicolas Grekas 8d098e5682 Merge branch '2.7'
* 2.7:
  [Form] Add conflict with symfony/twig-bridge <2.7

Conflicts:
	src/Symfony/Component/Form/composer.json
2015-04-06 14:31:59 +02:00
Nicolas Grekas 1d5f786a6b [Form] Add conflict with symfony/twig-bridge <2.7 2015-04-06 14:29:38 +02:00
Nicolas Grekas a5e05d2b7d Merge branch '2.7'
* 2.7:
  [TwigBundle] Require symfony/http-kernel < 3.0

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json
2015-04-06 14:14:02 +02:00
Nicolas Grekas 98c67be970 [TwigBundle] Require symfony/http-kernel < 3.0 2015-04-06 14:12:11 +02:00
Nicolas Grekas 3aab145d5d Merge branch '2.7'
* 2.7:
  [Bridge\Doctrine] Fix declaration of legacy tests
  [Form] Add missing checks for testable features
2015-04-06 11:56:29 +02:00
Nicolas Grekas 62ac4f39c9 [Bridge\Doctrine] Fix declaration of legacy tests 2015-04-06 11:55:30 +02:00
Nicolas Grekas a79b57bd46 [Form] Add missing checks for testable features 2015-04-06 11:39:54 +02:00
Nicolas Grekas a4cfcd1824 Merge branch '2.7'
* 2.7:
  [Form] Make tested features configurable
  fix upgrade readme syntax
  [Form] Fix BC break introduced in #14050
  [Form] Fix declaration of legacy tests
  Fix symfony/form dependend components
  [HttpKernel] Require symfony/debug < 3.0
  [Bridge\PhpUnit] Relax silencing rule and fix phpunit runtime detection

Conflicts:
	src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
	src/Symfony/Component/HttpKernel/composer.json
2015-04-06 11:11:04 +02:00
Nicolas Grekas 60d3c34592 minor #14225 [Form] Make tested features configurable (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Make tested features configurable

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

This adds some flexibility to AbstractLayoutTest so that it can be used by lower versions of components.
It will fix the remaining failing test on 2.6 with deps=high

Commits
-------

c584b3c [Form] Make tested features configurable
2015-04-06 11:03:23 +02:00
Nicolas Grekas c584b3c697 [Form] Make tested features configurable 2015-04-05 23:37:27 +02:00
Tobias Schultze 472f534435 fix upgrade readme syntax 2015-04-05 23:36:11 +02:00
Nicolas Grekas d1be9d04d7 minor #14223 [Form] Fix BC break introduced in #14050 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fix BC break introduced in #14050

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

Commits
-------

f3dbb5d [Form] Fix BC break introduced in #14050
2015-04-05 20:44:45 +02:00
Nicolas Grekas f3dbb5dea2 [Form] Fix BC break introduced in #14050 2015-04-05 20:38:35 +02:00
Nicolas Grekas 607dedde35 minor #14221 Fix symfony/form dependend components (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix symfony/form dependend components

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

Because both the FrameworkBundle and the Doctrine bridge use the new choice list feature of 2.7, they are incompatible with Form below 2.7

Commits
-------

278f5c9 Fix symfony/form dependend components
2015-04-05 19:48:08 +02:00
Nicolas Grekas 69eae1d206 minor #14222 [Form] Fix declaration of legacy tests (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Fix declaration of legacy tests

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

Commits
-------

4a74aba [Form] Fix declaration of legacy tests
2015-04-05 19:45:50 +02:00
Nicolas Grekas 4a74aba4e8 [Form] Fix declaration of legacy tests 2015-04-05 19:42:33 +02:00
Nicolas Grekas 278f5c9872 Fix symfony/form dependend components 2015-04-05 19:12:53 +02:00
Nicolas Grekas fc0dd83c17 minor #14214 [Bridge\PhpUnit] Relax silencing rule and fix phpunit runtime detection (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Bridge\PhpUnit] Relax silencing rule and fix phpunit runtime detection

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

This PR removes the need to call `$this->iniSet('error_reporting', -1 & ~E_USER_DEPRECATED);` in tests that are already tagged as legacy. We needed them while drafting our deprecation policy, but that's only burden to me now.

This PR also fixes the way we detect if phpunit is running the test suite for projects that have phpunit in their composer.json's require-dev

Commits
-------

8dc9be3 [Bridge\PhpUnit] Relax silencing rule and fix phpunit runtime detection
2015-04-05 18:11:54 +02:00
Nicolas Grekas 2b6d08749b minor #14216 [HttpKernel] Require symfony/debug < 3.0 (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Require symfony/debug < 3.0

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

The deprecated Exception\FlattenException relies on symfony/debug < 3.0

Commits
-------

ea312e7 [HttpKernel] Require symfony/debug < 3.0
2015-04-05 17:51:22 +02:00
Nicolas Grekas ea312e744d [HttpKernel] Require symfony/debug < 3.0 2015-04-05 12:03:21 +02:00
Nicolas Grekas 8dc9be3db0 [Bridge\PhpUnit] Relax silencing rule and fix phpunit runtime detection 2015-04-05 11:41:58 +02:00
Nicolas Grekas 6a0b617c3d Merge branch '2.7'
* 2.7: (60 commits)
  [Translation][Profiler] fixed Collect empty Messages.
  [VarDumper] Towards PHP7 support
  Fix currently broken tests
  [Form][choice] added choice_translation_domain to avoid trans options.
  [Translation][Profiler]  added the number of times a translation has been used.
  [DoctrineBridge] Removed useless code
  [Debug] Updated CHANGELOG
  [Debug] Use symfony_debug_backtrace() in FatalErrorException when available
  [Debug] Add debug extension to the test suite
  [Debug] Add symfony_debug_backtrace() that works with fatal errors
  [Form] Updated CHANGELOG and UPGRADE files
  [HttpKernel] Embed the original exception as previous to bounced exceptions
  Added feedback about the current symfony version
  Deprecated precision option in favor of scale
  [Enhancement] netbeans - force interactive shell when limited detection
  Automatically start server:run if server:start failed
  Tweaked some console command styles
  [FrameworkBundle] fixes displaying of deprecation notices.
  make date formats and number formats configurable
  Revert "Added missing changelog entry"
  ...

Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.6.md
	src/Symfony/Bridge/Doctrine/Form/Type/DoctrineType.php
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Bundle/TwigBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/TwigBundle/Extension/ActionsExtension.php
	src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php
	src/Symfony/Component/Debug/CHANGELOG.md
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/Form/CHANGELOG.md
	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2015-04-05 10:20:29 +02:00
Nicolas Grekas 045433c7c4 Merge branch '2.6' into 2.7
* 2.6:
  [VarDumper] Towards PHP7 support

Conflicts:
	src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
	src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
	src/Symfony/Component/VarDumper/Tests/HtmlDumperTest.php
2015-04-05 09:48:59 +02:00
Fabien Potencier 80546293af bug #14204 [VarDumper] Towards PHP7 support (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Towards PHP7 support

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

That's a start

Commits
-------

df484da [VarDumper] Towards PHP7 support
2015-04-04 20:55:32 +02:00
Fabien Potencier af548e4948 feature #14198 Automatically start server:run if server:start failed (WouterJ)
This PR was merged into the 2.7 branch.

Discussion
----------

Automatically start server:run if server:start failed

After this PR, `server:start` will ask the user if it wants to start `server:run` automatically. If yes, the `server:run` command is executed and the server is started. If no, the command exits with `1`.

Example of Yes:
```
$ php app/console server:start
This command needs the pcntl extension to run.
You can either install it or use the server:run command instead to run the built-in web server.
Do you want to start server:run immediately? [Yn]
Server running on http://127.0.0.1:8000

Quit the server with CONTROL-C.
```
Example of No:
```
$ php app/console server:start
This command needs the pcntl extension to run.
You can either install it or use the server:run command instead to run the built-in web server.
Do you want to start server:run immediately? [Yn] n

$ ...
```

I've created this PR, because documentation currently still has to promote `server:run` to be safe. You don't want to tell people, "use `server:start`" and have them getting an error immediately (please note that starting the server is probably the first action with Symfony). Example: https://github.com/symfony/symfony-demo/pull/17

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

Commits
-------

f95d89c Automatically start server:run if server:start failed
2015-04-04 20:53:42 +02:00
Abdellatif Ait boudad 4d1344c6a9 bug #14210 [Translation][Profiler] fixed Collect empty Messages. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation][Profiler] fixed Collect empty Messages.

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

Commits
-------

e965e59 [Translation][Profiler] fixed Collect empty Messages.
2015-04-04 18:24:59 +01:00
Abdellatif Ait boudad e965e59920 [Translation][Profiler] fixed Collect empty Messages. 2015-04-04 17:28:09 +01:00
Nicolas Grekas df484dadfc [VarDumper] Towards PHP7 support 2015-04-04 17:06:57 +02:00
Fabien Potencier 33ff623cb0 Merge branch '2.6' into 2.7
* 2.6:
  Fix currently broken tests
2015-04-04 14:23:51 +02:00
Fabien Potencier c29f779ede bug #14205 Fix currently broken tests (mpdude)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14205).

Discussion
----------

Fix currently broken tests

Glitch from 8f72338513

Commits
-------

1122160 Fix currently broken tests
2015-04-04 14:23:37 +02:00
Matthias Pigulla 1122160d9e Fix currently broken tests 2015-04-04 14:23:36 +02:00
Abdellatif Ait boudad fb514b6f30 feature #13651 [2.7][Form][choice] added choice_translation_domain to avoid trans options. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][Form][choice] added choice_translation_domain to avoid trans options.

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

see https://github.com/symfony/symfony/issues/12941#issuecomment-72904531

Commits
-------

5a33c2c [Form][choice] added choice_translation_domain to avoid trans options.
2015-04-04 10:11:30 +01:00
Abdellatif Ait boudad 04ad2a73b2 feature #14185 [Translation][Profiler]added the number of times a translation has been used. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Translation][Profiler]added the number of times a translation has been used.

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

Commits
-------

b470a5b [Translation][Profiler]  added the number of times a translation has been used.
2015-04-04 10:06:11 +01:00
Abdellatif Ait boudad 5a33c2ca2e [Form][choice] added choice_translation_domain to avoid trans options. 2015-04-03 23:13:58 +01:00
Abdellatif Ait boudad b470a5bfb6 [Translation][Profiler] added the number of times a translation has been used. 2015-04-03 20:54:19 +01:00
Fabien Potencier be0c98efaf minor #14200 [Form] Updated CHANGELOG and UPGRADE files (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Updated CHANGELOG and UPGRADE files

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

This PR includes the changes from #14050 in the CHANGELOG/UPGRADE files.

Commits
-------

6863ba5 [Form] Updated CHANGELOG and UPGRADE files
2015-04-03 19:03:03 +02:00
Fabien Potencier 53fa5e375d feature #13717 Deprecated precision option in favor of scale (WouterJ)
This PR was merged into the 2.7 branch.

Discussion
----------

Deprecated precision option in favor of scale

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | yes
| Fixed tickets | #7383
| License       | MIT
| Doc PR        | https://github.com/symfony/symfony-docs/pull/5005

Scale is the number of digits to the right of the decimal point in a number, precision isn't. See the referenced ticket for more context.

Commits
-------

2a2f7e2 Deprecated precision option in favor of scale
2015-04-03 19:01:25 +02:00
Bernhard Schussek 8945bcce77 minor #14202 [DoctrineBridge] Removed useless code (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[DoctrineBridge] Removed useless code

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

This PR removes a useless (duplicate) check introduced in #14050.

Commits
-------

d851a05 [DoctrineBridge] Removed useless code
2015-04-03 18:23:44 +02:00
Bernhard Schussek d851a0550a [DoctrineBridge] Removed useless code 2015-04-03 17:48:01 +02:00
Fabien Potencier d0676afa72 feature #14159 [Debug] Add symfony_debug_backtrace() and use it when dealing with fatal errors (jpauli, nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Add symfony_debug_backtrace() and use it when dealing with fatal errors

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

This takes a subset of #12159 that would be great in 2.7, and uses it to gather back traces of fatal errors when possible.

Commits
-------

5cbd9fe [Debug] Updated CHANGELOG
beb88f7 [Debug] Use symfony_debug_backtrace() in FatalErrorException when available
6487b6e [Debug] Add debug extension to the test suite
eacdc62 [Debug] Add symfony_debug_backtrace() that works with fatal errors
2015-04-03 17:40:20 +02:00