This PR was merged into the master branch.
Commits
-------
e13b050 Add missing symfony/stopwatch in the replace section of composer.json
Discussion
----------
Add missing symfony/stopwatch in the replace section of composer.json
And order the sections alphabeticaly for easier navigation
This PR was merged into the master branch.
Commits
-------
fc300ec [FrameworkBundle] Router class tweak
Discussion
----------
[FrameworkBundle] Router class tweak
This PR was merged into the master branch.
Commits
-------
4c0c588 [MemoryDataCollector] Stop being optimistic about memory usage
Discussion
----------
[MemoryDataCollector] Stop being optimistic about memory usage
Take into account the memory used in the kernel.terminate listeners
This PR was merged into the master branch.
Commits
-------
b27b749 made usage of Composer autoloader for subtree-split unit tests
Discussion
----------
made usage of Composer autoloader for subtree-split unit tests
This PR also normalizes the way components are tested.
---------------------------------------------------------------------------
by stof at 2012-11-09T23:14:22Z
👍
This PR was merged into the 2.1 branch.
Commits
-------
84b760b [HttpKernel] fixed Client when using StreamedResponses (closes#5370)
Discussion
----------
[HttpKernel] fixed Client when using StreamedResponses (closes#5370)
This PR was merged into the master branch.
Commits
-------
a288521 displayed the full event listener names to avoid name collisions (closes#5019)
Discussion
----------
displayed the full event listener names to avoid name collisions (closes#5019)
---------------------------------------------------------------------------
by stof at 2012-11-09T23:14:41Z
👍
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5967).
Commits
-------
79f750d [Form] Fixed singularization of "prices"
Discussion
----------
[Form] Fixed singularization of "prices"
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
This PR is similar to #4758, although in this case, the singularization of "prices" into "prex" or "prix" is obviously a mistake. I guess anyone working on a e-commerce platform with multiple prices on a product model could encounter this issue.
I adapted the tests as well ; there shouldn't be any bc break.
---------------------------------------------------------------------------
by bschussek at 2012-11-10T07:23:00Z
👍
This PR was merged into the 2.1 branch.
Commits
-------
0f75586 [Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc.
Discussion
----------
[Form] Removed an exception that prevented valid formats from being passed
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5730
Todo: -
License of the code: MIT
Documentation PR: -
This PR was merged into the 2.1 branch.
Commits
-------
e34fb41 [HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes#5937)
Discussion
----------
[HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes#5937)
This PR was merged into the 2.1 branch.
Commits
-------
67e697f fixed PDO session handler for Oracle (closes#5829)
Discussion
----------
fixed PDO session handler for Oracle (closes#5829)
This PR was merged into the master branch.
Commits
-------
6b54a51 moved the Stopwatch classes to their own component
Discussion
----------
moved the Stopwatch classes to their own component
see https://github.com/symfony/symfony/issues/5911
---------------------------------------------------------------------------
by stof at 2012-11-09T08:06:06Z
you should also add the ``.gitattributes`` in the new component
---------------------------------------------------------------------------
by fabpot at 2012-11-09T09:09:35Z
@stof: I've added the .gitattributes file, but also the phpunit and LICENSE ones.
---------------------------------------------------------------------------
by dlsniper at 2012-11-09T13:51:23Z
Also you should add this to the changelog/update files. I'll do it myself but only in about 8 hours or so as I'm not at home.
This PR was merged into the 2.1 branch.
Commits
-------
646a714 Fix export-ignore on Windows
Discussion
----------
Fix export-ignore on Windows
Rules:
Tests/ export-ignore
don't work on Windows. My proposition is:
/Tests export-ignore
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes#5955).
Commits
-------
c2955b7 Update src/Symfony/Component/Validator/Resources/translations/validators.fa.xlf
2dd87ae Adding new localized strings for farsi validation.
Discussion
----------
Adding new localized strings for farsi validation.
Adding new localized strings for farsi validation.
This PR was merged into the 2.1 branch.
Commits
-------
4909bc3 [Form] Fixed forms not to be marked invalid if their children are already marked invalid
Discussion
----------
[Form] Fixed forms not to be marked invalid if their children are already marked invalid
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #4359
Todo: -
License of the code: MIT
Documentation PR: -
This PR prevents unsynchronized forms from being marked invalid if any of their children is also unsynchronized (and thus also marked invalid). Displaying an invalid message twice does not help the user and, if used in conjunction with error bubbling, may lead to duplicate errors (see #4359).
This PR was merged into the master branch.
Commits
-------
380cf4f [HttpKernel] added memory information in the Stopwatch
Discussion
----------
[HttpKernel] added memory information in the Stopwatch
This PR was merged into the master branch.
Commits
-------
d231b8f [ClassLoader] Make ApcClassLoader properly decorate ClassLoader.
Discussion
----------
[ClassLoader] Make ApcClassLoader properly decorate ClassLoader.
ApcClassLoader only implements the findFile() and loadClass() methods, but none of the other methods. That's an implementation detail, which isn't particularly trivial.
I can't see a reason for why ApcClassLoader cannot simply decorate ClassLoader in a proper way, passing forward all unknown method calls to ClassLoader.
---------------------------------------------------------------------------
by sun at 2012-11-09T03:00:51Z
mmm, the test failures seem to be irrelevant. It passed on the PHP 5.4 environment. The others failed on early pre-test infrastructure operations.
This PR was merged into the 2.0 branch.
Commits
-------
8fb334f [Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
Discussion
----------
[Form] Excluded some tests in NumberToLocalizedStringTransformerTest which fail on ICU 4.4, but work on ICU 4.8
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: -
This PR was merged into the master branch.
Commits
-------
04e93d8 Update UPGRADE-2.1.md
Discussion
----------
Update UPGRADE-2.1.md
Change on selectedchoice part, because "choice.value" wont work, but just "value" does.
* 2.0:
[Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
Show correct class name InputArgument in error message
shows correct class name InputOption in error message
The exception message should say which field is not mapped
[HttpFoundation] Fix name sanitization after perfoming move
Add check to Store::unlock to ensure file exists
Conflicts:
src/Symfony/Bridge/Doctrine/Validator/Constraints/UniqueEntityValidator.php
src/Symfony/Component/HttpFoundation/File/UploadedFile.php
tests/Symfony/Tests/Component/Console/Input/InputArgumentTest.php
tests/Symfony/Tests/Component/Console/Input/InputOptionTest.php
tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/NumberToLocalizedStringTransformerTest.php
tests/Symfony/Tests/Component/HttpFoundation/File/FileTest.php
tests/Symfony/Tests/Component/HttpKernel/HttpCache/StoreTest.php
