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
2016-12-13 16:31:15 +01:00 · 2016-12-13 16:31:15 +01:00 · 298452da31
commit 298452da31
parent 8bf83cc0b0 e221ac9df7
3 changed files with 47 additions and 34 deletions
--- a/.php_cs.dist
+++ b/.php_cs.dist
@ -1,15 +1,14 @@
 <?php

-return Symfony\CS\Config\Config::create()
-    ->setUsingLinter(false)
-    ->setUsingCache(true)
-    ->fixers(array(
-        'long_array_syntax',
-        'php_unit_construct',
-        'php_unit_dedicate_assert',
+return PhpCsFixer\Config::create()
+    ->setRules(array(
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        'array_syntax' => array('syntax' => 'long'),
    ))
-    ->finder(
-        Symfony\CS\Finder\DefaultFinder::create()
+    ->setRiskyAllowed(true)
+    ->setFinder(
+        PhpCsFixer\Finder::create()
            ->in(__DIR__)
            ->exclude(array(
                // directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -28,16 +28,17 @@ Symfony is the result of the work of many people who made the code better
 - Lukas Kahwe Smith (lsmith)
 - Martin Hasoň (hason)
 - Jeremy Mikola (jmikola)
- - Jean-François Simon (jfsimon)
 - Grégoire Pineau (lyrixx)
+ - Jean-François Simon (jfsimon)
 - Benjamin Eberlei (beberlei)
 - Igor Wiedler (igorw)
 - Eriksen Costa (eriksencosta)
 - Jules Pietri (heah)
- - Sarah Khalil (saro0h)
 - Maxime Steinhausser (ogizanagi)
+ - Sarah Khalil (saro0h)
 - Jonathan Wage (jwage)
 - Diego Saint Esteben (dosten)
+ - Robin Chalas (chalas_r)
 - Alexandre Salomé (alexandresalome)
 - William Durand (couac)
 - ornicar
@ -45,7 +46,6 @@ Symfony is the result of the work of many people who made the code better
 - stealth35 ‏ (stealth35)
 - Alexander Mols (asm89)
 - Bulat Shakirzyanov (avalanche123)
- - Robin Chalas (chalas_r)
 - Saša Stamenković (umpirsky)
 - Henrik Bjørnskov (henrikbjorn)
 - Miha Vrhovnik
@ -53,9 +53,9 @@ Symfony is the result of the work of many people who made the code better
 - Ener-Getick (energetick)
 - Konstantin Kudryashov (everzet)
 - Bilal Amarni (bamarni)
+ - Iltar van der Berg (kjarli)
 - Florin Patan (florinpatan)
 - Peter Rehm (rpet)
- - Iltar van der Berg (kjarli)
 - Kevin Bond (kbond)
 - Andrej Hudec (pulzarraider)
 - Gábor Egyed (1ed)
@ -77,16 +77,16 @@ Symfony is the result of the work of many people who made the code better
 - Titouan Galopin (tgalopin)
 - Daniel Holmes (dholmes)
 - Pierre du Plessis (pierredup)
+ - Toni Uebernickel (havvg)
 - Bart van den Burg (burgov)
 - Jordan Alliot (jalliot)
 - John Wards (johnwards)
- - Toni Uebernickel (havvg)
+ - Roland Franssen (ro0)
 - Fran Moreno (franmomu)
+ - Jáchym Toušek (enumag)
 - Antoine Hérault (herzult)
 - Paráda József (paradajozsef)
- - Roland Franssen (ro0)
 - Dariusz Ruminski
- - Jáchym Toušek (enumag)
 - Arnaud Le Blanc (arnaud-lb)
 - Jérôme Tamarelle (gromnan)
 - Michal Piotrowski (eventhorizon)
@ -114,6 +114,7 @@ Symfony is the result of the work of many people who made the code better
 - Eric GELOEN (gelo)
 - David Buchmann (dbu)
 - Tugdual Saunier (tucksaun)
+ - Maxime STEINHAUSSER
 - Théo FIDRY (theofidry)
 - Robert Schönthal (digitalkaoz)
 - Florian Lonqueu-Brochard (florianlb)
@ -134,6 +135,7 @@ Symfony is the result of the work of many people who made the code better
 - jwdeitch
 - Tobias Nyholm (tobias)
 - Joel Wurtz (brouznouf)
+ - Yonel Ceruto González (yonelceruto)
 - Philipp Wahala (hifi)
 - Vyacheslav Pavlov
 - Javier Spagnoletti (phansys)
@ -146,7 +148,6 @@ Symfony is the result of the work of many people who made the code better
 - Clemens Tolboom
 - Helmer Aaviksoo
 - Hiromi Hishida (77web)
- - Yonel Ceruto González (yonelceruto)
 - Richard van Laak (rvanlaak)
 - Matthieu Ouellette-Vachon (maoueh)
 - Michał Pipa (michal.pipa)
@ -168,7 +169,6 @@ Symfony is the result of the work of many people who made the code better
 - Andreas Hucks (meandmymonkey)
 - Noel Guilbert (noel)
 - Lars Strojny (lstrojny)
- - Maxime STEINHAUSSER
 - Stepan Anchugov (kix)
 - bronze1man
 - sun (sun)
@ -263,6 +263,7 @@ Symfony is the result of the work of many people who made the code better
 - Hidde Wieringa (hiddewie)
 - Chris Smith (cs278)
 - Florian Klein (docteurklein)
+ - Julien Falque (julienfalque)
 - Oleg Voronkovich
 - Manuel Kiessling (manuelkiessling)
 - Daniel Wehner
@ -331,10 +332,13 @@ Symfony is the result of the work of many people who made the code better
 - Loïc Chardonnet (gnusat)
 - Marek Kalnik (marekkalnik)
 - Vyacheslav Salakhutdinov (megazoll)
+ - Jerzy Zawadzki (jzawadzki)
 - Hassan Amouhzi
 - Tamas Szijarto
 - Pavel Volokitin (pvolok)
+ - Nicolas Dewez (nicolas_dewez)
 - Endre Fejes
+ - Victor Bocharsky (bocharsky_bw)
 - Tobias Naumann (tna)
 - Daniel Beyer
 - Shein Alexey
@ -427,7 +431,6 @@ Symfony is the result of the work of many people who made the code better
 - Roy Van Ginneken (rvanginneken)
 - ondrowan
 - Barry vd. Heuvel (barryvdh)
- - Jerzy Zawadzki (jzawadzki)
 - Evan S Kaufman (evanskaufman)
 - mcben
 - Jérôme Vieilledent (lolautruche)
@ -437,9 +440,7 @@ Symfony is the result of the work of many people who made the code better
 - Markus Lanthaler (lanthaler)
 - Remi Collet
 - Vicent Soria Durá (vicentgodella)
- - Nicolas Dewez (nicolas_dewez)
 - Anthony Ferrara
- - Victor Bocharsky (bocharsky_bw)
 - Ioan Negulescu
 - Jakub Škvára (jskvara)
 - Andrew Udvare (audvare)
@ -484,6 +485,7 @@ Symfony is the result of the work of many people who made the code better
 - Ziumin
 - Jeremy Benoist
 - Lenar Lõhmus
+ - Sander Toonen (xatoo)
 - Benjamin Laugueux (yzalis)
 - Zach Badgett (zachbadgett)
 - Aurélien Fredouelle
@ -521,6 +523,7 @@ Symfony is the result of the work of many people who made the code better
 - Maxime Douailin
 - Jean Pasdeloup (pasdeloup)
 - Javier López (loalf)
+ - Andreas Braun
 - Reinier Kip
 - Geoffrey Brier (geoffrey-brier)
 - Dustin Dobervich (dustin10)
@ -548,8 +551,10 @@ Symfony is the result of the work of many people who made the code better
 - umpirski
 - Chris Heng (gigablah)
 - Ulumuddin Yunus (joenoez)
+ - Adam Prager (padam87)
 - Luc Vieillescazes (iamluc)
 - Johann Saunier (prophet777)
+ - Samuel ROZE (sroze)
 - Michael Devery (mickadoo)
 - Antoine Corcy
 - Artur Eshenbrener
@ -589,6 +594,7 @@ Symfony is the result of the work of many people who made the code better
 - yclian
 - twifty
 - Peter Ward
+ - Julien DIDIER (juliendidier)
 - Dominik Ritter (dritter)
 - Sebastian Grodzicki (sgrodzicki)
 - Martin Hujer (martinhujer)
@ -613,6 +619,7 @@ Symfony is the result of the work of many people who made the code better
 - michaelwilliams
 - 1emming
 - Leevi Graham (leevigraham)
+ - Nykopol (nykopol)
 - Jordan Deitch
 - Casper Valdemar Poulsen
 - Josiah (josiah)
@ -696,9 +703,9 @@ Symfony is the result of the work of many people who made the code better
 - abdul malik ikhsan (samsonasik)
 - Henry Snoek (snoek09)
 - Simone Di  Maulo (toretto460)
- - Sander Toonen (xatoo)
 - Christian Morgan
 - Alexander Miehe (engerim)
+ - Jérôme Parmentier (lctrs)
 - Morgan Auchede (mauchede)
 - Don Pinkster
 - Maksim Muruev
@ -769,13 +776,13 @@ Symfony is the result of the work of many people who made the code better
 - fabios
 - Sander Coolen (scoolen)
 - Nicolas Le Goff (nlegoff)
- - Andreas Braun
 - Ben Oman
 - Manuele Menozzi
 - Anton Babenko (antonbabenko)
 - Irmantas Šiupšinskas (irmantas)
 - Danilo Silva
 - Zachary Tong (polyfractal)
+ - Amrouche Hamza
 - Hryhorii Hrebiniuk
 - Dennis Fridrich (dfridrich)
 - mcfedr (mcfedr)
@ -808,10 +815,10 @@ Symfony is the result of the work of many people who made the code better
 - Ville Mattila
 - Boris Vujicic (boris.vujicic)
 - Max Beutel
+ - Antanas Arvasevicius
 - nacho
 - Piotr Antosik (antek88)
 - Artem Lopata
- - Samuel ROZE (sroze)
 - Sergey Novikov (s12v)
 - Marcos Quesada (marcos_quesada)
 - Matthew Vickery (mattvick)
@ -842,6 +849,7 @@ Symfony is the result of the work of many people who made the code better
 - Thomas Royer (cydonia7)
 - DerManoMann
 - Olaf Klischat
+ - orlovv
 - Jhonny Lidfors (jhonny)
 - Julien Bianchi (jubianchi)
 - Robert Meijers
@ -877,6 +885,7 @@ Symfony is the result of the work of many people who made the code better
 - Taras Girnyk
 - Eduardo García Sanz (coma)
 - James Gilliland
+ - fduch (fduch)
 - Rhodri Pugh (rodnaph)
 - David de Boer (ddeboer)
 - Klaus Purer
@ -910,6 +919,7 @@ Symfony is the result of the work of many people who made the code better
 - Alberto Aldegheri
 - heccjj
 - Alexandre Melard
+ - Thomas Calvet
 - Sergey Yuferev
 - Tobias Stöckler
 - Mario Young
@ -950,6 +960,7 @@ Symfony is the result of the work of many people who made the code better
 - Sebastian Utz
 - Adrien Gallou (agallou)
 - Karol Sójko (karolsojko)
+ - Grzegorz Zdanowski (kiler129)
 - sl_toto (sl_toto)
 - Walter Dal Mut (wdalmut)
 - Albin Kerouaton
@ -997,9 +1008,11 @@ Symfony is the result of the work of many people who made the code better
 - Ahmed TAILOULOUTE (ahmedtai)
 - Maxime Veber (nek-)
 - Sullivan SENECHAL
+ - Dariusz Ruminski
 - Tadcka
 - Beth Binkovitz
 - Romain Geissler
+ - Adrien Moiruad
 - Tomaz Ahlin
 - Benjamin Cremer (bcremer)
 - Marcus Stöhr (dafish)
@ -1015,7 +1028,6 @@ Symfony is the result of the work of many people who made the code better
 - Max Romanovsky (maxromanovsky)
 - Mathieu Morlon
 - Daniel Tschinder
- - Nykopol (nykopol)
 - Rafał Muszyński (rafmus90)
 - Timothy Anido (xanido)
 - Rick Prent
@ -1061,6 +1073,7 @@ Symfony is the result of the work of many people who made the code better
 - kor3k kor3k (kor3k)
 - Stelian Mocanita (stelian)
 - Flavian (2much)
+ - Arthur de Moulins (4rthem)
 - mike
 - Keith Maika
 - Mephistofeles
@ -1093,7 +1106,6 @@ Symfony is the result of the work of many people who made the code better
 - Adrian Olek (adrianolek)
 - Przemysław Piechota (kibao)
 - Leonid Terentyev (li0n)
- - Adam Prager (padam87)
 - ryunosuke
 - victoria
 - Francisco Facioni (fran6co)
@ -1254,11 +1266,11 @@ Symfony is the result of the work of many people who made the code better
 - Jan Eichhorn (exeu)
 - Grégory Pelletier (ip512)
 - John Nickell (jrnickell)
- - Julien DIDIER (juliendidier)
 - Martin Mayer (martin)
 - Grzegorz Łukaszewicz (newicz)
 - Götz Gottwald
 - Veres Lajos
+ - Michael Babker
 - grifx
 - Robert Campbell
 - Matt Lehner
@ -1299,6 +1311,7 @@ Symfony is the result of the work of many people who made the code better
 - Alex
 - Klaas Naaijkens
 - Daniel González Cerviño
+ - ShinDarth
 - Rafał
 - Adria Lopez (adlpz)
 - Rosio (ben-rosio)
@ -1319,7 +1332,6 @@ Symfony is the result of the work of many people who made the code better
 - Jelle Bekker (jbekker)
 - Ian Jenkins (jenkoian)
 - Jorge Martin (jorgemartind)
- - Julien Falque (julienfalque)
 - Kevin Herrera (kherge)
 - Luis Ramón López López (lrlopez)
 - Muriel (metalmumu)
@ -1341,6 +1353,7 @@ Symfony is the result of the work of many people who made the code better
 - Saem Ghani
 - Stefan Oderbolz
 - Curtis
+ - Gabriel Moreira
 - Alexey Popkov
 - Joseph Deray
 - Damian Sromek
@ -1362,6 +1375,7 @@ Symfony is the result of the work of many people who made the code better
 - Wotre
 - goohib
 - Xavier HAUSHERR
+ - Edwin Hageman
 - Mantas Urnieža
 - Cas
 - Dusan Kasan
@ -1393,6 +1407,7 @@ Symfony is the result of the work of many people who made the code better
 - Dariusz Czech
 - Anonymous User
 - Eric J. Duran
+ - Alexandru Bucur
 - cmfcmf
 - Drew Butler
 - Steve Müller
@ -1477,11 +1492,13 @@ Symfony is the result of the work of many people who made the code better
 - Daniel Basten (axhm3a)
 - Bill Hance (billhance)
 - Bernd Matzner (bmatzner)
+ - Bram Tweedegolf (bram_tweedegolf)
 - Choong Wei Tjeng (choonge)
 - Kousuke Ebihara (co3k)
 - Loïc Vernet (coil)
 - Christoph Schaefer (cvschaefer)
 - Damon Jones (damon__jones)
+ - Łukasz Giza (destroyer)
 - Daniel Londero (dlondero)
 - Sebastian Landwehr (dword123)
 - Adel ELHAIBA (eadel)
@ -1497,6 +1514,7 @@ Symfony is the result of the work of many people who made the code better
 - Arash Tabriziyan (ghost098)
 - ibasaw (ibasaw)
 - Vladislav Krupenkin (ideea)
+ - Imangazaliev Muhammad (imangazaliev)
 - joris de wit (jdewit)
 - Jérémy CROMBEZ (jeremy)
 - Jose Manuel Gonzalez (jgonzalez)
@ -1506,10 +1524,10 @@ Symfony is the result of the work of many people who made the code better
 - JuntaTom (juntatom)
 - Ismail Faizi (kanafghan)
 - Sébastien Armand (khepin)
+ - Pierre-Chanel Gauthier (kmecnin)
 - Krzysztof Menżyk (krymen)
 - samuel laulhau (lalop)
 - Laurent Bachelier (laurentb)
- - Jérôme Parmentier (lctrs)
 - Florent Viel (luxifer)
 - Matthieu Moquet (mattketmo)
 - Moritz Borgmann (mborgmann)
--- a/src/Symfony/Component/Console/Application.php
+++ b/src/Symfony/Component/Console/Application.php
@ -99,8 +99,6 @@ class Application
     * @param OutputInterface $output An Output instance
     *
     * @return int 0 if everything went fine, or an error code
-     *
-     * @throws \Exception When doRun returns Exception
     */
    public function run(InputInterface $input = null, OutputInterface $output = null)
    {
@ -404,7 +402,7 @@ class Application
     *
     * @return Command A Command object
     *
-     * @throws CommandNotFoundException When command name given does not exist
+     * @throws CommandNotFoundException When given command name does not exist
     */
    public function get($name)
    {
@ -805,8 +803,6 @@ class Application
     * @param OutputInterface $output  An Output instance
     *
     * @return int 0 if everything went fine, or an error code
-     *
-     * @throws \Exception when the command being run threw an exception
     */
    protected function doRunCommand(Command $command, InputInterface $input, OutputInterface $output)
    {