Commit Graph

14705 Commits

Author SHA1 Message Date
WouterJ 1cde7234c8 [Console] Make DialogHelper respect interaction settings 2013-07-21 21:29:13 +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 a0721afa5b merged branch pborreli/httpkernel-cs (PR #8537)
This PR was merged into the master branch.

Discussion
----------

[HttpKernel] Fixed CS

Commits
-------

6e35963 Fixed CS
2013-07-21 21:21:19 +02:00
Pascal Borreli 6e35963fa5 Fixed CS 2013-07-21 13:38:54 +01:00
Fabien Potencier 0a894bc800 merged branch entering/form-validationlistener-remove-count (PR #8430)
This PR was squashed before being merged into the master branch (closes #8430).

Discussion
----------

[Form] Validation listener remove count()

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

Removing what looks a extra count not needed.

Commits
-------

23a71e5 [Form] Validation listener remove count()
2013-07-21 14:22:17 +02:00
entering 23a71e59e1 [Form] Validation listener remove count() 2013-07-21 14:22:16 +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 9dbffeec3e merged branch hason/gitignore (PR #8498)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8498).

Discussion
----------

Added missing .gitignore

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

Commits
-------

60bc41d Added missing files .gitignore
2013-07-21 14:12:19 +02:00
Martin Hasoň 4146587ce7 Added missing files .gitignore 2013-07-21 14:12:18 +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 c3f0af1ceb merged branch pborreli/httpfoundation-cs (PR #8535)
This PR was merged into the master branch.

Discussion
----------

[HttpFoundation] Fixed CS

Commits
-------

7625869 Fixed CS
2013-07-21 10:01:20 +02:00
Pascal Borreli 76258695c4 Fixed CS 2013-07-21 03:30:39 +01:00
Fabien Potencier 0cac9a11cf Merge branch '2.3'
* 2.3:
  [PropertyAccess] added moves to pluralMap
  [Security] fixed issue where authentication listeners clear unrelated tokens
  added greek translation
  [DependencyInjection] Add exception for service name not dumpable in PHP
  bumped Symfony version to 2.3.3-DEV
  fix issue #8499 modelChoiceList call getPrimaryKey on a non object
  updated VERSION for 2.3.2
  updated CHANGELOG for 2.3.2
  [DependencyInjection] Add exception for service name not dumpable in PHP
  fixed typo
  bumped Symfony version to 2.2.5
  updated VERSION for 2.2.4
  update CONTRIBUTORS for 2.2.4
  updated CHANGELOG for 2.2.4
  Fixed NativeSessionStorage:regenerate when does not exists
  removed extraneous whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-07-20 09:42:41 +02:00
Fabien Potencier 183796312d Merge branch '2.2' into 2.3
* 2.2:
  [PropertyAccess] added moves to pluralMap
  [Security] fixed issue where authentication listeners clear unrelated tokens
  fix issue #8499 modelChoiceList call getPrimaryKey on a non object
  [DependencyInjection] Add exception for service name not dumpable in PHP

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
	src/Symfony/Component/Security/Tests/Http/Firewall/BasicAuthenticationListenerTest.php
2013-07-20 09:42:02 +02:00
Fabien Potencier 017c44d2c3 merged branch GromNaN/2.3-di-dump-exception (PR #8524)
This PR was merged into the 2.3 branch.

Discussion
----------

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

Same as #8494 for branch 2.3 since the DI component has been refactored (bb797ee755, f1c2ab78af)

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

9ac3556 [DependencyInjection] Add exception for service name not dumpable in PHP
2013-07-20 09:33:53 +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 9b861ef7b3 merged branch dbu/security-dbal-listener-cleanup (PR #8521)
This PR was merged into the master branch.

Discussion
----------

security acl dbal schema: inject the schema instead of the whole container

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

following a discussion with @Stof on https://github.com/doctrine/DoctrinePHPCRBundle/pull/78 i thought to clean up the code i used as template as well.

Commits
-------

b960004 security acl dbal schema: inject the schema instead of the whole container
2013-07-19 12:33:09 +02:00
Fabien Potencier 1efb0f00ff merged branch lancergr/greek_trans (PR #8522)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8522).

Discussion
----------

[Security] added greek translation

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

Commits
-------

3a6050b [Security] added greek translation
2013-07-19 12:20:37 +02:00
lancergr 658579a5c3 added greek translation 2013-07-19 12:20:37 +02:00
Fabien Potencier e1918dce76 merged branch jeremyFreeAgent/feature/deprecatedSwifMailerDataCollector (PR #8520)
This PR was merged into the master branch.

Discussion
----------

[SwiftmailerBridge] Marked MessageDataCollector as deprecated

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

Now you can configure several mailers.

Linked to the following PR:
- [ ] https://github.com/symfony/SwiftmailerBundle/pull/34

Commits
-------

15bf1d7 [SwiftmailerBridge] Marked MessageDataCollector as deprecated
2013-07-19 11:44:52 +02:00
Jérémy Romey 15bf1d77f7 [SwiftmailerBridge] Marked MessageDataCollector as deprecated 2013-07-19 11:24:03 +02:00
Jérôme Tamarelle 9ac3556825 [DependencyInjection] Add exception for service name not dumpable in PHP 2013-07-19 09:14:04 +02:00
David Buchmann b960004993 security acl dbal schema: inject the schema instead of the whole container 2013-07-18 14:31:55 +02:00
Fabien Potencier 40f7e6875f bumped Symfony version to 2.3.3-DEV 2013-07-17 10:47:37 +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
Fabien Potencier b82eb2f371 updated VERSION for 2.3.2 2013-07-17 08:22:21 +02:00
Fabien Potencier 1672396654 updated CHANGELOG for 2.3.2 2013-07-17 08:22:04 +02:00
Fabien Potencier a3fbf0082d Merge branch '2.2' into 2.3
* 2.2:
  fixed typo
  bumped Symfony version to 2.2.5
  updated VERSION for 2.2.4
  update CONTRIBUTORS for 2.2.4
  updated CHANGELOG for 2.2.4
  Fixed NativeSessionStorage:regenerate when does not exists
  removed extraneous whitespaces

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-07-17 07:57:53 +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 76b6449c16 merged branch fabpot/fragments-with-non-scalars (PR #8437)
This PR was merged into the master branch.

Discussion
----------

[HttpKernel] changed the fragment handler to explicitely disallow non-scalar in generated URIs (refs #8263)

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

When using the `render()` function in Twig with a `controller()` reference, the attributes can contain non-scalar. That's fine for the inline strategy, but it cannot work for other strategies as it then involves a proper HTTP request.

So, this PR properly throw an exception in such situations to avoid difficult to find bugs.

Commits
-------

43ce368 [HttpKernel] added a unit test to demonstrate that passing objects works for inline controllers
70f3399 [HttpKernel] changed the fragment handler to explicitely disallow non-scalar in generated URIs (refs #8263)
2013-07-15 14:15:29 +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 63e6368dc0 merged branch jakzal/master-fixme (PR #8480)
This PR was merged into the master branch.

Discussion
----------

[DependencyInjection] Removed outdated FIXME comments.

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

I stumbled upon two FIXME comments in the `ContainerBulderTest` which were introduced in 7796eb21.

It looks like the intention was that parameters in the builder should be resolved without having to compile the container. Unless we agree to change the behaviour at this point (the change was introduced over 3 years ago), the comments should be removed.

Commits
-------

44f9322 [DependencyInjection] Removed outdated FIXME comments.
2013-07-12 12:48:53 +02:00
Jakub Zalas 44f932270a [DependencyInjection] Removed outdated FIXME comments. 2013-07-12 11:38:48 +01:00
Fabien Potencier 43ce368dea [HttpKernel] added a unit test to demonstrate that passing objects works for inline controllers 2013-07-12 09:33:20 +02:00