Commit Graph

21218 Commits

Author SHA1 Message Date
Abdellatif Ait boudad
9b4f00c7ab [2.7][Translation][change log] added DataCollectorTranslator. 2015-04-12 23:10:02 +01:00
Fabien Potencier
5d428b7091 minor #14324 [Validator] Added missing Simplified Chinese (zh_CN) translations (foxwoods)
This PR was merged into the 2.3 branch.

Discussion
----------

[Validator] Added missing Simplified Chinese (zh_CN) translations

| Q             | A
| ------------- | ---
| Fixed tickets | None
| License       | MIT

Added the missing Mandarin Chinese translations.

Commits
-------

c0f0258 [Validator] Added missing Simplified Chinese (zh_CN) translations
2015-04-12 20:28:23 +02:00
Jingyu Wang
c0f0258c56 [Validator] Added missing Simplified Chinese (zh_CN) translations 2015-04-12 10:14:47 +08:00
Tobias Schultze
e00f037472 minor #14323 Use PSR-4 everywhere instead of PSR-0 (Tobion, Seldaek)
This PR was merged into the 2.7 branch.

Discussion
----------

Use PSR-4 everywhere instead of PSR-0

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

Rebased and updated #12466

Commits
-------

8072213 adjust phpdoc for class not found handler
e2bbf07 add phpunit bridge to psr4
60d4994 Tweak classmap paths
cc17234 Add two more components to psr-4
17f61af Add psr-4 support to the ClassNotFoundFatalErrorHandler
4e85901 Use PSR-4 everywhere instead of PSR-0
2015-04-12 00:30:26 +02:00
Tobias Schultze
8072213afe adjust phpdoc for class not found handler 2015-04-12 00:21:29 +02:00
Tobias Schultze
e2bbf074b5 add phpunit bridge to psr4 2015-04-11 23:43:46 +02:00
Jordi Boggiano
60d4994e70 Tweak classmap paths 2015-04-11 23:38:34 +02:00
Jordi Boggiano
cc17234464 Add two more components to psr-4 2015-04-11 23:38:34 +02:00
Jordi Boggiano
17f61afe08 Add psr-4 support to the ClassNotFoundFatalErrorHandler 2015-04-11 23:38:33 +02:00
Tobias Schultze
4e85901380 Use PSR-4 everywhere instead of PSR-0 2015-04-11 23:38:32 +02:00
Joshua Thijssen
6150c3a72b Removed duplicated toRegex() code 2015-04-11 21:29:31 +02:00
Fabien Potencier
37611405e5 bug #14313 [HttpKernel] fixed a regression when no exception listeners are registered (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] fixed a regression when no exception listeners are registered

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

This fixes a regression in 2.7. When no exception listeners are registered, the original exception should not be wrapped by the exception management layer of HttpKernel.

Commits
-------

27930fb [HttpKernel] fixed a regression when no exception listeners are registered
2015-04-11 10:42:37 +02:00
Fabien Potencier
27930fb626 [HttpKernel] fixed a regression when no exception listeners are registered 2015-04-11 10:15:54 +02:00
Fabien Potencier
bab6db59b5 Merge branch '2.6' into 2.7
* 2.6:
  renamed some confusing tests
  [2.3] Fix @link annotations
  [2.6] 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/Component/Form/Extension/HttpFoundation/EventListener/BindRequestListener.php
	src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
	src/Symfony/Component/Validator/ValidatorInterface.php
2015-04-11 09:21:47 +02: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
984220508b minor #14308 [2.7] For @link annotations (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7] For @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
-------

07cb92f [2.7] For @link annotations
2015-04-11 07:17:57 +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
Tobias Schultze
e4385083cb minor #14311 propel/propel1 is now useless (DavidPrevot)
This PR was merged into the 2.7 branch.

Discussion
----------

propel/propel1 is now useless

Since Propel bridge has been removed, no need to require it anymore for
development.

Commits
-------

bea4be0 propel/propel1 is now useless
2015-04-11 02:48:23 +02:00
David Prévot
bea4be00ea propel/propel1 is now useless
Since Propel bridge has been removed, no need to require it anymore for
development.
2015-04-10 17:34:32 -04:00
Fabien Potencier
7a71741875 bumped Symfony version to 2.7.0 2015-04-10 22:45:42 +02:00
Fabien Potencier
07379d1d80 updated VERSION for 2.7.0-BETA1 2015-04-10 21:52:02 +02:00
Fabien Potencier
6944fb122d updated CHANGELOG for 2.7.0-BETA1 2015-04-10 21:51:44 +02:00
Nicolas Grekas
c1983cad4d [2.3] Fix @link annotations 2015-04-10 20:54:05 +02:00
Nicolas Grekas
07cb92f003 [2.7] For @link annotations 2015-04-10 20:53:33 +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
Fabien Potencier
8115b0b977 minor #14303 [Config][cache factory] check type of callback argument. (aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[Config][cache factory] check type of callback argument.

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

/cc @mpdude

Commits
-------

11f798c [Config][cache factory] check type of callback argument.
2015-04-10 17:34:19 +02:00
Fabien Potencier
0ea25a9515 bug #14286 [WebProfiler] Added deprecation message and original color back (WouterJ)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfiler] Added deprecation message and original color back

For some reason, the deprecation message and its original yellow color were removed. This means that you don't know the error (without a stack, you would just see an empty bar) and they aren't easy to find anymore in a long list of logs (yeah, the filter can be used...).

**Before**
![sf-logger-deprecation-before](https://cloud.githubusercontent.com/assets/749025/7062927/4094d5d4-dea2-11e4-80e2-c13a02d6d748.png)

**After**
![sf-logger-deprecation-after](https://cloud.githubusercontent.com/assets/749025/7062930/475fc2b6-dea2-11e4-978f-0f18262f283c.png)

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

Commits
-------

773df8c Added deprecation message and original color back
2015-04-10 17:32:48 +02:00
Fabien Potencier
6c721658e7 bug #14283 [2.7][Console] Count the $messages array instead of $message (barryvdh)
This PR was squashed before being merged into the 2.7 branch (closes #14283).

Discussion
----------

[2.7][Console] Count the $messages array instead of $message

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

I think you mean $messages instead of $message. With this patch, the number of messages is correctly counted.

Commits
-------

95aa167 [2.7][Console] Count the  array instead of
2015-04-10 17:31:32 +02:00
Barry vd. Heuvel
95aa167d7c [2.7][Console] Count the array instead of 2015-04-10 17:31:30 +02:00
Abdellatif Ait boudad
11f798cf41 [Config][cache factory] check type of callback argument. 2015-04-10 14:54:53 +01:00
Fabien Potencier
1e121e619c minor #14295 removed 3.0 constraints from 2.7 composer files (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

removed 3.0 constraints from 2.7 composer files

| 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

Those 3.0 constraints will be kept in the new 2.8.

Commits
-------

5503804 removed 3.0 constraints from 2.7 composer files
2015-04-10 10:51:45 +02:00
Fabien Potencier
b8f2a6b901 feature #14229 [WebProfilerBundle] AJAX links (romqin)
This PR was submitted for the 2.6 branch but it was merged into the 2.7 branch instead (closes #14229).

Discussion
----------

[WebProfilerBundle] AJAX links

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

It is considered as a new feature ? If yes, should I make it on 2.7 ?

Add a link on GET requests:
![capture d ecran 2015-04-06 a 11 47 33](https://cloud.githubusercontent.com/assets/334432/7002965/1ff200fa-dc53-11e4-96de-664572f72b57.png)

Commits
-------

b9062a0 add link on GET requests
2015-04-10 10:50:44 +02:00
Romain Gautier
b9062a0c87 add link on GET requests 2015-04-10 10:50:43 +02:00
Fabien Potencier
5503804cf9 removed 3.0 constraints from 2.7 composer files 2015-04-10 09:23:38 +02:00
Fabien Potencier
30b31611a5 Merge branch '2.6' into 2.7
* 2.6:
  [Translator] Cache does not take fallback locales into consideration
  [VarDumper] Fix call site detection
  [Process] Fix volatile test
  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

Conflicts:
	.travis.yml
	src/Symfony/Component/Translation/Translator.php
2015-04-10 09:19:44 +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
b5da2ae876 minor #14281 [2.7][Translation] avoid freshness check based on content *inside* the cache (mpdude, aitboudad)
This PR was merged into the 2.7 branch.

Discussion
----------

[2.7][Translation] avoid freshness check based on content *inside* the cache

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

it's mainly based on #14268

Commits
-------

f9939d8 [Translation] avoid freshness check based on content *inside* the cache.
f666657 [Translator] Cache does not take fallback locales into consideration
2015-04-09 18:34:51 +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
Abdellatif Ait boudad
f9939d80f3 [Translation] avoid freshness check based on content *inside* the cache. 2015-04-09 15:04:27 +01:00
Matthias Pigulla
0d55b2f92d [Translator] Cache does not take fallback locales into consideration 2015-04-09 13:33:02 +01:00
Wouter J
773df8c081 Added deprecation message and original color back 2015-04-09 10:20:18 +02:00
Nicolas Grekas
dcde4458f0 [FrameworkBundle] Workaround php -S ignoring auto_prepend_file 2015-04-09 09:37:26 +02:00
Matthias Pigulla
f666657342 [Translator] Cache does not take fallback locales into consideration 2015-04-09 00:12:47 +01:00