diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,677 Commits 24 Branches 563 Tags 225 MiB
Commit Graph

26677 Commits

Author SHA1 Message Date
Fabien Potencier 06b07dd785 Merge pull request #19248 from fabpot/release-2.7.15 
released v2.7.15
 2016-06-30 17:14:45 +02:00
Fabien Potencier ec1ff36e58 updated VERSION for 2.7.15 2016-06-30 17:14:22 +02:00
Fabien Potencier 0d28ce434e update CONTRIBUTORS for 2.7.15 2016-06-30 17:14:17 +02:00
Fabien Potencier f5749df225 updated CHANGELOG for 2.7.15 2016-06-30 17:14:07 +02:00
Nicolas Grekas 6c4162e7f8 minor #19245 Fix some lowest deps (nicolas-grekas) 
This PR was merged into the 2.8 branch.

Discussion
----------

Fix some lowest deps

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

A 2.8-only issue

Commits
-------

aa0e8bd Fix some lowest deps
 2016-06-30 13:43:13 +02:00
Nicolas Grekas aa0e8bd980 Fix some lowest deps 2016-06-30 13:30:07 +02:00
Fabien Potencier 94773ad4ad minor #19243 Fixed typos in the expectedException annotations (GrahamCampbell) 
This PR was squashed before being merged into the 2.7 branch (closes #19243).

Discussion
----------

Fixed typos in the expectedException annotations

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

PHPUnit ignores any imports when resolving these. You must always reference the FQCN.

Commits
-------

b36de36 Fixed typos in the expectedException annotations
 2016-06-30 13:18:56 +02:00
Graham Campbell b36de36697 Fixed typos in the expectedException annotations 2016-06-30 13:18:54 +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 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 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
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
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 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
Nicolas Grekas 9f916a8279 [ci] Upgrade phpunit wrapper deps 2016-06-29 14:53:38 +02:00
Nicolas Grekas e770e2ec1a Merge branch '3.0' into 3.1 
* 3.0:
  [FrameworkBundle] Fix fixtures
  [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
  fixed HttpKernel dependencies after #18688

Conflicts:
	src/Symfony/Component/HttpKernel/HttpKernel.php
	src/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php
 2016-06-29 14:32:15 +02:00
Nicolas Grekas b4fbcb3559 Merge branch '2.8' into 3.0 
* 2.8:
  [FrameworkBundle] Fix fixtures
  [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
  fixed HttpKernel dependencies after #18688

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt
	src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/HttpKernel/composer.json
 2016-06-29 14:25:18 +02:00
Nicolas Grekas 4cfbcf5cc7 minor #19223 [FrameworkBundle] Fix fixtures (nicolas-grekas) 
This PR was merged into the 2.8 branch.

Discussion
----------

[FrameworkBundle] Fix fixtures

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

Commits
-------

d175477 [FrameworkBundle] Fix fixtures
 2016-06-29 14:08:11 +02:00
Nicolas Grekas d17547769c [FrameworkBundle] Fix fixtures 2016-06-29 13:57:45 +02:00
Nicolas Grekas 77053e7944 Merge branch '2.7' into 2.8 
* 2.7:
  [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
  fixed HttpKernel dependencies after #18688

Conflicts:
	src/Symfony/Component/HttpKernel/composer.json
 2016-06-29 13:29:28 +02:00
Nicolas Grekas 692740b57a bug #19217 [HttpKernel] Inline ValidateRequestListener logic into HttpKernel (nicolas-grekas) 
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpKernel] Inline ValidateRequestListener logic into HttpKernel

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

I propose to inline the listener introduced in #18688 into HttpKernel.

Commits
-------

9d3ae85 [HttpKernel] Inline ValidateRequestListener logic into HttpKernel
 2016-06-29 13:28:26 +02:00
Nicolas Grekas 9d3ae85301 [HttpKernel] Inline ValidateRequestListener logic into HttpKernel 2016-06-29 12:24:37 +02:00
Fabien Potencier eae78e208a minor #19216 fixed HttpKernel dependencies after #18688 (HeahDude) 
This PR was merged into the 2.7 branch.

Discussion
----------

fixed HttpKernel dependencies after #18688

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

Commits
-------

f809f3e fixed HttpKernel dependencies after #18688
 2016-06-29 10:26:41 +02:00
Jules Pietri f809f3e340 fixed HttpKernel dependencies after #18688 2016-06-29 10:18:30 +02:00
Fabien Potencier 5128cd368c Merge branch '3.0' into 3.1 
* 3.0:
  [HttpFoundation] Warning when request has both Forwarded and X-Forwarded-For
  fixed test
  [Console] Decouple SymfonyStyle from TableCell
 2016-06-29 09:02:31 +02:00
Fabien Potencier b6267c8bd8 Merge branch '2.8' into 3.0 
* 2.8:
  [HttpFoundation] Warning when request has both Forwarded and X-Forwarded-For
  fixed test
  [Console] Decouple SymfonyStyle from TableCell
 2016-06-29 09:02:21 +02:00
Fabien Potencier 0a7aa63ece Merge branch '2.7' into 2.8 
* 2.7:
  [HttpFoundation] Warning when request has both Forwarded and X-Forwarded-For
  [Console] Decouple SymfonyStyle from TableCell
 2016-06-29 09:02:14 +02:00