Commit Graph

25660 Commits

Author SHA1 Message Date
Fabien Potencier
86eee064dd Merge branch '3.0'
* 3.0:
  [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes
  [Debug] Fix case sensitivity checks
  [Debug] Fix handling of php7 throwables
  fix high deps tests
  fix testing deprecation messages
  [Process] remove dead code
  [WebProfilerBundle] Add missing use statement.
  [ClassLoader] Fix storing not-found classes in APC cache
  [Form] cs fixes in date types
  [phpunit] disable prophecy
2016-03-30 12:41:47 +02:00
Fabien Potencier
4e17cb2ecb Merge branch '2.8' into 3.0
* 2.8:
  [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes
  [Debug] Fix case sensitivity checks
  [Debug] Fix handling of php7 throwables
  fix high deps tests
  fix testing deprecation messages
  [Process] remove dead code
  [WebProfilerBundle] Add missing use statement.
  [ClassLoader] Fix storing not-found classes in APC cache
  [Form] cs fixes in date types
  [phpunit] disable prophecy
2016-03-30 12:41:14 +02:00
Fabien Potencier
8ca43b0760 Merge branch '2.7' into 2.8
* 2.7:
  [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes
  [Debug] Fix case sensitivity checks
  [Debug] Fix handling of php7 throwables
  fix high deps tests
  [Process] remove dead code
  [WebProfilerBundle] Add missing use statement.
  [ClassLoader] Fix storing not-found classes in APC cache
  [Form] cs fixes in date types
  [phpunit] disable prophecy
2016-03-30 12:37:34 +02:00
Fabien Potencier
b2a7fbf4ad minor #18295 [2.8] fix testing deprecation messages (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[2.8] fix testing deprecation messages

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

* always restore the previous error handler
* throw `LogicExcetion` when unexpected error type is triggered

Commits
-------

763ed6c fix testing deprecation messages
2016-03-30 12:31:32 +02:00
Fabien Potencier
850f2188a8 minor #18296 [3.1] fix testing deprecation messages (xabbuh)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[3.1] fix testing deprecation messages

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

* always restore the previous error handler
* throw `LogicExcetion` when unexpected error type is triggered

Commits
-------

0df544f fix testing deprecation messages
2016-03-30 12:28:54 +02:00
Fabien Potencier
5083a35100 bug #18352 [Debug] Fix case sensitivity checks (nicolas-grekas)
This PR was merged into the 2.7 branch.

Discussion
----------

[Debug] Fix case sensitivity checks

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

Commits
-------

7336177 [Debug] Fix case sensitivity checks
2016-03-30 12:25:08 +02:00
Fabien Potencier
03c28e4012 Merge branch '2.3' into 2.7
* 2.3:
  [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes
  [Debug] Fix handling of php7 throwables
  [Process] remove dead code
  [ClassLoader] Fix storing not-found classes in APC cache
  [Form] cs fixes in date types
2016-03-30 12:21:35 +02:00
Fabien Potencier
3c3e543fb1 bug #18336 [Debug] Fix handling of php7 throwables (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Debug] Fix handling of php7 throwables

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

Should not be merged into 2.7 because 2.7 already has the required logic.

Commits
-------

b032096 [Debug] Fix handling of php7 throwables
2016-03-30 12:04:02 +02:00
Fabien Potencier
eb06632b1d minor #18361 Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes

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

github.com should be more reliable

Commits
-------

8814ed0 [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes
2016-03-30 12:01:59 +02:00
Fabien Potencier
45755e02a5 bug #18354 [FrameworkBundle][TwigBridge] fix high deps tests (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle][TwigBridge] fix high deps 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        |

Commits
-------

aa4dd4f fix high deps tests
2016-03-30 11:58:23 +02:00
Nicolas Grekas
8814ed023d [ci] Get ICU/intl from github instead of nebm.ist.utl.pt/~glopes 2016-03-30 11:42:40 +02:00
Nicolas Grekas
7336177145 [Debug] Fix case sensitivity checks 2016-03-30 11:14:15 +02:00
Nicolas Grekas
b032096763 [Debug] Fix handling of php7 throwables 2016-03-30 11:02:35 +02:00
Christian Flothmann
aa4dd4fcf0 fix high deps tests 2016-03-29 22:47:33 +02:00
Fabien Potencier
8110612a46 minor #18348 [Process] remove dead code (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[Process] remove dead code

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

Commits
-------

d5e8f6f [Process] remove dead code
2016-03-29 22:11:02 +02:00
Christian Flothmann
0df544ff4c fix testing deprecation messages
* always restore the previous error handler
* throw `LogicExcetion` when unexpected error type is triggered
2016-03-29 21:03:24 +02:00
Christian Flothmann
763ed6c1e9 fix testing deprecation messages
* always restore the previous error handler
* throw `LogicExcetion` when unexpected error type is triggered
2016-03-29 21:00:15 +02:00
Nicolas Grekas
d5e8f6f20a [Process] remove dead code 2016-03-29 16:17:20 +02:00
Christian Flothmann
eca25ba3ea minor #18325 [Form] cs fixes in date types (HeahDude)
This PR was merged into the 2.3 branch.

Discussion
----------

[Form] cs fixes in date types

| Q             | A
| ------------- | ---
| Branch?       | 2.3+
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | n/a
| License       | MIT
| Doc PR        | ~

Commits
-------

bc21828 [Form] cs fixes in date types
2016-03-29 15:20:02 +02:00
Christian Flothmann
b054aebf37 minor #18340 [WebProfilerBundle] Add missing use statement. (camporter)
This PR was merged into the 2.7 branch.

Discussion
----------

[WebProfilerBundle] Add missing use statement.

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

The RouterController creates a Request in getTraces, but does not have a `use` statement, which causes an exception when trying to view profile routing in >2.7.

Commits
-------

0d31c3e [WebProfilerBundle] Add missing use statement.
2016-03-29 09:06:00 +02:00
Cameron Porter
0d31c3e9cb [WebProfilerBundle] Add missing use statement.
Request is needed in RouterController::getTraces to be able to create a request.
2016-03-28 23:46:00 -05:00
Tobias Schultze
666dc41d0e bug #18312 [ClassLoader] Fix storing not-found classes in APC cache (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[ClassLoader] Fix storing not-found classes in APC cache

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

Commits
-------

106ed06 [ClassLoader] Fix storing not-found classes in APC cache
2016-03-28 21:27:59 +02:00
Nicolas Grekas
106ed0660c [ClassLoader] Fix storing not-found classes in APC cache 2016-03-28 10:34:42 +02:00
Fabien Potencier
bcd981aadd Merge branch '2.3' into 2.7
* 2.3:
  [phpunit] disable prophecy
2016-03-28 09:32:00 +02:00
Fabien Potencier
29469323eb Merge branch '3.0'
* 3.0:
  [TwigBridge] fix lowest required Form dependency
2016-03-28 09:08:36 +02:00
Fabien Potencier
27dc53edd6 minor #18335 [TwigBridge] fix lowest required Form dependency (xabbuh)
This PR was merged into the 3.0 branch.

Discussion
----------

[TwigBridge] fix lowest required Form dependency

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

Commits
-------

77139ca [TwigBridge] fix lowest required Form dependency
2016-03-28 09:01:03 +02:00
Christian Flothmann
77139ca0a2 [TwigBridge] fix lowest required Form dependency 2016-03-28 08:29:34 +02:00
Fabien Potencier
c5c63dc142 Merge branch '3.0'
* 3.0:
  bumped Symfony version to 2.8.5
  updated VERSION for 2.8.4
  updated CHANGELOG for 2.8.4
  Revert "bug #18275 [Form] Fix BC break introduced in #14403 (HeahDude)"
  improved comment
  [FileSystem] Add support for Google App Engine.
  [2.8] fix mocks
  bumped Symfony version to 2.7.12
  [Form] Fix BC break introduced in #14403
  updated VERSION for 2.7.11
  updated CHANGELOG for 2.7.11
  [Request] Fix support of custom mime types with parameters
  fix mocks
  fix mocks
  [Validator] do not treat payload as callback
2016-03-27 18:15:51 +02:00
Fabien Potencier
c87c35ed97 Merge branch '2.8' into 3.0
* 2.8:
  bumped Symfony version to 2.8.5
  updated VERSION for 2.8.4
  updated CHANGELOG for 2.8.4
  bumped Symfony version to 2.7.12
  updated VERSION for 2.7.11
  updated CHANGELOG for 2.7.11
  [Request] Fix support of custom mime types with parameters
  fix mocks
  fix mocks
  [Validator] do not treat payload as callback
2016-03-27 16:50:32 +02:00
Fabien Potencier
df01f06a85 bumped Symfony version to 2.8.5 2016-03-27 16:32:56 +02:00
Fabien Potencier
8fb1fcdd51 Merge pull request #18329 from fabpot/release-2.8.4
released v2.8.4
2016-03-27 15:24:19 +02:00
Fabien Potencier
f5c0298b0b updated VERSION for 2.8.4 2016-03-27 15:23:50 +02:00
Fabien Potencier
047674ab8f updated CHANGELOG for 2.8.4 2016-03-27 15:23:48 +02:00
Jules Pietri
bc21828838 [Form] cs fixes in date types 2016-03-27 14:59:14 +02:00
Fabien Potencier
9e14f9f486 Merge branch '2.7' into 2.8
* 2.7:
  bumped Symfony version to 2.7.12
  updated VERSION for 2.7.11
  updated CHANGELOG for 2.7.11
  [Request] Fix support of custom mime types with parameters
  fix mocks
  fix mocks
  [Validator] do not treat payload as callback
2016-03-27 14:57:53 +02:00
Fabien Potencier
b0fffac156 fixed CS 2016-03-27 14:54:44 +02:00
Fabien Potencier
ae86e5bc88 feature #18215 [Cache] Add a Chain adapter (dunglas, nicolas-grekas)
This PR was merged into the 3.1-dev branch.

Discussion
----------

[Cache] Add a Chain adapter

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

Made in coordination with @dunglas

Commits
-------

68d9cea [Cache] Optimize Chain adapter
ebdcd16 [Cache] Add a Chain adapter
2016-03-27 14:53:58 +02:00
Fabien Potencier
3c1738a46b bug #18298 [Validator] do not treat payload as callback (xabbuh)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] do not treat payload as callback

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

see http://stackoverflow.com/a/36140305/2289865

Commits
-------

2066fc0 [Validator] do not treat payload as callback
2016-03-27 12:30:46 +02:00
Fabien Potencier
f4c998876e Revert "bug #18275 [Form] Fix BC break introduced in #14403 (HeahDude)"
This reverts commit 56fa7989a8, reversing
changes made to dcc3fce855.
2016-03-27 12:25:16 +02:00
Fabien Potencier
37a3a301bc Merge branch '2.8' into 3.0
* 2.8:
  improved comment
  [FileSystem] Add support for Google App Engine.
  [2.8] fix mocks
  [Form] Fix BC break introduced in #14403
2016-03-27 12:24:39 +02:00
Fabien Potencier
56fa7989a8 bug #18275 [Form] Fix BC break introduced in #14403 (HeahDude)
This PR was merged into the 2.8 branch.

Discussion
----------

[Form] Fix BC break introduced in #14403

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

Commits
-------

5f48c6a [Form] Fix BC break introduced in #14403
2016-03-27 12:21:58 +02:00
Fabien Potencier
dcc3fce855 improved comment 2016-03-27 12:20:16 +02:00
Fabien Potencier
7dafdda580 bug #18271 [FileSystem] Google app engine filesystem (swordbeta)
This PR was submitted for the master branch but it was merged into the 2.8 branch instead (closes #18271).

Discussion
----------

[FileSystem] Google app engine filesystem

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

Commits
-------

06d8697 [FileSystem] Add support for Google App Engine.
2016-03-27 12:19:31 +02:00
Michael van Tricht
06d86973cf [FileSystem] Add support for Google App Engine. 2016-03-27 12:19:31 +02:00
Fabien Potencier
bbf00d22dc minor #18304 [phpunit] disable prophecy (nicolas-grekas)
This PR was merged into the 2.3 branch.

Discussion
----------

[phpunit] disable prophecy

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

Both Prophecy and Symfony require some phpdocumentor dependencies, but incompatible versions.
Since we don't use Prophecy, let's disable it.
phpunit-mock-objects is forced to v3.1.1 until we fix our test suite (see https://github.com/sebastianbergmann/phpunit-mock-objects/issues/299).

Commits
-------

ae9bae7 [phpunit] disable prophecy
2016-03-27 12:05:51 +02:00
Nicolas Grekas
6376ea2296 minor #18321 [2.8] fix mocks (xabbuh)
This PR was squashed before being merged into the 2.8 branch (closes #18321).

Discussion
----------

[2.8] fix mocks

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

Commits
-------

7dff706 [2.8] fix mocks
2016-03-27 11:27:51 +02:00
Christian Flothmann
7dff706da1 [2.8] fix mocks 2016-03-27 11:27:49 +02:00
Fabien Potencier
831de7a015 bumped Symfony version to 2.7.12 2016-03-27 11:07:32 +02:00
Jules Pietri
5f48c6ac9a [Form] Fix BC break introduced in #14403 2016-03-25 19:30:27 +01:00
Fabien Potencier
66c99826ce Merge pull request #18315 from fabpot/release-2.7.11
released v2.7.11
2016-03-25 19:14:23 +01:00