Commit Graph

37754 Commits

Author SHA1 Message Date
Fabien Potencier
1c3d3db496 minor #28349 Fix usage of setUp in tests (4.1) (fabpot)
This PR was merged into the 4.1 branch.

Discussion
----------

Fix usage of setUp in tests (4.1)

| Q             | A
| ------------- | ---
| Branch?       | 4.1
| 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
-------

d8ba2cd703 fixed usage of setUp in tests
2018-09-04 08:29:30 +02:00
Fabien Potencier
525c98b224 Merge branch '3.4' into 4.1
* 3.4:
  fixed usage of setUp in tests
  fixed usage of setUp in tests
  [travis] minor fix (quater)
2018-09-04 08:28:44 +02:00
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
d8ba2cd703 fixed usage of setUp in tests 2018-09-04 08:24:48 +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
Nicolas Grekas
f9bd8acc58 [travis] minor fix (quater) 2018-09-03 15:07:30 +02:00
Nicolas Grekas
32db92eba7 Merge branch '3.4' into 4.1
* 3.4:
  [travis][appveyor] fix ter
2018-09-03 14:31:06 +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
ccc21574cf Merge branch '3.4' into 4.1
* 3.4:
  [appveyor] fix bis
  [appveyor] minor CI fix
2018-09-03 12:35:53 +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
95e6052074 Merge branch '3.4' into 4.1
* 3.4:
  Fix appveyor
2018-09-03 10:41:44 +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
Samuel ROZE
e2107d24e2 Merge branch '3.4' into 4.1
* 3.4:
  Use the real image URL for the filesystem tests
  [Finder] Update PHPdoc append()
  [DI] Fix phpdoc
  Fix code examples in PHPDoc
  [HttpKernel] Fix inheritdocs
  bumped Symfony version to 3.4.16
  updated VERSION for 3.4.15
  updated CHANGELOG for 3.4.15
2018-09-02 18:33:37 +01: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
Samuel ROZE
15f0be908c minor #28335 FrameworkBundle 4.1 == Messenger 4.1 (sroze)
This PR was merged into the 4.1 branch.

Discussion
----------

FrameworkBundle 4.1 == Messenger 4.1

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

That's the best way to tackle the BC break we've introduced (legitimately) in the consume command in Messenger 4.2.

Commits
-------

aaada7bf55 FrameworkBundle 4.1 == Messenger 4.1
2018-09-02 17:21:09 +01:00
Samuel ROZE
aaada7bf55 FrameworkBundle 4.1 == Messenger 4.1 2018-09-02 16:47:21 +01:00
Nicolas Grekas
d789189ade bug #28334 [FWB][Messenger] Revert "Move commands-specifics to a compiler pass in FWB" (sroze)
This PR was merged into the 4.1 branch.

Discussion
----------

[FWB][Messenger] Revert "Move commands-specifics to a compiler pass in FWB"

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

This reverts #28328.

Commits
-------

fb3f729d64 Revert "Move commands-specifics to a compiler pass in FWB"
2018-09-02 17:45:06 +02:00
Samuel ROZE
fb3f729d64 Revert "Move commands-specifics to a compiler pass in FWB"
This reverts commit b5415ead46.
2018-09-02 16:06:12 +01:00
Nicolas Grekas
bc90da7f60 bug #28328 [Messenger][FrameworkBundle] Move commands-specifics to a compiler pass in FWB (sroze)
This PR was merged into the 4.1 branch.

Discussion
----------

[Messenger][FrameworkBundle] Move commands-specifics to a compiler pass in FWB

| Q             | A
| ------------- | ---
| Branch?       | master
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | https://github.com/symfony/symfony/pull/28271#issuecomment-417333600
| License       | MIT
| Doc PR        | ø

We very recently [broke the tests](https://github.com/symfony/symfony/pull/28271#issuecomment-417333600) by adding a legitimate BC-break in one of Messenger's command. The failure is on FrameworkBundle (on the 4.1 branch) when using the "latest" dependencies (so messenger on master): the XML configuration does not match anymore the class.

Even though it makes sense to have most the compiler pass in the components, it does not make much sense to have things into them that are very coupled to what we defined in FWB' XML. This pull-request moves what is related to this command to the FWB directly.

Commits
-------

b5415ead46 Move commands-specifics to a compiler pass in FWB
2018-09-01 19:42:37 +02:00
Samuel ROZE
b5415ead46 Move commands-specifics to a compiler pass in FWB 2018-09-01 18:39:06 +01: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
30de3b8ef2 bumped Symfony version to 4.1.5 2018-08-28 08:19:34 +02:00
Fabien Potencier
c3f89b5cc8
Merge pull request #28291 from fabpot/release-4.1.4
released v4.1.4
2018-08-28 08:17:54 +02:00
Fabien Potencier
f1f6062a64 updated VERSION for 4.1.4 2018-08-28 08:17:42 +02:00
Fabien Potencier
7e9b69c7b3 updated CHANGELOG for 4.1.4 2018-08-28 08:17:15 +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
d6772c3207 Merge branch '3.4' into 4.1
* 3.4:
  [travis] disable symfony/flex during phpunit install
2018-08-27 21:15:26 +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