Commit Graph

14691 Commits

Author SHA1 Message Date
Fabien Potencier aa3e474aed Merge branch '2.3'
* 2.3:
  [Form] fixes empty file-inputs get treated as extra field
  return 0 if there is no valid data
  [DependencyInjection] fixed regression where setting a service to null did not trigger a re-creation of the service when getting it
  [DependencyInjection] fixed #8570
  fixed file permission
  The ignoreAttributes itself should be ignored, too.
  [Tests] Tests on php 5.5 should pass
  [Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #88546)
2013-07-27 07:01:52 +02:00
Fabien Potencier 9d53905b88 Merge branch '2.2' into 2.3
* 2.2:
  return 0 if there is no valid data
  [Tests] Tests on php 5.5 should pass
  [Twig] fixed TwigEngine::exists() method when a template contains a syntax error (closes #88546)
2013-07-27 07:01:40 +02:00
Fabien Potencier 10710cb2e6 merged branch bronze1man/PR-fixed-test-failure (PR #8591)
This PR was merged into the master branch.

Discussion
----------

[templating] fixed test failure introduted from #8585

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

Commits
-------

4b7c3b9 [template] fixed test failure introduted from #8585
2013-07-27 06:49:41 +02:00
bronze1man 4b7c3b9cb2 [template] fixed test failure introduted from #8585 2013-07-27 12:44:48 +08:00
Fabien Potencier de1915f405 merged branch Flask/ticket_8548 (PR #8575)
This PR was squashed before being merged into the 2.3 branch (closes #8575).

Discussion
----------

[Form] fixes empty file-inputs get treated as extra field

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

Commits
-------

e5fba3c [Form] fixes empty file-inputs get treated as extra field
2013-07-26 13:48:41 +02:00
Flavian Sierk e5fba3cf83 [Form] fixes empty file-inputs get treated as extra field 2013-07-26 13:48:40 +02:00
Fabien Potencier 3dec4dd2e6 merged branch agiuliano/2.3 (PR #8585)
This PR was submitted for the 2.3 branch but it was merged into the master branch instead (closes #8585).

Discussion
----------

Print form name in form_start function

It'd be useful if form_start() prints the form's name.
This way if you want to test it in your page, you can catch the form by `$crawler->filter('form[name=my_form_name]')`

Commits
-------

221bc15 Print form name in form_start function
2013-07-26 11:50:34 +02:00
Andrea Giuliano ac2a29c989 Print form name in form_start function 2013-07-26 11:50:34 +02:00
Fabien Potencier 63ef3c1901 merged branch dominikzogg/timecollectorfix (PR #8581)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8581).

Discussion
----------

TimeCollector, Notice, if no events

https://github.com/symfony/symfony/issues/8574

Commits
-------

e9da1c0 return 0 if there is no valid data
2013-07-25 19:15:10 +02:00
Dominik Zogg 3553c71d1a return 0 if there is no valid data 2013-07-25 19:15:09 +02:00
Fabien Potencier 364ccd1cb3 merged branch bronze1man/PR-setLazy-parent-2.3 (PR #8573)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] setLazy not work on DefinitionDecorator

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

Commits
-------

970ce2c [DependencyInjection] fixed #8570
2013-07-25 19:13:25 +02:00
Fabien Potencier 7dc211a263 merged branch fabpot/null-services (PR #8582)
This PR was merged into the 2.3 branch.

Discussion
----------

[DependencyInjection] fixed regression where setting a service to null did not trigger a re-creation of the service when getting it (closes #8392)

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

Commits
-------

50d0727 [DependencyInjection] fixed regression where setting a service to null did not trigger a re-creation of the service when getting it
2013-07-25 19:04:05 +02:00
Fabien Potencier 50d0727477 [DependencyInjection] fixed regression where setting a service to null did not trigger a re-creation of the service when getting it 2013-07-25 17:41:27 +02:00
bronze1man 970ce2c413 [DependencyInjection] fixed #8570 2013-07-25 13:55:15 +08:00
Fabien Potencier 2e2a36ca24 fixed file permission 2013-07-24 19:57:25 +02:00
Fabien Potencier ef987f7b2e merged branch derrabus/ignore_attributes_in_redirect_controller (PR #8563)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] RedirectCotroller: The ignoreAttributes parameter should be ignored

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

As discussed in PR #7590, when pointing a route to FrameworkBundle's `RedirectController` the attribute `ignoreAttributes` is added to the new route's attributes, if specified as array. As @lsmith77 wrote in a comment to that PR, this should not be the intended behavior. A valid workaround is to add `ignoreAttributes` itself to this array.

The problem remained undiscovered by the unit test, as `ignoreAttribues` was not included in the `_route_params` of the faked `Request` object. This PR should fix both, the unit test and the `RedirectController` itself, so the workaround mentioned above is not necessary anymore. Additionally, my fix should not break any routing configuration that is using the workaround.

Commits
-------

dc1fff0 The ignoreAttributes itself should be ignored, too.
2013-07-24 19:43:27 +02:00
Alexander M. Turek dc1fff0fe1 The ignoreAttributes itself should be ignored, too. 2013-07-24 17:20:53 +02:00
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 1d86ea10ff Merge branch '2.3'
* 2.3:
  [Validator] fixed ConstraintViolation:: incorrect when nested
  handle Optional and Required constraints from XML or YAML sources correctly
  added missing comments to WebTestCase
  Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary
  Added missing files .gitignore
  [DependencyInjection] Fix Container::camelize to convert beginning and ending chars
  [Validator] Fixed groups argument misplace for validateValue method from validator class
  [Form] Fix of "PATCH'ed forms are never valid"
2013-07-21 22:19:01 +02:00
Fabien Potencier b45f18b81d Merge branch '2.2' into 2.3
* 2.2:
  [Validator] fixed ConstraintViolation:: incorrect when nested
  handle Optional and Required constraints from XML or YAML sources correctly
  added missing comments to WebTestCase
  Fixed #8455: PhpExecutableFinder::find() does not always return the correct binary
  [DependencyInjection] Fix Container::camelize to convert beginning and ending chars
  [Validator] Fixed groups argument misplace for validateValue method from validator class

Conflicts:
	src/Symfony/Component/Validator/Tests/Constraints/CollectionTest.php
	src/Symfony/Component/Validator/Tests/GraphWalkerTest.php
2013-07-21 22:18:49 +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 9d98c417ec merged branch biozshock/patch-form-fix (PR #8362)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] Fix of "PATCH'ed forms are never valid". Fixes #8111

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

Commits
-------

a2b1535 [Form] Fix of "PATCH'ed forms are never valid"
2013-07-21 21:54:59 +02:00
Fabien Potencier ecc2f2b626 merged branch hacfi/2.3_doctrine_compiler_pass (PR #8409)
This PR was submitted for the 2.3 branch but it was merged into the master branch instead (closes #8409).

Discussion
----------

[DoctrineBridge] Only load event managers if tagged event subscribers are found

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

This PR only wraps the code that adds event subscribers / listeners in the Doctrine compiler pass RegisterEventListenersAndSubscribersPass so it doesn't run if no tagged services are found. So in general it doesn't change anything besides not running a few lines of code if it's not necessary. The reason I want this change is that it will allow DoctrinePHPCRBundle to be installed without Doctrine2 PHPCR ODM (I just want the PHPCR session..I don't need the ODM). This doesn't work currently as it tries to load the entity managers resulting in an error (Error: The service definition "doctrine_phpcr.odm.default_session.event_manager" does not exist.).

Commits
-------

63bc18c [DoctrineBridge] Only load event managers if tagged event subscribers are found
2013-07-21 21:51:05 +02:00
Philipp Wahala 29c34673df Only load event managers if tagged event subscribers are found 2013-07-21 21:51:05 +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 9601f611c3 [Security] updated CHANGELOG (refs #8195) 2013-07-21 21:36:38 +02:00
Fabien Potencier 707acd9a9b merged branch joncave/rememberme-hmac (PR #8195)
This PR was submitted for the 2.3 branch but it was merged into the master branch instead (closes #8195).

Discussion
----------

[Security] Use HMAC construction for remember me cookie hashes

[Security] Use HMAC construction for remember me cookie hashes

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

HMAC is a more secure construction for MACs than the secret suffix method that is currently being used by the remember me cookies, see http://rdist.root.org/2009/10/29/stop-using-unsafe-keyed-hashes-use-hmac/.

Changing the MAC scheme means that current cookies will be invalidated and users will have to login again. Though there are no API BC issues.

Commits
-------

c97e0d0 [Security] Use HMAC construction for remember me cookie hashes
2013-07-21 21:35:20 +02:00
Jon Cave f7bb5de804 Use HMAC construction for remember me cookie hashes 2013-07-21 21:35:20 +02:00
Fabien Potencier 8b3d8c1bae merged branch dosten/ticket_7683 (PR #8303)
This PR was squashed before being merged into the master branch (closes #8303).

Discussion
----------

[HttpFoundation] Add accessors methods to session handlers

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

Commits
-------

460c696 [HttpFoundation] Add accessors methods to session handlers
2013-07-21 21:32:03 +02:00
Diego Saint Esteben 460c696aef [HttpFoundation] Add accessors methods to session handlers 2013-07-21 21:32:03 +02:00
Fabien Potencier 4b383c7695 merged branch WouterJ/issue_8079 (PR #8452)
This PR was squashed before being merged into the master branch (closes #8452).

Discussion
----------

[Console] Make DialogHelper respect interaction settings

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

This is based on @cordoval's #8366, but it tries to not break BC and to be a little more userfriendly.

@stof I can't seem to follow the infinite loop you talked about in #8366 . `DialogHelper::ask` will return the default, which is `null`, that breaks the while loop and it returns the default.

Commits
-------

1cde723 [Console] Make DialogHelper respect interaction settings
2013-07-21 21:29:14 +02:00
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