Commit Graph

20144 Commits

Author SHA1 Message Date
Jingyu Wang
c0f0258c56 [Validator] Added missing Simplified Chinese (zh_CN) translations 2015-04-12 10:14:47 +08:00
Fabien Potencier
234cebd087 Merge branch '2.3' into 2.6
* 2.3:
  renamed some confusing tests
  [2.3] Fix @link annotations
  Fix javascript
  [2.3][Translation] test refresh cache when resources File change.
  [Translator] Cache does not take fallback locales into consideration

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Translation/TranslatorTest.php
	src/Symfony/Bundle/FrameworkBundle/Translation/Translator.php
2015-04-11 09:16:15 +02:00
Fabien Potencier
8b7148fbec minor #14312 renamed some confusing tests (fabpot)
This PR was merged into the 2.3 branch.

Discussion
----------

renamed some confusing tests

| 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

Commits
-------

a8e4c43 renamed some confusing tests
2015-04-11 08:59:48 +02:00
Fabien Potencier
a8e4c43080 renamed some confusing tests 2015-04-11 08:39:49 +02:00
Fabien Potencier
624be35038 minor #14309 [2.6] Fix @link annotations (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[2.6] Fix @link annotations

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

It would be great if PHP CS Fixer could enforce this.

Commits
-------

fb077a2 [2.6] Fix @link annotations
2015-04-11 07:17:31 +02:00
Fabien Potencier
08f4d29c72 minor #14310 [2.3] Fix @link annotations (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fix @link annotations

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

It would be great if PHP CS Fixer could enforce this.

Commits
-------

c1983ca [2.3] Fix @link annotations
2015-04-11 07:16:37 +02:00
Nicolas Grekas
c1983cad4d [2.3] Fix @link annotations 2015-04-10 20:54:05 +02:00
Nicolas Grekas
fb077a2748 [2.6] Fix @link annotations 2015-04-10 20:22:21 +02:00
Fabien Potencier
c764a84a27 minor #14299 [2.3] Fix javascript (SpacePossum)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] Fix javascript

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

Remove dead code and add missing semicolons.

Commits
-------

df76126 Fix javascript
2015-04-10 17:35:17 +02:00
Possum
df76126d47 Fix javascript 2015-04-10 08:59:04 +02:00
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
08c2f44a96 minor #14279 [2.3][Translation] test refresh cache when resources File change. (aitboudad)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3][Translation] test refresh cache when resources File change.

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

For 2.6 https://github.com/symfony/symfony/pull/14280

Commits
-------

4d01fab [2.3][Translation] test refresh cache when resources File change.
2015-04-09 19:30:45 +01: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
Abdellatif Ait boudad
4d01fab152 [2.3][Translation] test refresh cache when resources File change. 2015-04-09 16:12:29 +01:00
Matthias Pigulla
0d55b2f92d [Translator] Cache does not take fallback locales into consideration 2015-04-09 13:33:02 +01:00
Nicolas Grekas
dcde4458f0 [FrameworkBundle] Workaround php -S ignoring auto_prepend_file 2015-04-09 09:37:26 +02:00
Nicolas Grekas
d8fb6a4722 [VarDumper] Fix call site detection 2015-04-08 20:25:12 +02:00
Abdellatif Ait boudad
986e3d1b70 bug #14268 [Translator] Cache does not take fallback locales into consideration (sf2.3) (mpdude)
This PR was merged into the 2.3 branch.

Discussion
----------

[Translator] Cache does not take fallback locales into consideration (sf2.3)

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

This is the Symfony 2.3 variant of #14267.

Commits
-------

0f84f3a [Translator] Cache does not take fallback locales into consideration
2015-04-08 15:02:36 +01:00
Matthias Pigulla
0f84f3adfa [Translator] Cache does not take fallback locales into consideration
As we're dumping entire catalogues including their fallbacks (standalone or inlined in ~2.7), we need to use different cache files for different sets of fallback locales.
2015-04-08 15:33:16 +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