* 2.0:
[Form] Fixed creation of multiple money fields with different currencies
Fixed IPv6 Check in RequestMatcher
fixed DomCrwaler/Form to handle <button> when submitted
Conflicts:
tests/Symfony/Tests/Component/DomCrawler/FormTest.php
tests/Symfony/Tests/Component/Form/Extension/Core/Type/MoneyTypeTest.php
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5779).
Commits
-------
73aafb4 Delete use of CreationExeption
Discussion
----------
Delete use of CreationExeption
CreationException not used
This PR was merged into the 2.1 branch.
Commits
-------
bda29b3 [Form] Fixed error message in PropertyPath to not advice to use a non-existing feature
Discussion
----------
[Form] Fixed error message in PropertyPath to not advice to use a non-existing feature
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5388
Todo: -
License of the code: MIT
Documentation PR: -
This PR was merged into the 2.0 branch.
Commits
-------
bf3e358 [Form] Fixed creation of multiple money fields with different currencies
Discussion
----------
[Form] Fixed creation of multiple money fields with different currencies
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5458
Todo: -
License of the code: MIT
Documentation PR: -
This PR was merged into the 2.1 branch.
Commits
-------
8f81f07 [Form] Fixed setting the "data" option to an object in "choice" and "entity" type
Discussion
----------
[Form] Fixed setting the "data" option to an object in "choice" and "entity" type
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5582
Todo: -
License of the code: MIT
Documentation PR: -
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5764).
Commits
-------
cacf5d7 Fixed Serbian plural translations.
Discussion
----------
Fixed Serbian plural translations.
Translations break productions apps again. We should come up with some solution for this.
This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes#5763).
Commits
-------
333ebeb Fixed IPv6 Check in RequestMatcher
Discussion
----------
[HttpFoundation] Fixed IPv6 Check in RequestMatcher
RequestMatcher checks IPv6 support with
```php
if (!defined('AF_INET6')) {
throw new \RuntimeException('Unable to check Ipv6. Check that PHP was not compiled with option "disable-ipv6".');
}
```
wich depends on sockets extension.
This PR adds a fallback by checking return value of silented call to `inet_pton` if extension is not available (code from https://github.com/dsp/v6tools/blob/master/src/v6tools/Runtime.php).
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5762).
Commits
-------
a3df2fe Fix typo
Discussion
----------
Fix typo
---------------------------------------------------------------------------
by stloyd at 2012-10-16T09:25:20Z
Wrong branch selected. Should be `2.1`.
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5761).
Commits
-------
da784b7 change what I think is a typo
Discussion
----------
change what I think is a typo
This PR was merged into the 2.1 branch.
Commits
-------
cf1e02d [Console] Fix error when mode is not in PATH
Discussion
----------
[Console] Fix error when mode is not in PATH
Small bugfix, fixescomposer/composer#1208
This PR was merged into the 2.1 branch.
Commits
-------
2ffaeda Change monolog require-dev to use the branch alias instead of dev-master
Discussion
----------
Change monolog require-dev to use the branch alias instead of dev-master
Ping @seldaek
This PR was squashed before being merged into the 2.1 branch (closes#5586).
Commits
-------
6b66bc3 [2.1] Added missing error return codes in commands
Discussion
----------
[2.1] Added missing error return codes in commands
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
See: #5585
---------------------------------------------------------------------------
by fabpot at 2012-09-24T12:10:47Z
Exit code values are standardized and some values have some well-defined meaning. Have a look here for more info: https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Process/Process.php#L67
This PR was merged into the 2.1 branch.
Commits
-------
9d8f689 UnitTest fix
02b0b39 UnitTest fix
a4f3ea9 [2.1][DependencyInjection] Incomplete error handling in the container
Discussion
----------
[2.1][DependencyInjection] Incomplete error handling in the container
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: ~
Todo: ~
License of the code: MIT
Documentation PR: ~
The Container::get method, error handling has been handled incompletely because the created wrong service was not removed from the container.
---------------------------------------------------------------------------
by stof at 2012-10-13T23:12:11Z
@fabpot anything missig in this PR ? It looks ready to be merged to me.
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5745).
Commits
-------
a6918ec Made the router lazy when setting the context
Discussion
----------
Made the router lazy when setting the context
Initializing the matcher and the generator to set the context does not make
sense as it is set anyway when building them. This avoids initializing
them in the RouterListener if you never actually use them (for instance
because you use the apache matcher).
@fabpot should it be considered as a bugfix (and so done in older branches) or a new feature ?
---------------------------------------------------------------------------
by stof at 2012-10-14T01:23:51Z
Btw, looking at the ApacheUrlMatcher code, I think it is flawed and that this change will actually not fix the performance issue reported in #5538 as it requires creating the RouteCollection everytime, including when apache actually matched it.
Initializing the matcher and the generator to set the context does not make
sense as it is set anyway when building them. This avoids initializing
them in the RouterListener if you never actually use them (for instance
because you use the apache matcher).
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5738).
Commits
-------
894377f Fix incorrect variable in FileProfilerStorage
Discussion
----------
[HttpKernel] [Profiler] Fix incorrect variable use in FileProfilerStorage
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: ~
Todo: ~
License of the code: MIT
Documentation PR: ~
---------------------------------------------------------------------------
by pborreli at 2012-10-13T06:58:57Z
👍
---------------------------------------------------------------------------
by sstok at 2012-10-13T09:20:33Z
This should be done 2.1 as the bug also existing there.
This PR was merged into the 2.1 branch.
Commits
-------
86503db [Console] added a unit test
3b2eeb6 [Console] fixed#5384
Discussion
----------
[Console] Simplified find method
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5384
It simplifies the way command or command suggestions are found, also fixing issue #5384.
It's a WIP I had, my plan was to also remove the original methods findAlternatives, etc... but some other methods are relying on them, so I'm sending it as it instead of running into more refactoring.
---------------------------------------------------------------------------
by bamarni at 2012-10-06T20:35:59Z
I've refactored some code, as you can see in the tests I've changed, the exception messages have slightly changed.
---------------------------------------------------------------------------
by fabpot at 2012-10-08T13:04:36Z
I don't see the point fo this big refactoring, especially if it also changes the behavior. I think a better approach would be to do only one thing at a time. But as is, this is not mergeable.
---------------------------------------------------------------------------
by bamarni at 2012-10-08T14:01:41Z
I'll try to fix this PR to keep the same behavior and error messages as it is currently.
---------------------------------------------------------------------------
by bamarni at 2012-10-08T14:07:43Z
Well if in fact there is only one bug, it would be better to patch the current code instead of doing this refactoring, even though I think the current code which finds commands is overcomplicated.
---------------------------------------------------------------------------
by stof at 2012-10-08T14:09:18Z
Well, in this case, please submit only a bug report for the 2.1 branch (or 2.0 if it is also affected), and then you can refactor the logic in master to simplify it if needed. But a refactoring should not happen in a maintenance branch
---------------------------------------------------------------------------
by bamarni at 2012-10-09T07:32:47Z
I've patched the code.
---------------------------------------------------------------------------
by fabpot at 2012-10-09T07:37:53Z
Can you add a test for the bug fix?
---------------------------------------------------------------------------
by bamarni at 2012-10-09T21:30:21Z
here you go
This PR was merged into the 2.1 branch.
Commits
-------
8c6b7a4 Fixed the handling of the intl locale when setting the default locale
Discussion
----------
Fixed the handling of the intl locale when setting the default locale
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: none
Calling setDefaultLocale was replacing the intl locale even if the locale
was already set in the Request, thus leading to a different value than the
request locale.
Calling setDefaultLocale was replacing the intl locale even if the locale
was already set in the Request, thus leading to a different value than the
request locale.
This PR was merged into the 2.1 branch.
Commits
-------
5c895c8 [Form][Tests] Make *TestCase files abstract
Discussion
----------
[Form][Tests] Make FormIntegrationTestCase abstract
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: no - but failing tests are unrelated (not in the Form component)
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -
Depending on PHPUnit configuration extending this class in a test makes PHPUnit fail throwing a warning: `No tests found in class "Symfony\Component\Form\Tests\FormIntegrationTestCase"`.
This class should not be run as a test and thus it can be safely converted to abstract. There's also an incoherence between other TestCases, some of them being abstract and others concrete (eg. compare with *TypeTestCase* inheriting from *FormIntegrationTestCase*). Shouldn't all the TestCases be marked as abstract?
---------------------------------------------------------------------------
by fabpot at 2012-10-10T06:24:53Z
ping @bschussek
---------------------------------------------------------------------------
by bschussek at 2012-10-10T07:52:32Z
No objections. 👍
---------------------------------------------------------------------------
by marekkalnik at 2012-10-10T07:58:46Z
If so - would you accept other pull requests just adding abstract to various *TestCase files? Or I could do it all at once in this PR.
---------------------------------------------------------------------------
by bschussek at 2012-10-10T08:17:17Z
Sure. Tests that shouldn't be run should be abstract.
---------------------------------------------------------------------------
by bschussek at 2012-10-10T08:18:40Z
To answer your question completely: You can add all these changes to this PR. Please do also squash the commits when you're done.
Thanks! :)
---------------------------------------------------------------------------
by marekkalnik at 2012-10-10T11:34:45Z
[![Build Status](https://secure.travis-ci.org/marekkalnik/symfony.png)](http://travis-ci.org/marekkalnik/symfony)
Done.
This PR was merged into the 2.1 branch.
Commits
-------
673f74b [HttpFoundation] Fixed#5697 - Request::createFromGlobals, Request::getContentType Changed checking CONTENT_TYPE from server to headers variable
Discussion
----------
[HttpFoundation] Fixed#5697 - Request::createFromGlobals, Request::getContentType
Changed checking CONTENT_TYPE from server to headers variable
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5697
Todo: -
License of the code: MIT
Changed checking CONTENT_TYPE from server to headers variable
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5697
Todo: -
License of the code: MIT
This PR was merged into the 2.1 branch.
Commits
-------
1566f9f [Routing] fix handling of whitespace and synch between collection prefix and route pattern
90145d2 [Routing] fix handling of two starting slashes in the pattern
Discussion
----------
[Routing] fix handling of slashes and whitespace in pattern/prefix
BC break: no
feature addition: no
The first commit fixes the handling of two starting slashes in the pattern. It would be confused with a network path e.g. `//domain/path` when generating a path, so should be prevented.
The second commit fixes the handling of whitespace in RouteCollection::addPrefix. It wasn't trimmed there but it is trimmed in Route::setPattern. So it can be out-of-synch between RouteCollection::getPrefix <-> Route::getPattern.
This PR was merged into the 2.0 branch.
Commits
-------
b439d13 fixed DomCrwaler/Form to handle <button> when submitted
Discussion
----------
[DomCrawler] fixed Form to handle <button> when submitted
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
Issue appears when submitting form with <button> form element.
Name-value of this button wasn`t passed to the request.
This PR was merged into the 2.1 branch.
Commits
-------
65cf3a0 added doc comments
Discussion
----------
added doc comments
---------------------------------------------------------------------------
by stof at 2012-10-06T11:27:23Z
closing in favor of #5686 which targets 2.0
---------------------------------------------------------------------------
by fabpot at 2012-10-06T12:38:17Z
This one cannot be closed as it contains more phpdocs than in the 2.0 branch.
* 2.0:
fixed CS
added doc comments
[HttpKernel][Translator] Fixed type-hints
[Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/Translation#1)
[HttpFoundation] Fixed#5611 - Request::splitHttpAcceptHeader incorrect result order.
Conflicts:
src/Symfony/Component/Process/Process.php
tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php