Merge branch '4.3' into 4.4

* 4.3:
  bumped Symfony version to 4.3.5
  Sort components on CI
  fix parameter type declaration and make fabbot happy
  Upgraded CI Composer
  updated VERSION for 4.3.4
  updated CHANGELOG for 4.3.4
  bumped Symfony version to 3.4.32
  updated VERSION for 3.4.31
  update CONTRIBUTORS for 3.4.31
  updated CHANGELOG for 3.4.31
This commit is contained in:
Nicolas Grekas 2019-08-27 09:26:16 +02:00
commit a2f46664a7
6 changed files with 147 additions and 45 deletions

View File

@ -42,7 +42,7 @@ install:
- echo extension=php_curl.dll >> php.ini-max - echo extension=php_curl.dll >> php.ini-max
- copy /Y php.ini-max php.ini - copy /Y php.ini-max php.ini
- cd c:\projects\symfony - cd c:\projects\symfony
- IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.7.1/composer.phar) - IF NOT EXIST composer.phar (appveyor DownloadFile https://github.com/composer/composer/releases/download/1.9.0/composer.phar)
- php composer.phar self-update - php composer.phar self-update
- copy /Y .composer\* %APPDATA%\Composer\ - copy /Y .composer\* %APPDATA%\Composer\
- php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master - php composer.phar global require --no-progress --no-scripts --no-plugins symfony/flex dev-master

View File

@ -76,7 +76,7 @@ before_install:
export PHPUNIT=$(readlink -f ./phpunit) export PHPUNIT=$(readlink -f ./phpunit)
export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data" export PHPUNIT_X="$PHPUNIT --exclude-group tty,benchmark,intl-data"
export COMPOSER_UP='composer update --no-progress --no-suggest --ansi' export COMPOSER_UP='composer update --no-progress --no-suggest --ansi'
export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n') export COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
find ~/.phpenv -name xdebug.ini -delete find ~/.phpenv -name xdebug.ini -delete
if [[ $TRAVIS_PHP_VERSION = 7.4* ]]; then if [[ $TRAVIS_PHP_VERSION = 7.4* ]]; then
@ -227,7 +227,7 @@ install:
SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) && SYMFONY_VERSION=$(git ls-remote --heads | grep -o '/[1-9].*' | tail -n 1 | sed s/.//) &&
git fetch origin $SYMFONY_VERSION && git fetch origin $SYMFONY_VERSION &&
git checkout -m FETCH_HEAD && git checkout -m FETCH_HEAD &&
COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n') COMPONENTS=$(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n' | sort)
else else
SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*') SYMFONY_VERSION=$(cat composer.json | grep '^ *"dev-master". *"[1-9]' | grep -o '[0-9.]*')
fi fi
@ -235,7 +235,7 @@ install:
- | - |
# Skip the phpunit-bridge on not-master branches when $deps is empty # Skip the phpunit-bridge on not-master branches when $deps is empty
if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then if [[ ! $deps && $TRAVIS_BRANCH != master ]]; then
COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n') COMPONENTS=$(find src/Symfony -mindepth 3 -type f -name phpunit.xml.dist -not -wholename '*/Bridge/PhpUnit/*' -printf '%h\n' | sort)
fi fi
- | - |

View File

@ -7,6 +7,68 @@ in 4.3 minor versions.
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash To get the diff 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/v4.3.0...v4.3.1 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v4.3.0...v4.3.1
* 4.3.4 (2019-08-26)
* bug #33335 [DependencyInjection] Fixed the `getServiceIds` implementation to always return aliases (pdommelen)
* bug #33298 [Messenger] Stop worker when it should stop (tienvx)
* bug #33292 [VarExporter] fix support for PHP 7.4 (nicolas-grekas)
* bug #33282 [HttpKernel] Do not extend the new SF 4.3 ControllerEvent so we can make it final (Tobion)
* bug #33278 [FrameworkBundle] Fix BrowserKit assertions to make them compatible with Panther (dunglas)
* bug #33216 [Mime] Trim and remove line breaks from NamedAddress name arg (maldoinc)
* bug #33124 [Config] Add handling for ignored keys in ArrayNode::mergeValues. (Alexandre Parent)
* bug #33244 [Router] Fix TraceableUrlMatcher behaviour with trailing slash (Xavier Leune)
* bug #33232 Fix handling for session parameters (vkhramtsov)
* bug #32497 [Messenger] DispatchAfterCurrentBusMiddleware does not cancel messages from delayed handlers (Nyholm, BastienClement)
* bug #33127 [Messenger] make delay exchange and queues durable like the normal ones by default (Tobion)
* bug #33210 [Mailer] Don't duplicate addresses in Sendgrid Transport (pierredup)
* bug #33172 [Console] fixed a PHP notice when there is no function in the stack trace of an Exception (fabpot)
* bug #33157 Fix getMaxFilesize() returning zero (ausi)
* bug #33139 [Intl] Cleanup unused language aliases entry (ro0NL)
* bug #33126 [SecurityBundle] display the correct class name on the deprecated notice (maxhelias)
* bug #33093 [EventDispatcher] wrong Request class (maxhelias)
* bug #33092 [DependencyInjection] Improve an exception message (fabpot)
* bug #32541 [HttpKernel] trim the leading backslash in the controller init (Simperfit, fabpot)
* bug #32455 [HttpFoundation] Clear invalid session cookie (Toflar)
* bug #33066 [Serializer] Fix negative DateInterval (jderusse)
* bug #33045 Make HttpClientTestCase compatible with PHPUnit8 (jderusse)
* bug #33033 [Lock] consistently throw NotSupportException (xabbuh)
* bug #33022 [HttpClient] Remove CURLOPT_CONNECTTIMEOUT_MS curl opt (lyrixx)
* bug #32516 [FrameworkBundle][Config] Ignore exceptions thrown during reflection classes autoload (fancyweb)
* bug #33010 [TwigBridge] pass translation parameters to the trans filter (xabbuh)
* bug #32981 Fix tests/code for php 7.4 (jderusse)
* bug #32986 [Mime] fixed wrong mimetype (rjwebdev)
* bug #32992 [ProxyManagerBridge] Polyfill for unmaintained version (jderusse)
* bug #32989 [HttpClient] Declare `$active` first to prevent weird issue (Kocal)
* bug #32999 Added correct plural for box -> boxes (cinamo)
* bug #32933 [PhpUnitBridge] fixed PHPUnit 8.3 compatibility: method handleError was renamed to __invoke (karser)
* bug #32947 [Intl] Support DateTimeInterface in IntlDateFormatter::format (pierredup)
* bug #32919 [Intl] Order alpha2 to alpha3 mapping + phpdoc fixes (ro0NL)
* bug #32792 [Messenger] Fix incompatibility with FrameworkBundle <4.3.1 (chalasr)
* bug #32836 [Messenger] Removed named parameters and replaced with `?` placeholders for sqlsrv compatibility (David Legatt)
* bug #32838 [FrameworkBundle] Detect indirect env vars in routing (ro0NL)
* bug #32918 [Intl] Order alpha2 to alpha3 mapping (ro0NL)
* bug #32902 [PhpUnitBridge] Allow sutFqcnResolver to return array (VincentLanglet)
* bug #32814 Create mailBody with only attachments part present (srsbiz)
* bug #32682 [HttpFoundation] Revert getClientIp @return docblock (ossinkine)
* bug #32910 [Yaml] PHP-8: Uncaught TypeError: abs() expects parameter 1 to be int or float, string given (Aleksandr Dankovtsev)
* bug #32870 #32853 Check if $this->parameters is array. (ABGEO07)
* bug #32899 [Mailer] fix wrong error message when connection closes unexpectedly (fabpot)
* bug #32895 [Mailer] Fix error not being thrown properly (fabpot)
* bug #32868 [PhpUnitBridge] Allow symfony/phpunit-bridge > 4.2 to be installed with phpunit 4.8 (jderusse)
* bug #32823 [HttpClient] Preserve the case of headers when sending them (nicolas-grekas)
* bug #32767 [Yaml] fix comment in multi line value (soufianZantar)
* bug #32790 [HttpFoundation] Fix `getMaxFilesize` (bennyborn)
* bug #32796 [Cache] fix warning on PHP 7.4 (jpauli)
* bug #32806 [Console] fix warning on PHP 7.4 (rez1dent3)
* bug #32809 Don't add object-value of static properties in the signature of container metadata-cache (arjenm)
* bug #32708 Recompile container when translations directory changes (pierredup)
* bug #32722 [DependencyInjection] Fix bindings and tagged_locator (deguif)
* bug #32802 Make sure trace_level is always defined (dbu)
* bug #30096 [DI] Fix dumping Doctrine-like service graphs (bis) (weaverryan, nicolas-grekas)
* bug #32799 [HttpKernel] do not stopwatch sections when profiler is disabled (Tobion)
* bug #32631 [Messenger] expire delay queue and fix auto_setup logic (Tobion)
* bug #32641 [Messenger] Retrieve table default options from the SchemaManager (vincenttouzet)
* 4.3.3 (2019-07-28) * 4.3.3 (2019-07-28)
* bug #32726 [Messenger] Fix redis last error not cleared between calls (chalasr) * bug #32726 [Messenger] Fix redis last error not cleared between calls (chalasr)

View File

@ -18,36 +18,37 @@ Symfony is the result of the work of many people who made the code better
- Ryan Weaver (weaverryan) - Ryan Weaver (weaverryan)
- Javier Eguiluz (javier.eguiluz) - Javier Eguiluz (javier.eguiluz)
- Jakub Zalas (jakubzalas) - Jakub Zalas (jakubzalas)
- Johannes S (johannes)
- Roland Franssen (ro0) - Roland Franssen (ro0)
- Johannes S (johannes)
- Kris Wallsmith (kriswallsmith) - Kris Wallsmith (kriswallsmith)
- Grégoire Pineau (lyrixx) - Grégoire Pineau (lyrixx)
- Hugo Hamon (hhamon) - Hugo Hamon (hhamon)
- Abdellatif Ait boudad (aitboudad) - Abdellatif Ait boudad (aitboudad)
- Samuel ROZE (sroze) - Samuel ROZE (sroze)
- Yonel Ceruto (yonelceruto)
- Romain Neutron (romain) - Romain Neutron (romain)
- Pascal Borreli (pborreli) - Pascal Borreli (pborreli)
- Wouter De Jong (wouterj) - Wouter De Jong (wouterj)
- Yonel Ceruto (yonelceruto)
- Joseph Bielawski (stloyd) - Joseph Bielawski (stloyd)
- Karma Dordrak (drak) - Karma Dordrak (drak)
- Lukas Kahwe Smith (lsmith) - Lukas Kahwe Smith (lsmith)
- Martin Hasoň (hason) - Martin Hasoň (hason)
- Hamza Amrouche (simperfit) - Hamza Amrouche (simperfit)
- Jeremy Mikola (jmikola) - Jeremy Mikola (jmikola)
- Alexander M. Turek (derrabus)
- Jean-François Simon (jfsimon) - Jean-François Simon (jfsimon)
- Jules Pietri (heah) - Jules Pietri (heah)
- Benjamin Eberlei (beberlei) - Benjamin Eberlei (beberlei)
- Igor Wiedler (igorw) - Igor Wiedler (igorw)
- Jérémy DERUSSÉ (jderusse)
- Eriksen Costa (eriksencosta) - Eriksen Costa (eriksencosta)
- Guilhem Niot (energetick) - Guilhem Niot (energetick)
- Alexander M. Turek (derrabus)
- Sarah Khalil (saro0h) - Sarah Khalil (saro0h)
- Jonathan Wage (jwage)
- Tobias Nyholm (tobias) - Tobias Nyholm (tobias)
- Jérémy DERUSSÉ (jderusse) - Jonathan Wage (jwage)
- Lynn van der Berg (kjarli) - Lynn van der Berg (kjarli)
- Diego Saint Esteben (dosten) - Diego Saint Esteben (dosten)
- Thomas Calvet (fancyweb)
- Alexandre Salomé (alexandresalome) - Alexandre Salomé (alexandresalome)
- William Durand (couac) - William Durand (couac)
- ornicar - ornicar
@ -55,22 +56,21 @@ Symfony is the result of the work of many people who made the code better
- Francis Besset (francisbesset) - Francis Besset (francisbesset)
- stealth35 (stealth35) - stealth35 (stealth35)
- Alexander Mols (asm89) - Alexander Mols (asm89)
- Matthias Pigulla (mpdude)
- Bulat Shakirzyanov (avalanche123)
- Konstantin Myakshin (koc)
- Pierre du Plessis (pierredup) - Pierre du Plessis (pierredup)
- Matthias Pigulla (mpdude)
- Konstantin Myakshin (koc)
- Bulat Shakirzyanov (avalanche123)
- Grégoire Paris (greg0ire) - Grégoire Paris (greg0ire)
- Saša Stamenković (umpirsky) - Saša Stamenković (umpirsky)
- Peter Rehm (rpet) - Peter Rehm (rpet)
- Kevin Bond (kbond) - Kevin Bond (kbond)
- Henrik Bjørnskov (henrikbjorn) - Henrik Bjørnskov (henrikbjorn)
- Valentin Udaltsov (vudaltsov)
- Miha Vrhovnik - Miha Vrhovnik
- Diego Saint Esteben (dii3g0) - Diego Saint Esteben (dii3g0)
- Gábor Egyed (1ed) - Gábor Egyed (1ed)
- Thomas Calvet (fancyweb)
- Konstantin Kudryashov (everzet) - Konstantin Kudryashov (everzet)
- Titouan Galopin (tgalopin) - Titouan Galopin (tgalopin)
- Valentin Udaltsov (vudaltsov)
- Bilal Amarni (bamarni) - Bilal Amarni (bamarni)
- Mathieu Piot (mpiot) - Mathieu Piot (mpiot)
- David Maicher (dmaicher) - David Maicher (dmaicher)
@ -129,10 +129,10 @@ Symfony is the result of the work of many people who made the code better
- Daniel Wehner (dawehner) - Daniel Wehner (dawehner)
- excelwebzone - excelwebzone
- Gordon Franke (gimler) - Gordon Franke (gimler)
- Oskar Stark (oskarstark)
- Fabien Pennequin (fabienpennequin) - Fabien Pennequin (fabienpennequin)
- Théo FIDRY (theofidry) - Théo FIDRY (theofidry)
- Teoh Han Hui (teohhanhui) - Teoh Han Hui (teohhanhui)
- Oskar Stark (oskarstark)
- Eric GELOEN (gelo) - Eric GELOEN (gelo)
- Joel Wurtz (brouznouf) - Joel Wurtz (brouznouf)
- Lars Strojny (lstrojny) - Lars Strojny (lstrojny)
@ -151,19 +151,19 @@ Symfony is the result of the work of many people who made the code better
- Sebastian Hörl (blogsh) - Sebastian Hörl (blogsh)
- Daniel Gomes (danielcsgomes) - Daniel Gomes (danielcsgomes)
- Hidenori Goto (hidenorigoto) - Hidenori Goto (hidenorigoto)
- Andréia Bohner (andreia)
- Arnaud Kleinpeter (nanocom) - Arnaud Kleinpeter (nanocom)
- Guilherme Blanco (guilhermeblanco) - Guilherme Blanco (guilhermeblanco)
- SpacePossum - SpacePossum
- Pablo Godel (pgodel) - Pablo Godel (pgodel)
- Jérémie Augustin (jaugustin) - Jérémie Augustin (jaugustin)
- François-Xavier de Guillebon (de-gui_f)
- Oleg Voronkovich - Oleg Voronkovich
- Andréia Bohner (andreia)
- Philipp Wahala (hifi) - Philipp Wahala (hifi)
- Julien Falque (julienfalque) - Julien Falque (julienfalque)
- Rafael Dohms (rdohms) - Rafael Dohms (rdohms)
- jwdeitch - jwdeitch
- Mikael Pajunen - Mikael Pajunen
- François-Xavier de Guillebon (de-gui_f)
- Alessandro Chitolina (alekitto) - Alessandro Chitolina (alekitto)
- Massimiliano Arione (garak) - Massimiliano Arione (garak)
- Niels Keurentjes (curry684) - Niels Keurentjes (curry684)
@ -171,10 +171,13 @@ Symfony is the result of the work of many people who made the code better
- Richard van Laak (rvanlaak) - Richard van Laak (rvanlaak)
- Richard Shank (iampersistent) - Richard Shank (iampersistent)
- Thomas Rabaix (rande) - Thomas Rabaix (rande)
- Vincent Touzet (vincenttouzet)
- jeremyFreeAgent (jeremyfreeagent)
- Rouven Weßling (realityking) - Rouven Weßling (realityking)
- Alexander Schranz (alexander-schranz) - Alexander Schranz (alexander-schranz)
- Clemens Tolboom - Clemens Tolboom
- Helmer Aaviksoo - Helmer Aaviksoo
- Yanick Witschi (toflar)
- Hiromi Hishida (77web) - Hiromi Hishida (77web)
- Matthieu Ouellette-Vachon (maoueh) - Matthieu Ouellette-Vachon (maoueh)
- Michał Pipa (michal.pipa) - Michał Pipa (michal.pipa)
@ -186,16 +189,13 @@ Symfony is the result of the work of many people who made the code better
- Tyson Andre - Tyson Andre
- GDIBass - GDIBass
- Samuel NELA (snela) - Samuel NELA (snela)
- Vincent Touzet (vincenttouzet)
- Jérôme Parmentier (lctrs) - Jérôme Parmentier (lctrs)
- jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
- James Halsall (jaitsu) - James Halsall (jaitsu)
- Matthieu Napoli (mnapoli) - Matthieu Napoli (mnapoli)
- Florent Mata (fmata) - Florent Mata (fmata)
- Warnar Boekkooi (boekkooi) - Warnar Boekkooi (boekkooi)
- Dmitrii Chekaliuk (lazyhammer) - Dmitrii Chekaliuk (lazyhammer)
- Clément JOBEILI (dator) - Clément JOBEILI (dator)
- Yanick Witschi (toflar)
- Marek Štípek (maryo) - Marek Štípek (maryo)
- Daniel Espendiller - Daniel Espendiller
- Possum - Possum
@ -210,6 +210,7 @@ Symfony is the result of the work of many people who made the code better
- Gary PEGEOT (gary-p) - Gary PEGEOT (gary-p)
- Ruben Gonzalez (rubenrua) - Ruben Gonzalez (rubenrua)
- Benjamin Dulau (dbenjamin) - Benjamin Dulau (dbenjamin)
- Arman Hosseini
- Mathieu Lemoine (lemoinem) - Mathieu Lemoine (lemoinem)
- Christian Schmidt - Christian Schmidt
- Andreas Hucks (meandmymonkey) - Andreas Hucks (meandmymonkey)
@ -240,6 +241,7 @@ Symfony is the result of the work of many people who made the code better
- jeff - jeff
- John Kary (johnkary) - John Kary (johnkary)
- Andreas Schempp (aschempp) - Andreas Schempp (aschempp)
- Andreas Braun
- Justin Hileman (bobthecow) - Justin Hileman (bobthecow)
- Blanchon Vincent (blanchonvincent) - Blanchon Vincent (blanchonvincent)
- Michele Orselli (orso) - Michele Orselli (orso)
@ -263,6 +265,7 @@ Symfony is the result of the work of many people who made the code better
- julien pauli (jpauli) - julien pauli (jpauli)
- Lorenz Schori - Lorenz Schori
- Sébastien Lavoie (lavoiesl) - Sébastien Lavoie (lavoiesl)
- mcfedr (mcfedr)
- Dariusz - Dariusz
- Michael Babker (mbabker) - Michael Babker (mbabker)
- Francois Zaninotto - Francois Zaninotto
@ -299,8 +302,11 @@ Symfony is the result of the work of many people who made the code better
- Joseph Rouff (rouffj) - Joseph Rouff (rouffj)
- Félix Labrecque (woodspire) - Félix Labrecque (woodspire)
- GordonsLondon - GordonsLondon
- Tomas Norkūnas (norkunas)
- Quynh Xuan Nguyen (xuanquynh)
- Jan Sorgalla (jsor) - Jan Sorgalla (jsor)
- Ray - Ray
- Smaine Milianni (ismail1432)
- Chekote - Chekote
- François Pluchino (francoispluchino) - François Pluchino (francoispluchino)
- Antoine Makdessi (amakdessi) - Antoine Makdessi (amakdessi)
@ -315,7 +321,6 @@ Symfony is the result of the work of many people who made the code better
- Nikita Konstantinov - Nikita Konstantinov
- Wodor Wodorski - Wodor Wodorski
- Thomas Lallement (raziel057) - Thomas Lallement (raziel057)
- mcfedr (mcfedr)
- Colin O&#039;Dell (colinodell) - Colin O&#039;Dell (colinodell)
- Giorgio Premi - Giorgio Premi
- renanbr - renanbr
@ -326,11 +331,12 @@ Symfony is the result of the work of many people who made the code better
- Zan Baldwin (zanderbaldwin) - Zan Baldwin (zanderbaldwin)
- Roumen Damianoff (roumen) - Roumen Damianoff (roumen)
- Kim Hemsø Rasmussen (kimhemsoe) - Kim Hemsø Rasmussen (kimhemsoe)
- Dmitrii Poddubnyi (karser)
- Pascal Luna (skalpa) - Pascal Luna (skalpa)
- Wouter Van Hecke - Wouter Van Hecke
- Peter Kruithof (pkruithof) - Peter Kruithof (pkruithof)
- Michael Holm (hollo) - Michael Holm (hollo)
- Andreas Braun - Arjen van der Meijden
- Mathieu Lechat - Mathieu Lechat
- Marc Weistroff (futurecat) - Marc Weistroff (futurecat)
- Simon Mönch (sm) - Simon Mönch (sm)
@ -342,12 +348,10 @@ Symfony is the result of the work of many people who made the code better
- Florian Klein (docteurklein) - Florian Klein (docteurklein)
- Manuel Kiessling (manuelkiessling) - Manuel Kiessling (manuelkiessling)
- Atsuhiro KUBO (iteman) - Atsuhiro KUBO (iteman)
- Quynh Xuan Nguyen (xuanquynh)
- rudy onfroy (ronfroy) - rudy onfroy (ronfroy)
- Serkan Yildiz (srknyldz) - Serkan Yildiz (srknyldz)
- Andrew Moore (finewolf) - Andrew Moore (finewolf)
- Bertrand Zuchuat (garfield-fr) - Bertrand Zuchuat (garfield-fr)
- Tomas Norkūnas (norkunas)
- Sullivan SENECHAL (soullivaneuh) - Sullivan SENECHAL (soullivaneuh)
- Gabor Toth (tgabi333) - Gabor Toth (tgabi333)
- realmfoo - realmfoo
@ -370,6 +374,7 @@ Symfony is the result of the work of many people who made the code better
- Francesc Rosàs (frosas) - Francesc Rosàs (frosas)
- Romain Pierre (romain-pierre) - Romain Pierre (romain-pierre)
- Julien Galenski (ruian) - Julien Galenski (ruian)
- Maxime Helias
- Bongiraud Dominique - Bongiraud Dominique
- janschoenherr - janschoenherr
- Emanuele Gaspari (inmarelibero) - Emanuele Gaspari (inmarelibero)
@ -389,7 +394,6 @@ Symfony is the result of the work of many people who made the code better
- alquerci - alquerci
- Mateusz Sip (mateusz_sip) - Mateusz Sip (mateusz_sip)
- Francesco Levorato - Francesco Levorato
- Dmitrii Poddubnyi (karser)
- Vitaliy Zakharov (zakharovvi) - Vitaliy Zakharov (zakharovvi)
- Tobias Sjösten (tobiassjosten) - Tobias Sjösten (tobiassjosten)
- Gyula Sallai (salla) - Gyula Sallai (salla)
@ -397,9 +401,9 @@ Symfony is the result of the work of many people who made the code better
- Christian Gärtner (dagardner) - Christian Gärtner (dagardner)
- Tomasz Kowalczyk (thunderer) - Tomasz Kowalczyk (thunderer)
- Artur Eshenbrener - Artur Eshenbrener
- Arjen van der Meijden
- Damien Alexandre (damienalexandre) - Damien Alexandre (damienalexandre)
- Thomas Perez (scullwm) - Thomas Perez (scullwm)
- Saif Eddin Gmati (azjezz)
- Felix Labrecque - Felix Labrecque
- Yaroslav Kiliba - Yaroslav Kiliba
- Terje Bråten - Terje Bråten
@ -432,7 +436,6 @@ Symfony is the result of the work of many people who made the code better
- Tamas Szijarto - Tamas Szijarto
- Michele Locati - Michele Locati
- Pavel Volokitin (pvolok) - Pavel Volokitin (pvolok)
- Smaine Milianni (ismail1432)
- Arthur de Moulins (4rthem) - Arthur de Moulins (4rthem)
- Matthias Althaus (althaus) - Matthias Althaus (althaus)
- Nicolas Dewez (nicolas_dewez) - Nicolas Dewez (nicolas_dewez)
@ -459,7 +462,6 @@ Symfony is the result of the work of many people who made the code better
- Miha Vrhovnik - Miha Vrhovnik
- Alessandro Desantis - Alessandro Desantis
- hubert lecorche (hlecorche) - hubert lecorche (hlecorche)
- Arman Hosseini
- Marc Morales Valldepérez (kuert) - Marc Morales Valldepérez (kuert)
- Jean-Baptiste GOMOND (mjbgo) - Jean-Baptiste GOMOND (mjbgo)
- Vadim Kharitonov (virtuozzz) - Vadim Kharitonov (virtuozzz)
@ -512,6 +514,7 @@ Symfony is the result of the work of many people who made the code better
- cedric lombardot (cedriclombardot) - cedric lombardot (cedriclombardot)
- Tim Goudriaan (codedmonkey) - Tim Goudriaan (codedmonkey)
- Jonas Flodén (flojon) - Jonas Flodén (flojon)
- Tobias Weichart
- Gonzalo Vilaseca (gonzalovilaseca) - Gonzalo Vilaseca (gonzalovilaseca)
- Marcin Sikoń (marphi) - Marcin Sikoń (marphi)
- Denis Brumann (dbrumann) - Denis Brumann (dbrumann)
@ -519,13 +522,16 @@ Symfony is the result of the work of many people who made the code better
- Marek Pietrzak - Marek Pietrzak
- Luc Vieillescazes (iamluc) - Luc Vieillescazes (iamluc)
- franek (franek) - franek (franek)
- Raulnet
- Christian Wahler - Christian Wahler
- Gintautas Miselis - Gintautas Miselis
- Rob Bast - Rob Bast
- Roberto Espinoza (respinoza) - Roberto Espinoza (respinoza)
- Zander Baldwin - Zander Baldwin
- Gocha Ossinkine (ossinkine)
- Adam Harvey - Adam Harvey
- Anton Bakai - Anton Bakai
- Martin Auswöger
- Rhodri Pugh (rodnaph) - Rhodri Pugh (rodnaph)
- Sam Fleming (sam_fleming) - Sam Fleming (sam_fleming)
- Alex Bakhturin - Alex Bakhturin
@ -584,6 +590,7 @@ Symfony is the result of the work of many people who made the code better
- Rokas Mikalkėnas (rokasm) - Rokas Mikalkėnas (rokasm)
- De Cock Xavier (xdecock) - De Cock Xavier (xdecock)
- Almog Baku (almogbaku) - Almog Baku (almogbaku)
- Karoly Gossler (connorhu)
- Scott Arciszewski - Scott Arciszewski
- Xavier HAUSHERR - Xavier HAUSHERR
- Christopher Hertel (chertel) - Christopher Hertel (chertel)
@ -643,11 +650,14 @@ Symfony is the result of the work of many people who made the code better
- Piotr Stankowski - Piotr Stankowski
- Baptiste Leduc (bleduc) - Baptiste Leduc (bleduc)
- Jean-Christophe Cuvelier [Artack] - Jean-Christophe Cuvelier [Artack]
- Julien Montel (julienmgel)
- Philippe Segatori
- Simon DELICATA - Simon DELICATA
- Dmitry Simushev - Dmitry Simushev
- alcaeus - alcaeus
- Fred Cox - Fred Cox
- vitaliytv - vitaliytv
- Philippe Segatori
- Dalibor Karlović (dkarlovi) - Dalibor Karlović (dkarlovi)
- Sebastian Blum - Sebastian Blum
- Alexis Lefebvre - Alexis Lefebvre
@ -668,12 +678,14 @@ Symfony is the result of the work of many people who made the code better
- Desjardins Jérôme (jewome62) - Desjardins Jérôme (jewome62)
- Kévin THERAGE (kevin_therage) - Kévin THERAGE (kevin_therage)
- Simeon Kolev (simeon_kolev9) - Simeon Kolev (simeon_kolev9)
- Joost van Driel (j92)
- Jonas Elfering - Jonas Elfering
- Nahuel Cuesta (ncuesta) - Nahuel Cuesta (ncuesta)
- Chris Boden (cboden) - Chris Boden (cboden)
- Christophe Villeger (seragan) - Christophe Villeger (seragan)
- Julien Fredon - Julien Fredon
- Bob van de Vijver (bobvandevijver) - Bob van de Vijver (bobvandevijver)
- Xavier Leune (xleune)
- Stefan Gehrig (sgehrig) - Stefan Gehrig (sgehrig)
- Hany el-Kerdany - Hany el-Kerdany
- Wang Jingyu - Wang Jingyu
@ -726,15 +738,16 @@ Symfony is the result of the work of many people who made the code better
- Johann Saunier (prophet777) - Johann Saunier (prophet777)
- Sergey (upyx) - Sergey (upyx)
- Andreas Erhard - Andreas Erhard
- Giso Stallenberg (gisostallenberg)
- Michael Devery (mickadoo) - Michael Devery (mickadoo)
- Antoine Corcy - Antoine Corcy
- Sascha Grossenbacher - Sascha Grossenbacher
- Emanuele Panzeri (thepanz) - Emanuele Panzeri (thepanz)
- Szijarto Tamas - Szijarto Tamas
- Gocha Ossinkine (ossinkine)
- Robin Lehrmann (robinlehrmann) - Robin Lehrmann (robinlehrmann)
- Catalin Dan - Catalin Dan
- Jaroslav Kuba - Jaroslav Kuba
- Kristijan Kanalas
- Stephan Vock - Stephan Vock
- Benjamin Zikarsky (bzikarsky) - Benjamin Zikarsky (bzikarsky)
- battye - battye
@ -745,7 +758,6 @@ Symfony is the result of the work of many people who made the code better
- Hossein Bukhamsin - Hossein Bukhamsin
- Oliver Hoff - Oliver Hoff
- Christian Sciberras (uuf6429) - Christian Sciberras (uuf6429)
- Martin Auswöger
- Disparity - Disparity
- origaminal - origaminal
- Matteo Beccati (matteobeccati) - Matteo Beccati (matteobeccati)
@ -760,7 +772,7 @@ Symfony is the result of the work of many people who made the code better
- Thomas Ploch - Thomas Ploch
- Benjamin Grandfond (benjamin) - Benjamin Grandfond (benjamin)
- Tiago Brito (blackmx) - Tiago Brito (blackmx)
- -
- Richard van den Brand (ricbra) - Richard van den Brand (ricbra)
- develop - develop
- flip111 - flip111
@ -768,12 +780,12 @@ Symfony is the result of the work of many people who made the code better
- VJ - VJ
- RJ Garcia - RJ Garcia
- Delf Tonder (leberknecht) - Delf Tonder (leberknecht)
- Raulnet
- Ondrej Exner - Ondrej Exner
- Mark Sonnabaum - Mark Sonnabaum
- Massimiliano Braglia (massimilianobraglia) - Massimiliano Braglia (massimilianobraglia)
- Richard Quadling - Richard Quadling
- Raphaëll Roussel - Raphaëll Roussel
- Michael Lutz
- jochenvdv - jochenvdv
- Arturas Smorgun (asarturas) - Arturas Smorgun (asarturas)
- Alexander Volochnev (exelenz) - Alexander Volochnev (exelenz)
@ -797,6 +809,7 @@ Symfony is the result of the work of many people who made the code better
- Pierre Rineau - Pierre Rineau
- Vladyslav Petrovych - Vladyslav Petrovych
- Alex Xandra Albert Sim - Alex Xandra Albert Sim
- Soufian EZ-ZANTAR (soezz)
- Carson Full - Carson Full
- Sergey Yastrebov - Sergey Yastrebov
- Trent Steel (trsteel88) - Trent Steel (trsteel88)
@ -830,8 +843,8 @@ Symfony is the result of the work of many people who made the code better
- Joschi Kuphal - Joschi Kuphal
- John Bohn (jbohn) - John Bohn (jbohn)
- Marc Morera (mmoreram) - Marc Morera (mmoreram)
- Saif Eddin Gmati (azjezz)
- BENOIT POLASZEK (bpolaszek) - BENOIT POLASZEK (bpolaszek)
- Julien Pauli
- Mathieu Rochette (mathroc) - Mathieu Rochette (mathroc)
- Andrew Hilobok (hilobok) - Andrew Hilobok (hilobok)
- Noah Heck (myesain) - Noah Heck (myesain)
@ -995,6 +1008,7 @@ Symfony is the result of the work of many people who made the code better
- Kyle - Kyle
- Daniel Alejandro Castro Arellano (lexcast) - Daniel Alejandro Castro Arellano (lexcast)
- sensio - sensio
- Terje Bråten
- Thomas Jarrand - Thomas Jarrand
- Antoine Bluchet (soyuka) - Antoine Bluchet (soyuka)
- Sebastien Morel (plopix) - Sebastien Morel (plopix)
@ -1034,7 +1048,6 @@ Symfony is the result of the work of many people who made the code better
- Franz Wilding (killerpoke) - Franz Wilding (killerpoke)
- ProgMiner - ProgMiner
- Oleg Golovakhin (doc_tr) - Oleg Golovakhin (doc_tr)
- Joost van Driel
- Icode4Food (icode4food) - Icode4Food (icode4food)
- Radosław Benkel - Radosław Benkel
- EStyles (insidestyles) - EStyles (insidestyles)
@ -1061,6 +1074,7 @@ Symfony is the result of the work of many people who made the code better
- Arnaud PETITPAS (apetitpa) - Arnaud PETITPAS (apetitpa)
- Ken Stanley - Ken Stanley
- Zachary Tong (polyfractal) - Zachary Tong (polyfractal)
- Mario Blažek (marioblazek)
- Ashura - Ashura
- Hryhorii Hrebiniuk - Hryhorii Hrebiniuk
- johnstevenson - johnstevenson
@ -1068,7 +1082,6 @@ Symfony is the result of the work of many people who made the code better
- hamza - hamza
- dantleech - dantleech
- Bastien DURAND (deamon) - Bastien DURAND (deamon)
- Xavier Leune
- Sander Goossens (sandergo90) - Sander Goossens (sandergo90)
- Rudy Onfroy - Rudy Onfroy
- Tero Alén (tero) - Tero Alén (tero)
@ -1085,6 +1098,7 @@ Symfony is the result of the work of many people who made the code better
- Sortex - Sortex
- chispita - chispita
- Wojciech Sznapka - Wojciech Sznapka
- Luis Pabon (luispabon)
- Gavin Staniforth - Gavin Staniforth
- Ksaveras Šakys (xawiers) - Ksaveras Šakys (xawiers)
- Ariel J. Birnbaum - Ariel J. Birnbaum
@ -1183,6 +1197,7 @@ Symfony is the result of the work of many people who made the code better
- Robert Meijers - Robert Meijers
- James Sansbury - James Sansbury
- Marcin Chwedziak - Marcin Chwedziak
- Alexandre Parent
- hjkl - hjkl
- Tony Cosentino (tony-co) - Tony Cosentino (tony-co)
- Dan Wilga - Dan Wilga
@ -1225,6 +1240,8 @@ Symfony is the result of the work of many people who made the code better
- rchoquet - rchoquet
- gitlost - gitlost
- Taras Girnyk - Taras Girnyk
- Jan Vernarsky
- Amine Yakoubi
- Eduardo García Sanz (coma) - Eduardo García Sanz (coma)
- Sergio (deverad) - Sergio (deverad)
- James Gilliland - James Gilliland
@ -1266,7 +1283,9 @@ Symfony is the result of the work of many people who made the code better
- Paul Matthews - Paul Matthews
- Jakub Kisielewski - Jakub Kisielewski
- Vacheslav Silyutin - Vacheslav Silyutin
- Aleksandr Dankovtsev
- Juan Traverso - Juan Traverso
- David Legatt (dlegatt)
- Alain Flaus (halundra) - Alain Flaus (halundra)
- tsufeki - tsufeki
- Philipp Strube - Philipp Strube
@ -1278,7 +1297,6 @@ Symfony is the result of the work of many people who made the code better
- Marco - Marco
- Marc Torres - Marc Torres
- Alberto Aldegheri - Alberto Aldegheri
- Philippe Segatori
- Dmitri Petmanson - Dmitri Petmanson
- heccjj - heccjj
- Alexandre Melard - Alexandre Melard
@ -1289,6 +1307,7 @@ Symfony is the result of the work of many people who made the code better
- Ilia (aliance) - Ilia (aliance)
- Chris McCafferty (cilefen) - Chris McCafferty (cilefen)
- Mo Di (modi) - Mo Di (modi)
- Tien Vo (tienvx)
- Pablo Schläpfer - Pablo Schläpfer
- Gert de Pagter - Gert de Pagter
- Jelte Steijaert (jelte) - Jelte Steijaert (jelte)
@ -1318,7 +1337,6 @@ Symfony is the result of the work of many people who made the code better
- Ross Tuck - Ross Tuck
- Kévin Gomez (kevin) - Kévin Gomez (kevin)
- Mihai Nica (redecs) - Mihai Nica (redecs)
- Soufian EZ-ZANTAR (soezz)
- Andrei Igna - Andrei Igna
- azine - azine
- Dawid Sajdak - Dawid Sajdak
@ -1369,6 +1387,7 @@ Symfony is the result of the work of many people who made the code better
- Renato Mendes Figueiredo - Renato Mendes Figueiredo
- Eric Stern - Eric Stern
- ShiraNai7 - ShiraNai7
- Cedrick Oka
- Antal Áron (antalaron) - Antal Áron (antalaron)
- Markus Fasselt (digilist) - Markus Fasselt (digilist)
- Vašek Purchart (vasek-purchart) - Vašek Purchart (vasek-purchart)
@ -1425,6 +1444,8 @@ Symfony is the result of the work of many people who made the code better
- Carsten Nielsen (phreaknerd) - Carsten Nielsen (phreaknerd)
- Roger Guasch (rogerguasch) - Roger Guasch (rogerguasch)
- Jay Severson - Jay Severson
- Benny Born
- Emirald Mateli
- René Kerner - René Kerner
- Nathaniel Catchpole - Nathaniel Catchpole
- Adrien Samson (adriensamson) - Adrien Samson (adriensamson)
@ -1501,7 +1522,6 @@ Symfony is the result of the work of many people who made the code better
- Lance Chen - Lance Chen
- Ciaran McNulty (ciaranmcnulty) - Ciaran McNulty (ciaranmcnulty)
- Andrew (drew) - Andrew (drew)
- Giso Stallenberg (gisostallenberg)
- kor3k kor3k (kor3k) - kor3k kor3k (kor3k)
- Stelian Mocanita (stelian) - Stelian Mocanita (stelian)
- Justin (wackymole) - Justin (wackymole)
@ -1548,6 +1568,7 @@ Symfony is the result of the work of many people who made the code better
- Jakub Simon - Jakub Simon
- Bouke Haarsma - Bouke Haarsma
- mlievertz - mlievertz
- Radosław Kowalewski
- Enrico Schultz - Enrico Schultz
- Evert Harmeling - Evert Harmeling
- mschop - mschop
@ -1583,9 +1604,9 @@ Symfony is the result of the work of many people who made the code better
- Arnau González (arnaugm) - Arnau González (arnaugm)
- Simon Bouland (bouland) - Simon Bouland (bouland)
- Jibé Barth (jibbarth) - Jibé Barth (jibbarth)
- Julien Montel (julienmgel)
- Matthew Foster (mfoster) - Matthew Foster (mfoster)
- Reyo Stallenberg (reyostallenberg) - Reyo Stallenberg (reyostallenberg)
- Ruben Jacobs (rubenj)
- Paul Seiffert (seiffert) - Paul Seiffert (seiffert)
- Vasily Khayrulin (sirian) - Vasily Khayrulin (sirian)
- Stefan Koopmanschap (skoop) - Stefan Koopmanschap (skoop)
@ -1637,9 +1658,11 @@ Symfony is the result of the work of many people who made the code better
- Kamil Madejski - Kamil Madejski
- Jeremiah VALERIE - Jeremiah VALERIE
- Mike Francis - Mike Francis
- Vladimir Khramtsov (chrome)
- Gerd Christian Kunze (derdu) - Gerd Christian Kunze (derdu)
- Christoph Nissle (derstoffel) - Christoph Nissle (derstoffel)
- Ionel Scutelnicu (ionelscutelnicu) - Ionel Scutelnicu (ionelscutelnicu)
- Mathieu Dewet (mdewet)
- Nicolas Tallefourtané (nicolab) - Nicolas Tallefourtané (nicolab)
- Botond Dani (picur) - Botond Dani (picur)
- Thierry Marianne (thierrymarianne) - Thierry Marianne (thierrymarianne)
@ -1684,7 +1707,6 @@ Symfony is the result of the work of many people who made the code better
- Mike Meier - Mike Meier
- Vilius Grigaliūnas - Vilius Grigaliūnas
- Kirill Saksin - Kirill Saksin
- Julien Pauli
- Koalabaerchen - Koalabaerchen
- michalmarcinkowski - michalmarcinkowski
- Warwick - Warwick
@ -1697,7 +1719,6 @@ Symfony is the result of the work of many people who made the code better
- Nicolas Pion - Nicolas Pion
- Muhammed Akbulut - Muhammed Akbulut
- Aaron Somi - Aaron Somi
- Karoly Gossler (connorhu)
- Michał Dąbrowski (defrag) - Michał Dąbrowski (defrag)
- Konstantin Grachev (grachevko) - Konstantin Grachev (grachevko)
- Simone Fumagalli (hpatoio) - Simone Fumagalli (hpatoio)
@ -1707,6 +1728,7 @@ Symfony is the result of the work of many people who made the code better
- Johannes Müller (johmue) - Johannes Müller (johmue)
- Jordi Llonch (jordillonch) - Jordi Llonch (jordillonch)
- Nicholas Ruunu (nicholasruunu) - Nicholas Ruunu (nicholasruunu)
- Cyril Pascal (paxal)
- Cédric Dugat (ph3nol) - Cédric Dugat (ph3nol)
- Philip Dahlstrøm (phidah) - Philip Dahlstrøm (phidah)
- Milos Colakovic (project2481) - Milos Colakovic (project2481)
@ -1820,6 +1842,7 @@ Symfony is the result of the work of many people who made the code better
- adenkejawen - adenkejawen
- Florent SEVESTRE (aniki-taicho) - Florent SEVESTRE (aniki-taicho)
- Ari Pringle (apringle) - Ari Pringle (apringle)
- Gert Wijnalda (cinamo)
- Dan Ordille (dordille) - Dan Ordille (dordille)
- Jan Eichhorn (exeu) - Jan Eichhorn (exeu)
- Grégory Pelletier (ip512) - Grégory Pelletier (ip512)
@ -1875,6 +1898,7 @@ Symfony is the result of the work of many people who made the code better
- Alexis MARQUIS - Alexis MARQUIS
- Gerrit Drost - Gerrit Drost
- Linnaea Von Lavia - Linnaea Von Lavia
- Bastien Clément
- Javan Eskander - Javan Eskander
- Lenar Lõhmus - Lenar Lõhmus
- Cristian Gonzalez - Cristian Gonzalez
@ -1964,11 +1988,13 @@ Symfony is the result of the work of many people who made the code better
- dasmfm - dasmfm
- Mathias Geat - Mathias Geat
- Arnaud Buathier (arnapou) - Arnaud Buathier (arnapou)
- Benoit Galati (benoitgalati)
- chesteroni (chesteroni) - chesteroni (chesteroni)
- Mauricio Lopez (diaspar) - Mauricio Lopez (diaspar)
- HADJEDJ Vincent (hadjedjvincent) - HADJEDJ Vincent (hadjedjvincent)
- Daniele Cesarini (ijanki) - Daniele Cesarini (ijanki)
- Ismail Asci (ismailasci) - Ismail Asci (ismailasci)
- Hugo Alliaume (kocal)
- Simon CONSTANS (kosssi) - Simon CONSTANS (kosssi)
- Kristof Van Cauwenbergh (kristofvc) - Kristof Van Cauwenbergh (kristofvc)
- Dennis Langen (nijusan) - Dennis Langen (nijusan)
@ -1993,9 +2019,11 @@ Symfony is the result of the work of many people who made the code better
- misterx - misterx
- Cas - Cas
- Dusan Kasan - Dusan Kasan
- Michael Steininger
- Karolis - Karolis
- Myke79 - Myke79
- Brian Debuire - Brian Debuire
- Benjamin Morel
- Piers Warmers - Piers Warmers
- Guilliam Xavier - Guilliam Xavier
- Sylvain Lorinet - Sylvain Lorinet
@ -2101,6 +2129,7 @@ Symfony is the result of the work of many people who made the code better
- Yuriy Potemkin - Yuriy Potemkin
- Emilie Lorenzo - Emilie Lorenzo
- enomotodev - enomotodev
- Babichev Maxim
- Edvin Hultberg - Edvin Hultberg
- Benjamin Long - Benjamin Long
- Ben Miller - Ben Miller
@ -2123,6 +2152,7 @@ Symfony is the result of the work of many people who made the code better
- parhs - parhs
- Diego Campoy - Diego Campoy
- TeLiXj - TeLiXj
- Vincent Langlet
- Oncle Tom - Oncle Tom
- Sam Anthony - Sam Anthony
- Christian Stocker - Christian Stocker
@ -2145,6 +2175,7 @@ Symfony is the result of the work of many people who made the code better
- Bilge - Bilge
- ADmad - ADmad
- Nicolas Roudaire - Nicolas Roudaire
- Temuri Takalandze (abgeo)
- Alfonso (afgar) - Alfonso (afgar)
- Andreas Forsblom (aforsblo) - Andreas Forsblom (aforsblo)
- Alex Olmos (alexolmos) - Alex Olmos (alexolmos)
@ -2261,6 +2292,7 @@ Symfony is the result of the work of many people who made the code better
- Andreas Streichardt - Andreas Streichardt
- Alexandre Segura - Alexandre Segura
- Pascal Hofmann - Pascal Hofmann
- david-binda
- smokeybear87 - smokeybear87
- Gustavo Adrian - Gustavo Adrian
- damaya - damaya

View File

@ -31,7 +31,7 @@ interface FormInterface extends \ArrayAccess, \Traversable, \Countable
* @throws Exception\LogicException when trying to set a parent for a form with * @throws Exception\LogicException when trying to set a parent for a form with
* an empty name * an empty name
*/ */
public function setParent(FormInterface $parent = null); public function setParent(self $parent = null);
/** /**
* Returns the parent form. * Returns the parent form.

View File

@ -13,8 +13,9 @@ namespace Symfony\Component\Form\Tests;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormFactory; use Symfony\Component\Form\FormFactory;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormTypeGuesserChain; use Symfony\Component\Form\FormTypeGuesserChain;
use Symfony\Component\Form\Guess\Guess; use Symfony\Component\Form\Guess\Guess;
use Symfony\Component\Form\Guess\TypeGuess; use Symfony\Component\Form\Guess\TypeGuess;
@ -194,7 +195,7 @@ class FormFactoryTest extends TestCase
->method('buildForm') ->method('buildForm')
->with($this->builder, $resolvedOptions); ->with($this->builder, $resolvedOptions);
$form = $this->createMock(FormInterface::class); $form = $this->createForm();
$this->builder->expects($this->once()) $this->builder->expects($this->once())
->method('getForm') ->method('getForm')
@ -227,7 +228,7 @@ class FormFactoryTest extends TestCase
->method('buildForm') ->method('buildForm')
->with($this->builder, $resolvedOptions); ->with($this->builder, $resolvedOptions);
$form = $this->createMock(FormInterface::class); $form = $this->createForm();
$this->builder->expects($this->once()) $this->builder->expects($this->once())
->method('getForm') ->method('getForm')
@ -467,6 +468,13 @@ class FormFactoryTest extends TestCase
$this->assertSame($this->builder, $this->builder); $this->assertSame($this->builder, $this->builder);
} }
protected function createForm()
{
$formBuilder = new FormBuilder('', null, new EventDispatcher(), $this->factory);
return $formBuilder->getForm();
}
private function getMockFactory(array $methods = []) private function getMockFactory(array $methods = [])
{ {
return $this->getMockBuilder('Symfony\Component\Form\FormFactory') return $this->getMockBuilder('Symfony\Component\Form\FormFactory')