Commit Graph

20725 Commits

Author SHA1 Message Date
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 89f6e1e115 minor #14123 CS: Use "self" keyword instead of class name if possible (gharlan)
This PR was merged into the 2.3 branch.

Discussion
----------

CS: Use "self" keyword instead of class name if possible

| 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

Fixes provided by new fixer: https://github.com/FriendsOfPHP/PHP-CS-Fixer/pull/1116

If this pr is merged I would change the level of the fixer to `symfony`.

Commits
-------

e72128f CS: Use "self" keyword instead of class name if possible
2015-04-05 18:28:06 +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 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
Maxime COLIN c0ef55219d Update logger.html.twig 2015-04-04 23:40:04 +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
Fabien Potencier f690cefee1 minor #14211 [DependencyInjection] Removed useless strtolower call (dosten)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] Removed useless strtolower call

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

The `setDefinition` method already lowercase the id, so it's not necessary to lowercase it twice.

Commits
-------

f62b050 Removed useless strtolower call
2015-04-04 20:52:16 +02:00
Diego Saint Esteben f62b050fa4 Removed useless strtolower call 2015-04-04 14:31:25 -03: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 fec2f031d8 minor #14188 [Validator] Use strict comparisons in loaders (dunglas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Use strict comparisons in loaders

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

Commits
-------

efc1c03 [Validator] Use strict comparisons in loaders
2015-04-04 15:21:13 +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
Nicolas Grekas 5cbd9fe207 [Debug] Updated CHANGELOG 2015-04-03 17:33:45 +02:00
Nicolas Grekas beb88f7590 [Debug] Use symfony_debug_backtrace() in FatalErrorException when available 2015-04-03 17:33:45 +02:00
Nicolas Grekas 6487b6e07b [Debug] Add debug extension to the test suite 2015-04-03 17:33:45 +02:00
Julien Pauli eacdc626ae [Debug] Add symfony_debug_backtrace() that works with fatal errors 2015-04-03 17:33:43 +02:00
Bernhard Schussek 8be29031b2 bug #14162 [FrameworkBundle][TwigBridge] Fixed Composer dependencies (webmozart)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle][TwigBridge] Fixed Composer dependencies

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

The tests were broken by #14050. This PR fixes that.

Commits
-------

7523f68 [TwigBridge] Pushed symfony/form dependency from ~2.6 to ~2.7
2b5efbb [FrameworkBundle] Pushed symfony/form dependency from ~2.6 to to ~2.7
2015-04-03 17:29:35 +02:00
Bernhard Schussek 6863ba5bef [Form] Updated CHANGELOG and UPGRADE files 2015-04-03 17:25:47 +02:00
Nicolas Grekas 0b39ce2315 Merge branch '2.6' into 2.7
* 2.6: (24 commits)
  [HttpKernel] Embed the original exception as previous to bounced exceptions
  [Enhancement] netbeans - force interactive shell when limited detection
  [FrameworkBundle] fixes displaying of deprecation notices.
  Revert "Added missing changelog entry"
  [Debug] Tweak docblocks
  [Debug] Rework a bit the PHP doc
  Added missing changelog entry
  [StringUtil] Fixed singularification of 'movies'
  [Debug] Renamed "context" key to "scope_vars" to avoid any ambiguity
  Fix some phpdocs for Twig extensions & templating helpers
  [Debug] Made code in ErrorHandler easier to read
  Use specialized config methods instead of the generic ifTrue() method
  Fix the AJAX profiling
  bumped Symfony version to 2.6.7
  updated VERSION for 2.6.6
  updated CHANGELOG for 2.6.6
  Safe escaping of fragments for eval()
  bumped Symfony version to 2.3.28
  updated VERSION for 2.3.27
  update CONTRIBUTORS for 2.3.27
  ...

Conflicts:
	src/Symfony/Component/Debug/ErrorHandler.php
	src/Symfony/Component/HttpKernel/Kernel.php
2015-04-03 17:24:01 +02:00
Nicolas Grekas 7adba99975 Merge branch '2.3' into 2.6
* 2.3:
  [HttpKernel] Embed the original exception as previous to bounced exceptions
  [Enhancement] netbeans - force interactive shell when limited detection
  [StringUtil] Fixed singularification of 'movies'
  Fix some phpdocs for Twig extensions & templating helpers
  Use specialized config methods instead of the generic ifTrue() method
  [DoctrineBridge] Add missing variable declaration in testcase

Conflicts:
	src/Symfony/Component/Console/Application.php
2015-04-03 17:17:51 +02:00
Nicolas Grekas 63ae7b834c bug #14192 [HttpKernel] Embed the original exception as previous to bounced exceptions (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Embed the original exception as previous to bounced exceptions

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

Commits
-------

[HttpKernel] Embed the original exception as previous to bounced exceptions
2015-04-03 17:14:07 +02:00
Nicolas Grekas 40ab7ef349 [HttpKernel] Embed the original exception as previous to bounced exceptions 2015-04-03 17:11:39 +02:00
Fabien Potencier 3c2c5c90a0 feature #14192 [HttpKernel] Embed the original exception as previous to bounced exceptions (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Embed the original exception as previous to bounced exceptions

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

Commits
-------

bb020f4 [HttpKernel] Embed the original exception as previous to bounced exceptions
2015-04-03 17:03:03 +02:00
Fabien Potencier d84f03d982 feature #13626 [WebProfilerBundle] Added feedback about the current symfony version (WouterJ)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle] Added feedback about the current symfony version

Description
---

This PR adds some visual and textual information about the Symfony version that is currently used. It'll indicate when the used version has reached eom or eol. I hope this will make people more aware of the fact that they should update (as I've seen quite some people using completely outdated Symfony versions).

Screenshot
---

![sf-toolbar-version-info](https://cloud.githubusercontent.com/assets/749025/6099512/da59c99e-affa-11e4-8093-173857901769.png)

PR Information
---

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes (didn't test though)
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Commits
-------

a4551f9 Added feedback about the current symfony version
2015-04-03 16:49:46 +02:00
WouterJ a4551f97f4 Added feedback about the current symfony version 2015-04-03 16:47:47 +02:00
WouterJ 2a2f7e2c82 Deprecated precision option in favor of scale 2015-04-03 16:31:32 +02:00
Fabien Potencier 7dca9a9e5a bug #14102 [Enhancement] netbeans - force interactive shell when limited detection (cordoval)
This PR was squashed before being merged into the 2.3 branch (closes #14102).

Discussion
----------

[Enhancement] netbeans - force interactive shell when limited detection

|Q            |A  |
|---          |---|
|Bug Fix?     |y  |
|New Feature? |n  |
|BC Breaks?   |n  |
|Deprecations?|n  |
|Tests Pass?  |y  |
|Fixed Tickets|  #9946 |
|License      |MIT|
|Doc PR       |   |

Commits
-------

02cda05 [Enhancement] netbeans - force interactive shell when limited detection
2015-04-03 15:07:12 +02:00
Luis Cordova 02cda0595c [Enhancement] netbeans - force interactive shell when limited detection 2015-04-03 15:07:10 +02:00
WouterJ f95d89c382 Automatically start server:run if server:start failed 2015-04-03 14:47:25 +02:00