Commit Graph

28708 Commits

Author SHA1 Message Date
Nicolas Grekas 42d17b13a4 Merge branch '3.1' into 3.2
* 3.1:
  Minor fixes found while ugrading the CI
2017-01-03 16:52:33 +01:00
Nicolas Grekas de02095c92 Merge branch '2.8' into 3.1
* 2.8:
  Minor fixes found while ugrading the CI
2017-01-03 16:52:17 +01:00
Nicolas Grekas 3569531e60 Merge branch '2.7' into 2.8
* 2.7:
  Minor fixes found while ugrading the CI
2017-01-03 16:50:41 +01:00
Nicolas Grekas 0b9fc83ae7 minor #21150 Minor fixes found while ugrading the CI (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

Minor fixes found while ugrading the CI

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

aae4f6d Minor fixes found while ugrading the CI
2017-01-03 16:50:21 +01:00
Nicolas Grekas aae4f6d9e7 Minor fixes found while ugrading the CI 2017-01-03 16:43:07 +01:00
Nicolas Grekas cfd3262b81 Merge branch '3.1' into 3.2
* 3.1:
  [appveyor] Update phpunit-bridge cache-id
  handle empty lines inside unindented collection
2017-01-03 14:51:32 +01:00
Nicolas Grekas 0f21c853e9 Merge branch '2.8' into 3.1
* 2.8:
  [appveyor] Update phpunit-bridge cache-id
  handle empty lines inside unindented collection
2017-01-03 14:51:21 +01:00
Nicolas Grekas eced0dad35 Merge branch '2.7' into 2.8
* 2.7:
  [appveyor] Update phpunit-bridge cache-id
  handle empty lines inside unindented collection
2017-01-03 14:49:52 +01:00
Nicolas Grekas 5044c9875c [appveyor] Update phpunit-bridge cache-id 2017-01-03 14:47:36 +01:00
Fabien Potencier 942e0c1706 bug #21084 [Yaml] handle empty lines inside unindented collection (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Yaml] handle empty lines inside unindented collection

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

Commits
-------

bbfe6f73b5 handle empty lines inside unindented collection
2017-01-03 05:44:39 -08:00
Nicolas Grekas 03d5567602 minor #21149 [PhpUnitBrige] Fix current failures (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[PhpUnitBrige] Fix current failures

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

Commits
-------

73df9cd [PhpUnitBrige] Fix current failures
2017-01-03 14:43:49 +01:00
Nicolas Grekas 73df9cd423 [PhpUnitBrige] Fix current failures 2017-01-03 14:42:10 +01:00
Nicolas Grekas fcf8b334ec Merge branch '3.1' into 3.2
* 3.1:
  [ci] Update travis/appveyor
  [HttpFoundation] Validate/cast cookie expire time
2017-01-03 12:28:32 +01:00
Nicolas Grekas e3e1cce863 Merge branch '2.8' into 3.1
* 2.8:
  [ci] Update travis/appveyor
  [HttpFoundation] Validate/cast cookie expire time
2017-01-03 12:28:18 +01:00
Nicolas Grekas 41539cf165 Merge branch '2.7' into 2.8
* 2.7:
  [ci] Update travis/appveyor
  [HttpFoundation] Validate/cast cookie expire time
2017-01-03 12:26:18 +01:00
Nicolas Grekas 5ad1586eab minor #21146 [ci] Update travis/appveyor (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[ci] Update travis/appveyor

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

Account for latest changes in simple-phpunit + update to PhpUnit 5.7.

Commits
-------

32b8d98 [ci] Update travis/appveyor
2017-01-03 12:25:55 +01:00
Nicolas Grekas 32b8d98bed [ci] Update travis/appveyor 2017-01-03 12:24:35 +01:00
Nicolas Grekas c29f89515d minor #21148 [PhpUnitBridge] Fix HHVM compat with putenv() (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[PhpUnitBridge] Fix HHVM compat with putenv()

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

On HHVM, `putenv()` is ignored by `passthru()` & co., but works with `proc_open()`.

Commits
-------

d4553c5 [PhpUnitBridge] Fix HHVM compat with putenv()
2017-01-03 12:23:10 +01:00
Nicolas Grekas d4553c5393 [PhpUnitBridge] Fix HHVM compat with putenv() 2017-01-03 12:22:10 +01:00
Nicolas Grekas 4020a0dda2 bug #21143 [PhpUnitBridge] Set COMPOSER_ROOT_VERSION while installing (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[PhpUnitBridge] Set COMPOSER_ROOT_VERSION while installing

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

Commits
-------

8bab09e [PhpUnitBridge] Set COMPOSER_ROOT_VERSION while installing
2017-01-03 10:28:43 +01:00
Nicolas Grekas 8bab09e668 [PhpUnitBridge] Set COMPOSER_ROOT_VERSION while installing 2017-01-03 10:26:49 +01:00
Nicolas Grekas b703f32230 Fix test 2017-01-03 09:53:57 +01:00
Fabien Potencier 5fdf0e9a60 bug #20925 [HttpFoundation] Validate/cast cookie expire time (ro0NL)
This PR was merged into the 2.7 branch.

Discussion
----------

[HttpFoundation] Validate/cast cookie expire time

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #... <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!--highly recommended for new features-->

Commits
-------

8215dbdb31 [HttpFoundation] Validate/cast cookie expire time
2017-01-02 19:24:33 -08:00
Fabien Potencier 8c2a67f561 bug #21138 [PhpUnitBridge] skip tests with failure and error states too (xabbuh)
This PR was merged into the 3.2 branch.

Discussion
----------

[PhpUnitBridge] skip tests with failure and error states too

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

I was actually wrong by not excluding failures and errors to in #21121.

Commits
-------

f3bb206f12 skip tests with failure and error states too
2017-01-02 14:07:15 -08:00
Fabien Potencier da86c93857 bug #21135 [PhpUnitBridge] hide stack trace of expected deprecation failures (xabbuh)
This PR was merged into the 3.2 branch.

Discussion
----------

[PhpUnitBridge] hide stack trace of expected deprecation failures

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

Commits
-------

3777da5b67 hide stack trace of expected deprecation failures
2017-01-02 14:06:22 -08:00
Fabien Potencier b5aa8891db updated LICENSE year 2017-01-02 12:32:57 -08:00
Fabien Potencier 3f4e6cce8c Merge branch '3.1' into 3.2
* 3.1:
  updated LICENSE year
  updated LICENSE year
  Fixed `@return self` with `$this`
2017-01-02 12:32:22 -08:00
Fabien Potencier d05e9e03cb Merge branch '2.8' into 3.1
* 2.8:
  updated LICENSE year
  updated LICENSE year
  Fixed `@return self` with `$this`
2017-01-02 12:31:54 -08:00
Fabien Potencier 5ea8f3f147 updated LICENSE year 2017-01-02 12:30:51 -08:00
Fabien Potencier ed70281d49 Merge branch '2.7' into 2.8
* 2.7:
  updated LICENSE year
  Fixed `@return self` with `$this`
2017-01-02 12:30:24 -08:00
Fabien Potencier 9879c8193f updated LICENSE year 2017-01-02 12:30:00 -08:00
Christian Flothmann f3bb206f12 skip tests with failure and error states too 2017-01-02 18:41:18 +01:00
Christian Flothmann 3777da5b67 hide stack trace of expected deprecation failures 2017-01-02 18:34:38 +01:00
Nicolas Grekas a89f60bbe8 bug #21117 [Yaml] add missing indicator character (xabbuh)
This PR was merged into the 3.2 branch.

Discussion
----------

[Yaml] add missing indicator character

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

The comma was mentioned in the deprecation message, though it actually was never checked before in the condition.

Commits
-------

8725e0b [Yaml] add missing indicator character
2017-01-02 17:48:41 +01:00
Nicolas Grekas 0507d4a657 minor #21137 Fixed `@return self` with `$this` in FormConfigBuilderInterface (wouterj)
This PR was merged into the 2.7 branch.

Discussion
----------

Fixed `@return self` with `$this` in FormConfigBuilderInterface

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

Fixes a tiny bug introduced by https://github.com/symfony/symfony/pull/21054 . `FormConfigBuilder` methods actually return `$this` and not `self`. This is important, as the `FormBuilder` (extending `FormConfigBuilder`) methods can also be called (e.g. `$builder->setDataMapper(...)->add()` is perfectly possible).

Commits
-------

505e84d Fixed `@return self` with `$this`
2017-01-02 17:29:15 +01:00
Nicolas Grekas c90de867c8 Merge branch '3.1' into 3.2
* 3.1:
  [Form] Fix forward compat of AbstractLayoutTest
2017-01-02 17:06:19 +01:00
Nicolas Grekas 5d9ac9e3ec Merge branch '2.8' into 3.1
* 2.8:
  [Form] Fix forward compat of AbstractLayoutTest
2017-01-02 17:05:26 +01:00
Nicolas Grekas b47915c34e [Form] Fix forward compat of AbstractLayoutTest 2017-01-02 17:04:05 +01:00
WouterJ 505e84d9f3 Fixed `@return self` with `$this` 2017-01-02 16:57:42 +01:00
Nicolas Grekas 81894faacd Fix merge 2017-01-02 16:13:20 +01:00
Nicolas Grekas 061b4b4ece Merge branch '3.1' into 3.2
* 3.1:
  Fix merge
2017-01-02 16:09:44 +01:00
Nicolas Grekas 4c623514f6 Fix merge 2017-01-02 16:09:29 +01:00
Nicolas Grekas 8df0540c9f Merge branch '3.1' into 3.2
* 3.1:
  do not depend on a fixed date in layout tests
  [Console] Escape default value when dumping help
  [Console] OS X Can't call cli_set_process_title php without superuser
  Fixed @return when returning this or static #bis
  fixed @return when returning this or static
  Polish translation improvement in Validator component
  [Console] Descriptors should use Helper::strlen
  [Config] Improve PHPdoc / IDE autocomplete
  [Debug] Wrap call to ->log in a try catch block
  [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes
  fix merge
  [cache] Bump RedisAdapter timeout to 5s
  fixed @return when returning this or static
  [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService
  remove is_writable check on filesystem cache
2017-01-02 15:57:35 +01:00
Nicolas Grekas 0dbc5cec7f Merge branch '2.8' into 3.1
* 2.8:
  do not depend on a fixed date in layout tests
  [Console] Escape default value when dumping help
  [Console] OS X Can't call cli_set_process_title php without superuser
  Fixed @return when returning this or static #bis
  Polish translation improvement in Validator component
  [Console] Descriptors should use Helper::strlen
  [Config] Improve PHPdoc / IDE autocomplete
  [Debug] Wrap call to ->log in a try catch block
  [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes
  [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService
2017-01-02 15:50:07 +01:00
Nicolas Grekas 23590eb51a Merge branch '2.7' into 2.8
* 2.7:
  do not depend on a fixed date in layout tests
  [Console] Escape default value when dumping help
  [Console] OS X Can't call cli_set_process_title php without superuser
  Polish translation improvement in Validator component
  [Console] Descriptors should use Helper::strlen
  [Config] Improve PHPdoc / IDE autocomplete
  [Debug] Wrap call to ->log in a try catch block
  [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes
  [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService
2017-01-02 15:44:49 +01:00
Nicolas Grekas e04041fdd5 minor #21134 [DI] Minor fixes in FactoryReturnTypePass (nicolas-grekas)
This PR was merged into the 3.2 branch.

Discussion
----------

[DI] Minor fixes in FactoryReturnTypePass

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

Commits
-------

c231f81 [DI] Minor fixes in FactoryReturnTypePass
2017-01-02 15:31:02 +01:00
Nicolas Grekas 508db68d2a bug #21121 [PhpUnitBridge] respect skipped and incomplete tests (xabbuh)
This PR was merged into the 3.2 branch.

Discussion
----------

[PhpUnitBridge] respect skipped and incomplete tests

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

Commits
-------

0c06093 respect skipped and incomplete tests
2017-01-02 15:29:01 +01:00
Christian Flothmann 0c060931ee respect skipped and incomplete tests 2017-01-02 15:25:30 +01:00
Nicolas Grekas 770ed8d44e minor #21119 [Form][FrameworkBundle][TwigBridge] do not depend on a fixed date in layout tests (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form][FrameworkBundle][TwigBridge] do not depend on a fixed date in layout tests

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

By default, the `DateType` as well as the `DateTimeType` set the choices being available for the year to a range starting five years in the past. After some time, this will make tests fail when the year of the fixed date being used as the initial data is before the first year being part of the choices.

Commits
-------

97b7fab do not depend on a fixed date in layout tests
2017-01-02 15:17:04 +01:00
Nicolas Grekas c231f811b5 [DI] Minor fixes in FactoryReturnTypePass 2017-01-02 15:07:02 +01:00