Commit Graph

28727 Commits

Author SHA1 Message Date
Fabien Potencier
f50e91419f minor #21162 [Console] Fix return type in Terminal docblocks (pjcdawkins)
This PR was merged into the 3.2 branch.

Discussion
----------

[Console] Fix return type in Terminal docblocks

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

This PR updates the docblock to reflect what's already in the code.

Commits
-------

6afb0afa24 [Console] Fix return type in Terminal docblocks
2017-01-04 19:57:48 -08:00
Fabien Potencier
8dedf9d999 Merge branch '3.1' into 3.2
* 3.1:
  tweaked php cs fixer configuration
  [TwigBundle] fixed typo in composer.json
2017-01-04 14:01:24 -08: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
be882c4663 Merge branch '3.1' into 3.2
* 3.1:
  Fix serializer/translations/validator resources loading for bundles overriding getPath()
2017-01-04 11:58:34 -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
Patrick Dawkins
6afb0afa24 [Console] Fix return type in Terminal docblocks 2017-01-04 17:48:15 +00:00
Nicolas Grekas
142afa359e bug #20995 [DependencyInjection] Fix the priority order of compiler pass trait (francoispluchino)
This PR was merged into the 3.2 branch.

Discussion
----------

[DependencyInjection] Fix the priority order of compiler pass trait

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

A regression has appeared between the version `3.1` and `3.2` on the compilation passes using a priority option (see #20332).

Indeed, the order is no longer preserved for service definitions with the same priority. This is caused by the `SplPriorityQueue` class that does not have a FIFO implementation (see this [comment](https://github.com/symfony/symfony/issues/20332#issuecomment-268096527)).

The PR #20993 fixes the problem but only for Forms, not for all compiler passes using the `PriorityTaggedServiceTrait` trait since `3.2`.

Commits
-------

aac9a7e Fix the priority order of compiler pass trait
2017-01-03 18:12:19 +01:00
Nicolas Grekas
1e39b99c7f Merge branch '3.1' into 3.2
* 3.1:
  Fix hhvm & tty tests
2017-01-03 17:40:20 +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
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