Merge branch '2.7' into 2.8
* 2.7: Fixed the escaping of back slashes and << in console output bumped Symfony version to 2.7.35 updated VERSION for 2.7.34 update CONTRIBUTORS for 2.7.34 updated CHANGELOG for 2.7.34
This commit is contained in:
commit
3956469e16
@ -7,6 +7,19 @@ in 2.7 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 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.7.0...v2.7.1
|
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.7.0...v2.7.1
|
||||||
|
|
||||||
|
* 2.7.34 (2017-08-28)
|
||||||
|
|
||||||
|
* bug #23989 [Debug] Remove false-positive check in DebugClassLoader (nicolas-grekas)
|
||||||
|
* bug #23982 [VarDumper] Strengthen dumped JS (nicolas-grekas)
|
||||||
|
* bug #23925 [Validator] Fix use of GroupSequenceProvider in child classes (linniksa)
|
||||||
|
* bug #23945 [Validator] Fix Greek translation (azhurb)
|
||||||
|
* bug #23909 [Console] Initialize lazily to render exceptions properly (nicolas-grekas)
|
||||||
|
* bug #23856 [DI] Fix dumping abstract with YamlDumper (nicolas-grekas)
|
||||||
|
* bug #23752 Ignore memcached missing key error on session destroy (jderusse)
|
||||||
|
* bug #23658 [HttpFoundation] Generate safe fallback filename for wrongly encoded filename (xelaris)
|
||||||
|
* bug #23783 Avoid infinite loops when profiler data is malformed (javiereguiluz)
|
||||||
|
* bug #23729 [Bridge\ProxyManager] Dont call __destruct() on non-instantiated services (nicolas-grekas)
|
||||||
|
|
||||||
* 2.7.33 (2017-08-01)
|
* 2.7.33 (2017-08-01)
|
||||||
|
|
||||||
* bug #22244 [Console] Fix passing options with defaultCommand (Jakub Sacha)
|
* bug #22244 [Console] Fix passing options with defaultCommand (Jakub Sacha)
|
||||||
|
@ -7,8 +7,8 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Fabien Potencier (fabpot)
|
- Fabien Potencier (fabpot)
|
||||||
- Nicolas Grekas (nicolas-grekas)
|
- Nicolas Grekas (nicolas-grekas)
|
||||||
- Bernhard Schussek (bschussek)
|
- Bernhard Schussek (bschussek)
|
||||||
- Tobias Schultze (tobion)
|
|
||||||
- Christian Flothmann (xabbuh)
|
- Christian Flothmann (xabbuh)
|
||||||
|
- Tobias Schultze (tobion)
|
||||||
- Christophe Coevoet (stof)
|
- Christophe Coevoet (stof)
|
||||||
- Jordi Boggiano (seldaek)
|
- Jordi Boggiano (seldaek)
|
||||||
- Victor Berchet (victor)
|
- Victor Berchet (victor)
|
||||||
@ -37,8 +37,8 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Roland Franssen (ro0)
|
- Roland Franssen (ro0)
|
||||||
- Eriksen Costa (eriksencosta)
|
- Eriksen Costa (eriksencosta)
|
||||||
- Jules Pietri (heah)
|
- Jules Pietri (heah)
|
||||||
- Sarah Khalil (saro0h)
|
|
||||||
- Guilhem Niot (energetick)
|
- Guilhem Niot (energetick)
|
||||||
|
- Sarah Khalil (saro0h)
|
||||||
- Jonathan Wage (jwage)
|
- Jonathan Wage (jwage)
|
||||||
- Diego Saint Esteben (dosten)
|
- Diego Saint Esteben (dosten)
|
||||||
- Alexandre Salomé (alexandresalome)
|
- Alexandre Salomé (alexandresalome)
|
||||||
@ -65,20 +65,20 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Michel Weimerskirch (mweimerskirch)
|
- Michel Weimerskirch (mweimerskirch)
|
||||||
- Eric Clemmons (ericclemmons)
|
- Eric Clemmons (ericclemmons)
|
||||||
- Charles Sarrazin (csarrazi)
|
- Charles Sarrazin (csarrazi)
|
||||||
- Christian Raue
|
|
||||||
- Konstantin Myakshin (koc)
|
- Konstantin Myakshin (koc)
|
||||||
|
- Christian Raue
|
||||||
|
- Dany Maillard (maidmaid)
|
||||||
- Arnout Boks (aboks)
|
- Arnout Boks (aboks)
|
||||||
|
- Jérémy DERUSSÉ (jderusse)
|
||||||
- Deni
|
- Deni
|
||||||
- Henrik Westphal (snc)
|
- Henrik Westphal (snc)
|
||||||
- Dariusz Górecki (canni)
|
- Dariusz Górecki (canni)
|
||||||
- Jáchym Toušek (enumag)
|
- Jáchym Toušek (enumag)
|
||||||
- Titouan Galopin (tgalopin)
|
- Titouan Galopin (tgalopin)
|
||||||
- Douglas Greenshields (shieldo)
|
- Douglas Greenshields (shieldo)
|
||||||
- Dany Maillard (maidmaid)
|
|
||||||
- Lee McDermott
|
- Lee McDermott
|
||||||
- Brandon Turner
|
- Brandon Turner
|
||||||
- Luis Cordova (cordoval)
|
- Luis Cordova (cordoval)
|
||||||
- Jérémy DERUSSÉ (jderusse)
|
|
||||||
- Graham Campbell (graham)
|
- Graham Campbell (graham)
|
||||||
- Daniel Holmes (dholmes)
|
- Daniel Holmes (dholmes)
|
||||||
- Toni Uebernickel (havvg)
|
- Toni Uebernickel (havvg)
|
||||||
@ -87,24 +87,24 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Jérôme Tamarelle (gromnan)
|
- Jérôme Tamarelle (gromnan)
|
||||||
- John Wards (johnwards)
|
- John Wards (johnwards)
|
||||||
- Dariusz Ruminski
|
- Dariusz Ruminski
|
||||||
|
- Alexander M. Turek (derrabus)
|
||||||
- Fran Moreno (franmomu)
|
- Fran Moreno (franmomu)
|
||||||
- Antoine Hérault (herzult)
|
- Antoine Hérault (herzult)
|
||||||
|
- Tobias Nyholm (tobias)
|
||||||
- Paráda József (paradajozsef)
|
- Paráda József (paradajozsef)
|
||||||
- Issei Murasawa (issei_m)
|
- Issei Murasawa (issei_m)
|
||||||
- Arnaud Le Blanc (arnaud-lb)
|
- Arnaud Le Blanc (arnaud-lb)
|
||||||
- Maxime STEINHAUSSER
|
- Maxime STEINHAUSSER
|
||||||
- Alexander M. Turek (derrabus)
|
|
||||||
- Michal Piotrowski (eventhorizon)
|
- Michal Piotrowski (eventhorizon)
|
||||||
- Tim Nagel (merk)
|
|
||||||
- Yonel Ceruto González (yonelceruto)
|
- Yonel Ceruto González (yonelceruto)
|
||||||
|
- Tim Nagel (merk)
|
||||||
- Brice BERNARD (brikou)
|
- Brice BERNARD (brikou)
|
||||||
- Baptiste Clavié (talus)
|
- Baptiste Clavié (talus)
|
||||||
- Vladimir Reznichenko (kalessil)
|
- Vladimir Reznichenko (kalessil)
|
||||||
- marc.weistroff
|
- marc.weistroff
|
||||||
- lenar
|
- lenar
|
||||||
- Tobias Nyholm (tobias)
|
|
||||||
- Włodzimierz Gajda (gajdaw)
|
|
||||||
- Alexander Schwenn (xelaris)
|
- Alexander Schwenn (xelaris)
|
||||||
|
- Włodzimierz Gajda (gajdaw)
|
||||||
- Jacob Dreesen (jdreesen)
|
- Jacob Dreesen (jdreesen)
|
||||||
- Florian Voutzinos (florianv)
|
- Florian Voutzinos (florianv)
|
||||||
- Colin Frei
|
- Colin Frei
|
||||||
@ -152,7 +152,9 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Rouven Weßling (realityking)
|
- Rouven Weßling (realityking)
|
||||||
- Teoh Han Hui (teohhanhui)
|
- Teoh Han Hui (teohhanhui)
|
||||||
- Clemens Tolboom
|
- Clemens Tolboom
|
||||||
|
- Oleg Voronkovich
|
||||||
- Helmer Aaviksoo
|
- Helmer Aaviksoo
|
||||||
|
- Lars Strojny (lstrojny)
|
||||||
- Hiromi Hishida (77web)
|
- Hiromi Hishida (77web)
|
||||||
- Matthieu Ouellette-Vachon (maoueh)
|
- Matthieu Ouellette-Vachon (maoueh)
|
||||||
- Michał Pipa (michal.pipa)
|
- Michał Pipa (michal.pipa)
|
||||||
@ -166,7 +168,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Warnar Boekkooi (boekkooi)
|
- Warnar Boekkooi (boekkooi)
|
||||||
- Dmitrii Chekaliuk (lazyhammer)
|
- Dmitrii Chekaliuk (lazyhammer)
|
||||||
- Clément JOBEILI (dator)
|
- Clément JOBEILI (dator)
|
||||||
- Lars Strojny (lstrojny)
|
|
||||||
- Possum
|
- Possum
|
||||||
- Dorian Villet (gnutix)
|
- Dorian Villet (gnutix)
|
||||||
- Richard Miller (mr_r_miller)
|
- Richard Miller (mr_r_miller)
|
||||||
@ -183,7 +184,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Daniel Espendiller
|
- Daniel Espendiller
|
||||||
- sun (sun)
|
- sun (sun)
|
||||||
- Larry Garfield (crell)
|
- Larry Garfield (crell)
|
||||||
- Oleg Voronkovich
|
|
||||||
- Martin Schuhfuß (usefulthink)
|
- Martin Schuhfuß (usefulthink)
|
||||||
- apetitpa
|
- apetitpa
|
||||||
- Matthieu Bontemps (mbontemps)
|
- Matthieu Bontemps (mbontemps)
|
||||||
@ -334,9 +334,11 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Damien Alexandre (damienalexandre)
|
- Damien Alexandre (damienalexandre)
|
||||||
- Felix Labrecque
|
- Felix Labrecque
|
||||||
- Yaroslav Kiliba
|
- Yaroslav Kiliba
|
||||||
|
- Amrouche Hamza
|
||||||
- Terje Bråten
|
- Terje Bråten
|
||||||
- Robbert Klarenbeek (robbertkl)
|
- Robbert Klarenbeek (robbertkl)
|
||||||
- Thomas Calvet (fancyweb)
|
- Thomas Calvet (fancyweb)
|
||||||
|
- Valentin Udaltsov (vudaltsov)
|
||||||
- Niels Keurentjes (curry684)
|
- Niels Keurentjes (curry684)
|
||||||
- JhonnyL
|
- JhonnyL
|
||||||
- David Badura (davidbadura)
|
- David Badura (davidbadura)
|
||||||
@ -387,6 +389,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Karel Souffriau
|
- Karel Souffriau
|
||||||
- Christophe L. (christophelau)
|
- Christophe L. (christophelau)
|
||||||
- Anthon Pang (robocoder)
|
- Anthon Pang (robocoder)
|
||||||
|
- Jérôme Parmentier (lctrs)
|
||||||
- Emanuele Gaspari (inmarelibero)
|
- Emanuele Gaspari (inmarelibero)
|
||||||
- Sébastien Santoro (dereckson)
|
- Sébastien Santoro (dereckson)
|
||||||
- Brian King
|
- Brian King
|
||||||
@ -421,7 +424,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Dirk Pahl (dirkaholic)
|
- Dirk Pahl (dirkaholic)
|
||||||
- cedric lombardot (cedriclombardot)
|
- cedric lombardot (cedriclombardot)
|
||||||
- Jonas Flodén (flojon)
|
- Jonas Flodén (flojon)
|
||||||
- Amrouche Hamza
|
|
||||||
- Marcin Sikoń (marphi)
|
- Marcin Sikoń (marphi)
|
||||||
- Dominik Zogg (dominik.zogg)
|
- Dominik Zogg (dominik.zogg)
|
||||||
- Marek Pietrzak
|
- Marek Pietrzak
|
||||||
@ -432,6 +434,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Zander Baldwin
|
- Zander Baldwin
|
||||||
- Adam Harvey
|
- Adam Harvey
|
||||||
- Maxime Veber (nek-)
|
- Maxime Veber (nek-)
|
||||||
|
- Sanpi
|
||||||
- Alex Bakhturin
|
- Alex Bakhturin
|
||||||
- Alexander Obuhovich (aik099)
|
- Alexander Obuhovich (aik099)
|
||||||
- boombatower
|
- boombatower
|
||||||
@ -512,6 +515,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Dave Hulbert (dave1010)
|
- Dave Hulbert (dave1010)
|
||||||
- Ivan Rey (ivanrey)
|
- Ivan Rey (ivanrey)
|
||||||
- Marcin Chyłek (songoq)
|
- Marcin Chyłek (songoq)
|
||||||
|
- Ben Scott
|
||||||
- Ned Schwartz
|
- Ned Schwartz
|
||||||
- Ziumin
|
- Ziumin
|
||||||
- Jeremy Benoist
|
- Jeremy Benoist
|
||||||
@ -520,7 +524,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Benjamin Laugueux (yzalis)
|
- Benjamin Laugueux (yzalis)
|
||||||
- Zach Badgett (zachbadgett)
|
- Zach Badgett (zachbadgett)
|
||||||
- Aurélien Fredouelle
|
- Aurélien Fredouelle
|
||||||
- Jérôme Parmentier (lctrs)
|
|
||||||
- Pavel Campr (pcampr)
|
- Pavel Campr (pcampr)
|
||||||
- Johnny Robeson (johnny)
|
- Johnny Robeson (johnny)
|
||||||
- Disquedur
|
- Disquedur
|
||||||
@ -592,7 +595,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Ulumuddin Yunus (joenoez)
|
- Ulumuddin Yunus (joenoez)
|
||||||
- Luc Vieillescazes (iamluc)
|
- Luc Vieillescazes (iamluc)
|
||||||
- Johann Saunier (prophet777)
|
- Johann Saunier (prophet777)
|
||||||
- Valentin Udaltsov (vudaltsov)
|
|
||||||
- Michael Devery (mickadoo)
|
- Michael Devery (mickadoo)
|
||||||
- Antoine Corcy
|
- Antoine Corcy
|
||||||
- Artur Eshenbrener
|
- Artur Eshenbrener
|
||||||
@ -671,9 +673,11 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Andrew Hilobok (hilobok)
|
- Andrew Hilobok (hilobok)
|
||||||
- Noah Heck (myesain)
|
- Noah Heck (myesain)
|
||||||
- Christian Soronellas (theunic)
|
- Christian Soronellas (theunic)
|
||||||
|
- Adam Szaraniec (mimol)
|
||||||
- Yosmany Garcia (yosmanyga)
|
- Yosmany Garcia (yosmanyga)
|
||||||
- Wouter de Wild
|
- Wouter de Wild
|
||||||
- Degory Valentine
|
- Degory Valentine
|
||||||
|
- izzyp
|
||||||
- Benoit Lévêque (benoit_leveque)
|
- Benoit Lévêque (benoit_leveque)
|
||||||
- Jeroen Fiege (fieg)
|
- Jeroen Fiege (fieg)
|
||||||
- Krzysiek Łabuś
|
- Krzysiek Łabuś
|
||||||
@ -709,7 +713,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Pierre Vanliefland (pvanliefland)
|
- Pierre Vanliefland (pvanliefland)
|
||||||
- Sofiane HADDAG (sofhad)
|
- Sofiane HADDAG (sofhad)
|
||||||
- frost-nzcr4
|
- frost-nzcr4
|
||||||
- Sanpi
|
|
||||||
- Abhoryo
|
- Abhoryo
|
||||||
- Fabian Vogler (fabian)
|
- Fabian Vogler (fabian)
|
||||||
- Korvin Szanto
|
- Korvin Szanto
|
||||||
@ -742,7 +745,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Omar Yepez (oyepez003)
|
- Omar Yepez (oyepez003)
|
||||||
- mwsaz
|
- mwsaz
|
||||||
- Jelle Kapitein
|
- Jelle Kapitein
|
||||||
- Ben Scott
|
|
||||||
- Benoît Bourgeois
|
- Benoît Bourgeois
|
||||||
- mantulo
|
- mantulo
|
||||||
- corphi
|
- corphi
|
||||||
@ -877,6 +879,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Boris Vujicic (boris.vujicic)
|
- Boris Vujicic (boris.vujicic)
|
||||||
- Max Beutel
|
- Max Beutel
|
||||||
- Antanas Arvasevicius
|
- Antanas Arvasevicius
|
||||||
|
- Maximilian Berghoff (electricmaxxx)
|
||||||
- nacho
|
- nacho
|
||||||
- Piotr Antosik (antek88)
|
- Piotr Antosik (antek88)
|
||||||
- Artem Lopata
|
- Artem Lopata
|
||||||
@ -910,6 +913,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Matteo Giachino (matteosister)
|
- Matteo Giachino (matteosister)
|
||||||
- Alex Demchenko (pilot)
|
- Alex Demchenko (pilot)
|
||||||
- Tadas Gliaubicas (tadcka)
|
- Tadas Gliaubicas (tadcka)
|
||||||
|
- Thanos Polymeneas (thanos)
|
||||||
- Benoit Garret
|
- Benoit Garret
|
||||||
- Jakub Sacha
|
- Jakub Sacha
|
||||||
- DerManoMann
|
- DerManoMann
|
||||||
@ -1098,7 +1102,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Tomaz Ahlin
|
- Tomaz Ahlin
|
||||||
- Marcus Stöhr (dafish)
|
- Marcus Stöhr (dafish)
|
||||||
- Emmanuel Vella (emmanuel.vella)
|
- Emmanuel Vella (emmanuel.vella)
|
||||||
- Adam Szaraniec (mimol)
|
|
||||||
- Carsten Nielsen (phreaknerd)
|
- Carsten Nielsen (phreaknerd)
|
||||||
- Mathieu Rochette
|
- Mathieu Rochette
|
||||||
- Jay Severson
|
- Jay Severson
|
||||||
@ -1171,6 +1174,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- César Suárez (csuarez)
|
- César Suárez (csuarez)
|
||||||
- Nicolas Badey (nico-b)
|
- Nicolas Badey (nico-b)
|
||||||
- Shane Preece (shane)
|
- Shane Preece (shane)
|
||||||
|
- Johannes Goslar
|
||||||
- Geoff
|
- Geoff
|
||||||
- georaldc
|
- georaldc
|
||||||
- Malte Wunsch
|
- Malte Wunsch
|
||||||
@ -1204,6 +1208,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- catch
|
- catch
|
||||||
- Alexandre Segura
|
- Alexandre Segura
|
||||||
- Josef Cech
|
- Josef Cech
|
||||||
|
- Harold Iedema
|
||||||
- Arnau González (arnaugm)
|
- Arnau González (arnaugm)
|
||||||
- Simon Bouland (bouland)
|
- Simon Bouland (bouland)
|
||||||
- Matthew Foster (mfoster)
|
- Matthew Foster (mfoster)
|
||||||
@ -1236,7 +1241,6 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Dennis Væversted
|
- Dennis Væversted
|
||||||
- nuncanada
|
- nuncanada
|
||||||
- flack
|
- flack
|
||||||
- izzyp
|
|
||||||
- František Bereň
|
- František Bereň
|
||||||
- Mike Francis
|
- Mike Francis
|
||||||
- Christoph Nissle (derstoffel)
|
- Christoph Nissle (derstoffel)
|
||||||
@ -1477,6 +1481,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Ismail Asci (ismailasci)
|
- Ismail Asci (ismailasci)
|
||||||
- Simon CONSTANS (kosssi)
|
- Simon CONSTANS (kosssi)
|
||||||
- Kristof Van Cauwenbergh (kristofvc)
|
- Kristof Van Cauwenbergh (kristofvc)
|
||||||
|
- Paulius Jarmalavičius (pjarmalavicius)
|
||||||
- Ramon Henrique Ornelas (ramonornela)
|
- Ramon Henrique Ornelas (ramonornela)
|
||||||
- Markus S. (staabm)
|
- Markus S. (staabm)
|
||||||
- Till Klampaeckel (till)
|
- Till Klampaeckel (till)
|
||||||
@ -1569,11 +1574,13 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- Matt Janssen
|
- Matt Janssen
|
||||||
- Peter Gribanov
|
- Peter Gribanov
|
||||||
- Ben Johnson
|
- Ben Johnson
|
||||||
|
- Florent Mata
|
||||||
- kwiateusz
|
- kwiateusz
|
||||||
- David Soria Parra
|
- David Soria Parra
|
||||||
- Sergiy Sokolenko
|
- Sergiy Sokolenko
|
||||||
- dinitrol
|
- dinitrol
|
||||||
- Penny Leach
|
- Penny Leach
|
||||||
|
- Yurii K
|
||||||
- Richard Trebichavský
|
- Richard Trebichavský
|
||||||
- g123456789l
|
- g123456789l
|
||||||
- Jonathan Vollebregt
|
- Jonathan Vollebregt
|
||||||
@ -1651,6 +1658,7 @@ Symfony is the result of the work of many people who made the code better
|
|||||||
- samuel laulhau (lalop)
|
- samuel laulhau (lalop)
|
||||||
- Laurent Bachelier (laurentb)
|
- Laurent Bachelier (laurentb)
|
||||||
- Florent Viel (luxifer)
|
- Florent Viel (luxifer)
|
||||||
|
- Matthieu Mota (matthieumota)
|
||||||
- Matthieu Moquet (mattketmo)
|
- Matthieu Moquet (mattketmo)
|
||||||
- Moritz Borgmann (mborgmann)
|
- Moritz Borgmann (mborgmann)
|
||||||
- Michal Čihař (mcihar)
|
- Michal Čihař (mcihar)
|
||||||
|
@ -52,7 +52,8 @@ class OutputFormatter implements OutputFormatterInterface
|
|||||||
if ('\\' === substr($text, -1)) {
|
if ('\\' === substr($text, -1)) {
|
||||||
$len = strlen($text);
|
$len = strlen($text);
|
||||||
$text = rtrim($text, '\\');
|
$text = rtrim($text, '\\');
|
||||||
$text .= str_repeat('<<', $len - strlen($text));
|
$text = str_replace("\0", '', $text);
|
||||||
|
$text .= str_repeat("\0", $len - strlen($text));
|
||||||
}
|
}
|
||||||
|
|
||||||
return $text;
|
return $text;
|
||||||
@ -167,8 +168,8 @@ class OutputFormatter implements OutputFormatterInterface
|
|||||||
|
|
||||||
$output .= $this->applyCurrentStyle(substr($message, $offset));
|
$output .= $this->applyCurrentStyle(substr($message, $offset));
|
||||||
|
|
||||||
if (false !== strpos($output, '<<')) {
|
if (false !== strpos($output, "\0")) {
|
||||||
return strtr($output, array('\\<' => '<', '<<' => '\\'));
|
return strtr($output, array("\0" => '\\', '\\<' => '<'));
|
||||||
}
|
}
|
||||||
|
|
||||||
return str_replace('\\<', '<', $output);
|
return str_replace('\\<', '<', $output);
|
||||||
|
@ -28,6 +28,9 @@ class OutputFormatterTest extends TestCase
|
|||||||
$formatter = new OutputFormatter(true);
|
$formatter = new OutputFormatter(true);
|
||||||
|
|
||||||
$this->assertEquals('foo<bar', $formatter->format('foo\\<bar'));
|
$this->assertEquals('foo<bar', $formatter->format('foo\\<bar'));
|
||||||
|
$this->assertEquals('foo << bar', $formatter->format('foo << bar'));
|
||||||
|
$this->assertEquals('foo << bar \\', $formatter->format('foo << bar \\'));
|
||||||
|
$this->assertEquals("foo << \033[32mbar \\ baz\033[39m \\", $formatter->format('foo << <info>bar \\ baz</info> \\'));
|
||||||
$this->assertEquals('<info>some info</info>', $formatter->format('\\<info>some info\\</info>'));
|
$this->assertEquals('<info>some info</info>', $formatter->format('\\<info>some info\\</info>'));
|
||||||
$this->assertEquals('\\<info>some info\\</info>', OutputFormatter::escape('<info>some info</info>'));
|
$this->assertEquals('\\<info>some info\\</info>', OutputFormatter::escape('<info>some info</info>'));
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user