Commit Graph

11975 Commits

Author SHA1 Message Date
Fabien Potencier
02e9b19f29 merged branch fabpot/cookies (PR #7879)
This PR was merged into the 2.1 branch.

Discussion
----------

[BrowserKit] fixed BC break done recently

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

This PR tries to avoid a BC break that was introduced recently in the management of cookies (see #7738).

see fabpot/Silex#684

Commits
-------

25b8b84 [BrowserKit] fixed BC break done recently
2013-04-30 09:12:45 +02:00
Fabien Potencier
25b8b84f65 [BrowserKit] fixed BC break done recently 2013-04-29 22:22:06 +02:00
Fabien Potencier
372a76a453 merged branch romainneutron/termsig (PR #7865)
This PR was merged into the 2.1 branch.

Discussion
----------

[Process] Fix #5594 : `termsig` must be used instead of `stopsig` in exceptions when a process is signaled

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #5594
| License       | MIT

When a process is signaled, an exception is thrown saying `The process has been signaled with signal "0".`. This is wrong because "0" is not a signal.

This is actually a bug in `Process` because we retrieve the `stopsig` property of the process status whereas we should retrieve the `termsig`.

`stopsig` should be retrieved in case the process has been stopped, and `termsig` when it has been signaled, see [PHP documentation](http://www.php.net/manual/en/function.proc-get-status.php).

Commits
-------

8757ad4 [Process] Fix #5594 : `termsig` must be used instead of `stopsig` in exceptions when a process is signaled
2013-04-29 09:14:50 +02:00
Romain Neutron
8757ad45a8 [Process] Fix #5594 : termsig must be used instead of stopsig in exceptions when a process is signaled 2013-04-27 20:40:50 +02:00
Fabien Potencier
9abcf4f81b merged branch alexpods/patch-1 (PR #7837)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7837).

Discussion
----------

Rename misprint property (from warmer to finder)

Commits
-------

a1f5bd5 Rename misprint property (from warmer to finder)
2013-04-25 12:13:02 +02:00
alexpods
b3135254dd Rename misprint property (from warmer to finder) 2013-04-25 12:13:02 +02:00
Fabien Potencier
f10364a07e merged branch fabpot/moved_validator_4 (PR #7784)
This PR was merged into the 2.1 branch.

Discussion
----------

Add This field is missing RU translation

This PR was submitted on the symfony/Validator read-only repository and moved automatically to the main Symfony repository (closes symfony/Validator#4).

<source>This field is missing.</source>
Have no translation. Not exists in EN version too. Just forgot? 
Symfony\Component\Validator\Constraints\Collection()
public $missingFieldsMessage = 'This field is missing.';

Commits
-------

97c4291 Add This field is missing RU translation
2013-04-22 08:34:44 +02:00
Maksim Muruev
97c4291452 Add This field is missing RU translation
<source>This field is missing.</source>
Have no translation. Not exists in EN version too. Just forgotten? 
Symfony\Component\Validator\Constraints\Collection()
public $missingFieldsMessage = 'This field is missing.';
2013-04-22 08:33:45 +02:00
Fabien Potencier
76b67a1356 added missing license blocks 2013-04-22 06:28:40 +02:00
Fabien Potencier
743a15439d merged branch pborreli/patch-9 (PR #7770)
This PR was merged into the 2.1 branch.

Discussion
----------

Removed trailing whitespace

Commits
-------

20d6fd8 Removed trailing whitespace
2013-04-21 16:27:47 +02:00
Pascal Borreli
20d6fd8987 Removed trailing whitespace 2013-04-21 14:22:56 +00:00
Fabien Potencier
f9603a6fa8 merged branch kgilden/trans_et (PR #7769)
This PR was merged into the 2.1 branch.

Discussion
----------

[Validator] added missing estonian translation of messages

| Q             | A
| ------------- | ---
| Fixed tickets | -
| License       | MIT

Commits
-------

efff50a [Validator] added missing estonian translation of messages
2013-04-21 16:13:54 +02:00
Kristen Gilden
efff50ae69 [Validator] added missing estonian translation of messages 2013-04-21 16:56:15 +03:00
Fabien Potencier
69deaa7bc7 merged branch fabpot/moved_filesystem_3 (PR #7752)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7752).

Discussion
----------

Filesystem::touch() not working with different owners (utime/atime issue)

This PR was submitted on the symfony/Filesystem read-only repository and moved automatically to the main Symfony repository (closes symfony/Filesystem#3).

Case: I have 2 users, www-data and myself. I have a command script that makes a lock file in /var/lock/.../ something. This command is called from a post request by FOS and ran in the background.  Whever one of the 2 methods (web/cli manually) is used, the other user won't have permissions to use the Filesystem::touch(). The reason this won't work is the second parameter.

What touch() does:
$touch param: The touch time. If time is not supplied, the current system time is used.
$atime param: If present, the access time of the given filename is set to the value of atime. Otherwise, it is set to the value passed to the time parameter. If neither are present, the current system time is used.

So the current code is basically copying this. However, if the second parameter is null it is still present and will cause the same problem. Note that all files and folders related are set to 0777 and have the owner of www-data. I'm accessing them under my own account here:

Interactive shell

php > var_dump(touch('/var/lock/tripolis/ontw/dev/2140191804.lock', null));
PHP Warning:  touch(): Utime failed: Operation not permitted in php shell code on line 1

Warning: touch(): Utime failed: Operation not permitted in php shell code on line 1
bool(false)
php > var_dump(touch('/var/lock/tripolis/ontw/dev/2140191804.lock'));
bool(true)

If I were to pass it without second parameter, let it be time() or null (Filesystem uses time() by default if not present), it DOES work. However, Filesystem::touch() ALWAYS gives a parameter to touch. This parameter is exactly the same value as what the function itself would do in php. Let it be that in my case there is an issue with the atime. I'm not exactly sure how it works but it's not tracked or usable in my case. Because parameter 2 exists, parameter 3 is set. Parameter 3 is not allowed and therefore causes Filesystem::touch() to throw an exception.

Commits
-------

e3a0fe6 Filesystem::touch() not working with different owners (utime/atime issue)
2013-04-21 09:19:24 +02:00
Iltar van der Berg
06e21fff03 Filesystem::touch() not working with different owners (utime/atime issue) 2013-04-21 09:19:24 +02:00
Fabien Potencier
499c9e6fdc merged branch fabpot/cookie (PR #7738)
This PR was merged into the 2.1 branch.

Discussion
----------

[BrowserKit] fixed detection of secure cookies received over https

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7666, #7738
| License       | MIT
| Doc PR        | N/A

As reported in symfony/symfony#7666, BrowserKit's cookie handling only recognises a secure cookie if the cookie option is set and the cookie was set over an https request. The client was not passing the url into the cookiejar update code, causing Cookie::isSecure() to always return false for every cookie.

I have corrected this behaviour and added an additional unit test to prove the bug and fix.

Commits
-------

36d057b [HttpFoundation][BrowserKit] fixed path when converting a cookie to a string
c884151 [BrowserKit] removed dead code
495d0e3 [HttpFoundation] fixed empty domain= in Cookie::__toString()
c2bc707 fixed detection of secure cookies received over https
2013-04-20 20:17:49 +02:00
Fabien Potencier
36d057b69e [HttpFoundation][BrowserKit] fixed path when converting a cookie to a string
An empty path has a different meaning than a /; it means that the path
is the one from the current URI.
2013-04-20 20:05:01 +02:00
Fabien Potencier
c884151e16 [BrowserKit] removed dead code 2013-04-20 20:04:45 +02:00
Fabien Potencier
495d0e366e [HttpFoundation] fixed empty domain= in Cookie::__toString() 2013-04-20 19:50:53 +02:00
Andrew Coulton
c2bc707a4d fixed detection of secure cookies received over https
BrowserKit's cookie handling only recognises a secure cookie if the
cookie option is set and the cookie was set over an https request.
The client was not passing the url into the cookiejar update code,
causing Cookie::isSecure() to always return false for every cookie.

Fixes symfony/symfony#7666
2013-04-20 18:48:52 +02:00
Fabien Potencier
1454af7235 merged branch bendavies/iis-rewrite-subrequests (PR #7606)
This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] fixes creation of sub requests under IIS & Rewite Module

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6936, #6923
| License       | MIT
| Doc PR        | N/A

There are a few bugs to address.

1. `HTTP_X_ORIGINAL_URL` wasn't removed from the server parameters, so is picked back up [here](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpFoundation/ServerBag.php#L33) upon recreation of a sub request.
2. When `X_ORIGINAL_URL` is passed in the headers by IIS, `IIS_WasUrlRewritten` and `UNENCODED_URL` can also be passed as server vars, so they must also be removed for sub request URI's to be resolved correctly.

Additionally, I have removed the OS check for windows, because it was only done for 2 out of 4 of the IIS specific checks, and it made the code untestable.

Also added tests for all scenarios as there were none.

Commits
-------

9fcd2f6 [HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS
2013-04-20 14:53:27 +02:00
Fabien Potencier
4c4a0c4ef1 [Translation] removed an uneeded class property 2013-04-20 10:25:59 +02:00
Fabien Potencier
ad4624cd04 [Translation] removed unneeded getter/setter 2013-04-20 09:44:39 +02:00
Fabien Potencier
8792575795 merged branch benjaminpaap/bugfixes/xliff_encoding (PR #7698)
This PR was squashed before being merged into the 2.1 branch (closes #7698).

Discussion
----------

[Translator] added additional conversion for encodings other than utf-8

Added an additional conversion if there is another encoding in the
xlf file present. Values from simple_xml are always utf-8 encoded.
Also added some tests to verify this new behaviour.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

54bcf5c [Translator] added additional conversion for encodings other than utf-8
2013-04-20 09:34:01 +02:00
Benjamin Paap
54bcf5c697 [Translator] added additional conversion for encodings other than utf-8 2013-04-20 09:34:00 +02:00
Fabien Potencier
a8915ff5c8 merged branch tgabi333/2.1 (PR #7699)
This PR was merged into the 2.1 branch.

Discussion
----------

[DependencyInjection] Fix a DI circular reference recognition bug

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | no
| Fixed tickets |
| License       | MIT
| Doc PR        |

plus add ability to detect deeper circular references eg: A -> B -> C -> B

Commits
-------

8a434ed fix a DI circular reference recognition bug
2013-04-19 08:18:27 +02:00
Tóth Gábor
8a434edd2c fix a DI circular reference recognition bug 2013-04-18 15:53:00 +02:00
Fabien Potencier
8be013d8fb merged branch fabpot/inactive-scope-fix (PR #7696)
This PR was merged into the 2.1 branch.

Discussion
----------

[DependencyInjection] fixed wrong exception class

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

22bf965 [DependencyInjection] fixed wrong exception class
2013-04-17 14:11:36 +02:00
Fabien Potencier
22bf96561e [DependencyInjection] fixed wrong exception class 2013-04-17 14:10:55 +02:00
Fabien Potencier
580b249310 merged branch uwej711/fix_locale_is_overridden_2_1 (PR #7686)
This PR was merged into the 2.1 branch.

Discussion
----------

[HttpKernel] fix overwriting of request's locale if attribute _locale is missing

In addition to https://github.com/symfony/symfony/pull/7516 same change for the 2.1 branch, see comments on https://github.com/lunetics/LocaleBundle/pull/59

Commits
-------

da156d3 fix overwriting of request's locale if attribute _locale is missing
2013-04-17 07:38:53 +02:00
Fabien Potencier
41fef9310a merged branch jmikola/2.2-fix/gh7689 (PR #7690)
This PR was submitted for the 2.2 branch but it was merged into the 2.1 branch instead (closes #7690).

Discussion
----------

[Console] Fix default value handling for multi-value options

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7689
| License       | MIT

The default value for array options will be an array, so it is not suitable to use as the default when processing one of many values for a multi-value option. Using null seems appropriate here, as it indicates the absence of a value and also converts nicely to an empty string (as opposed to an empty array).

Commits
-------

a9c28ff [Console] Fix default value handling for multi-value options
2013-04-17 07:12:51 +02:00
Jeremy Mikola
5abf887180 Fix default value handling for multi-value options
The default value for array options will be an array, so it is not suitable to use as the default when processing one of many values for a multi-value option. Using null seems appropriate here, as it indicates the absence of a value and also converts nicely to an empty string (as opposed to an empty array).

Fixes #7689
2013-04-17 07:12:51 +02:00
Uwe Jäger
da156d3f94 fix overwriting of request's locale if attribute _locale is missing 2013-04-16 21:35:51 +02:00
Fabien Potencier
324686cf25 merged branch 1ed/token-length (PR #7665)
This PR was merged into the 2.1 branch.

Discussion
----------

[WebProfilerBundle] made token shorter in WDT

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

The length of the profiler token was increased by [this](b9cdb9a26d
) commit. This PR makes the visible token shorter.

Before:
![before](https://f.cloud.github.com/assets/162986/376901/338b9684-a461-11e2-9806-fc77d5ce5039.png)
After:
![after](https://f.cloud.github.com/assets/162986/376902/338ee078-a461-11e2-88c8-78748739565c.png)

Commits
-------

1adbe3c [HttpKernel] truncate profiler token to 6 chars (see #7665)
2013-04-14 20:15:16 +02:00
Gábor Egyed
1adbe3cad6 [HttpKernel] truncate profiler token to 6 chars (see #7665) 2013-04-13 20:20:36 +02:00
Fabien Potencier
ef0cebfaa6 merged branch stof/fix_travis_5_5 (PR #7663)
This PR was merged into the 2.1 branch.

Discussion
----------

Disabled APC on Travis for PHP 5.5+ as it is not available

As APC is not available, PHP triggers a warning when trying to load the extension, which lead to many test failures.

Commits
-------

6084176 Disabled APC on Travis for PHP 5.5+ as it is not available
2013-04-13 16:47:44 +02:00
Christophe Coevoet
60841766db Disabled APC on Travis for PHP 5.5+ as it is not available 2013-04-13 16:35:03 +02:00
Fabien Potencier
ff56a9e8a3 merged branch Tobion/apache-pathinfo (PR #7656)
This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] do not use server variable PATH_INFO

because it is already decoded (see http://www.ietf.org/rfc/rfc3875) and thus symfony is fragile to double encoding of the path. This is not really a security issue (in contrast to a [previous problem](http://symfony.com/blog/security-release-symfony-2-0-20-and-2-1-5-released)) but when using the apacherequest, one could access pages with double encoded characters although the path should not match.

BC break: no
tests pass: yes

Commits
-------

d552e4c [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
2013-04-12 17:12:59 +02:00
Tobias Schultze
d552e4c396 [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path 2013-04-12 17:03:10 +02:00
Fabien Potencier
c8889c2c73 merged branch pvolok/fix-7274 (PR #7641)
This PR was merged into the 2.1 branch.

Discussion
----------

[2.2][Yaml] Fixed resolving blank values

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7274
| License       | MIT
| Doc PR        | -

Also, Seldaek suggested to rename the $notEOF variable.

Commits
-------

fb686d8 [Yaml] improved boolean naming ($notEOF -> !$EOF)
047212a [Yaml] fixed handling an empty value
2013-04-12 12:34:18 +02:00
Pavel Volokitin
fb686d83de [Yaml] improved boolean naming ($notEOF -> !$EOF) 2013-04-12 16:27:36 +06:00
Pavel Volokitin
047212a439 [Yaml] fixed handling an empty value 2013-04-12 16:19:23 +06:00
Fabien Potencier
0d32445414 merged branch MaxVandervelde/fix/namespaced-parameter-issue (PR #7586)
This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7564
| License       | MIT
| Doc PR        | N/A

Fixed a bug in NamespacedAttributeBag causing a result to be falsely found when
the last key of the attribute matched the last of the queried name regardless of
if the key did not exist in the search.
Added Tests to demonstrate the issue and resolved by setting keys to null when
iterating through query and returning proper responses in the case that the
given array does in fact not exist.

Commits
-------

0f0c29c [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
2013-04-12 08:49:49 +02:00
Fabien Potencier
de275b5ba9 merged branch Aitboudad/ticket__7335 (PR #7635)
This PR was merged into the 2.1 branch.

Discussion
----------

[Routing][XML Loader] Add a possibility to set a default value to null

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/7335
| License       | MIT

Example:

    <route id="acme_user_show" pattern="/{id}">
        <default key="_controller">AcmeUserBundle:User:show</default>
        <default key="id" xsi:nil="true" />
    </route>

Commits
-------

94a9cdc [Routing][XML Loader] Add a possibility to set a default value to null
2013-04-12 08:26:26 +02:00
Fabien Potencier
65ee3233a8 merged branch kibao/datetime-rfc3339-transformer (PR #7618)
This PR was merged into the 2.1 branch.

Discussion
----------

[Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation

Handle _Exception_ throwed by DateTime constructor if an invalid date is passed.
Then throws proper transformation exception.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

7fc429f [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
2013-04-12 08:22:59 +02:00
Abdellatif Ait boudad
94a9cdc473 [Routing][XML Loader] Add a possibility to set a default value to null 2013-04-11 23:37:28 +00:00
Fabien Potencier
fb83589661 merged branch Tatsh/master (PR #7624)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7624).

Discussion
----------

[FrameworkBundle] RegisterKernelListenersPass: Removed and replaced use of deprecated preg_match() /e modifier with regards to PHP 5.5

More information: https://wiki.php.net/rfc/remove_preg_replace_eval_modifier

As of beta 2 of PHP 5.5, the above is implemented. Attempting to run the current version of Symfony FrameworkBundle (or 2.1) will cause an `ErrorException`.

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

Commits
-------

c1e98b9 The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback()
2013-04-11 08:41:27 +02:00
Andrew Udvare
b22d2ff925 The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback() 2013-04-11 08:41:26 +02:00
Maxwell Vandervelde
0f0c29c9bf [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
Fixed a bug in NamespacedAttributeBag causing a result to be falsely found when
the last key of the attribute matched the last of the queried name regardless of
if the key did not exist in the search.
Added Tests to demonstrate the issue and resolved by setting keys to null when
iterating through query and returning proper responses in the case that the
given array does in fact not exist.

* Updated Syntax of null checks
* Fixing missing else case for if statement in write context
2013-04-10 09:17:16 -05:00
Przemysław Piechota
7fc429ffd0 [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation 2013-04-09 23:29:54 +02:00