Merge branch '2.7' into 2.8
* 2.7: fixed typo Revert "fixed typo" fixed typo fixed CS Avoid setting request attributes from signature arguments in AnnotationClassLoader [DependencyInjection] Add some missing typehints in YamlFileLoader [DependencyInjection] minor: Fix a DocBlock [HttpKernel] Give higher priority to adding request formats [FrameworkBundle] Fix third level headers for MarkdownDescriptor [TwigBundle] do not lose already set method calls #20411 fix Yaml parsing for very long quoted strings CS: apply is_null DX: remove invalid inheritdoc bumped Symfony version to 2.7.24 updated VERSION for 2.7.23 update CONTRIBUTORS for 2.7.23 updated CHANGELOG for 2.7.23 [FrameworkBundle] Skip test if xdebug.file_link_format is defined.
This commit is contained in:
Fabien Potencier
commit
a784d5c01f
|
|
@ -12,7 +12,7 @@ return PhpCsFixer\Config::create()
|
|||
->setRiskyAllowed(true)
|
||||
->setFinder(
|
||||
PhpCsFixer\Finder::create()
|
||||
->in(__DIR__)
|
||||
->in(__DIR__.'/src')
|
||||
->exclude(array(
|
||||
// directories containing files with content that is autogenerated by `var_export`, which breaks CS in output code
|
||||
'src/Symfony/Component/DependencyInjection/Tests/Fixtures',
|
||||
|
|
|
|||
|
|
@ -7,6 +7,43 @@ 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.23 (2017-01-12)
|
||||
|
||||
* bug #21218 [Form] DateTimeToLocalizedStringTransformer does not use timezone when using date only (magnetik)
|
||||
* bug #21104 [FrameworkBundle] fix IPv6 address handling in server commands (xabbuh)
|
||||
* bug #20793 [Validator] Fix caching of constraints derived from non-serializable parents (uwej711)
|
||||
* bug #19586 [TwigBundle] Fix bug where namespaced paths don't take parent bundles in account (wesleylancel)
|
||||
* bug #21237 [FrameworkBundle] Fix relative paths used as cache keys (nicolas-grekas)
|
||||
* bug #21183 [Validator] respect groups when merging constraints (xabbuh)
|
||||
* bug #21179 [TwigBundle] Fixing regression in TwigEngine exception handling (Bertalan Attila)
|
||||
* bug #21220 [DI] Fix missing new line after private alias (ogizanagi)
|
||||
* bug #21211 Classloader tmpname (lyrixx)
|
||||
* bug #21205 [TwigBundle] fixed usage when Templating is not installed (fabpot)
|
||||
* bug #21155 [Validator] Check cascasdedGroups for being countable (scaytrase)
|
||||
* bug #21200 [Filesystem] Check that directory is writable after created it in dumpFile() (chalasr)
|
||||
* bug #21113 [FrameworkBundle][HttpKernel] Fix resources loading for bundles with custom structure (chalasr)
|
||||
* bug #21084 [Yaml] handle empty lines inside unindented collection (xabbuh)
|
||||
* bug #20925 [HttpFoundation] Validate/cast cookie expire time (ro0NL)
|
||||
* bug #21032 [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService (lyrixx)
|
||||
* bug #21078 [Console] Escape default value when dumping help (lyrixx)
|
||||
* bug #21076 [Console] OS X Can't call cli_set_process_title php without superuser (ogizanagi)
|
||||
* bug #20900 [Console] Descriptors should use Helper::strlen (ogizanagi)
|
||||
* bug #21064 [Debug] Wrap call to ->log in a try catch block (lyrixx)
|
||||
* bug #21010 [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes (SpacePossum)
|
||||
* bug #20859 Avoid warning in PHP 7.2 because of non-countable data (wouterj)
|
||||
* bug #21053 [Validator] override property constraints in child class (xabbuh)
|
||||
* bug #20970 [Console] Fix question formatting using SymfonyStyle::ask() (chalasr, ogizanagi)
|
||||
* bug #20975 [Form] fix group sequence based validation (xabbuh)
|
||||
* bug #20599 [WebProfilerBundle] Display multiple HTTP headers in WDT (ro0NL)
|
||||
* bug #20799 [TwigBundle] do not try to register incomplete definitions (xabbuh)
|
||||
* bug #20961 [Validator] phpize default option values (xabbuh)
|
||||
* bug #20934 [FrameworkBundle] Fix PHP form templates on translatable attributes (ro0NL)
|
||||
* bug #20957 [FrameworkBundle] test for the Validator component to be present (xabbuh)
|
||||
* bug #20936 [DependencyInjection] Fix on-invalid attribute type in xsd (ogizanagi)
|
||||
* bug #20931 [VarDumper] Fix dumping by-ref variadics (nicolas-grekas)
|
||||
* bug #20734 [Security] AbstractVoter->supportsAttribute gives false positive if attribute is zero (0) (martynas-foodpanda)
|
||||
* bug #14082 [config] Fix issue when key removed and left value only (zerustech)
|
||||
|
||||
* 2.7.22 (2016-12-13)
|
||||
|
||||
* bug #20714 [FrameworkBundle] Fix unresolved parameters from default configs in debug:config (chalasr)
|
||||
|
|
|
|||
|
|
@ -27,18 +27,18 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Karma Dordrak (drak)
|
||||
- Lukas Kahwe Smith (lsmith)
|
||||
- Martin Hasoň (hason)
|
||||
- Jeremy Mikola (jmikola)
|
||||
- Grégoire Pineau (lyrixx)
|
||||
- Jeremy Mikola (jmikola)
|
||||
- Jean-François Simon (jfsimon)
|
||||
- Benjamin Eberlei (beberlei)
|
||||
- Igor Wiedler (igorw)
|
||||
- Eriksen Costa (eriksencosta)
|
||||
- Jules Pietri (heah)
|
||||
- Maxime Steinhausser (ogizanagi)
|
||||
- Jules Pietri (heah)
|
||||
- Robin Chalas (chalas_r)
|
||||
- Sarah Khalil (saro0h)
|
||||
- Jonathan Wage (jwage)
|
||||
- Diego Saint Esteben (dosten)
|
||||
- Robin Chalas (chalas_r)
|
||||
- Alexandre Salomé (alexandresalome)
|
||||
- William Durand (couac)
|
||||
- ornicar
|
||||
|
|
@ -49,11 +49,12 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Saša Stamenković (umpirsky)
|
||||
- Henrik Bjørnskov (henrikbjorn)
|
||||
- Miha Vrhovnik
|
||||
- Diego Saint Esteben (dii3g0)
|
||||
- Ener-Getick (energetick)
|
||||
- Diego Saint Esteben (dii3g0)
|
||||
- Konstantin Kudryashov (everzet)
|
||||
- Bilal Amarni (bamarni)
|
||||
- Iltar van der Berg (kjarli)
|
||||
- Roland Franssen (ro0)
|
||||
- Bilal Amarni (bamarni)
|
||||
- Florin Patan (florinpatan)
|
||||
- Peter Rehm (rpet)
|
||||
- Kevin Bond (kbond)
|
||||
|
|
@ -69,19 +70,18 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Henrik Westphal (snc)
|
||||
- Dariusz Górecki (canni)
|
||||
- Douglas Greenshields (shieldo)
|
||||
- Titouan Galopin (tgalopin)
|
||||
- Konstantin Myakshin (koc)
|
||||
- Lee McDermott
|
||||
- Brandon Turner
|
||||
- Luis Cordova (cordoval)
|
||||
- Graham Campbell (graham)
|
||||
- Titouan Galopin (tgalopin)
|
||||
- Daniel Holmes (dholmes)
|
||||
- Pierre du Plessis (pierredup)
|
||||
- Toni Uebernickel (havvg)
|
||||
- Bart van den Burg (burgov)
|
||||
- Jordan Alliot (jalliot)
|
||||
- John Wards (johnwards)
|
||||
- Roland Franssen (ro0)
|
||||
- Fran Moreno (franmomu)
|
||||
- Jáchym Toušek (enumag)
|
||||
- Antoine Hérault (herzult)
|
||||
|
|
@ -98,6 +98,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- lenar
|
||||
- Włodzimierz Gajda (gajdaw)
|
||||
- Baptiste Clavié (talus)
|
||||
- Maxime STEINHAUSSER
|
||||
- Alexander Schwenn (xelaris)
|
||||
- Florian Voutzinos (florianv)
|
||||
- Colin Frei
|
||||
|
|
@ -114,13 +115,13 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Eric GELOEN (gelo)
|
||||
- David Buchmann (dbu)
|
||||
- Tugdual Saunier (tucksaun)
|
||||
- Maxime STEINHAUSSER
|
||||
- Théo FIDRY (theofidry)
|
||||
- Robert Schönthal (digitalkaoz)
|
||||
- Florian Lonqueu-Brochard (florianlb)
|
||||
- Stefano Sala (stefano.sala)
|
||||
- Evgeniy (ewgraf)
|
||||
- Juti Noppornpitak (shiroyuki)
|
||||
- Tobias Nyholm (tobias)
|
||||
- Tigran Azatyan (tigranazatyan)
|
||||
- Sebastian Hörl (blogsh)
|
||||
- Daniel Gomes (danielcsgomes)
|
||||
|
|
@ -130,12 +131,11 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Pablo Godel (pgodel)
|
||||
- Jérémie Augustin (jaugustin)
|
||||
- Andréia Bohner (andreia)
|
||||
- Yonel Ceruto González (yonelceruto)
|
||||
- Rafael Dohms (rdohms)
|
||||
- Arnaud Kleinpeter (nanocom)
|
||||
- jwdeitch
|
||||
- Tobias Nyholm (tobias)
|
||||
- Joel Wurtz (brouznouf)
|
||||
- Yonel Ceruto González (yonelceruto)
|
||||
- Philipp Wahala (hifi)
|
||||
- Vyacheslav Pavlov
|
||||
- Javier Spagnoletti (phansys)
|
||||
|
|
@ -179,6 +179,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- fivestar
|
||||
- Dominique Bongiraud
|
||||
- Jeremy Livingston (jeremylivingston)
|
||||
- Michael Lee (zerustech)
|
||||
- Matthieu Auger (matthieuauger)
|
||||
- Leszek Prabucki (l3l0)
|
||||
- François Zaninotto (fzaninotto)
|
||||
|
|
@ -187,6 +188,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- John Kary (johnkary)
|
||||
- Justin Hileman (bobthecow)
|
||||
- Blanchon Vincent (blanchonvincent)
|
||||
- Chris Wilkinson (thewilkybarkid)
|
||||
- Michele Orselli (orso)
|
||||
- Tom Van Looy (tvlooy)
|
||||
- Sven Paulus (subsven)
|
||||
|
|
@ -195,6 +197,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Dawid Nowak
|
||||
- Eugene Wissner
|
||||
- Julien Brochet (mewt)
|
||||
- Tristan Darricau (nicofuma)
|
||||
- Sergey Linnik (linniksa)
|
||||
- Michaël Perrin (michael.perrin)
|
||||
- Marcel Beerta (mazen)
|
||||
|
|
@ -202,7 +205,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Jannik Zschiesche (apfelbox)
|
||||
- Marco Pivetta (ocramius)
|
||||
- julien pauli (jpauli)
|
||||
- Michael Lee (zerustech)
|
||||
- Lorenz Schori
|
||||
- Sébastien Lavoie (lavoiesl)
|
||||
- Francois Zaninotto
|
||||
|
|
@ -216,20 +218,20 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Roman Marintšenko (inori)
|
||||
- Christian Schmidt
|
||||
- Xavier Montaña Carreras (xmontana)
|
||||
- Chris Wilkinson (thewilkybarkid)
|
||||
- Mickaël Andrieu (mickaelandrieu)
|
||||
- Xavier Perez
|
||||
- Arjen Brouwer (arjenjb)
|
||||
- Katsuhiro OGAWA
|
||||
- Patrick McDougle (patrick-mcdougle)
|
||||
- James Halsall (jaitsu)
|
||||
- Alif Rachmawadi
|
||||
- Kristen Gilden (kgilden)
|
||||
- SpacePossum
|
||||
- Pierre-Yves LEBECQ (pylebecq)
|
||||
- Alex Pott
|
||||
- Jakub Kucharovic (jkucharovic)
|
||||
- Eugene Leonovich (rybakit)
|
||||
- Filippo Tessarotto
|
||||
- Tristan Darricau (nicofuma)
|
||||
- Joseph Rouff (rouffj)
|
||||
- Félix Labrecque (woodspire)
|
||||
- GordonsLondon
|
||||
|
|
@ -259,7 +261,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Peter Kruithof (pkruithof)
|
||||
- Michael Holm (hollo)
|
||||
- Marc Weistroff (futurecat)
|
||||
- SpacePossum
|
||||
- Hidde Wieringa (hiddewie)
|
||||
- Chris Smith (cs278)
|
||||
- Florian Klein (docteurklein)
|
||||
|
|
@ -278,12 +279,14 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Ismael Ambrosi (iambrosi)
|
||||
- Uwe Jäger (uwej711)
|
||||
- Aurelijus Valeiša (aurelijus)
|
||||
- Victor Bocharsky (bocharsky_bw)
|
||||
- Jan Decavele (jandc)
|
||||
- Gustavo Piltcher
|
||||
- Stepan Tanasiychuk (stfalcon)
|
||||
- Tiago Ribeiro (fixe)
|
||||
- Hidde Boomsma (hboomsma)
|
||||
- John Bafford (jbafford)
|
||||
- Pavel Batanov (scaytrase)
|
||||
- Bob den Otter (bopp)
|
||||
- Adrian Rudnik (kreischweide)
|
||||
- Francesc Rosàs (frosas)
|
||||
|
|
@ -304,6 +307,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Matthew Lewinski (lewinski)
|
||||
- Magnus Nordlander (magnusnordlander)
|
||||
- alquerci
|
||||
- Adam Prager (padam87)
|
||||
- Francesco Levorato
|
||||
- Vitaliy Zakharov (zakharovvi)
|
||||
- Tobias Sjösten (tobiassjosten)
|
||||
|
|
@ -324,6 +328,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Clément Gautier (clementgautier)
|
||||
- Eduardo Gulias (egulias)
|
||||
- giulio de donato (liuggio)
|
||||
- ShinDarth
|
||||
- Stéphane PY (steph_py)
|
||||
- Philipp Kräutli (pkraeutli)
|
||||
- Kirill chEbba Chebunin (chebba)
|
||||
|
|
@ -336,9 +341,9 @@ 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)
|
||||
- Nicolas Dewez (nicolas_dewez)
|
||||
- Endre Fejes
|
||||
- Victor Bocharsky (bocharsky_bw)
|
||||
- Tobias Naumann (tna)
|
||||
- Daniel Beyer
|
||||
- Shein Alexey
|
||||
|
|
@ -355,7 +360,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Xavier HAUSHERR
|
||||
- Albert Jessurum (ajessu)
|
||||
- Laszlo Korte
|
||||
- Pavel Batanov (scaytrase)
|
||||
- Miha Vrhovnik
|
||||
- Alessandro Desantis
|
||||
- hubert lecorche (hlecorche)
|
||||
|
|
@ -412,6 +416,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- boombatower
|
||||
- Fabrice Bernhard (fabriceb)
|
||||
- Jérôme Macias (jeromemacias)
|
||||
- Andrey Astakhov (aast)
|
||||
- Fabian Lange (codingfabian)
|
||||
- Frank Neff (fneff)
|
||||
- Roman Lapin (memphys)
|
||||
|
|
@ -422,6 +427,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Pablo Díez (pablodip)
|
||||
- Kevin McBride
|
||||
- Sergio Santoro
|
||||
- Robin van der Vleuten (robinvdvleuten)
|
||||
- Philipp Rieber (bicpi)
|
||||
- Manuel de Ruiter (manuel)
|
||||
- Eduardo Oliveira (entering)
|
||||
|
|
@ -478,7 +484,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Alexander Deruwe (aderuwe)
|
||||
- Alain Hippolyte (aloneh)
|
||||
- Dave Hulbert (dave1010)
|
||||
- François Pluchino (francoispluchino)
|
||||
- Ivan Rey (ivanrey)
|
||||
- Marcin Chyłek (songoq)
|
||||
- Ned Schwartz
|
||||
|
|
@ -512,6 +517,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Konstantin S. M. Möllers (ksmmoellers)
|
||||
- Sinan Eldem
|
||||
- Alexandre Dupuy (satchette)
|
||||
- Rob Frawley 2nd
|
||||
- Nahuel Cuesta (ncuesta)
|
||||
- Chris Boden (cboden)
|
||||
- Asmir Mustafic (goetas)
|
||||
|
|
@ -522,6 +528,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Åsmund Garfors
|
||||
- Maxime Douailin
|
||||
- Jean Pasdeloup (pasdeloup)
|
||||
- Benjamin Cremer (bcremer)
|
||||
- Javier López (loalf)
|
||||
- Andreas Braun
|
||||
- Reinier Kip
|
||||
|
|
@ -551,7 +558,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- umpirski
|
||||
- Chris Heng (gigablah)
|
||||
- Ulumuddin Yunus (joenoez)
|
||||
- Adam Prager (padam87)
|
||||
- Luc Vieillescazes (iamluc)
|
||||
- Johann Saunier (prophet777)
|
||||
- Samuel ROZE (sroze)
|
||||
|
|
@ -586,6 +592,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- develop
|
||||
- ReenExe
|
||||
- Mark Sonnabaum
|
||||
- Thomas Royer (cydonia7)
|
||||
- Richard Quadling
|
||||
- jochenvdv
|
||||
- Arturas Smorgun (asarturas)
|
||||
|
|
@ -593,6 +600,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Michael Piecko
|
||||
- yclian
|
||||
- twifty
|
||||
- Indra Gunawan (guind)
|
||||
- Peter Ward
|
||||
- Julien DIDIER (juliendidier)
|
||||
- Dominik Ritter (dritter)
|
||||
|
|
@ -600,10 +608,10 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Martin Hujer (martinhujer)
|
||||
- Pascal Helfenstein
|
||||
- Baldur Rensch (brensch)
|
||||
- Thomas Calvet
|
||||
- Vladyslav Petrovych
|
||||
- Alex Xandra Albert Sim
|
||||
- Carson Full
|
||||
- Andrey Astakhov (aast)
|
||||
- Trent Steel (trsteel88)
|
||||
- Yuen-Chi Lian
|
||||
- Besnik Br
|
||||
|
|
@ -630,11 +638,13 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Christian Soronellas (theunic)
|
||||
- Romain Gautier (mykiwi)
|
||||
- Yosmany Garcia (yosmanyga)
|
||||
- Wouter J
|
||||
- Wouter de Wild
|
||||
- Miroslav Sustek
|
||||
- Degory Valentine
|
||||
- Benoit Lévêque (benoit_leveque)
|
||||
- Jeroen Fiege (fieg)
|
||||
- Arthur de Moulins (4rthem)
|
||||
- Krzysiek Łabuś
|
||||
- Xavier Lacot (xavier)
|
||||
- possum
|
||||
|
|
@ -642,6 +652,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Olivier Maisonneuve (olineuve)
|
||||
- Masterklavi
|
||||
- Francis Turmel (fturmel)
|
||||
- Nikita Nefedov (nikita2206)
|
||||
- cgonzalez
|
||||
- Ben
|
||||
- Jayson Xu (superjavason)
|
||||
|
|
@ -683,8 +694,10 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Ivan Menshykov
|
||||
- David Romaní
|
||||
- Patrick Allaert
|
||||
- Fabien Bourigault (fbourigault)
|
||||
- Gustavo Falco (gfalco)
|
||||
- Matt Robinson (inanimatt)
|
||||
- Ruud Kamphuis (ruudk)
|
||||
- Aleksey Podskrebyshev
|
||||
- Calin Mihai Pristavu
|
||||
- David Marín Carreño (davefx)
|
||||
|
|
@ -734,7 +747,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Mikhail Yurasov (mym)
|
||||
- LOUARDI Abdeltif (ouardisoft)
|
||||
- Robert Gruendler (pulse00)
|
||||
- Robin van der Vleuten (robinvdvleuten)
|
||||
- Simon Terrien (sterrien)
|
||||
- Benoît Merlet (trompette)
|
||||
- Koen Kuipers
|
||||
|
|
@ -763,6 +775,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Colin O'Dell (colinodell)
|
||||
- xaav
|
||||
- Mahmoud Mostafa (mahmoud)
|
||||
- Alessandro Lai
|
||||
- Pieter
|
||||
- Michael Tibben
|
||||
- Sander Marechal
|
||||
|
|
@ -811,8 +824,10 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Nicolas Macherey
|
||||
- Lin Clark
|
||||
- Jeremy David (jeremy.david)
|
||||
- Denis Brumann (dbrumann)
|
||||
- Troy McCabe
|
||||
- Ville Mattila
|
||||
- ilyes kooli
|
||||
- Boris Vujicic (boris.vujicic)
|
||||
- Max Beutel
|
||||
- Antanas Arvasevicius
|
||||
|
|
@ -832,6 +847,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Christian
|
||||
- Sergii Smertin (nfx)
|
||||
- hugofonseca (fonsecas72)
|
||||
- Martynas Narbutas
|
||||
- Bailey Parker
|
||||
- Eddie Jaoude
|
||||
- Haritz Iturbe (hizai)
|
||||
|
|
@ -846,7 +862,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Alex Demchenko (pilot)
|
||||
- Tadas Gliaubicas (tadcka)
|
||||
- Benoit Garret
|
||||
- Thomas Royer (cydonia7)
|
||||
- DerManoMann
|
||||
- Olaf Klischat
|
||||
- orlovv
|
||||
|
|
@ -867,7 +882,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- rpg600
|
||||
- Péter Buri (burci)
|
||||
- Davide Borsatto (davide.borsatto)
|
||||
- Indra Gunawan (guind)
|
||||
- kaiwa
|
||||
- Charles Sanquer (csanquer)
|
||||
- Albert Ganiev (helios-ag)
|
||||
|
|
@ -909,6 +923,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Krzysztof Przybyszewski
|
||||
- Paul Matthews
|
||||
- Juan Traverso
|
||||
- Tarjei Huse (tarjei)
|
||||
- Philipp Strube
|
||||
- Christian Sciberras
|
||||
- Clement Herreman (clemherreman)
|
||||
|
|
@ -919,7 +934,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Alberto Aldegheri
|
||||
- heccjj
|
||||
- Alexandre Melard
|
||||
- Thomas Calvet
|
||||
- Sergey Yuferev
|
||||
- Tobias Stöckler
|
||||
- Mario Young
|
||||
|
|
@ -973,6 +987,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Samuel Vogel (samuelvogel)
|
||||
- Berat Doğan
|
||||
- Juanmi Rodriguez Cerón
|
||||
- Andy Raines
|
||||
- Anthony Ferrara
|
||||
- Klaas Cuvelier (kcuvelier)
|
||||
- Steve Frécinaux
|
||||
|
|
@ -998,6 +1013,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Alberto Pirovano (geezmo)
|
||||
- Pete Mitchell (peterjmit)
|
||||
- Tom Corrigan (tomcorrigan)
|
||||
- Luis Galeas
|
||||
- Martin Pärtel
|
||||
- Noah Heck (myesain)
|
||||
- Patrick Daley (padrig)
|
||||
|
|
@ -1014,7 +1030,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Romain Geissler
|
||||
- Adrien Moiruad
|
||||
- Tomaz Ahlin
|
||||
- Benjamin Cremer (bcremer)
|
||||
- Marcus Stöhr (dafish)
|
||||
- Emmanuel Vella (emmanuel.vella)
|
||||
- Carsten Nielsen (phreaknerd)
|
||||
|
|
@ -1036,6 +1051,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Damien Tournoud
|
||||
- Jon Gotlin (jongotlin)
|
||||
- Michael Dowling (mtdowling)
|
||||
- Karlos Presumido (oneko)
|
||||
- BilgeXA
|
||||
- r1pp3rj4ck
|
||||
- Robert Queck
|
||||
|
|
@ -1073,7 +1089,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- kor3k kor3k (kor3k)
|
||||
- Stelian Mocanita (stelian)
|
||||
- Flavian (2much)
|
||||
- Arthur de Moulins (4rthem)
|
||||
- mike
|
||||
- Keith Maika
|
||||
- Mephistofeles
|
||||
|
|
@ -1164,6 +1179,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Julius Beckmann
|
||||
- Romain Dorgueil
|
||||
- Grayson Koonce (breerly)
|
||||
- Fabien LUCAS (flucas2)
|
||||
- Karim Cassam Chenaï (ka)
|
||||
- Nicolas Bastien (nicolas_bastien)
|
||||
- Denis (yethee)
|
||||
|
|
@ -1212,7 +1228,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Bram Van der Sype (brammm)
|
||||
- Guile (guile)
|
||||
- Julien Moulin (lizjulien)
|
||||
- Nikita Nefedov (nikita2206)
|
||||
- Mauro Foti (skler)
|
||||
- Yannick Warnier (ywarnier)
|
||||
- Kevin Decherf
|
||||
|
|
@ -1235,7 +1250,9 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Tischoi
|
||||
- J Bruni
|
||||
- Alexey Prilipko
|
||||
- vlakoff
|
||||
- bertillon
|
||||
- Bertalan Attila
|
||||
- Yannick Bensacq (cibou)
|
||||
- Luca Genuzio (genuzio)
|
||||
- Hans Nilsson (hansnilsson)
|
||||
|
|
@ -1254,7 +1271,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Joel Marcey
|
||||
- David Christmann
|
||||
- root
|
||||
- Wouter J
|
||||
- James Hudson
|
||||
- Tom Maguire
|
||||
- David Zuelke
|
||||
|
|
@ -1309,9 +1325,9 @@ Symfony is the result of the work of many people who made the code better
|
|||
- ddebree
|
||||
- Tomas Liubinas
|
||||
- Alex
|
||||
- Patrick Dawkins
|
||||
- Klaas Naaijkens
|
||||
- Daniel González Cerviño
|
||||
- ShinDarth
|
||||
- Rafał
|
||||
- Adria Lopez (adlpz)
|
||||
- Rosio (ben-rosio)
|
||||
|
|
@ -1338,9 +1354,9 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Michael Pohlers (mick_the_big)
|
||||
- Cayetano Soriano Gallego (neoshadybeat)
|
||||
- Ondrej Machulda (ondram)
|
||||
- Patrick McDougle (patrick-mcdougle)
|
||||
- Pablo Monterde Perez (plebs)
|
||||
- Jimmy Leger (redpanda)
|
||||
- Marcin Szepczynski (szepczynski)
|
||||
- Cyrille Jouineau (tuxosaurus)
|
||||
- Yorkie Chadwick (yorkie76)
|
||||
- Yanick Witschi
|
||||
|
|
@ -1363,6 +1379,7 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Arnaud Buathier (arnapou)
|
||||
- chesteroni (chesteroni)
|
||||
- Mauricio Lopez (diaspar)
|
||||
- HADJEDJ Vincent (hadjedjvincent)
|
||||
- Daniele Cesarini (ijanki)
|
||||
- Ismail Asci (ismailasci)
|
||||
- Simon CONSTANS (kosssi)
|
||||
|
|
@ -1505,7 +1522,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Damián Nohales (eagleoneraptor)
|
||||
- Elliot Anderson (elliot)
|
||||
- Fabien D. (fabd)
|
||||
- Fabien Bourigault (fbourigault)
|
||||
- Carsten Eilers (fnc)
|
||||
- Sorin Gitlan (forapathy)
|
||||
- Yohan Giarelli (frequence-web)
|
||||
|
|
@ -1549,7 +1565,6 @@ Symfony is the result of the work of many people who made the code better
|
|||
- Daniel Perez Pinazo (pitiflautico)
|
||||
- Brayden Williams (redstar504)
|
||||
- Rich Sage (richsage)
|
||||
- Ruud Kamphuis (ruudk)
|
||||
- Bart Ruysseveldt (ruyss)
|
||||
- Sascha Dens (saschadens)
|
||||
- scourgen hung (scourgen)
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ class DeprecationErrorHandler
|
|||
return "\x1B[{$color}m{$str}\x1B[0m";
|
||||
};
|
||||
} else {
|
||||
$colorize = function ($str) {return $str;};
|
||||
$colorize = function ($str) { return $str; };
|
||||
}
|
||||
register_shutdown_function(function () use ($getMode, &$deprecations, $deprecationHandler, $colorize) {
|
||||
$mode = $getMode();
|
||||
|
|
@ -151,7 +151,7 @@ class DeprecationErrorHandler
|
|||
restore_error_handler();
|
||||
|
||||
if (DeprecationErrorHandler::MODE_WEAK === $mode) {
|
||||
$colorize = function ($str) {return $str;};
|
||||
$colorize = function ($str) { return $str; };
|
||||
}
|
||||
if ($currErrorHandler !== $deprecationHandler) {
|
||||
echo "\n", $colorize('THE ERROR HANDLER HAS CHANGED!', true), "\n";
|
||||
|
|
|
|||
|
|
@ -125,9 +125,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
|
|||
unset($this->valueHolder5157dd96e88c0->$name);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function __clone()
|
||||
{
|
||||
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());
|
||||
|
|
@ -135,9 +132,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
|
|||
$this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function __sleep()
|
||||
{
|
||||
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());
|
||||
|
|
@ -145,9 +139,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
|
|||
return array('valueHolder5157dd96e88c0');
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function __wakeup()
|
||||
{
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,9 +120,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
|
|||
unset($this->valueHolder5157dd96e88c0->$name);
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function __clone()
|
||||
{
|
||||
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__clone', array());
|
||||
|
|
@ -130,9 +127,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
|
|||
$this->valueHolder5157dd96e88c0 = clone $this->valueHolder5157dd96e88c0;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function __sleep()
|
||||
{
|
||||
$this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, '__sleep', array());
|
||||
|
|
@ -140,9 +134,6 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
|
|||
return array('valueHolder5157dd96e88c0');
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
public function __wakeup()
|
||||
{
|
||||
}
|
||||
|
|
@ -166,7 +157,7 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
|
|||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function initializeProxy() : bool
|
||||
public function initializeProxy(): bool
|
||||
{
|
||||
return $this->initializer5157dd96e8924 && $this->initializer5157dd96e8924->__invoke($this->valueHolder5157dd96e88c0, $this, 'initializeProxy', array());
|
||||
}
|
||||
|
|
@ -174,7 +165,7 @@ class stdClass_c1d194250ee2e2b7d2eab8b8212368a8 extends \stdClass implements \Pr
|
|||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function isProxyInitialized() : bool
|
||||
public function isProxyInitialized(): bool
|
||||
{
|
||||
return null !== $this->valueHolder5157dd96e88c0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -140,7 +140,7 @@ EOF
|
|||
}
|
||||
if ($type === 'functions' || $type === 'filters') {
|
||||
$cb = $entity->getCallable();
|
||||
if (is_null($cb)) {
|
||||
if (null === $cb) {
|
||||
return;
|
||||
}
|
||||
if (is_array($cb)) {
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class DumpExtensionTest extends \PHPUnit_Framework_TestCase
|
|||
|
||||
$dumped = null;
|
||||
$exception = null;
|
||||
$prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) {$dumped = $var;});
|
||||
$prevDumper = VarDumper::setHandler(function ($var) use (&$dumped) { $dumped = $var; });
|
||||
|
||||
try {
|
||||
$this->assertEquals($expectedOutput, $twig->render('template'));
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ class MarkdownDescriptor extends Descriptor
|
|||
}
|
||||
}
|
||||
|
||||
$this->write(isset($options['id']) ? sprintf("%s\n%s\n\n%s\n", $options['id'], str_repeat('~', strlen($options['id'])), $output) : $output);
|
||||
$this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -256,7 +256,7 @@ class MarkdownDescriptor extends Descriptor
|
|||
$output = '- Service: `'.$alias.'`'
|
||||
."\n".'- Public: '.($alias->isPublic() ? 'yes' : 'no');
|
||||
|
||||
$this->write(isset($options['id']) ? sprintf("%s\n%s\n\n%s\n", $options['id'], str_repeat('~', strlen($options['id'])), $output) : $output);
|
||||
$this->write(isset($options['id']) ? sprintf("### %s\n\n%s\n", $options['id'], $output) : $output);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -326,6 +326,10 @@ abstract class FrameworkExtensionTest extends TestCase
|
|||
|
||||
public function testFileLinkFormat()
|
||||
{
|
||||
if (ini_get('xdebug.file_link_format') || get_cfg_var('xdebug.file_link_format')) {
|
||||
$this->markTestSkipped('A custom file_link_format is defined.');
|
||||
}
|
||||
|
||||
$container = $this->createContainerFromFile('full');
|
||||
|
||||
$this->assertEquals('file%link%format', $container->getParameter('templating.helper.code.file_link_format'));
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@ Public services
|
|||
Definitions
|
||||
-----------
|
||||
|
||||
definition_1
|
||||
~~~~~~~~~~~~
|
||||
### definition_1
|
||||
|
||||
- Class: `Full\Qualified\Class1`
|
||||
- Scope: `container`
|
||||
|
|
@ -23,14 +22,12 @@ definition_1
|
|||
Aliases
|
||||
-------
|
||||
|
||||
alias_1
|
||||
~~~~~~~
|
||||
### alias_1
|
||||
|
||||
- Service: `service_1`
|
||||
- Public: yes
|
||||
|
||||
alias_2
|
||||
~~~~~~~
|
||||
### alias_2
|
||||
|
||||
- Service: `service_2`
|
||||
- Public: no
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@ Public and private services
|
|||
Definitions
|
||||
-----------
|
||||
|
||||
definition_1
|
||||
~~~~~~~~~~~~
|
||||
### definition_1
|
||||
|
||||
- Class: `Full\Qualified\Class1`
|
||||
- Scope: `container`
|
||||
|
|
@ -19,8 +18,7 @@ definition_1
|
|||
- Factory Class: `Full\Qualified\FactoryClass`
|
||||
- Factory Method: `get`
|
||||
|
||||
definition_2
|
||||
~~~~~~~~~~~~
|
||||
### definition_2
|
||||
|
||||
- Class: `Full\Qualified\Class2`
|
||||
- Scope: `container`
|
||||
|
|
@ -45,14 +43,12 @@ definition_2
|
|||
Aliases
|
||||
-------
|
||||
|
||||
alias_1
|
||||
~~~~~~~
|
||||
### alias_1
|
||||
|
||||
- Service: `service_1`
|
||||
- Public: yes
|
||||
|
||||
alias_2
|
||||
~~~~~~~
|
||||
### alias_2
|
||||
|
||||
- Service: `service_2`
|
||||
- Public: no
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@ Public and private services with tag `tag1`
|
|||
Definitions
|
||||
-----------
|
||||
|
||||
definition_2
|
||||
~~~~~~~~~~~~
|
||||
### definition_2
|
||||
|
||||
- Class: `Full\Qualified\Class2`
|
||||
- Scope: `container`
|
||||
|
|
|
|||
|
|
@ -4,8 +4,7 @@ Container tags
|
|||
tag1
|
||||
----
|
||||
|
||||
definition_2
|
||||
~~~~~~~~~~~~
|
||||
### definition_2
|
||||
|
||||
- Class: `Full\Qualified\Class2`
|
||||
- Scope: `container`
|
||||
|
|
@ -24,8 +23,7 @@ definition_2
|
|||
tag2
|
||||
----
|
||||
|
||||
definition_2
|
||||
~~~~~~~~~~~~
|
||||
### definition_2
|
||||
|
||||
- Class: `Full\Qualified\Class2`
|
||||
- Scope: `container`
|
||||
|
|
|
|||
|
|
@ -413,11 +413,11 @@ class MainConfiguration implements ConfigurationInterface
|
|||
|
||||
$providerNodeBuilder
|
||||
->validate()
|
||||
->ifTrue(function ($v) {return count($v) > 1;})
|
||||
->ifTrue(function ($v) { return count($v) > 1; })
|
||||
->thenInvalid('You cannot set multiple provider types for the same provider')
|
||||
->end()
|
||||
->validate()
|
||||
->ifTrue(function ($v) {return count($v) === 0;})
|
||||
->ifTrue(function ($v) { return count($v) === 0; })
|
||||
->thenInvalid('You must set a provider definition for the provider.')
|
||||
->end()
|
||||
;
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ class ExtensionPass implements CompilerPassInterface
|
|||
$twigLoader = $container->getDefinition('twig.loader.native_filesystem');
|
||||
if ($container->has('templating')) {
|
||||
$loader = $container->getDefinition('twig.loader.filesystem');
|
||||
$loader->setMethodCalls($twigLoader->getMethodCalls());
|
||||
$loader->setMethodCalls(array_merge($twigLoader->getMethodCalls(), $loader->getMethodCalls()));
|
||||
|
||||
$twigLoader->clearTag('twig.loader');
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,41 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* This file is part of the Symfony package.
|
||||
*
|
||||
* (c) Fabien Potencier <fabien@symfony.com>
|
||||
*
|
||||
* For the full copyright and license information, please view the LICENSE
|
||||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
namespace Symfony\Bundle\TwigBundle\Tests\DependencyInjection\Compiler;
|
||||
|
||||
use Symfony\Bundle\TwigBundle\DependencyInjection\Compiler\ExtensionPass;
|
||||
use Symfony\Component\DependencyInjection\ContainerBuilder;
|
||||
use Symfony\Component\DependencyInjection\Definition;
|
||||
|
||||
class ExtensionPassTest extends \PHPUnit_Framework_TestCase
|
||||
{
|
||||
public function testProcessDoesNotDropExistingFileLoaderMethodCalls()
|
||||
{
|
||||
$container = new ContainerBuilder();
|
||||
$container->setParameter('kernel.debug', false);
|
||||
|
||||
$container->register('twig.app_variable', '\Symfony\Bridge\Twig\AppVariable');
|
||||
$container->register('templating', '\Symfony\Bundle\TwigBundle\TwigEngine');
|
||||
|
||||
$nativeTwigLoader = new Definition('\Twig_Loader_Filesystem');
|
||||
$nativeTwigLoader->addMethodCall('addPath', array());
|
||||
$container->setDefinition('twig.loader.native_filesystem', $nativeTwigLoader);
|
||||
|
||||
$filesystemLoader = new Definition('\Symfony\Bundle\TwigBundle\Loader\FilesystemLoader');
|
||||
$filesystemLoader->addMethodCall('addPath', array());
|
||||
$container->setDefinition('twig.loader.filesystem', $filesystemLoader);
|
||||
|
||||
$extensionPass = new ExtensionPass();
|
||||
$extensionPass->process($container);
|
||||
|
||||
$this->assertCount(2, $filesystemLoader->getMethodCalls());
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
* foo
|
||||
*/
|
||||
|
||||
declare (strict_types = 1);
|
||||
declare(strict_types=1);
|
||||
|
||||
namespace Namespaced;
|
||||
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ class ClassNotFoundFatalErrorHandler implements FatalErrorHandlerInterface
|
|||
);
|
||||
|
||||
if ($prefix) {
|
||||
$candidates = array_filter($candidates, function ($candidate) use ($prefix) {return 0 === strpos($candidate, $prefix);});
|
||||
$candidates = array_filter($candidates, function ($candidate) use ($prefix) { return 0 === strpos($candidate, $prefix); });
|
||||
}
|
||||
|
||||
// We cannot use the autoloader here as most of them use require; but if the class
|
||||
|
|
|
|||
|
|
@ -164,7 +164,7 @@ class Definition
|
|||
}
|
||||
|
||||
/**
|
||||
* Gets the service that decorates this service.
|
||||
* Gets the service that this service is decorating.
|
||||
*
|
||||
* @return null|array An array composed of the decorated service id, the new id for it and the priority of decoration, null if no service is decorated
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ class YamlFileLoader extends FileLoader
|
|||
* @param array $content
|
||||
* @param string $file
|
||||
*/
|
||||
private function parseImports($content, $file)
|
||||
private function parseImports(array $content, $file)
|
||||
{
|
||||
if (!isset($content['imports'])) {
|
||||
return;
|
||||
|
|
@ -112,7 +112,7 @@ class YamlFileLoader extends FileLoader
|
|||
* @param array $content
|
||||
* @param string $file
|
||||
*/
|
||||
private function parseDefinitions($content, $file)
|
||||
private function parseDefinitions(array $content, $file)
|
||||
{
|
||||
if (!isset($content['services'])) {
|
||||
return;
|
||||
|
|
@ -130,9 +130,9 @@ class YamlFileLoader extends FileLoader
|
|||
/**
|
||||
* Parses a definition.
|
||||
*
|
||||
* @param string $id
|
||||
* @param array $service
|
||||
* @param string $file
|
||||
* @param string $id
|
||||
* @param array|string $service
|
||||
* @param string $file
|
||||
*
|
||||
* @throws InvalidArgumentException When tags are invalid
|
||||
*/
|
||||
|
|
@ -454,7 +454,7 @@ class YamlFileLoader extends FileLoader
|
|||
*
|
||||
* @param array $content
|
||||
*/
|
||||
private function loadFromExtensions($content)
|
||||
private function loadFromExtensions(array $content)
|
||||
{
|
||||
foreach ($content as $namespace => $values) {
|
||||
if (in_array($namespace, array('imports', 'parameters', 'services'))) {
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ class Crawler extends \SplObjectStorage
|
|||
$dom = new \DOMDocument('1.0', $charset);
|
||||
$dom->validateOnParse = true;
|
||||
|
||||
set_error_handler(function () {throw new \Exception();});
|
||||
set_error_handler(function () { throw new \Exception(); });
|
||||
|
||||
try {
|
||||
// Convert charset to HTML-entities to work around bugs in DOMDocument::loadHTML()
|
||||
|
|
|
|||
|
|
@ -52,6 +52,6 @@ class AddRequestFormatsListener implements EventSubscriberInterface
|
|||
*/
|
||||
public static function getSubscribedEvents()
|
||||
{
|
||||
return array(KernelEvents::REQUEST => 'onKernelRequest');
|
||||
return array(KernelEvents::REQUEST => array('onKernelRequest', 1));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ class AddRequestFormatsListenerTest extends \PHPUnit_Framework_TestCase
|
|||
public function testRegisteredEvent()
|
||||
{
|
||||
$this->assertEquals(
|
||||
array(KernelEvents::REQUEST => 'onKernelRequest'),
|
||||
array(KernelEvents::REQUEST => array('onKernelRequest', 1)),
|
||||
AddRequestFormatsListener::getSubscribedEvents()
|
||||
);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,9 +42,6 @@ abstract class AbstractDataGenerator
|
|||
$this->dirName = $dirName;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function generateData(GeneratorConfig $config)
|
||||
{
|
||||
$filesystem = new Filesystem();
|
||||
|
|
|
|||
|
|
@ -57,9 +57,6 @@ class LocaleDataGenerator
|
|||
$this->regionDataProvider = $regionDataProvider;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function generateData(GeneratorConfig $config)
|
||||
{
|
||||
$filesystem = new Filesystem();
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
* file that was distributed with this source code.
|
||||
*/
|
||||
|
||||
pcntl_signal(SIGUSR1, function () {echo 'SIGUSR1'; exit;});
|
||||
pcntl_signal(SIGUSR1, function () { echo 'SIGUSR1'; exit; });
|
||||
|
||||
echo 'Caught ';
|
||||
|
||||
|
|
|
|||
|
|
@ -138,11 +138,6 @@ abstract class AnnotationClassLoader implements LoaderInterface
|
|||
}
|
||||
|
||||
$defaults = array_replace($globals['defaults'], $annot->getDefaults());
|
||||
foreach ($method->getParameters() as $param) {
|
||||
if (!isset($defaults[$param->getName()]) && $param->isDefaultValueAvailable()) {
|
||||
$defaults[$param->getName()] = $param->getDefaultValue();
|
||||
}
|
||||
}
|
||||
$requirements = array_replace($globals['requirements'], $annot->getRequirements());
|
||||
$options = array_replace($globals['options'], $annot->getOptions());
|
||||
$schemes = array_merge($globals['schemes'], $annot->getSchemes());
|
||||
|
|
|
|||
|
|
@ -136,11 +136,10 @@ class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
|
|||
array_intersect_assoc($routeData['options'], $route->getOptions()),
|
||||
'->load preserves options annotation'
|
||||
);
|
||||
$defaults = array_replace($methodArgs, $routeData['defaults']);
|
||||
$this->assertCount(
|
||||
count($defaults),
|
||||
array_intersect_assoc($defaults, $route->getDefaults()),
|
||||
'->load preserves defaults annotation and merges them with default arguments in method signature'
|
||||
count($routeData['defaults']),
|
||||
$route->getDefaults(),
|
||||
'->load preserves defaults annotation'
|
||||
);
|
||||
$this->assertEquals($routeData['schemes'], $route->getSchemes(), '->load preserves schemes annotation');
|
||||
$this->assertEquals($routeData['methods'], $route->getMethods(), '->load preserves methods annotation');
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ use Symfony\Component\Yaml\Exception\DumpException;
|
|||
*/
|
||||
class Inline
|
||||
{
|
||||
const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
|
||||
const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*+(?:\\\\.[^"\\\\]*+)*+)"|\'([^\']*+(?:\'\'[^\']*+)*+)\')';
|
||||
|
||||
private static $exceptionOnInvalidType = false;
|
||||
private static $objectSupport = false;
|
||||
|
|
|
|||
|
|
@ -457,4 +457,14 @@ class InlineTest extends \PHPUnit_Framework_TestCase
|
|||
{
|
||||
Inline::parse('{this, is not, supported}');
|
||||
}
|
||||
|
||||
public function testVeryLongQuotedStrings()
|
||||
{
|
||||
$longStringWithQuotes = str_repeat("x\r\n\\\"x\"x", 1000);
|
||||
|
||||
$yamlString = Inline::dump(array('longStringWithQuotes' => $longStringWithQuotes));
|
||||
$arrayFromYaml = Inline::parse($yamlString);
|
||||
|
||||
$this->assertEquals($longStringWithQuotes, $arrayFromYaml['longStringWithQuotes']);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in New Issue