Commit Graph

25081 Commits

Author SHA1 Message Date
Konstantin.Myakshin
32cb269614 [DoctrineBridge] added missing error code for constraint. 2016-07-07 18:14:45 +03:00
Nicolas Grekas
1f7083764a bug #19292 [varDumper] Fix missing usage of ExceptionCaster::$traceArgs (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[varDumper] Fix missing usage of ExceptionCaster::$traceArgs

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

Used in 2.7 but lost in 2.8

Commits
-------

6c5237c [varDumper] Fix missing usage of ExceptionCaster::$traceArgs
2016-07-06 11:25:47 +02:00
Nicolas Grekas
6c5237ca36 [varDumper] Fix missing usage of ExceptionCaster::$traceArgs 2016-07-05 14:03:54 +02:00
Nicolas Grekas
5053ae2140 Merge branch '2.7' into 2.8
* 2.7:
  removed @since
  Remove and change unrelevant comments in Validator and Security components.
  [Validator] UuidValidator must accept a Uuid constraint.
  [Validator] make UuidValidator class formatting consistent.
2016-07-05 13:05:26 +02:00
Nicolas Grekas
4e7cc3b98e bug #19288 [VarDumper] Fix indentation trimming in ExceptionCaster (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[VarDumper] Fix indentation trimming in ExceptionCaster

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

Blank lines prevent left-trimming of source code excerpts currently.

Commits
-------

ab9daeb [VarDumper] Fix indentation trimming in ExceptionCaster
2016-07-05 13:02:43 +02:00
Nicolas Grekas
ab9daeba13 [VarDumper] Fix indentation trimming in ExceptionCaster 2016-07-05 11:48:09 +02:00
Fabien Potencier
0259bedec1 bug #19267 [Validator] UuidValidator must accept a Uuid constraint. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] UuidValidator must accept a Uuid constraint.

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

ff8bb4b [Validator] UuidValidator must accept a Uuid constraint.
2016-07-04 14:22:45 +02:00
Fabien Potencier
ff9ac703cd minor #19280 removed @since (fabpot)
This PR was merged into the 2.7 branch.

Discussion
----------

removed @since

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

`@since` is not an annotation we use in Symfony, so let's remove the exiting ones.

Commits
-------

5d6f6aa removed @since
2016-07-04 08:44:03 +02:00
Fabien Potencier
5d6f6aa7c7 removed @since 2016-07-04 07:27:33 +02:00
Fabien Potencier
4b9b6fb2d5 minor #19269 [Validator] [Security] Remove unrelevant comments in Security and Validator components (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] [Security] Remove unrelevant comments in Security and Validator components

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

2cec4a6 Remove and change unrelevant comments in Validator and Security components.
2016-07-02 18:12:19 +02:00
Fabien Potencier
ccf4935020 minor #19266 [Validator] make UuidValidator class formatting consistent. (hhamon)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] make UuidValidator class formatting consistent.

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

3cc2f10 [Validator] make UuidValidator class formatting consistent.
2016-07-02 18:11:23 +02:00
Hugo Hamon
2cec4a61ef Remove and change unrelevant comments in Validator and Security components. 2016-07-01 22:22:57 +02:00
Hugo Hamon
ff8bb4b5f2 [Validator] UuidValidator must accept a Uuid constraint. 2016-07-01 21:12:56 +02:00
Hugo Hamon
3cc2f10541 [Validator] make UuidValidator class formatting consistent. 2016-07-01 20:48:13 +02:00
Nicolas Grekas
fe17083cf9 Merge branch '2.7' into 2.8
* 2.7:
  [travis] Fix deps=low/high builds
  fixed CS
  Fix for #19183 to add support for new PHP MongoDB extension in sessions.
  bumped Symfony version to 2.7.16
  updated VERSION for 2.7.15
  update CONTRIBUTORS for 2.7.15
  updated CHANGELOG for 2.7.15
  Fixed typos in the expectedException annotations

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2016-07-01 17:02:03 +02:00
Nicolas Grekas
e262ef046b minor #19264 [travis] Fix deps=low/high builds (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[travis] Fix deps=low/high builds

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

72fd0b8 [travis] Fix deps=low/high builds
2016-07-01 16:59:03 +02:00
Nicolas Grekas
72fd0b82c5 [travis] Fix deps=low/high builds 2016-07-01 16:56:05 +02:00
Fabien Potencier
70cee967ab minor #19255 skip test with current phpunit bridge (remicollet)
This PR was merged into the 2.8 branch.

Discussion
----------

skip test with current phpunit bridge

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

AS for DnsMock in some other tests, (e.g. see efc1de7786)

Commits
-------

7696c95 skip test with current phpunit bridge
2016-07-01 09:57:37 +02:00
Fabien Potencier
81b0cc7c72 fixed CS 2016-07-01 09:20:22 +02:00
Remi Collet
7696c95b17 skip test with current phpunit bridge 2016-07-01 08:55:04 +02:00
Fabien Potencier
f086259450 bug #19186 Fix for #19183 to add support for new PHP MongoDB extension in sessions. (omanizer)
This PR was submitted for the master branch but it was merged into the 2.7 branch instead (closes #19186).

Discussion
----------

Fix for #19183 to add support for new PHP MongoDB extension in sessions.

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

Commits
-------

ebbc706 Fix for #19183 to add support for new PHP MongoDB extension in sessions.
2016-07-01 08:50:38 +02:00
Ben Oman
ebbc7068f9 Fix for #19183 to add support for new PHP MongoDB extension in sessions. 2016-07-01 08:50:26 +02:00
Fabien Potencier
c7d569a65e bug #19253 [Console] Fix block() padding formatting after #19189 (chalasr)
This PR was merged into the 2.8 branch.

Discussion
----------

[Console] Fix block() padding formatting after #19189

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/19189#issuecomment-229735157
| License       | MIT
| Doc PR        | reference to the documentation PR, if any

This fixes the unformatted padding of `block()` output after #19189.

Commits
-------

dc130be [Console] Fix for block() padding formatting after #19189
2016-06-30 20:39:02 +02:00
Robin Chalas
dc130be43c
[Console] Fix for block() padding formatting after #19189
Prevent future regression
2016-06-30 20:17:12 +02:00
Fabien Potencier
647184266f bug #19218 [Security][Guard] check if session exist before using it (pasdeloup)
This PR was squashed before being merged into the 2.8 branch (closes #19218).

Discussion
----------

[Security][Guard] check if session exist before using it

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

As stated by @Shekhovtsovy when the Guard component is used without the Symfony full stack (for instance in Laravel), $request->getSession() may be null.

An additionnal PR will be needed for 3.1 but it may be better to check this one before.

Commits
-------

a3f7510 [Security][Guard] check if session exist before using it
2016-06-30 20:09:50 +02:00
Jean Pasdeloup
a3f75100bf [Security][Guard] check if session exist before using it 2016-06-30 20:09:09 +02:00
Fabien Potencier
e0f1476bfe bumped Symfony version to 2.8.9 2016-06-30 18:28:54 +02:00
Fabien Potencier
038d13264f Merge pull request #19250 from fabpot/release-2.8.8
released v2.8.8
2016-06-30 17:42:24 +02:00
Fabien Potencier
938682b02e updated VERSION for 2.8.8 2016-06-30 17:42:15 +02:00
Fabien Potencier
c513e81d60 updated CHANGELOG for 2.8.8 2016-06-30 17:42:06 +02:00
Fabien Potencier
6cdb090dd0 bumped Symfony version to 2.7.16 2016-06-30 17:39:56 +02:00
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
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
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
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
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