Merge branch '2.2' into 2.3
* 2.2: bumped Symfony version to 2.2.7 updated VERSION for 2.2.6 update CONTRIBUTORS for 2.2.6 updated CHANGELOG for 2.2.6 clearToken exception is thrown at wrong place. Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
This commit is contained in:
Fabien Potencier
commit
d75a35ef12
|
|
@ -7,6 +7,41 @@ 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.6 (2013-08-26)
|
||||
|
||||
* f936b41: clearToken exception is thrown at wrong place.
|
||||
* d0faf55: [Locale] Fixed: StubLocale::setDefault() throws no exception when "en" is passed
|
||||
* 566d79c: [Yaml] fixed embedded folded string parsing
|
||||
* 0951b8d: [Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used
|
||||
* 4563f1b: [Yaml] Fix comment containing a colon on a scalar line being parsed as a hash.
|
||||
* 7e87eb1: fixed request format when forwarding a request
|
||||
* ccaaedf: [Form] PropertyPathMapper::mapDataToForms() *always* calls setData() on every child to ensure that all *_DATA events were fired when the initialization phase is over (except for virtual forms)
|
||||
* 00bc270: [Form] Fixed: submit() reacts to dynamic modifications of the form children
|
||||
* 05fdb12: Fixed issue #6932 - Inconsistent locale handling in subrequests
|
||||
* b3c3159: fixed locale of sub-requests when explicitely set by the developer (refs #8821)
|
||||
* b72bc0b: [Locale] fixed build-data exit code in case of an error
|
||||
* 9bb7a3d: fixed request format of sub-requests when explicitely set by the developer (closes #8787)
|
||||
* fa35597: Sets _format attribute only if it wasn't set previously by the user.
|
||||
* f946108: fixed the format of the request used to render an exception
|
||||
* 51022c3: Fix typo in the check_path validator
|
||||
* 5f7219e: added a missing use statement (closes #8808)
|
||||
* 262879d: fix for Process:isSuccessful()
|
||||
* 0723c10: [Process] Use a consistent way to reset data of the process latest run
|
||||
* 85a9c9d: [HttpFoundation] Fixed removing a nonexisting namespaced attribute.
|
||||
* 191d320: [Validation] Fixed IdentityTranslator to pass correct Locale to MessageSelector
|
||||
* c6ecd83: SwiftMailerHandler in Monolog bridge now able to react to kernel.terminate event
|
||||
* 99adcf1: {HttpFoundation] [Session] fixed session compatibility with memcached/redis session storage
|
||||
* ab9a96b: Fixes for hasParameterOption and getParameterOption methods of ArgvInput
|
||||
* dbd0855: Added sleep() workaround for windows php rename bug
|
||||
* fa769a2: [Process] Add more precision to Process::stop timeout
|
||||
* 3ef517b: [Process] Fix #8739
|
||||
* 18896d5a: [Validator] fixed the wrong isAbstract() check against the class (fixed #8589)
|
||||
* e8e76ec: [TwigBridge] Prevent code extension to display warning
|
||||
* 1a73b44: added missing support for the new output API in PHP 5.4+
|
||||
* e0c7d3d: Fixed bug introduced in #8675
|
||||
* 0b965fb: made the filesystem loader compatible with Twig 2.0
|
||||
* 322f880: replaced deprecated Twig features
|
||||
|
||||
* 2.2.5 (2013-08-07)
|
||||
|
||||
* c35cc5b: added trusted hosts check
|
||||
|
|
|
|||
|
|
@ -23,10 +23,11 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Benjamin Eberlei (beberlei)
|
||||
- Jakub Zalas (jakubzalas)
|
||||
- Hugo Hamon (hhamon)
|
||||
- Eriksen Costa (eriksencosta)
|
||||
- Martin Hasoň (hason)
|
||||
- Jonathan Wage (jwage)
|
||||
- Eriksen Costa (eriksencosta)
|
||||
- William Durand (couac)
|
||||
- Jonathan Wage (jwage)
|
||||
- Romain Neutron (romain)
|
||||
- Alexandre Salomé (alexandresalome)
|
||||
- ornicar
|
||||
- stealth35 (stealth35)
|
||||
|
|
@ -36,7 +37,6 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Henrik Bjørnskov (henrikbjorn)
|
||||
- Miha Vrhovnik
|
||||
- Bilal Amarni (bamarni)
|
||||
- Romain Neutron (romain)
|
||||
- Florin Patan (florinpatan)
|
||||
- Konstantin Kudryashov (everzet)
|
||||
- Saša Stamenković (umpirsky)
|
||||
|
|
@ -44,13 +44,13 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Eric Clemmons (ericclemmons)
|
||||
- Dariusz Górecki (canni)
|
||||
- Henrik Westphal (snc)
|
||||
- Grégoire Pineau (lyrixx)
|
||||
- Deni
|
||||
- Marc Weistroff (futurecat)
|
||||
- Jordan Alliot (jalliot)
|
||||
- Arnout Boks (aboks)
|
||||
- Hidenori Goto (hidenorigoto)
|
||||
- Fran Moreno (franmomu)
|
||||
- Grégoire Pineau (lyrixx)
|
||||
- Andrej Hudec (pulzarraider)
|
||||
- Lee McDermott
|
||||
- Brandon Turner
|
||||
|
|
@ -69,8 +69,8 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- lenar
|
||||
- Fabien Pennequin (fabienpennequin)
|
||||
- excelwebzone
|
||||
- woodspire
|
||||
- Douglas Greenshields (shieldo)
|
||||
- woodspire
|
||||
- Mario A. Alvarez Garcia (nomack84)
|
||||
- Kevin Bond (kbond)
|
||||
- Richard Miller (mr_r_miller)
|
||||
|
|
@ -91,27 +91,27 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Larry Garfield (crell)
|
||||
- Arnaud Kleinpeter (nanocom)
|
||||
- Jonathan Ingram (jonathaningram)
|
||||
- Wouter De Jong (wouterj)
|
||||
- Sebastiaan Stok (sstok)
|
||||
- Helmer Aaviksoo
|
||||
- Javier Eguiluz (javier.eguiluz)
|
||||
- Matthieu Ouellette-Vachon (maoueh)
|
||||
- Amal Raghav (kertz)
|
||||
- Artur Kotyrba
|
||||
- Pablo Godel (pgodel)
|
||||
- Helmer Aaviksoo
|
||||
- Dmitrii Chekaliuk (lazyhammer)
|
||||
- Clément JOBEILI (dator)
|
||||
- Hiromi Hishida (77web)
|
||||
- Julien Brochet (mewt)
|
||||
- Rafael Dohms (rdohms)
|
||||
- Wouter De Jong (wouterj)
|
||||
- Dennis Benkert (denderello)
|
||||
- Benjamin Dulau (dbenjamin)
|
||||
- Andreas Hucks (meandmymonkey)
|
||||
- Noel Guilbert (noel)
|
||||
- Dmitrii Chekaliuk (lazyhammer)
|
||||
- Dorian Villet (gnutix)
|
||||
- Guilherme Blanco (guilhermeblanco)
|
||||
- Martin Schuhfuß (usefulthink)
|
||||
- Thomas Rabaix (rande)
|
||||
- Dennis Benkert (denderello)
|
||||
- Marcel Beerta (mazen)
|
||||
- Albert Casademont (acasademont)
|
||||
- Matthieu Bontemps (mbontemps)
|
||||
|
|
@ -194,9 +194,12 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Peter Kruithof (pkruithof)
|
||||
- Kristen Gilden (kgilden)
|
||||
- hossein zolfi (ocean)
|
||||
- Philipp Kräutli (pkraeutli)
|
||||
- Christian Flothmann (xabbuh)
|
||||
- Greg Thornton (xdissent)
|
||||
- Atsuhiro KUBO (iteman)
|
||||
- Lars Strojny
|
||||
- Loïc Chardonnet (gnusat)
|
||||
- Costin Bereveanu (schniper)
|
||||
- Markus Lanthaler (lanthaler)
|
||||
- Jérôme Vieilledent (lolautruche)
|
||||
|
|
@ -262,6 +265,7 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- mcben
|
||||
- Maks Slesarenko
|
||||
- Vicent Soria Durá (vicentgodella)
|
||||
- Andrew Udvare
|
||||
- alexpods
|
||||
- Erik Trapman (eriktrapman)
|
||||
- De Cock Xavier (xdecock)
|
||||
|
|
@ -274,7 +278,6 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Luis Cordova (cordoval)
|
||||
- Michaël Perrin (michael.perrin)
|
||||
- sasezaki
|
||||
- Loïc Chardonnet (gnusat)
|
||||
- Xavier HAUSHERR
|
||||
- Steven Surowiec
|
||||
- Marek Kalnik (marekkalnik)
|
||||
|
|
@ -339,13 +342,14 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Johannes Klauss (cloppy)
|
||||
- fzerorubigd
|
||||
- develop
|
||||
- Atsuhiro KUBO (iteman)
|
||||
- Tomasz Kowalczyk (thunderer)
|
||||
- Samy Dindane (dinduks)
|
||||
- yclian
|
||||
- Pascal Helfenstein
|
||||
- Matt Daum (daum)
|
||||
- Baldur Rensch
|
||||
- Alex Xandra Albert Sim
|
||||
- Gabor Toth (tgabi333)
|
||||
- Yuen-Chi Lian
|
||||
- Joshua Nye
|
||||
- avorobiev
|
||||
|
|
@ -363,8 +367,8 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Christian Soronellas Vallespí (theunic)
|
||||
- Benjamin Grandfond (benjamin)
|
||||
- Degory Valentine
|
||||
- hacfi (hifi)
|
||||
- Krzysiek Łabuś
|
||||
- Andrew Udvare
|
||||
- Xavier Lacot (xavier)
|
||||
- Olivier Maisonneuve
|
||||
- Iwan van Staveren (istaveren)
|
||||
|
|
@ -381,7 +385,6 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Reen Lokum
|
||||
- Pierre Vanliefland (pvanliefland)
|
||||
- Martin Parsiegla (spea)
|
||||
- Philipp Kräutli (pkraeutli)
|
||||
- Stefano Sala (stefano.sala)
|
||||
- frost-nzcr4
|
||||
- Abhoryo
|
||||
|
|
@ -398,6 +401,7 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Gustavo Falco (gfalco)
|
||||
- Matt Robinson (inanimatt)
|
||||
- Bob den Otter (bopp)
|
||||
- David Marín Carreño (davefx)
|
||||
- Jörn Lang (j.lang)
|
||||
- julien pauli (jpauli)
|
||||
- mwsaz
|
||||
|
|
@ -408,6 +412,7 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Derek ROTH
|
||||
- Shin Ohno (ganchiku)
|
||||
- Drew Butler (nodrew)
|
||||
- Christian Morgan
|
||||
- Alexander Miehe (engerim)
|
||||
- Titouan Galopin (tgalopin)
|
||||
- Don Pinkster
|
||||
|
|
@ -473,6 +478,7 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Dan Finnie
|
||||
- Martijn Evers
|
||||
- Benjamin Paap (benjaminpaap)
|
||||
- Christian
|
||||
- Sergii Smertin (nfx)
|
||||
- Eddie Jaoude
|
||||
- Nerijus Arlauskas
|
||||
|
|
@ -485,7 +491,6 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- matteo giachino
|
||||
- Daniel Mecke (daniel_mecke)
|
||||
- Alex Demchenko (pilot)
|
||||
- Tomasz Kowalczyk (thunderer)
|
||||
- Vincent AUBERT (vincent)
|
||||
- Benoit Garret
|
||||
- DerManoMann
|
||||
|
|
@ -501,6 +506,7 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Neil Katin
|
||||
- peter
|
||||
- Gustavo Adrian
|
||||
- Nikita Konstantinov
|
||||
- Brooks Boyd
|
||||
- Roger Webb
|
||||
- Nicolas Fabre (nfabre)
|
||||
|
|
@ -525,15 +531,18 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Sebastian Göttschkes (sgoettschkes)
|
||||
- erikaheidi
|
||||
- Pierre Tachoire
|
||||
- marcj
|
||||
- Ludek Stepan
|
||||
- Balázs Benyó (duplabe)
|
||||
- Marc Morera (mmoreram)
|
||||
- Daniel Wehner
|
||||
- Saem Ghani
|
||||
- Sebastian Utz
|
||||
- Keri Henare (kerihenare)
|
||||
- Cédric Lahouste (rapotor)
|
||||
- Anthony Ferrara
|
||||
- Janusz Jablonski
|
||||
- ShiraNai7
|
||||
- George Giannoulopoulos
|
||||
- Chris Wilkinson (thewilkybarkid)
|
||||
- Ilya Biryukov
|
||||
|
|
@ -541,13 +550,13 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- m.chwedziak
|
||||
- Lance McNearney
|
||||
- Alberto Pirovano (geezmo)
|
||||
- Philipp W (hifi)
|
||||
- Gabor Toth (tgabi333)
|
||||
- Martin Pärtel
|
||||
- Xavier Briand (xavierbriand)
|
||||
- Evan Kaufman
|
||||
- Romain Geissler
|
||||
- Charles Sarrazin (csarrazi)
|
||||
- Marcus Stöhr (dafish)
|
||||
- Emmanuel Vella (emmanuel.vella)
|
||||
- Carsten Nielsen (phreaknerd)
|
||||
- Jay Severson
|
||||
- René Kerner
|
||||
|
|
@ -580,6 +589,7 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- jskvara
|
||||
- Mephistofeles
|
||||
- Hoffmann András
|
||||
- Olivier
|
||||
- pscheit
|
||||
- Ramon Kleiss (akathos)
|
||||
- Nicolas Badey (nico-b)
|
||||
|
|
@ -602,6 +612,7 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Andrey Esaulov (andremaha)
|
||||
- hicham ELGUAROUANI (hiiimoo)
|
||||
- Paul Seiffert (seiffert)
|
||||
- Vasily (sirian)
|
||||
- Stefan Koopmanschap (skoop)
|
||||
- Ivan Kurnosov
|
||||
- stloyd
|
||||
|
|
@ -672,7 +683,6 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- cyrillej
|
||||
- Alex Pods
|
||||
- timaschew
|
||||
- Christian Morgan
|
||||
- Ian Phillips
|
||||
- Haritz
|
||||
- Grummfy
|
||||
|
|
@ -696,7 +706,6 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Rafał
|
||||
- Masao Maeda (brtriver)
|
||||
- Dave Marshall (davedevelopment)
|
||||
- David Marín Carreño (davefx)
|
||||
- Denis Klementjev (dklementjev)
|
||||
- Kévin Dunglas (dunglas)
|
||||
- Vincent Composieux (eko)
|
||||
|
|
@ -737,11 +746,14 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Christian Eikermann
|
||||
- Antonio Angelino
|
||||
- Vladimir Sazhin
|
||||
- Jáchym Toušek
|
||||
- Vyacheslav Slinko
|
||||
- Johannes
|
||||
- Jörg Rühl
|
||||
- patrick-mcdougle
|
||||
- Daniel Basten
|
||||
- Giacomo Gallico
|
||||
- Steve Müller
|
||||
- andreabreu98
|
||||
- Michael Schneider
|
||||
- Jerome Tamarelle
|
||||
|
|
@ -787,6 +799,7 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Besnik Br
|
||||
- sualko
|
||||
- Nicolas Roudaire
|
||||
- Lee Rowlands
|
||||
- Alex Olmos (alexolmos)
|
||||
- Juan Ases García (ases)
|
||||
- Bernd Matzner (bmatzner)
|
||||
|
|
@ -802,10 +815,12 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Yohan Giarelli (frequence-web)
|
||||
- Massimiliano Arione (garak)
|
||||
- Vladislav Krupenkin (ideea)
|
||||
- Jaik Dean (jaikdean)
|
||||
- joris de wit (jdewit)
|
||||
- Jérémy CROMBEZ (jeremy)
|
||||
- Jorge Maiden (jorgemaiden)
|
||||
- Justin Rainbow (jrainbow)
|
||||
- JuntaTom (juntatom)
|
||||
- Sébastien Armand (khepin)
|
||||
- Krzysztof Menżyk (krymen)
|
||||
- Martin Ledgard (le6o)
|
||||
|
|
@ -819,8 +834,10 @@ Symfony2 is the result of the work of many people who made the code better
|
|||
- Rich Sage (richsage)
|
||||
- Ruud Kamphuis (ruudk)
|
||||
- Sarah Khalil (saro0h)
|
||||
- scourgen hung (scourgen)
|
||||
- Sebastian Busch (sebu)
|
||||
- Andrea Giuliano (shark)
|
||||
- Julien Sanchez (sumbobyboys)
|
||||
- Markus Tacker (tacker)
|
||||
- Tyler Stroud (tystr)
|
||||
- Víctor Mateo (victormateo)
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface
|
|||
try {
|
||||
list($user, $credentials) = $this->getPreAuthenticatedData($request);
|
||||
} catch (BadCredentialsException $exception) {
|
||||
$this->clearToken();
|
||||
$this->clearToken($exception);
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
@ -91,21 +91,23 @@ abstract class AbstractPreAuthenticatedListener implements ListenerInterface
|
|||
$this->dispatcher->dispatch(SecurityEvents::INTERACTIVE_LOGIN, $loginEvent);
|
||||
}
|
||||
} catch (AuthenticationException $failed) {
|
||||
$this->clearToken();
|
||||
$this->clearToken($failed);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clears a PreAuthenticatedToken for this provider (if present)
|
||||
*
|
||||
* @param AuthenticationException $exception
|
||||
*/
|
||||
protected function clearToken()
|
||||
private function clearToken(AuthenticationException $exception)
|
||||
{
|
||||
$token = $this->securityContext->getToken();
|
||||
if ($token instanceof PreAuthenticatedToken && $this->providerKey === $token->getProviderKey()) {
|
||||
$this->securityContext->setToken(null);
|
||||
|
||||
if (null !== $this->logger) {
|
||||
$this->logger->info(sprintf("Cleared security context due to exception: %s", $failed->getMessage()));
|
||||
$this->logger->info(sprintf("Cleared security context due to exception: %s", $exception->getMessage()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in New Issue