Skip to content

Commit 5743ca3

Browse files
alexandre-dauboisalexandre-daubois
committed
Merge branch '7.3' into 7.4
* 7.3: switch to Composer 2 metadata [Validator] Add tests for `MacAddress` Fix `ContainerDebugCommandTest::testNoDumpedXML` [HttpKernel] Do not superseed private cache-control when no-store is set doc: update UserInterface header comments Fix: Lack of recipient in case DSN does not have optional LIST_ID parameter. [PhpUnitBridge] Mark as dev package [DependencyInjection] Make `YamlDumper` quote resolved env vars if necessary Bump Symfony version to 7.3.1 Update VERSION for 7.3.0 Update CHANGELOG for 7.3.0 Bump Symfony version to 7.2.8 Update VERSION for 7.2.7 Update CHANGELOG for 7.2.7 Bump Symfony version to 6.4.23 Update VERSION for 6.4.22 Update CONTRIBUTORS for 6.4.22 Update CHANGELOG for 6.4.22 fixed Via regex
2 parents f8e605c + 24b868e commit 5743ca3

File tree

18 files changed

+209
-38
lines changed

18 files changed

+209
-38
lines changed

‎.github/build-packages.php

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

3+
require __DIR__.'/vendor/autoload.php';
4+
5+
use Composer\MetadataMinifier\MetadataMinifier;
6+
37
if (3 > $_SERVER['argc']) {
48
echo "Usage: branch version dir1 dir2 ... dirN\n";
59
exit(1);
@@ -52,11 +56,23 @@
5256

5357
$packages[$package->name][$package->version] = $package;
5458

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};
59+
if (false !== $taggedReleases = @file_get_contents('https://repo.packagist.org/p2/'.$package->name.'.json')) {
60+
$versions = MetadataMinifier::expand(json_decode($taggedReleases, true)['packages'][$package->name]);
61+
62+
foreach ($versions as $v => $p) {
63+
$packages[$package->name] += [$v => $p];
64+
}
65+
}
66+
67+
if (false !== $devReleases = @file_get_contents('https://repo.packagist.org/p2/'.$package->name.'~dev.json')) {
68+
$versions = MetadataMinifier::expand(json_decode($taggedReleases, true)['packages'][$package->name]);
69+
} else {
70+
$versions = sprintf('{"packages":{"%s":{"%s":%s}}}', $package->name, $package->version, file_get_contents($dir.'/composer.json'));
71+
$versions = json_decode($versions, true)['packages'][$package->name];
72+
}
5773

58-
foreach ($versions as $v => $package) {
59-
$packages[$package->name] += [$v => $package];
74+
foreach ($versions as $v => $p) {
75+
$packages[$package->name] += [$v => $p];
6076
}
6177
}
6278

‎.github/composer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"require": {
3+
"composer/metadata-minifier": "^1.0"
4+
}
5+
}

‎.github/workflows/unit-tests.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,18 @@ jobs:
101101
102102
# Create local composer packages for each patched components and reference them in composer.json files when cross-testing components
103103
if [[ ! "${{ matrix.mode }}" = *-deps ]]; then
104-
php .github/build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
104+
cd .github
105+
composer install
106+
php ./build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
107+
cd ..
105108
else
106109
echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV
107110
cp composer.json composer.json.orig
108111
echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json
109-
php .github/build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin)
112+
cd .github
113+
composer install
114+
php ./build-packages.php HEAD^ $SYMFONY_VERSION $(find src/Symfony -mindepth 2 -type f -name composer.json -printf '%h\n' | grep -v src/Symfony/Component/Emoji/Resources/bin)
115+
cd ..
110116
mv composer.json composer.json.phpunit
111117
mv composer.json.orig composer.json
112118
fi

‎CHANGELOG-7.2.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,32 @@ 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+
1036
* 7.2.6 (2025-05-02)
1137

1238
* bug #60288 [VarExporter] dump default value for property hooks if present (xabbuh)

‎CHANGELOG-7.3.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ in 7.3 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.3.0...v7.3.1
99

10+
* 7.3.0 (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 #60542 [Webhook] Fix controller service name (HypeMC)
15+
1016
* 7.3.0-RC1 (2025-05-25)
1117

1218
* bug #60529 [AssetMapper] Fix SequenceParser possible infinite loop (smnandre)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy