Commit Graph

26788 Commits

Author SHA1 Message Date
Fabien Potencier
35f201f9d6 minor #19157 [Routing] rename boolean and integer to bool and int (xabbuh)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[Routing] rename boolean and integer to bool and int

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/11394#issuecomment-228075328
| License       | MIT
| Doc PR        |

This addresses @Tobion's comment in https://github.com/symfony/symfony/pull/11394#issuecomment-228075328.

@symfony/deciders What do you think? Should we change the element names to how we use the types in PHP code or should we stick with XML element names that rather match the types as defined by the XML schema?

Commits
-------

808dcc8 rename boolean and integer to bool and int
2016-07-01 10:54:59 +02:00
Christian Flothmann
808dcc8dcf rename boolean and integer to bool and int 2016-07-01 10:30:59 +02:00
Fabien Potencier
473263a00b feature #18510 Added a SecurityUserValueResolver for controllers (iltar)
This PR was merged into the 3.2-dev branch.

Discussion
----------

Added a SecurityUserValueResolver for controllers

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

This PR uses the new `ArgumentResolver` to inject a security user when the signature implies so. This is based on the [docs code example](https://github.com/symfony/symfony-docs/pull/6438#issuecomment-208319704) and [existing pr on the SFEB](sensiolabs/SensioFrameworkExtraBundle#327).

With the new example you can do the following:
```php
// when a User is mandatory, e.g. behind firewall
public function fooAction(UserInterface $user)

// when a User is optional, e.g. where it can be anonymous
public function barAction(UserInterface $user = null)
```
This deprecates the `Controller::getUser()` method.

I have added it on a priority of 40 so it falls just under the `RequestValueResolver`. This is because it's already used and the initial performance is less of an impact.

There was a comment asking if the `controller_argument.value_resolver` tag name wasn't too long. If decided this tag should change before 3.1 is released, I will update it in here.

*`RequestValueResolver` contains a small codestyle consistency fix.*

Commits
-------

d341889 Added a SecurityUserValueResolver for controllers
2016-07-01 10:03:07 +02:00
Fabien Potencier
62f0dbf024 feature #19203 [Bridge/Doctrine] Reset the EM lazy-proxy instead of the EM service (nicolas-grekas)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[Bridge/Doctrine] Reset the EM lazy-proxy instead of the EM service

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

This makes the entity manager resettable by resetting its proxy, which should be more robust than resetting its service.
See first comments in #19192
Ping @stof

Commits
-------

c581cd4 [Bridge/Doctrine] Reset the EM lazy-proxy instead of the EM service
2016-07-01 08:33:46 +02:00
Nicolas Grekas
c581cd4c81 [Bridge/Doctrine] Reset the EM lazy-proxy instead of the EM service 2016-07-01 08:19:10 +02:00
Iltar van der Berg
d341889b95 Added a SecurityUserValueResolver for controllers 2016-07-01 08:00:40 +02:00
Fabien Potencier
2e811cb930 feature #19236 [FrameworkBundle] Deprecate the service serializer.mapping.cache.doctrine.apc (Ener-Getick)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] Deprecate the service serializer.mapping.cache.doctrine.apc

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

This PR deprecates the service `serializer.mapping.cache.doctrine.apc` introduced in 3.1 as the cache component is now the recommended way.
This PR contains https://github.com/symfony/symfony/pull/19235.

Commits
-------

2a0c19c [FrameworkBundle] Deprecate the service serializer.mapping.cache.doctrine.apc
2016-07-01 07:26:19 +02:00
Ener-Getick
2a0c19c014
[FrameworkBundle] Deprecate the service serializer.mapping.cache.doctrine.apc 2016-06-30 19:03:33 +02:00
Nicolas Grekas
ba9cc945cd Merge branch '3.1'
* 3.1:
  [FrameworkBundle] Update the UPGRADING files Advise to not use the service `serializer.mapping.cache.apc` anymore
  [travis] fix
2016-06-30 12:08:17 +02:00
Nicolas Grekas
e86cbbf38b Merge branch '3.0' into 3.1
* 3.0:
  [travis] fix
2016-06-30 12:07:58 +02:00
Nicolas Grekas
ecc03f5ae7 Merge branch '2.8' into 3.0
* 2.8:
  [travis] fix

Conflicts:
	.github/travis.php
2016-06-30 12:07:39 +02:00
Nicolas Grekas
949b6a4ce2 Merge branch '2.7' into 2.8
* 2.7:
  [travis] fix
2016-06-30 12:06:50 +02:00
Nicolas Grekas
6b55df33a4 minor #19244 [travis] fix (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis] fix

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

Commits
-------

8712d54 [travis] fix
2016-06-30 12:06:33 +02:00
Fabien Potencier
a680910010 minor #19235 [FrameworkBundle] Advise to not use the serializer services related to the cache (Ener-Getick)
This PR was merged into the 3.1 branch.

Discussion
----------

[FrameworkBundle] Advise to not use the serializer services related to the cache

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

Advise to not use the serializer services related to the cache.

Commits
-------

16358d4 [FrameworkBundle] Update the UPGRADING files Advise to not use the service `serializer.mapping.cache.apc` anymore
2016-06-30 11:50:45 +02:00
Ener-Getick
16358d4a52
[FrameworkBundle] Update the UPGRADING files
Advise to not use the service `serializer.mapping.cache.apc` anymore
2016-06-30 11:41:22 +02:00
Fabien Potencier
cc188e991b Merge branch '3.1'
* 3.1:
  Fixed BC Layer in DoctrineChoiceLoader
  [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
  [HttpKernel] Move conflicting origin IPs handling to catch block
  [travis] Fix deps=low/high patching
  Fixed some issues of the AccessDecisionManager profiler
  [DoctrineBridge] fixed default parameter value in UniqueEntityValidator
2016-06-30 11:40:30 +02:00
Fabien Potencier
080962f7ac Merge branch '3.0' into 3.1
* 3.0:
  [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
  [HttpKernel] Move conflicting origin IPs handling to catch block
  [travis] Fix deps=low/high patching
2016-06-30 11:40:26 +02:00
Fabien Potencier
9c0ca1948e Merge branch '2.8' into 3.0
* 2.8:
  [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
  [HttpKernel] Move conflicting origin IPs handling to catch block
  [travis] Fix deps=low/high patching
2016-06-30 11:37:32 +02:00
Fabien Potencier
05fe884bd5 Merge branch '2.7' into 2.8
* 2.7:
  [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
  [HttpKernel] Move conflicting origin IPs handling to catch block
  [travis] Fix deps=low/high patching
2016-06-30 11:32:56 +02:00
Fabien Potencier
c770eb99cc minor #19233 [HttpKernel] Move handling of conflicting origin IPs to catch block (magnusnordlander, nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Move handling of conflicting origin IPs to catch block

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

Commits
-------

db84101 [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For
1f00b55 [HttpKernel] Move conflicting origin IPs handling to catch block
2016-06-30 11:30:35 +02:00
Nicolas Grekas
8712d54d8a [travis] fix 2016-06-30 11:22:01 +02:00
Fabien Potencier
9c74d6351e fixed CS 2016-06-30 09:48:58 +02:00
Fabien Potencier
75f4142dff minor #19169 Add test for Definition with exeption InvalidArgument (IvanMenshykov)
This PR was squashed before being merged into the 3.2-dev branch (closes #19169).

Discussion
----------

Add test for Definition with exeption InvalidArgument

Add test for Definition with exeption InvalidArgument

| Q             | A
| ------------- | ---
| Branch?       | "master" for new features / 2.7, 2.8, 3.0 or 3.1 for fixes
| Bug fix?      | no
| New feature?  | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Commits
-------

91072e6 Add test for Definition with exeption InvalidArgument
2016-06-30 09:48:33 +02:00
Ivan Menshykov
91072e6e86 Add test for Definition with exeption InvalidArgument 2016-06-30 09:48:28 +02:00
Fabien Potencier
3282d5fb07 feature #19174 [FrameworkBundle] Show server:run logs by default (nicolas-grekas)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[FrameworkBundle] Show server:run logs by default

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

I propose to change the default for the `server:run` command and show `php -S` logs by default.
I really miss them otherwise. The `-vvv` mode is not suited here, because it adds a useless ` ERR ` red prefix.
I do this through a tty when available, so that the output remains colored.

Ping @javiereguiluz @weaverryan since this is mostly a DX issue.

Commits
-------

7cc6161 [FrameworkBundle] Show server:run logs by default
2016-06-30 09:45:17 +02:00
Fabien Potencier
4ac9f72884 bug #19227 [DoctrineBridge] fixed default parameter value in UniqueEntityValidator (HeahDude)
This PR was merged into the 3.1 branch.

Discussion
----------

[DoctrineBridge] fixed default parameter value in UniqueEntityValidator

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

Commits
-------

40c0c52 [DoctrineBridge] fixed default parameter value in UniqueEntityValidator
2016-06-30 09:28:49 +02:00
Rootie
fbeb299273 Fixed BC Layer in DoctrineChoiceLoader
in the case when the BC Layer is used $idReader is not set to the right value.
2016-06-30 09:26:19 +02:00
Fabien Potencier
d8707535f1 bug #19241 Fixed BC Layer in DoctrineChoiceLoader (Rootie)
This PR was merged into the 3.2-dev branch.

Discussion
----------

Fixed BC Layer in DoctrineChoiceLoader

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

in the case when the BC Layer is used $idReader is not set to the right value.

Commits
-------

c44d71c Fixed BC Layer in DoctrineChoiceLoader
2016-06-30 09:25:23 +02:00
Rootie
c44d71cebb Fixed BC Layer in DoctrineChoiceLoader
in the case when the BC Layer is used $idReader is not set to the right value.
2016-06-30 09:10:11 +02:00
Magnus Nordlander
db841018dc [HttpKernel] Add listener that checks when request has both Forwarded and X-Forwarded-For 2016-06-30 08:49:13 +02:00
Nicolas Grekas
1f00b55373 [HttpKernel] Move conflicting origin IPs handling to catch block 2016-06-30 08:49:13 +02:00
Nicolas Grekas
3ef96b9458 minor #19240 [travis] Fix deps=low/high patching (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis] Fix deps=low/high patching

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

Deps=low/high are broken since we added depth=1 to the git checkout on travis...
This fixes the situation and ensures it won't happen again by adding a missing error check.

Commits
-------

5ec92e8 [travis] Fix deps=low/high patching
2016-06-30 08:47:42 +02:00
Nicolas Grekas
5ec92e8af3 [travis] Fix deps=low/high patching 2016-06-30 08:35:34 +02:00
Nicolas Grekas
76708ecdf5 minor #19234 [Console] fix input stream related tests (xabbuh)
This PR was merged into the 3.2-dev branch.

Discussion
----------

[Console] fix input stream related tests

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

Commits
-------

1cca740 [Console] fix input stream related tests
2016-06-29 22:08:07 +02:00
Christian Flothmann
1cca740392 [Console] fix input stream related tests 2016-06-29 21:53:37 +02:00
Nicolas Grekas
d6b38d1968 minor #19230 Fix merge issues (nicolas-grekas)
This PR was merged into the 3.2-dev branch.

Discussion
----------

Fix merge issues

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

Commits
-------

7701fea Fix merge issues
2016-06-29 20:59:52 +02:00
Nicolas Grekas
7701feab55 Fix merge issues 2016-06-29 17:37:25 +02:00
Fabien Potencier
0b3b0d5268 bug #18934 Fixed some issues of the AccessDecisionManager profiler (javiereguiluz)
This PR was squashed before being merged into the 3.1 branch (closes #18934).

Discussion
----------

Fixed some issues of the AccessDecisionManager profiler

| Q             | A
| ------------- | ---
| Branch?       | 3.1
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #19022 https://github.com/symfony/symfony-standard/issues/968 https://github.com/schmittjoh/JMSSecurityExtraBundle/issues/207
| License       | MIT
| Doc PR        | -

Commits
-------

082f1b5 Fixed some issues of the AccessDecisionManager profiler
2016-06-29 17:24:22 +02:00
Javier Eguiluz
082f1b5b1c Fixed some issues of the AccessDecisionManager profiler 2016-06-29 17:24:17 +02:00
Jules Pietri
40c0c52465 [DoctrineBridge] fixed default parameter value in UniqueEntityValidator 2016-06-29 16:12:01 +02:00
Nicolas Grekas
d08cbe6e8b Merge branch '3.1'
* 3.1:
  [Form] fixed ChoiceTypeTest after #17822
  [DoctrineBridge] fixed DoctrineChoiceLoaderTest by removing deprecated factory
  [ci] Upgrade phpunit wrapper deps
  [FrameworkBundle] Fix fixtures
  [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
  fixed HttpKernel dependencies after #18688
2016-06-29 15:38:44 +02:00
Nicolas Grekas
fe6841c461 Merge branch '3.0' into 3.1
* 3.0:
  [Form] fixed ChoiceTypeTest after #17822
2016-06-29 15:38:22 +02:00
Nicolas Grekas
46b379b457 minor #19226 [Form] fixed ChoiceTypeTest after #17822 (HeahDude)
This PR was merged into the 3.0 branch.

Discussion
----------

[Form] fixed ChoiceTypeTest after #17822

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

Commits
-------

777c193 [Form] fixed ChoiceTypeTest after #17822
2016-06-29 15:38:05 +02:00
Jules Pietri
777c193f2a [Form] fixed ChoiceTypeTest after #17822 2016-06-29 15:31:42 +02:00
Nicolas Grekas
4976c7fd4b minor #19222 [DoctrineBridge] fixed DoctrineChoiceLoaderTest by removing deprecated factory (HeahDude)
This PR was merged into the 3.1 branch.

Discussion
----------

[DoctrineBridge] fixed DoctrineChoiceLoaderTest by removing deprecated factory

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

Commits
-------

3f86eae [DoctrineBridge] fixed DoctrineChoiceLoaderTest by removing deprecated factory
2016-06-29 15:29:37 +02:00
Jules Pietri
3f86eaece1 [DoctrineBridge] fixed DoctrineChoiceLoaderTest by removing deprecated factory 2016-06-29 15:18:15 +02:00
Nicolas Grekas
0439837729 Merge branch '3.0' into 3.1
* 3.0:
  [ci] Upgrade phpunit wrapper deps
2016-06-29 15:03:37 +02:00
Nicolas Grekas
f3b2324c20 Merge branch '2.8' into 3.0
* 2.8:
  [ci] Upgrade phpunit wrapper deps
2016-06-29 15:03:16 +02:00
Nicolas Grekas
27f1cfc9af Merge branch '2.7' into 2.8
* 2.7:
  [ci] Upgrade phpunit wrapper deps
2016-06-29 15:03:02 +02:00
Nicolas Grekas
79fbbded0d minor #19225 [ci] Upgrade phpunit wrapper deps (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[ci] Upgrade phpunit wrapper deps

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

To get https://github.com/sebastianbergmann/exporter/pull/14 in.

Commits
-------

9f916a8 [ci] Upgrade phpunit wrapper deps
2016-06-29 15:02:48 +02:00