Commit Graph

19979 Commits

Author SHA1 Message Date
Fabien Potencier
aeef0cd9a2 bug #14271 [VarDumper] Fix call site detection (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Fix call site detection

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

`$trace[$i]['file']` is not always defined and `call_user_func_array` should also be filtered out.

Commits
-------

d8fb6a4 [VarDumper] Fix call site detection
2015-04-10 08:43:32 +02:00
Abdellatif Ait boudad
cd1d14c61d bug #14277 [2.6][Translator] Cache does not take fallback locales into consideration (mpdude)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6][Translator] Cache does not take fallback locales into consideration

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

Commits
-------

0d55b2f [Translator] Cache does not take fallback locales into consideration
2015-04-09 18:31:41 +01:00
Matthias Pigulla
0d55b2f92d [Translator] Cache does not take fallback locales into consideration 2015-04-09 13:33:02 +01:00
Nicolas Grekas
d8fb6a4722 [VarDumper] Fix call site detection 2015-04-08 20:25:12 +02:00
Fabien Potencier
b66c9347cb minor #14247 [Process] Fix volatile test (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Process] Fix volatile test

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

This PR hopefully fixes this remaining and most frequent volatile test.

Commits
-------

dae1942 [Process] Fix volatile test
2015-04-08 12:03:04 +02:00
Nicolas Grekas
dae19422ec [Process] Fix volatile test 2015-04-08 07:35:52 +02:00
Fabien Potencier
0430d2095f Merge branch '2.3' into 2.6
* 2.3:
  Remove some useless @group annotations
  Removed useless strtolower call
  [Validator] Use strict comparisons in loaders
  CS: Use "self" keyword instead of class name if possible
2015-04-08 07:30:27 +02:00
Fabien Potencier
e273ab586e bug #14256 [Form] Fixed DateType/TimeType (webmozart)
This PR was merged into the 2.6 branch.

Discussion
----------

[Form] Fixed DateType/TimeType

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

In 849fb29984, support for the "model_timezone" and "view_timezone" options was removed from DateType and TimeType. In 1c4a75a00a, this change was reverted, but only partially, leaving the tests in a broken state and leading to bugs such as described in #12808 (I have no idea why this bug report is closed, when the bug still seems to be present to me).

This PR fixes both types.

Commits
-------

060d0f8 [Form] Fixed DateType/TimeType that were broken since 849fb29984 and 1c4a75a00a
2015-04-08 07:26:43 +02:00
Fabien Potencier
e140c7f3bd minor #14245 Remove some useless @group annotations (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Remove some useless @group annotations

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

Commits
-------

0b70d02 Remove some useless @group annotations
2015-04-08 07:25:44 +02:00
Bernhard Schussek
060d0f8821 [Form] Fixed DateType/TimeType that were broken since 849fb29984 and 1c4a75a00a 2015-04-07 18:35:44 +02:00
Nicolas Grekas
0b70d02e3f Remove some useless @group annotations 2015-04-07 15:19:55 +02:00
Nicolas Grekas
9ca8709c47 minor #14248 [Debug] Skip unsilencing test on PHP7 (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Skip unsilencing test on PHP7

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

Commits
-------

6a87ad3 [Debug] Skip unsilencing test on PHP7
2015-04-07 14:20:59 +02:00
Nicolas Grekas
347b17e966 bug #14226 [Profiler][Logger] fixed cycle odd/even. (aitboudad)
This PR was merged into the 2.6 branch.

Discussion
----------

[Profiler][Logger] fixed cycle odd/even.

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

Before:
![selection_023](https://cloud.githubusercontent.com/assets/1753742/6999021/bcdf1bb0-dbee-11e4-843a-0b01842aeec4.png)

After:
![selection_024](https://cloud.githubusercontent.com/assets/1753742/6999022/c5dcffde-dbee-11e4-9410-bf6fc8000e38.png)

Commits
-------

9a9c56f [Profiler][Logger] fixed cycle odd/even.
2015-04-06 10:58:04 +02:00
Nicolas Grekas
6a87ad3d6e [Debug] Skip unsilencing test on PHP7 2015-04-06 10:42:23 +02:00
Abdellatif Ait boudad
9a9c56f4fe [Profiler][Logger] fixed cycle odd/even. 2015-04-05 23:50:35 +01: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
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
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
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
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
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
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
Fabien Potencier
a3f9c7f02d bug #14191 [StringUtil] Fixed singularification of 'movies' (GerbenWijnja)
This PR was merged into the 2.3 branch.

Discussion
----------

[StringUtil] Fixed singularification of 'movies'

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

The word 'movies' was singularified to 'movy'. There seem to be only two
words ending in 'ovies', which are 'movies' and 'anchovies'. The singular
of the latter is 'anchovy'. All other words ending in 'vies' singularify to
'vy', so the word 'movies' is an exception to the general rule.

Commits
-------

6f5e95b [StringUtil] Fixed singularification of 'movies'
2015-04-03 14:28:57 +02:00
Fabien Potencier
3da702c49b bug #14182 [FrameworkBundle] fixes displaying of deprecation notices. (hhamon)
This PR was merged into the 2.6 branch.

Discussion
----------

[FrameworkBundle] fixes displaying of deprecation notices.

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

Commits
-------

ab37040 [FrameworkBundle] fixes displaying of deprecation notices.
2015-04-03 14:15:40 +02:00
Hugo Hamon
ab370409fe [FrameworkBundle] fixes displaying of deprecation notices. 2015-04-03 10:50:41 +02:00
Nicolas Grekas
24b780e1ed Revert "Added missing changelog entry"
This reverts commit 9d0c0aeeba.
2015-04-03 09:54:01 +02:00
Nicolas Grekas
dc282ec679 [Debug] Tweak docblocks 2015-04-03 09:48:36 +02:00
Nicolas Grekas
9c0aa19e91 minor #14184 [Debug] Rework a bit the PHP doc (lyrixx)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #14184).

Discussion
----------

[Debug] Rework a bit the PHP doc

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

Commits
-------

126514f [Debug] Rework a bit the PHP doc
9d0c0ae Added missing changelog entry
2015-04-03 09:46:34 +02:00
Grégoire Pineau
126514f2a3 [Debug] Rework a bit the PHP doc 2015-04-03 09:46:34 +02:00
Diego Saint Esteben
9d0c0aeeba Added missing changelog entry 2015-04-03 09:46:34 +02:00
Nicolas Grekas
7aafae571b feature #14186 [Debug] Renamed "context" key to "scope_vars" to avoid any ambiguity (lyrixx)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Renamed "context" key to "scope_vars" to avoid any ambiguity

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

As seen with @nicolas-grekas ; the current key is ambiguous because the 2nd parameter in `Psr\LoggerInterface::info()` is already `context`. So when we "export" logs, it's confusing.

More over, now, the meaning is more accurate.

Commits
-------

b56a804 [Debug] Renamed "context" key to "scope_vars" to avoid any ambiguity
2015-04-03 09:43:08 +02:00
Gerben Wijnja
6f5e95b762 [StringUtil] Fixed singularification of 'movies'
The word 'movies' was singularified to 'movy'. There seem to be only two
words ending in 'ovies', which are 'movies' and 'anchovies'. The singular
of the latter is 'anchovy'. All other words ending in 'vies' singularify to
'vy', so the word 'movies' is an exception to the general rule.
2015-04-03 01:10:26 +02:00
Kévin Dunglas
efc1c03866 [Validator] Use strict comparisons in loaders 2015-04-02 22:42:16 +02:00
Grégoire Pineau
b56a804f93 [Debug] Renamed "context" key to "scope_vars" to avoid any ambiguity 2015-04-02 21:18:30 +02:00
Nicolas Grekas
dec2ac917e minor #14179 [Debug] Made code in ErrorHandler easier to read (lyrixx)
This PR was merged into the 2.6 branch.

Discussion
----------

[Debug] Made code in ErrorHandler easier to read

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

Commits
-------

15ef182 [Debug] Made code in ErrorHandler easier to read
2015-04-02 20:01:15 +02:00
Fabien Potencier
36d62eea7d minor #14134 [CS] Fix some phpdocs for Twig extensions & templating helpers (stloyd)
This PR was merged into the 2.3 branch.

Discussion
----------

[CS] Fix some phpdocs for Twig extensions & templating helpers

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

Commits
-------

a95f7f3 Fix some phpdocs for Twig extensions & templating helpers
2015-04-02 16:01:08 +02:00
stloyd
a95f7f38af Fix some phpdocs for Twig extensions & templating helpers 2015-04-02 15:55:01 +02:00
Fabien Potencier
d9d43a80bd minor #14128 [DoctrineBridge] Add missing variable declaration in testcase (stloyd)
This PR was merged into the 2.3 branch.

Discussion
----------

[DoctrineBridge] Add missing variable declaration in testcase

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

Commits
-------

52885f0 [DoctrineBridge] Add missing variable declaration in testcase
2015-04-02 15:50:49 +02:00
Grégoire Pineau
15ef182b99 [Debug] Made code in ErrorHandler easier to read 2015-04-02 15:40:50 +02:00
Fabien Potencier
25f719e90e minor #14173 Use specialized config methods instead of the generic ifTrue() method (javiereguiluz)
This PR was merged into the 2.3 branch.

Discussion
----------

Use specialized config methods instead of the generic ifTrue() method

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

Commits
-------

dbd02b0 Use specialized config methods instead of the generic ifTrue() method
2015-04-02 15:31:24 +02:00
Fabien Potencier
ba84ac87b8 bug #14170 Fix the AJAX profiling (stof)
This PR was merged into the 2.6 branch.

Discussion
----------

Fix the AJAX profiling

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | reported in https://github.com/symfony/symfony/issues/13447#issuecomment-88849938
| License       | MIT
| Doc PR        | n/a

The fix for IE8 (#13978) which does not have the addEventListener method on XMLHttpRequest broke the feature for modern browsers because it was checking the existence on the wrong object. It is a method on the instance, not on the "class", and so should be checked on the prototype.

Commits
-------

9d6c0b1 Fix the AJAX profiling
2015-04-02 14:16:16 +02:00
Javier Eguiluz
dbd02b0871 Use specialized config methods instead of the generic ifTrue() method 2015-04-02 13:05:24 +02:00
Christophe Coevoet
9d6c0b1c30 Fix the AJAX profiling
The fix for IE8 which does not have the addEventListener method on
XMLHttpRequest broke the feature for modern browsers because it was
checking the existence on the wrong object. It is a method on the
instance, not on the "class", and so should be checked on the prototype.
2015-04-02 11:50:50 +02:00
Gregor Harlan
e72128fa86 CS: Use "self" keyword instead of class name if possible 2015-04-01 21:28:50 +02:00