Commit Graph

27925 Commits

Author SHA1 Message Date
Nicolas Grekas e2b11b4207 bug #21166 [Cache] Fix order of writes in ChainAdapter (nicolas-grekas)
This PR was merged into the 3.1 branch.

Discussion
----------

[Cache] Fix order of writes in ChainAdapter

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

This is of importance in race situations: writes should happen on less volatile backend first so that.

Commits
-------

df552af [Cache] Fix order of writes in ChainAdapter
2017-01-05 18:42:20 +01:00
Nicolas Grekas df552af2f2 [Cache] Fix order of writes in ChainAdapter 2017-01-05 08:56:56 +01:00
Fabien Potencier 2904201ec6 Merge branch '2.8' into 3.1
* 2.8:
  tweaked php cs fixer configuration
2017-01-04 14:01:15 -08:00
Fabien Potencier a9ed1841dc Merge branch '2.7' into 2.8
* 2.7:
  tweaked php cs fixer configuration
2017-01-04 14:01:04 -08:00
Fabien Potencier 4864e9dd51 tweaked php cs fixer configuration 2017-01-04 14:00:53 -08:00
Fabien Potencier c3a50b0931 Merge branch '2.8' into 3.1
* 2.8:
  [TwigBundle] fixed typo in composer.json
2017-01-04 12:00:51 -08:00
Fabien Potencier fccb98c551 [TwigBundle] fixed typo in composer.json 2017-01-04 12:00:29 -08:00
Fabien Potencier 8f82bf7076 Merge branch '2.8' into 3.1
* 2.8:
  Fix serializer/translations/validator resources loading for bundles overriding getPath()
2017-01-04 11:57:42 -08:00
Fabien Potencier 829b6bd475 Merge branch '2.7' into 2.8
* 2.7:
  Fix serializer/translations/validator resources loading for bundles overriding getPath()
2017-01-04 11:55:18 -08:00
Fabien Potencier da88e6b1d7 bug #21113 [FrameworkBundle][HttpKernel] Fix resources loading for bundles with custom structure (chalasr)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle][HttpKernel] Fix resources loading for bundles with custom structure

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/issues/18563
| License       | MIT
| Doc PR        |  n/a

This fixes twig/translator/validator/serializer resource loading for bundles overriding `Bundle::getPath()`, adding a kernel parameter containing the bundle metadata (i.e. `path`, `namespace` and `parent`).

Fixes #18563 and unlocks https://github.com/symfony/symfony/pull/19586

Commits
-------

fef3146b3b Fix serializer/translations/validator resources loading for bundles overriding getPath()
2017-01-04 11:50:28 -08:00
Robin Chalas fef3146b3b
Fix serializer/translations/validator resources loading for bundles overriding getPath() 2017-01-04 20:27:15 +01:00
Maxime Steinhausser b282076d8a [Profiler][VarDumper] Fix minor color issue & duplicated selector 2017-01-03 20:31:24 +01:00
Nicolas Grekas 1563b4242b Merge branch '2.8' into 3.1
* 2.8:
  Fix hhvm & tty tests
2017-01-03 17:39:53 +01:00
Nicolas Grekas 1fc445a5e9 Merge branch '2.7' into 2.8
* 2.7:
  Fix hhvm & tty tests
2017-01-03 17:39:35 +01:00
Nicolas Grekas d294051fe8 Fix hhvm & tty tests 2017-01-03 17:38:07 +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 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 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
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 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
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 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 4c623514f6 Fix merge 2017-01-02 16:09:29 +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 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
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
Fabien Potencier 6699928cfd bug #21032 [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService (lyrixx)
This PR was merged into the 2.7 branch.

Discussion
----------

[SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService

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

8227593 [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService
2016-12-31 09:30:48 +01:00
Nicolas Grekas 6faa8abe04 bug #21078 [Console] Escape default value when dumping help (lyrixx)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] Escape default value when dumping help

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

c242690 [Console] Escape default value when dumping help
2016-12-30 15:17:32 +01:00
Christian Flothmann 2bb47136df fix IPv6 address handling in server commands 2016-12-30 11:19:53 +01:00
Grégoire Pineau c24269005b [Console] Escape default value when dumping help 2016-12-30 11:17:25 +01:00
Fabien Potencier 7e8e9e3a6e bug #21076 [Console] OS X Can't call cli_set_process_title php without superuser (ogizanagi)
This PR was merged into the 2.7 branch.

Discussion
----------

[Console] OS X Can't call cli_set_process_title php without superuser

| 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

The console component test suite is failing on OS X (10.12.2) as the `cli_set_process_title` function seems not to be allowed to be called without superuser. It seems to be an OS X limitation.
At least, the test suite should pass and a warning should be shown when using the component with this feature on OS X.

---

refs:

- http://stackoverflow.com/questions/27803120/cannot-set-process-title-in-a-php-command-line-script-using-cli-set-process-titl
- https://github.com/liip/php-osx/issues/139
- https://github.com/zfcampus/zf-console/pull/22

Commits
-------

9928c0d [Console] OS X Can't call cli_set_process_title php without superuser
2016-12-30 09:19:58 +01:00
Maxime Steinhausser 9928c0d44e [Console] OS X Can't call cli_set_process_title php without superuser 2016-12-30 09:09:55 +01:00
Fabien Potencier fd8750e992 minor #21100 Fixed @return when returning this or static #bis (ogizanagi)
This PR was merged into the 2.8 branch.

Discussion
----------

Fixed @return when returning this or static #bis

| 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

For some reasons these weren't fixed before https://github.com/symfony/symfony/pull/21059 was merged despite the review comments 😆

Commits
-------

20d8c74 Fixed @return when returning this or static #bis
2016-12-30 07:18:01 +01:00
Maxime Steinhausser 20d8c74bfe Fixed @return when returning this or static #bis 2016-12-29 22:47:05 +01:00
Fabien Potencier 2a778c2d16 fixed @return when returning this or static 2016-12-29 22:43:11 +01:00