Merge branch '7.4' into amqp-messenger-transactional-publish_51656

Author: michalsitek

.appveyor.yml

@@ -0,0 +1,8 @@
+# Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
+f4118e110a46de3ffb799e7d79bf15128d1646ea
+9519b54417c09c49496a4a6be238e63be9a73465
+ae0a783425b80b78376488619bf9106e69193fa4
+9c1e36257c4df0929179462d6b2bdd00453ac8aa
+6ae74d38e3d20d0ffcc66c7c3d28767fab76bdfb
+# Prefix all sprintf() calls
+6ce530c5e90397d88e3a76a56db266c74d651584

.git-blame-ignore-revs

@@ -4,3 +4,10 @@
 /src/Symfony/Component/Messenger/Bridge export-ignore
 /src/Symfony/Component/Notifier/Bridge export-ignore
 /src/Symfony/Component/Runtime export-ignore
+/src/Symfony/Component/Translation/Bridge export-ignore
+/src/Symfony/Component/Emoji/Resources/data/* linguist-generated=true
+/src/Symfony/Component/Intl/Resources/data/*/* linguist-generated=true
+/src/Symfony/Component/JsonEncoder/Tests/Fixtures/encoder/* linguist-generated=true
+/src/Symfony/Component/JsonEncoder/Tests/Fixtures/decoder/* linguist-generated=true
+/src/Symfony/**/.github/workflows/close-pull-request.yml linguist-generated=true
+/src/Symfony/**/.github/PULL_REQUEST_TEMPLATE.md linguist-generated=true

.gitattributes

@@ -1,14 +1,14 @@
 | Q             | A
 | ------------- | ---
-| Branch?       | 6.4 for features / 5.4, or 6.3 for bug fixes <!-- see below -->
+| Branch?       | 7.4 for features / 6.4, 7.2, or 7.3 for bug fixes <!-- see below -->
 | Bug fix?      | yes/no
 | New feature?  | yes/no <!-- please update src/**/CHANGELOG.md files -->
 | Deprecations? | yes/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 exists, explain below instead -->
+| Issues        | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exists, explain below instead -->
 | License       | MIT
-| Doc PR        | symfony/symfony-docs#... <!-- required for new features -->
+
 <!--
-Replace this notice by a short README for your feature/bugfix.
+Replace this notice by a description of your feature/bugfix.
 This will help reviewers and should be a good start for the documentation.
 
 Additionally (see https://symfony.com/releases):

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,9 @@
 <?php
 
+require __DIR__.'/vendor/autoload.php';
+
+use Composer\MetadataMinifier\MetadataMinifier;
+
 if (3 > $_SERVER['argc']) {
     echo "Usage: branch version dir1 dir2 ... dirN\n";
     exit(1);
@@ -52,11 +56,23 @@
 
     $packages[$package->name][$package->version] = $package;
 
-    $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'));
-    $versions = json_decode($versions)->packages->{$package->name};
+    if (false !== $taggedReleases = @file_get_contents('https://repo.packagist.org/p2/'.$package->name.'.json')) {
+        $versions = MetadataMinifier::expand(json_decode($taggedReleases, true)['packages'][$package->name]);
+
+        foreach ($versions as $v => $p) {
+            $packages[$package->name] += [$v => $p];
+        }
+    }
+
+    if (false !== $devReleases = @file_get_contents('https://repo.packagist.org/p2/'.$package->name.'~dev.json')) {
+        $versions = MetadataMinifier::expand(json_decode($taggedReleases, true)['packages'][$package->name]);
+    } else {
+        $versions = sprintf('{"packages":{"%s":{"%s":%s}}}', $package->name, $package->version, file_get_contents($dir.'/composer.json'));
+        $versions = json_decode($versions, true)['packages'][$package->name];
+    }
 
-    foreach ($versions as $v => $package) {
-        $packages[$package->name] += [$v => $package];
+    foreach ($versions as $v => $p) {
+        $packages[$package->name] += [$v => $p];
     }
 }
 

.github/build-packages.php

@@ -0,0 +1,5 @@
+{
+    "require": {
+        "composer/metadata-minifier": "^1.0"
+    }
+}