Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc4716d2

Browse files
Merge branch '2.7' into 2.8
* 2.7: `@throws` annotations should go after `@return` Fix merge updated VERSION for 2.3.42 update CONTRIBUTORS for 2.3.42 updated CHANGELOG for 2.3.42 Revert "bug#18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)" Partial revert of previous PR [DependencyInjection] Skip deep reference check for 'service_container' Catch \Throwable [Serializer] Add missing@throws annotations Fix for#18843 force enabling the external XML entity loaders Removed UTC specification with timestampConflicts:src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.phpsrc/Symfony/Component/Finder/Finder.phpsrc/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.phpsrc/Symfony/Component/Security/Acl/Domain/ObjectIdentity.phpsrc/Symfony/Component/Security/Acl/Model/AclInterface.phpsrc/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.phpsrc/Symfony/Component/Security/Acl/Permission/MaskBuilder.phpsrc/Symfony/Component/Translation/Loader/XliffFileLoader.phpsrc/Symfony/Component/Yaml/Tests/InlineTest.php
2 parents5a560f1 +1088252 commitc4716d2

File tree

38 files changed

+249
-88
lines changed

38 files changed

+249
-88
lines changed

‎CHANGELOG-2.3.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ in 2.3 minor versions.
77
To get the diff for a specific change, go tohttps://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go tohttps://github.com/symfony/symfony/compare/v2.3.0...v2.3.1
99

10+
* 2.3.42 (2016-05-30)
11+
12+
* bug#18908[DependencyInjection] force enabling the external XML entity loaders (xabbuh)
13+
* bug#18893[DependencyInjection] Skip deep reference check for 'service_container' (RobertMe)
14+
* bug#18812 Catch \Throwable (fprochazka)
15+
* bug#18821[Form] Removed UTC specification with timestamp (francisbesset)
16+
* bug#18861 Fix for#18843 (inso)
17+
* bug#18907[Routing] Fix the annotation loader taking a class constant as a beginning of a class name (jakzal, nicolas-grekas)
18+
* bug#18864[Console][DX] Fixed ambiguous error message when using a duplicate option shortcut (peterrehm)
19+
* bug#18844[Yaml] fix exception contexts (xabbuh)
20+
* bug#18840[Yaml] properly handle unindented collections (xabbuh)
21+
* bug#18839 People - person singularization (Keeo)
22+
* bug#18828[Yaml] chomp newlines only at the end of YAML documents (xabbuh)
23+
* bug#18635[Console] Prevent fatal error when calling Command::getHelper without helperSet (chalasr)
24+
* bug#18761[Form] Modified iterator_to_array's 2nd parameter to false in ViolationMapper (issei-m)
25+
1026
* 2.3.41 (2016-05-09)
1127

1228
* security#18733 limited the maximum length of a submitted username (fabpot)

‎CONTRIBUTORS.md‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ Symfony is the result of the work of many people who made the code better
2323
- Pascal Borreli (pborreli)
2424
- Joseph Bielawski (stloyd)
2525
- Wouter De Jong (wouterj)
26-
- Karma Dordrak (drak)
2726
- Romain Neutron (romain)
27+
- Karma Dordrak (drak)
2828
- Lukas Kahwe Smith (lsmith)
2929
- Martin Hasoň (hason)
3030
- Jeremy Mikola (jmikola)
@@ -53,11 +53,11 @@ Symfony is the result of the work of many people who made the code better
5353
- Bilal Amarni (bamarni)
5454
- Florin Patan (florinpatan)
5555
- Kevin Bond (kbond)
56+
- Peter Rehm (rpet)
5657
- Gábor Egyed (1ed)
5758
- Michel Weimerskirch (mweimerskirch)
5859
- Eric Clemmons (ericclemmons)
5960
- Andrej Hudec (pulzarraider)
60-
- Peter Rehm (rpet)
6161
- Christian Raue
6262
- Matthias Pigulla (mpdude)
6363
- Deni
@@ -67,14 +67,14 @@ Symfony is the result of the work of many people who made the code better
6767
- Iltar van der Berg (kjarli)
6868
- Ener-Getick (energetick)
6969
- Douglas Greenshields (shieldo)
70+
- Charles Sarrazin (csarrazi)
7071
- Lee McDermott
7172
- Brandon Turner
7273
- Luis Cordova (cordoval)
7374
- Daniel Holmes (dholmes)
7475
- Pierre du Plessis (pierredup)
7576
- Bart van den Burg (burgov)
7677
- Jordan Alliot (jalliot)
77-
- Charles Sarrazin (csarrazi)
7878
- John Wards (johnwards)
7979
- Toni Uebernickel (havvg)
8080
- Fran Moreno (franmomu)
@@ -89,6 +89,7 @@ Symfony is the result of the work of many people who made the code better
8989
- Alexander M. Turek (derrabus)
9090
- Dariusz Ruminski
9191
- marc.weistroff
92+
- Issei Murasawa (issei_m)
9293
- lenar
9394
- Włodzimierz Gajda (gajdaw)
9495
- Alexander Schwenn (xelaris)
@@ -97,13 +98,12 @@ Symfony is the result of the work of many people who made the code better
9798
- Colin Frei
9899
- Adrien Brault (adrienbrault)
99100
- Joshua Thijssen
100-
-Issei Murasawa (issei_m)
101+
-Baptiste Clavié (talus)
101102
- Peter Kokot (maastermedia)
102103
- excelwebzone
103104
- Jacob Dreesen (jdreesen)
104105
- Jérémy DERUSSÉ (jderusse)
105106
- Vladimir Reznichenko (kalessil)
106-
- Baptiste Clavié (talus)
107107
- Fabien Pennequin (fabienpennequin)
108108
- Gordon Franke (gimler)
109109
- David Buchmann (dbu)
@@ -121,6 +121,7 @@ Symfony is the result of the work of many people who made the code better
121121
- Evgeniy (ewgraf)
122122
- Guilherme Blanco (guilhermeblanco)
123123
- Pablo Godel (pgodel)
124+
- Titouan Galopin (tgalopin)
124125
- Jérémie Augustin (jaugustin)
125126
- Sebastiaan Stok (sstok)
126127
- Tugdual Saunier (tucksaun)
@@ -129,10 +130,10 @@ Symfony is the result of the work of many people who made the code better
129130
- Arnaud Kleinpeter (nanocom)
130131
- Joel Wurtz (brouznouf)
131132
- Philipp Wahala (hifi)
132-
- Titouan Galopin (tgalopin)
133133
- Richard Shank (iampersistent)
134134
- Thomas Rabaix (rande)
135135
- Vincent AUBERT (vincent)
136+
- Rouven Weßling (realityking)
136137
- Mikael Pajunen
137138
- Clemens Tolboom
138139
- Helmer Aaviksoo
@@ -143,7 +144,6 @@ Symfony is the result of the work of many people who made the code better
143144
- Amal Raghav (kertz)
144145
- Jonathan Ingram (jonathaningram)
145146
- Artur Kotyrba
146-
- Rouven Weßling (realityking)
147147
- Warnar Boekkooi (boekkooi)
148148
- Dmitrii Chekaliuk (lazyhammer)
149149
- Clément JOBEILI (dator)
@@ -211,6 +211,7 @@ Symfony is the result of the work of many people who made the code better
211211
- Kristen Gilden (kgilden)
212212
- Dawid Nowak
213213
- Pierre-Yves LEBECQ (pylebecq)
214+
- Daniel Espendiller
214215
- Jakub Kucharovic (jkucharovic)
215216
- Eugene Leonovich (rybakit)
216217
- Filippo Tessarotto
@@ -240,7 +241,6 @@ Symfony is the result of the work of many people who made the code better
240241
- Michael Holm (hollo)
241242
- Marc Weistroff (futurecat)
242243
- Hidde Wieringa (hiddewie)
243-
- Daniel Espendiller
244244
- Chris Smith (cs278)
245245
- Florian Klein (docteurklein)
246246
- Manuel Kiessling (manuelkiessling)
@@ -293,6 +293,7 @@ Symfony is the result of the work of many people who made the code better
293293
- Inal DJAFAR (inalgnu)
294294
- Christian Gärtner (dagardner)
295295
- Tomasz Kowalczyk (thunderer)
296+
- Christian Schmidt
296297
- François-Xavier de Guillebon (de-gui_f)
297298
- Damien Alexandre (damienalexandre)
298299
- Felix Labrecque
@@ -309,6 +310,7 @@ Symfony is the result of the work of many people who made the code better
309310
- Philipp Kräutli (pkraeutli)
310311
- Kirill chEbba Chebunin (chebba)
311312
- Greg Thornton (xdissent)
313+
- Robin Chalas (chalas_r)
312314
- Costin Bereveanu (schniper)
313315
- Loïc Chardonnet (gnusat)
314316
- Marek Kalnik (marekkalnik)
@@ -319,12 +321,14 @@ Symfony is the result of the work of many people who made the code better
319321
- Pavel Volokitin (pvolok)
320322
- Endre Fejes
321323
- Tobias Naumann (tna)
324+
- Daniel Beyer
322325
- Shein Alexey
323326
- Baptiste Lafontaine
324327
- Joe Lencioni
325328
- Daniel Tschinder
326329
- Kai
327330
- Lee Rowlands
331+
- Krzysztof Piasecki (krzysztek)
328332
- Maximilian Reichel (phramz)
329333
- Loick Piera (pyrech)
330334
- Karoly Negyesi (chx)
@@ -364,7 +368,6 @@ Symfony is the result of the work of many people who made the code better
364368
- EdgarPE
365369
- Florian Pfitzer (marmelatze)
366370
- Asier Illarramendi (doup)
367-
- Christian Schmidt
368371
- Chris Sedlmayr (catchamonkey)
369372
- Seb Koelen
370373
- Christoph Mewes (xrstf)
@@ -382,6 +385,7 @@ Symfony is the result of the work of many people who made the code better
382385
- Mathieu Lemoine
383386
- franek (franek)
384387
- Christian Wahler
388+
- Mathieu Lemoine
385389
- Gintautas Miselis
386390
- Zander Baldwin
387391
- Adam Harvey
@@ -419,7 +423,6 @@ Symfony is the result of the work of many people who made the code better
419423
- Anthony Ferrara
420424
- Ioan Negulescu
421425
- Jakub Škvára (jskvara)
422-
- Daniel Beyer
423426
- Andrew Udvare (audvare)
424427
- alexpods
425428
- Tristan Darricau (nicofuma)
@@ -448,6 +451,7 @@ Symfony is the result of the work of many people who made the code better
448451
- Denis Gorbachev (starfall)
449452
- Peter van Dommelen
450453
- Tim van Densen
454+
- Martin Morávek (keeo)
451455
- Steven Surowiec
452456
- Kevin Saliou (kbsali)
453457
- NothingWeAre
@@ -462,7 +466,6 @@ Symfony is the result of the work of many people who made the code better
462466
- Ziumin
463467
- Jeremy Benoist
464468
- Lenar Lõhmus
465-
- Krzysztof Piasecki (krzysztek)
466469
- Benjamin Laugueux (yzalis)
467470
- Zach Badgett (zachbadgett)
468471
- Aurélien Fredouelle
@@ -501,6 +504,7 @@ Symfony is the result of the work of many people who made the code better
501504
- Javier López (loalf)
502505
- Reinier Kip
503506
- Dustin Dobervich (dustin10)
507+
- dantleech
504508
- Anne-Sophie Bachelard (annesophie)
505509
- Sebastian Marek (proofek)
506510
- Erkhembayar Gantulga (erheme318)
@@ -563,6 +567,7 @@ Symfony is the result of the work of many people who made the code better
563567
- Peter Ward
564568
- Dominik Ritter (dritter)
565569
- Sebastian Grodzicki (sgrodzicki)
570+
- SpacePossum
566571
- Martin Hujer (martinhujer)
567572
- Pascal Helfenstein
568573
- Baldur Rensch (brensch)
@@ -613,6 +618,7 @@ Symfony is the result of the work of many people who made the code better
613618
- Adrien Lucas (adrienlucas)
614619
- James Michael DuPont
615620
- Tom Klingenberg
621+
- Filip Procházka (fprochazka)
616622
- Christopher Hall (mythmakr)
617623
- Paul Kamer (pkamer)
618624
- Rafał Wrzeszcz (rafalwrzeszcz)
@@ -629,6 +635,7 @@ Symfony is the result of the work of many people who made the code better
629635
- Alaattin Kahramanlar (alaattin)
630636
- Maksim Kotlyar (makasim)
631637
- Neil Ferreira
638+
- Nathanael Noblet (gnat)
632639
- Dmitry Parnas (parnas)
633640
- Théo FIDRY (theofidry)
634641
- Paul LE CORRE
@@ -745,7 +752,6 @@ Symfony is the result of the work of many people who made the code better
745752
- Guillaume Royer
746753
- Artem (digi)
747754
- boite
748-
- dantleech
749755
- Vadim Tyukov (vatson)
750756
- Sortex
751757
- chispita
@@ -851,6 +857,7 @@ Symfony is the result of the work of many people who made the code better
851857
- Christian Sciberras
852858
- Anton Bakai
853859
- Clement Herreman (clemherreman)
860+
- Dan Ionut Dumitriu (danionut90)
854861
- Nyro (nyro)
855862
- Marco
856863
- Marc Torres
@@ -870,7 +877,6 @@ Symfony is the result of the work of many people who made the code better
870877
- ConneXNL
871878
- Aharon Perkel
872879
- Abdul.Mohsen B. A. A
873-
- SpacePossum
874880
- Benoît Burnichon
875881
- Remi Collet
876882
- pthompson
@@ -1059,6 +1065,7 @@ Symfony is the result of the work of many people who made the code better
10591065
- stloyd
10601066
- Chris Tickner
10611067
- Andrew Coulton
1068+
- Jeremy Benoist
10621069
- Michal Gebauer
10631070
- Gleb Sidora
10641071
- David Stone
@@ -1108,7 +1115,6 @@ Symfony is the result of the work of many people who made the code better
11081115
- Simon Sargeant
11091116
- efeen
11101117
- Michał Dąbrowski (defrag)
1111-
- Nathanael Noblet (gnat)
11121118
- Simone Fumagalli (hpatoio)
11131119
- Brian Graham (incognito)
11141120
- Kevin Vergauwen (innocenzo)
@@ -1214,8 +1220,10 @@ Symfony is the result of the work of many people who made the code better
12141220
- Alan Chen
12151221
- Maerlyn
12161222
- Even André Fiskvik
1223+
- Erik van Wingerden
12171224
- Dane Powell
12181225
- Gerrit Drost
1226+
- Linnaea Von Lavia
12191227
- Lenar Lõhmus
12201228
- Cristian Gonzalez
12211229
- AlberT
@@ -1271,6 +1279,7 @@ Symfony is the result of the work of many people who made the code better
12711279
- Joseph Deray
12721280
- Damian Sromek
12731281
- Ben
1282+
- dasmfm
12741283
- Arnaud Buathier (arnapou)
12751284
- chesteroni (chesteroni)
12761285
- Mauricio Lopez (diaspar)
@@ -1358,7 +1367,6 @@ Symfony is the result of the work of many people who made the code better
13581367
- Norman Soetbeer
13591368
- zorn
13601369
- Benjamin Long
1361-
- Robin Chalas
13621370
- Matt Janssen
13631371
- Peter Gribanov
13641372
- kwiateusz
@@ -1443,6 +1451,7 @@ Symfony is the result of the work of many people who made the code better
14431451
- ollie harridge (ollietb)
14441452
- Paul Andrieux (paulandrieux)
14451453
- Paweł Szczepanek (pauluz)
1454+
- Philippe Degeeter (pdegeeter)
14461455
- Christian López Espínola (penyaskito)
14471456
- Petr Jaroš (petajaros)
14481457
- Philipp Hoffmann (philipphoffmann)

‎src/Symfony/Bridge/Twig/NodeVisitor/Scope.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ public function leave()
6767
* @param string $key
6868
* @param mixed $value
6969
*
70-
* @throws \LogicException
71-
*
7270
* @return Scope Current scope
71+
*
72+
* @throws \LogicException
7373
*/
7474
publicfunctionset($key,$value)
7575
{

‎src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,9 @@ public function load($resource, $type = null)
8484
}catch (\Exception$e) {
8585
$this->loading =false;
8686
throw$e;
87+
}catch (\Throwable$e) {
88+
$this->loading =false;
89+
throw$e;
8790
}
8891

8992
$this->loading =false;
@@ -92,7 +95,7 @@ public function load($resource, $type = null)
9295
if ($controller =$route->getDefault('_controller')) {
9396
try {
9497
$controller =$this->parser->parse($controller);
95-
}catch (\Exception$e) {
98+
}catch (\InvalidArgumentException$e) {
9699
// unable to optimize unknown notation
97100
}
98101

‎src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
182182
/**
183183
* @param string $file
184184
*
185-
* @throws \InvalidArgumentException
186-
*
187185
* @return bool
186+
*
187+
* @throws \InvalidArgumentException
188188
*/
189189
protectedfunctioncanBeExtracted($file)
190190
{

‎src/Symfony/Bundle/TwigBundle/Extension/AssetsExtension.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ public function getName()
9595
*
9696
* @param string $url The URL that has to be absolute
9797
*
98-
* @throws \RuntimeException
99-
*
10098
* @return string The absolute URL
99+
*
100+
* @throws \RuntimeException
101101
*/
102102
privatefunctionensureUrlIsAbsolute($url)
103103
{

‎src/Symfony/Component/Config/Loader/FileLoader.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ public function import($resource, $type = null, $ignoreErrors = false, $sourceRe
113113
}catch (\Exception$e) {
114114
unset(self::$loading[$resource]);
115115
throw$e;
116+
}catch (\Throwable$e) {
117+
unset(self::$loading[$resource]);
118+
throw$e;
116119
}
117120

118121
unset(self::$loading[$resource]);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp