Commit Graph

38031 Commits

Author SHA1 Message Date
Fabien Potencier
ae599089c3 minor #28380 Update .editorconfig (Saphyel)
This PR was submitted for the master branch but it was squashed and merged into the 2.8 branch instead (closes #28380).

Discussion
----------

Update .editorconfig

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

.editorconfig is already in the project and we can add some options to match with the PSR standard

Commits
-------

a4347a4389 Update .editorconfig
2018-09-06 16:23:05 +02:00
Carlos Jimenez
a4347a4389 Update .editorconfig 2018-09-06 16:22:56 +02:00
Nicolas Grekas
432487f577 Merge branch '3.4' into 4.1
* 3.4:
  [appveyor] fix
  Revert "minor #28321 [Routing] Fixed the interface description of the url generator interface (Toflar)"
  Fixed caching of templates in default path on cache warmup
  remove cache warmers when Twig cache is disabled
  [HttpKernel][FrameworkBundle] Fix escaping of serialized payloads passed to test clients
  chore: rename Appveyor filename
  Fixed the interface description of the url generator interface
  Format file size in validation message according to binaryFormat option
2018-09-05 13:58:22 +02:00
Nicolas Grekas
5632dc7c7a Merge branch '2.8' into 3.4
* 2.8:
  [appveyor] fix
  Revert "minor #28321 [Routing] Fixed the interface description of the url generator interface (Toflar)"
  remove cache warmers when Twig cache is disabled
  [HttpKernel][FrameworkBundle] Fix escaping of serialized payloads passed to test clients
  chore: rename Appveyor filename
  Fixed the interface description of the url generator interface
  Format file size in validation message according to binaryFormat option
2018-09-05 13:56:21 +02:00
Nicolas Grekas
992a174470 [appveyor] fix 2018-09-05 13:43:17 +02:00
Fabien Potencier
eaeb124093 bug #27764 [TwigBundle] Fixed caching of templates in default path on cache warmup (yceruto)
This PR was merged into the 3.4 branch.

Discussion
----------

[TwigBundle] Fixed caching of templates in default path on cache warmup

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

**Reproducer**
```bash
$ git clone https://github.com/symfony/demo && cd demo
$ bin/console cache:clear
$ find var/cache/dev/twig -printf "%y\n" | awk '/f/{f++}/d/{d++}END{printf "%d directories, %d files\n", d, f}'
...
```
**Before:**
```bash
...
131 directories, 167 files
```
Twig `paths` config:
44ce4dd625/src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php (L104)
`%kernel.root_dir%/Resources/views`:
2b01d59481/src/Symfony/Bundle/TwigBundle/TemplateIterator.php (L50)
**After:**
```bash
...
141 directories, 193 files
```
Adding `%twig.default_path%`.

Commits
-------

245c860ab4 Fixed caching of templates in default path on cache warmup
2018-09-05 10:48:23 +02:00
Nicolas Grekas
cba6421b2b Merge branch '3.4' into 4.1
* 3.4:
  [DI] Fix dumping some complex service graphs
  change baseUrl to basePath to fix wrong profiler url
2018-09-05 09:26:50 +02:00
Nicolas Grekas
8851c141d2 bug #28366 [DI] Fix dumping some complex service graphs (nicolas-grekas)
This PR was merged into the 3.4 branch.

Discussion
----------

[DI] Fix dumping some complex service graphs

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #28296 (and its duplicates #28355 & #28362 ~+ possibly #28304~)
| License       | MIT
| Doc PR        | -

Commits
-------

769fd4be0e [DI] Fix dumping some complex service graphs
2018-09-05 09:20:12 +02:00
Nicolas Grekas
769fd4be0e [DI] Fix dumping some complex service graphs 2018-09-05 08:48:52 +02:00
Fabien Potencier
90494c20cc Revert "minor #28321 [Routing] Fixed the interface description of the url generator interface (Toflar)"
This reverts commit 487f8acde5, reversing
changes made to cf359c2e79.
2018-09-05 07:00:57 +02:00
Fabien Potencier
a159638233 bug #27970 [FileValidator] Format file size in validation message according to binaryFormat option (jfredon)
This PR was merged into the 2.8 branch.

Discussion
----------

[FileValidator] Format file size in validation message according to binaryFormat option

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

The binaryFormat option of the constraint is not taken into account if the maxsize limit is defined by the php configuration files.
This patch correct this inconsistent behavior.

If the binaryOption is not set, the unit of measurement used remains in binary because it’s the unit used in php configuration files.

Commits
-------

0edbbd3fea Format file size in validation message according to binaryFormat option
2018-09-04 19:17:48 +02:00
Yonel Ceruto
245c860ab4 Fixed caching of templates in default path on cache warmup 2018-09-04 12:49:36 -04:00
Christophe Coevoet
150bd841a3 minor #28356 Add missing LICENSE file (fabpot)
This PR was merged into the 4.1 branch.

Discussion
----------

Add missing LICENSE file

| 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 -->
| Fixed tickets | #28353
| 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
-------

6484ef8258 added missing LICENSE file
2018-09-04 15:15:54 +02:00
Fabien Potencier
6484ef8258 added missing LICENSE file 2018-09-04 15:11:50 +02:00
Fabien Potencier
e7d325f49f bug #28029 [TwigBundle] remove cache warmers when Twig cache is disabled (xabbuh)
This PR was merged into the 2.8 branch.

Discussion
----------

[TwigBundle] remove cache warmers when Twig cache is disabled

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

Commits
-------

ef1f7ff0bb remove cache warmers when Twig cache is disabled
2018-09-04 10:59:51 +02:00
Christian Flothmann
ef1f7ff0bb remove cache warmers when Twig cache is disabled 2018-09-04 10:49:33 +02:00
Fabien Potencier
824dbbdd8f bug #28322 [Workflow] Make sure we do not run the next transition on an updated state (Nyholm)
This PR was squashed before being merged into the 4.1 branch (closes #28322).

Discussion
----------

[Workflow] Make sure we do not run the next transition on an updated state

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

When you have a workflow like this, where all transitions are named the same.

![php](https://user-images.githubusercontent.com/1275206/44908106-87914680-ad1a-11e8-9c6f-e58de4b255e8.png)

The current behavior on `$stateMachine->apply($object, 'next')` is that it will go to "done".

It will do this because it checks the current "froms" at each iteration in the loop in `apply()`. It should check the valid transition before it actually apply them.

Commits
-------

d9dda76d8a [Workflow] Make sure we do not run the next transition on an updated state
2018-09-04 10:20:17 +02:00
Nyholm
d9dda76d8a [Workflow] Make sure we do not run the next transition on an updated state 2018-09-04 10:20:06 +02:00
Fabien Potencier
487f8acde5 minor #28321 [Routing] Fixed the interface description of the url generator interface (Toflar)
This PR was merged into the 2.8 branch.

Discussion
----------

[Routing] Fixed the interface description of the url generator interface

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

The `UrlGenerator` has always been able to return `null`. Many tests assert this for many years but the interface actually always only allowed a `string` return.

Examples for tests:

- https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php#L206
- https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php#L217
- https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php#L471

So I think I would not consider this change as a BC break but rather a doc fix because it seems like `null` has always been an accepted return value.

Commits
-------

d2e9e0bcf3 Fixed the interface description of the url generator interface
2018-09-04 10:17:45 +02:00
Fabien Potencier
cf359c2e79 bug #28344 [HttpKernel][FrameworkBundle] Fix escaping of serialized payloads passed to test clients (nicolas-grekas)
This PR was merged into the 2.8 branch.

Discussion
----------

[HttpKernel][FrameworkBundle] Fix escaping of serialized payloads passed to test clients

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

Commits
-------

255455430a [HttpKernel][FrameworkBundle] Fix escaping of serialized payloads passed to test clients
2018-09-04 10:15:22 +02:00
Fabien Potencier
b102e72856 minor #28345 chore: rename AppVeyor filename (Kocal)
This PR was merged into the 2.8 branch.

Discussion
----------

chore: rename AppVeyor filename

| 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 -->
| Fixed tickets | ~   <!-- #-prefixed issue number(s), if any -->
| License       | MIT
| Doc PR        | ~ <!-- 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.
-->

In [AppVeyor documentation](https://www.appveyor.com/docs/build-configuration/#yaml-file-alternative-naming), it says that is possible to use alternative filename `.appveyor.yml`.

By doing this, I find this more consistent with Travis file which starts with a `.` too.

Commits
-------

b133bd6bd3 chore: rename Appveyor filename
2018-09-04 10:13:26 +02:00
Fabien Potencier
edbd869bfd bug #28183 [WebProfilerBundle] fix wrong url when base path is the index (ismail1432)
This PR was submitted for the master branch but it was merged into the 3.4 branch instead (closes #28183).

Discussion
----------

[WebProfilerBundle] fix wrong url when base path is the index

| Q             | A
| ------------- | ---
| Branch?       | >= 3.4
| Bug fix?      | yes
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| 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 -->
| Fixed tickets | #27846   <!-- #-prefixed issue number(s), if any -->
| License       | MIT

The `FileLinkFormatter` create a wrong url because it's using [getBaseUrl](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpFoundation/Request.php#L870) that render the script filename, the problem is that in this class it's used twice, first time with the [getBaseUrl method](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php#L99) and another time with the [generate method](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php#L77). Just switch to `getBasePath` solve the issue.
WDYT ?

Commits
-------

897615ee0d change baseUrl to basePath to fix wrong profiler url
2018-09-04 09:18:11 +02:00
Smaine Milianni
897615ee0d change baseUrl to basePath to fix wrong profiler url 2018-09-04 09:18:01 +02:00
Nicolas Grekas
255455430a [HttpKernel][FrameworkBundle] Fix escaping of serialized payloads passed to test clients 2018-09-04 08:39:37 +02:00
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
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
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