Merge branch '2.7' into 2.8
* 2.7: update test for Twig performance optimizations [WebProfilerBundle] Increase retry delays between toolbarAction ajax calls support sapi_windows_vt100_support for php 7.2+ bumped Symfony version to 2.7.42 updated VERSION for 2.7.41 update CONTRIBUTORS for 2.7.41 updated CHANGELOG for 2.7.41 [HttpFoundation] Added "null" type on Request::create docblock Allow trans filter to be safe
This commit is contained in:
commit
49b94cc995
@ -7,6 +7,34 @@ 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 between two versions, go to https://github.com/symfony/symfony/compare/v2.7.0...v2.7.1
|
||||
|
||||
* 2.7.41 (2018-01-29)
|
||||
|
||||
* bug #25922 [HttpFoundation] Use the correct syntax for session gc based on Pdo driver (tanasecosminromeo)
|
||||
* bug #25933 Disable CSP header on exception pages only in debug (ostrolucky)
|
||||
* bug #25926 [Form] Fixed Button::setParent() when already submitted (HeahDude)
|
||||
* bug #25927 [Form] Fixed submitting disabled buttons (HeahDude)
|
||||
* bug #25891 [DependencyInjection] allow null values for root nodes in YAML configs (xabbuh)
|
||||
* bug #25848 [Validator] add missing parent isset and add test (Simperfit)
|
||||
* bug #25861 do not conflict with egulias/email-validator 2.0+ (xabbuh)
|
||||
* bug #25851 [Validator] Conflict with egulias/email-validator 2.0 (emodric)
|
||||
* bug #25837 [SecurityBundle] Don't register in memory users as services (chalasr)
|
||||
* bug #25835 [HttpKernel] DebugHandlersListener should always replace the existing exception handler (nicolas-grekas)
|
||||
* bug #25829 [Debug] Always decorate existing exception handlers to deal with fatal errors (nicolas-grekas)
|
||||
* bug #25824 Fixing a bug where the dump() function depended on bundle ordering (weaverryan)
|
||||
* bug #25789 Enableable ArrayNodeDefinition is disabled for empty configuration (kejwmen)
|
||||
* bug #25816 Problem in phar see mergerequest #25579 (betzholz)
|
||||
* bug #25781 [Form] Disallow transform dates beyond the year 9999 (curry684)
|
||||
* bug #25812 Copied NO language files to the new NB locale (derrabus)
|
||||
* bug #25801 [Router] Skip anonymous classes when loading annotated routes (pierredup)
|
||||
* bug #25657 [Security] Fix fatal error on non string username (chalasr)
|
||||
* bug #25799 Fixed Request::__toString ignoring cookies (Toflar)
|
||||
* bug #25755 [Debug] prevent infinite loop with faulty exception handlers (nicolas-grekas)
|
||||
* bug #25771 [Validator] 19 digits VISA card numbers are valid (xabbuh)
|
||||
* bug #25751 [FrameworkBundle] Add the missing `enabled` session attribute (sroze)
|
||||
* bug #25750 [HttpKernel] Turn bad hosts into 400 instead of 500 (nicolas-grekas)
|
||||
* bug #25490 [Serializer] Fixed throwing exception with option JSON_PARTIAL_OUTPUT_ON_ERROR (diversantvlz)
|
||||
* feature #25669 [Security] Fail gracefully if the security token cannot be unserialized from the session (thewilkybarkid)
|
||||
|
||||
* 2.7.40 (2018-01-05)
|
||||
|
||||
* bug #25532 [HttpKernel] Disable CSP header on exception pages (ostrolucky)
|
||||
|
@ -16,8 +16,8 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Kévin Dunglas (dunglas)
|
||||
- Jakub Zalas (jakubzalas)
|
||||
- Kris Wallsmith (kriswallsmith)
|
||||
- Ryan Weaver (weaverryan)
|
||||
- Robin Chalas (chalas_r)
|
||||
- Ryan Weaver (weaverryan)
|
||||
- Javier Eguiluz (javier.eguiluz)
|
||||
- Maxime Steinhausser (ogizanagi)
|
||||
- Hugo Hamon (hhamon)
|
||||
@ -58,21 +58,21 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Diego Saint Esteben (dii3g0)
|
||||
- Dany Maillard (maidmaid)
|
||||
- Konstantin Kudryashov (everzet)
|
||||
- Amrouche Hamza (simperfit)
|
||||
- Kevin Bond (kbond)
|
||||
- Bilal Amarni (bamarni)
|
||||
- Pierre du Plessis (pierredup)
|
||||
- Bilal Amarni (bamarni)
|
||||
- Florin Patan (florinpatan)
|
||||
- Jérémy DERUSSÉ (jderusse)
|
||||
- Amrouche Hamza (simperfit)
|
||||
- Samuel ROZE (sroze)
|
||||
- Gábor Egyed (1ed)
|
||||
- Alexander M. Turek (derrabus)
|
||||
- Michel Weimerskirch (mweimerskirch)
|
||||
- Andrej Hudec (pulzarraider)
|
||||
- Alexander M. Turek (derrabus)
|
||||
- Eric Clemmons (ericclemmons)
|
||||
- Jáchym Toušek (enumag)
|
||||
- Charles Sarrazin (csarrazi)
|
||||
- Titouan Galopin (tgalopin)
|
||||
- Samuel ROZE (sroze)
|
||||
- Konstantin Myakshin (koc)
|
||||
- Christian Raue
|
||||
- Arnout Boks (aboks)
|
||||
@ -100,9 +100,9 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Maxime STEINHAUSSER
|
||||
- Michal Piotrowski (eventhorizon)
|
||||
- Tim Nagel (merk)
|
||||
- David Maicher (dmaicher)
|
||||
- Vladimir Reznichenko (kalessil)
|
||||
- Brice BERNARD (brikou)
|
||||
- David Maicher (dmaicher)
|
||||
- Baptiste Clavié (talus)
|
||||
- marc.weistroff
|
||||
- lenar
|
||||
@ -112,17 +112,17 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Florian Voutzinos (florianv)
|
||||
- Colin Frei
|
||||
- Adrien Brault (adrienbrault)
|
||||
- Tomáš Votruba (tomas_votruba)
|
||||
- Joshua Thijssen
|
||||
- Peter Kokot (maastermedia)
|
||||
- David Buchmann (dbu)
|
||||
- excelwebzone
|
||||
- Tomáš Votruba (tomas_votruba)
|
||||
- Grégoire Paris (greg0ire)
|
||||
- Fabien Pennequin (fabienpennequin)
|
||||
- Gordon Franke (gimler)
|
||||
- Eric GELOEN (gelo)
|
||||
- Daniel Wehner (dawehner)
|
||||
- Tugdual Saunier (tucksaun)
|
||||
- Grégoire Paris (greg0ire)
|
||||
- Théo FIDRY (theofidry)
|
||||
- Robert Schönthal (digitalkaoz)
|
||||
- Florian Lonqueu-Brochard (florianlb)
|
||||
@ -135,11 +135,11 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Sebastian Hörl (blogsh)
|
||||
- Daniel Gomes (danielcsgomes)
|
||||
- Hidenori Goto (hidenorigoto)
|
||||
- Alex Pott
|
||||
- Guilherme Blanco (guilhermeblanco)
|
||||
- Pablo Godel (pgodel)
|
||||
- Jérémie Augustin (jaugustin)
|
||||
- Andréia Bohner (andreia)
|
||||
- Alex Pott
|
||||
- Julien Falque (julienfalque)
|
||||
- Rafael Dohms (rdohms)
|
||||
- Arnaud Kleinpeter (nanocom)
|
||||
@ -147,6 +147,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Mikael Pajunen
|
||||
- Joel Wurtz (brouznouf)
|
||||
- Jérôme Vasseur (jvasseur)
|
||||
- Chris Wilkinson (thewilkybarkid)
|
||||
- Oleg Voronkovich
|
||||
- Philipp Wahala (hifi)
|
||||
- Vyacheslav Pavlov
|
||||
@ -169,7 +170,6 @@ Symfony is the result of the work of many people who made the code better
|
||||
- GDIBass
|
||||
- jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
|
||||
- James Halsall (jaitsu)
|
||||
- Chris Wilkinson (thewilkybarkid)
|
||||
- Warnar Boekkooi (boekkooi)
|
||||
- Dmitrii Chekaliuk (lazyhammer)
|
||||
- Clément JOBEILI (dator)
|
||||
@ -213,8 +213,10 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Tom Van Looy (tvlooy)
|
||||
- Sven Paulus (subsven)
|
||||
- Rui Marinho (ruimarinho)
|
||||
- Niels Keurentjes (curry684)
|
||||
- Eugene Wissner
|
||||
- Julien Brochet (mewt)
|
||||
- Gabriel Ostrolucký
|
||||
- Tristan Darricau (nicofuma)
|
||||
- Michaël Perrin (michael.perrin)
|
||||
- Marcel Beerta (mazen)
|
||||
@ -247,13 +249,11 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Alessandro Chitolina
|
||||
- Kristen Gilden (kgilden)
|
||||
- Pierre-Yves LEBECQ (pylebecq)
|
||||
- Niels Keurentjes (curry684)
|
||||
- Jordan Samouh (jordansamouh)
|
||||
- Jakub Kucharovic (jkucharovic)
|
||||
- Uwe Jäger (uwej711)
|
||||
- Eugene Leonovich (rybakit)
|
||||
- Filippo Tessarotto
|
||||
- Gabriel Ostrolucký
|
||||
- Joseph Rouff (rouffj)
|
||||
- Félix Labrecque (woodspire)
|
||||
- GordonsLondon
|
||||
@ -285,6 +285,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Robert Kiss (kepten)
|
||||
- Roumen Damianoff (roumen)
|
||||
- Antonio J. García Lagar (ajgarlag)
|
||||
- Benoît Burnichon (bburnichon)
|
||||
- Kim Hemsø Rasmussen (kimhemsoe)
|
||||
- Wouter Van Hecke
|
||||
- Jérôme Parmentier (lctrs)
|
||||
@ -293,6 +294,9 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Michael Holm (hollo)
|
||||
- Marc Weistroff (futurecat)
|
||||
- Christian Schmidt
|
||||
- Yanick Witschi (toflar)
|
||||
- Edi Modrić (emodric)
|
||||
- Thomas Calvet (fancyweb)
|
||||
- Chad Sikorra (chadsikorra)
|
||||
- Chris Smith (cs278)
|
||||
- Florian Klein (docteurklein)
|
||||
@ -309,6 +313,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Wouter J
|
||||
- Ismael Ambrosi (iambrosi)
|
||||
- Baptiste Lafontaine
|
||||
- François Pluchino (francoispluchino)
|
||||
- Aurelijus Valeiša (aurelijus)
|
||||
- Victor Bocharsky (bocharsky_bw)
|
||||
- Jan Decavele (jandc)
|
||||
@ -347,11 +352,9 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Damien Alexandre (damienalexandre)
|
||||
- Felix Labrecque
|
||||
- Yaroslav Kiliba
|
||||
- Maxime Veber (nek-)
|
||||
- Terje Bråten
|
||||
- Yanick Witschi (toflar)
|
||||
- Robbert Klarenbeek (robbertkl)
|
||||
- Edi Modrić (emodric)
|
||||
- Thomas Calvet (fancyweb)
|
||||
- JhonnyL
|
||||
- David Badura (davidbadura)
|
||||
- hossein zolfi (ocean)
|
||||
@ -364,7 +367,6 @@ 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)
|
||||
- Benoît Burnichon (bburnichon)
|
||||
- Costin Bereveanu (schniper)
|
||||
- Loïc Chardonnet (gnusat)
|
||||
- Marek Kalnik (marekkalnik)
|
||||
@ -372,7 +374,6 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Hassan Amouhzi
|
||||
- Tamas Szijarto
|
||||
- Pavel Volokitin (pvolok)
|
||||
- François Pluchino (francoispluchino)
|
||||
- Arthur de Moulins (4rthem)
|
||||
- Nicolas Dewez (nicolas_dewez)
|
||||
- Endre Fejes
|
||||
@ -452,7 +453,6 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Zander Baldwin
|
||||
- Adam Harvey
|
||||
- Anton Bakai
|
||||
- Maxime Veber (nek-)
|
||||
- Alex Bakhturin
|
||||
- Alexander Obuhovich (aik099)
|
||||
- boombatower
|
||||
@ -575,6 +575,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Hany el-Kerdany
|
||||
- Wang Jingyu
|
||||
- Åsmund Garfors
|
||||
- Gunnstein Lye (glye)
|
||||
- Maxime Douailin
|
||||
- Jean Pasdeloup (pasdeloup)
|
||||
- Benjamin Cremer (bcremer)
|
||||
@ -587,6 +588,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Sebastian Marek (proofek)
|
||||
- Erkhembayar Gantulga (erheme318)
|
||||
- Michal Trojanowski
|
||||
- Mateusz Sip
|
||||
- David Fuhr
|
||||
- Kamil Kokot (pamil)
|
||||
- Aurimas Niekis (gcds)
|
||||
@ -648,6 +650,8 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Richard van den Brand (ricbra)
|
||||
- develop
|
||||
- VJ
|
||||
- Delf Tonder (leberknecht)
|
||||
- Sullivan SENECHAL (soullivaneuh)
|
||||
- Mark Sonnabaum
|
||||
- Richard Quadling
|
||||
- jochenvdv
|
||||
@ -801,6 +805,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Jacques Moati
|
||||
- Balazs Csaba (balazscsaba2006)
|
||||
- Douglas Reith (douglas_reith)
|
||||
- Forfarle (forfarle)
|
||||
- Harry Walter (haswalt)
|
||||
- Johnson Page (jwpage)
|
||||
- Ruben Gonzalez (rubenruateltek)
|
||||
@ -930,6 +935,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- benatespina (benatespina)
|
||||
- Denis Kop
|
||||
- jfcixmedia
|
||||
- Nikita Konstantinov
|
||||
- Martijn Evers
|
||||
- Benjamin Paap (benjaminpaap)
|
||||
- Christian
|
||||
@ -975,6 +981,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Jeremy Bush
|
||||
- wizhippo
|
||||
- Viacheslav Sychov
|
||||
- Matt Brunt
|
||||
- Carlos Ortega Huetos
|
||||
- rpg600
|
||||
- Péter Buri (burci)
|
||||
@ -1026,6 +1033,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Felicitus
|
||||
- Krzysztof Przybyszewski
|
||||
- Paul Matthews
|
||||
- Vacheslav Silyutin
|
||||
- Juan Traverso
|
||||
- Alain Flaus (halundra)
|
||||
- Tarjei Huse (tarjei)
|
||||
@ -1070,7 +1078,6 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Sebastian Göttschkes (sgoettschkes)
|
||||
- Tatsuya Tsuruoka
|
||||
- Ross Tuck
|
||||
- Gunnstein Lye (glye)
|
||||
- Kévin Gomez (kevin)
|
||||
- azine
|
||||
- Dawid Sajdak
|
||||
@ -1126,6 +1133,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Kim Laï Trinh
|
||||
- Jason Desrosiers
|
||||
- m.chwedziak
|
||||
- Andreas Frömer
|
||||
- Philip Frank
|
||||
- Lance McNearney
|
||||
- Gonzalo Vilaseca (gonzalovilaseca)
|
||||
@ -1144,7 +1152,6 @@ Symfony is the result of the work of many people who made the code better
|
||||
- WedgeSama
|
||||
- Felds Liscia
|
||||
- Chihiro Adachi (chihiro-adachi)
|
||||
- Sullivan SENECHAL
|
||||
- Tadcka
|
||||
- Beth Binkovitz
|
||||
- Gonzalo Míguez
|
||||
@ -1202,6 +1209,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Simon Neidhold
|
||||
- Xavier HAUSHERR
|
||||
- Valentin VALCIU
|
||||
- Jeremiah VALERIE
|
||||
- Kevin Dew
|
||||
- James Cowgill
|
||||
- 1ma (jautenim)
|
||||
@ -1251,6 +1259,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- natechicago
|
||||
- Jonathan Poston
|
||||
- Adrian Olek (adrianolek)
|
||||
- Jody Mickey (jwmickey)
|
||||
- Przemysław Piechota (kibao)
|
||||
- Leonid Terentyev (li0n)
|
||||
- ryunosuke
|
||||
@ -1260,6 +1269,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Iwan van Staveren (istaveren)
|
||||
- Povilas S. (povilas)
|
||||
- pborreli
|
||||
- Boris Betzholz
|
||||
- Eric Caron
|
||||
- 2manypeople
|
||||
- Wing
|
||||
@ -1409,6 +1419,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- vlakoff
|
||||
- bertillon
|
||||
- Bertalan Attila
|
||||
- AmsTaFF (amstaff)
|
||||
- Yannick Bensacq (cibou)
|
||||
- Frédéric G. Marand (fgm)
|
||||
- Freek Van der Herten (freekmurze)
|
||||
@ -1514,6 +1525,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Javier Núñez Berrocoso (javiernuber)
|
||||
- Jelle Bekker (jbekker)
|
||||
- Ian Jenkins (jenkoian)
|
||||
- Giovanni Albero (johntree)
|
||||
- Jorge Martin (jorgemartind)
|
||||
- Joeri Verdeyen (jverdeyen)
|
||||
- Dmitrii Poddubnyi (karser)
|
||||
@ -1560,6 +1572,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Ismail Asci (ismailasci)
|
||||
- Simon CONSTANS (kosssi)
|
||||
- Kristof Van Cauwenbergh (kristofvc)
|
||||
- Dennis Langen (nijusan)
|
||||
- Paulius Jarmalavičius (pjarmalavicius)
|
||||
- Ramon Henrique Ornelas (ramonornela)
|
||||
- Ricardo de Vries (ricknox)
|
||||
@ -1598,6 +1611,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- lol768
|
||||
- jamogon
|
||||
- Vyacheslav Slinko
|
||||
- Jakub Chábek
|
||||
- Johannes
|
||||
- Jörg Rühl
|
||||
- wesleyh
|
||||
@ -1606,6 +1620,7 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Michael Genereux
|
||||
- patrick-mcdougle
|
||||
- Dariusz Czech
|
||||
- Jack Wright
|
||||
- Anonymous User
|
||||
- Paweł Tomulik
|
||||
- Eric J. Duran
|
||||
@ -1728,7 +1743,6 @@ Symfony is the result of the work of many people who made the code better
|
||||
- Fabien D. (fabd)
|
||||
- Carsten Eilers (fnc)
|
||||
- Sorin Gitlan (forapathy)
|
||||
- Forfarle (forfarle)
|
||||
- Yohan Giarelli (frequence-web)
|
||||
- Gerry Vandermaesen (gerryvdm)
|
||||
- Ghazy Ben Ahmed (ghazy)
|
||||
|
@ -195,7 +195,8 @@ class DeprecationErrorHandler
|
||||
{
|
||||
if ('\\' === DIRECTORY_SEPARATOR) {
|
||||
return
|
||||
'10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
|
||||
defined('STDOUT') && function_exists('sapi_windows_vt100_support') && sapi_windows_vt100_support(STDOUT)
|
||||
|| '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
|
||||
|| false !== getenv('ANSICON')
|
||||
|| 'ON' === getenv('ConEmuANSI')
|
||||
|| 'xterm' === getenv('TERM');
|
||||
|
@ -224,7 +224,13 @@
|
||||
{% set label = name|humanize %}
|
||||
{%- endif -%}
|
||||
{%- endif -%}
|
||||
<label{% for attrname, attrvalue in label_attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}>{{ translation_domain is same as(false) ? label : label|trans({}, translation_domain) }}</label>
|
||||
<label{% for attrname, attrvalue in label_attr %} {{ attrname }}="{{ attrvalue }}"{% endfor %}>
|
||||
{%- if translation_domain is same as(false) -%}
|
||||
{{- label -}}
|
||||
{%- else -%}
|
||||
{{- label|trans({}, translation_domain) -}}
|
||||
{%- endif -%}
|
||||
</label>
|
||||
{%- endif -%}
|
||||
{%- endblock form_label -%}
|
||||
|
||||
|
@ -57,6 +57,10 @@ class TransNodeTest extends TestCase
|
||||
|
||||
protected function getVariableGetterWithStrictCheck($name)
|
||||
{
|
||||
if (Environment::VERSION_ID > 20404) {
|
||||
return sprintf('(isset($context["%s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%1$s" does not exist.\', 0, $this->source); })())', $name);
|
||||
}
|
||||
|
||||
if (Environment::MAJOR_VERSION >= 2) {
|
||||
return sprintf('(isset($context["%s"]) || array_key_exists("%1$s", $context) ? $context["%1$s"] : (function () { throw new Twig_Error_Runtime(\'Variable "%1$s" does not exist.\', 0, $this->getSourceContext()); })())', $name);
|
||||
}
|
||||
|
@ -50,7 +50,7 @@
|
||||
setTimeout(function(){
|
||||
options.maxTries--;
|
||||
request(url, onSuccess, onError, payload, options);
|
||||
}, 500);
|
||||
}, 1000);
|
||||
|
||||
return null;
|
||||
}
|
||||
|
@ -92,7 +92,8 @@ class StreamOutput extends Output
|
||||
{
|
||||
if (DIRECTORY_SEPARATOR === '\\') {
|
||||
return
|
||||
'10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
|
||||
function_exists('sapi_windows_vt100_support') && sapi_windows_vt100_support($this->stream)
|
||||
|| '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
|
||||
|| false !== getenv('ANSICON')
|
||||
|| 'ON' === getenv('ConEmuANSI')
|
||||
|| 'xterm' === getenv('TERM');
|
||||
|
@ -130,7 +130,7 @@ class Request
|
||||
public $headers;
|
||||
|
||||
/**
|
||||
* @var string|resource
|
||||
* @var string|resource|false|null
|
||||
*/
|
||||
protected $content;
|
||||
|
||||
@ -216,13 +216,13 @@ class Request
|
||||
);
|
||||
|
||||
/**
|
||||
* @param array $query The GET parameters
|
||||
* @param array $request The POST parameters
|
||||
* @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
|
||||
* @param array $cookies The COOKIE parameters
|
||||
* @param array $files The FILES parameters
|
||||
* @param array $server The SERVER parameters
|
||||
* @param string|resource $content The raw body data
|
||||
* @param array $query The GET parameters
|
||||
* @param array $request The POST parameters
|
||||
* @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
|
||||
* @param array $cookies The COOKIE parameters
|
||||
* @param array $files The FILES parameters
|
||||
* @param array $server The SERVER parameters
|
||||
* @param string|resource|null $content The raw body data
|
||||
*/
|
||||
public function __construct(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
|
||||
{
|
||||
@ -234,13 +234,13 @@ class Request
|
||||
*
|
||||
* This method also re-initializes all properties.
|
||||
*
|
||||
* @param array $query The GET parameters
|
||||
* @param array $request The POST parameters
|
||||
* @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
|
||||
* @param array $cookies The COOKIE parameters
|
||||
* @param array $files The FILES parameters
|
||||
* @param array $server The SERVER parameters
|
||||
* @param string|resource $content The raw body data
|
||||
* @param array $query The GET parameters
|
||||
* @param array $request The POST parameters
|
||||
* @param array $attributes The request attributes (parameters parsed from the PATH_INFO, ...)
|
||||
* @param array $cookies The COOKIE parameters
|
||||
* @param array $files The FILES parameters
|
||||
* @param array $server The SERVER parameters
|
||||
* @param string|resource|null $content The raw body data
|
||||
*/
|
||||
public function initialize(array $query = array(), array $request = array(), array $attributes = array(), array $cookies = array(), array $files = array(), array $server = array(), $content = null)
|
||||
{
|
||||
@ -303,13 +303,13 @@ class Request
|
||||
* The information contained in the URI always take precedence
|
||||
* over the other information (server and parameters).
|
||||
*
|
||||
* @param string $uri The URI
|
||||
* @param string $method The HTTP method
|
||||
* @param array $parameters The query (GET) or request (POST) parameters
|
||||
* @param array $cookies The request cookies ($_COOKIE)
|
||||
* @param array $files The request files ($_FILES)
|
||||
* @param array $server The server parameters ($_SERVER)
|
||||
* @param string|resource $content The raw body data
|
||||
* @param string $uri The URI
|
||||
* @param string $method The HTTP method
|
||||
* @param array $parameters The query (GET) or request (POST) parameters
|
||||
* @param array $cookies The request cookies ($_COOKIE)
|
||||
* @param array $files The request files ($_FILES)
|
||||
* @param array $server The server parameters ($_SERVER)
|
||||
* @param string|resource|null $content The raw body data
|
||||
*
|
||||
* @return static
|
||||
*/
|
||||
|
@ -448,7 +448,8 @@ class CliDumper extends AbstractDumper
|
||||
|
||||
if ('\\' === DIRECTORY_SEPARATOR) {
|
||||
static::$defaultColors = @(
|
||||
'10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
|
||||
function_exists('sapi_windows_vt100_support') && sapi_windows_vt100_support($this->outputStream)
|
||||
|| '10.0.10586' === PHP_WINDOWS_VERSION_MAJOR.'.'.PHP_WINDOWS_VERSION_MINOR.'.'.PHP_WINDOWS_VERSION_BUILD
|
||||
|| false !== getenv('ANSICON')
|
||||
|| 'ON' === getenv('ConEmuANSI')
|
||||
|| 'xterm' === getenv('TERM')
|
||||
|
Reference in New Issue
Block a user