This PR was squashed before being merged into the 4.4 branch.
Discussion
----------
[Mailer] Fix typo in README
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets |
| License | MIT
| Doc PR |
Commits
-------
14f2a2974c [Mailer] Fix typo in README
This PR was submitted for the 6.0 branch but it was merged into the 4.4 branch instead.
Discussion
----------
[VarDumper] fix tests
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | -
| License | MIT
| Doc PR | -
Fixing VarDumper on appveyor hopefully.
Commits
-------
bdf3222c60 [VarDumper] fix tests
This PR was merged into the 4.4 branch.
Discussion
----------
[DependencyInjection] keep container.service_subscriber tag on the decorated definition
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets |
| License | MIT
| Doc PR |
Commits
-------
b917fafc8d keep container.service_subscriber tag on the decorated definition
This PR was merged into the 4.4 branch.
Discussion
----------
[Filesystem] fix readlink() for Windows
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets |
| License | MIT
| Doc PR |
**How to reproduce**
Windows 10.0.19042.928, PHP 8.0.3, PHPUnit 9.5.4
run as Administrator
C:\php\php.exe ./phpunit --bootstrap ./vendor/autoload.php --configuration ./phpunit.xml.dist ./src/Symfony/Component/Filesystem/Tests
There were 2 failures:
1) Symfony\Component\Filesystem\Tests\FilesystemTest::testRemoveCleansInvalidLinks
Failed asserting that 'C:\Users\albat\AppData\Local\Temp\1618836823.005.2057903605\directory\dir\' is false.
D:\Z__PHP_PROJECT\symfony\src\Symfony\Component\Filesystem\Tests\FilesystemTest.php:379
2) Symfony\Component\Filesystem\Tests\FilesystemTest::testReadAbsoluteLink
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-'C:\Users\albat\AppData\Local\Temp\1618836823.1681.131301953\dir\link'
+'C:\Users\albat\AppData\Local\Temp\1618836823.1681.131301953\file'
Commits
-------
f1b95d3c93 [Filesystem] fix readlink for Windows
This PR was merged into the 4.4 branch.
Discussion
----------
[HttpKernel] Fixes file_get_content in HttpCache's Store for PHP7.4+
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets | -
| License | MIT
| Doc PR | -
While trying to get 6.0 branch tests green, I encountered an error on multiple HttpKernel tests.
After investigating, it comes from the file_get_contents in the load method of the Store class from HttpCache. For obscure reasons, some calls are in errors and the content can't be read for "permission denied".
This is happening only on PHP 7.4.0+ (and that explains why the tests are green on the branch 5.4 as it runs php 7.2), adding the `@` error suppressor fixes this.
Commits
-------
c3ac11cc64 [HttpKernel] Fixes tests for PHP7.4+
This PR was merged into the 4.4 branch.
Discussion
----------
Fix markdown in README files
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
| License | MIT
| Doc PR | symfony/symfony-docs#... <!-- required for new features -->
I would up merge it and fix the upper branches while upmerging or via separate PR's, whatever is prefered
Commits
-------
ad0890c604 Fix markdown
This PR was merged into the 4.4 branch.
Discussion
----------
[Form] fix support for years outside of the 32b range on x86 arch
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets | -
| License | MIT
| Doc PR | -
Commits
-------
2353f19cc2 [Form] fix support for years outside of the 32b range on x86 arch
This PR was squashed before being merged into the 4.4 branch.
Discussion
----------
[Messenger] Fix merging PrototypedArrayNode associative values
Now keys will not be considered as irrelevant.
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets | Fix#39846, fix#36874
| License | MIT
| Doc PR |
The problem was because in ConfigTree `options` are defined as `arrayNode` and has a `prototype('variable')`. So for combining config together `PrototypedArrayNode::mergeValues()` was called. And there was a trouble - for that `PrototypedArrayNode` `$rightSide` values were added without keys:
`\Symfony\Component\Config\Definition\PrototypedArrayNode::mergeValues`
```php
foreach ($rightSide as $k => $v) {
// prototype, and key is irrelevant, append the element
if (null === $this->keyAttribute) {
$leftSide[] = $v;
continue;
}
```
Commits
-------
11128c9c0b [Messenger] Fix merging PrototypedArrayNode associative values
This PR was merged into the 4.4 branch.
Discussion
----------
[WebProfilerBundle] Wrapping exception js in Sfjs check and also loading base_js Sfjs if needed
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets | Fix#41305
| License | MIT
| Doc PR | Not needed
This bug was introduced in #41168.
Best viewed with: https://github.com/symfony/symfony/pull/41346/files?w=1 - we could also remove the new indentation in `exception.js`.
In that PR, we innocently don't reload `Sfjs` if it doesn't exist. However, on an error page, that template ALSO adds an `Sfjs`, and that `Sfjs` is *smaller* - containing only a subset of the `Sfjs` functions. This is tricky, but this PR fixes it.
Here are the various situations:
1) I hit an exception page. The `Sfjs` from `exception.js` is loaded first. This adds the smaller `Sfjs`. Then the `base_js.html.twig` version is hit. Because `Sfjs` is missing the `loadToolbar()` method, that code DOES run again to reinitialize it.
2) I am on a normal page, then travel to an exception page with Turbo. In this case, the original `Sfjs` from `base_js.html.twig` was processed. Then, on the exception page, the `Sfjs` from `exception.js` is ignored, as is the 2nd execution of `base_js.html.twig`.
Overall, the JS could use some work for supporting things like Turbo (e.g. `DOMContentLoaded` doesn't work with Turbo, so the exception page JS is broken). But I wanted to focus on fixing the bug in this PR.
As a reminder, #41168 (avoiding overriding `Sfjs`) was done to help with the AJAX toolbar and Turbo - it's explained in point (1) on #41168.
Cheers!
Commits
-------
5fa42f11f3 Wrapping exception js in Sfjs check and also loading base_js Sfjs if needed
This PR was merged into the 4.4 branch.
Discussion
----------
[FrameworkBundle] Return early
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | https://github.com/symfony/symfony/pull/41295#discussion_r636346945
| License | MIT
| Doc PR | N/A
Commits
-------
b6c8aa5b68 [FrameworkBundle] Return early
This PR was merged into the 4.4 branch.
Discussion
----------
doctrine/doctrine-bundle should not be a dep
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | -
| License | MIT
| Doc PR | -
Commits
-------
e006eaf26a doctrine/doctrine-bundle should not be a dep
This PR was merged into the 4.4 branch.
Discussion
----------
Improve .travis.yml
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | -
| License | MIT
| Doc PR | -
Follow up of #41293
- For the highest branch (6.0 right now), when deps=high, the version before it is checked out (5.4) and tested with the locally patched components (6.0)
- For `*.4` branches, aka when the current branch version has not the same major version number as the next one, in addition to testing with the next major as deps (6.0 deps on patched-5.4), we also checkout the previous major and test it with the locally patched components (aka patched-5.4 deps on 4.4).
Commits
-------
2620da26dc Improve .travis.yml
This PR was merged into the 4.4 branch.
Discussion
----------
Remove always-true requirement
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | -
| License | MIT
| Doc PR | -
This requirement is always true for our version constraint
Commits
-------
5783800e8f Remove always-true requirement
This PR was merged into the 4.4 branch.
Discussion
----------
Add 5.3 in github PR template
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | -
| License | MIT
| Doc PR | -
Right time now :)
Commits
-------
327014b104 Add 5.3 in github PR template
This PR was merged into the 4.4 branch.
Discussion
----------
[Security] Added missing translations for Serbian (sr_Latn)
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | Fix#41066
| License | MIT
| Doc PR |
Added 2 missing translations for Serbian (sr_Latn).
Commits
-------
ce31fc3643 [Security] Added missing translations for Serbian (sr_Latn) #41066
This PR was merged into the 4.4 branch.
Discussion
----------
[Security] Added missing translations for Serbian (sr_Cyrl)
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | Fix#41065
| License | MIT
| Doc PR |
Added 2 missing translations.
Commits
-------
0e3165c67d minor #41065 [Security] Added missing translations for Serbian (sr_Cyrl)
This PR was merged into the 4.4 branch.
Discussion
----------
[Security] Missing translations for Chinese (zh_TW & zh_CN)
| Q | A
| ------------- | ---
| Branch? | 4.4 <!-- see below -->
| Bug fix? | no
| New feature? | no <!-- please update src/**/CHANGELOG.md files -->
| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->
| Tickets | Fix#41037 , Fix#41038 <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
| License | MIT
| Doc PR | no <!-- required for new features -->
<!--
Replace this notice by a short README for your feature/bugfix. This will help people
understand your PR and can be used as a start for the documentation.
Additionally (see https://symfony.com/releases):
- Always add tests and ensure they pass.
- Never break backward compatibility (see https://symfony.com/bc).
- Bug fixes must be submitted against the lowest maintained 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 branch 5.x.
- Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
-->
Added missing translation for Chinese (zh_TW & zh_CN).
Commits
-------
26d156f17f add chinese translation
This PR was merged into the 4.4 branch.
Discussion
----------
[FrameworkBundle][Validator] Fix deprecations from Doctrine Annotations+Cache
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets | N/A
| License | MIT
| Doc PR | N/A
* Doctrine Annotations' `CachedReader` is deprecated. Let's not use it if we don't have to.
* Doctrine Cache 2 has been released. Since we're mostly only using the interfaces, we can indicate compatibility.
Paslm is going to complain about missing classes, which is kind-of expected here. 🙂
Commits
-------
ec51c21a9d Fix deprecations from Doctrine Annotations+Cache
This PR was merged into the 4.4 branch.
Discussion
----------
[Security] Keep Bulgarian wording consistent across all texts
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets |
| License | MIT
| Doc PR |
Keep wording consistent across all texts in translations:
Trans unit id=17:
Too many === Твърде много
Trans unit id=19:
Too many === Прекалено много
I put word "Твърде", because it was used before.
Commits
-------
4f1b4f993e [Security] Keep Bulgarian wording consistent across all texts.
This PR was merged into the 4.4 branch.
Discussion
----------
Migrate configuration file for PHP CS Fixer 2.19/3.0
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | no
| New feature? | no
| Deprecations? | no
| Tickets | N/A
| License | MIT
| Doc PR | N/A
This PR suggests to rename the PHP CS Fixer configuration file as expected by version 2.19 and 3.0. I don't know what version Fabbot is currently running, but as soon as it is updated to 2.19, we can merge this PR.
Commits
-------
1462a3215e Migrate configuration file for PHP CS Fixer 2.19/3.0
This PR was merged into the 4.4 branch.
Discussion
----------
Fixed deprecation warnings about passing null as parameter
| Q | A
| ------------- | ---
| Branch? | 4.4
| Bug fix? | yes
| New feature? | no
| Deprecations? | no
| Tickets | N/A
| License | MIT
| Doc PR | N/A
Various built-in PHP functions will trigger a deprecation warning if `null` is passed as parameter. This PR attempts to fix all warnings that our test suite currently picks up.
Commits
-------
7d9bdf5734 Fixed deprecation warnings about passing null as parameter