symfony
diff --git a/‎CONTRIBUTORS.md
Lines changed: 24 additions & 15 deletions b/‎CONTRIBUTORS.md
Lines changed: 24 additions & 15 deletions
diff --git a/‎src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bridge/Twig/NodeVisitor/Scope.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Routing/DelegatingLoader.php
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
Lines changed: 2 additions & 2 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Symfony/Component/CssSelector/Parser/Parser.php
Lines changed: 8 additions & 8 deletions b/‎src/Symfony/Component/CssSelector/Parser/Parser.php
Lines changed: 8 additions & 8 deletions
@@ -23,8 +23,8 @@ Symfony is the result of the work of many people who made the code better
  - Pascal Borreli (pborreli)
  - Joseph Bielawski (stloyd)
  - Wouter De Jong (wouterj)
- - Karma Dordrak (drak)
  - Romain Neutron (romain)
+ - Karma Dordrak (drak)
  - Lukas Kahwe Smith (lsmith)
  - Martin Hasoň (hason)
  - Jeremy Mikola (jmikola)
@@ -53,11 +53,11 @@ Symfony is the result of the work of many people who made the code better
  - Bilal Amarni (bamarni)
  - Florin Patan (florinpatan)
  - Kevin Bond (kbond)
+ - Peter Rehm (rpet)
  - Gábor Egyed (1ed)
  - Michel Weimerskirch (mweimerskirch)
  - Eric Clemmons (ericclemmons)
  - Andrej Hudec (pulzarraider)
- - Peter Rehm (rpet)
  - Christian Raue
  - Matthias Pigulla (mpdude)
  - Deni
@@ -67,14 +67,14 @@ Symfony is the result of the work of many people who made the code better
  - Iltar van der Berg (kjarli)
  - Ener-Getick (energetick)
  - Douglas Greenshields (shieldo)
+ - Charles Sarrazin (csarrazi)
  - Lee McDermott
  - Brandon Turner
  - Luis Cordova (cordoval)
  - Daniel Holmes (dholmes)
  - Pierre du Plessis (pierredup)
  - Bart van den Burg (burgov)
  - Jordan Alliot (jalliot)
- - Charles Sarrazin (csarrazi)
  - John Wards (johnwards)
  - Toni Uebernickel (havvg)
  - Fran Moreno (franmomu)
@@ -89,6 +89,7 @@ Symfony is the result of the work of many people who made the code better
  - Alexander M. Turek (derrabus)
  - Dariusz Ruminski
  - marc.weistroff
+ - Issei Murasawa (issei_m)
  - lenar
  - Włodzimierz Gajda (gajdaw)
  - Alexander Schwenn (xelaris)
@@ -97,13 +98,12 @@ Symfony is the result of the work of many people who made the code better
  - Colin Frei
  - Adrien Brault (adrienbrault)
  - Joshua Thijssen
- - Issei Murasawa (issei_m)
+ - Baptiste Clavié (talus)
  - Peter Kokot (maastermedia)
  - excelwebzone
  - Jacob Dreesen (jdreesen)
  - Jérémy DERUSSÉ (jderusse)
  - Vladimir Reznichenko (kalessil)
- - Baptiste Clavié (talus)
  - Fabien Pennequin (fabienpennequin)
  - Gordon Franke (gimler)
  - David Buchmann (dbu)
@@ -121,6 +121,7 @@ Symfony is the result of the work of many people who made the code better
  - Evgeniy (ewgraf)
  - Guilherme Blanco (guilhermeblanco)
  - Pablo Godel (pgodel)
+ - Titouan Galopin (tgalopin)
  - Jérémie Augustin (jaugustin)
  - Sebastiaan Stok (sstok)
  - Tugdual Saunier (tucksaun)
@@ -129,10 +130,10 @@ Symfony is the result of the work of many people who made the code better
  - Arnaud Kleinpeter (nanocom)
  - Joel Wurtz (brouznouf)
  - Philipp Wahala (hifi)
- - Titouan Galopin (tgalopin)
  - Richard Shank (iampersistent)
  - Thomas Rabaix (rande)
  - Vincent AUBERT (vincent)
+ - Rouven Weßling (realityking)
  - Mikael Pajunen
  - Clemens Tolboom
  - Helmer Aaviksoo
@@ -143,7 +144,6 @@ Symfony is the result of the work of many people who made the code better
  - Amal Raghav (kertz)
  - Jonathan Ingram (jonathaningram)
  - Artur Kotyrba
- - Rouven Weßling (realityking)
  - Warnar Boekkooi (boekkooi)
  - Dmitrii Chekaliuk (lazyhammer)
  - Clément JOBEILI (dator)
@@ -211,6 +211,7 @@ Symfony is the result of the work of many people who made the code better
  - Kristen Gilden (kgilden)
  - Dawid Nowak
  - Pierre-Yves LEBECQ (pylebecq)
+ - Daniel Espendiller
  - Jakub Kucharovic (jkucharovic)
  - Eugene Leonovich (rybakit)
  - Filippo Tessarotto
@@ -240,7 +241,6 @@ Symfony is the result of the work of many people who made the code better
  - Michael Holm (hollo)
  - Marc Weistroff (futurecat)
  - Hidde Wieringa (hiddewie)
- - Daniel Espendiller
  - Chris Smith (cs278)
  - Florian Klein (docteurklein)
  - Manuel Kiessling (manuelkiessling)
@@ -293,6 +293,7 @@ Symfony is the result of the work of many people who made the code better
  - Inal DJAFAR (inalgnu)
  - Christian Gärtner (dagardner)
  - Tomasz Kowalczyk (thunderer)
+ - Christian Schmidt
  - François-Xavier de Guillebon (de-gui_f)
  - Damien Alexandre (damienalexandre)
  - Felix Labrecque
@@ -309,6 +310,7 @@ Symfony is the result of the work of many people who made the code better
  - Philipp Kräutli (pkraeutli)
  - Kirill chEbba Chebunin (chebba)
  - Greg Thornton (xdissent)
+ - Robin Chalas (chalas_r)
  - Costin Bereveanu (schniper)
  - Loïc Chardonnet (gnusat)
  - Marek Kalnik (marekkalnik)
@@ -319,12 +321,14 @@ Symfony is the result of the work of many people who made the code better
  - Pavel Volokitin (pvolok)
  - Endre Fejes
  - Tobias Naumann (tna)
+ - Daniel Beyer
  - Shein Alexey
  - Baptiste Lafontaine
  - Joe Lencioni
  - Daniel Tschinder
  - Kai
  - Lee Rowlands
+ - Krzysztof Piasecki (krzysztek)
  - Maximilian Reichel (phramz)
  - Loick Piera (pyrech)
  - Karoly Negyesi (chx)
@@ -364,7 +368,6 @@ Symfony is the result of the work of many people who made the code better
  - EdgarPE
  - Florian Pfitzer (marmelatze)
  - Asier Illarramendi (doup)
- - Christian Schmidt
  - Chris Sedlmayr (catchamonkey)
  - Seb Koelen
  - Christoph Mewes (xrstf)
@@ -382,6 +385,7 @@ Symfony is the result of the work of many people who made the code better
  - Mathieu Lemoine
  - franek (franek)
  - Christian Wahler
+ - Mathieu Lemoine
  - Gintautas Miselis
  - Zander Baldwin
  - Adam Harvey
@@ -419,7 +423,6 @@ Symfony is the result of the work of many people who made the code better
  - Anthony Ferrara
  - Ioan Negulescu
  - Jakub Škvára (jskvara)
- - Daniel Beyer
  - Andrew Udvare (audvare)
  - alexpods
  - Tristan Darricau (nicofuma)
@@ -448,6 +451,7 @@ Symfony is the result of the work of many people who made the code better
  - Denis Gorbachev (starfall)
  - Peter van Dommelen
  - Tim van Densen
+ - Martin Morávek (keeo)
  - Steven Surowiec
  - Kevin Saliou (kbsali)
  - NothingWeAre
@@ -462,7 +466,6 @@ Symfony is the result of the work of many people who made the code better
  - Ziumin
  - Jeremy Benoist
  - Lenar Lõhmus
- - Krzysztof Piasecki (krzysztek)
  - Benjamin Laugueux (yzalis)
  - Zach Badgett (zachbadgett)
  - Aurélien Fredouelle
@@ -501,6 +504,7 @@ Symfony is the result of the work of many people who made the code better
  - Javier López (loalf)
  - Reinier Kip
  - Dustin Dobervich (dustin10)
+ - dantleech
  - Anne-Sophie Bachelard (annesophie)
  - Sebastian Marek (proofek)
  - Erkhembayar Gantulga (erheme318)
@@ -563,6 +567,7 @@ Symfony is the result of the work of many people who made the code better
  - Peter Ward
  - Dominik Ritter (dritter)
  - Sebastian Grodzicki (sgrodzicki)
+ - SpacePossum
  - Martin Hujer (martinhujer)
  - Pascal Helfenstein
  - Baldur Rensch (brensch)
@@ -613,6 +618,7 @@ Symfony is the result of the work of many people who made the code better
  - Adrien Lucas (adrienlucas)
  - James Michael DuPont
  - Tom Klingenberg
+ - Filip Procházka (fprochazka)
  - Christopher Hall (mythmakr)
  - Paul Kamer (pkamer)
  - Rafał Wrzeszcz (rafalwrzeszcz)
@@ -629,6 +635,7 @@ Symfony is the result of the work of many people who made the code better
  - Alaattin Kahramanlar (alaattin)
  - Maksim Kotlyar (makasim)
  - Neil Ferreira
+ - Nathanael Noblet (gnat)
  - Dmitry Parnas (parnas)
  - Théo FIDRY (theofidry)
  - Paul LE CORRE
@@ -745,7 +752,6 @@ Symfony is the result of the work of many people who made the code better
  - Guillaume Royer
  - Artem (digi)
  - boite
- - dantleech
  - Vadim Tyukov (vatson)
  - Sortex
  - chispita
@@ -851,6 +857,7 @@ Symfony is the result of the work of many people who made the code better
  - Christian Sciberras
  - Anton Bakai
  - Clement Herreman (clemherreman)
+ - Dan Ionut Dumitriu (danionut90)
  - Nyro (nyro)
  - Marco
  - Marc Torres
@@ -870,7 +877,6 @@ Symfony is the result of the work of many people who made the code better
  - ConneXNL
  - Aharon Perkel
  - Abdul.Mohsen B. A. A
- - SpacePossum
  - BenoÃ®t Burnichon
  - Remi Collet
  - pthompson
@@ -1059,6 +1065,7 @@ Symfony is the result of the work of many people who made the code better
  - stloyd
  - Chris Tickner
  - Andrew Coulton
+ - Jeremy Benoist
  - Michal Gebauer
  - Gleb Sidora
  - David Stone
@@ -1108,7 +1115,6 @@ Symfony is the result of the work of many people who made the code better
  - Simon Sargeant
  - efeen
  - Michał Dąbrowski (defrag)
- - Nathanael Noblet (gnat)
  - Simone Fumagalli (hpatoio)
  - Brian Graham (incognito)
  - Kevin Vergauwen (innocenzo)
@@ -1214,8 +1220,10 @@ Symfony is the result of the work of many people who made the code better
  - Alan Chen
  - Maerlyn
  - Even André Fiskvik
+ - Erik van Wingerden
  - Dane Powell
  - Gerrit Drost
+ - Linnaea Von Lavia
  - Lenar Lõhmus
  - Cristian Gonzalez
  - AlberT
@@ -1271,6 +1279,7 @@ Symfony is the result of the work of many people who made the code better
  - Joseph Deray
  - Damian Sromek
  - Ben
+ - dasmfm
  - Arnaud Buathier (arnapou)
  - chesteroni (chesteroni)
  - Mauricio Lopez (diaspar)
@@ -1358,7 +1367,6 @@ Symfony is the result of the work of many people who made the code better
  - Norman Soetbeer
  - zorn
  - Benjamin Long
- - Robin Chalas
  - Matt Janssen
  - Peter Gribanov
  - kwiateusz
@@ -1443,6 +1451,7 @@ Symfony is the result of the work of many people who made the code better
  - ollie harridge (ollietb)
  - Paul Andrieux (paulandrieux)
  - Paweł Szczepanek (pauluz)
+ - Philippe Degeeter (pdegeeter)
  - Christian López Espínola (penyaskito)
  - Petr Jaroš (petajaros)
  - Philipp Hoffmann (philipphoffmann)
 
@@ -67,9 +67,9 @@ public function leave()
      * @param string $key
      * @param mixed  $value
      *
-     * @throws \LogicException
-     *
      * @return Scope Current scope
+     * @throws \LogicException
      */
     public function set($key, $value)
     {
 
@@ -78,7 +78,7 @@ public function load($resource, $type = null)
             if ($controller = $route->getDefault('_controller')) {
                 try {
                     $controller = $this->parser->parse($controller);
-                } catch (\Exception $e) {
+                } catch (\InvalidArgumentException $e) {
                     // unable to optimize unknown notation
                 }
 
 
@@ -182,9 +182,9 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
     /**
      * @param string $file
      *
-     * @throws \InvalidArgumentException
-     *
      * @return bool
+     *
+     * @throws \InvalidArgumentException
      */
     protected function canBeExtracted($file)
     {
 
@@ -58,9 +58,9 @@ public function parse($source)
      *
      * @param Token[] $tokens
      *
-     * @throws SyntaxErrorException
-     *
      * @return array
+     *
+     * @throws SyntaxErrorException
      */
     public static function parseSeries(array $tokens)
     {
@@ -133,9 +133,9 @@ private function parseSelectorList(TokenStream $stream)
      *
      * @param TokenStream $stream
      *
-     * @throws SyntaxErrorException
-     *
      * @return Node\SelectorNode
+     *
+     * @throws SyntaxErrorException
      */
     private function parserSelectorNode(TokenStream $stream)
     {
@@ -173,9 +173,9 @@ private function parserSelectorNode(TokenStream $stream)
      * @param TokenStream $stream
      * @param bool        $insideNegation
      *
-     * @throws SyntaxErrorException
-     *
      * @return array
+     *
+     * @throws SyntaxErrorException
      */
     private function parseSimpleSelector(TokenStream $stream, $insideNegation = false)
     {
@@ -330,9 +330,9 @@ private function parseElementNode(TokenStream $stream)
      * @param Node\NodeInterface $selector
      * @param TokenStream        $stream
      *
-     * @throws SyntaxErrorException
-     *
      * @return Node\AttributeNode
+     *
+     * @throws SyntaxErrorException
      */
     private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream)
     {
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,9 @@ public function leave()`
`67`	`67`	`* @param string $key`
`68`	`68`	`* @param mixed $value`
`69`	`69`	`*`
`70`		`- * @throws \LogicException`
`71`		`- *`
`72`	`70`	`* @return Scope Current scope`
	`71`	`+ *`
	`72`	`+ * @throws \LogicException`
`73`	`73`	`*/`
`74`	`74`	`public function set($key, $value)`
`75`	`75`	`{`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function load($resource, $type = null)`
`78`	`78`	`if ($controller = $route->getDefault('_controller')) {`
`79`	`79`	`try {`
`80`	`80`	`$controller = $this->parser->parse($controller);`
`81`		`- } catch (\Exception $e) {`
	`81`	`+ } catch (\InvalidArgumentException $e) {`
`82`	`82`	`// unable to optimize unknown notation`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -182,9 +182,9 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)`
`182`	`182`	`/**`
`183`	`183`	`* @param string $file`
`184`	`184`	`*`
`185`		`- * @throws \InvalidArgumentException`
`186`		`- *`
`187`	`185`	`* @return bool`
	`186`	`+ *`
	`187`	`+ * @throws \InvalidArgumentException`
`188`	`188`	`*/`
`189`	`189`	`protected function canBeExtracted($file)`
`190`	`190`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,9 @@ public function parse($source)`
`58`	`58`	`*`
`59`	`59`	`* @param Token[] $tokens`
`60`	`60`	`*`
`61`		`- * @throws SyntaxErrorException`
`62`		`- *`
`63`	`61`	`* @return array`
	`62`	`+ *`
	`63`	`+ * @throws SyntaxErrorException`
`64`	`64`	`*/`
`65`	`65`	`public static function parseSeries(array $tokens)`
`66`	`66`	`{`
`@@ -133,9 +133,9 @@ private function parseSelectorList(TokenStream $stream)`
`133`	`133`	`*`
`134`	`134`	`* @param TokenStream $stream`
`135`	`135`	`*`
`136`		`- * @throws SyntaxErrorException`
`137`		`- *`
`138`	`136`	`* @return Node\SelectorNode`
	`137`	`+ *`
	`138`	`+ * @throws SyntaxErrorException`
`139`	`139`	`*/`
`140`	`140`	`private function parserSelectorNode(TokenStream $stream)`
`141`	`141`	`{`
`@@ -173,9 +173,9 @@ private function parserSelectorNode(TokenStream $stream)`
`173`	`173`	`* @param TokenStream $stream`
`174`	`174`	`* @param bool $insideNegation`
`175`	`175`	`*`
`176`		`- * @throws SyntaxErrorException`
`177`		`- *`
`178`	`176`	`* @return array`
	`177`	`+ *`
	`178`	`+ * @throws SyntaxErrorException`
`179`	`179`	`*/`
`180`	`180`	`private function parseSimpleSelector(TokenStream $stream, $insideNegation = false)`
`181`	`181`	`{`
`@@ -330,9 +330,9 @@ private function parseElementNode(TokenStream $stream)`
`330`	`330`	`* @param Node\NodeInterface $selector`
`331`	`331`	`* @param TokenStream $stream`
`332`	`332`	`*`
`333`		`- * @throws SyntaxErrorException`
`334`		`- *`
`335`	`333`	`* @return Node\AttributeNode`
	`334`	`+ *`
	`335`	`+ * @throws SyntaxErrorException`
`336`	`336`	`*/`
`337`	`337`	`private function parseAttributeNode(Node\NodeInterface $selector, TokenStream $stream)`
`338`	`338`	`{`