merged branch mmuruev/patch-1 (PR #7278)

This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7278).

Commits
-------

0cf2656 Default validation message translation fix.

Discussion
----------

Default validation message translation fix.

Add 'validators' for $translationDomain. Detailed discussion https://github.com/fabpot/Silex/pull/641

---------------------------------------------------------------------------

by fabpot at 2013-03-06T08:17:43Z

ping @bschussek

---------------------------------------------------------------------------

by stof at 2013-03-06T08:43:53Z

@fabpot Using ``null`` as translation domain would make weird things in the Translator component. So this change is needed IMO to have a sensible default.

---------------------------------------------------------------------------

by bschussek at 2013-03-06T10:42:59Z

:+1:
merged branch Tobion/deprecation-trigger (PR #7266)

This PR was merged into the 2.2 branch.

Commits
-------

c0687cd remove() should not use deprecated getParent() so it does not trigger deprecation internally
708c0d3 adjust routing tests to not use prefix in addCollection
6180c5b add test for uniqueness of resources
c0de07b added tests for addDefaults, addRequirements, addOptions
0a1cfcd adjust RouteCollectionTest for the addCollection change and refactor the tests to only skip the part that really needs the config component
ea694e4 added tests for remove() that wasnt covered yet and special route name
9e2bcb5 refactor interator test that was still assuming a tree
ceb9ab4 adjust tests to no use addPrefix with options
2b8bf6b adjusted tests to not use RouteCollection::getPrefix
acff735 [Routing] trigger deprecation warning for deprecated features that will be removed in 2.3

Discussion
----------

[2.2][Routing] Trigger deprecation and refactor tests to not use deprecated methods

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

@fabpot please don't squash because it also added new tests
Unset loading[$id] in ContainerBuilder on exception
merged branch chx/master (PR #7261)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7261).

Commits
-------

ff8c5ca Unset loading[$id] in ContainerBuilder on exception

Discussion
----------

Unset loading[$id] in ContainerBuilder on exception

This is the same functionality that Container provides.

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

---------------------------------------------------------------------------

by vicb at 2013-03-04T22:43:07Z

could you add a unit test and use the standard PR header (symfony.com > doc > contributing). thanks.

---------------------------------------------------------------------------

by igorw at 2013-03-04T22:48:02Z

Can you add a test case? EDIT: I guess someone beat me to that comment. :)
[DependencyInjection] added a test for the previous merge (refs #7261)
merged branch jfsimon/issue-7232-2.1 (PR #7236)

This PR was merged into the 2.1 branch.

Commits
-------

6681df0 [Console] fixed StringInput binding
6b98883 [Console] added string input test
32f1904 Revert "merged branch jfsimon/issue-6749 (PR #7220)"

Discussion
----------

[Console] fixes tests

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

---------------------------------------------------------------------------

by gigablah at 2013-03-02T13:25:10Z

Apparently 5b19c892cff52d8d50bcd4b1397cff8972acb9df broke the console shell. I was wondering why all commands executed through the shell in 2.2.0 were throwing "Too many arguments" exception.

---------------------------------------------------------------------------

by stof at 2013-03-02T13:27:09Z

@gigablah This is already fixed in the 2.2 branch as this PR has already been merged in 2.2 (but the revert is also needed in 2.1)

---------------------------------------------------------------------------

by gigablah at 2013-03-02T13:51:44Z

Ah, guess I'll have to wait for it to be pushed to the symfony/console repository then.
[2.3] [DomCrawler] adds schema relative URL support to link
merged branch jfsimon/issue-7169 (PR #7179)

This PR was squashed before being merged into the master branch (closes #7179).

Commits
-------

c6fe27f [2.3] [DomCrawler] adds schema relative URL support to link

Discussion
----------

[2.3] [DomCrawler] adds schema relative URL support to link

Adds support for `//relative/schema` URLs to `DomCrawler` links.

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

---------------------------------------------------------------------------

by stof at 2013-02-25T19:17:10Z

:+1:
RedisProfilerStorage wrong db-number/index-number selected
merged branch trivago/webprofiler_redis_add_select (PR #7177)

This PR was squashed before being merged into the 2.1 branch (closes #7177).

Commits
-------

c82c754 RedisProfilerStorage wrong db-number/index-number selected

Discussion
----------

RedisProfilerStorage wrong db-number/index-number selected

bug: in the webprofiler the wrong database (0) is selected when storage should not go to index 0. on redis connect the default behaviour is to select index/database number 0, but it is necessary to select a special index/database.
see: http://rediscookbook.org/multiple_databases.html

[HttpKernel] [Profiler] [RedisProfilerStorage] added select for a db-number/db-index to dsn-patttern

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

Usage with index/db-number = 7 :
```xml
<!-- config_dev.xml -->

<symfony:profiler only-exceptions="false" dsn="redis://127.0.0.1:6379/7" lifetime="3600" />

```

```yml
#config_dev.yml

framework:
...
    profiler:
    ...
        dsn: redis://127.0.0.1:6379/7

```

---------------------------------------------------------------------------

by fabpot at 2013-02-27T07:21:02Z

Can you also add some unit tests?

---------------------------------------------------------------------------

by JohnDoe007 at 2013-02-27T09:36:28Z

@fabpot the function getRedis() is currently not testable, I think. this means I have to do a bigger change to the class, add a public function initRedis() or something and move initialize code there to make the initialization process, where my change is, testable. is this ok to do it in that bugfix/pull request? or should I add this test change to master and only adding this small bugfix to the 2.1-branch?

---------------------------------------------------------------------------

by fabpot at 2013-03-06T16:47:37Z

Thanks, I've merged the fix. Can you work on the changes needed to allow the code to be testable (on the master branch)?
fixed typo
Fixed typo in UPGRADE-2.2
remove dead code in yaml component
merged branch gimler/cleamup_yaml (PR #7264)

This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7264).

Commits
-------

edda254 remove dead code in yaml component

Discussion
----------

remove dead code in yaml component

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

Cleanup unused code.

---------------------------------------------------------------------------

by fabpot at 2013-03-06T16:27:57Z

Can you explain why it is not needed anymore?

---------------------------------------------------------------------------

by igorw at 2013-03-06T16:44:30Z

`$subject` is no longer used anywhere. The `substr` is now done inline in the `preg_match` call. This code is effectively dead.
merged branch gimler/profiler_status_text (PR #7095)

This PR was merged into the master branch.

Commits
-------

b0bca01 add status text to web profiler response panel

Discussion
----------

[2.3] add status text to web profiler response panel

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

Add the status text to the web profiler response panel

---------------------------------------------------------------------------

by Burgov at 2013-02-17T11:08:37Z

The response object allows for setting a custom status message, so displaying the predefined one could be confusing.

E.g. ```$reponse->setStatusCode(403, "You can't go here!")```

However, there is no getter for it to be read... Perhaps it should be added?

---------------------------------------------------------------------------

by fabpot at 2013-02-17T11:32:37Z

I think displaying the default text is good enough. I suppose that the intent is to easily remember what a given status code means. There is no getter for the status text as it has no real meaning in terms of HTTP.

---------------------------------------------------------------------------

by gimler at 2013-02-17T16:50:47Z

Yes this was my intention. But i think this is a good point the response should have a `getStatusText` method.
So actual to only point where the status text is use is when the response is converted to string.

@fabpot i would add the `getStatusText` method to the `response` class and modify the PR to use this text. Do you agree with that?

---------------------------------------------------------------------------

by fabpot at 2013-02-17T17:13:07Z

Ad I said in my previous comment, not having a `getStatusText()` was in fact intentional.
merged branch henrikbjorn/time-collector-canvas (PR #7065)

This PR was merged into the master branch.

Commits
-------

439b8bc [WebProfilerBundle] Draw retina canvas if devicePixelRatio is bigger than 1

Discussion
----------

[2.3] [WebProfilerBundle] Draw retina canvas elements

When using a MacBook Pro Retina the default canvas is fuzzy and ugly, this scales the elements for a higher DPI so they will look sharp and crisp.
merged branch WouterJ/patch-1 (PR #7284)

This PR was merged into the 2.2 branch.

Commits
-------

ac0c4ce Fixed typo in UPGRADE-2.2

Discussion
----------

Fixed typos in UPGRADE-2.2

| Q             | A
| ------------- | ---
| Fixed tickets | -
| License       | MIT
[WebProfilerBundle] removed the display of some information when their value is n/a
merged branch fabpot/webprofiler-master (PR #7286)

This PR was merged into the master branch.

Commits
-------

6ead8a1 [WebProfilerBundle] removed the display of some information when their value is n/a

Discussion
----------

[WebProfilerBundle] removed the display of some information when their value is n/a

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7002
| License       | MIT
| Doc PR        | n/a
merged branch fabpot/translator-consistency (PR #7100)

This PR was merged into the master branch.

Commits
-------

0ef08f5 [Translator] fixed inconsistency in Translator

Discussion
----------

[2.3] [Translator] fixed inconsistency in Translator

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

---------------------------------------------------------------------------

by stof at 2013-02-17T20:44:32Z

shouldn't you make ``setFallbackLocale`` call ``setFallbackLocales`` ?

---------------------------------------------------------------------------

by fabpot at 2013-02-18T14:04:39Z

@stof: done

---------------------------------------------------------------------------

by stof at 2013-02-18T14:18:10Z

shoudn't you also update the place where the method is used (in FrameworkBundle probably) to use the non-deprecated one ?