Commit Graph

13623 Commits

Author SHA1 Message Date
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
1b03681045 update CONTRIBUTORS for 2.1.10 2013-05-06 13:01:36 +02:00
Fabien Potencier
4db4e6243d updated CHANGELOG for 2.1.10 2013-05-06 13:00:54 +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
Fabien Potencier
991829ca52 merged branch stloyd/bugfix/fix_regression (PR #7944)
This PR was merged into the 2.1 branch.

Discussion
----------

[Filesystem] Fix regression introduced in 10dea94

This is one of ideas to fix the regression from 10dea948, @kachkaev what do you think?

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature? | no
| Tests pass?  | yes
| Fixed tickets | #7920
| License       | MIT

Commits
-------

e4913f8 [Filesystem] Fix regression introduced in 10dea948
2013-05-06 12:30:15 +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
759293c9f5 merged branch fabpot/missing-provider-key-check (PR #7937)
This PR was merged into the 2.1 branch.

Discussion
----------

added a missing check for the provider key

| 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
-------

5b7e1e6 added a missing check for the provider key
2013-05-05 21:58:37 +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
Fabien Potencier
cf35eb8ccb merged branch bschussek/fix-validator (PR #7919)
This PR was merged into the 2.2 branch.

Discussion
----------

[Validator] Fixed: $traverse and $deep is passed to the visitor from Validator::validate()

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

Commits
-------

59b78c7 [Validator] Fixed: $traverse and $deep is passed to the visitor from Validator::validate()
2013-05-03 16:19:45 +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
e57d87a2f2 merged branch bschussek/issue7609 (PR #7902)
This PR was merged into the 2.2 branch.

Discussion
----------

[Form] Improved multi-byte handling of NumberToLocalizedStringTransformer

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

Commits
-------

dcced01 [Form] Improved multi-byte handling of NumberToLocalizedStringTransformer
2013-05-03 11:03:51 +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
Fabien Potencier
3f5cffec8a merged branch beberlei/TaggedServices (PR #7909)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7909).

Discussion
----------

[DependencyInjection] Fix method use + example in doc block

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

Fixes using a wrong method in ``findTaggedServiceIds`` and adds an example for the usage and showing the returned data structure as ``@return array`` is not very helpful, the datastructure being a bit unintuitive.

Commits
-------

ad2c955 [DependencyInjection] Fix wrong method in findTaggedServiceIds(), add example to docblock.
2013-05-03 07:08:13 +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
Fabien Potencier
030695752b merged branch bamarni/issue-6977 (PR #7857)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7857).

Discussion
----------

[HttpCache] remove validation related headers when needed

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

Fixes #6977 by removing validation related headers when there is at least one embedded response.

I've added an embedded response counter because the current check was wrong I think, it was checking count($this->ttls) which isn't updated for validateable responses.

And for the BC break, looking at the interface PHPDoc description, it supposes add() method should only be applied on esi responses and update() takes the master one at the end, what do you think?

Commits
-------

bb80139 [HttpCache] remove validation related headers when needed
2013-05-01 06:14:15 +02:00
Bilal Amarni
2b554d77fa remove validation related headers when needed 2013-05-01 06:14:15 +02:00
Fabien Potencier
4ab05a35bc merged branch henrikbjorn/filesystem-limit (PR #7886)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7886).

Discussion
----------

[HttpKernel][Profile] Fixes #7883

Commits
-------

0172fc1 [HttpKernel][Profile] use while loop for iterating
2013-05-01 05:56:56 +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
Fabien Potencier
0dacd56ee9 merged branch pst/master (PR #7871)
This PR was submitted for the master branch but it was merged into the 2.1 branch instead (closes #7871).

Discussion
----------

Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https

[HttpFoundation] fixed something

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

Ensure that the getPort() method returns port 443 as default when
X-FORWARDED-PROTO is set to https. Currently it would return port 80
if X-FORWARDED-PROTO was set to https and X-FORWARDED-PORT was not
set by the trusted proxy.

Commits
-------

8554af3 Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
2013-04-30 19:03:37 +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
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
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
Fabien Potencier
b4b4326a10 merged branch pborreli/bug-7860 (PR #7863)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] is not ambiguous anymore if it has a perfect match command name (closes #7860)

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

Commits
-------

be34917 [Console] find command even if its name is a namespace too (closes #7860)
2013-04-27 09:33:31 +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
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
609b5ff08c merged branch hilobok/ticket_7715 (PR #7819)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7819).

Discussion
----------

[Translator] 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        |

Commits
-------

4f0b063 [Translator] Reset all catalogues when adding resource to fallback locale (#7715, #7819)
5544f36 [Translator] Added reloading of fallback catalogues when calling addResource() (#7715)
2013-04-24 11:42:33 +02:00