Commit Graph

22952 Commits

Author SHA1 Message Date
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
38374f983c updated version to 2.8 2015-04-10 10:56:33 +02:00
Fabien Potencier
ebe0889a38 Revert "removed 3.0 constraints from 2.7 composer files"
This reverts commit 5503804cf9.
2015-04-10 10:55:07 +02: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
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
Bernhard Schussek
94eb384163 bug #14258 [Form] Cleanup deprecation notices (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form] Cleanup deprecation notices

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

This uses the same technique used for FlattenException in HttpKernel that prevents repeated notices triggered by the constructor.

Commits
-------

3f58862 [Form] Cleanup deprecation notices
2015-04-08 11:34:58 +02:00
Nicolas Grekas
3f58862513 [Form] Cleanup deprecation notices 2015-04-08 11:29:16 +02:00
Fabien Potencier
81bf9108a0 feature #13220 [Console] Made output docopt compatible (WouterJ)
This PR was squashed before being merged into the 2.7 branch (closes #13220).

Discussion
----------

[Console] Made output docopt compatible

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

This was harder than I thought. To sum up:

 * The output now follows the [docopt](http://docopt.org/) specification
 * There is a new `addUsage` method to add more usage patterns
 * The handling of spaces in the descriptors is refactored to make it easier to understand and to make it render better (using sprintf's features only made it worse imo)

Todo
---

 * [x] Add test for `addUsage` and friends
 * [x] Add test for multiline descriptions of arguments
 * <s>Convert long descriptions to multiline automatically</s>
 * [ ] Submit a doc PR for `addUsage`

Question
---

The docopt specification suggests we should add these usage patterns:

    %command.name% -h | --help
    %command.name% --version

I didn't do that yet, as I think it'll only makes the output more verbose and it's already pretty obvious.

I've taken some decisions which I don't think everybody agrees with. I'm willing to change it, so feel free to comment :)

/cc @Seldaek

Commits
-------

3910940 [Console] Made output docopt compatible
2015-04-08 07:37:48 +02:00
WouterJ
39109404da [Console] Made output docopt compatible 2015-04-08 07:37:46 +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
c0ddd3da26 Merge branch '2.6' into 2.7
* 2.6:
  [Form] Fixed DateType/TimeType that were broken since 849fb29984 and 1c4a75a00a
  [Debug] Skip unsilencing test on PHP7
  [Profiler][Logger] fixed cycle odd/even.
2015-04-08 07:28:20 +02:00
Fabien Potencier
f492b12158 bug #14250 [Console] Fixed SymfonyStyle when get terminal width fails (1ed)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Fixed SymfonyStyle when get terminal width fails

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

Commits
-------

a52b658 [Console] Fixed SymfonyStyle when get terminal width fails
2015-04-08 07:27:55 +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
Fabien Potencier
b01ed897fd feature #14178 [Config] Delegate creation of ConfigCache instances to a factory. (mpdude)
This PR was squashed before being merged into the 2.7 branch (closes #14178).

Discussion
----------

[Config] Delegate creation of ConfigCache instances to a factory.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes (refactoring, new flex point)
| BC breaks?    | no
| Deprecations? | yes
| Tests pass?   | we'll see :-)
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | symfony/symfony-docs#5136

In the Routing/Router and Translation/Translator, delegate creation of ConfigCache instances to a factory. The factory can be setter-injected but will default to a BC implementation.

The ```ConfigCacheFactoryInterface``` is designed in a way that captures the common ```$cache = new ...; if (!$cache->isFresh()) { ... do sth }``` pattern. But more importantly, this design allows factory implementations to take additional measures to avoid race conditions before actually filling the cache.

By using an exchangeable ConfigCache factory it becomes possible to implement different resource (freshness) checking strategies, especially service-based ones.

The goal is to be able to validate Translators and Routers generated by database-based loaders. It might also help with symfony/AsseticBundle#168. This PR only contains the minimum changes needed, so the rest could be implemented in a bundle outside the core (at least for the beginning).

Component/HttpKernel/Kernel::initializeContainer still uses the ConfigCache implementation directly as there is no sensible way of getting/injecting a factory service (chicken-egg).

This is a pick off #7230. It replaces #7781 which was against the master branch. Also see #7781 for additional comments/explanations.

## Todo

* [ ] Allow `symfony/config` `~3.0.0` in `composer.json` for the HttpKernel and Translator component as well as TwigBundle once this PR has been merged into the master branch (fail deps=high tests for the time being).

Commits
-------

6fbe9b1 [Config] Delegate creation of ConfigCache instances to a factory.
2015-04-08 07:21:37 +02:00
Matthias Pigulla
6fbe9b1064 [Config] Delegate creation of ConfigCache instances to a factory. 2015-04-08 07:21:35 +02:00
Gregor Harlan
c5123d6881 CS: Pre incrementation/decrementation should be used if possible 2015-04-07 19:54:22 +02:00