Commit Graph

28846 Commits

Author SHA1 Message Date
Nicolas Grekas
0f5f21882c minor #21144 [Security] Typo fix (dunglas)
This PR was merged into the 3.3-dev branch.

Discussion
----------

[Security] Typo fix

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

Remove an extra space, will make fabbot happy for #21136.

Commits
-------

4def721 [Security] Typo fix
2017-01-03 10:35:58 +01:00
Nicolas Grekas
c4732b3d1f Merge branch '3.2'
* 3.2:
  [PhpUnitBridge] Set COMPOSER_ROOT_VERSION while installing
2017-01-03 10:28:57 +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
fa41236986 bug #21145 [PhpUnitBridge] Restore --colors=always default in simple-phpunit (nicolas-grekas)
This PR was merged into the 3.3-dev branch.

Discussion
----------

[PhpUnitBridge] Restore --colors=always default in simple-phpunit

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

1f3167a [PhpUnitBridge] Restore --colors=always default in simple-phpunit
2017-01-03 10:18:56 +01:00
Nicolas Grekas
1f3167a720 [PhpUnitBridge] Restore --colors=always default in simple-phpunit 2017-01-03 10:09:32 +01:00
Nicolas Grekas
12a4cfe087 Merge branch '3.2'
* 3.2:
  Fix test
  skip tests with failure and error states too
  hide stack trace of expected deprecation failures
2017-01-03 09:54:10 +01:00
Nicolas Grekas
b703f32230 Fix test 2017-01-03 09:53:57 +01:00
Kévin Dunglas
4def721237
[Security] Typo fix 2017-01-03 08:50:10 +01: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
f71c699289 Merge branch '3.2'
* 3.2:
  updated LICENSE year
  updated LICENSE year
  updated LICENSE year
  Fixed `@return self` with `$this`
  [Yaml] add missing indicator character
2017-01-02 12:33:09 -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
Fabien Potencier
1315c9cb9b feature #21112 [PhpUnitBridge] run PHPUnit in the same process (xabbuh)
This PR was merged into the 3.3-dev branch.

Discussion
----------

[PhpUnitBridge] run PHPUnit in the same process

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

Commits
-------

198627877a [PhpUnitBridge] run PHPUnit in the same process
2017-01-02 12:09:43 -08:00
Fabien Potencier
e6cfa9a357 feature #21106 [Validator] support DateTimeInterface instances for times (xabbuh)
This PR was merged into the 3.3-dev branch.

Discussion
----------

[Validator] support DateTimeInterface instances for times

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

The same has already been done for the `Date` and `DateTime` constraints in #18759.

Commits
-------

1fa9276937 support DateTimeInterface instances for times
2017-01-02 12:08:39 -08:00
Fabien Potencier
cbcc6ca726 feature #20809 [FrameworkBundle] Display the controller class name in 'debug:router' (lyrixx)
This PR was merged into the 3.3-dev branch.

Discussion
----------

[FrameworkBundle] Display the controller class name in 'debug:router'

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

---

Before:
![screenshot7](https://cloud.githubusercontent.com/assets/408368/21152351/318af764-c166-11e6-8245-1729779e9809.png)

After:
![screenshot3](https://cloud.githubusercontent.com/assets/408368/21563210/02cf043e-ce80-11e6-94be-34736d85bb3b.png)

Commits
-------

157a8306a2 [FrameworkBundle] Display the controller class name in 'debug:router'
2017-01-02 12:07:21 -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
1099f6b112 bug #21126 Added missing use statemenet (Nyholm)
This PR was merged into the 3.3-dev branch.

Discussion
----------

Added missing use statemenet

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

We should use Symfony\Component\Translation\Exception\RuntimeException

Commits
-------

f9848be Added missing use statemenet
2017-01-02 17:42:57 +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
0d2dfa76f9 Merge branch '3.2'
* 3.2:
  [Form] Fix forward compat of AbstractLayoutTest
2017-01-02 17:06:32 +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
4d7b84512c Fix merge 2017-01-02 16:35:15 +01:00
Nicolas Grekas
14611db296 Merge branch '3.2'
* 3.2:
  Fix merge
  Fix merge
2017-01-02 16:13:40 +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
3e7ff2194e Merge branch '3.2'
* 3.2:
  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:58:37 +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
ffc07c318f Merge branch '3.2'
* 3.2:
  respect skipped and incomplete tests
  [DI] Minor fixes in FactoryReturnTypePass
  [TwigBridge] Fix upgrade/changelog notes
  [Debug] Fixed cast of stream
  [Console] minor addition to #20817 for branch 3.2
2017-01-02 15:31:48 +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
Tobias Nyholm
f9848be1d2 Added missing use statemenet
We should use Symfony\Component\Translation\Exception\RuntimeException
2017-01-02 10:34:12 +01:00
Christian Flothmann
97b7fabf51 do not depend on a fixed date in layout tests
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.
2017-01-01 13:43:56 +01:00
Christian Flothmann
8725e0b0e1 [Yaml] add missing indicator character
The comma was mentioned in the deprecation message, though it actually
was never checked before in the condition.
2017-01-01 11:33:22 +01:00
Christian Flothmann
198627877a [PhpUnitBridge] run PHPUnit in the same process 2016-12-31 14:41:54 +01:00