Commit Graph

20297 Commits

Author SHA1 Message Date
Tobias Schultze
0cead0f17a bug #13835 [PropertyAccess] stop overwriting once a reference is reached (3rd) (bananer)
This PR was squashed before being merged into the 2.6 branch (closes #13835).

Discussion
----------

[PropertyAccess] stop overwriting once a reference is reached (3rd)

I commited with a different email address in [PR 13831](https://github.com/symfony/symfony/pull/13831), so here is the third attempt. Also removed unnecessary test as suggested by @Tobion

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | [13731](https://github.com/symfony/symfony/issues/13731)
| License       | MIT
| Doc PR        | none

I added test cases for the scenario described in my issue. After looking through the PropertyAccessor source my conclusion was that there is no reason to overwrite parents of references, so I changed that. None of the previous test cases disagreed and my new tests also passed.

Or maybe I got it all wrong, I'm willing to learn.

Commits
-------

d733a88 [PropertyAccess] stop overwriting once a reference is reached (3rd)
2015-03-03 20:22:24 +01:00
Philip Frank
d733a887df [PropertyAccess] stop overwriting once a reference is reached (3rd) 2015-03-03 20:22:08 +01:00
Tobias Schultze
0e3090b19c minor #13834 [OptionsResolver] Remove Unused Variable from Foreach Cycles (vadim2404)
This PR was merged into the 2.6 branch.

Discussion
----------

[OptionsResolver] Remove Unused Variable from Foreach Cycles

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

Commits
-------

77f4dbf [OptionsResolver] Remove Unused Variable from Foreach Cycles
2015-03-03 20:15:31 +01:00
Vadim Kharitonov
77f4dbfa10 [OptionsResolver] Remove Unused Variable from Foreach Cycles 2015-03-03 17:59:03 +03:00
Nicolas Grekas
b638256ffa minor #13830 [travis] Tests Security sub-components (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Tests Security sub-components

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

Previous PR has been merged too fast :)

Commits
-------

16cdcf2 [travis] Tests Security sub-components
2015-03-03 10:01:25 +01:00
Nicolas Grekas
16cdcf2b94 [travis] Tests Security sub-components 2015-03-03 09:52:27 +01:00
Fabien Potencier
12cf04f8f3 minor #13818 [Serializer] Test that normalizers ignore non-existing attributes. (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #13818).

Discussion
----------

[Serializer] Test that normalizers ignore non-existing attributes.

| 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

Test the behavior of normalizers when an attribute doesn't exist.

Commits
-------

df0fe30 [Serializer] Test that normalizers ignore non-existing attributes.
2015-03-03 09:32:45 +01:00
Kévin Dunglas
df0fe30896 [Serializer] Test that normalizers ignore non-existing attributes. 2015-03-03 09:32:43 +01:00
Fabien Potencier
eb99c78358 bug #13814 [Twig] bootstrap_3_layout.html.twig is traitable (Dusan Kasan)
This PR was submitted for the 2.7 branch but it was merged into the 2.6 branch instead (closes #13814).

Discussion
----------

[Twig] bootstrap_3_layout.html.twig is traitable

| Q             | A
| ------------- | ---
| Fixed tickets | #13639
| License       | MIT

bootstrap_3_layout.html.twig is now traitable in the same way as form_table_layout.html.twig

Commits
-------

4509d36 [Twig] bootstrap_3_layout.html.twig is usable as a trait
2015-03-03 09:30:41 +01:00
Dusan Kasan
4509d36991 [Twig] bootstrap_3_layout.html.twig is usable as a trait 2015-03-03 09:30:40 +01:00
Fabien Potencier
632cc10d01 minor #13827 [Serializer] Fix ClassMetadataFactory PHPDoc (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Fix ClassMetadataFactory PHPDoc

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

0dba547 [Serializer] Fix ClassMetadataFactory PHPDoc
2015-03-03 09:28:49 +01:00
Fabien Potencier
9efec600e0 minor #13819 [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer

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

c41346b [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer
2015-03-03 09:27:38 +01:00
Fabien Potencier
c715cd660a minor #13825 [travis] Tests Security sub-components (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] Tests Security sub-components

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

Commits
-------

8aef213 [travis] Tests Security sub-components
2015-03-03 09:23:50 +01:00
Nicolas Grekas
8aef213246 [travis] Tests Security sub-components 2015-03-03 09:13:47 +01:00
Kévin Dunglas
0dba547bc8 [Serializer] Fix ClassMetadataFactory PHPDoc 2015-03-02 23:09:40 +01:00
Kévin Dunglas
c491332e0f minor #13798 [Serializer] rename exception interface (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Serializer] rename exception interface

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

Commits
-------

c6bf1de [Serializer] rename exception interface
2015-03-02 22:28:43 +01:00
Fabien Potencier
eb632f3dac minor #13727 CS fixes (keradus)
This PR was squashed before being merged into the 2.3 branch (closes #13727).

Discussion
----------

CS fixes

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

Commits
-------

7fd6ba0 CS fixes
2015-03-02 15:15:52 +01:00
Dariusz Ruminski
7fd6ba06b1 CS fixes 2015-03-02 15:15:25 +01:00
Tobias Schultze
755ea09a44 Merge branch '2.6' into 2.7 2015-03-02 11:21:01 +01:00
Tobias Schultze
38a5ebdb05 bug #13816 [OptionsResolver] fix allowed values with null (Tobion)
This PR was merged into the 2.6 branch.

Discussion
----------

[OptionsResolver] fix allowed values with null

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

1. setNormalizers was missing deprecated annotation
2. setAllowedValues/addAllowedValues with `null` was broken because `(array) null === array()`

Commits
-------

cb37fbe [OptionsResolver] fix allowed values with null
e3e9a4d [OptionsResolver] add missing deprecated phpdoc for setNormalizers
2015-03-02 11:19:04 +01:00
Nicolas Grekas
c6bf1dec2e [Serializer] rename exception interface 2015-03-02 10:36:49 +01:00
Kévin Dunglas
c41346baef [Serializer] Optimize GetSetMethodNormalizer and PropertyNormalizer 2015-03-01 18:38:38 +01:00
Tobias Schultze
cb37fbe707 [OptionsResolver] fix allowed values with null 2015-03-01 03:42:24 +01:00
Tobias Schultze
e3e9a4d269 [OptionsResolver] add missing deprecated phpdoc for setNormalizers 2015-03-01 03:08:17 +01:00
Tobias Schultze
c498389f59 feature #13809 [OptionsResolver] add missing deprecation triggers (Tobion)
This PR was merged into the 2.7 branch.

Discussion
----------

[OptionsResolver] add missing deprecation triggers

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

Commits
-------

9607e82 replace deprecated options resolver uses by new ones
7e9d2e6 [OptionsResolver] add missing deprecation triggers
2015-03-01 00:55:24 +01:00
Tobias Schultze
9607e82c78 replace deprecated options resolver uses by new ones 2015-02-28 13:09:24 +01:00
Tobias Schultze
7e9d2e618b [OptionsResolver] add missing deprecation triggers 2015-02-27 17:11:51 +01:00
Tobias Schultze
469e70d5be [OptionsResolver] remove duplicate deprecation text 2015-02-27 16:20:50 +01:00
ogizanagi
96896390d7 [TwigBridge] Bootstrap Layout - Fix the label of checkbox cannot be empty 2015-02-27 01:57:35 +01:00
Fabien Potencier
d3f049dbbe minor #13799 [travis] test with php nightly (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[travis] test with php nightly

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

Commits
-------

213cabc [travis] test with php nightly
2015-02-26 18:12:57 +01:00
Nicolas Grekas
213cabcf95 [travis] test with php nightly 2015-02-26 11:12:05 +01:00
Kévin Dunglas
469b8e7017 [Serializer] Replace BadMethodCallException by UnexpectedValueException 2015-02-25 23:52:02 +01:00
Nicolas Grekas
2b036ecbb5 Merge branch '2.6' into 2.7
* 2.6:
  [Form] NativeRequestHandler file handling fix
  [VarDumper] Workaround stringy numeric keys
  [HttpKernel] Throw double-bounce exceptions
  minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
  [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 13:51:44 +01:00
Nicolas Grekas
c9da1ae73f Merge branch '2.3' into 2.6
* 2.3:
  [Form] NativeRequestHandler file handling fix
  [HttpKernel] Throw double-bounce exceptions
  minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
  [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 13:51:23 +01:00
Fabien Potencier
e0ba4d65af bug #13744 minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource (bijibox)
This PR was merged into the 2.3 branch.

Discussion
----------

minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource

| Q             | A
| ------------- | ---
| Fixed tickets | #13377
| License       | MIT

FileResource and tests update

Commits
-------

87800ae minor #13377 [Console] Change greater by greater or equal for isFresh in FileResource
2015-02-25 12:39:01 +01:00
Fabien Potencier
46d05ecad4 bug #13708 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-mapping (phansys)
This PR was merged into the 2.3 branch.

Discussion
----------

[2.3] [HttpFoundation] fixed param order for Nginx's x-accel-mapping

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

Inverted path and location directives for x-accel-mapping header (fixes #13502).

Before:
```proxy_set_header X-Accel-Mapping /internal/=/var/www/example.com/```

After:
```proxy_set_header X-Accel-Mapping /var/www/example.com/=/internal/```

It could be a BC break since the response will fail if someone sends this header
honoring the previous signature, thus I need some feedback in order to choose the right branch for this change.

Commits
-------

9f9f230 [2.3] [HttpFoundation] fixed param order for Nginx's x-accel-redirect
2015-02-25 12:23:04 +01:00
Fabien Potencier
7d6c7a3cef bug #13767 [HttpKernel] Throw double-bounce exceptions (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[HttpKernel] Throw double-bounce exceptions

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

Commits
-------

0ebcf63 [HttpKernel] Throw double-bounce exceptions
2015-02-25 12:22:04 +01:00
Fabien Potencier
70ba475156 bug #13785 [VarDumper] Workaround stringy numeric keys (nicolas-grekas)
This PR was merged into the 2.6 branch.

Discussion
----------

[VarDumper] Workaround stringy numeric keys

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

Commits
-------

46bea3a [VarDumper] Workaround stringy numeric keys
2015-02-25 09:36:14 +01:00
Fabien Potencier
ab7b3a8119 bug #13769 [Form] NativeRequestHandler file handling fix (mpajunen)
This PR was squashed before being merged into the 2.3 branch (closes #13769).

Discussion
----------

[Form] NativeRequestHandler file handling fix

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

`NativeRequestHandler` reused the local variable for the form name `$name` as a loop variable for processing the `$_FILES` array. A separate variable is now used.

Two new test cases are included:
- Handling a request with multiple files
- Handling a request with file upload and a nameless form

Both tests fail without the fix. The test cases could probably be better though.

Commits
-------

9b3421f [Form] NativeRequestHandler file handling fix
2015-02-25 09:33:53 +01:00
Mikael Pajunen
9b3421f18a [Form] NativeRequestHandler file handling fix 2015-02-25 09:33:49 +01:00
Nicolas Grekas
46bea3ab30 [VarDumper] Workaround stringy numeric keys 2015-02-25 09:21:12 +01:00
Nicolas Grekas
0ebcf639c3 [HttpKernel] Throw double-bounce exceptions 2015-02-24 20:09:42 +01:00
Nicolas Grekas
2777e965ed Merge branch '2.6' into 2.7
* 2.6:
  [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 20:07:49 +01:00
Nicolas Grekas
9f5a2caf3a Merge branch '2.3' into 2.6
* 2.3:
  [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 20:07:32 +01:00
Fabien Potencier
cea862935c bug #13779 [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[FrameworkBundle] silence E_USER_DEPRECATED in insulated clients

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

Commits
-------

7558c23 [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients
2015-02-24 18:38:20 +01:00
Nicolas Grekas
7558c232af [FrameworkBundle] silence E_USER_DEPRECATED in insulated clients 2015-02-24 17:59:59 +01:00
Fabien Potencier
f206dfd9e4 bug #13745 Fixed absolute_url for absolute paths (florianv)
This PR was merged into the 2.7 branch.

Discussion
----------

Fixed absolute_url for absolute paths

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/13724
| License       | MIT

The issue is that `asset()` and `absolute_url()` cannot be composed because `asset()` already returns an absolute path (using the `PathPackage`) and `absolute_url()` still prepends the base path. So the resulting url contains the base path twice.

So this PR removes appending the base path to absolute paths (starting with `/`) passed to `absolute_url()`.

Commits
-------

08aa7bc Fixed absolute_url for absolute paths
2015-02-24 17:24:16 +01:00
Nicolas Grekas
65e4a5aaf4 Merge branch '2.6' into 2.7
* 2.6:
  [minor] composer.json fix
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 14:41:26 +01:00
Nicolas Grekas
76e736eeb7 [minor] composer.json fix 2015-02-24 14:39:59 +01:00
Nicolas Grekas
decd82eef7 Merge branch '2.3' into 2.6
* 2.3:
  [minor] composer.json fix

Conflicts:
	src/Symfony/Component/HttpFoundation/composer.json
	src/Symfony/Component/Templating/composer.json
2015-02-24 14:39:25 +01:00