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 master branch.
Commits
-------
b31ae34 [WebProfilerBundle] Remove the now unneeded BC var and fixed a typo
d07ce03 [TwigBundle] Moved the registration of the app global to the environment
Discussion
----------
[TwigBundle] Moved the registration of the app global to the environment
This makes the app global variable available also when accessing the Twig
environment directly instead of using the TwigEngine.
This PR was squashed before being merged into the master branch (closes#5725).
Commits
-------
d6be69a [i5669][Console] Adding a note about the list command in the help command
Discussion
----------
[i5669][Console] Adding a note about the list command in the help command
In order to fix the issue #5669.
---------------------------------------------------------------------------
by gnugat at 2012-10-11T09:45:45Z
This PR is ready for a first code review.
---------------------------------------------------------------------------
by stof at 2012-10-13T22:25:15Z
@fabpot 👍
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 merged into the master branch.
Commits
-------
63b480e [Console] fixed#5316
Discussion
----------
[Console] [Enhancement] fixes#5316
Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5316
---------------------------------------------------------------------------
by marfillaster at 2012-10-05T02:14:55Z
I simplified the change. And the reason why tests for text help do not need changes is because in CommandTest, the commands are executed first which also merges app definition before invoking asText or asXml . While in ApplicationTest, commands are never run therefore app definition is not being merged.
---------------------------------------------------------------------------
by stof at 2012-10-13T23:13:52Z
@fabpot This looks ready to me. Anything left ?
This PR was merged into the master branch.
Commits
-------
3d2a7db Fix a few namespaces to match file system.
Discussion
----------
Cleanup Some Tests - tearDown and namespaces
Tried to cleanup a few tests and fix a few test classes which weren't following PSR-0. Removed original `tearDown` changes.
---
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: ~
---------------------------------------------------------------------------
by pborreli at 2012-10-13T06:41:14Z
from [PHPUnit documentation](http://www.phpunit.de/manual/current/en/fixtures.html#fixtures.more-setup-than-teardown) :
>setUp() and tearDown() are nicely symmetrical in theory but not in practice. In practice, you only need to implement tearDown() if you have allocated external resources like files or sockets in setUp(). If your setUp() just creates plain PHP objects, you can generally ignore tearDown(). However, if you create many objects in your setUp(), you might want to unset() the variables pointing to those objects in your tearDown() so they can be garbage collected. The garbage collection of test case objects is not predictable.
---------------------------------------------------------------------------
by fabpot at 2012-10-13T10:05:49Z
All these tearDown methods are not needed and should be removed.
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 merged into the master branch.
Commits
-------
d427522 [Validator] fixed German translation, see #5675
Discussion
----------
[Validator] fixed German translation
see #5675
The controllers are not relying on the DIC anymore and only Twig
is used for rendering (instead of the Templating component).
The Exception controller has not been updated yet as it relies on many
external dependencies (and other bundles).
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 has been done for several reasons:
* for consistency with the way we already manage the WDT icons;
* it makes the WebProfiler independant from the location of the assets (and from the asset() function)
* this is the very first step to make the WebProfiler useable outside the full-stack framework (more commits soon)
There is still one asset() call though, which will be removed later on.
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 master branch.
Commits
-------
74e2c5e Fix incorrect inheritdoc blocks
Discussion
----------
Fix incorrect inheritdoc blocks
Also add a docblock to stopwatch member variable.
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.