symfony
diff --git a/‎.travis.yml
Lines changed: 0 additions & 4 deletions b/‎.travis.yml
Lines changed: 0 additions & 4 deletions
diff --git a/‎CHANGELOG-2.2.md
Lines changed: 20 additions & 0 deletions b/‎CHANGELOG-2.2.md
Lines changed: 20 additions & 0 deletions
diff --git a/‎CHANGELOG-2.3.md
Lines changed: 13 additions & 0 deletions b/‎CHANGELOG-2.3.md
Lines changed: 13 additions & 0 deletions
diff --git a/‎CONTRIBUTORS.md
Lines changed: 18 additions & 7 deletions b/‎CONTRIBUTORS.md
Lines changed: 18 additions & 7 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Console/Application.php
Lines changed: 6 additions & 1 deletion b/‎src/Symfony/Bundle/FrameworkBundle/Console/Application.php
Lines changed: 6 additions & 1 deletion
diff --git a/‎src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Bundle/WebProfilerBundle/Controller/ExceptionController.php
Lines changed: 3 additions & 3 deletions
@@ -6,10 +6,6 @@ php:
   - 5.4
   - 5.5
 
-matrix:
-  allow_failures:
-    - php: 5.5
-
 before_script:
     - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
     - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
 
@@ -7,6 +7,26 @@ in 2.2 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.2.0...v2.2.1
 
+* 2.2.3 (2013-06-19)
+
+ * c0da3ae: [Process] Disable exception on stream_select timeout
+ * 77f2aa8: [HttpFoundation] fixed issue with session_regenerate_id (closes #7380)
+ * bcbbb28: Throw exception if value is passed to VALUE_NONE input, long syntax
+ * 6b71513: fixed date type format pattern regex
+ * 842f3fa: do not re-register commands each time a Console\Application is run
+ * 0991cd0: [Process] moved env check to the Process class (refs #8227)
+ * 8764944: fix issue where $_ENV contains array vals
+ * 4139936: [DomCrawler] Fix handling file:// without a host
+ * de289d2: [Form] corrected interface bind() method defined against in deprecation notice
+ * 0c0a3e9: [Console] fixed regression when calling a command foo:bar if there is another one like foo:bar:baz (closes #8245)
+ * 849f3ed: [Finder] Fix SplFileInfo::getContents isn't working with ssh2 protocol
+ * 25e3abd: fix many-to-many Propel1 ModelChoiceList
+ * bce6bd2: [DomCrawler] Fixed a fatal error when setting a value in a malformed field name.
+ * 445b2e3: [Console] fix status code when Exception::getCode returns something like 0.1
+ * bbfde62: Fixed exit code for exceptions with error code 0
+ * afad9c7: instantiate valid commands only
+ * 6d2135b: force the Content-Type to html in the web profiler controllers
+
 * 2.2.2 (2013-06-02)
 
  * 2038329: [Form] [Validator] Fixed post_max_size = 0 bug (Issue #8065)
 
@@ -7,6 +7,19 @@ in 2.3 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.3.0...v2.3.1
 
+* 2.3.1 (2013-06-11)
+
+ * 25e3abd: fix many-to-many Propel1 ModelChoiceList
+ * bce6bd2: [DomCrawler] Fixed a fatal error when setting a value in a malformed field name.
+ * e3561ce: [FrameworkBundle] Fixed OutOfBoundException when session handler_id is null
+ * 81b122d: [DependencyInjection] Add support for aliases of aliases + regression test
+ * 445b2e3: [Console] fix status code when Exception::getCode returns something like 0.1
+ * bbfde62: Fixed exit code for exceptions with error code 0
+ * d8c0ef7: [DependencyInjection] Rename ContainerBuilder::$aliases to avoid conflicting with the parent class
+ * bb797ee: [DependencyInjection] Remove get*Alias*Service methods from compiled containers
+ * 379f5e0: [DependencyInjection] Fix aliased access of shared services, fixes #8096
+ * afad9c7: instantiate valid commands only
+
 * 2.3.0 (2013-06-03)
 
  * e93fc7a: [FrameworkBundle] set the dispatcher in the console application
 
@@ -9,8 +9,8 @@ Symfony2 is the result of the work of many people who made the code better
  - Victor Berchet (victor)
  - Jordi Boggiano (seldaek)
  - Johannes S (johannes)
- - Kris Wallsmith (kriswallsmith)
  - Tobias Schultze (tobion)
+ - Kris Wallsmith (kriswallsmith)
  - Christophe Coevoet (stof)
  - Pascal Borreli (pborreli)
  - Karma Dordrak (drak)
@@ -51,20 +51,20 @@ Symfony2 is the result of the work of many people who made the code better
  - Hidenori Goto (hidenorigoto)
  - Fran Moreno (franmomu)
  - Andrej Hudec (pulzarraider)
+ - Grégoire Pineau (lyrixx)
  - Lee McDermott
  - Brandon Turner
  - Daniel Holmes (dholmes)
  - Brikou Carré (brikou)
  - John Wards (johnwards)
- - Grégoire Pineau (lyrixx)
  - Antoine Hérault (herzult)
  - Bart van den Burg (burgov)
+ - Toni Uebernickel (havvg)
  - Tim Nagel (merk)
  - Włodzimierz Gajda (gajdaw)
  - Michel Weimerskirch (mweimerskirch)
  - Christian Raue
  - Michal Piotrowski (eventhorizon)
- - Toni Uebernickel (havvg)
  - Colin Frei
  - lenar
  - Fabien Pennequin (fabienpennequin)
@@ -220,6 +220,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Emanuele Gaspari (inmarelibero)
  - Brian King
  - Jan Schumann
+ - Ruben Gonzalez (rubenrua)
  - Antonio J. García Lagar (ajgarlag)
  - Olivier Dolbeau (odolbeau)
  - Robert Kiss (kepten)
@@ -233,7 +234,9 @@ Symfony2 is the result of the work of many people who made the code better
  - Marcin Sikoń (marphi)
  - Miquel Rodríguez Telep (mrtorrent)
  - Filippo Tessarotto
+ - Mark Sonnabaum
  - Adam Harvey
+ - Pierre-Yves LEBECQ (pylebecq)
  - Laurent Bachelier (laurentb)
  - Fabian Lange (codingfabian)
  - Yoshio HANAWA
@@ -255,6 +258,7 @@ Symfony2 is the result of the work of many people who made the code better
  - alexpods
  - Erik Trapman (eriktrapman)
  - De Cock Xavier (xdecock)
+ - Vitaliy Zakharov (zakharovvi)
  - Matthijs van den Bos
  - Joel Wurtz
  - Nils Adermann (naderman)
@@ -295,7 +299,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Markus Bachmann (baachi)
  - aubx
  - Max Rath (drak3)
- - Ruben Gonzalez (rubenrua)
  - Sinan Eldem
  - DerManoMann
  - alquerci
@@ -322,12 +325,10 @@ Symfony2 is the result of the work of many people who made the code better
  - cedric lombardot (cedriclombardot)
  - John Kary (johnkary)
  - Hossein Bukhamsin
- - Pierre-Yves LEBECQ (pylebecq)
  - Fabrice Bernhard (fabriceb)
  - Oleg Zinchenko (cystbear)
  - Johannes Klauss (cloppy)
  - fzerorubigd
- - Mark Sonnabaum
  - develop
  - Atsuhiro KUBO (iteman)
  - Samy Dindane (dinduks)
@@ -374,7 +375,6 @@ Symfony2 is the result of the work of many people who made the code better
  - Luis Cordova (cordoval)
  - Philipp Kräutli (pkraeutli)
  - Stefano Sala (stefano.sala)
- - Vitaliy Zakharov (zakharovvi)
  - frost-nzcr4
  - Abhoryo
  - Fabian Vogler (fabian)
@@ -430,6 +430,7 @@ Symfony2 is the result of the work of many people who made the code better
  - xaav
  - Mahmoud Mostafa (mahmoud)
  - Juti Noppornpitak
+ - lancergr
  - Mei Gwilym
  - ttomor
  - Sander Coolen
@@ -479,20 +480,23 @@ Symfony2 is the result of the work of many people who made the code better
  - DerManoMann
  - Roland Franssen (ro0)
  - Jochen Bayer (jocl)
+ - Jerome TAMARELLE
  - Jeremy Bush
  - Evan Villemez
  - Péter Buri (burci)
  - Davide Borsatto (davide.borsatto)
  - kaiwa
  - Albert Ganiev (helios-ag)
  - Neil Katin
+ - peter
  - Gustavo Adrian
  - Brooks Boyd
  - Roger Webb
  - Nicolas Fabre (nfabre)
  - Felicitus
  - Paul Matthews
  - Philipp Strube
+ - Christian Sciberras
  - Clement Herreman (clemherreman)
  - Marco
  - Alberto Aldegheri
@@ -511,6 +515,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Ludek Stepan
  - Balázs Benyó (duplabe)
  - Marc Morera (mmoreram)
+ - Saem Ghani
  - Sebastian Utz
  - Keri Henare (kerihenare)
  - Cédric Lahouste (rapotor)
@@ -524,6 +529,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Lance McNearney
  - Alberto Pirovano (geezmo)
  - Gabor Toth (tgabi333)
+ - Martin Pärtel
  - Xavier Briand (xavierbriand)
  - Evan Kaufman
  - Romain Geissler
@@ -554,6 +560,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Benjamin Bender
  - Konrad Mohrfeldt
  - Benoit Lévêque (benoit_leveque)
+ - Stelian Mocanita (stelian)
  - jskvara
  - Mephistofeles
  - Hoffmann András
@@ -641,6 +648,7 @@ Symfony2 is the result of the work of many people who made the code better
  - partugal
  - Robert Campbell
  - Matt Lehner
+ - Aleksey Podskrebyshev
  - cyrillej
  - Alex Pods
  - timaschew
@@ -686,15 +694,18 @@ Symfony2 is the result of the work of many people who made the code better
  - Nicolas A. Bérard-Nault
  - Gladhon
  - Saem Ghani
+ - Stefan Oderbolz
  - Alexey Popkov
  - Piotr Błasiak
  - Arnaud Buathier (arnapou)
  - chesteroni (chesteroni)
+ - Daniele Cesarini (ijanki)
  - Simon CONSTANS (kosssi)
  - Mauricio Lopez (sanctuary29)
  - Wotre
  - goohib
  - Xavier HAUSHERR
+ - ghazy ben ahmed
  - Myke79
  - Brian Debuire
  - Lars Vierbergen
 
@@ -27,6 +27,7 @@
 class Application extends BaseApplication
 {
     private $kernel;
+    private $commandsRegistered = false;
 
     /**
      * Constructor.
@@ -65,7 +66,11 @@ public function getKernel()
      */
     public function doRun(InputInterface $input, OutputInterface $output)
     {
-        $this->registerCommands();
+        if (!$this->commandsRegistered) {
+            $this->registerCommands();
+
+            $this->commandsRegistered = true;
+        }
 
         $this->setDispatcher($this->kernel->getContainer()->get('event_dispatcher'));
 
 
@@ -55,7 +55,7 @@ public function showAction($token)
         if (!$this->twig->getLoader()->exists($template)) {
             $handler = new ExceptionHandler();
 
-            return new Response($handler->getContent($exception));
+            return new Response($handler->getContent($exception), 200, array('Content-Type' => 'text/html'));
         }
 
         $code = $exception->getStatusCode();
@@ -69,7 +69,7 @@ public function showAction($token)
                 'logger'         => null,
                 'currentContent' => '',
             )
-        ));
+        ), 200, array('Content-Type' => 'text/html'));
     }
 
     /**
@@ -96,7 +96,7 @@ public function cssAction($token)
             return new Response($handler->getStylesheet($exception));
         }
 
-        return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'));
+        return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, 'text/css');
     }
 
     protected function getTemplate()
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function showAction($token)`
`55`	`55`	`if (!$this->twig->getLoader()->exists($template)) {`
`56`	`56`	`$handler = new ExceptionHandler();`
`57`	`57`
`58`		`- return new Response($handler->getContent($exception));`
	`58`	`+ return new Response($handler->getContent($exception), 200, array('Content-Type' => 'text/html'));`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`$code = $exception->getStatusCode();`
`@@ -69,7 +69,7 @@ public function showAction($token)`
`69`	`69`	`'logger' => null,`
`70`	`70`	`'currentContent' => '',`
`71`	`71`	`)`
`72`		`- ));`
	`72`	`+ ), 200, array('Content-Type' => 'text/html'));`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`/**`
`@@ -96,7 +96,7 @@ public function cssAction($token)`
`96`	`96`	`return new Response($handler->getStylesheet($exception));`
`97`	`97`	`}`
`98`	`98`
`99`		`- return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'));`
	`99`	`+ return new Response($this->twig->render('@WebProfiler/Collector/exception.css.twig'), 200, 'text/css');`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`protected function getTemplate()`