Commit Graph

11479 Commits

Author SHA1 Message Date
Tobias Schultze
5c317b77e8 [Console] fix and refactor exit code handling 2013-05-17 23:54:02 +02:00
Dmitrii Chekaliuk
1469953df4 [CssSelector] Fix :nth-last-child() translation 2013-05-17 03:31:34 +03:00
Dmitrii Chekaliuk
91b84903b7 Fix Crawler::children() to not trigger a notice for childless node 2013-05-16 03:06:15 +03:00
Lukas Kahwe Smith
6d2135b65c force the Content-Type to html in the web profiler controllers 2013-05-15 19:16:40 +02:00
Fabien Potencier
70ea5a61c5 Merge branch '2.1' into 2.2
* 2.1:
  Fixed XML syntax.
  Fixed parsing of leading blank lines in folded scalars. Closes #7989.
  Added a test case for Loader::import().
  Fixed Loader import
  [Console] Added dedicated testcase for HelperSet class
2013-05-10 20:08:31 +02:00
Fabien Potencier
a00abf6cda fixed CS 2013-05-10 18:49:00 +02:00
Andreas Forsblom
0a4837dee2 Fixed XML syntax. 2013-05-10 19:13:09 +03:00
Erin Millard
a5441b2d57 Fixed parsing of leading blank lines in folded scalars. Closes #7989. 2013-05-10 10:09:46 +10:00
Jakub Zalas
ef87ba7913 [Form] Fixed a method name.
1858b96b7d introduced a mocked context and therefore getExecutionContext() is now called getMockExectionContext().
2013-05-10 00:02:36 +01:00
Jakub Zalas
c93b9f72e5 Added a test case for Loader::import(). 2013-05-09 17:22:40 +02:00
Myke79
e8d5d16a13 Fixed Loader import 2013-05-09 17:22:40 +02:00
Stefan Warman
37af7714af [Console] Added dedicated testcase for HelperSet class 2013-05-09 10:10:50 +02:00
Fabien Potencier
e3187590c0 [Serializer] fixed CS (refs #7971) 2013-05-08 10:39:40 +02:00
Lin Clark
60edc58325 Fixed fatal error in normalize/denormalizeObject. 2013-05-08 10:37:01 +02:00
WouterJ
1788c6bd32 Fixed 2 namespaces 2013-05-07 18:20:13 +02:00
Fabien Potencier
66433c5626 Merge branch '2.1' into 2.2
* 2.1:
  bumped Symfony version to 2.1.11-DEV
  updated VERSION for 2.1.10
  update CONTRIBUTORS for 2.1.10
  updated CHANGELOG for 2.1.10
  fixed CS
  [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
  [Filesystem] Fix regression introduced in 10dea948

Conflicts:
	src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/HttpKernel/Profiler/RedisProfilerStorage.php
	src/Symfony/Component/Routing/Tests/Loader/XmlFileLoaderTest.php
2013-05-06 22:02:13 +02:00
Fabien Potencier
17a214a1c7 bumped Symfony version to 2.1.11-DEV 2013-05-06 21:45:53 +02:00
Fabien Potencier
7cced0a0e8 updated VERSION for 2.1.10 2013-05-06 13:01:51 +02:00
Fabien Potencier
9f522de0d5 fixed CS 2013-05-06 12:48:41 +02:00
Fabien Potencier
de98954016 merged branch stloyd/bugfix/process_tests (PR #7947)
This PR was merged into the 2.1 branch.

Discussion
----------

[Process] Cleanup tests & prevent assertion that kills randomly Travis-CI

Commits
-------

05b987f [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
2013-05-06 12:36:22 +02:00
Joseph Bielawski
05b987f381 [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI 2013-05-06 12:21:56 +02:00
Joseph Bielawski
e4913f8f04 [Filesystem] Fix regression introduced in 10dea948 2013-05-06 12:06:16 +02:00
Fabien Potencier
b9bc5b4770 Merge branch '2.1' into 2.2
* 2.1:
  added additional tests to cover invalid argument exceptions in OutputFormatterStyle component
  added a missing check for the provider key
  [Validator] fixed wrong URL for XSD
  [Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions
  [Form] Fixed: String validation groups are never interpreted as callbacks
  if the repository method returns an array ensure that it's internal poin...
  Fix wrong method in findTaggedServiceIds(), add example to docblock.

Conflicts:
	src/Symfony/Bridge/Doctrine/Form/DataTransformer/CollectionToArrayTransformer.php
	src/Symfony/Component/Form/Extension/Core/DataTransformer/DataTransformerChain.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ArrayToPartsTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoiceToValueTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ChoicesToValuesTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToArrayTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/DateTimeToRfc3339TransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformerTest.php
	src/Symfony/Component/Form/Tests/Extension/Core/DataTransformer/ValueToDuplicatesTransformerTest.php
2013-05-06 10:37:50 +02:00
Stefan Warman
7deb923236 added additional tests to cover invalid argument exceptions in OutputFormatterStyle component 2013-05-06 08:31:43 +02:00
Fabien Potencier
5b7e1e6f68 added a missing check for the provider key 2013-05-05 18:38:27 +02:00
Fabien Potencier
b0e3ea5f5f [Validator] fixed wrong URL for XSD 2013-05-04 10:54:37 +02:00
Bernhard Schussek
59b78c7c16 [Validator] Fixed: $traverse and $deep is passed to the visitor from Validator::validate() 2013-05-03 15:20:58 +02:00
Fabien Potencier
0a8c2ddd4b merged branch bschussek/issue7558 (PR #7917)
This PR was merged into the 2.1 branch.

Discussion
----------

[Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions

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

Commits
-------

bcb5400 [Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions
2013-05-03 13:10:52 +02:00
Fabien Potencier
1510faa96a merged branch bschussek/issue7371 (PR #7918)
This PR was merged into the 2.1 branch.

Discussion
----------

[Form] Fixed: String validation groups are never interpreted as callbacks

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

Commits
-------

7b2ebbf [Form] Fixed: String validation groups are never interpreted as callbacks
2013-05-03 13:08:49 +02:00
Bernhard Schussek
bcb540021a [Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions 2013-05-03 12:15:17 +02:00
Bernhard Schussek
7b2ebbfa41 [Form] Fixed: String validation groups are never interpreted as callbacks 2013-05-03 12:12:06 +02:00
Fabien Potencier
795e828140 merged branch xabbuh/issue6651 (PR #7906)
This PR was squashed before being merged into the 2.1 branch (closes #7906).

Discussion
----------

if the repository method returns an array ensure that it's internal poin...

...ter is resetted

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

Commits
-------

0610750 if the repository method returns an array ensure that it's internal poin...
2013-05-03 10:59:56 +02:00
Christian Flothmann
0610750378 if the repository method returns an array ensure that it's internal poin... 2013-05-03 10:59:56 +02:00
Bernhard Schussek
dcced01fd5 [Form] Improved multi-byte handling of NumberToLocalizedStringTransformer 2013-05-03 08:56:21 +02:00
Benjamin Eberlei
cfebe47000 Fix wrong method in findTaggedServiceIds(), add example to docblock. 2013-05-03 07:08:13 +02:00
Fabien Potencier
9f02b05997 Merge branch '2.1' into 2.2
* 2.1:
  remove validation related headers when needed
  use while loop for iterating
  [Filesystem] copy() is not working when open_basedir is set

Conflicts:
	src/Symfony/Component/HttpKernel/Profiler/FileProfilerStorage.php
2013-05-01 09:15:36 +02:00
Fabien Potencier
609df321aa [Swiftmailer] bumped allowed versions 2013-05-01 09:13:20 +02:00
Bilal Amarni
2b554d77fa remove validation related headers when needed 2013-05-01 06:14:15 +02:00
Henrik Bjørnskov
fbe039bfca use while loop for iterating
The other method limits the number of results without taking the
constraints into account.

Fixes GH-7883
2013-05-01 05:56:28 +02:00
Fabien Potencier
ca4fb5530e merged branch stloyd/patch-3 (PR #7869)
This PR was merged into the 2.1 branch.

Discussion
----------

[Filesystem] copy() is not working when open_basedir is set

More details: https://bugs.php.net/bug.php?id=64634

Commits
-------

10dea94 [Filesystem] copy() is not working when open_basedir is set
2013-04-30 19:08:19 +02:00
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
Joseph Bielawski
10dea948f3 [Filesystem] copy() is not working when open_basedir is set
More details: https://bugs.php.net/bug.php?id=64634
2013-04-28 18:43:05 +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
alexpods
b3135254dd Rename misprint property (from warmer to finder) 2013-04-25 12:13:02 +02: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
Michel Weimerskirch
9e49bc83a5 Re-added context information to log list
Fixes #7679
2013-04-23 09:56:11 +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
Pavel Volokitin
f1632266e4 fixed output of bag values
Call json_encode with flags: JSON_UNESCAPED_SLASHES and
JSON_UNESCAPED_UNICODE
2013-04-12 14:36:58 +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
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
Rénald Casagraude
383a84b807 fixed handling of "0" input on ask 2013-04-11 07:30:49 +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
Fabien Potencier
c8bd45b2c7 merged branch denvned/getClientIp-fix (PR #7472)
This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] getClientIp is fixed.

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

The getClientIp now returns ip of the earliest server in a proxy chain when all the servers in the chain are trusted proxies. Before this patch the getClientIp used to return null at such condition.
Some appropriate tests are added.

Commits
-------

c4da2d9 [HttpFoundation] getClientIp is fixed.
2013-04-09 18:02:56 +02:00
janschoenherr
df22326664 Update PhpEngine.php
just a minor phpdoc fix
2013-04-09 16:11:33 +02:00
Ben Davies
9fcd2f6005 [HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS 2013-04-09 09:37:01 +01:00
Fabien Potencier
5ce53b434a merged branch lyrixx/path-10 (PR #7597)
This PR was merged into the 2.2 branch.

Discussion
----------

[Security] Removed unused var

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | I guess
| Fixed tickets | -

Commits
-------

bd26419 [Security] Removed unused var
2013-04-08 16:57:30 +02:00
Fran Moreno
6ef92fd4e8 [PropertyAccess] Add objectives to pluralMap 2013-04-08 00:02:49 +02:00
Fabien Potencier
2965a52d20 Merge branch '2.1' into 2.2
* 2.1:
  [HttpKernel] tweaked previous merge
  #7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
  Fix autocompletion of command names when namespaces conflict
  Fix timeout in Process::stop method
  fixed CS
  Round stream_select fifth argument up.
  Fix Process timeout

Conflicts:
	src/Symfony/Component/Process/Process.php
	src/Symfony/Component/Process/ProcessBuilder.php
2013-04-07 22:19:55 +02:00
Fabien Potencier
689653f51d merged branch uwej711/fix_locale_is_overridden (PR #7516)
This PR was merged into the 2.2 branch.

Discussion
----------

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

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

Commits
-------

e8cae94 fix overwriting of request's locale if attribute _locale is missing
2013-04-07 19:31:06 +02:00
Samuel Gordalina
8a9e898c9a Fix finding ACLs from ObjectIdentity's with different types 2013-04-07 18:31:20 +02:00
Fabien Potencier
b11b0f7f26 merged branch caponica/HttpKernelExtension_phpdoc_fix (PR #7573)
This PR was merged into the 2.2 branch.

Discussion
----------

[Symfony\Bridge\Twig\Extension] fixed two methods' documentation blocks

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

Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)

Commits
-------

2ea5eaa Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string)
2013-04-07 18:29:31 +02:00
Fabien Potencier
12b7073607 [HttpKernel] tweaked previous merge 2013-04-07 17:51:54 +02:00
Roland Franssen
a3826ab4f4 #7531: [HttpKernel][Config] FileLocator adds NULL as global resource path 2013-04-07 17:48:35 +02:00
Jordi Boggiano
9d71ebe8e2 Fix autocompletion of command names when namespaces conflict 2013-04-07 16:54:11 +02:00
Fabien Potencier
ebbb96ee46 merged branch romainneutron/process-timeout (PR #7580)
This PR was merged into the 2.1 branch.

Discussion
----------

[2.1][Process] Fix timeout in Process::stop method

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

- The timeout is ten times more than set.
- The timeout does not occurs, it is actually blocking until the process dies.

Commits
-------

bec8ff1 Fix timeout in Process::stop method
2013-04-07 16:41:36 +02:00
Romain Neutron
bec8ff16e8 Fix timeout in Process::stop method
- The timeout is ten times more than set.
 - The timeout does not occurs, it is actually blocking until the process dies.
2013-04-07 16:17:09 +02:00
Fabien Potencier
783ae3adff fixed CS 2013-04-07 16:10:23 +02:00
Romain Neutron
bf4a9b083c Round stream_select fifth argument up.
- This argument must be an integer
- An argument equal to 0 should be avoided as it consumes too much CPU time
2013-04-07 14:38:17 +02:00
Romain Neutron
3780fdb214 Fix Process timeout 2013-04-07 14:29:57 +02:00
Jordi Boggiano
99256e44a0 [HttpKernel] Remove args from 5.3 stack traces to avoid filling log files, fixes #7259 2013-04-07 13:10:22 +02:00
Fabien Potencier
6c114ca8c4 bumped Symfony version to 2.2.2-DEV 2013-04-06 15:17:40 +02:00
Fabien Potencier
8d0cb78fbf updated VERSION for 2.2.1 2013-04-06 12:16:33 +02:00
Fabien Potencier
9a7c56788e Merge branch '2.1' into 2.2
* 2.1:
  [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
  [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562)
  [WebProfilerBundle] removed next pointer class in a template
2013-04-06 12:15:43 +02:00
Christian Morgan
2ea5eaadc6 Fixed phpdoc blocks to show that $uri can be passed as a string or ControllerReference (rather than just as a string) 2013-04-05 22:29:42 +01:00
Fabien Potencier
7221d25fc4 merged branch phc/2.1 (PR #7569)
This PR was merged into the 2.1 branch.

Discussion
----------

[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag

| Q             | A
| ------------- | ---
| Bug fix?      | [no]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | [no]
| Tests pass?   | [yes] I assume : only changed a comment word
| License       | MIT

Commits
-------

815eb61 [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
2013-04-05 15:22:11 +02:00
phc
815eb6144c [HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag 2013-04-05 14:59:25 +02:00
Fabien Potencier
375ded4227 [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562) 2013-04-05 08:39:48 +02:00
Bilal Amarni
b0ba9fd712 [WebProfilerBundle] removed next pointer class in a template 2013-04-02 11:25:27 +03:00
Fabien Potencier
50822015a6 fixed doc references (closes #7515) 2013-04-01 10:06:05 +02:00
Fabien Potencier
ab1ab7ac18 merge branch '2.1' into 2.2
* 2.1:
  fixed doc references (closes #7515)
  small changes
  [SecurityBundle] Fixed configuration exemple
  idAsIndex should be true with a smallint or bigint id field.
  Fixed long multibyte parameter logging in DbalLogger:startQuery
  Keep the file extension in the temporary copy and test that it exists (closes #7482)
  [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation

Conflicts:
	src/Symfony/Component/Validator/Resources/translations/validators.ja.xlf
2013-04-01 10:05:23 +02:00
Fabien Potencier
e602b19b3c fixed doc references (closes #7515) 2013-04-01 10:04:03 +02:00
Fabien Potencier
bf7daa11e7 merged branch sterrien/patch-4 (PR #7519)
This PR was merged into the 2.1 branch.

Discussion
----------

[Form] [Doctrine] [EntityChoiceList] idAsIndex should be true with a smallint id field.

When the id of an entity is a smallint, $this->idAsIndex should also be true.
It was not the case.

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

Commits
-------

673fd9b  idAsIndex should be true with a smallint or bigint id field.
2013-04-01 10:01:59 +02:00
Fabien Potencier
e57b4e5bc4 merged branch lyrixx/fix-security-config (PR #7528)
This PR was merged into the 2.1 branch.

Discussion
----------

[2.1][SecurityBundle] Fixed configuration exemple

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

Commits
-------

2c7a99b [SecurityBundle] Fixed configuration exemple
2013-04-01 10:00:34 +02:00
Fabien Potencier
c65b482a69 merged branch TerjeBr/persistent-token-provider (PR #7534)
This PR was merged into the 2.2 branch.

Discussion
----------

[Security/Http/RememberMe] PersistentTokenBasedRememberMeServices bugfix

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

The database and debug layer cannot handle raw random strings. It may contain invalid ut8 characters and whatnot. So, in order to avoid a lot of database bugs, we must base64_encode the random strings.

Commits
-------

751abe1 Doctrine cannot handle bare random non-utf8 strings
2013-04-01 09:55:23 +02:00
Matthias Pigulla
43a818e830 On OS X, sys_get_tmp_dir() returns /var/private/..., which really is below /private/var. 2013-04-01 09:51:50 +02:00
Terje Bråten
751abe10d5 Doctrine cannot handle bare random non-utf8 strings 2013-03-31 22:30:03 +02:00
Bilal Amarni
766e880a9d small changes 2013-03-31 20:13:07 +02:00
Grégoire Pineau
2c7a99b679 [SecurityBundle] Fixed configuration exemple
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
2013-03-30 23:16:49 +01:00
Simon Terrien
673fd9bc27 idAsIndex should be true with a smallint or bigint id field. 2013-03-29 10:20:11 +01:00
Uwe Jäger
e8cae94758 fix overwriting of request's locale if attribute _locale is missing 2013-03-28 23:37:30 +01:00
Grégoire Pineau
bd264195e1 [Security] Removed unused var 2013-03-28 18:41:24 +01:00
Jeremy Mikola
8aaa6ef0a2 [PropertyAccess] Remove trailing periods from doc blocks
Periods were left in place for entries with multiple sentences/statements.
2013-03-28 11:37:15 -04:00
Jeremy Mikola
d78fec9098 Fix param docs for PropertyAccessor read method 2013-03-28 11:37:10 -04:00
Peter Buri
64a1d3999a Fixed long multibyte parameter logging in DbalLogger:startQuery 2013-03-27 19:41:01 +01:00
thewilkybarkid
4cf06c1560 Keep the file extension in the temporary copy and test that it exists (closes #7482) 2013-03-27 18:13:16 +01:00
Fabien Potencier
b898b13061 merged branch 77web/validator-translation-ja (PR #7478)
This PR was merged into the 2.1 branch.

Discussion
----------

[Validator] [translation] updated Japanese translation for Validator component

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

I will also update translations for new messages available after 2.2 once this request is merged.

Commits
-------

987aded [Validator][translation][japanese]replaced period to japanese one [Validator][translation][japanese]fixed japanese translation to more practical one [Validator][translation][japanese]fixed message ordering to be consistent with other languages [Validator][translation][japanese]added new validation messages in japanese translation
2013-03-26 15:51:15 +01:00
Fabien Potencier
aaf4f12ad9 Merge branch '2.1' into 2.2
* 2.1:
  bumped Symfony version to 2.1.10-DEV
  updated VERSION for 2.1.9
  update CONTRIBUTORS for 2.1.9
  updated CHANGELOG for 2.1.9
  [FrameworkBundle] Reuse definition variable in FormPass

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-03-26 15:39:23 +01:00