Commit Graph

13685 Commits

Author SHA1 Message Date
Fabien Potencier 9538efaf40 merged branch lyrixx/php55 (PR #8559)
This PR was merged into the 2.2 branch.

Discussion
----------

[Tests] Tests on php 5.5 should pass

Because php 5.5 is stable now

Commits
-------

0086ee3 [Tests] Tests on php 5.5 should pass
2013-07-24 15:01:08 +02:00
Grégoire Pineau 0086ee392b [Tests] Tests on php 5.5 should pass
Because php 5.5 is stable now
2013-07-24 14:55:10 +02:00
Fabien Potencier ea01eeb3b0 merged branch fabpot/twig-engine-exists (PR #8547)
This PR was merged into the 2.2 branch.

Discussion
----------

[Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #8546)

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

Commits
-------

ae7fa11 [Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #88546)
2013-07-23 16:07:56 +02:00
Fabien Potencier ae7fa11c91 [Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #88546) 2013-07-23 14:30:22 +02:00
Fabien Potencier a67c137278 merged branch venu/ticket_8351#2.2 (PR #8421)
This PR was squashed before being merged into the 2.2 branch (closes #8421).

Discussion
----------

[Validator] fixed ConstraintViolation::$propertyPath incorrect when nested

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

In nested constraints, the property path will be overwritten in the context (as there would be a recursive call to CollectionValidotor when nested). Reason is, in ConstraintValidatorFactory object is loaded from memory if exists and context is initialized with the new context. So, other constraints after the nested constraints PropertyPath would be wrong.

So I think better create a new object for CollectionValidator always.

see this https://gist.github.com/alexkappa/5851274
It shows [name][email] even though the email is not under the name node.

Commits
-------

28e0709 [Validator] fixed ConstraintViolation:: incorrect when nested
2013-07-21 22:10:38 +02:00
Venu 28e070974a [Validator] fixed ConstraintViolation:: incorrect when nested 2013-07-21 22:10:37 +02:00
Fabien Potencier 441857b67d merged branch xabbuh/issue7575 (PR #7930)
This PR was submitted for the 2.1 branch but it was merged into the 2.2 branch instead (closes #7930).

Discussion
----------

handle Optional and Required constraints from XML or YAML sources correc...

...tly

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

Commits
-------

a93a23a handle Optional and Required constraints from XML or YAML sources correctly
2013-07-21 21:45:38 +02:00
Christian Flothmann 890934d33d handle Optional and Required constraints from XML or YAML sources correctly 2013-07-21 21:45:37 +02:00
Fabien Potencier 810cf3f332 merged branch venu/groups_argument_fix (PR #8422)
This PR was merged into the 2.2 branch.

Discussion
----------

[Validator] Fixed groups argument misplace for validateValue method from validator class

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

Signature of validateValue method in ExecutionContext Class is this.
```
public function validateValue($value, $constraints, $subPath = '', $groups = null)
```

But this was called wrongly in Validator Class.

Commits
-------

d3eb9b7 [Validator] Fixed groups argument misplace for validateValue method from validator class
2013-07-21 21:21:34 +02:00
Fabien Potencier 776b463e20 merged branch Powerhamster/missing-comments (PR #8453)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8453).

Discussion
----------

added missing comments to WebTestCase

Added comments that are required for autocompletion when extending WebTestCase.

Commits
-------

d056e6b added missing comments to WebTestCase
2013-07-21 14:18:54 +02:00
Thomas Rothe 9852b92da9 added missing comments to WebTestCase 2013-07-21 14:18:53 +02:00
Fabien Potencier c1e4bb8353 merged branch patrickallaert/issue-8455 (PR #8456)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8456).

Discussion
----------

[Process] Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary

Since `PHP_BINARY` is the very first approach considered, there is no way to use a workaround like setting the `PHP_PATH`.

Checking `PHP_PATH` could potentially be put before checking `PHP_BINARY`: that would avoid an extra function call (and system call), at the price of a small BC_BREAK, but I think it's better in this case to have a solution that doesn't force people to set the `PHP_PATH` environment variable.

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

Commits
-------

35a2fe4 [Process] Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary
2013-07-21 14:15:26 +02:00
Patrick Allaert a2eca45051 Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary 2013-07-21 14:15:26 +02:00
Fabien Potencier d8b42aa750 merged branch GromNaN/dic-camelize (PR #8536)
This PR was merged into the 2.2 branch.

Discussion
----------

[DependencyInjection] Fix Container::camelize to convert beginning and ending . and _

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

I'm using strtr to make the conversion in order to ensure that the behavior is the same as `Container::get`.

From the test cases I've added, the following were not passing:

Commits
-------

485d53a [DependencyInjection] Fix Container::camelize to convert beginning and ending chars
2013-07-21 14:07:55 +02:00
Jérôme Tamarelle 485d53aead [DependencyInjection] Fix Container::camelize to convert beginning and ending chars
To convert a service ID exactly like Container::get
2013-07-21 11:38:59 +02:00
Fabien Potencier 4970770d9c merged branch GromNaN/di-dump-exception (PR #8494)
This PR was merged into the 2.2 branch.

Discussion
----------

[DependencyInjection] Add exception for service name not dumpable in PHP

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

Throws an exception when the DIC is dumped to PHP, before generating invalid PHP.
The regex comes from the PHP doc: http://www.php.net/manual/en/language.oop5.basic.php

Commits
-------

242b318 [DependencyInjection] Add exception for service name not dumpable in PHP
2013-07-20 09:33:16 +02:00
Fabien Potencier c3d7eb967c merged branch alcaeus/ticket_8226 (PR #8528)
This PR was merged into the 2.2 branch.

Discussion
----------

[Security] fixed issue where x509 authentication clears unrelated tokens

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8226
| License       | MIT
| Doc PR        | symfony/symfony-docs#2825
| Notes          | Replaces PR #8283

TODO:
- [x] Feedback on change to make sure security is not affected
- [x] Fix other authentication listeners (they suffer the same problem)
- [x] Write unit tests for bug and maybe a few listener classes as well

This pull request is the summary of the problem mentioned in the ticket above.
It only fixes the "disappearing token" problem for one authentication provider, not all. If acceptable, the change needs to be applied to all authentication listeners since they always clear all tokens from the security context.

Commits
-------

2317443 [Security] fixed issue where authentication listeners clear unrelated tokens
2013-07-20 08:54:49 +02:00
Fabien Potencier 75bf7a1a28 merged branch ianfp/ticket_8529 (PR #8531)
This PR was merged into the 2.2 branch.

Discussion
----------

[PropertyAccess] added moves to pluralMap

Fixes https://github.com/symfony/symfony/issues/8529

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

Commits
-------

d6cafcd [PropertyAccess] added moves to pluralMap
2013-07-20 08:51:20 +02:00
Ian Phillips d6cafcd63c [PropertyAccess] added moves to pluralMap 2013-07-19 16:05:19 -07:00
alcaeus 2317443708 [Security] fixed issue where authentication listeners clear unrelated tokens
This commit fixes an issue where authentication listeners clear all security tokens in case of authentication failure.
This behavior makes it impossible to combine certain authentication mechanisms, notably x509 with form-based login.
2013-07-19 23:56:43 +02:00
Fabien Potencier 5fde0b00c6 merged branch jaugustin/fix-propel-modelChoiceList (PR #8505)
This PR was merged into the 2.2 branch.

Discussion
----------

[bridge] [propel1] [ModelChoiceList] fix issue #8499 call getPrimaryKey on a non object

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

This fix an issue #8499 introduced by the PR #8223

CC @willdurand @havvg

Commits
-------

2ebb783 fix issue #8499 modelChoiceList call getPrimaryKey on a non object
2013-07-17 10:14:35 +02:00
Jérémie Augustin 2ebb783c05 fix issue #8499 modelChoiceList call getPrimaryKey on a non object 2013-07-17 09:33:13 +02:00
Jérôme Tamarelle 242b3184b9 [DependencyInjection] Add exception for service name not dumpable in PHP 2013-07-16 14:47:20 +02:00
Fabien Potencier ddebe064db fixed typo 2013-07-16 10:48:55 +02:00
Fabien Potencier 002d9e80e9 bumped Symfony version to 2.2.5 2013-07-15 22:44:57 +02:00
Fabien Potencier 76f918a125 updated VERSION for 2.2.4 2013-07-15 14:28:01 +02:00
Fabien Potencier 732f1f8f0d update CONTRIBUTORS for 2.2.4 2013-07-15 14:27:44 +02:00
Fabien Potencier 97e0c4f9e9 updated CHANGELOG for 2.2.4 2013-07-15 14:27:43 +02:00
Fabien Potencier 579dbe2b94 merged branch lyrixx/fix-8460 (PR #8479)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8479).

Discussion
----------

 	[HttpFoundation] Fixed NativeSessionStorage:regenerate when does not exists

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

**warning** I did not try to reproduce this bug, so I am not sure it fixes the issue. I just open a PR with the suggested patch. Tests for http foundation are OK. I am not sur it's the best way to fix this issue as I do not understand why symfony reach this code if $_SESSION is not set.

Commits
-------

f5d59fb [HttpFoundation] Fixed NativeSessionStorage:regenerate when  does not exists
2013-07-15 14:12:07 +02:00
Grégoire Pineau 52e530da1f Fixed NativeSessionStorage:regenerate when does not exists 2013-07-15 14:12:07 +02:00
Fabien Potencier adde057877 removed extraneous whitespaces 2013-07-13 21:08:31 +02:00
Fabien Potencier d3f16d0ea0 merged branch genexp/master (PR #8477)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8477).

Discussion
----------

Reverts recent change that added type coercion for JSON responses

We shouldn't be coercing primitive in the array provided to setData.

Commits
-------

02e6aef Reverts JSON_NUMERIC_CHECK
2013-07-11 21:34:16 +02:00
Brian Corrigan bb59f40178 Reverts JSON_NUMERIC_CHECK
We shouldn't be coercing types.
2013-07-11 21:34:16 +02:00
Fabien Potencier c5f8a8a1ee merged branch mborgmann/patch-2 (PR #8476)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8476).

Discussion
----------

Just a typo

Just a typo in the doc

Commits
-------

fdaf59f Just a Typo
2013-07-11 17:52:52 +02:00
Moritz Borgmann 306b704bb0 Just a Typo 2013-07-11 17:52:51 +02:00
Fabien Potencier 81a49c638a merged branch jfsimon/issue-8145 (PR #8472)
This PR was merged into the 2.2 branch.

Discussion
----------

[Yaml] removed wrong comment removal inside a string block

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

Commits
-------

9c5f8c6 [Yaml] removed wrong comment removal inside a string block
2013-07-11 17:50:16 +02:00
Fabien Potencier 577bc82b02 merged branch jfsimon/issue-8450 (PR #8468)
This PR was merged into the 2.2 branch.

Discussion
----------

[HtppKernel] fixed inline fragment renderer

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

Commits
-------

2dc1ee0 [HtppKernel] fixed inline fragment renderer
2013-07-11 17:49:50 +02:00
Jean-François Simon 9c5f8c6b96 [Yaml] removed wrong comment removal inside a string block 2013-07-11 11:28:01 +02:00
Fabien Potencier 69772b90e4 merged branch seiffert/master (PR #8465)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8465).

Discussion
----------

[Config] Fixed error messages of min/max validation methods

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

This PR fixes the error messages of the configuration validation methods `min` and `max`. The error message was "Should be greater/less than: <value>" but should be "Should be greater/less than or equal to <value>".

Commits
-------

3395837 Fixing configuration validation error messages.
2013-07-10 16:03:01 +02:00
Paul Seiffert aaa40e5902 Fixing configuration validation error messages.
The min and max validation functions lead to incorrect error messages.
2013-07-10 16:03:01 +02:00
Jean-François Simon 2dc1ee04b4 [HtppKernel] fixed inline fragment renderer 2013-07-10 16:02:46 +02:00
Fabien Potencier 183ff09bf1 merged branch jfsimon/issue-8450 (PR #8462)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8462).

Discussion
----------

[HttpKernel] fixed inline fragment renderer

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

Commits
-------

1554f1f [HttpKernel] fixed inline fragment renderer
2013-07-10 09:34:46 +02:00
Jean-François Simon 06b69b859a fixed inline fragment renderer 2013-07-10 09:34:46 +02:00
Fabien Potencier ce2fae1953 merged branch reenl/fix-round-issues (PR #8447)
This PR was merged into the 2.2 branch.

Discussion
----------

[Console] Show completed percentage, not a rounded value.

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

This pull request has 2 minor changes:
- 199/200 => 99% instead of 100% (there was no test case and I added one, everything else passes) In the past the value was rounded, the progress bar ended up being 100% for 0.5% of the total execution time. That means 18 seconds on a 1 hour process.
- Fixed the comments to match the inner workings of RedrawFrequency.

First Symfony PR and second overall so hope I just did this the right way.

PR #8419 Rebased for 2.2

Commits
-------

91bb757 ProgressHelper shows percentage complete.
40591b9 Comment fixed: RedrawFrequency is measured in steps.
2013-07-08 16:59:54 +02:00
Fabien Potencier 2d61ebf26b merged branch lsmith77/fix_include_default_text (PR #8445)
This PR was merged into the 2.2 branch.

Discussion
----------

Fix include default text

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: [![Build Status](https://travis-ci.org/lsmith77/symfony.png?branch=fix_include_default_text)](https://travis-ci.org/lsmith77/symfony)
Fixes the following tickets: -
License of the code: MIT

Commits
-------

9d1004b fix handling of a default 'template' as a string
2013-07-08 16:43:11 +02:00
Reen Lokum 91bb7578c2 ProgressHelper shows percentage complete.
In the past the value was rounded, the progressbar ended up being 100% for 0.5%
of the total execution time. That means 18 seconds on a 1 hour process.
2013-07-08 16:34:53 +02:00
Reen Lokum 40591b92c8 Comment fixed: RedrawFrequency is measured in steps. 2013-07-08 16:24:02 +02:00
Lukas Kahwe Smith 9d1004b59e fix handling of a default 'template' as a string 2013-07-08 15:32:00 +02:00
Fabien Potencier af31180205 merged branch esgy/patch-1 (PR #8420)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8420).

Discussion
----------

Update JsonResponse.php

Added JSON_NUMERIC_CHECK flag to fix issues when json response is used in JavaScript apps and especially in AngularJS.

Commits
-------

2b1c973 Update JsonResponse.php
2013-07-08 15:12:22 +02:00
Sorin Gitlan 218bb907ef Update JsonResponse.php
Added JSON_NUMERIC_CHECK flag to fix issues when json response is used in JavaScript apps and especially in AngularJS.
2013-07-08 15:12:21 +02:00