merged 2.0

CHANGELOG-2.0.md

@@ -7,6 +7,19 @@ in 2.0 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.0.0...v2.0.1
 
+* 2.0.14 (2012-05-17)
+
+ * d1c831d: Change must-proxy-revalidate by proxy-revalidate
+ * 445fd2f: In console terms columns are width and rows are height
+ * 926ac98: [Finder] replaced static by self on a private variable
+ * 47605f6: [Form][DataMapper] Do not update form to data when form is read only
+ * c642a5e: [CssSelector] ignored an optional whitespace after a combinator
+ * cbc3ed3: [HttpKernel] added some constant for better forward compatibility
+ * 906f6f6: [DependencyInjection] fixed private services removal when used as configurators (closes #3758)
+ * 970d0b4: [BrowserKit] Check class existence only when required.
+ * 1ed8b72: Autoloader should not throw exception because PHP will continue to call other registered autoloaders.
+ * 7fe236a: [Security] Configure ports in RetryAuthenticationEntryPoint according to router settings
+
 * 2.0.13 (2012-04-30)
 
  * 5b92b9e: [Console] Selectively output to STDOUT or OUTPUT stream

CONTRIBUTORS.md

@@ -20,23 +20,23 @@ Symfony2 is the result of the work of many people who made the code better
  - Joseph Bielawski (stloyd)
  - Igor Wiedler (igorw)
  - Hugo Hamon (hhamon)
- - Eriksen Costa (eriksencosta)
  - William DURAND (willdurand)
+ - Eriksen Costa (eriksencosta)
  - Alexandre Salomé (alexandresalome)
  - stealth35 (stealth35)
  - Jonathan H. Wage (jwage)
  - Thibault Duplessis (ornicar)
  - Jakub Zalas (jakzal)
  - Eric Clemmons (ericclemmons)
+ - Martin Hasoň (hason)
  - Henrik Westphal (snc)
  - Dariusz Górecki (canni)
+ - Tobias Schultze (Tobion)
  - Miha Vrhovnik (mvrhov)
  - Bulat Shakirzyanov (avalanche123)
- - Martin Hasoň (hason)
  - Henrik Bjørnskov (henrikbjorn)
- - Francis Besset (francisbesset)
- - Tobias Schultze (Tobion)
  - Andrej Hudec (pulzarraider)
+ - Francis Besset (francisbesset)
  - Kevin Bond (kbond)
  - Deni (yethee)
  - Arnout Boks (aboks)
@@ -53,8 +53,8 @@ Symfony2 is the result of the work of many people who made the code better
  - John Wards (johnwards)
  - Jean-François Simon (jfsimon)
  - Daniel Holmes (danielholmes)
- - Tigran Azatyan (tigranazatyan)
  - Antoine Hérault (Herzult)
+ - Tigran Azatyan (tigranazatyan)
  - Helmer Aaviksoo (helmer)
  - Jacob Dreesen (jdreesen)
  - umpirsky (umpirsky)
@@ -63,6 +63,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Fabien Pennequin (FabienPennequin)
  - Richard Shank (IamPersistent)
  - Benjamin Dulau (benjamindulau)
+ - Douglas Greenshields (shieldo)
  - Christian Raue (craue)
  - Grégoire Pineau (lyrixx)
  - Katsuhiro OGAWA (fivestar)
@@ -75,6 +76,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Florin Patan (dlsniper)
  - Rafael Dohms (rdohms)
  - Tim Nagel (merk)
+ - Włodzimierz Gajda (gajdaw)
  - Michel Weimerskirch (mweimerskirch)
  - Javier Eguiluz (javiereguiluz)
  - Joseph Rouff (rouffj)
@@ -87,12 +89,12 @@ Symfony2 is the result of the work of many people who made the code better
  - Gustavo Piltcher
  - Rui Marinho
  - Clément JOBEILI (dator)
+ - Michael Holm (hollodk)
  - dbu
  - Julien Brochet (aerialls)
  - Thomas (rande)
  - Alexander (asm89)
  - Gordon Franke (gimler)
- - Włodzimierz Gajda (gajdaw)
  - Noel GUILBERT (noelg)
  - Alif Rachmawadi (subosito)
  - Lars Strojny (lstrojny)
@@ -102,18 +104,18 @@ Symfony2 is the result of the work of many people who made the code better
  - Jonathan Ingram (jonathaningram)
  - Alessandro Desantis (alessandro1997)
  - Oscar Cubo Medina (ocubom)
+ - Pablo Godel (pgodel)
  - Dustin Whittle (dustinwhittle)
  - Jean-François PHILIPPE (jfphilippe)
  - Arnaud Le Blanc (arnaud-lb)
  - Justin Hileman (bobthecow)
  - Danny Berger (dpb587)
  - Sven Paulus (subsven)
+ - Gábor Egyed (1ed)
  - Xavier Perez (DuoSRX)
  - Joel Wurtz (Brouznouf)
- - Douglas Greenshields (shieldo)
  - Joe Lencioni (lencioni)
  - brki (brki)
- - Pablo Godel (pgodel)
  - Francois Zaninotto
  - Leszek Prabucki (l3l0)
  - Francois Zaninotto (fzaninotto)
@@ -121,20 +123,21 @@ Symfony2 is the result of the work of many people who made the code better
  - Xavier Montaña Carreras (xmontana)
  - Andreas Hucks (meandmymonkey)
  - Arjen Brouwer (arjenjb)
- - Michael Holm (hollodk)
+ - Jérémie Augustin (jaugustin)
  - Boussekeyt Jules (gordonslondon)
  - Jan Sorgalla (jsor)
+ - Daniel Gomes (danielcsgomes)
  - Lee McDermott (lmcd)
  - Manuel Reinhard (sprain)
  - Jeroen Hoek (jdhoek)
+ - Albert Jessurum (ajessu)
  - Ryan Rogers (timewasted)
  - flevour (flevour)
  - Michel Salib (michelsalib)
  - geoffrey
  - Kim Hemsø Rasmussen (kimhemsoe)
- - Gábor Egyed (1ed)
- - Jérémie Augustin (jaugustin)
  - Manuel Kiessling (ManuelKiessling)
+ - Bilal Amarni (bamarni)
  - Tobias Naumann (tna)
  - Shein Alexey (conf)
  - Aurelijus Valeiša (aurelijus)
@@ -146,17 +149,21 @@ Symfony2 is the result of the work of many people who made the code better
  - drak3 (drak3)
  - Chris Boden (cboden)
  - Dustin Dobervich (dustin10)
+ - Sebastian Marek (proofek)
+ - Olivier Dolbeau (odolbeau)
  - Michele Orselli (micheleorselli)
  - Andréia Bohner (andreia)
  - Sebastian Bergmann (sebastianbergmann)
  - Miquel Rodríguez Telep (mrtorrent)
  - Peter Kokot (maastermedia)
+ - Jérôme Tamarelle (GromNaN)
  - Jérémy Romey (jeremyFreeAgent)
  - Yuen-Chi Lian (yclian)
  - John Bohn (jjbohn)
  - Greg Thornton (xdissent)
  - andrewtch (andrewtch)
  - Costin Bereveanu (schniper)
+ - Ondrej Slinták (ondrowan)
  - Markus Lanthaler (lanthaler)
  - Konstantin Leboev (realmfoo)
  - Thomas Adam (tecbot)
@@ -165,19 +172,18 @@ Symfony2 is the result of the work of many people who made the code better
  - Matthew Lewinski
  - Kai
  - Sergey Linnik (Partugal)
- - Albert Jessurum (ajessu)
  - Johnny Peck (johnnypeck)
  - Laszlo Korte (laszlokorte)
  - Hubert LECORCHE (hlecorche)
  - Sergey Skopin (grizlik)
  - drmonty (drmonty)
  - Michael Ridgway (mridgway)
+ - Anthon Pang (robocoder)
  - Stepan Tanasiychuk (stfalcon)
  - Bertrand Zuchuat (Garfield-fr)
- - Bilal Amarni (bamarni)
+ - Sebastien Armand (khepin)
+ - Sebastiaan Stok (sstok)
  - Jan Schumann (janschumann)
- - Olivier Dolbeau (odolbeau)
- - Sebastian Marek (proofek)
  - Asier Illarramendi (doup)
  - Shigenobu Nishikawa (shishi)
  - Marcin Sikoń (marphi)
@@ -188,12 +194,11 @@ Symfony2 is the result of the work of many people who made the code better
  - Pablo Díez (pablodip)
  - Fran Moreno (franmomu)
  - Manuel de Ruiter (ManuelAC)
- - Ondrej Slinták (ondrowan)
  - Crell (Crell)
  - Benoit Tirmarche (mcbennn)
  - Grégoire Passault
+ - Ismael Ambrosi (iambrosi)
  - Tom Klingenberg (ktomk)
- - Daniel Gomes (danielcsgomes)
  - De Cock Xavier (xdecock)
  - Cristian González Sánchez (cristiangsp)
  - Nils Adermann (naderman)
@@ -205,6 +210,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Ziumin (Ziumin)
  - Aurélien Fredouelle (AurelC2G)
  - Marek Kalnik (marekkalnik)
+ - Adán Lobato (adanlobato)
  - Tiago Ribeiro (fixe)
  - Geoffrey Tran (geoffreytran)
  - Christian Schaefer (caefer)
@@ -220,12 +226,14 @@ Symfony2 is the result of the work of many people who made the code better
  - Tom Van Looy (tvlooy)
  - umpirski (umpirski)
  - Neil Katin
+ - John Kary (johnkary)
  - Peter Kokot (peterkokot)
  - Hossein Bukhamsin (husinluck)
  - Fabrice Bernhard (fabriceb)
  - develop
  - Hiromi Hishida (77web)
  - Klein Florian (docteurklein)
+ - Stéphane PY (stephpy)
  - Joshua Nye (zerosanity)
  - markchalloner (markchalloner)
  - Mike Lively (mlively)
@@ -234,7 +242,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Casper Valdemar Poulsen (cvaldemar)
  - Degory Valentine
  - Krzysiek Łabuś (Crozin)
- - Ismael Ambrosi (iambrosi)
  - Thomas Bibb (thomasbibb)
  - Ivan Kurnosov
  - stloyd
@@ -260,6 +267,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Chris Smith (cs278)
  - Derek ROTH (DerekRoth)
  - mwsaz
+ - corphi (corphi)
  - Giulio De Donato (liuggio)
  - Matthias (mpdude)
  - Emil Einarsson (Einarsson)
@@ -290,13 +298,13 @@ Symfony2 is the result of the work of many people who made the code better
  - Hans (drublic)
  - m0ppers (m0ppers)
  - Michael Shtukin (mshtukin)
- - Anthon Pang (robocoder)
  - Teo (teo-sk)
  - Tony Piper (tonypiper)
  - sensio
  - Théophile Helleboid - chtitux (chtitux)
  - Matthew Lewinski (lewinski)
  - Markus Bachmann (Baachi)
+ - scoolen (scoolen)
  - irmantas (irmantas)
  - tero (tero)
  - Vadim Tyukov (vatson)
@@ -305,7 +313,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Tobias Sjösten (tobiassjosten)
  - Wojciech Sznapka (wowo)
  - julien.galenski
- - John Kary (johnkary)
  - Martijn Evers (martijn4evers)
  - Jeremy Bush (zombor)
  - Evan Villemez (evillemez)
@@ -316,11 +323,14 @@ Symfony2 is the result of the work of many people who made the code better
  - Nicolas Fabre (nfabre)
  - Clément Herreman (clemherreman)
  - heccjj (heccjj)
+ - Ringosan (Ringosan)
+ - Balázs Benyó (duplabe)
  - Sebastian Utz (seut)
  - Cédric Lahouste (RapotOR)
  - George Giannoulopoulos (dotoree)
  - Alberto Pirovano (geezmo)
  - Xavier Briand (xavierbriand)
+ - Romain Geissler (Romain-Geissler)
  - Carsten Nielsen (phreaknerd)
  - JerikVenture (JerikVenture)
  - Evan Kaufman (EvanK)
@@ -363,6 +373,7 @@ Symfony2 is the result of the work of many people who made the code better
  - cim-dch (cim-dch)
  - Dan Ordille (dordille)
  - Martin Mayer (martinmayer)
+ - Uwe Jäger (uwej711)
  - Baptiste Clavié (Taluu)
  - Tuxosaurus (Tuxosaurus)
  - Hugo Hamon
@@ -385,7 +396,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Jimmy Leger (redpanda)
  - Nicolas A. Bérard-Nault
  - Alexey Popkov
- - Adán Lobato (adanlobato)
  - Arnaud Buathier (arnapou)
  - chesteroni (chesteroni)
  - Elnur Abdurrakhimov (elnur)
@@ -395,6 +405,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Eugene Babushkin (EugeneBabushkin)
  - Fabien D. (FabienD)
  - Matt Drollette (MDrollette)
+ - Matthieu Moquet (MattKetmo)
  - Kornienko Alexander (Skorney)
  - Vincent (Vincent-P)
  - Drew Butler

src/Symfony/Bridge/Doctrine/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Symfony/Bridge/Monolog/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Symfony/Bridge/Propel1/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Symfony/Bridge/Swiftmailer/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Symfony/Bridge/Twig/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Symfony/Bundle/FrameworkBundle/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Symfony/Bundle/SecurityBundle/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Symfony/Bundle/TwigBundle/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Symfony/Bundle/TwigBundle/TwigEngine.php

@@ -20,7 +20,7 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Config\FileLocatorInterface;
 
 /**
- * This engine knows how to render Twig templates.
+ * This engine renders Twig templates.
  *
  * @author Fabien Potencier <fabien@symfony.com>
  */

src/Symfony/Bundle/WebProfilerBundle/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php

@@ -249,6 +249,8 @@ class ArrayNodeDefinition extends NodeDefinition implements ParentNodeDefinition
      *         ->append($this->getBarNodeDefinition())
      *     ;
      *
+     * @param NodeDefinition $node A NodeDefinition instance
+     *
      * @return ArrayNodeDefinition This node
      */
     public function append(NodeDefinition $node)

src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php

@@ -37,6 +37,8 @@ class ExprBuilder
     /**
      * Marks the expression as being always used.
      *
+     * @param \Closure $then
+     *
      * @return ExprBuilder
      */
     public function always(\Closure $then = null)

src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php

@@ -55,6 +55,8 @@ abstract class NodeDefinition implements NodeParentInterface
      * Sets the parent node.
      *
      * @param NodeParentInterface $parent The parent
+     *
+     * @return NodeDefinition
      */
     public function setParent(NodeParentInterface $parent)
     {

src/Symfony/Component/Config/Loader/DelegatingLoader.php

@@ -39,6 +39,8 @@ class DelegatingLoader extends Loader
      * @param mixed  $resource A resource
      * @param string $type     The resource type
      *
+     * @return mixed
+     *
      * @throws FileLoaderLoadException if no loader is found.
      */
     public function load($resource, $type = null)

src/Symfony/Component/Console/Application.php

@@ -839,7 +839,7 @@ class Application
         }
 
         if (preg_match("{rows.(\d+);.columns.(\d+);}i", $this->getSttyColumns(), $match)) {
-            return $match[1];
+            return $match[2];
         }
     }
 
@@ -855,7 +855,7 @@ class Application
         }
 
         if (preg_match("{rows.(\d+);.columns.(\d+);}i", $this->getSttyColumns(), $match)) {
-            return $match[2];
+            return $match[1];
         }
     }
 

src/Symfony/Component/Console/Command/Command.php

@@ -200,6 +200,8 @@ class Command
      * @param InputInterface  $input  An InputInterface instance
      * @param OutputInterface $output An OutputInterface instance
      *
+     * @return integer The command exit code
+     *
      * @see setCode()
      * @see execute()
      *

src/Symfony/Component/Console/Formatter/OutputFormatter.php

@@ -41,9 +41,9 @@ class OutputFormatter implements OutputFormatterInterface
     {
         $this->decorated = (Boolean) $decorated;
 
-        $this->setStyle('error',    new OutputFormatterStyle('white', 'red'));
+        $this->setStyle('error', new OutputFormatterStyle('white', 'red'));
-        $this->setStyle('info',     new OutputFormatterStyle('green'));
+        $this->setStyle('info', new OutputFormatterStyle('green'));
-        $this->setStyle('comment',  new OutputFormatterStyle('yellow'));
+        $this->setStyle('comment', new OutputFormatterStyle('yellow'));
         $this->setStyle('question', new OutputFormatterStyle('black', 'cyan'));
 
         foreach ($styles as $name => $style) {
@@ -93,9 +93,9 @@ class OutputFormatter implements OutputFormatterInterface
     /**
      * Checks if output formatter has style with specified name.
      *
-     * @param   string  $name
+     * @param string $name
      *
-     * @return  Boolean
+     * @return Boolean
      *
      * @api
      */
@@ -107,11 +107,11 @@ class OutputFormatter implements OutputFormatterInterface
     /**
      * Gets style options from style with specified name.
      *
-     * @param   string  $name
+     * @param string $name
      *
-     * @return  OutputFormatterStyleInterface
+     * @return OutputFormatterStyleInterface
      *
-     * @throws  \InvalidArgumentException When style isn't defined
+     * @throws \InvalidArgumentException When style isn't defined
      *
      * @api
      */
@@ -181,9 +181,9 @@ class OutputFormatter implements OutputFormatterInterface
     /**
      * Tries to create new style instance from string.
      *
-     * @param   string  $string
+     * @param string $string
      *
-     * @return  OutputFormatterStyle|Boolean false if string is not format string
+     * @return OutputFormatterStyle|Boolean false if string is not format string
      */
     private function createStyleFromString($string)
     {

src/Symfony/Component/Console/Formatter/OutputFormatterInterface.php

@@ -51,9 +51,9 @@ interface OutputFormatterInterface
     /**
      * Checks if output formatter has style with specified name.
      *
-     * @param   string  $name
+     * @param string $name
      *
-     * @return  Boolean
+     * @return Boolean
      *
      * @api
      */
@@ -62,9 +62,9 @@ interface OutputFormatterInterface
     /**
      * Gets style options from style with specified name.
      *
-     * @param   string  $name
+     * @param string $name
      *
-     * @return  OutputFormatterStyleInterface
+     * @return OutputFormatterStyleInterface
      *
      * @api
      */

src/Symfony/Component/Console/Formatter/OutputFormatterStyle.php

@@ -55,9 +55,9 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     /**
      * Initializes output formatter style.
      *
-     * @param string $foreground style foreground color name
+     * @param string $foreground The style foreground color name
-     * @param string $background style background color name
+     * @param string $background The style background color name
-     * @param array  $options    style options
+     * @param array  $options    The style options
      *
      * @api
      */
@@ -77,7 +77,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     /**
      * Sets style foreground color.
      *
-     * @param string $color color name
+     * @param string $color The color name
      *
      * @throws \InvalidArgumentException When the color name isn't defined
      *
@@ -105,7 +105,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     /**
      * Sets style background color.
      *
-     * @param string $color color name
+     * @param string $color The color name
      *
      * @throws \InvalidArgumentException When the color name isn't defined
      *
@@ -133,7 +133,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     /**
      * Sets some specific style option.
      *
-     * @param string $option option name
+     * @param string $option The option name
      *
      * @throws \InvalidArgumentException When the option name isn't defined
      *
@@ -157,7 +157,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     /**
      * Unsets some specific style option.
      *
-     * @param string $option option name
+     * @param string $option The option name
      *
      * @throws \InvalidArgumentException When the option name isn't defined
      *
@@ -181,7 +181,7 @@ class OutputFormatterStyle implements OutputFormatterStyleInterface
     /**
      * Sets multiple style options at once.
      *
-     * @param   array   $options
+     * @param array $options
      */
     public function setOptions(array $options)
     {

src/Symfony/Component/Console/Formatter/OutputFormatterStyleInterface.php

@@ -23,7 +23,7 @@ interface OutputFormatterStyleInterface
     /**
      * Sets style foreground color.
      *
-     * @param string $color color name
+     * @param string $color The color name
      *
      * @api
      */
@@ -32,7 +32,7 @@ interface OutputFormatterStyleInterface
     /**
      * Sets style background color.
      *
-     * @param string $color color name
+     * @param string $color The color name
      *
      * @api
      */
@@ -41,7 +41,7 @@ interface OutputFormatterStyleInterface
     /**
      * Sets some specific style option.
      *
-     * @param string $option option name
+     * @param string $option The option name
      *
      * @api
      */
@@ -50,14 +50,14 @@ interface OutputFormatterStyleInterface
     /**
      * Unsets some specific style option.
      *
-     * @param string $option option name
+     * @param string $option Theoption name
      */
     function unsetOption($option);
 
     /**
      * Sets multiple style options at once.
      *
-     * @param   array   $options
+     * @param array $options
      */
     function setOptions(array $options);
 

src/Symfony/Component/Console/Helper/DialogHelper.php

@@ -131,6 +131,8 @@ class DialogHelper extends Helper
 
     /**
      * Returns the helper's canonical name.
+     *
+     * @return string The helper name
      */
     public function getName()
     {

src/Symfony/Component/Console/Helper/FormatterHelper.php

@@ -24,6 +24,8 @@ class FormatterHelper extends Helper
      * @param string $section The section name
      * @param string $message The message
      * @param string $style   The style to apply to the section
+     *
+     * @return string The format section
      */
     public function formatSection($section, $message, $style = 'info')
     {

src/Symfony/Component/Console/Input/StringInput.php

@@ -47,6 +47,8 @@ class StringInput extends ArgvInput
      *
      * @param string $input The input to tokenize
      *
+     * @return array An array of tokens
+     *
      * @throws \InvalidArgumentException When unable to parse input (should never happen)
      */
     private function tokenize($input)

src/Symfony/Component/Console/Shell.php

@@ -145,6 +145,7 @@ EOF;
      * Tries to return autocompletion for the current entered text.
      *
      * @param string $text The last segment of the entered text
+     *
      * @return Boolean|array A list of guessed strings or true
      */
     private function autocompleter($text)

src/Symfony/Component/Console/Tester/ApplicationTester.php

@@ -18,6 +18,8 @@ use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Output\StreamOutput;
 
 /**
+ * Eases the testing of console applications.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class ApplicationTester

src/Symfony/Component/Console/Tester/CommandTester.php

@@ -16,6 +16,8 @@ use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\StreamOutput;
 
 /**
+ * Eases the testing of console commands.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  */
 class CommandTester

src/Symfony/Component/CssSelector/CssSelector.php

@@ -84,11 +84,11 @@ class CssSelector
      * Parses an expression and returns the Node object that represents
      * the parsed expression.
      *
-     * @throws \Exception When tokenizer throws it while parsing
-     *
      * @param string $string The expression to parse
      *
      * @return Node\NodeInterface
+     *
+     * @throws \Exception When tokenizer throws it while parsing
      */
     public function parse($string)
     {
@@ -136,11 +136,11 @@ class CssSelector
      * Parses a selector contained in $stream and returns the Node
      * object that represents it.
      *
-     * @throws ParseException When expected selector but got something else
-     *
      * @param TokenStream $stream The stream containing the selector.
      *
      * @return Node\NodeInterface
+     *
+     * @throws ParseException When expected selector but got something else
      */
     private function parseSelector($stream)
     {
@@ -177,11 +177,11 @@ class CssSelector
      * Parses a simple selector (the current token) from $stream and returns
      * the resulting Node object.
      *
-     * @throws ParseException When expected symbol but got something else
-     *
      * @param TokenStream $stream The stream containing the selector.
      *
      * @return Node\NodeInterface
+     *
+     * @throws ParseException When expected symbol but got something else
      */
     private function parseSimpleSelector($stream)
     {
@@ -284,13 +284,13 @@ class CssSelector
      * Parses an attribute from a selector contained in $stream and returns
      * the resulting AttribNode object.
      *
-     * @throws ParseException When encountered unexpected selector
-     *
      * @param Node\NodeInterface $selector The selector object whose attribute
      *                                      is to be parsed.
      * @param TokenStream $stream The container token stream.
      *
      * @return Node\AttribNode
+     *
+     * @throws ParseException When encountered unexpected selector
      */
     private function parseAttrib($selector, $stream)
     {

src/Symfony/Component/CssSelector/Node/CombinedSelectorNode.php

@@ -79,6 +79,8 @@ class CombinedSelectorNode implements NodeInterface
      *
      * @param XPathExpr     $xpath The XPath expression for this object
      * @param NodeInterface $sub   The NodeInterface object to add
+     *
+     * @return XPathExpr An XPath instance
      */
     protected function _xpath_descendant($xpath, $sub)
     {
@@ -93,6 +95,8 @@ class CombinedSelectorNode implements NodeInterface
      *
      * @param XPathExpr     $xpath The parent XPath expression
      * @param NodeInterface $sub   The NodeInterface object to add
+     *
+     * @return XPathExpr An XPath instance
      */
     protected function _xpath_child($xpath, $sub)
     {
@@ -107,6 +111,8 @@ class CombinedSelectorNode implements NodeInterface
      *
      * @param XPathExpr     $xpath The parent XPath expression
      * @param NodeInterface $sub   The adjacent XPath expression
+     *
+     * @return XPathExpr An XPath instance
      */
     protected function _xpath_direct_adjacent($xpath, $sub)
     {
@@ -123,6 +129,8 @@ class CombinedSelectorNode implements NodeInterface
      *
      * @param XPathExpr     $xpath The parent XPath expression
      * @param NodeInterface $sub   The indirect adjacent NodeInterface object
+     *
+     * @return XPathExpr An XPath instance
      */
     protected function _xpath_indirect_adjacent($xpath, $sub)
     {

src/Symfony/Component/CssSelector/Tokenizer.php

@@ -109,12 +109,12 @@ class Tokenizer
      * and returns an array holding the unquoted string contained by $s and
      * the new position from which tokenizing should take over.
      *
-     * @throws ParseException When expected closing is not found
-     *
      * @param string  $s   The selector string containing the quoted string.
      * @param integer $pos The starting position for the quoted string.
      *
      * @return array
+     *
+     * @throws ParseException When expected closing is not found
      */
     private function tokenizeEscapedString($s, $pos)
     {
@@ -146,11 +146,11 @@ class Tokenizer
     /**
      * Unescapes a string literal and returns the unescaped string.
      *
-     * @throws ParseException When invalid escape sequence is found
-     *
      * @param string $literal The string literal to unescape.
      *
      * @return string
+     *
+     * @throws ParseException When invalid escape sequence is found
      */
     private function unescapeStringLiteral($literal)
     {
@@ -172,12 +172,12 @@ class Tokenizer
      * contained in it and the new position from which tokenizing should take
      * over.
      *
-     * @throws ParseException When Unexpected symbol is found
-     *
      * @param string  $s   The selector string.
      * @param integer $pos The position in $s at which the symbol starts.
      *
      * @return array
+     *
+     * @throws ParseException When Unexpected symbol is found
      */
     private function tokenizeSymbol($s, $pos)
     {

src/Symfony/Component/HttpFoundation/Response.php

@@ -533,7 +533,7 @@ class Response
      */
     public function mustRevalidate()
     {
-        return $this->headers->hasCacheControlDirective('must-revalidate') || $this->headers->has('must-proxy-revalidate');
+        return $this->headers->hasCacheControlDirective('must-revalidate') || $this->headers->has('proxy-revalidate');
     }
 
     /**