Commit Graph

6928 Commits

Author SHA1 Message Date
Fabien Potencier
01ff0765b2 Merge branch '2.1' into 2.2
* 2.1:
  Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
2013-04-30 19:05:10 +02:00
Philipp Strube
2a531d78be Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https 2013-04-30 19:01:33 +02:00
Fabien Potencier
d1cad7e243 [Translation] fixed a unit test 2013-04-30 11:53:49 +02:00
Fabien Potencier
d29bf50dc8 Merge branch '2.1' into 2.2
* 2.1:
  [BrowserKit] fixed BC break done recently
  [Process] Fix #5594 : `termsig` must be used instead of `stopsig` in exceptions when a process is signaled
  Rename misprint property (from warmer to finder)
  Add This field is missing RU translation

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
2013-04-30 09:15:50 +02:00
Fabien Potencier
25b8b84f65 [BrowserKit] fixed BC break done recently 2013-04-29 22:22:06 +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
Pascal Borreli
be34917448 [Console] find command even if its name is a namespace too (closes #7860) 2013-04-26 22:56:13 +00:00
Andrew Hilobok
3c97004972 Reset all catalogues when adding resource to fallback locale (#7715, #7819)
Slightly refactored testAddResourceAfterTrans()
and replaced costly part with reset all catalogues

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7715, #7819
| License       | MIT
| Doc PR        |
2013-04-24 11:42:33 +02:00
Andrew Hilobok
0fb35a4a83 Added reloading of fallback catalogues when calling addResource() (#7715)
| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #7715
| License       | MIT
| Doc PR        |
2013-04-24 11:42:33 +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
a8af3e2c18 added missing license blocks 2013-04-22 06:29:54 +02:00
Fabien Potencier
f6875287b5 Merge branch '2.1' into 2.2
* 2.1:
  added missing license blocks
2013-04-22 06:28:56 +02:00
Fabien Potencier
76b67a1356 added missing license blocks 2013-04-22 06:28:40 +02:00
Fabien Potencier
c8e3f0fabe Merge branch '2.1' into 2.2
* 2.1:
  Removed trailing whitespace
  [Validator] added missing estonian translation of messages
  Filesystem::touch() not working with different owners (utime/atime issue)

Conflicts:
	src/Symfony/Component/Validator/Resources/translations/validators.et.xlf
2013-04-21 19:39:25 +02:00
Kristen Gilden
633b63bfb3 [Validator] added missing estonian translation of messages 2013-04-21 20:18:20 +03:00
Pascal Borreli
20d6fd8987 Removed trailing whitespace 2013-04-21 14:22:56 +00:00
Kristen Gilden
efff50ae69 [Validator] added missing estonian translation of messages 2013-04-21 16:56:15 +03: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
33d659047c [Translation] fixed a unit test 2013-04-20 22:30:24 +02:00
Fabien Potencier
e81f7925eb Merge branch '2.1' into 2.2
* 2.1:
  [HttpFoundation][BrowserKit] fixed path when converting a cookie to a string
  [BrowserKit] removed dead code
  [HttpFoundation] fixed empty domain= in Cookie::__toString()
  fixed detection of secure cookies received over https
  [Translation] removed an uneeded class property
  [Translation] removed unneeded getter/setter
  [Translator] added additional conversion for encodings other than utf-8
  fix a DI circular reference recognition bug
  [HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS
2013-04-20 21:05:29 +02:00
Fabien Potencier
64ac4d1679 merged branch cordoval/bugfix/7644 (PR #7655)
This PR was squashed before being merged into the 2.2 branch (closes #7655).

Discussion
----------

[Config] #7644 add tests for passing number looking attributes as strings

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

Commits
-------

d98118a [Config] #7644 add tests for passing number looking attributes as strings
2013-04-20 20:42:11 +02:00
Luis Cordova
d98118ac05 [Config] #7644 add tests for passing number looking attributes as strings 2013-04-20 20:42:10 +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
ce7bcddba1 merged branch mweimerskirch/patch-13 (PR #7253)
This PR was squashed before being merged into the 2.2 branch (closes #7253).

Discussion
----------

[2.2] Pass ESI header to subrequests

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

Commits
-------

af819a7 [2.2] Pass ESI header to subrequests
2013-04-20 15:53:43 +02:00
Michel Weimerskirch
af819a7145 [2.2] Pass ESI header to subrequests 2013-04-20 15:53:42 +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
77web
67b5797965 fixed source messages to accept pluralized messages [Validator][translation][japanese] add messages for new validator 2013-04-19 16:20:54 +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
0b4716e3e8 Merge branch '2.1' into 2.2
* 2.1:
  [DependencyInjection] fixed wrong exception class

Conflicts:
	src/Symfony/Component/DependencyInjection/ContainerBuilder.php
2013-04-17 14:12:09 +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
fd58a5f424 Merge branch '2.1' into 2.2
* 2.1:
  Fix default value handling for multi-value options
  [HttpKernel] truncate profiler token to 6 chars (see #7665)
  Disabled APC on Travis for PHP 5.5+ as it is not available
  [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
  [Yaml] improved boolean naming ($notEOF -> !$EOF)
  [Yaml] fixed handling an empty value
  [Routing][XML Loader] Add a possibility to set a default value to null
  The /e modifier for preg_replace() is deprecated in PHP 5.5; replace with preg_replace_callback()
  [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
  [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
  Update PhpEngine.php
  [HttpFoundation] getClientIp is fixed.

Conflicts:
	.travis.yml
	src/Symfony/Component/Routing/Loader/XmlFileLoader.php
	src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
	src/Symfony/Component/Routing/Tests/Fixtures/validpattern.xml
	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
2013-04-17 07:27:14 +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
Gábor Egyed
1adbe3cad6 [HttpKernel] truncate profiler token to 6 chars (see #7665) 2013-04-13 20:20:36 +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
4b967b1fcb merged branch nlegoff/ie_download_over_ssl (PR #7651)
This PR was merged into the 2.2 branch.

Discussion
----------

[HTTPFoundation]  Fix download over SSL using IE < 8 and binary file response

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

related to #7153

Commits
-------

4c51ec7 Fix download over SSL using IE < 8 and binary file response
2013-04-12 16:22:22 +02:00
Nicolas Le Goff
4c51ec7866 Fix download over SSL using IE < 8 and binary file response 2013-04-12 15:45:42 +02:00
Fabien Potencier
96251acbae merged branch Seldaek/consmerge (PR #7650)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Fix merging of application definition

Fixes #7068, replaces #7158 - the fix there introduces a regression and always shows the application arguments in the commands help (i.e. it lists "command" as an argument to every command, except list because it overrides getNativeDefinition).

Commits
-------

46909fa [Console] Fix merging of application definition, fixes #7068, replaces #7158
2013-04-12 15:21:28 +02:00
Jordi Boggiano
46909faff0 [Console] Fix merging of application definition, fixes #7068, replaces #7158 2013-04-12 15:15:07 +02:00
Fabien Potencier
972bde73ce [HttpKernel] fixed the Kernel when the ClassLoader component is not available (closes #7406) 2013-04-12 14:45:07 +02:00