Commit Graph

36030 Commits

Author SHA1 Message Date
Fabien Potencier
9a97ea819a minor #28348 Fix usage of setUp in tests (3.4) (fabpot)
This PR was merged into the 3.4 branch.

Discussion
----------

Fix usage of setUp in tests (3.4)

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | no
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| License       | MIT

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against the master branch.
-->

Commits
-------

298782841c fixed usage of setUp in tests
2018-09-04 08:28:11 +02:00
Fabien Potencier
fcc31cb6dd Merge branch '2.8' into 3.4
* 2.8:
  fixed usage of setUp in tests
  [travis] minor fix (quater)
2018-09-04 08:27:33 +02:00
Fabien Potencier
26b173b915 minor #28347 Fix usage of setUp in tests (fabpot)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix usage of setUp in tests

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | no
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| License       | MIT

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against the master branch.
-->

Commits
-------

62e620843e fixed usage of setUp in tests
2018-09-04 08:26:58 +02:00
Fabien Potencier
298782841c fixed usage of setUp in tests 2018-09-04 08:21:44 +02:00
Fabien Potencier
62e620843e fixed usage of setUp in tests 2018-09-04 07:42:16 +02:00
Hugo Alliaume
b133bd6bd3 chore: rename Appveyor filename 2018-09-03 20:51:33 +02:00
Nicolas Grekas
f9bd8acc58 [travis] minor fix (quater) 2018-09-03 15:07:30 +02:00
Nicolas Grekas
e170d940d8 Merge branch '2.8' into 3.4
* 2.8:
  [travis][appveyor] fix ter
2018-09-03 14:31:00 +02:00
Nicolas Grekas
74b6689838 [travis][appveyor] fix ter 2018-09-03 14:29:28 +02:00
Nicolas Grekas
fc484d77ff Merge branch '2.8' into 3.4
* 2.8:
  [appveyor] fix bis
  [appveyor] minor CI fix
2018-09-03 12:35:43 +02:00
Nicolas Grekas
450098a5a1 minor #28342 [appveyor] fix bis (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[appveyor] fix bis

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

Give it another try...

Commits
-------

9d24400b1f [appveyor] fix bis
2018-09-03 12:33:55 +02:00
Nicolas Grekas
9d24400b1f [appveyor] fix bis 2018-09-03 12:28:27 +02:00
Nicolas Grekas
3b687fd09d minor #28340 [appveyor] minor CI fix (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[appveyor] minor CI fix

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

Should fix this message on appveyor:
`fatal: Not a valid object name HEAD^`

Commits
-------

a391331791 [appveyor] minor CI fix
2018-09-03 11:34:13 +02:00
Nicolas Grekas
a391331791 [appveyor] minor CI fix 2018-09-03 11:26:11 +02:00
Nicolas Grekas
7a4d7b5f10 Merge branch '2.8' into 3.4
* 2.8:
  Fix appveyor
2018-09-03 10:40:31 +02:00
Nicolas Grekas
599de83b33 Fix appveyor 2018-09-03 10:32:25 +02:00
Nicolas Grekas
aa13bfdde0 Merge branch '2.8' into 3.4
* 2.8:
  Use the real image URL for the filesystem tests
  [Finder] Update PHPdoc append()
  [DI] Fix phpdoc
  Fix code examples in PHPDoc
  [HttpKernel] Fix inheritdocs
2018-09-02 19:11:59 +02:00
Fabien Potencier
53c1a5f2bc minor #28337 [Filesystem] Use the real image URL for tests (sroze)
This PR was merged into the 2.8 branch.

Discussion
----------

[Filesystem] Use the real image URL for tests

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

AppVeyor is always failing on this test. Trying with the real HTTPS url of the image to see if it's working or if it's something else.

Commits
-------

886f7390b8 Use the real image URL for the filesystem tests
2018-09-02 19:04:10 +02:00
Samuel ROZE
886f7390b8 Use the real image URL for the filesystem tests 2018-09-02 18:03:13 +01:00
Yanick Witschi
d2e9e0bcf3 Fixed the interface description of the url generator interface 2018-08-31 10:56:24 +02:00
Fabien Potencier
fb9ccc0fec minor #28301 Fix code examples in PHPDoc (maidmaid)
This PR was merged into the 2.8 branch.

Discussion
----------

Fix code examples in PHPDoc

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

This PR properly indents the code examples in PHPDoc for a clean render.

Commits
-------

1afb043dc5 Fix code examples in PHPDoc
2018-08-30 18:22:36 +02:00
Nicolas Grekas
592c4afd22 minor #28310 [Finder] Update PHPdoc append() (ro0NL)
This PR was squashed before being merged into the 2.8 branch (closes #28310).

Discussion
----------

[Finder] Update PHPdoc append()

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #...   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->

<!--
Write a short README entry for your feature/bugfix here (replace this comment block.)
This will help people understand your PR and can be used as a start of the Doc PR.
Additionally:
 - Bug fixes must be submitted against the lowest branch where they apply
   (lowest branches are regularly merged to upper ones so they get the fixes too).
 - Features and deprecations must be submitted against the master branch.
-->

Commits
-------

111d9bc6f5 [Finder] Update PHPdoc append()
2018-08-30 17:33:00 +02:00
Roland Franssen
111d9bc6f5 [Finder] Update PHPdoc append() 2018-08-30 17:32:53 +02:00
Nicolas Grekas
7b4fb12d0a minor #28311 [DI] Fix phpdoc (hason)
This PR was merged into the 2.8 branch.

Discussion
----------

[DI] Fix phpdoc

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

Commits
-------

f1d594b732 [DI] Fix phpdoc
2018-08-30 17:32:22 +02:00
Martin Hasoň
f1d594b732
[DI] Fix phpdoc 2018-08-30 11:30:49 +02:00
Dany Maillard
1afb043dc5 Fix code examples in PHPDoc 2018-08-29 15:11:53 +02:00
Fabien Potencier
b954fbcf16 minor #28297 [HttpKernel] Fix inheritdocs (ro0NL)
This PR was squashed before being merged into the 2.8 branch (closes #28297).

Discussion
----------

[HttpKernel] Fix inheritdocs

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no     <!-- see https://symfony.com/bc -->
| Deprecations? | no
| Tests pass?   | yes    <!-- please add some, will be required by reviewers -->
| Fixed tickets | #...   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->

fixed some obvious inheritdocs for Kernel & Bundle class. Nevertheless there's a lot of inconsistency in general, and this probably deserves a CS fixer long term.

Commits
-------

b04ef43d22 [HttpKernel] Fix inheritdocs
2018-08-29 14:45:42 +02:00
Roland Franssen
b04ef43d22 [HttpKernel] Fix inheritdocs 2018-08-29 14:45:36 +02:00
Fabien Potencier
b61480f10b bumped Symfony version to 3.4.16 2018-08-28 08:16:34 +02:00
Fabien Potencier
5bb5c2d4b0
Merge pull request #28290 from fabpot/release-3.4.15
released v3.4.15
2018-08-28 08:06:28 +02:00
Fabien Potencier
1735abb8a0 updated VERSION for 3.4.15 2018-08-28 08:06:12 +02:00
Fabien Potencier
ff81046f38 updated CHANGELOG for 3.4.15 2018-08-28 08:05:40 +02:00
Nicolas Grekas
cbe9822ce8 Merge branch '2.8' into 3.4
* 2.8:
  [travis] disable symfony/flex during phpunit install
2018-08-27 21:14:37 +02:00
Nicolas Grekas
411e0c5d66 minor #28288 [travis] disable symfony/flex during phpunit install (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[travis] disable symfony/flex during phpunit install

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

Fixing https://travis-ci.org/symfony/symfony/jobs/421206649

Commits
-------

4623fe74ca [travis] disable symfony/flex during phpunit install
2018-08-27 21:14:05 +02:00
Nicolas Grekas
4623fe74ca [travis] disable symfony/flex during phpunit install 2018-08-27 21:11:57 +02:00
Fabien Potencier
05dccf88d0 Merge branch '2.8' into 3.4
* 2.8:
  bumped Symfony version to 2.8.46
  updated VERSION for 2.8.45
  update CONTRIBUTORS for 2.8.45
  updated CHANGELOG for 2.8.45
  Instantiate $offset and $maxlen at definition
2018-08-27 19:45:33 +02:00
Fabien Potencier
a8b16054e7 bumped Symfony version to 2.8.46 2018-08-27 19:44:28 +02:00
Fabien Potencier
289dc238c5
Merge pull request #28286 from fabpot/release-2.8.45
released v2.8.45
2018-08-27 19:33:57 +02:00
Fabien Potencier
7e0a16cf2f updated VERSION for 2.8.45 2018-08-27 19:33:38 +02:00
Fabien Potencier
97e425cdcb update CONTRIBUTORS for 2.8.45 2018-08-27 19:33:31 +02:00
Fabien Potencier
0aee31fcd8 updated CHANGELOG for 2.8.45 2018-08-27 19:33:04 +02:00
Fabien Potencier
b547855b23 bug #28278 [HttpFoundation] Fix unprepared BinaryFileResponse sends empty file (wackymole)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpFoundation] Fix unprepared BinaryFileResponse sends empty file

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes, with the exception of preexisting, unrelated failures
| Fixed tickets | #28237
| License       | MIT
| Doc PR        |

When you call `BinaryFileResponse#sendContent()` without first calling `prepare()` the response is sent but the contents are empty. `prepare()` properly initializes the `$maxlen` and `$offset` properties. However, `sendContent()` doesn't do any sanity checking, and so, uses the uninitialized properties. This causes `stream_copy_to_stream()` to copy empty contents and the file that is sent, to contain nothing.

This change initializes the properties at definition instead of in `prepare()`.

> Additionally:
> - Bug fixes must be submitted against the lowest branch where they apply

~I'm not sure how early this bug exists, or how far back to go. I'll check to see if 2.7 and 2.8 are affected and report back.~

Commits
-------

dba8687a5d Instantiate $offset and $maxlen at definition
2018-08-27 17:52:41 +02:00
Fabien Potencier
2041624286 bug #28284 [PhpUnitBridge] keep compat with composer 1.0 (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[PhpUnitBridge] keep compat with composer 1.0

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

Remove `--no-suggest` when installing PHPUnit from the bridge to keep compat with composer 1.0, which is shipped with Ubuntu 16.04LTS.

Commits
-------

28492a7bb1 [PhpUnitBridge] keep compat with composer 1.0
2018-08-27 17:39:04 +02:00
Nicolas Grekas
28492a7bb1 [PhpUnitBridge] keep compat with composer 1.0 2018-08-27 17:17:06 +02:00
Justin
dba8687a5d Instantiate $offset and $maxlen at definition 2018-08-27 09:50:38 -04:00
Nicolas Grekas
96e0833b93 Merge branch '2.8' into 3.4
* 2.8:
  [HttpKernel] fix forwarding trusted headers as server parameters
2018-08-24 16:37:40 +02:00
Nicolas Grekas
2554ad0698 bug #28241 [HttpKernel] fix forwarding trusted headers as server parameters (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpKernel] fix forwarding trusted headers as server parameters

| Q             | A
| ------------- | ---
| Branch?       | 2.8
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #28233, #28226, #28225, #28240
| License       | MIT
| Doc PR        | -

Commits
-------

92953485a5 [HttpKernel] fix forwarding trusted headers as server parameters
2018-08-24 16:33:48 +02:00
Nicolas Grekas
24e8bc233c Merge branch '2.8' into 3.4
* 2.8:
  [travis] fix composer.lock invalidation for deps=low
2018-08-24 14:41:28 +02:00
Nicolas Grekas
77cd8b694a minor #28258 [travis] fix composer.lock invalidation for deps=low (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[travis] fix composer.lock invalidation for deps=low

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

Commits
-------

41ffba1916 [travis] fix composer.lock invalidation for deps=low
2018-08-24 14:40:49 +02:00
Nicolas Grekas
41ffba1916 [travis] fix composer.lock invalidation for deps=low 2018-08-24 14:37:56 +02:00