8000 Merge branch '6.4' into 7.2 · symfony/symfony@60ae6a3 · GitHub
[go: up one dir, main page]

Skip to content

Commit 60ae6a3

Browse files
Merge branch '6.4' into 7.2
* 6.4: switch to Composer 2 metadata Fix `ContainerDebugCommandTest::testNoDumpedXML` 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 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 6b4fced + 8819ea9 commit 60ae6a3

File tree

15 files changed

+153
-38
lines changed

15 files changed

+153
-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
@@ -92,12 +92,18 @@ 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+
cd .github
96+
composer install
97+
php ./build-packages.php HEAD^ $SYMFONY_VERSION src/Symfony/Bridge/PhpUnit
98+
cd ..
9699
else
97100
echo SYMFONY_DEPRECATIONS_HELPER=weak >> $GITHUB_ENV
98101
cp composer.json composer.json.orig
99102
echo -e '{\n"require":{'"$(grep phpunit-bridge composer.json)"'"php":"*"},"minimum-stability":"dev"}' > composer.json
100-
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)
103+
cd .github
104+
composer install
105+
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)
106+
cd ..
101107
mv composer.json composer.json.phpunit
102108
mv composer.json.orig composer.json
103109
fi

CONTRIBUTORS.md

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ The Symfony Connect username in parenthesis allows to get more information
3030
- Kris Wallsmith (kriswallsmith)
3131
- Jakub Zalas (jakubzalas)
3232
- Yonel Ceruto (yonelceruto)
33+
- HypeMC (hypemc)
3334
- Hugo Hamon (hhamon)
3435
- Tobias Nyholm (tobias)
35-
- HypeMC (hypemc)
3636
- Jérôme Tamarelle (gromnan)
3737
- Antoine Lamirault (alamirault)
3838
- Samuel ROZE (sroze)
@@ -96,8 +96,8 @@ The Symfony Connect username in parenthesis allows to get more information
9696
- Henrik Bjørnskov (henrikbjorn)
9797
- Ruud Kamphuis (ruudk)
9898
- David Buchmann (dbu)
99-
- Andrej Hudec (pulzarraider)
10099
- Tomas Norkūnas (norkunas)
100+
- Andrej Hudec (pulzarraider)
101101
- Jáchym Toušek (enumag)
102102
- Hubert Lenoir (hubert_lenoir)
103103
- Christian Raue
@@ -160,12 +160,13 @@ The Symfony Connect username in parenthesis allows to get more information
160160
- Włodzimierz Gajda (gajdaw)
161161
- Javier Spagnoletti (phansys)
162162
- Adrien Brault (adrienbrault)
163+
- Florent Morselli (spomky_)
164+
- soyuka
163165
- Florian Voutzinos (florianv)
164166
- Teoh Han Hui (teohhanhui)
165167
- Przemysław Bogusz (przemyslaw-bogusz)
166168
- Colin Frei
167169
- excelwebzone
168-
- Florent Morselli (spomky_)
169170
- Paráda József (paradajozsef)
170171
- Maximilian Beckers (maxbeckers)
171172
- Baptiste Clavié (talus)
@@ -175,17 +176,16 @@ The Symfony Connect username in parenthesis allows to get more information
175176
- Dāvis Zālītis (k0d3r1s)
176177
- Gordon Franke (gimler)
177178
- Malte Schlüter (maltemaltesich)
178-
- soyuka
179179
- jeremyFreeAgent (jeremyfreeagent)
180180
- Michael Babker (mbabker)
181181
- Alexis Lefebvre
182+
- Hugo Alliaume (kocal)
182183
- Christopher Hertel (chertel)
183184
- Joshua Thijssen
184185
- Vasilij Dusko
185186
- Daniel Wehner (dawehner)
186187
- Robert Schönthal (digitalkaoz)
187188
- Smaine Milianni (ismail1432)
188-
- Hugo Alliaume (kocal)
189189
- François-Xavier de Guillebon (de-gui_f)
190190
- Andreas Schempp (aschempp)
191191
- noniagriconomie
@@ -255,6 +255,7 @@ The Symfony Connect username in parenthesis allows to get more information
255255
- Alessandro Lai (jean85)
256256
- 77web
257257
- Gocha Ossinkine (ossinkine)
258+
- matlec
258259
- Jesse Rushlow (geeshoe)
259260
- Matthieu Ouellette-Vachon (maoueh)
260261
- Michał Pipa (michal.pipa)
@@ -286,7 +287,6 @@ The Symfony Connect username in parenthesis allows to get more information
286287
- Clément JOBEILI (dator)
287288
- Andreas Möller (localheinz)
288289
- Marek Štípek (maryo)
289-
- matlec
290290
- Daniel Espendiller
291291
- Arnaud PETITPAS (apetitpa)
292292
- Michael Käfer (michael_kaefer)
@@ -310,6 +310,7 @@ The Symfony Connect username in parenthesis allows to get more information
310310
- Patrick Landolt (scube)
311311
- Karoly Gossler (connorhu)
312312
- Timo Bakx (timobakx)
313+
- Quentin Devos
313314
- Giorgio Premi
314315
- Alan Poulain (alanpoulain)
315316
- Ruben Gonzalez (rubenrua)
@@ -337,6 +338,7 @@ The Symfony Connect username in parenthesis allows to get more information
337338
- Nikolay Labinskiy (e-moe)
338339
- Martin Schuhfuß (usefulthink)
339340
- apetitpa
341+
- wkania
340342
- Guilliam Xavier
341343
- Pierre Minnieur (pminnieur)
342344
- Dominique Bongiraud
@@ -377,6 +379,7 @@ The Symfony Connect username in parenthesis allows to get more information
377379
- Pascal Montoya
378380
- Julien Brochet
379381
- François Pluchino (francoispluchino)
382+
- W0rma
380383
- Tristan Darricau (tristandsensio)
381384
- Jan Sorgalla (jsor)
382385
- henrikbjorn
@@ -401,7 +404,6 @@ The Symfony Connect username in parenthesis allows to get more information
401404
- Zan Baldwin (zanbaldwin)
402405
- Tim Goudriaan (codedmonkey)
403406
- BoShurik
404-
- Quentin Devos
405407
- Adam Prager (padam87)
406408
- Benoît Burnichon (bburnichon)
407409
- maxime.steinhausser
@@ -428,7 +430,6 @@ The Symfony Connect username in parenthesis allows to get more information
428430
- Uwe Jäger (uwej711)
429431
- javaDeveloperKid
430432
- Chris Smith (cs278)
431-
- W0rma
432433
- Lynn van der Berg (kjarli)
433434
- Michaël Perrin (michael.perrin)
434435
- Eugene Leonovich (rybakit)
@@ -438,6 +439,7 @@ The Symfony Connect username in parenthesis allows to get more information
438439
- GordonsLondon
439440
- Ray
440441
- Philipp Cordes (corphi)
442+
- Fabien S (bafs)
441443
- Chekote
442444
- Thomas Adam
443445
- Anderson Müller
@@ -471,6 +473,7 @@ The Symfony Connect username in parenthesis allows to get more information
471473
- Marcos Sánchez
472474
- Emanuele Panzeri (thepanz)
473475
- Zmey
476+
- Santiago San Martin (santysisi)
474477
- Kim Hemsø Rasmussen (kimhemsoe)
475478
- Maximilian Reichel (phramz)
476479
- Samaël Villette (samadu61)
@@ -498,6 +501,7 @@ The Symfony Connect username in parenthesis allows to get more information
498501
- Manuel Kießling (manuelkiessling)
499502
- Alexey Kopytko (sanmai)
500503
- Warxcell (warxcell)
504+
- SiD (plbsid)
501505
- Atsuhiro KUBO (iteman)
502506
- rudy onfroy (ronfroy)
503507
- Serkan Yildiz (srknyldz)
@@ -507,7 +511,6 @@ The Symfony Connect username in parenthesis allows to get more information
507511
- Gabor Toth (tgabi333)
508512
- realmfoo
509513
- Joppe De Cuyper (joppedc)
510-
- Fabien S (bafs)
511514
- Simon Podlipsky (simpod)
512515
- Thomas Tourlourat (armetiz)
513516
- Andrey Esaulov (andremaha)
@@ -612,7 +615,6 @@ The Symfony Connect username in parenthesis allows to get more information
612615
- Alex (aik099)
613616
- Kieran Brahney
614617
- Fabien Villepinte
615-
- SiD (plbsid)
616618
- Greg Thornton (xdissent)
617619
- Alex Bowers
618620
- Kev
@@ -638,6 +640,7 @@ The Symfony Connect username in parenthesis allows to get more information
638640
- Ivan Sarastov (isarastov)
639641
- flack (flack)
640642
- Shein Alexey
643+
- Link1515
641644
- Joe Lencioni
642645
- Daniel Tschinder
643646
- Diego Agulló (aeoris)
@@ -758,6 +761,7 @@ The Symfony Connect username in parenthesis allows to get more information
758761
- Jérémy REYNAUD (babeuloula)
759762
- Faizan Akram Dar (faizanakram)
760763
- Arkadius Stefanski (arkadius)
764+
- Andy Palmer (andyexeter)
761765
- Jonas Flodén (flojon)
762766
- AnneKir
763767
- Tobias Weichart
@@ -781,6 +785,7 @@ The Symfony Connect username in parenthesis allows to get more information
781785
- Giso Stallenberg (gisostallenberg)
782786
- Rob Bast
783787
- Roberto Espinoza (respinoza)
788+
- Steven RENAUX (steven_renaux)
784789
- Marvin Feldmann (breyndotechse)
785790
- Soufian EZ ZANTAR (soezz)
786791
- Marek Zajac
@@ -867,7 +872,6 @@ The Symfony Connect username in parenthesis allows to get more information
867872
- Dariusz Ruminski
868873
- Bahman Mehrdad (bahman)
869874
- Romain Gautier (mykiwi)
870-
- Link1515
871875
- Matthieu Bontemps
872876
- Erik Trapman
873877
- De Cock Xavier (xdecock)
@@ -1010,7 +1014,6 @@ The Symfony Connect username in parenthesis allows to get more information
10101014
- Jonas Elfering
10111015
- Mihai Stancu
10121016
- Nahuel Cuesta (ncuesta)
1013-
- Santiago San Martin
10141017
- Chris Boden (cboden)
10151018
- EStyles (insidestyles)
10161019
- Christophe Villeger (seragan)
@@ -1065,7 +1068,6 @@ The Symfony Connect username in parenthesis allows to get more information
10651068
- Pierrick VIGNAND (pierrick)
10661069
- Alex Bogomazov (alebo)
10671070
- aaa2000 (aaa2000)
1068-
- Andy Palmer (andyexeter)
10691071
- Andrew Neil Forster (krciga22)
10701072
- Stefan Warman (warmans)
10711073
- Tristan Maindron (tmaindron)
@@ -1865,6 +1867,7 @@ The Symfony Connect username in parenthesis allows to get more information
18651867
- Philipp Fritsche
18661868
- Léon Gersen
18671869
- tarlepp
1870+
- Giuseppe Arcuti
18681871
- Dustin Wilson
18691872
- Benjamin Paap (benjaminpaap)
18701873
- Claus Due (namelesscoder)
@@ -1958,7 +1961,6 @@ The Symfony Connect username in parenthesis allows to get more information
19581961
- Bruno MATEU
19591962
- Jeremy Bush
19601963
- Lucas Bäuerle
1961-
- Steven RENAUX (steven_renaux)
19621964
- Laurens Laman
19631965
- Thomason, James
19641966
- Dario Savella
@@ -2195,6 +2197,7 @@ The Symfony Connect username in parenthesis allows to get more information
21952197
- Tim Ward
21962198
- Adiel Cristo (arcristo)
21972199
- Christian Flach (cmfcmf)
2200+
- Dennis Jaschinski (d.jaschinski)
21982201
- Fabian Kropfhamer (fabiank)
21992202
- Jeffrey Cafferata (jcidnl)
22002203
- Junaid Farooq (junaidfarooq)
@@ -2264,6 +2267,7 @@ The Symfony Connect username in parenthesis allows to get more information
22642267
- wivaku
22652268
- Markus Reinhold
22662269
- Jingyu Wang
2270+
- es
22672271
- steveYeah
22682272
- Asrorbek (asrorbek)
22692273
- Samy D (dinduks)
@@ -2278,6 +2282,7 @@ The Symfony Connect username in parenthesis allows to get more information
22782282
- Alan Scott
22792283
- Juanmi Rodriguez Cerón
22802284
- twifty
2285+
- David Szkiba
22812286
- Andy Raines
22822287
- François Poguet
22832288
- Anthony Ferrara
@@ -2296,6 +2301,7 @@ The Symfony Connect username in parenthesis allows to get more information
22962301
- xdavidwu
22972302
- Benjamin RICHARD
22982303
- Raphaël Droz
2304+
- Vladimir Pakhomchik
22992305
- pdommelen
23002306
- Eric Stern
23012307
- ShiraNai7
@@ -2710,6 +2716,7 @@ The Symfony Connect username in parenthesis allows to get more information
27102716
- Marcel Siegert
27112717
- ryunosuke
27122718
- Bruno BOUTAREL
2719+
- Athorcis
27132720
- John Stevenson
27142721
- everyx
27152722
- Richard Heine
@@ -2767,6 +2774,7 @@ The Symfony Connect username in parenthesis allows to get more information
27672774
- Abdouarrahmane FOUAD (fabdouarrahmane)
27682775
- Jakub Janata (janatjak)
27692776
- Jm Aribau (jmaribau)
2777+
- Maciej Paprocki (maciekpaprocki)
27702778
- Matthew Foster (mfoster)
27712779
- Paul Seiffert (seiffert)
27722780
- Vasily Khayrulin (sirian)
@@ -3114,6 +3122,7 @@ The Symfony Connect username in parenthesis allows to get more information
31143122
- Darryl Hein (xmmedia)
31153123
- Vladimir Sadicov (xtech)
31163124
- Marcel Berteler
3125+
- Ruud Seberechts
31173126
- sdkawata
31183127
- Frederik Schmitt
31193128
- Peter van Dommelen
@@ -3151,6 +3160,7 @@ The Symfony Connect username in parenthesis allows to get more information
31513160
- Pierre Rineau
31523161
- Florian Morello
31533162
- Maxim Lovchikov
3163+
- ivelin vasilev
31543164
- adenkejawen
31553165
- Florent SEVESTRE (aniki-taicho)
31563166
- Ari Pringle (apringle)
@@ -3327,6 +3337,7 @@ The Symfony Connect username in parenthesis allows to get more information
33273337
- Kevin Verschaeve (keversc)
33283338
- Kevin Herrera (kherge)
33293339
- Kubicki Kamil (kubik)
3340+
- Lauris Binde (laurisb)
33303341
- Luis Ramón López López (lrlopez)
33313342
- Vladislav Nikolayev (luxemate)
33323343
- Martin Mandl (m2mtech)
@@ -3372,7 +3383,6 @@ The Symfony Connect username in parenthesis allows to get more information
33723383
- Youpie
33733384
- Jason Stephens
33743385
- Korvin Szanto
3375-
- wkania
33763386
- srsbiz
33773387
- Taylan Kasap
33783388
- Michael Orlitzky
@@ -3585,6 +3595,7 @@ The Symfony Connect username in parenthesis allows to get more 10000 information
35853595
- mieszko4
35863596
- Steve Preston
35873597
- ibasaw
3598+
- koyolgecen
35883599
- Wojciech Skorodecki
35893600
- Kevin Frantz
35903601
- Neophy7e
@@ -3614,6 +3625,7 @@ The Symfony Connect username in parenthesis allows to get more information
36143625
- satalaondrej
36153626
- Matthias Dötsch
36163627
- jonmldr
3628+
- Nowfel2501
36173629
- Yevgen Kovalienia
36183630
- Lebnik
36193631
- Shude
@@ -3635,6 +3647,7 @@ The Symfony Connect username in parenthesis allows to get more information
36353647
- Egor Gorbachev
36363648
- Julian Krzefski
36373649
- Derek Stephen McLean
3650+
- PatrickRedStar
36383651
- Norman Soetbeer
36393652
- zorn
36403653
- Yuriy Potemkin
@@ -3744,6 +3757,7 @@ The Symfony Connect username in parenthesis allows to get more information
37443757
- Brandon Kelly (brandonkelly)
37453758
- Choong Wei Tjeng (choonge)
37463759
- Bermon Clément (chou666)
3760+
- Chris Shennan (chrisshennan)
37473761
- Citia (citia)
37483762
- Kousuke Ebihara (co3k)
37493763
- Loïc Vernet (coil)
@@ -3906,6 +3920,7 @@ The Symfony Connect username in parenthesis allows to get more information
39063920
- Romain
39073921
- Xavier REN
39083922
- Kevin Meijer
3923+
- Ignacio Alveal
39093924
- max
39103925
- Alexander Bauer (abauer)
39113926
- Ahmad Mayahi (ahmadmayahi)

0 commit comments

Comments
 (0)
0