Commits
-------
1402b42 Fixing config normalisation example in docblock
Discussion
----------
Fixing config normalisation example in docblock
Against 2.0 this time
as per @stof's comments in symfony/symfony-docs#1721
Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: -
Fixes the following tickets: -
Todo: -
License of the code: MIT
Commits
-------
71d8148 Create CONTRIBUTING.md file for auto-linking in PR's
Discussion
----------
Create CONTRIBUTING.md file for auto-linking in PR's
See: https://github.com/blog/1184-contributing-guidelines
---------------------------------------------------------------------------
by kbond at 2012-09-17T17:35:26Z
@jmikola won the race
---------------------------------------------------------------------------
by stof at 2012-09-17T17:37:35Z
and this should be updated according to the discussion on the dev mailing-list
---------------------------------------------------------------------------
by fabpot at 2012-09-17T17:42:28Z
Instead of duplicating the information, I would just linked to the documentation.
---------------------------------------------------------------------------
by jmikola at 2012-09-17T18:42:29Z
I reduced the file to the "Contributing" block from the readme.
---------------------------------------------------------------------------
by lsmith77 at 2012-09-17T19:36:36Z
+1
Commits
-------
de6658b [Profiler]Use the abstract method to get client IP
Discussion
----------
[Profiler]Use the abstract method to get client IP
---------------------------------------------------------------------------
by armetiz at 2012-09-17T13:37:19Z
This PR is also done for master branch : https://github.com/symfony/symfony/pull/5527
Commits
-------
05f7f78 Fixed the phpdoc in the DependencyInjection component
Discussion
----------
Fixed the phpdoc in the DependencyInjection component
I was sick of having a warning in my IDE each time I used DefinitionDecorator because of an invalid phpdoc in the constructor, so I took some time and fixed it in the whole DI component.
---------------------------------------------------------------------------
by stof at 2012-09-07T23:09:04Z
The travis failure is unrelated. It is all about some intl failures.
---------------------------------------------------------------------------
by eventhorizonpl at 2012-09-07T23:37:04Z
Reviewed-by: Michal Piotrowski <michal@eventhorizon.pl>
---------------------------------------------------------------------------
by pborreli at 2012-09-08T01:42:26Z
👍
Commits
-------
f694615 [Process] fix ProcessTest::testProcessPipes hangs on Windows on branch 2.0
Discussion
----------
[Process] fix ProcessTest::testProcessPipes hangs on Windows on branch 2.0
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5343
Todo: -
License of the code: MIT
Documentation PR:
Marked the test as skipped on Windows, exactly as it is done on master branch (kind of backport)
---------------------------------------------------------------------------
by pborreli at 2012-08-25T20:06:58Z
👍
Commits
-------
9beffff [HttpKernel] KernelTest::testGetRootDir fails on Windows for branch 2.0
Discussion
----------
[HttpKernel] fix KernelTest::testGetRootDir fails on Windows for branch 2.0
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #5341
Todo: -
License of the code: MIT
Documentation PR:
replace
$this->assertEquals(DIR, $kernel->getRootDir());
with
$this->assertEquals(DIR, realpath($kernel->getRootDir()));
line 287
---------------------------------------------------------------------------
by pborreli at 2012-08-25T20:23:34Z
👍
Commits
-------
e49afde Update monolog compatibility
832f8dd Add support for Monolog 1.2.0
Discussion
----------
Add support for Monolog 1.2.0
It's BC just in case someone still uses an older monolog version
---------------------------------------------------------------------------
by stloyd at 2012-08-19T07:20:24Z
IMO you should update `composer.json` too.
---------------------------------------------------------------------------
by Seldaek at 2012-08-19T07:36:51Z
1.* is still ok I think. Obviously the latest version is better, and if you update composer will pick the latest, but I don't think we need to force people to upgrade if there is no BC break.
---------------------------------------------------------------------------
by stloyd at 2012-08-19T07:46:31Z
But adding support for version `1.2` without changing `composer.json` which actually is: `>=1.0,<1.2-dev` is useless IMO.
---------------------------------------------------------------------------
by Seldaek at 2012-08-19T07:50:16Z
Where do you see `>=1.0,<1.2-dev`?
---------------------------------------------------------------------------
by stloyd at 2012-08-19T07:55:36Z
Here, in `2.0` branch: https://github.com/symfony/symfony/blob/2.0/composer.json#L21
---------------------------------------------------------------------------
by Seldaek at 2012-08-19T07:58:28Z
Ok fixed.. Everywhere else in the master branch it is required with `1.*` so I didn't get what you meant :)
Commits
-------
1a4a4ee [DependencyInjection] Fixed a frozen constructor of a container with no parameters
2a124bc [DependencyInjection] Added a test for a frozen constructor of a container with no parameters
Discussion
----------
[DependencyInjection] Fix PHP Dumper for a constructor of a frozen container with no parameters
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets:
Todo: -
License of the code: MIT
---------------------------------------------------------------------------
by travisbot at 2012-08-06T16:51:20Z
This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2049206) (merged 1a4a4ee9 into 3d32a0bc).
Commits
-------
c51fc10 avoid fatal error on invalid session
Discussion
----------
[Security] avoid fatal error on invalid session
If the session has something instead of a token there will be a fatal error when `$this->refreshUser($token)` is called because the argument on that method is strictly typed.
```
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 travisbot at 2012-08-07T18:35:47Z
This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2059743) (merged c51fc105 into 3d32a0bc).
Commits
-------
b3cf36a [Config] Missing type argument passed to loader.
Discussion
----------
[Config] Missing type argument passed to loader.
In FileLoader the $type is not passed to the child loader.
Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT
---------------------------------------------------------------------------
by travisbot at 2012-08-06T14:22:30Z
This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2047982) (merged b3cf36af into 89dce2df).
Commits
-------
55a0b34 Fixes incorrect class used in src/Symfony/Bundle/FrameworkBundle/Console/Application.php
79c547f [FrameworkBundle] added test for fix broken command registration
Discussion
----------
[FrameworkBundle] fix broken command registration
fixed#5168, #5166
---------------------------------------------------------------------------
by travisbot at 2012-08-03T11:35:29Z
This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2027699) (merged 39e964b8 into fee3f4e1).
---------------------------------------------------------------------------
by travisbot at 2012-08-03T11:45:14Z
This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2027761) (merged 55a0b347 into fee3f4e1).
---------------------------------------------------------------------------
by xeross at 2012-08-03T11:45:45Z
Duplicate of #5166
---------------------------------------------------------------------------
by Burgov at 2012-08-03T11:47:54Z
@xeross that PR was opened on master instead of 2.0
---------------------------------------------------------------------------
by xeross at 2012-08-03T11:48:49Z
@Burgov Ah sorry, I got confused and thought this was another dupe
Issue must be related to commit 7a5f614240 (merged 2.0), specifically this file src/Symfony/Bundle/FrameworkBundle/Console/Application.php, lines 86-88.
Presumably to do "instanceof Bundle" correct class has to be imported at the top of the file:
instead of
use Symfony\Component\HttpKernel\Bundle;
this should be
use Symfony\Component\HttpKernel\Bundle\Bundle;
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Console/Application.php
Commits
-------
a0709fc [DoctrineBridge] Fix log of non utf8 data
Discussion
----------
Doctrine logger - fix logging of binary data
fix#5115
---------------------------------------------------------------------------
by travisbot at 2012-08-01T11:21:07Z
This pull request [fails](http://travis-ci.org/symfony/symfony/builds/2008862) (merged a0709fc3 into 1da896dc).
---------------------------------------------------------------------------
by stof at 2012-08-01T11:54:45Z
I see a way to fix it in a far better way: instead of json_encoding the parameters and appending them to the SQL, we could pass them as context to the logger (the optional second argument) as Monolog already handles normalizing the context (and in a better way silencing the error).
Btw, this would also make the log message better for rich logger as they would receive the array (for instance, the FirephpHandler is able to send the context as an array instead of a string as firebug is able to dump arrays)
---------------------------------------------------------------------------
by vicb at 2012-08-01T12:19:06Z
@stof you're right that would be much better. What about keeping this fix for 2.0 and use your suggestion for 2.1 (as the public `log` method prototype would change (to take the context as argument) ?
---------------------------------------------------------------------------
by stof at 2012-08-01T12:21:09Z
@vicb as the method is public, it need to be done in 2.1 only indeed. The next question being "why is it public ?" :)
---------------------------------------------------------------------------
by fabpot at 2012-08-03T07:47:39Z
So, what's the next step?
---------------------------------------------------------------------------
by vicb at 2012-08-03T07:48:38Z
I think this should be merged in 2.0 and then 2.1 should be updated with the suggestion from @stof
---------------------------------------------------------------------------
by fabpot at 2012-08-03T07:54:16Z
Can you provide a PR for 2.1 so that I merge both at the same time?
