8000 Merge branch '2.8' into 3.1 · symfony/symfony@298452d · GitHub
[go: up one dir, main page]
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
Appearance settings

Commit 298452d

Browse files
fabpotfabpot
committed
Merge branch '2.8' into 3.1
* 2.8: [Console] Review Application docblocks bumped Symfony version to 2.8.16 updated VERSION for 2.8.15 updated CHANGELOG for 2.8.15 bumped Symfony version to 2.7.23 updated VERSION for 2.7.22 update CONTRIBUTORS for 2.7.22 updated CHANGELOG for 2.7.22 Update PHP CS Fixer config file
2 parents 8bf83cc + e221ac9 commit 298452d

File tree

3 files changed

+47
-34
lines changed

3 files changed

+47
-34
lines changed

‎.php_cs renamed to ‎.php_cs.dist

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
<?php
22

3-
return Symfony\CS\Config\Config::create()
4-
->setUsingLinter(false)
5-
->setUsingCache(true)
6-
->fixers(array(
7-
'long_array_syntax',
8-
'php_unit_construct',
9-
'php_unit_dedicate_assert',
3+
return PhpCsFixer\Config::create()
4+
->setRules(array(
5+
'@Symfony' => true,
6+
'@Symfony:risky' => true,
7+
'array_syntax' => array('syntax' => 'long'),
108
))
11-
->finder(
12-
Symfony\CS\Finder\DefaultFinder::create()
9+
->setRiskyAllowed(true)
10+
->setFinder(
11+
PhpCsFixer\Finder::create()
1312
->in(__DIR__)
1413
->exclude(array(
1514
// directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code

‎CONTRIBUTORS.md

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -28,34 +28,34 @@ Symfony is the result of the work of many people who made the code better
2828
- Lukas Kahwe Smith (lsmith)
2929
- Martin Hasoň (hason)
3030
- Jeremy Mikola (jmikola)
31-
- Jean-François Simon (jfsimon)
3231
- Grégoire Pineau (lyrixx)
32+
- Jean-François Simon (jfsimon)
3333
- Benjamin Eberlei (beberlei)
3434
- Igor Wiedler (igorw)
3535
- Eriksen Costa (eriksencosta)
3636
- Jules Pietri (heah)
37-
- Sarah Khalil (saro0h)
3837
- Maxime Steinhausser (ogizanagi)
38+
- Sarah Khalil (saro0h)
3939
- Jonathan Wage (jwage)
4040
- Diego Saint Esteben (dosten)
41+
- Robin Chalas (chalas_r)
4142
- Alexandre Salomé (alexandresalome)
4243
- William Durand (couac)
4344
- ornicar
4445
- Francis Besset (francisbesset)
4546
- stealth35 ‏ (stealth35)
4647
- Alexander Mols (asm89)
4748
- Bulat Shakirzyanov (avalanche123)
48-
- Robin Chalas (chalas_r)
4949
- Saša Stamenković (umpirsky)
5050
- Henrik Bjørnskov (henrikbjorn)
5151
- Miha Vrhovnik
5252
- Diego Saint Esteben (dii3g0)
5353
- Ener-Getick (energetick)
5454
- Konstantin Kudryashov (everzet)
5555
- Bilal Amarni (bamarni)
56+
- Iltar van der Berg (kjarli)
5657
- Florin Patan (florinpatan)
5758
- Peter Rehm (rpet)
58-
- Iltar van der Berg (kjarli)
5959
- Kevin Bond (kbond)
6060
- Andrej Hudec (pulzarraider)
6161
- Gábor Egyed (1ed)
@@ -77,16 +77,16 @@ Symfony is the result of the work of many people who made the code better
7777
- Titouan Galopin (tgalopin)
7878
- Daniel Holmes (dholmes)
7979
- Pierre du Plessis (pierredup)
80+
- Toni Uebernickel (havvg)
8081
- Bart van den Burg (burgov)
8182
- Jordan Alliot (jalliot)
8283
- John Wards (johnwards)
83-
- Toni Uebernickel (havvg)
84+
- Roland Franssen (ro0)
8485
- Fran Moreno (franmomu)
86+
- Jáchym Toušek (enumag)
8587
- Antoine Hérault (herzult)
8688
- Paráda József (paradajozsef)
87-
- Roland Franssen (ro0)
8889
- Dariusz Ruminski
89-
- Jáchym Toušek (enumag)
9090
- Arnaud Le Blanc (arnaud-lb)
9191
- Jérôme Tamarelle (gromnan)
9292
- Michal Piotrowski (eventhorizon)
@@ -114,6 +114,7 @@ Symfony is the result of the work of many people who made the code better
114114
- Eric GELOEN (gelo)
115115
- David Buchmann (dbu)
116116
- Tugdual Saunier (tucksaun)
117+
- Maxime STEINHAUSSER
117118
- Théo FIDRY (theofidry)
118119
- Robert Schönthal (digitalkaoz)
119120
- Florian Lonqueu-Brochard (florianlb)
@@ -134,6 +135,7 @@ Symfony is the result of the work of many people who made the code better
134135
- jwdeitch
135136
- Tobias Nyholm (tobias)
136137
- Joel Wurtz (brouznouf)
138+
- Yonel Ceruto González (yonelceruto)
137139
- Philipp Wahala (hifi)
138140
- Vyacheslav Pavlov
139141
- Javier Spagnoletti (phansys)
@@ -146,7 +148,6 @@ Symfony is the result of the work of many people who made the code better
146148
- Clemens Tolboom
147149
- Helmer Aaviksoo
148150
- Hiromi Hishida (77web)
149-
- Yonel Ceruto González (yonelceruto)
150151
- Richard van Laak (rvanlaak)
151152
- Matthieu Ouellette-Vachon (maoueh)
152153
- Michał Pipa (michal.pipa)
@@ -168,7 +169,6 @@ Symfony is the result of the work of many people who made the code better
168169
- Andreas Hucks (meandmymonkey)
169170
- Noel Guilbert (noel)
170171
- Lars Strojny (lstrojny)
171-
- Maxime STEINHAUSSER
172172
- Stepan Anchugov (kix)
173173
- bronze1man
174174
- sun (sun)
@@ -263,6 +263,7 @@ Symfony is the result of the work of many people who made the code better
263263
- Hidde Wieringa (hiddewie)
264264
- Chris Smith (cs278)
265265
- Florian Klein (docteurklein)
266+
- Julien Falque (julienfalque)
266267
- Oleg Voronkovich
267268
- Manuel Kiessling (manuelkiessling)
268269
- Daniel Wehner
@@ -331,10 +332,13 @@ Symfony is the result of the work of many people who made the code better
331332
- Loïc Chardonnet (gnusat)
332333
- Marek Kalnik (marekkalnik)
333334
- Vyacheslav Salakhutdinov (megazoll)
335+
- Jerzy Zawadzki (jzawadzki)
334336
- Hassan Amouhzi
335337
- Tamas Szijarto
336338
- Pavel Volokitin (pvolok)
339+
- Nicolas Dewez (nicolas_dewez)
337340
- Endre Fejes
341+
- Victor Bocharsky (bocharsky_bw)
338342
- Tobias Naumann (tna)
339343
- Daniel Beyer
340344
- Shein Alexey
@@ -427,7 +431,6 @@ Symfony is the result of the work of many people who made the code better
427431
- Roy Van Ginneken (rvanginneken)
428432
- ondrowan
429433
- Barry vd. Heuvel (barryvdh)
430-
- Jerzy Zawadzki (jzawadzki)
431434
- Evan S Kaufman (evanskaufman)
432435
- mcben
433436
- Jérôme Vieilledent (lolautruche)
@@ -437,9 +440,7 @@ Symfony is the result of the work of many people who made the code better
437440
- Markus Lanthaler (lanthaler)
438441
- Remi Collet
439442
- Vicent Soria Durá (vicentgodella)
440-
- Nicolas Dewez (nicolas_dewez)
441443
- Anthony Ferrara
442-
- Victor Bocharsky (bocharsky_bw)
443444
- Ioan Negulescu
444445
- Jakub Škvára (jskvara)
445446
- Andrew Udvare (audvare)
@@ -484,6 +485,7 @@ Symfony is the result of the work of many people who made the code better
484485
- Ziumin
485486
- Jeremy Benoist
486487
- Lenar Lõhmus
488+
- Sander Toonen (xatoo)
487489
- Benjamin Laugueux (yzalis)
488490
- Zach Badgett (zachbadgett)
489491
- Aurélien Fredouelle
@@ -521,6 +523,7 @@ Symfony is the result of the work of many people who made the code better
521523
- Maxime Douailin
522524
- Jean Pasdeloup (pasdeloup)
523525
- Javier López (loalf)
526+
- Andreas Braun
524527
- Reinier Kip
525528
- Geoffrey Brier (geoffrey-brier)
526529
- Dustin Dobervich (dustin10)
@@ -548,8 +551,10 @@ Symfony is the result of the work of many people who made the code better
548551
- umpirski
549552
- Chris Heng (gigablah)
550553
- Ulumuddin Yunus (joenoez)
554+
- Adam Prager (padam87)
551555
- Luc Vieillescazes (iamluc)
552556
- Johann Saunier (prophet777)
557+
- Samuel ROZE (sroze)
553558
- Michael Devery (mickadoo)
554559
- Antoine Corcy
555560
- Artur Eshenbrener
@@ -589,6 +594,7 @@ Symfony is the result of the work of many people who made the code better
589594
- yclian
590595
- twifty
591596
- Peter Ward
597+
- Julien DIDIER (juliendidier)
592598
- Dominik Ritter (dritter)
593599
- Sebastian Grodzicki (sgrodzicki)
594600
- Martin Hujer (martinhujer)
@@ -613,6 +619,7 @@ Symfony is the result of the work of many people who made the code better
613619
- michaelwilliams
614620
- 1emming
615621
- Leevi Graham (leevigraham)
622+
- Nykopol (nykopol)
616623
- Jordan Deitch
617624
- Casper Valdemar Poulsen
618625
- Josiah (josiah)
@@ -696,9 +703,9 @@ Symfony is the result of the work of many people who made the code better
696703
- abdul malik ikhsan (samsonasik)
697704
- Henry Snoek (snoek09)
698705
- Simone Di Maulo (toretto460)
699-
- Sander Toonen (xatoo)
700706
- Christian Morgan
701707
- Alexander Miehe (engerim)
708+
- Jérôme Parmentier (lctrs)
702709
- Morgan Auchede (mauchede)
703710
- Don Pinkster
704711
- Maksim Muruev
@@ -769,13 +776,13 @@ Symfony is the result of the work of many people who made the code better
769776
- fabios
770777
- Sander Coolen (scoolen)
771778
- Nicolas Le Goff (nlegoff)
772-
- Andreas Braun
773779
- Ben Oman
774780
- Manuele Menozzi
775781
- Anton Babenko (antonbabenko)
776782
- Irmantas Šiupšinskas (irmantas)
777783
- Danilo Silva
778784
- Zachary Tong (polyfractal)
785+
- Amrouche Hamza
779786
- Hryhorii Hrebiniuk
780787
- Dennis Fridrich (dfridrich)
781788
- mcfedr (mcfedr)
@@ -808,10 +815,10 @@ Symfony is the result of the work of many people who made the code better
808815
- Ville Mattila
809816
- Boris Vujicic (boris.vujicic)
810817
- Max Beutel
818+
- Antanas Arvasevicius
811819
- nacho
812820
- Piotr Antosik (antek88)
813821
- Artem Lopata
814-
- Samuel ROZE (sroze)
815822
- Sergey Novikov (s12v)
816823
- Marcos Quesada (marcos_quesada)
817824
- Matthew Vickery (mattvick)
@@ -842,6 +849,7 @@ Symfony is the result of the work of many people who made the code better
842849
- Thomas Royer (cydonia7)
843850
- DerManoMann
844851
- Olaf Klischat
852+
- orlovv
845853
- Jhonny Lidfors (jhonny)
846854
- Julien Bianchi (jubianchi)
847855
- Robert Meijers
@@ -877,6 +885,7 @@ Symfony is the result of the work of many people who made the code better
877885
- Taras Girnyk
878886
- Eduardo García Sanz (coma)
879887
- James Gilliland
888+
- fduch (fduch)
880889
- Rhodri Pugh (rodnaph)
881890
- David de Boer (ddeboer)
882891
- Klaus Purer
@@ -910,6 +919,7 @@ Symfony is the result of the work of many people who made the code better
910919
- Alberto Aldegheri
911920
- heccjj
912921
- Alexandre Melard
922+
- Thomas Calvet
913923
- Sergey Yuferev
914924
- Tobias Stöckler
915925
- Mario Young
@@ -950,6 +960,7 @@ Symfony is the result of the work of many people who made the code better
950960
- Sebastian Utz
951961
- Adrien Gallou (agallou)
952962
- Karol Sójko (karolsojko)
963+
- Grzegorz Zdanowski (kiler129)
953964
- sl_toto (sl_toto)
954965
- Walter Dal Mut (wdalmut)
955966
- Albin Kerouaton
@@ -997,9 +1008,11 @@ Symfony is the result of the work of many people who made the code better
9971008
- Ahmed TAILOULOUTE (ahmedtai)
9981009
- Maxime Veber (nek-)
9991010
- Sullivan SENECHAL
1011+
- Dariusz Ruminski
10001012
- Tadcka
10011013
- Beth Binkovitz
10021014
- Romain Geissler
1015+
- Adrien Moiruad
10031016
- Tomaz Ahlin
10041017
- Benjamin Cremer (bcremer)
10051018
- Marcus Stöhr (dafish)
@@ -1015,7 +1028,6 @@ Symfony is the result of the work of many people who made the code better
10151028
- Max Romanovsky (maxromanovsky)
10161029
- Mathieu Morlon
10171030
- Daniel Tschinder
1018-
- Nykopol (nykopol)
10191031
- Rafał Muszyński (rafmus90)
10201032
- Timothy Anido (xanido)
10211033
- Rick Prent
@@ -1061,6 +1073,7 @@ Symfony is the result of the work of many people who made the code better
10611073
- kor3k kor3k (kor3k)
10621074
- Stelian Mocanita (stelian)
10631075
- Flavian (2much)
1076+
- Arthur de Moulins (4rthem)
10641077
- mike
10651078
- Keith Maika
10661079
- Mephistofeles
@@ -1093,7 +1106,6 @@ Symfony is the result of the work of many people who made the code better
10931106
- Adrian Olek (adrianolek)
10941107
- Przemysław Piechota (kibao)
10951108
- Leonid Terentyev (li0n)
1096-
- Adam Prager (padam87)
10971109
- ryunosuke
10981110
- victoria
10991111
- Francisco Facioni (fran6co)
@@ -1254,11 +1266,11 @@ Symfony is the result of the work of many people who made the code better
12541266
- Jan Eichhorn (exeu)
12551267
- Grégory Pelletier (ip512)
12561268
- John Nickell (jrnickell)
1257-
- Julien DIDIER (juliendidier)
12581269
- Martin Mayer (martin)
12591270
- Grzegorz Łukaszewicz (newicz)
12601271
- Götz Gottwald
12611272
- Veres Lajos
1273+
- Michael Babker
12621274
- grifx
12631275
- Robert Campbell
12641276
- Matt Lehner
@@ -1299,6 +1311,7 @@ Symfony is the result of the work of many people who made the code better
12991311
- Alex
13001312
- Klaas Naaijkens
13011313
- Daniel González Cerviño
1314+
- ShinDarth
13021315
- Rafał
13031316
- Adria Lopez (adlpz)
13041317
- Rosio (ben-rosio)
@@ -1319,7 +1332,6 @@ Symfony is the result of the work of many people who made the code better
13191332
- Jelle Bekker (jbekker)
13201333
- Ian Jenkins (jenkoian)
13211334
- Jorge Martin (jorgemartind)
1322-
- Julien Falque (julienfalque)
13231335
- Kevin Herrera (kherge)
13241336
- Luis Ramón López López (lrlopez)
13251337
- Muriel (metalmumu)
@@ -1341,6 +1353,7 @@ Symfony is the result of the work of many people who made the code better
13411353
- Saem Ghani
13421354
- Stefan Oderbolz
13431355
- Curtis
1356+
- Gabriel Moreira
13441357
- Alexey Popkov
13451358
- Joseph Deray
13461359
- Damian Sromek
@@ -1362,6 +1375,7 @@ Symfony is the result of the work of many people who made the code better
13621375
- Wotre
13631376
- goohib
13641377
- Xavier HAUSHERR
1378+
- Edwin Hageman
13651379
- Mantas Urnieža
13661380
- Cas
13671381
- Dusan Kasan
@@ -1393,6 +1407,7 @@ Symfony is the result of the work of many people who made the code better
13931407
- Dariusz Czech
13941408
- Anonymous User
13951409
- Eric J. Duran
1410+
- Alexandru Bucur
13961411
- cmfcmf
13971412
- Drew Butler
13981413
- Steve Müller
@@ -1477,11 +1492,13 @@ Symfony is the result of the work of many people who made the code better
14771492
- Daniel Basten (axhm3a)
14781493
- Bill Hance (billhance)
14791494
- Bernd Matzner (bmatzner)
1495+
- Bram Tweedegolf (bram_tweedegolf)
14801496
- Choong Wei Tjeng (choonge)
14811497
- Kousuke Ebihara (co3k)
14821498
- Loïc Vernet (coil)
14831499
- Christoph Schaefer (cvschaefer)
14841500
- Damon Jones (damon__jones)
1501+
- Łukasz Giza (destroyer)
14851502
- Daniel Londero (dlondero)
14861503
- Sebastian Landwehr (dword123)
14871504
- Adel ELHAIBA (eadel)
@@ -1497,6 +1514,7 @@ Symfony is the result of the work of many people who made the code better
14971514
- Arash Tabriziyan (ghost098)
14981515
- ibasaw (ibasaw)
14991516
- Vladislav Krupenkin (ideea)
1517+
- Imangazaliev Muhammad (imangazaliev)
15001518
- joris de wit (jdewit)
15011519
- Jérémy CROMBEZ (jeremy)
15021520
- Jose Manuel Gonzalez (jgonzalez)
@@ -1506,10 +1524,10 @@ Symfony is the result of the work of many people who made the code better
15061524
- JuntaTom (juntatom)
15071525
- Ismail Faizi (kanafghan)
15081526
- Sébastien Armand (khepin)
1527+
- Pierre-Chanel Gauthier (kmecnin)
15091528
- Krzysztof Menżyk (krymen)
15101529
- samuel laulhau (lalop)
15111530
- Laurent Bachelier (laurentb)
1512-
- Jérôme Parmentier (lctrs)
15131531
- Florent Viel (luxifer)
15141532
- Matthieu Moquet (mattketmo)
15151533
- Moritz Borgmann (mborgmann)

0 commit comments

Comments
 (0)
0