Commit Graph

10053 Commits

Author SHA1 Message Date
Fabien Potencier
fc40e53724 Revert "merged branch jfsimon/issue-4475 (PR #4497)"
This reverts commit f8a09db5e2, reversing
changes made to ae2ec36e27.
2012-06-09 21:38:22 +02:00
Jordi Boggiano
d5ab4c1d71 [Routing] Update changelog 2012-06-09 18:33:17 +02:00
Fabien Potencier
f8a09db5e2 merged branch jfsimon/issue-4475 (PR #4497)
Commits
-------

06976fc Updated upgrade 2.1 file.
110ccd8 [BrowserKit] Updated changelog.
686854b [http kernel] Added client response type test.
ce7e1e6 [browser kit] Client now stores filtered response after request.

Discussion
----------

[browser kit] Client now stores filtered response after request.

Bug fix: yes
Feature addition: no
Backwards compatibility break: yes/no, choice is your
Symfony2 tests pass: yes

`Symfony\Component\HttpKernel\Client::request()` method now returns a `Symfony\Component\BrowserKit\Response` instance.

Fixes issue #4475.

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

by stof at 2012-06-05T08:58:00Z

This *is* as BC break as it changes the class returned by the method, even if the BC break is a bugfix to respect the epxected behavior :)

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

by jfsimon at 2012-06-05T09:05:32Z

@stof you're right!

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

by travisbot at 2012-06-06T15:29:54Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1533533) (merged 686854b2 into 1541fe26).

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

by stof at 2012-06-09T10:12:18Z

@jfsimon can you add a note in the changelog of the component and in the upgrade file ?

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

by jfsimon at 2012-06-09T10:51:00Z

@stof done!

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

by travisbot at 2012-06-09T11:12:43Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1575524) (merged 06976fcd into 1541fe26).

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

by stof at 2012-06-09T12:50:16Z

@fabpot 👍
2012-06-09 17:15:29 +02:00
Fabien Potencier
ae2ec36e27 merged branch henrikbjorn/require-authentication (PR #4525)
Commits
-------

6a01d3d [Security] Check post_only option and request method

Discussion
----------

[Security] Take `post_only` into consideration in requiresAuthentication

Change requiresAuthentication to look at the `post_only` option. Fixes #4524

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

by travisbot at 2012-06-08T18:26:21Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1570033) (merged 6d799494 into b84b46ba).

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

by travisbot at 2012-06-09T11:34:59Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1575681) (merged af676bb5 into b84b46ba).

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

by stof at 2012-06-09T14:01:21Z

@henrikbjorn could you squash the commit, or cherry-pick the third one so that it is the only one ? The reverted commit seems weird in the PR.

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

by henrikbjorn at 2012-06-09T14:18:08Z

@stof there. Actually it cannot be squashed. But maybe what i did was wrong.

``` shell
git reset --hard b84b46ba1a
git cherry-pick af676bb5d01f835b2f9913e129e6c6eb3320dd26
git push -f henrikbjorn require-authentication
```

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

by travisbot at 2012-06-09T14:22:59Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1576658) (merged 6a01d3dd into 3bb7dc0b).

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

by stof at 2012-06-09T14:39:25Z

@fabpot 👍
2012-06-09 17:11:11 +02:00
Fabien Potencier
dedaa82ec4 merged branch greg0ire/position_switching (PR #4533)
Commits
-------

f541a54 [Form] implement force append / prepend

Discussion
----------

implement force append / prepend

See #4494 and #4473

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

by travisbot at 2012-06-09T12:33:07Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1575997) (merged b0ed9b26 into 3bb7dc0b).

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

by stof at 2012-06-09T12:53:29Z

@fabpot 👍 for me.

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

by travisbot at 2012-06-09T12:57:54Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1576150) (merged 5e45b5d3 into 3bb7dc0b).

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

by travisbot at 2012-06-09T13:41:05Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1576322) (merged d51c5437 into 3bb7dc0b).

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

by fabpot at 2012-06-09T14:47:37Z

Can you add a mention in the CHANGELOG please?

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

by greg0ire at 2012-06-09T14:58:25Z

Couldn't find anything relevant to update in the CHANGELOG of the form component, but the UPGRADE file contains something I could update.

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

by travisbot at 2012-06-09T15:06:27Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1576951) (merged 6b45ba66 into 3bb7dc0b).

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

by greg0ire at 2012-06-09T15:06:51Z

Squashed all the commits into one.
2012-06-09 17:08:14 +02:00
Grégoire Paris
f541a54770 [Form] implement force append / prepend 2012-06-09 17:05:41 +02:00
Fabien Potencier
27100ba4eb merged branch jakzal/yamlDoubleQuotesDumperFix (PR #4320)
Commits
-------

b631073 [Yaml] Fixed double quotes escaping in Dumper.

Discussion
----------

[Yaml] Fixed double quotes escaping in Dumper

Issue #4308 is caused by Dumper::escapeWithDoubleQuotes() which uses [str_replace()](http://php.net/str_replace).

From the php docs:

> Because str_replace() replaces left to right, it might replace a previously inserted value when doing multiple replacements.

We should be very careful in deciding about the order of elements in $escapees array. I'd really appreciate if someone reviewed my fix. Tests say I didn't break anything but I'm not sure what percentage of Yaml specification is covered by tests.

Bug fix: yes
Feature addition: no
Backwards compatibility break: not that I know
Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/jakzal/symfony.png?branch=yamlDoubleQuotesDumperFix)](http://travis-ci.org/jakzal/symfony)
Fixes the following tickets: #4308

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

by travisbot at 2012-05-18T08:53:51Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1364279) (merged 5192722c into a04acc89).

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

by travisbot at 2012-05-18T23:19:49Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1371539) (merged ecaa1aab into fc3c609b).

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

by dinamic at 2012-05-19T07:35:21Z

Something is really wrong with this method. You can see clearly that multiple characters would fail proper escaping.

Here's an example:
```
$value = '\\\\"some value\n \"some quoted string\" and \'some single quotes one\'"';
var_dump(Escaper::escapeWithDoubleQuotes($value));
string(72) ""\\\"some value\n \\some quoted string\\ and 'some single quotes one'\"""
```

To begin with the backslash - in the initial value you have 2 (escaped ones), that after escaping should result in 4, not in 1 (escaped). I guess this behavior has to be verified with the importer, but imho it does not seem right.

Does anyone know why this escaping wasn't done using a regular expression in first place?

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

by clemens-tolboom at 2012-05-19T10:18:58Z

Searching for https://duckduckgo.com/?q=what+is+\xc2\x85 the table on http://stackoverflow.com/questions/6609895/efficiently-replace-bad-characters is interesting enough to decide we need way more documentation on this file.

\xc2\x85 seems to be triple dot (ellipses)
\xe2\x80\xa9 seems to be paragraph separator see http://drupal.org/node/914360#comment-3468550
2012-06-09 17:04:17 +02:00
Jordi Boggiano
bbef65e657 [Routing] Add strict_parameters option to disable exceptions when a route generation fails due to an invalid parameter 2012-06-09 16:59:48 +02:00
Fabien Potencier
37678e1715 merged branch paul-matthews/master (PR #4042)
Commits
-------

478227d Fixed quoting issues with Yaml Inline Parser

Discussion
----------

[Yaml] fix parsing quotes problem

Added some basic checking for quotes on their own within strings. Used single quote ' followed by "," and ":" to denote the end of the current string to test.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #4021
Todo: N/A

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

by fabpot at 2012-05-07T09:22:56Z

After doing the requested changes, can you squash your commits? Thanks.

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

by paul-matthews at 2012-05-09T13:29:45Z

Resolved and squashed

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

by travisbot at 2012-05-09T13:30:30Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1285048) (merged 5ce6d4e1 into 6c714095).

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

by travisbot at 2012-05-09T13:31:06Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1285057) (merged 3592fcec into e54f4e46).

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

by travisbot at 2012-05-09T13:33:40Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1285094) (merged e209f786 into e54f4e46).

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

by travisbot at 2012-05-09T13:37:42Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1285153) (merged 0967b513 into e54f4e46).

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

by fabpot at 2012-05-09T14:00:29Z

It looks like that another commit is in your PR that should not be there.

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

by paul-matthews at 2012-05-09T15:52:35Z

Right-o will remove

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

by paul-matthews at 2012-05-09T15:54:15Z

resolved

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

by travisbot at 2012-05-09T15:57:15Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1286339) (merged fc276209 into e66a0bb3).

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

by fabpot at 2012-05-10T05:20:18Z

Apparently, some tests do not pass anymore after the patch. Can you have a look at them? Thanks.

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

by paul-matthews at 2012-05-10T11:20:45Z

Sure - looking into it.

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

by paul-matthews at 2012-05-10T17:55:53Z

I believe that's fixed.

The entire suite works locally now.

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

by travisbot at 2012-05-10T17:55:54Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1297641) (merged 884c02ed into fae4523f).

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

by paul-matthews at 2012-05-10T17:57:03Z

Unsure why travis fails.

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

by travisbot at 2012-05-10T18:00:28Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1297650) (merged 478227d9 into fae4523f).

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

by stof at 2012-06-09T13:24:52Z

@fabpot 👍
2012-06-09 16:40:39 +02:00
Henrik Bjørnskov
6a01d3dd54 [Security] Check post_only option and request method 2012-06-09 16:16:43 +02:00
Jean-François Simon
06976fcd82 Updated upgrade 2.1 file. 2012-06-09 12:40:37 +02:00
Jean-François Simon
110ccd8e71 [BrowserKit] Updated changelog. 2012-06-09 12:37:27 +02:00
Fabien Potencier
3bb7dc0bfa merged branch kriswallsmith/console-visibility (PR #4526)
Commits
-------

d13dce0 [Console] reduced visibility to protected

Discussion
----------

[Console] reduced visibility to protected

This is an internal method and should be cast as such.

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

by travisbot at 2012-06-08T21:27:13Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1571579) (merged d13dce06 into b84b46ba).
2012-06-09 11:53:01 +02:00
Kris Wallsmith
d13dce0636 [Console] reduced visibility to protected 2012-06-08 14:18:51 -07:00
Fabien Potencier
b84b46ba1a [HttpFoundation] added some unit tests (refs #4510) 2012-06-08 16:22:49 +02:00
Fabien Potencier
ab5abf6d6b merged branch rowanmanning/ticket_4516 (PR #4517)
Commits
-------

326991b Reset image styling for the web-profiler toolbar

Discussion
----------

Reset image styling for the web-profiler toolbar

This fixes the issue #4516 by resetting image styling to browser defaults, which is what the toolbar expects.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: n/a
Fixes the following tickets: #4516

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

by travisbot at 2012-06-08T11:34:36Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1565938) (merged 326991bd into f8e68e58).
2012-06-08 14:03:12 +02:00
Rowan Manning
326991bd6e Reset image styling for the web-profiler toolbar
I've had issues with the toolbar where the site styling pushes
the toolbar info below the image. This is often because of global
image styling such as applying `display: block` by default.

This fixes the issue by reseting image styling to browser
defaults, which is what the toolbar expects.
2012-06-08 11:45:18 +01:00
Fabien Potencier
f8e68e58bf merged branch alexandresalome/twig-linter-context (PR #4452)
Commits
-------

df5590e [TwigBundle] Fix return code in LintComand
604a79a [TwigBundle] Fix line start in twig:lint command
91936b5 [TwigBundle] Fancy output for twig:lint

Discussion
----------

[TwigBundle] Fancy output for twig:lint

Previous PR : #3804

@marcw @fabpot Since no exception is raised, the return code is always 0. Do I add ``return rand(64, 113)`` ?

Screenshot : http://twitpic.com/9qql09

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

by travisbot at 2012-05-29T21:18:33Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1470256) (merged 91936b53 into adf07f1e).

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

by travisbot at 2012-05-29T21:21:54Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1470353) (merged 604a79ab into adf07f1e).

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

by fabpot at 2012-05-30T16:45:24Z

@alexandresalome just return 1 in case of a problem.

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

by travisbot at 2012-06-06T20:06:04Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1550631) (merged df5590ec into adf07f1e).
2012-06-08 09:58:39 +02:00
Fabien Potencier
3c8947e3f1 merged branch shiroyuki/master (PR #4481)
Commits
-------

06cc9ff Adjust the width of the timeline in the profiler dynamically when the (browser) window is resized.

Discussion
----------

Adjust the width of the timeline in the profiler dynamically when the (browser) window is resized.

(Rework of [PR 4476](https://github.com/symfony/symfony/pull/4476))

Instead of making the developer to resize the width of the visual presentation of the timeline in the profile manually, this change is to make the profiler adjust the width of the timeline dynamically when the (browser) window is resized.

Also, this change introduce the cleaner HTML/JavaScript code and URL as the result of:

* the removal of 'width' from the query string as the width is now controlled by JavaScript.
the removal of 'threshold' from the query string as the threshold is now passed between pages via HTML5 LocalStorage.
* Please note that at the time of submitting the pull request, GitHub didn't pick up some commits to deal with the trailing white spaces.

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

by travisbot at 2012-06-01T18:30:49Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1501464) (merged 06cc9ff3 into 1541fe26).
2012-06-08 09:55:41 +02:00
Fabien Potencier
2faba01d4f merged branch Ph3nol/ph3-routing-component-fixes (PR #4486)
Commits
-------

a6d32de UrlMatcher class indent and doc fixes

Discussion
----------

[Routing] PHP CS and doc minor fixes

Bug fix: no
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

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

by travisbot at 2012-06-02T12:03:36Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1507232) (merged a6d32de1 into 1541fe26).
2012-06-08 09:46:03 +02:00
Fabien Potencier
15b5aa4f7c merged branch beberlei/GH-4491 (PR #4493)
Commits
-------

4938080 MethodNotImplementedException -> MethodArgumentValueNotImplementedException
789fc14 Accept calling setLenient(false)

Discussion
----------

GH-4491 - Move patch from master to 2.0

A patch in PR-4469 fixed an issue with setLenient() and not having intl. This was only merged into master, although the original issue was created in the 2.0 branch. This PR cherry-picked the patches against 2.0 again.

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

by travisbot at 2012-06-06T15:29:19Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1527145) (merged 49380804 into 9a5e6c90).

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

by kbond at 2012-06-06T17:42:40Z

fixes #4491
2012-06-08 09:44:31 +02:00
Fabien Potencier
29542c162b merged branch jfsimon/issue-4495 (PR #4496)
Commits
-------

5f328de [console] Fixed docblock.
c80e156 [console] Added style stack getter in formatter.
0ae5a45 [console] Removed hardcoded empty style from styles stack.

Discussion
----------

[console] Removed hardcoded style formatter from style stack.

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes

This PR make it possible to replace OutputFormatter again.
Fixes issue #4495.

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

by travisbot at 2012-06-06T15:29:44Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1531654) (merged c80e156f into 1541fe26).

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

by travisbot at 2012-06-06T15:29:53Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1533586) (merged 5f328dee into 1541fe26).
2012-06-08 09:41:22 +02:00
Fabien Potencier
2b767612c5 merged branch raulfraile/patch-3 (PR #4505)
Commits
-------

26d416f Fixed typo in ConstraintValidatorFactoryInterface PHPDoc (2.0)

Discussion
----------

Fixed typo in ConstraintValidatorFactoryInterface PHPDoc: Constrain => Constraint.

Bug fix: yes

Feature addition: no

Backwards compatibility break: no

Symfony2 tests pass: yes

Fixed typo in ConstraintValidatorFactoryInterface PHPDoc: Constrain => Constraint.
Fixes #4503

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

by travisbot at 2012-06-06T15:30:53Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1546330) (merged 26d416fe into 9a5e6c90).
2012-06-08 09:16:24 +02:00
Fabien Potencier
8d41b64e7e merged branch alexandresalome/feat-profiler-view-all (PR #4506)
Commits
-------

4d29c75 [WebProfilerBundle] Add a button "View all" in top of the page

Discussion
----------

[WebProfilerBundle] Add a button "View all" in top of the page

This is a link in the toolbar to search for last queries. This actions is
often achieved and having a link in top of the page to reach the 10 last
queries seems useful.

View on Twitpic: http://twitpic.com/9ti0yx

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

by travisbot at 2012-06-06T20:04:49Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1550622) (merged 4d29c755 into 1541fe26).

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

by nomack84 at 2012-06-06T20:36:10Z

+1
2012-06-08 08:56:13 +02:00
Fabien Potencier
ed4f8097e2 merged branch niklasf/html-safe-json-response (PR #4510)
Commits
-------

5c2fbfa [HttpFoundation] Make JsonResponse HTML safe.

Discussion
----------

[HttpFoundation] Make JsonResponse HTML safe.

After porting Drupal 8 to the HTTP Kernel, we noticed regressions on our JSON responses.

The original issue was http://drupal.org/node/479368. To summarize that:
- Doing the changes in this pull requests is backwarts compatible, because >>As RFC4627-2.5 clearly states that "Any character *may* be escaped", we can avoid special treatment of characters ', ", <, > and & by an HTML parser through simple substitution with a Unicode escape sequence (\uXXXX).<<
- A number of characters MUST be escaped for the JSON parser. These are: ", \, U+0000 - U+001F

Since PHP 5.3 we can simply get RFC compliant safe JSON by passing a few flags to json_encode().

Current issue: http://drupal.org/node/1619446.

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

by travisbot at 2012-06-07T14:49:12Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1558213) (merged 1200e27d into 1541fe26).

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

by sun at 2012-06-07T15:33:44Z

It would be a good idea to add an inline comment to explain what is being done; e.g.:

`// Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML.`

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

by niklasf at 2012-06-07T15:41:24Z

Thanks, @sun. Pushed.

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

by travisbot at 2012-06-07T15:50:25Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1558974) (merged 5c2fbfab into 1541fe26).
2012-06-08 08:54:17 +02:00
Niklas Fiekas
5c2fbfabf6 [HttpFoundation] Make JsonResponse HTML safe. 2012-06-07 17:39:19 +02:00
Niklas Fiekas
2277500835 [Routing][HttpKernel] Add RequestMatcherInterface.
While UrlMatcherInterface is only for matching URLs with routes, add
RequestMatcherInterface, that allows to match against whole requests.
2012-06-07 09:37:25 +02:00
alexandresalome
df5590ec60 [TwigBundle] Fix return code in LintComand 2012-06-06 21:11:24 +02:00
alexandresalome
4d29c7555b [WebProfilerBundle] Add a button "View all" in top of the page
This is a link in the toolbar to search for last queries. This actions is
often achieved and having a link in top of the page to reach the 10 last
queries seems useful.
2012-06-06 21:04:12 +02:00
Raul Fraile
26d416fe51 Fixed typo in ConstraintValidatorFactoryInterface PHPDoc (2.0) 2012-06-06 15:13:50 +03:00
Kris Wallsmith
280fc0578a failing test for HEAD StreamedResponse requests 2012-06-05 22:28:15 -07:00
jeanfrancois.simon
5f328deed4 [console] Fixed docblock. 2012-06-05 10:51:09 +02:00
jeanfrancois.simon
686854b245 [http kernel] Added client response type test. 2012-06-05 10:37:51 +02:00
jeanfrancois.simon
ce7e1e6c9a [browser kit] Client now stores filtered response after request. 2012-06-05 10:37:06 +02:00
Jean-François Simon
c80e156f96 [console] Added style stack getter in formatter. 2012-06-05 05:22:08 +02:00
Jean-François Simon
0ae5a45282 [console] Removed hardcoded empty style from styles stack. 2012-06-05 05:21:33 +02:00
Francesc Rosàs
4938080422 MethodNotImplementedException -> MethodArgumentValueNotImplementedException 2012-06-04 19:15:56 +02:00
Francesc Rosàs
789fc14145 Accept calling setLenient(false) 2012-06-04 19:15:47 +02:00
Ph3nol
a6d32de181 UrlMatcher class indent and doc fixes 2012-06-02 13:54:03 +02:00
Juti Noppornpitak
06cc9ff32d Adjust the width of the timeline in the profiler dynamically when the (browser) window is resized. 2012-06-01 14:12:35 -04:00
Fabien Potencier
1541fe26e4 merged branch bschussek/fix (PR #4478)
Commits
-------

d6e8001 Fixed mistake in UPGRADE file
a1cd8ae [Form] Removed invalid tests introduced again upon merge

Discussion
----------

[Form] Fixed failing tests in master

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

by travisbot at 2012-06-01T06:24:55Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1495799) (merged d6e80012 into e0825289).
2012-06-01 08:37:11 +02:00
Bernhard Schussek
d6e80012b2 Fixed mistake in UPGRADE file 2012-06-01 07:59:14 +02:00
Bernhard Schussek
a1cd8ae5d9 [Form] Removed invalid tests introduced again upon merge 2012-06-01 07:58:58 +02:00
Fabien Potencier
e08252897a Revert "merged branch nomack84/rename_form_methods (PR #4473)"
This reverts commit 136b7868f7, reversing
changes made to 78747e6cc5.
2012-06-01 07:45:48 +02:00
Fabien Potencier
4d46da7d08 merged branch neilferreira/master (PR #4472)
Commits
-------

85db221 Since getClientIp() no longer takes a parameter, removed that old test
7b5328f getClientIp() will now only return valid IP addresses, rather than assuming the X_FORWARDED_FOR is the first comma seperated value.

Discussion
----------

getClientIp() will now only return valid IP addresses, rather than assuming the X_FORWARDED_FOR is the first comma seperated value.

Fixes #4471

I'm not sure why an empty string was being returned in the first place, rather than null.  Any ideas?

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

by travisbot at 2012-05-31T08:59:12Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1485615) (merged 68c17e07 into 78747e6c).

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

by travisbot at 2012-05-31T09:02:57Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1485634) (merged 9c1ba1c4 into 78747e6c).

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

by neilferreira at 2012-05-31T09:04:16Z

Sorted, I'm guessing I need to squash the commits?

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

by travisbot at 2012-05-31T09:21:30Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1485732) (merged 7b5328f1 into 78747e6c).

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

by igorw at 2012-05-31T09:38:07Z

With what value did it fail? Can you add a test case for that `HTTP_X_FORWARDED_FOR ` value?

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

by neilferreira at 2012-05-31T10:45:11Z

Anyone have any idea why that function returns an empty string instead of null ?

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

by neilferreira at 2012-05-31T11:34:12Z

@igorw done, I've also removed an old test that should have been removed when getClientIp() started using the 'trust proxy' variable concept.

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

by travisbot at 2012-05-31T11:38:19Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1486534) (merged 85db2213 into 78747e6c).
2012-05-31 19:36:01 +02:00
Fabien Potencier
136b7868f7 merged branch nomack84/rename_form_methods (PR #4473)
Commits
-------

cbc9944 [Bridge][Form] Rename some deprecated methods

Discussion
----------

[Bridge][Form] Rename some deprecated methods

This pull request is for renaming some deprecated Form's methods from the Bridge namespace.

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

by travisbot at 2012-05-31T12:20:59Z

This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1486874) (merged cbc99442 into 78747e6c).

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

by nomack84 at 2012-05-31T12:27:29Z

The fail is not my fault.
2012-05-31 19:33:07 +02:00
Fabien Potencier
9a5e6c9081 bumped Symfony version to 2.0.16-DEV 2012-05-31 17:18:01 +02:00
nomack84
cbc99442c6 [Bridge][Form] Rename some deprecated methods 2012-05-31 08:09:25 -04:00
Neil Ferreira
85db22130e Since getClientIp() no longer takes a parameter, removed that old test
Added a new test for HTTP_X_FORWARDED_FOR that starts with 'unknown, '
2012-05-31 19:32:31 +08:00
Neil Ferreira
7b5328f1c7 getClientIp() will now only return valid IP addresses, rather than assuming the X_FORWARDED_FOR is the first comma seperated value. 2012-05-31 17:15:39 +08:00