This PR was merged into the 2.1 branch.
Commits
-------
039bdfd [WebProfilerBundle] Fixed the use of nested macros
Discussion
----------
[WebProfilerBundle] Fixed the use of nested macros
Closes#5800
---------------------------------------------------------------------------
by stof at 2012-10-22T20:03:10Z
@fabpot ping. this regression is quite annoying as I like the profiler
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5786).
Commits
-------
199a593 Removed unused use statements.
Discussion
----------
Removed unused use statements.
This PR was squashed before being merged into the 2.1 branch (closes#5789).
Commits
-------
788cc2c Nsdocblocks
Discussion
----------
Nsdocblocks
Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
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#5746).
Commits
-------
96d87ad [Locale] fixed fallback locale
Discussion
----------
[Locale] fixed fallback locale
The `getFallbackLocale()` method in `Symfony\Component\Locale\Locale` did not return a fallback locale if the current locale (`Locale::getDefault()`) was a 5-char locale like de_CH.
`LocaleTest` failed when the locale was set to de_CH before running (see changes in LocaleTest).
(second attempt after messing up PR#5641)
---------------------------------------------------------------------------
by eriksencosta at 2012-10-15T05:08:25Z
Original PR: #5641.
This PR was merged into the 2.1 branch.
Commits
-------
3e15d44 Documented removed _form_is_choice_group function
Discussion
----------
Documented removed `_form_is_choice_group` function
Also changed for-loop variables to match the current `form_div_layout.html.twig` code.
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5782).
Commits
-------
d662e22 [DoctrineBridge] UniqueValidatorTest, Change message on assertions
Discussion
----------
[DoctrineBridge] UniqueValidatorTest, Change message on assertions
* 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.