Commit Graph

32704 Commits

Author SHA1 Message Date
Nicolas Grekas
f1a7b075a6 [DI] Fix circular-aliases message 2017-12-07 18:21:50 +01:00
Fabien Potencier
6e7e6847d9 bug #25364 [DependencyInjection] Prevent a loop in aliases within the findDefinition method (sroze)
This PR was merged into the 3.3 branch.

Discussion
----------

[DependencyInjection] Prevent a loop in aliases within the `findDefinition` method

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

This prevents an infinite loop going when aliases reference themselves. This is based on 3.3 as the "normalized ID" changed to allow non-lowercase names. Fixing this in 2.7 would mean a merge conflict that IMO is not worth it.

Commits
-------

22f35239a4 Prevent a loop in aliases within the `findDefinition` method
2017-12-07 08:06:29 -08:00
Samuel ROZE
22f35239a4
Prevent a loop in aliases within the findDefinition method 2017-12-06 16:40:30 +00:00
Fabien Potencier
b783602622 bumped Symfony version to 3.3.15 2017-12-04 15:02:34 -08:00
Fabien Potencier
8e2b473de6
Merge pull request #25319 from fabpot/release-3.3.14
released v3.3.14
2017-12-04 14:26:41 -08:00
Fabien Potencier
4965ef5311 updated VERSION for 3.3.14 2017-12-04 14:26:28 -08:00
Fabien Potencier
b1a1a8fb5c updated CHANGELOG for 3.3.14 2017-12-04 14:26:15 -08:00
Fabien Potencier
31e4533f13 bug #25304 [Bridge/PhpUnit] Prefer $_SERVER['argv'] over $argv (ricknox)
This PR was submitted for the master branch but it was squashed and merged into the 3.3 branch instead (closes #25304).

Discussion
----------

[Bridge/PhpUnit] Prefer $_SERVER['argv'] over $argv

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

This makes the script usable even if it is wrapped into another script, which is what some IDEs like PHPStorm do.

Commits
-------

1ff22e6acc [Bridge/PhpUnit] Prefer ['argv'] over
2017-12-04 12:15:54 -08:00
Ricardo de Vries
1ff22e6acc [Bridge/PhpUnit] Prefer ['argv'] over 2017-12-04 12:15:54 -08:00
Nicolas Grekas
1f2213a691 Merge branch '2.8' into 3.3
* 2.8:
  Fix for missing whitespace control modifier in form layout
2017-12-04 20:58:26 +01:00
Nicolas Grekas
c865b03fd5 Merge branch '2.7' into 2.8
* 2.7:
  Fix for missing whitespace control modifier in form layout
2017-12-04 20:58:03 +01:00
Fabien Potencier
0f0a5764ca fixed typo 2017-12-04 11:01:57 -08:00
Fabien Potencier
b646de885c bug #25308 [FrameworkBundle] Fix a bug where a color tag will be shown when passing an antislash (Simperfit)
This PR was merged into the 3.3 branch.

Discussion
----------

[FrameworkBundle] Fix a bug where a color tag will be shown when passing an antislash

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

You can see in the [reproducer](e6509ffcb4) when running `bin/console debug:container` that there an error in the ouput (like in the issue) when using a class with `\` in the service name.

This PR fix this wrong output. (even if that feels more developer thingy when there are xml everywhere ;)

Commits
-------

890edf7c38 [FrameworkBundle] Fix a bug where a color tag will be shown when passing an antislash
2017-12-04 10:48:04 -08:00
Fabien Potencier
11105f3717 fixed tests 2017-12-04 10:36:52 -08:00
Fabien Potencier
783cd69c75 bug #25278 Fix for missing whitespace control modifier in form layout (kubawerlos)
This PR was merged into the 2.7 branch.

Discussion
----------

Fix for missing whitespace control modifier in form layout

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

That single missing whitespace control modifier results in e.g. new line in `data-prototype` attribute when using CollectionType field type in form.

Commits
-------

369075a282 Fix for missing whitespace control modifier in form layout
2017-12-04 10:25:32 -08:00
Fabien Potencier
8a4bb79203 minor #25296 [WebProfiler] Disallow viewing dot-files in Profiler (curry684)
This PR was merged into the 3.3 branch.

Discussion
----------

[WebProfiler] Disallow viewing dot-files in Profiler

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

The file viewer in the profiler should not open files that were specifically intended to be hidden, like specifically .env files, but similarly files like .htaccess that might expose server configuration knowledge.

Added tests validating both the new and old behavior.

Commits
-------

6a2f518e74 Disallow viewing dot-files in Profiler
2017-12-04 10:24:30 -08:00
Fabien Potencier
93e136b306 moved method to function 2017-12-04 10:22:59 -08:00
Fabien Potencier
0829b79c6d Merge branch '2.8' into 3.3
* 2.8:
  marked method as being internal
2017-12-04 10:21:35 -08:00
Fabien Potencier
4dccfefb7c Merge branch '2.7' into 2.8
* 2.7:
  marked method as being internal
2017-12-04 10:21:19 -08:00
Fabien Potencier
0f8ff1583a marked method as being internal 2017-12-04 10:21:12 -08:00
Fabien Potencier
e4ce3129d9 bug #25305 [Form][TwigBridge] Fix collision between view properties and form fields (yceruto)
This PR was merged into the 3.3 branch.

Discussion
----------

[Form][TwigBridge] Fix collision between view properties and form fields

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

Require https://github.com/symfony/symfony/pull/25236 merged in 3.3

Commits
-------

888b48a89c Fix collision between view properties and form fields
2017-12-04 10:16:13 -08:00
Fabien Potencier
561767ce65 Merge branch '2.8' into 3.3
* 2.8:
  Fix collision between view properties and form fields
2017-12-04 10:09:49 -08:00
Fabien Potencier
c610a32b4b Merge branch '2.7' into 2.8
* 2.7:
  Fix collision between view properties and form fields
2017-12-04 10:08:18 -08:00
Fabien Potencier
9524396712 bug #25236 [Form][TwigBridge] Fix collision between view properties and form fields (yceruto)
This PR was merged into the 2.7 branch.

Discussion
----------

[Form][TwigBridge] Fix collision between view properties and form fields

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

This introduce a new Twig test function `rootform` that guarantee the right access to the `parent` property of the form view. The rest of the properties (`vars` and `children`) are not used at least inside Symfony repo.

I've chosen this solution because it doesn't [affect the design of the form view class/interface](https://github.com/symfony/symfony/pull/19492/files#diff-f60b55ea46e40b9c4475a1bd361f6940R168) and because [the problem happen only on Twig](fd98722d15/lib/Twig/Extension/Core.php (L1439-L1447)).

More details about the problem here:
* https://github.com/symfony/symfony/issues/24892
* https://github.com/symfony/symfony/pull/19492
* https://github.com/symfony/symfony/pull/23649#discussion_r129244236

_if this is approved_ we should update also:
* [`foundation_5_layout.html.twig`](336600857b/src/Symfony/Bridge/Twig/Resources/views/Form/foundation_5_layout.html.twig (L321-L326)) in `3.3` (done in https://github.com/symfony/symfony/pull/25305)
* [`bootstrap_4_layout.html.twig`](76d356f36a/src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_4_layout.html.twig (L176)) in `3.4` (done in https://github.com/symfony/symfony/pull/25306)

Commits
-------

8505894988 Fix collision between view properties and form fields
2017-12-04 10:06:36 -08:00
Fabien Potencier
73ff764bd9 bug #25312 [DI] Fix deep-inlining of non-shared refs (nicolas-grekas)
This PR was merged into the 3.3 branch.

Discussion
----------

[DI] Fix deep-inlining of non-shared refs

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

Non-shared definitions should deep-clone their inlined non-shared definitions.

Commits
-------

eb2a15229a [DI] Fix deep-inlining of non-shared refs
2017-12-04 10:00:31 -08:00
Fabien Potencier
c08602cb80 bug #25309 [Yaml] parse newlines in quoted multiline strings (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[Yaml] parse newlines in quoted multiline strings

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

Commits
-------

b23b957ae9 parse newlines in quoted multiline strings
2017-12-04 09:04:06 -08:00
Amrouche Hamza
890edf7c38
[FrameworkBundle] Fix a bug where a color tag will be shown when passing an antislash 2017-12-04 17:41:23 +01:00
Nicolas Grekas
eb2a15229a [DI] Fix deep-inlining of non-shared refs 2017-12-04 16:44:12 +01:00
Christian Flothmann
b23b957ae9 parse newlines in quoted multiline strings 2017-12-04 15:51:35 +01:00
Yonel Ceruto
888b48a89c Fix collision between view properties and form fields 2017-12-04 08:54:58 -05:00
Niels Keurentjes
6a2f518e74 Disallow viewing dot-files in Profiler
The file viewer in the profiler should not open files that were meant
to be hidden, like specifically .env files, but similarly files like
.htaccess that might expose server configuration knowledge.
2017-12-04 14:14:51 +01:00
Nicolas Grekas
c9f72e2807 [SecurityBundle] Fix compat with HttpFoundation >=3.4 2017-12-04 13:50:51 +01:00
Nicolas Grekas
5b997f1f21 Merge branch '2.8' into 3.3
* 2.8:
  [FrameworkBundle] Fix visibility of a test helper
  [link] clear the cache after linking
  [link] Prevent warnings when running link with 2.7
  [Validator] ExpressionValidator should use OBJECT_TO_STRING to allow value in message
2017-12-04 13:17:10 +01:00
Nicolas Grekas
874d418a8f Merge branch '2.7' into 2.8
* 2.7:
  [FrameworkBundle] Fix visibility of a test helper
  [link] clear the cache after linking
  [link] Prevent warnings when running link with 2.7
  [Validator] ExpressionValidator should use OBJECT_TO_STRING to allow value in message
2017-12-04 13:15:49 +01:00
Kuba Werłos
369075a282 Fix for missing whitespace control modifier in form layout 2017-12-04 13:08:37 +01:00
Nicolas Grekas
5f5edf26f2 bug #25241 [Yaml] do not eagerly filter comment lines (xabbuh)
This PR was merged into the 3.3 branch.

Discussion
----------

[Yaml] do not eagerly filter comment lines

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

Trying to be clever by filtering commented lines inside
`getNextEmbedBlock()` does not work as expected. The `#` may as well be
part of a multi-line quoted string where it must not be treated as the
beginning of a comment. Thus, we only must ensure that a comment-like
line does not skip the process of getting the next line of the embed
block.

Commits
-------

d594038 do not eagerly filter comment lines
2017-12-04 13:05:43 +01:00
Nicolas Grekas
f056b4ef5b minor #25270 Fail as early and noisily as possible (greg0ire)
This PR was merged into the 3.3 branch.

Discussion
----------

Fail as early and noisily as possible

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

An alternative would be to use a custom error handler

Commits
-------

3bdeda0 Fail as early and noisily as possible
2017-12-04 11:36:39 +01:00
Grégoire Paris
3bdeda048b
Fail as early and noisily as possible
Today, I tried using SYMFONY_PHPUNIT_VERSION=6 because I don't really
care about the minor version. I got lots of warnings, followed by
hard-to-understand error messages. This will silence the first warning
and will throw an exception instead.
2017-12-03 00:45:47 +01:00
Fabien Potencier
6eedbb5660 minor #25271 [FrameworkBundle] Fix visibility of a test helper (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[FrameworkBundle] Fix visibility of a test helper

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| Bug fix?      | no
| New feature?  | no <!-- don't forget to update src/**/CHANGELOG.md files -->
| BC breaks?    | no
| Deprecations? | no <!-- don't forget to update UPGRADE-*.md files -->
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Commits
-------

23b5758198 [FrameworkBundle] Fix visibility of a test helper
2017-12-02 08:24:41 -08:00
Kévin Dunglas
23b5758198
[FrameworkBundle] Fix visibility of a test helper 2017-12-02 16:57:48 +01:00
Fabien Potencier
de3a25a474 minor #25257 [link] clear the cache after linking (dunglas)
This PR was squashed before being merged into the 2.7 branch (closes #25257).

Discussion
----------

[link] clear the cache after linking

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| 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 files -->
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Clearing the cache after linking prevents fatal errors when a container already exists.

Commits
-------

05c3c81a20 [link] clear the cache after linking
2017-12-01 17:33:23 -08:00
Kévin Dunglas
05c3c81a20 [link] clear the cache after linking 2017-12-01 17:33:21 -08:00
Fabien Potencier
7f5aeb7475 bug #25258 [link] Prevent warnings when running link with 2.7 (dunglas)
This PR was merged into the 2.7 branch.

Discussion
----------

[link] Prevent warnings when running link with 2.7

| Q             | A
| ------------- | ---
| Branch?       | 2.7
| 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 files -->
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

Prevent warnings when linking from 2.7 because some directories (like the Bridge/Propel1) don't contain `composer.json` files.

Commits
-------

3e7780cb90 [link] Prevent warnings when running link with 2.7
2017-12-01 17:32:35 -08:00
Kévin Dunglas
3e7780cb90
[link] Prevent warnings when running link with 2.7 2017-12-01 20:16:54 +01:00
Fabien Potencier
5a6e2d7993 bug #24750 [Validator] ExpressionValidator should use OBJECT_TO_STRING (Simperfit)
This PR was merged into the 2.7 branch.

Discussion
----------

[Validator] ExpressionValidator should use OBJECT_TO_STRING

…value in message

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

Commits
-------

7dac528a86 [Validator] ExpressionValidator should use OBJECT_TO_STRING to allow value in message
2017-12-01 09:38:10 -08:00
Amrouche Hamza
7dac528a86
[Validator] ExpressionValidator should use OBJECT_TO_STRING to allow value in message 2017-12-01 18:16:29 +01:00
Christian Flothmann
d594038ad9 do not eagerly filter comment lines
Trying to be clever by filtering commented lines inside
`getNextEmbedBlock()` does not work as expected. The `#` may as well be
part of a multi-line quoted string where it must not be treated as the
beginning of a comment. Thus, we only must ensure that a comment-like
line does not skip the process of getting the next line of the embed
block.
2017-12-01 11:59:50 +01:00
Nicolas Grekas
61e1f5705e bug #25232 [WebProfilerBundle] [TwigBundle] Fix Profiler breaking XHTML pages (tistre)
This PR was submitted for the master branch but it was merged into the 3.3 branch instead (closes #25232).

Discussion
----------

[WebProfilerBundle] [TwigBundle] Fix Profiler breaking XHTML pages

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

Just a tiny fix: Stop the Profiler from breaking XHTML pages (served with "Content-Type: application/xhtml+xml") - with the added quotes around the nonce attribute value, the page remains well-formed XML.

Commits
-------

b1ab7d0 [WebProfilerBundle], [TwigBundle] Fix Profiler breaking XHTML pages (Content-Type: application/xhtml+xml)
2017-12-01 11:26:11 +01:00
Tim Strehle
b1ab7d0050 [WebProfilerBundle], [TwigBundle] Fix Profiler breaking XHTML pages (Content-Type: application/xhtml+xml) 2017-12-01 11:26:11 +01:00
Yonel Ceruto
8505894988 Fix collision between view properties and form fields 2017-11-30 23:33:59 -05:00