Commit Graph

7647 Commits

Author SHA1 Message Date
Christoph
b2614aa7e6 fixed CS 2012-10-06 14:46:45 +02:00
Christoph
e7c2e90069 added doc comments 2012-10-06 06:39:50 +02:00
Fabien Potencier
65dd6e0ab3 merged branch drak/docb (PR #5672)
This PR was merged into the 2.0 branch.

Commits
-------

22c7a91 [HttpKernel][Translator] Fixed type-hints

Discussion
----------

[HttpKernel][Translator] Fixed type-hints

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 drak at 2012-10-04T15:18:55Z

This PR is ready - the travis build fail is not related to this PR which is just docblock changes.

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

by pborreli at 2012-10-04T15:37:57Z

the travis build fail is indeed not related to your PR but your branch. see https://github.com/drak/symfony/blob/docb/.travis.yml

You should fetch upstream remote, merge, rebase and push again.

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

by drak at 2012-10-04T16:50:28Z

Thanks for the info, but the branch is 100% up to date with `2.0`, the file you quoted is as it is in the main repo: https://github.com/symfony/symfony/blob/2.0/.travis.yml - in any case, it doesnt affect merging this changeset.
2012-10-05 18:42:32 +02:00
Drak
22c7a910b8 [HttpKernel][Translator] Fixed type-hints 2012-10-04 16:11:30 +01:00
Fabien Potencier
f90882927b merged branch kerihenare/ticket_5611 (PR #5612)
This PR was merged into the 2.0 branch.

Commits
-------

6c59fbd [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.

Discussion
----------

[HttpFoundation] Request::splitHttpAcceptHeader incorrect result order.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: 5611

Makes items with equal q-values return in the original provided order. Fixes tests to reflect this behavior.

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

by kerihenare at 2012-10-02T20:59:11Z

To avoid confusion over the modified language test I have instead created new tests.
2012-10-03 16:08:54 +02:00
Fabien Potencier
a6ae6f6ec3 [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/Translation#1) 2012-10-03 12:03:29 +02:00
Keri Henare
6c59fbdb59 [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order.
* Makes items with equal q-values return in the original provided order.
* Fixes tests to reflect this behavior
2012-10-03 09:31:34 +13:00
Fabien Potencier
302c0e4647 merged branch benja-M-1/hotfix-response (PR #5633)
This PR was squashed before being merged into the 2.0 branch (closes #5633).

Commits
-------

5c60a65 [2.0][http-foundation] Update phpdoc
c17462f [2.0][http-foundation] Fix response getDate method

Discussion
----------

[2.0][http-foundation] Fix Response::getDate method

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
License of the code: MIT

Reference #5588, #5629
2012-09-30 16:03:58 +02:00
Benjamin Grandfond
1a53b121aa [2.0][http-foundation] Fix Response::getDate method 2012-09-30 16:03:57 +02:00
Fabien Potencier
5984dee719 merged branch sasezaki/ZF-4491 (PR #5222)
This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #5222).

Commits
-------

60cd7c0 [HttpFoundation] Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842

Discussion
----------

[HttpFoundation] Support the new Microsoft URL Rewrite Module for IIS 7.0

@see http://framework.zend.com/issues/browse/ZF-4491
@see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842
feel free, merge this or not.

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

by stloyd at 2012-08-09T09:41:18Z

Also this PR should be made against `2.0` branch.

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

by fabpot at 2012-09-18T17:24:26Z

@sasezaki Can you open a PR for the 2.0 branch? Thanks.
2012-09-28 21:25:17 +02:00
sasezaki
7444cb9725 Support the new Microsoft URL Rewrite Module for IIS 7.0. @see http://framework.zend.com/issues/browse/ZF-4491 @see http://framework.zend.com/code/revision.php?repname=Zend+Framework&rev=24842 2012-09-28 21:25:17 +02:00
Fabien Potencier
33abe78e6c merged branch h4ck3rm1k3/Undefined_Security_Http_Firewall_ContextListener3 (PR #5622)
This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #5622).

Commits
-------

538f8c7 fixed undefined variable

Discussion
----------

Undefined security http firewall context listener3

Updated minimal patch,
First patch from static code analysis, $value should be $token I guess. please check.

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

by h4ck3rm1k3 at 2012-09-27T18:00:18Z

I have reverted the admin, i could create a new branch if needed. you can just cherrypick 	 e9bb5a8 that would be easier.

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

by h4ck3rm1k3 at 2012-09-27T18:29:36Z

I squashed it down to one commit. thanks for your patience and help.
2012-09-28 21:09:10 +02:00
James Michael DuPont
b3d06dda44 fixed undefined variable 2012-09-28 21:09:10 +02:00
Fabien Potencier
be00e3204f merged branch h4ck3rm1k3/hasColorSupportFix (PR #5624)
This PR was submitted on branch master but was merged on branch 2.0 instead (closes #5624).

Commits
-------

05eaebf hasColorSupport does not take an argument

Discussion
----------

hasColorSupport does not take an argument

removed the uneeded argument. trivial patch.
2012-09-28 16:21:46 +02:00
James Michael DuPont
ad95364b21 hasColorSupport does not take an argument 2012-09-28 16:21:46 +02:00
Fabien Potencier
91699d8fd7 merged branch adrienbrault/patch-3 (PR #5572)
Commits
-------

34ca3de Improve FilterResponseEvent docblocks Response ref

Discussion
----------

Improve FilterResponseEvent docblocks Response ref

The type hinting wasn't working in PHPStorm.
2012-09-21 10:49:18 +02:00
Adrien Brault
34ca3de4f2 Improve FilterResponseEvent docblocks Response ref
The type hinting wasn't working in PHPStorm.
2012-09-21 11:33:41 +03:00
Fabien Potencier
2ceebdcaba fixed stringification of array objects in RequestDataCollector (closes #5295) 2012-09-21 08:32:55 +02:00
Fabien Potencier
5bfecef595 merged branch richardmiller/fixing_config_docblock (PR #5542)
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
2012-09-19 05:44:42 +02:00
Richard Miller
1402b42228 Fixing config normalisation example in docblock 2012-09-18 21:29:16 +01:00
Fabien Potencier
d62f492529 merged branch jmikola/2.0-contributing-file (PR #5533)
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
2012-09-17 22:33:03 +02:00
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