Commit Graph

7626 Commits

Author SHA1 Message Date
Jeremy Mikola 71d8148ad6 Create CONTRIBUTING.md file for auto-linking in PR's
See: https://github.com/blog/1184-contributing-guidelines
2012-09-17 14:40:53 -04:00
Fabien Potencier 8e759076f0 merged branch armetiz/patch-7 (PR #5530)
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
2012-09-17 19:11:29 +02:00
Thomas Tourlourat de6658b902 [Profiler]Use the abstract method to get client IP 2012-09-17 16:33:21 +03:00
Fabien Potencier 87065dc0ba merged branch besnikb/2.0 (PR #5482)
Commits
-------

3648abe =Minor chnage: replaced function by method

Discussion
----------

=Minor chnage: replaced function by method
2012-09-11 09:00:20 +02:00
Besnik Br 3648abea9b =Minor chnage: replaced function by method 2012-09-10 20:40:01 +02:00
Fabien Potencier 2e7e296fec merged branch stof/fix_phpdoc (PR #5467)
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

👍
2012-09-08 13:19:38 +02:00
Christophe Coevoet 05f7f78332 Fixed the phpdoc in the DependencyInjection component 2012-09-08 00:56:45 +02:00
Jonathan Ingram a094f7e2a5 Add check to Store::unlock to ensure file exists
Fix indentation and shorten code
2012-08-29 16:45:40 +10:00
Fabien Potencier 462f93ad12 bumped Symfony version to 2.0.18-DEV 2012-08-28 10:43:15 +02:00
Fabien Potencier 348babccba updated VERSION for 2.0.17 2012-08-28 09:05:44 +02:00
Fabien Potencier 9e54d6c8dd updated CHANGELOG for 2.0.17 2012-08-28 09:03:49 +02:00
Fabien Potencier e333865618 updated vendors for 2.0.17 2012-08-28 09:03:46 +02:00
Fabien Potencier 5bf4f92e86 fixed XML decoding attack vector through external entities 2012-08-28 08:43:14 +02:00
Fabien Potencier 4e0c99211d prevents injection of malicious doc types 2012-08-28 08:43:14 +02:00
Fabien Potencier 47fe725bd4 disabled network access when loading XML documents 2012-08-28 08:43:14 +02:00
Fabien Potencier c896d71594 refined previous commit 2012-08-28 08:43:14 +02:00
Johannes M. Schmitt a2a6cdca8d prevents injection of malicious doc types 2012-08-28 08:43:14 +02:00
Fabien Potencier 865461d204 standardized the way we handle XML errors 2012-08-28 08:43:14 +02:00
Thorsten Hallwas 352e8f583c Redirects are now absolute
According to w3c locations need to be absolute:
http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.30
2012-08-28 08:40:05 +02:00
Fabien Potencier 9a355e995a [HttpKernel] excluded a test on PHP 5.3.16, which is buggy (PHP, not Symfony ;)) 2012-08-26 11:23:03 +02:00
Fabien Potencier 04c46ebd33 merged branch bdmu/ticket_5343 (PR #5344)
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

👍
2012-08-26 11:09:43 +02:00
Fabien Potencier 71f3081188 merged branch bdmu/ticket_5341 (PR #5342)
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

👍
2012-08-26 11:07:01 +02:00
Christophe L f694615bc5 [Process] fix ProcessTest::testProcessPipes hangs on Windows on branch 2.0 2012-08-25 23:29:32 +04:00
Christophe L 9beffff263 [HttpKernel] KernelTest::testGetRootDir fails on Windows for branch 2.0 2012-08-25 22:46:45 +04:00
Fabien Potencier 07d108af5e merged branch Seldaek/monologbridge (PR #5297)
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 :)
2012-08-19 11:00:16 +02:00
Jordi Boggiano e49afde2ee Update monolog compatibility 2012-08-19 09:57:44 +02:00
Jordi Boggiano 832f8dd4fe Add support for Monolog 1.2.0 2012-08-18 19:58:03 +02:00
Fabien Potencier ee572b34cf merged branch hidenorigoto/fix-di-phpdumper (PR #5194)
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).
2012-08-10 12:39:41 +02:00
Fabien Potencier f6040587b2 merged branch kriswallsmith/graceful-invalid-session (PR #5210)
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).
2012-08-10 12:35:34 +02:00
Kris Wallsmith c51fc105f4 avoid fatal error on invalid session 2012-08-07 14:21:04 -04:00
hidenorigoto 1a4a4ee93c [DependencyInjection] Fixed a frozen constructor of a container with no parameters 2012-08-07 01:03:17 +09:00
hidenorigoto 2a124bc89c [DependencyInjection] Added a test for a frozen constructor of a container with no parameters 2012-08-07 01:03:17 +09:00
Fabien Potencier 3d32a0bcc2 merged branch beberlei/ConfigFileLoaderTypeMissing (PR #5193)
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).
2012-08-06 16:50:56 +02:00
Benjamin Eberlei b3cf36af9e [Config] Missing type argument passed to loader.
In FileLoader the $type is not passed to the child loader.
2012-08-06 16:02:40 +02:00
Fabien Potencier 89dce2df51 merged branch SamsonIT/fix_broken_command_registration (PR #5169)
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
2012-08-03 14:43:49 +02:00
Fabien Potencier 982545350b merged branch lsmith77/container_builder_cosmetics (PR #5165)
Commits
-------

4563397 corrected phpdoc

Discussion
----------

corrected phpdoc

---------------------------------------------------------------------------

by travisbot at 2012-08-03T09:37:07Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2026993) (merged 4563397c into fee3f4e1).
2012-08-03 14:40:59 +02:00
smokeybear87 55a0b347a0 Fixes incorrect class used in src/Symfony/Bundle/FrameworkBundle/Console/Application.php
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
2012-08-03 13:33:57 +02:00
Bart van den Burg 79c547f09c [FrameworkBundle] added test for fix broken command registration 2012-08-03 13:33:31 +02:00
lsmith77 4563397c0a corrected phpdoc 2012-08-03 11:27:08 +02:00
Fabien Potencier fee3f4e1ef merged branch vicb/doctrine_logger (PR #5139)
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?
2012-08-03 10:46:13 +02:00
Fabien Potencier 089feb7c96 merged branch lsmith77/container_builder_cosmetics (PR #5163)
Commits
-------

3605c54 removed unused private property
d4a78a2 fix phpdoc statement of getAlias()

Discussion
----------

Container builder cosmetics

---------------------------------------------------------------------------

by travisbot at 2012-08-03T08:39:00Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2026569) (merged 3605c54f into 13c60bde).
2012-08-03 10:44:24 +02:00
lsmith77 3605c54f9d removed unused private property 2012-08-03 10:28:23 +02:00
lsmith77 d4a78a21de fix phpdoc statement of getAlias() 2012-08-03 10:28:07 +02:00
Fabien Potencier 13c60bdeaf merged branch henrikbjorn/2.0 (PR #5137)
Commits
-------

0b78fdf Only call registerCommand on bundles that is an instance of Bundle

Discussion
----------

Only call registerCommand on bundles that is an instance of Bundle

Fixes GH-5133

---------------------------------------------------------------------------

by travisbot at 2012-08-01T09:41:05Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/2008252) (merged 0b78fdff into 1da896dc).

---------------------------------------------------------------------------

by henrikbjorn at 2012-08-01T10:05:00Z

Build failed because of HTTP request error.

---------------------------------------------------------------------------

by lsmith77 at 2012-08-01T11:31:08Z

wondering if it would be good if you could include the commit from #5133 in this PR .. then we get the test and the fix at once.
2012-08-03 10:19:10 +02:00
Fabien Potencier bb57e54320 merged branch web-dev/bundle-interface-command-fatal-error (PR #5133)
Commits
-------

30bcb57 Added a test case to demonstrate the fatal error occuring when a Bundle implementing BundleInterface only is registered in the kernel.

Discussion
----------

Fatal error in FrameworkBundle console application

A fatal error is generated in the `FrameworkBundle` console application when a bundle is added implementing [`BundleInterface`](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/Bundle/BundleInterface.php)

This is because the method `registerCommands` does not exist on this interface and is instead only defined on the concrete [`Bundle`](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/Bundle/Bundle.php#L173) implementation.

The workaround for this issue is simple - implement an empty method for `registerCommands` in the bundle implementation so that the fatal error is not triggered.

However this issue should probably be fixed by either restricting bundles to the Bundle class or expanding the `BundleInterface` to include the `registerCommands` method signature. Both of these fixes will introduce a BC break into the API so I would suggest creating a fix for 2.0 which includes method detection in the `registerCommands` method of the [`Console\Application`](https://github.com/symfony/symfony/blob/master/src/Symfony/Bundle/FrameworkBundle/Console/Application.php#L80) class.

I'm happy to submit the fix for this - however I would like some direction from the SF2 dev team as to which way they would like to resolve this.

The PR currently only contains a unit test that proves this behaviour.

---------------------------------------------------------------------------

by travisbot at 2012-08-01T02:42:55Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/2006350) (merged 30bcb572 into 1da896dc).

---------------------------------------------------------------------------

by henrikbjorn at 2012-08-01T05:50:16Z

I am thinking a instanceof check might be the most reasonable in this case. But in master it should proberly be fixed by adding the method to the interface.

/cc @stof any comments if that is to be done?

---------------------------------------------------------------------------

by stof at 2012-08-01T08:53:02Z

yeah, for 2.0, we cannot change the interface.
2012-08-03 10:18:29 +02:00
Fabien Potencier f5d2187143 merged branch gajdaw/md_format_fix (PR #5160)
Commits
-------

6b0dcbb MD format fix

Discussion
----------

Md format fix

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: -

Small format fixes in CHANGELOG-2.0.md.

---------------------------------------------------------------------------

by travisbot at 2012-08-03T06:23:27Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/2025980) (merged 6b0dcbb7 into 1da896dc).
2012-08-03 09:30:11 +02:00
Włodzimierz Gajda 6b0dcbb730 MD format fix 2012-08-03 08:13:46 +02:00
Victor Berchet a0709fc365 [DoctrineBridge] Fix log of non utf8 data 2012-08-01 13:10:42 +02:00
Henrik Bjørnskov 0b78fdffa4 Only call registerCommand on bundles that is an instance of Bundle
Fixes GH-5133
2012-08-01 11:35:03 +02:00
Josiah Truasheim 30bcb57286 Added a test case to demonstrate the fatal error occuring when a Bundle implementing BundleInterface only is registered in the kernel. 2012-08-01 09:25:05 +07:00