This PR was merged into the 2.1 branch.
Commits
-------
5d2525b [Form] Created test for DoctrineOrmTypeGuesser see #5790b844d6b [Form] Fixed DoctrineOrmTypeGuesser to guess the "required" option for to-one associations
Discussion
----------
[Form] Doctrine orm type guesser tests
This PR adds tests to https://github.com/symfony/symfony/pull/5790
---------------------------------------------------------------------------
by Tobion at 2012-10-20T10:53:56Z
Using real test entities would be better IMO. Using mocks ties it pretty much to the implementation.
---------------------------------------------------------------------------
by sstok at 2012-10-21T10:38:53Z
@Tobion thats true, but Doctrine Class meta data takes quite some coding to set-up.
For instance you need the EntityManager to get even get the meta data set!
So you'd end having more code to set-up then your actually testing.
---------------------------------------------------------------------------
by Burgov at 2012-10-21T12:58:58Z
I wasn't sure whether do use a test entity manager, or do it the way I finally did it.
@sstok true, it's quite some work to set it up, but on the other hand there's the base OrmTestCase class which does it for you, so it'd actually mean I'd only have to create one entity for all the cases: https://github.com/symfony/symfony/blob/master/src/Symfony/Bridge/Doctrine/Tests/DoctrineOrmTestCase.php
@Tobion on the other hand I tend to use a test EM only when I actually need to test persisting and loading, while this test case here is so isolated that I didn't really feel it would be necessary.
I'd like to know which method is preferred though, I'll change it if necessary, and other tests can be added to test the rest of this specific class
This PR was merged into the 2.1 branch.
Commits
-------
7447ef7 slight refactoring in UrlMatcher
Discussion
----------
slight refactoring in UrlMatcher
bc break: no
bug fix: no
feature addition: no
saving a variable
* 2.0:
bumped Symfony version to 2.0.19-DEV
updated VERSION for 2.0.18
update CONTRIBUTORS for 2.0.18
updated CHANGELOG for 2.0.18
updated vendors for 2.0.18
Add to DateFormats 'D M d H:i:s Y T' (closes#5830)
Conflicts:
CONTRIBUTORS.md
src/Symfony/Component/HttpKernel/Kernel.php
tests/Symfony/Tests/Bridge/Monolog/Processor/WebProcessorTest.php
vendors.php
This PR was merged into the 2.1 branch.
Commits
-------
6fb4a1b Remove § about prototype_name customization in 2.0
8a347fd fix option name
Discussion
----------
Fix upgrade prototype name option
This PR was merged into the 2.1 branch.
Commits
-------
3553276 [ConfigDumpReference] avoid notice for variable nodes
Discussion
----------
[ConfigDumpReference] avoid notice for variable nodes
When a variable node has an array as default value, a notice occurs later on because of an "array to string conversion", which is turned to an exception in debug mode (mandatory in order to run this command).
This PR was merged into the 2.1 branch.
Commits
-------
f06432b Code cleanup
Discussion
----------
Code cleanup
Not sure at the end if this good or not. If it is useless, just close it.
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
