Skip to content

Commit 296358d

Browse files
author
Miquel Fontana
committed
Merge branch '7.2' into rabbitmq-delayed-quorum-queues
2 parents a1ef0e1 + fa4d2d8 commit 296358d

File tree

204 files changed

+1786
-579
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+1786
-579
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
| Q | A
22
| ------------- | ---
3-
| Branch? | 7.3 for features / 6.4, and 7.2 for bug fixes <!-- see below -->
3+
| Branch? | 7.4 for features / 6.4, 7.2, or 7.3 for bug fixes <!-- see below -->
44
| Bug fix? | yes/no
55
| New feature? | yes/no <!-- please update src/**/CHANGELOG.md files -->
66
| Deprecations? | yes/no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->

‎.github/build-packages.php

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
<?php
22

3+
// Logic inspired from composer/metadata-minifier
4+
function expandComposerMetadata(array $versions): array
5+
{
6+
array_reduce($versions, function ($carry, $version) use (&$expandedVersions) {
7+
return $expandedVersions[] = array_filter(array_merge($carry, $version), fn ($v) => '__unset' !== $v);
8+
}, []);
9+
10+
return $expandedVersions ?? [];
11+
}
12+
313
if (3 > $_SERVER['argc']) {
414
echo "Usage: branch version dir1 dir2 ... dirN\n";
515
exit(1);
@@ -52,11 +62,13 @@
5262

5363
$packages[$package->name][$package->version] = $package;
5464

55-
$versions = @file_get_contents('https://repo.packagist.org/p/'.$package->name.'.json') ?: sprintf('{"packages":{"%s":{"%s":%s}}}', $package->name, $package->version, file_get_contents($dir.'/composer.json'));
56-
$versions = json_decode($versions)->packages->{$package->name};
65+
foreach (['.json', '~dev.json'] as $ext) {
66+
$versions = @file_get_contents('https://repo.packagist.org/p2/'.$package->name.$ext) ?: '[]';
67+
$versions = json_decode($versions, true)['packages'][$package->name] ?? [];
5768

58-
foreach ($versions as $v => $package) {
59-
$packages[$package->name] += [$v => $package];
69+
foreach (expandComposerMetadata($versions) as $p) {
70+
$packages[$package->name] += [$p['version'] => $p];
71+
}
6072
}
6173
}
6274

‎.github/expected-missing-return-types.diff

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,23 @@ diff --git a/src/Symfony/Component/DependencyInjection/Extension/PrependExtensio
177177
- public function prepend(ContainerBuilder $container);
178178
+ public function prepend(ContainerBuilder $container): void;
179179
}
180+
diff --git a/src/Symfony/Component/Emoji/EmojiTransliterator.php b/src/Symfony/Component/Emoji/EmojiTransliterator.php
181+
--- a/src/Symfony/Component/Emoji/EmojiTransliterator.php
182+
+++ b/src/Symfony/Component/Emoji/EmojiTransliterator.php
183+
@@ -88,5 +88,5 @@ final class EmojiTransliterator extends \Transliterator
184+
*/
185+
#[\ReturnTypeWillChange]
186+
- public function getErrorCode(): int|false
187+
+ public function getErrorCode(): int
188+
{
189+
return isset($this->transliterator) ? $this->transliterator->getErrorCode() : 0;
190+
@@ -97,5 +97,5 @@ final class EmojiTransliterator extends \Transliterator
191+
*/
192+
#[\ReturnTypeWillChange]
193+
- public function getErrorMessage(): string|false
194+
+ public function getErrorMessage(): string
195+
{
196+
return isset($this->transliterator) ? $this->transliterator->getErrorMessage() : '';
180197
diff --git a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
181198
--- a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
182199
+++ b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php

‎.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
schedule:
77
- cron: '34 4 * * 6'
88
push:
9-
branches: [ "7.3" ]
9+
branches: [ "7.4" ]
1010

1111
# Declare default permissions as read only.
1212
permissions: read-all

‎.github/workflows/unit-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
9393
# Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
9494
if [[ ! "${{ matrix.mode }}" = *-deps ]]; then
95-
php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
95+
php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
9696
else
9797
echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV
9898
cp composer.json composer.json.orig

‎CHANGELOG-7.2.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,58 @@ in 7.2 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v7.2.0...v7.2.1
99

10+
* 7.2.7 (2025-05-29)
11+
12+
* bug #60549 [Translation] Add intl-icu fallback for MessageCatalogue metadata (pontus-mp)
13+
* bug #60571 [ErrorHandler] Do not transform file to link if it does not exist (lyrixx)
14+
* bug #60494 [Messenger] fix: Add argument as integer (overexpOG)
15+
* bug #60524 [Notifier] Fix Clicksend transport (BafS)
16+
* bug #60478 [Validator] add missing `$extensions` and `$extensionsMessage` to the `Image` constraint (xabbuh)
17+
* bug #60484 [PhpUnitBridge] Clean up mocked features only when ``@group`` is present (HypeMC)
18+
* bug #60490 [PhpUnitBridge] set path to the PHPUnit autoload file (xabbuh)
19+
* bug #60423 [DependencyInjection] Make `DefinitionErrorExceptionPass` consider `IGNORE_ON_UNINITIALIZED_REFERENCE` and `RUNTIME_EXCEPTION_ON_INVALID_REFERENCE` the same (MatTheCat)
20+
* bug #60439 [FrameworkBundle] Fix declaring field-attr tags in xml config files (nicolas-grekas)
21+
* bug #60428 [DependencyInjection] Fix missing binding for ServiceCollectionInterface when declaring a service subscriber (nicolas-grekas)
22+
* bug #60421 [VarExporter] Fixed lazy-loading ghost objects generation with property hooks (cheack)
23+
* bug #60266 [Security] Exclude remember_me from default login authenticators (santysisi)
24+
* bug #60400 [Config] Fix generated comment for multiline "info" (GromNaN)
25+
* bug #60260 [Serializer] Prevent `Cannot traverse an already closed generator` error by materializing Traversable input (santysisi)
26+
* bug #60292 [HttpFoundation] Encode path in `X-Accel-Redirect` header (Athorcis)
27+
* bug #58643 [SecurityBundle] Use Composer `InstalledVersions` to check if flex is installed (andyexeter)
28+
* bug #60275 [DoctrineBridge] Fix UniqueEntityValidator Stringable identifiers (GiuseppeArcuti, wkania)
29+
* bug #60293 [Messenger] fix asking users to select an option if `--force` option is used in `messenger:failed:retry` command (W0rma)
30+
* bug #60379 [Security] Avoid failing when PersistentRememberMeHandler handles a malformed cookie (Seldaek)
31+
* bug #60373 [FrameworkBundle] Ensure `Email` class exists before using it (Kocal)
32+
* bug #60365 [FrameworkBundle] ensure that all supported e-mail validation modes can be configured (xabbuh)
33+
* bug #60350 [Security][LoginLink] Throw `InvalidLoginLinkException` on invalid parameters (davidszkiba)
34+
* bug #60340 [String] fix EmojiTransliterator return type compatibility with PHP 8.5 (xabbuh)
35+
36+
* 7.2.6 (2025-05-02)
37+
38+
* bug #60288 [VarExporter] dump default value for property hooks if present (xabbuh)
39+
* bug #60267 [Contracts] Fix `ServiceMethodsSubscriberTrait` for nullable service (StevenRenaux)
40+
* bug #60268 [Contracts] Fix `ServiceSubscriberTrait` for nullable service (StevenRenaux)
41+
* bug #60256 [Mailer][Postmark] drop the `Date` header using the API transport (xabbuh)
42+
* bug #60258 [VarExporter] Fix: Use correct closure call for property-specific logic in $notByRef (Hakayashii, denjas)
43+
* bug #60269 [Notifier] [Discord] Fix value limits (norkunas)
44+
* bug #60270 [Validator] [WordCount] Treat 0 as one character word and do not exclude it (sidz)
45+
* bug #60248 [Messenger] Revert " Add call to `gc_collect_cycles()` after each message is handled" (jwage)
46+
* bug #60236 [String] Support nexus -> nexuses pluralization (KorvinSzanto)
47+
* bug #60238 [Lock] read (possible) error from Redis instance where evalSha() was called (xabbuh)
48+
* bug #60194 [Workflow] Fix dispatch of entered event when the subject is already in this marking (lyrixx)
49+
* bug #60174 [PhpUnitBridge] properly clean up mocked features after tests have run (xabbuh)
50+
* bug #60172 [Cache] Fix invalidating on save failures with Array|ApcuAdapter (nicolas-grekas)
51+
* bug #60122 [Cache] ArrayAdapter serialization exception clean $expiries (bastien-wink)
52+
* bug #60167 [Cache] Fix proxying third party PSR-6 cache items (Dmitry Danilson)
53+
* bug #60165 [HttpKernel] Do not ignore enum in controller arguments when it has an `#[Autowire]` attribute (ruudk)
54+
* bug #60168 [Console] Correctly convert `SIGSYS` to its name (cs278)
55+
* bug #60166 [Security] fix(security): fix OIDC user identifier (vincentchalamon)
56+
* bug #60124 [Validator] : fix url validation when punycode is on tld but not on domain (joelwurtz)
57+
* bug #60137 [Config] ResourceCheckerConfigCache metadata unserialize emits warning (Colin Michoudet)
58+
* bug #60057 [Mailer] Fix `Trying to access array offset on value of type null` error by adding null checking (khushaalan)
59+
* bug #60094 [DoctrineBridge] Fix support for entities that leverage native lazy objects (nicolas-grekas)
60+
* bug #60094 [DoctrineBridge] Fix support for entities that leverage native lazy objects (nicolas-grekas)
61+
1062
* 7.2.5 (2025-03-28)
1163

1264
* bug #60054 [Form] Use duplicate_preferred_choices to set value of ChoiceType (aleho)

0 commit comments

Comments
 (0)