Merge branch '3.1'

* 3.1:
  [FrameworkBundle] Check for class existence before is_subclass_of
  Update GroupSequence.php
  Code enhancement and cleanup
  [Form] Fix transformer tests after the ICU update
  [DI] Add anti-regression test
  Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)"
  bumped Symfony version to 3.1.5
  updated VERSION for 3.1.4
  updated CHANGELOG for 3.1.4
  bumped Symfony version to 2.8.11
  updated VERSION for 2.8.10
  updated CHANGELOG for 2.8.10
  [BrowserKit] Fix cookie expiration on 32 bit systems
  bumped Symfony version to 2.7.18
  updated VERSION for 2.7.17
  update CONTRIBUTORS for 2.7.17
  updated CHANGELOG for 2.7.17
  Update misleading comment about RFC4627
This commit is contained in:
Nicolas Grekas 2016-09-06 13:07:23 +02:00
commit a2a442b554
44 changed files with 163 additions and 88 deletions

View File

@ -7,6 +7,43 @@ in 3.1 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/v3.1.0...v3.1.1 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.1.0...v3.1.1
* 3.1.4 (2016-09-03)
* bug #19812 [WebProfilerBundle] Fix margin on toolbar route panel when no route is found in the request (jameshalsall)
* bug #19786 Update profiler's layout to use flexbox (javiereguiluz)
* bug #19794 [VarDumper] Various minor fixes & cleanups (nicolas-grekas)
* bug #19751 Fixes the calendar in constructor to handle null (wakqasahmed)
* bug #19743 [symfony/symfony] add "provides" for psr/cache-implementation (alcohol)
* bug #19388 [Validator][GroupSequence] fixed GroupSequence validation ignores PropetyMetadata of parent classes (Sandro Hopf)
* bug #19729 Add symfony/inflector to composer.json "replaces" (teohhanhui)
* bug #19601 [FrameworkBundle] Added friendly exception when constraint validator class does not exist (yceruto)
* bug #19580 [Validator] fixed duplicate constraints with parent class interfaces (dmaicher)
* bug #19647 [Debug] Swap dumper services at bootstrap (lyrixx)
* bug #19685 [DI] Include dynamic services in alternatives (ro0NL)
* bug #19702 [Debug][HttpKernel][VarDumper] Prepare for committed 7.2 changes (aka "small-bc-breaks") (nicolas-grekas)
* bug #19704 [DependencyInjection] PhpDumper::isFrozen inconsistency (allflame)
* bug #19643 [DependencyInjection] Fix service autowiring inheritance (chalasr)
* bug #19649 [Serializer] Fix denormalization of arrays (dunglas)
* bug #19667 [SecurityBundle] Add missing deprecation notice for form_login.intention (ro0NL)
* bug #19666 Verify explicitly that the request IP is a valid IPv4 address (nesk)
* bug #19660 Disable CLI color for Windows 10 greater than 10.0.10586 (mlocati)
* bug #19663 Exception details break the layout (Dionysis Arvanitis)
* bug #19651 [HttpKernel] Fix HttpCache validation HTTP method (tgalopin)
* bug #19650 [FrameworkBundle] Fix default lifetime of cache pools (nicolas-grekas)
* bug #19623 [VarDumper] Fix dumping continuations (nicolas-grekas)
* bug #19437 [PropertyInfo] Fix an error in PropertyInfoCacheExtractor (Ener-Getick)
* bug #19549 [HttpFoundation] fixed Request::getContent() reusage bug (1ma)
* bug #19373 [Form] Skip CSRF validation on form when POST max size is exceeded (jameshalsall)
* bug #19541 Fix #19531 [Form] DateType fails parsing when midnight is not a valid time (mbeccati)
* bug #19567 [Cache] Handle unserialize() failures gracefully (nicolas-grekas)
* bug #19579 [Process] Strengthen Windows pipe files opening (again...) (nicolas-grekas)
* bug #19564 Added class existence check if is_subclass_of() fails in compiler passes (SCIF)
* bug #19551 [Cache] Use SCAN instead of KEYS with Redis >= 2.8 (nicolas-grekas)
* bug #19522 [SwiftMailerBridge] Fix flawed deprecation message (chalasr)
* bug #19510 [Process] Fix double-fread() when reading unix pipes (nicolas-grekas)
* bug #19508 [Process] Fix AbstractPipes::write() for a situation seen on HHVM (at least) (nicolas-grekas)
* bug #19470 undefined offset fix (#19406) (ReenExe)
* 3.1.3 (2016-07-30) * 3.1.3 (2016-07-30)
* bug #19300 [HttpKernel] Use flock() for HttpCache's lock files (mpdude) * bug #19300 [HttpKernel] Use flock() for HttpCache's lock files (mpdude)

View File

@ -16,8 +16,8 @@ Symfony is the result of the work of many people who made the code better
- Kris Wallsmith (kriswallsmith) - Kris Wallsmith (kriswallsmith)
- Jakub Zalas (jakubzalas) - Jakub Zalas (jakubzalas)
- Ryan Weaver (weaverryan) - Ryan Weaver (weaverryan)
- Javier Eguiluz (javier.eguiluz)
- Kévin Dunglas (dunglas) - Kévin Dunglas (dunglas)
- Javier Eguiluz (javier.eguiluz)
- Hugo Hamon (hhamon) - Hugo Hamon (hhamon)
- Abdellatif Ait boudad (aitboudad) - Abdellatif Ait boudad (aitboudad)
- Pascal Borreli (pborreli) - Pascal Borreli (pborreli)
@ -56,17 +56,18 @@ Symfony is the result of the work of many people who made the code better
- Ener-Getick (energetick) - Ener-Getick (energetick)
- Iltar van der Berg (kjarli) - Iltar van der Berg (kjarli)
- Kevin Bond (kbond) - Kevin Bond (kbond)
- Andrej Hudec (pulzarraider)
- Gábor Egyed (1ed) - Gábor Egyed (1ed)
- Michel Weimerskirch (mweimerskirch) - Michel Weimerskirch (mweimerskirch)
- Eric Clemmons (ericclemmons) - Eric Clemmons (ericclemmons)
- Matthias Pigulla (mpdude) - Matthias Pigulla (mpdude)
- Andrej Hudec (pulzarraider)
- Christian Raue - Christian Raue
- Arnout Boks (aboks)
- Charles Sarrazin (csarrazi) - Charles Sarrazin (csarrazi)
- Robin Chalas (chalas_r)
- Deni - Deni
- Henrik Westphal (snc) - Henrik Westphal (snc)
- Dariusz Górecki (canni) - Dariusz Górecki (canni)
- Arnout Boks (aboks)
- Douglas Greenshields (shieldo) - Douglas Greenshields (shieldo)
- Lee McDermott - Lee McDermott
- Brandon Turner - Brandon Turner
@ -80,14 +81,14 @@ Symfony is the result of the work of many people who made the code better
- Toni Uebernickel (havvg) - Toni Uebernickel (havvg)
- Fran Moreno (franmomu) - Fran Moreno (franmomu)
- Antoine Hérault (herzult) - Antoine Hérault (herzult)
- Robin Chalas (chalas_r)
- Arnaud Le Blanc (arnaud-lb) - Arnaud Le Blanc (arnaud-lb)
- Jérôme Tamarelle (gromnan) - Jérôme Tamarelle (gromnan)
- Paráda József (paradajozsef) - Paráda József (paradajozsef)
- Titouan Galopin (tgalopin)
- Michal Piotrowski (eventhorizon) - Michal Piotrowski (eventhorizon)
- Tim Nagel (merk) - Tim Nagel (merk)
- Brice BERNARD (brikou)
- Konstantin Myakshin (koc) - Konstantin Myakshin (koc)
- Brice BERNARD (brikou)
- Alexander M. Turek (derrabus) - Alexander M. Turek (derrabus)
- Dariusz Ruminski - Dariusz Ruminski
- marc.weistroff - marc.weistroff
@ -114,15 +115,14 @@ Symfony is the result of the work of many people who made the code better
- Théo FIDRY (theofidry) - Théo FIDRY (theofidry)
- Robert Schönthal (digitalkaoz) - Robert Schönthal (digitalkaoz)
- Florian Lonqueu-Brochard (florianlb) - Florian Lonqueu-Brochard (florianlb)
- Titouan Galopin (tgalopin)
- Stefano Sala (stefano.sala) - Stefano Sala (stefano.sala)
- Evgeniy (ewgraf)
- Juti Noppornpitak (shiroyuki) - Juti Noppornpitak (shiroyuki)
- Tigran Azatyan (tigranazatyan) - Tigran Azatyan (tigranazatyan)
- Sebastian Hörl (blogsh) - Sebastian Hörl (blogsh)
- Daniel Gomes (danielcsgomes) - Daniel Gomes (danielcsgomes)
- Hidenori Goto (hidenorigoto) - Hidenori Goto (hidenorigoto)
- Sebastiaan Stok (sstok) - Sebastiaan Stok (sstok)
- Evgeniy (ewgraf)
- Tugdual Saunier (tucksaun) - Tugdual Saunier (tucksaun)
- Guilherme Blanco (guilhermeblanco) - Guilherme Blanco (guilhermeblanco)
- Pablo Godel (pgodel) - Pablo Godel (pgodel)
@ -132,6 +132,7 @@ Symfony is the result of the work of many people who made the code better
- Arnaud Kleinpeter (nanocom) - Arnaud Kleinpeter (nanocom)
- Joel Wurtz (brouznouf) - Joel Wurtz (brouznouf)
- Philipp Wahala (hifi) - Philipp Wahala (hifi)
- Vyacheslav Pavlov
- Richard Shank (iampersistent) - Richard Shank (iampersistent)
- Thomas Rabaix (rande) - Thomas Rabaix (rande)
- Vincent AUBERT (vincent) - Vincent AUBERT (vincent)
@ -161,9 +162,9 @@ Symfony is the result of the work of many people who made the code better
- Noel Guilbert (noel) - Noel Guilbert (noel)
- Stepan Anchugov (kix) - Stepan Anchugov (kix)
- bronze1man - bronze1man
- Roland Franssen (ro0)
- sun (sun) - sun (sun)
- Larry Garfield (crell) - Larry Garfield (crell)
- Vyacheslav Pavlov
- Martin Schuhfuß (usefulthink) - Martin Schuhfuß (usefulthink)
- Matthieu Bontemps (mbontemps) - Matthieu Bontemps (mbontemps)
- Pierre Minnieur (pminnieur) - Pierre Minnieur (pminnieur)
@ -179,12 +180,15 @@ Symfony is the result of the work of many people who made the code better
- Justin Hileman (bobthecow) - Justin Hileman (bobthecow)
- Blanchon Vincent (blanchonvincent) - Blanchon Vincent (blanchonvincent)
- Michele Orselli (orso) - Michele Orselli (orso)
- Tom Van Looy (tvlooy)
- Sven Paulus (subsven) - Sven Paulus (subsven)
- Lars Strojny (lstrojny) - Lars Strojny (lstrojny)
- Rui Marinho (ruimarinho) - Rui Marinho (ruimarinho)
- Daniel Espendiller - Daniel Espendiller
- Dawid Nowak
- Eugene Wissner - Eugene Wissner
- Julien Brochet (mewt) - Julien Brochet (mewt)
- Yonel Ceruto González (yonelceruto)
- Sergey Linnik (linniksa) - Sergey Linnik (linniksa)
- Michaël Perrin (michael.perrin) - Michaël Perrin (michael.perrin)
- Marcel Beerta (mazen) - Marcel Beerta (mazen)
@ -205,8 +209,8 @@ Symfony is the result of the work of many people who made the code better
- Danny Berger (dpb587) - Danny Berger (dpb587)
- Jérôme Vasseur - Jérôme Vasseur
- Roman Marintšenko (inori) - Roman Marintšenko (inori)
- Christian Schmidt
- Xavier Montaña Carreras (xmontana) - Xavier Montaña Carreras (xmontana)
- Tom Van Looy (tvlooy)
- Chris Wilkinson (thewilkybarkid) - Chris Wilkinson (thewilkybarkid)
- Mickaël Andrieu (mickaelandrieu) - Mickaël Andrieu (mickaelandrieu)
- Xavier Perez - Xavier Perez
@ -214,8 +218,8 @@ Symfony is the result of the work of many people who made the code better
- Katsuhiro OGAWA - Katsuhiro OGAWA
- Alif Rachmawadi - Alif Rachmawadi
- Kristen Gilden (kgilden) - Kristen Gilden (kgilden)
- Dawid Nowak
- Pierre-Yves LEBECQ (pylebecq) - Pierre-Yves LEBECQ (pylebecq)
- Alex Pott
- Jakub Kucharovic (jkucharovic) - Jakub Kucharovic (jkucharovic)
- Eugene Leonovich (rybakit) - Eugene Leonovich (rybakit)
- Filippo Tessarotto - Filippo Tessarotto
@ -227,8 +231,10 @@ Symfony is the result of the work of many people who made the code better
- Ray - Ray
- Grégoire Paris (greg0ire) - Grégoire Paris (greg0ire)
- Chekote - Chekote
- Tobias Nyholm (tobias)
- Thomas Adam - Thomas Adam
- Albert Casademont (acasademont) - Albert Casademont (acasademont)
- Jhonny Lidfors (jhonne)
- Diego Agulló (aeoris) - Diego Agulló (aeoris)
- jdhoek - jdhoek
- Nikita Konstantinov - Nikita Konstantinov
@ -242,7 +248,6 @@ Symfony is the result of the work of many people who made the code better
- Roumen Damianoff (roumen) - Roumen Damianoff (roumen)
- Antonio J. García Lagar (ajgarlag) - Antonio J. García Lagar (ajgarlag)
- Kim Hemsø Rasmussen (kimhemsoe) - Kim Hemsø Rasmussen (kimhemsoe)
- Christian Schmidt
- Wouter Van Hecke - Wouter Van Hecke
- Peter Kruithof (pkruithof) - Peter Kruithof (pkruithof)
- Michael Holm (hollo) - Michael Holm (hollo)
@ -257,17 +262,15 @@ Symfony is the result of the work of many people who made the code better
- Andrew Moore (finewolf) - Andrew Moore (finewolf)
- Bertrand Zuchuat (garfield-fr) - Bertrand Zuchuat (garfield-fr)
- Gabor Toth (tgabi333) - Gabor Toth (tgabi333)
- Alex Pott
- realmfoo - realmfoo
- Thomas Tourlourat (armetiz) - Thomas Tourlourat (armetiz)
- Andrey Esaulov (andremaha) - Andrey Esaulov (andremaha)
- Tobias Nyholm (tobias)
- Grégoire Passault (gregwar) - Grégoire Passault (gregwar)
- Leo Feyer
- Ismael Ambrosi (iambrosi) - Ismael Ambrosi (iambrosi)
- Uwe Jäger (uwej711) - Uwe Jäger (uwej711)
- Aurelijus Valeiša (aurelijus) - Aurelijus Valeiša (aurelijus)
- Jan Decavele (jandc) - Jan Decavele (jandc)
- Yonel Ceruto González (yonelceruto)
- Gustavo Piltcher - Gustavo Piltcher
- Stepan Tanasiychuk (stfalcon) - Stepan Tanasiychuk (stfalcon)
- Tiago Ribeiro (fixe) - Tiago Ribeiro (fixe)
@ -306,8 +309,8 @@ Symfony is the result of the work of many people who made the code better
- Felix Labrecque - Felix Labrecque
- Yaroslav Kiliba - Yaroslav Kiliba
- Terje Bråten - Terje Bråten
- Roland Franssen (ro0)
- Robbert Klarenbeek (robbertkl) - Robbert Klarenbeek (robbertkl)
- Marek Štípek (maryo)
- Alessandro Chitolina - Alessandro Chitolina
- JhonnyL - JhonnyL
- hossein zolfi (ocean) - hossein zolfi (ocean)
@ -317,6 +320,8 @@ Symfony is the result of the work of many people who made the code better
- Stéphane PY (steph_py) - Stéphane PY (steph_py)
- Philipp Kräutli (pkraeutli) - Philipp Kräutli (pkraeutli)
- Kirill chEbba Chebunin (chebba) - Kirill chEbba Chebunin (chebba)
- Tristan Darricau (nicofuma)
- SpacePossum
- Greg Thornton (xdissent) - Greg Thornton (xdissent)
- Costin Bereveanu (schniper) - Costin Bereveanu (schniper)
- Loïc Chardonnet (gnusat) - Loïc Chardonnet (gnusat)
@ -328,7 +333,6 @@ Symfony is the result of the work of many people who made the code better
- Endre Fejes - Endre Fejes
- Tobias Naumann (tna) - Tobias Naumann (tna)
- Daniel Beyer - Daniel Beyer
- Jhonny Lidfors (jhonne)
- Shein Alexey - Shein Alexey
- Baptiste Lafontaine - Baptiste Lafontaine
- Joe Lencioni - Joe Lencioni
@ -383,7 +387,6 @@ Symfony is the result of the work of many people who made the code better
- cedric lombardot (cedriclombardot) - cedric lombardot (cedriclombardot)
- Jonas Flodén (flojon) - Jonas Flodén (flojon)
- Christian Schmidt - Christian Schmidt
- Marek Štípek (maryo)
- Marcin Sikoń (marphi) - Marcin Sikoń (marphi)
- Dominik Zogg (dominik.zogg) - Dominik Zogg (dominik.zogg)
- Marek Pietrzak - Marek Pietrzak
@ -393,6 +396,7 @@ Symfony is the result of the work of many people who made the code better
- Christian Wahler - Christian Wahler
- Mathieu Lemoine - Mathieu Lemoine
- Gintautas Miselis - Gintautas Miselis
- James Halsall (jaitsu)
- David Badura (davidbadura) - David Badura (davidbadura)
- Zander Baldwin - Zander Baldwin
- Adam Harvey - Adam Harvey
@ -409,7 +413,6 @@ Symfony is the result of the work of many people who made the code better
- Benoît Burnichon (bburnichon) - Benoît Burnichon (bburnichon)
- Sebastian Bergmann - Sebastian Bergmann
- Pablo Díez (pablodip) - Pablo Díez (pablodip)
- SpacePossum
- Kevin McBride - Kevin McBride
- Philipp Rieber (bicpi) - Philipp Rieber (bicpi)
- Manuel de Ruiter (manuel) - Manuel de Ruiter (manuel)
@ -428,6 +431,7 @@ Symfony is the result of the work of many people who made the code better
- Filip Procházka (fprochazka) - Filip Procházka (fprochazka)
- mmoreram - mmoreram
- Markus Lanthaler (lanthaler) - Markus Lanthaler (lanthaler)
- Remi Collet
- Vicent Soria Durá (vicentgodella) - Vicent Soria Durá (vicentgodella)
- Nicolas Dewez (nicolas_dewez) - Nicolas Dewez (nicolas_dewez)
- Anthony Ferrara - Anthony Ferrara
@ -435,7 +439,7 @@ Symfony is the result of the work of many people who made the code better
- Jakub Škvára (jskvara) - Jakub Škvára (jskvara)
- Andrew Udvare (audvare) - Andrew Udvare (audvare)
- alexpods - alexpods
- Tristan Darricau (nicofuma) - Michele Locati
- Erik Trapman (eriktrapman) - Erik Trapman (eriktrapman)
- De Cock Xavier (xdecock) - De Cock Xavier (xdecock)
- Almog Baku (almogbaku) - Almog Baku (almogbaku)
@ -449,13 +453,13 @@ Symfony is the result of the work of many people who made the code better
- DUPUCH (bdupuch) - DUPUCH (bdupuch)
- Benjamin Leveque (benji07) - Benjamin Leveque (benji07)
- Nate (frickenate) - Nate (frickenate)
- Timothée Barray (tyx)
- jhonnyL - jhonnyL
- sasezaki - sasezaki
- Dawid Pakuła (zulusx) - Dawid Pakuła (zulusx)
- Florian Rey (nervo) - Florian Rey (nervo)
- Oskar Stark (oskarstark) - Oskar Stark (oskarstark)
- Rodrigo Borrego Bernabé (rodrigobb) - Rodrigo Borrego Bernabé (rodrigobb)
- Leo Feyer
- MatTheCat - MatTheCat
- Denis Gorbachev (starfall) - Denis Gorbachev (starfall)
- Peter van Dommelen - Peter van Dommelen
@ -557,6 +561,7 @@ Symfony is the result of the work of many people who made the code better
- Hossein Bukhamsin - Hossein Bukhamsin
- Disparity - Disparity
- origaminal - origaminal
- Maxime STEINHAUSSER
- Paweł Wacławczyk (pwc) - Paweł Wacławczyk (pwc)
- Oleg Zinchenko (cystbear) - Oleg Zinchenko (cystbear)
- Johannes Klauss (cloppy) - Johannes Klauss (cloppy)
@ -567,6 +572,7 @@ Symfony is the result of the work of many people who made the code better
- Tiago Brito (blackmx) - Tiago Brito (blackmx)
- Richard van den Brand (ricbra) - Richard van den Brand (ricbra)
- develop - develop
- ReenExe
- Mark Sonnabaum - Mark Sonnabaum
- Richard Quadling - Richard Quadling
- jochenvdv - jochenvdv
@ -596,7 +602,6 @@ Symfony is the result of the work of many people who made the code better
- Lars Vierbergen - Lars Vierbergen
- Dennis Hotson - Dennis Hotson
- Andrew Tchircoff (andrewtch) - Andrew Tchircoff (andrewtch)
- Remi Collet
- michaelwilliams - michaelwilliams
- 1emming - 1emming
- Leevi Graham (leevigraham) - Leevi Graham (leevigraham)
@ -619,7 +624,6 @@ Symfony is the result of the work of many people who made the code better
- possum - possum
- Denis Zunke (donalberto) - Denis Zunke (donalberto)
- Olivier Maisonneuve (olineuve) - Olivier Maisonneuve (olineuve)
- Michele Locati
- Masterklavi - Masterklavi
- Francis Turmel (fturmel) - Francis Turmel (fturmel)
- cgonzalez - cgonzalez
@ -630,6 +634,7 @@ Symfony is the result of the work of many people who made the code better
- Harm van Tilborg - Harm van Tilborg
- Jan Prieser - Jan Prieser
- Adrien Lucas (adrienlucas) - Adrien Lucas (adrienlucas)
- Zhuravlev Alexander (scif)
- James Michael DuPont - James Michael DuPont
- Tom Klingenberg - Tom Klingenberg
- Christopher Hall (mythmakr) - Christopher Hall (mythmakr)
@ -681,7 +686,6 @@ Symfony is the result of the work of many people who made the code better
- abdul malik ikhsan (samsonasik) - abdul malik ikhsan (samsonasik)
- Henry Snoek (snoek09) - Henry Snoek (snoek09)
- Simone Di Maulo (toretto460) - Simone Di Maulo (toretto460)
- Timothée Barray (tyx)
- Sander Toonen (xatoo) - Sander Toonen (xatoo)
- Christian Morgan - Christian Morgan
- Alexander Miehe (engerim) - Alexander Miehe (engerim)
@ -801,7 +805,6 @@ Symfony is the result of the work of many people who made the code better
- Ken Marfilla (marfillaster) - Ken Marfilla (marfillaster)
- benatespina (benatespina) - benatespina (benatespina)
- Denis Kop - Denis Kop
- Maxime STEINHAUSSER
- jfcixmedia - jfcixmedia
- Martijn Evers - Martijn Evers
- Benjamin Paap (benjaminpaap) - Benjamin Paap (benjaminpaap)
@ -834,6 +837,7 @@ Symfony is the result of the work of many people who made the code better
- Rodrigo Díez Villamuera (rodrigodiez) - Rodrigo Díez Villamuera (rodrigodiez)
- e-ivanov - e-ivanov
- Jochen Bayer (jocl) - Jochen Bayer (jocl)
- Matteo Beccati (matteobeccati)
- Jeremy Bush - Jeremy Bush
- wizhippo - wizhippo
- Viacheslav Sychov - Viacheslav Sychov
@ -855,6 +859,7 @@ Symfony is the result of the work of many people who made the code better
- Gustavo Adrian - Gustavo Adrian
- Yannick - Yannick
- spdionis - spdionis
- Taras Girnyk
- Eduardo García Sanz (coma) - Eduardo García Sanz (coma)
- James Gilliland - James Gilliland
- Rhodri Pugh (rodnaph) - Rhodri Pugh (rodnaph)
@ -882,6 +887,7 @@ Symfony is the result of the work of many people who made the code better
- Christian Sciberras - Christian Sciberras
- Clement Herreman (clemherreman) - Clement Herreman (clemherreman)
- Dan Ionut Dumitriu (danionut90) - Dan Ionut Dumitriu (danionut90)
- David Maicher (dmaicher)
- Nyro (nyro) - Nyro (nyro)
- Marco - Marco
- Marc Torres - Marc Torres
@ -946,6 +952,7 @@ Symfony is the result of the work of many people who made the code better
- ShiraNai7 - ShiraNai7
- Vašek Purchart (vasek-purchart) - Vašek Purchart (vasek-purchart)
- Janusz Jabłoński (yanoosh) - Janusz Jabłoński (yanoosh)
- Sandro Hopf
- Łukasz Makuch - Łukasz Makuch
- George Giannoulopoulos - George Giannoulopoulos
- Daniel Richter (richtermeister) - Daniel Richter (richtermeister)
@ -971,7 +978,6 @@ Symfony is the result of the work of many people who made the code better
- WedgeSama - WedgeSama
- Felds Liscia - Felds Liscia
- Ahmed TAILOULOUTE (ahmedtai) - Ahmed TAILOULOUTE (ahmedtai)
- James Halsall (jaitsu)
- Maxime Veber (nek-) - Maxime Veber (nek-)
- Sullivan SENECHAL - Sullivan SENECHAL
- Tadcka - Tadcka
@ -1026,6 +1032,7 @@ Symfony is the result of the work of many people who made the code better
- Valentin VALCIU - Valentin VALCIU
- Kevin Dew - Kevin Dew
- James Cowgill - James Cowgill
- 1ma (jautenim)
- Nicolas Schwartz (nicoschwartz) - Nicolas Schwartz (nicoschwartz)
- Patrik Gmitter (patie) - Patrik Gmitter (patie)
- Jonathan Gough - Jonathan Gough
@ -1102,8 +1109,8 @@ Symfony is the result of the work of many people who made the code better
- David Stone - David Stone
- Jovan Perovic (jperovic) - Jovan Perovic (jperovic)
- Pablo Maria Martelletti (pmartelletti) - Pablo Maria Martelletti (pmartelletti)
- Zhuravlev Alexander (scif)
- Yassine Guedidi (yguedidi) - Yassine Guedidi (yguedidi)
- Waqas Ahmed
- Luis Muñoz - Luis Muñoz
- Andreas - Andreas
- Thomas Chmielowiec - Thomas Chmielowiec
@ -1185,6 +1192,7 @@ Symfony is the result of the work of many people who made the code better
- Adam - Adam
- devel - devel
- taiiiraaa - taiiiraaa
- Johann Pardanaud
- Trevor Suarez - Trevor Suarez
- gedrox - gedrox
- dropfen - dropfen
@ -1313,6 +1321,7 @@ Symfony is the result of the work of many people who made the code better
- Joseph Deray - Joseph Deray
- Damian Sromek - Damian Sromek
- Ben - Ben
- Evgeniy Tetenchuk
- dasmfm - dasmfm
- Arnaud Buathier (arnapou) - Arnaud Buathier (arnapou)
- chesteroni (chesteroni) - chesteroni (chesteroni)
@ -1403,6 +1412,7 @@ Symfony is the result of the work of many people who made the code better
- Benjamin Long - Benjamin Long
- Matt Janssen - Matt Janssen
- Peter Gribanov - Peter Gribanov
- Ben Johnson
- kwiateusz - kwiateusz
- David Soria Parra - David Soria Parra
- Sergiy Sokolenko - Sergiy Sokolenko
@ -1526,6 +1536,7 @@ Symfony is the result of the work of many people who made the code better
- smokeybear87 - smokeybear87
- Gustavo Adrian - Gustavo Adrian
- Kevin Weber - Kevin Weber
- Dionysis Arvanitis
- Sergey Fedotov - Sergey Fedotov
- Michael - Michael
- fh-github@fholzhauer.de - fh-github@fholzhauer.de

View File

@ -336,7 +336,7 @@ abstract class AbstractDoctrineExtension extends Extension
$memcacheClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.memcache.class').'%'; $memcacheClass = !empty($cacheDriver['class']) ? $cacheDriver['class'] : '%'.$this->getObjectManagerElementName('cache.memcache.class').'%';
$memcacheInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%'.$this->getObjectManagerElementName('cache.memcache_instance.class').'%'; $memcacheInstanceClass = !empty($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%'.$this->getObjectManagerElementName('cache.memcache_instance.class').'%';
$memcacheHost = !empty($cacheDriver['host']) ? $cacheDriver['host'] : '%'.$this->getObjectManagerElementName('cache.memcache_host').'%'; $memcacheHost = !empty($cacheDriver['host']) ? $cacheDriver['host'] : '%'.$this->getObjectManagerElementName('cache.memcache_host').'%';
$memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && $cacheDriver['port'] === 0) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%'; $memcachePort = !empty($cacheDriver['port']) || (isset($cacheDriver['port']) && $cacheDriver['port'] === 0) ? $cacheDriver['port'] : '%'.$this->getObjectManagerElementName('cache.memcache_port').'%';
$cacheDef = new Definition($memcacheClass); $cacheDef = new Definition($memcacheClass);
$memcacheInstance = new Definition($memcacheInstanceClass); $memcacheInstance = new Definition($memcacheInstanceClass);
$memcacheInstance->addMethodCall('connect', array( $memcacheInstance->addMethodCall('connect', array(

View File

@ -139,7 +139,6 @@ EOF
return; return;
} }
if ($type === 'functions' || $type === 'filters') { if ($type === 'functions' || $type === 'filters') {
$args = array();
$cb = $entity->getCallable(); $cb = $entity->getCallable();
if (is_null($cb)) { if (is_null($cb)) {
return; return;

View File

@ -29,7 +29,7 @@ class YamlLintCommand extends BaseLintCommand
parent::configure(); parent::configure();
$this->setHelp( $this->setHelp(
$this->getHelp().<<<EOF $this->getHelp().<<<EOF
Or find all files in a bundle: Or find all files in a bundle:

View File

@ -35,6 +35,10 @@ class AddConsoleCommandPass implements CompilerPassInterface
$class = $container->getParameterBag()->resolveValue($definition->getClass()); $class = $container->getParameterBag()->resolveValue($definition->getClass());
if (!is_subclass_of($class, 'Symfony\\Component\\Console\\Command\\Command')) { if (!is_subclass_of($class, 'Symfony\\Component\\Console\\Command\\Command')) {
if (!class_exists($class, false)) {
throw new \InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
}
throw new \InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must be a subclass of "Symfony\\Component\\Console\\Command\\Command".', $id)); throw new \InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must be a subclass of "Symfony\\Component\\Console\\Command\\Command".', $id));
} }
$container->setAlias($serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class)), $id); $container->setAlias($serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class)), $id);

View File

@ -113,8 +113,6 @@ class WebDebugToolbarListener implements EventSubscriberInterface
/** /**
* Injects the web debug toolbar into the given Response. * Injects the web debug toolbar into the given Response.
*
* @param Response $response A Response instance
*/ */
protected function injectToolbar(Response $response, Request $request, array $nonces) protected function injectToolbar(Response $response, Request $request, array $nonces)
{ {

View File

@ -76,7 +76,7 @@ class Cookie
throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.', $expires)); throw new \UnexpectedValueException(sprintf('The cookie expiration time "%s" is not valid.', $expires));
} }
$this->expires = $timestampAsDateTime->getTimestamp(); $this->expires = $timestampAsDateTime->format('U');
} }
} }
@ -205,13 +205,13 @@ class Cookie
foreach (self::$dateFormats as $dateFormat) { foreach (self::$dateFormats as $dateFormat) {
if (false !== $date = \DateTime::createFromFormat($dateFormat, $dateValue, new \DateTimeZone('GMT'))) { if (false !== $date = \DateTime::createFromFormat($dateFormat, $dateValue, new \DateTimeZone('GMT'))) {
return $date->getTimestamp(); return $date->format('U');
} }
} }
// attempt a fallback for unusual formatting // attempt a fallback for unusual formatting
if (false !== $date = date_create($dateValue, new \DateTimeZone('GMT'))) { if (false !== $date = date_create($dateValue, new \DateTimeZone('GMT'))) {
return $date->getTimestamp(); return $date->format('U');
} }
throw new \InvalidArgumentException(sprintf('Could not parse date "%s".', $dateValue)); throw new \InvalidArgumentException(sprintf('Could not parse date "%s".', $dateValue));
@ -304,6 +304,6 @@ class Cookie
*/ */
public function isExpired() public function isExpired()
{ {
return null !== $this->expires && 0 !== $this->expires && $this->expires < time(); return null !== $this->expires && 0 != $this->expires && $this->expires < time();
} }
} }

View File

@ -178,7 +178,7 @@ class CookieTest extends \PHPUnit_Framework_TestCase
} }
/** /**
* @expectedException UnexpectedValueException * @expectedException \UnexpectedValueException
* @expectedExceptionMessage The cookie expiration time "string" is not valid. * @expectedExceptionMessage The cookie expiration time "string" is not valid.
*/ */
public function testConstructException() public function testConstructException()

View File

@ -572,6 +572,8 @@ class Command
* Add a command usage example. * Add a command usage example.
* *
* @param string $usage The usage, it'll be prefixed with the command name * @param string $usage The usage, it'll be prefixed with the command name
*
* @return Command The current instance
*/ */
public function addUsage($usage) public function addUsage($usage)
{ {

View File

@ -98,7 +98,7 @@ class MarkdownDescriptor extends Descriptor
.'* Description: '.($command->getDescription() ?: '<none>')."\n" .'* Description: '.($command->getDescription() ?: '<none>')."\n"
.'* Usage:'."\n\n" .'* Usage:'."\n\n"
.array_reduce(array_merge(array($command->getSynopsis()), $command->getAliases(), $command->getUsages()), function ($carry, $usage) { .array_reduce(array_merge(array($command->getSynopsis()), $command->getAliases(), $command->getUsages()), function ($carry, $usage) {
return $carry .= ' * `'.$usage.'`'."\n"; return $carry.' * `'.$usage.'`'."\n";
}) })
); );

View File

@ -215,6 +215,7 @@ class QuestionHelper extends Helper
* *
* @param OutputInterface $output * @param OutputInterface $output
* @param Question $question * @param Question $question
* @param resource $inputStream
* *
* @return string * @return string
*/ */
@ -331,7 +332,8 @@ class QuestionHelper extends Helper
/** /**
* Gets a hidden response from user. * Gets a hidden response from user.
* *
* @param OutputInterface $output An Output instance * @param OutputInterface $output An Output instance
* @param resource $inputStream The handler resource
* *
* @return string The answer * @return string The answer
* *

View File

@ -108,13 +108,6 @@ class HelperSetTest extends \PHPUnit_Framework_TestCase
} }
} }
/**
* Create a generic mock for the helper interface. Optionally check for a call to setHelperSet with a specific
* helperset instance.
*
* @param string $name
* @param HelperSet $helperset allows a mock to verify a particular helperset set is being added to the Helper
*/
private function getGenericMockHelper($name, HelperSet $helperset = null) private function getGenericMockHelper($name, HelperSet $helperset = null)
{ {
$mock_helper = $this->getMock('\Symfony\Component\Console\Helper\HelperInterface'); $mock_helper = $this->getMock('\Symfony\Component\Console\Helper\HelperInterface');

View File

@ -70,9 +70,6 @@ class Translator implements TranslatorInterface
*/ */
private $attributeMatchingTranslators = array(); private $attributeMatchingTranslators = array();
/**
* Constructor.
*/
public function __construct(ParserInterface $parser = null) public function __construct(ParserInterface $parser = null)
{ {
$this->mainParser = $parser ?: new Parser(); $this->mainParser = $parser ?: new Parser();

View File

@ -352,10 +352,12 @@ class ErrorHandler
/** /**
* Handles errors by filtering then logging them according to the configured bit fields. * Handles errors by filtering then logging them according to the configured bit fields.
* *
* @param int $type One of the E_* constants * @param int $type One of the E_* constants
* @param string $message
* @param string $file * @param string $file
* @param int $line * @param int $line
* @param array $context * @param array $context
* @param array $backtrace
* *
* @return bool Returns false when no handling happens so that the PHP engine can handle the error itself * @return bool Returns false when no handling happens so that the PHP engine can handle the error itself
* *

View File

@ -39,7 +39,7 @@ class ServiceReferenceGraphEdge
/** /**
* Returns the value of the edge. * Returns the value of the edge.
* *
* @return ServiceReferenceGraphNode * @return string
*/ */
public function getValue() public function getValue()
{ {

View File

@ -209,6 +209,18 @@ class ContainerTest extends \PHPUnit_Framework_TestCase
} }
} }
/**
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
* @expectedExcepionMessage You have requested a synthetic service ("request"). The DIC does not know how to construct this service.
*/
public function testGetSyntheticServiceAlwaysThrows()
{
require_once __DIR__.'/Fixtures/php/services9.php';
$container = new \ProjectServiceContainer();
$container->get('request', ContainerInterface::NULL_ON_INVALID_REFERENCE);
}
public function testHas() public function testHas()
{ {
$sc = new ProjectServiceContainer(); $sc = new ProjectServiceContainer();

View File

@ -189,7 +189,7 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
/** /**
* @dataProvider provideInvalidFactories * @dataProvider provideInvalidFactories
* @expectedException Symfony\Component\DependencyInjection\Exception\RuntimeException * @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
* @expectedExceptionMessage Cannot dump definition * @expectedExceptionMessage Cannot dump definition
*/ */
public function testInvalidFactories($factory) public function testInvalidFactories($factory)

View File

@ -60,6 +60,10 @@ class TokenStream
/** /**
* Tests a token. * Tests a token.
*
* @param array|int $type The type to test
* @param string|null $value The token value
* @param string|null $message The syntax error message
*/ */
public function expect($type, $value = null, $message = null) public function expect($type, $value = null, $message = null)
{ {

View File

@ -285,6 +285,8 @@ class Filesystem
* *
* @param string $filename Path to the file * @param string $filename Path to the file
* *
* @return bool
*
* @throws IOException When windows path is longer than 258 characters * @throws IOException When windows path is longer than 258 characters
*/ */
private function isReadable($filename) private function isReadable($filename)

View File

@ -177,12 +177,13 @@ class ArrayChoiceList implements ChoiceListInterface
/** /**
* Flattens an array into the given output variables. * Flattens an array into the given output variables.
* *
* @param array $choices The array to flatten * @param array $choices The array to flatten
* @param callable $value The callable for generating choice values * @param callable $value The callable for generating choice values
* @param array $choicesByValues The flattened choices indexed by the * @param array $choicesByValues The flattened choices indexed by the
* corresponding values * corresponding values
* @param array $keysByValues The original keys indexed by the * @param array $keysByValues The original keys indexed by the
* corresponding values * corresponding values
* @param array $structuredValues The values indexed by the original keys
* *
* @internal Must not be used by user-land code * @internal Must not be used by user-land code
*/ */

View File

@ -177,8 +177,6 @@ class DateTimeToLocalizedStringTransformer extends BaseDateTimeTransformer
/** /**
* Checks if the pattern contains only a date. * Checks if the pattern contains only a date.
* *
* @param string $pattern The input pattern
*
* @return bool * @return bool
*/ */
protected function isPatternDateOnly() protected function isPatternDateOnly()

View File

@ -23,14 +23,8 @@ use Symfony\Component\Validator\ConstraintViolationInterface;
*/ */
class FormDataExtractor implements FormDataExtractorInterface class FormDataExtractor implements FormDataExtractorInterface
{ {
/**
* @var ValueExporter
*/
private $valueExporter; private $valueExporter;
/**
* Constructs a new data extractor.
*/
public function __construct(ValueExporter $valueExporter = null) public function __construct(ValueExporter $valueExporter = null)
{ {
$this->valueExporter = $valueExporter ?: new ValueExporter(); $this->valueExporter = $valueExporter ?: new ValueExporter();

View File

@ -108,10 +108,10 @@ class IntegerToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCas
public function testReverseTransformWithGrouping() public function testReverseTransformWithGrouping()
{ {
// Since we test against "de_AT", we need the full implementation // Since we test against "de_DE", we need the full implementation
IntlTestHelper::requireFullIntl($this); IntlTestHelper::requireFullIntl($this);
\Locale::setDefault('de_AT'); \Locale::setDefault('de_DE');
$transformer = new IntegerToLocalizedStringTransformer(null, true); $transformer = new IntegerToLocalizedStringTransformer(null, true);

View File

@ -54,8 +54,8 @@ class NumberToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
public function provideTransformationsWithGrouping() public function provideTransformationsWithGrouping()
{ {
return array( return array(
array(1234.5, '1.234,5', 'de_AT'), array(1234.5, '1.234,5', 'de_DE'),
array(12345.912, '12.345,912', 'de_AT'), array(12345.912, '12.345,912', 'de_DE'),
array(1234.5, '1 234,5', 'fr'), array(1234.5, '1 234,5', 'fr'),
array(1234.5, '1 234,5', 'ru'), array(1234.5, '1 234,5', 'ru'),
array(1234.5, '1 234,5', 'fi'), array(1234.5, '1 234,5', 'fi'),
@ -393,10 +393,10 @@ class NumberToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
*/ */
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot() public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDot()
{ {
// Since we test against "de_AT", we need the full implementation // Since we test against "de_DE", we need the full implementation
IntlTestHelper::requireFullIntl($this); IntlTestHelper::requireFullIntl($this);
\Locale::setDefault('de_AT'); \Locale::setDefault('de_DE');
$transformer = new NumberToLocalizedStringTransformer(null, true); $transformer = new NumberToLocalizedStringTransformer(null, true);
@ -408,10 +408,10 @@ class NumberToLocalizedStringTransformerTest extends \PHPUnit_Framework_TestCase
*/ */
public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep() public function testDecimalSeparatorMayNotBeDotIfGroupingSeparatorIsDotWithNoGroupSep()
{ {
// Since we test against "de_AT", we need the full implementation // Since we test against "de_DE", we need the full implementation
IntlTestHelper::requireFullIntl($this); IntlTestHelper::requireFullIntl($this);
\Locale::setDefault('de_AT'); \Locale::setDefault('de_DE');
$transformer = new NumberToLocalizedStringTransformer(null, true); $transformer = new NumberToLocalizedStringTransformer(null, true);

View File

@ -27,7 +27,7 @@ class JsonResponse extends Response
protected $data; protected $data;
protected $callback; protected $callback;
// Encode <, >, ', &, and " for RFC4627-compliant JSON, which may also be embedded into HTML. // Encode <, >, ', &, and " characters in the JSON, making it also safe to be embedded into HTML.
// 15 === JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT // 15 === JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT
const DEFAULT_ENCODING_OPTIONS = 15; const DEFAULT_ENCODING_OPTIONS = 15;
@ -51,7 +51,18 @@ class JsonResponse extends Response
} }
/** /**
* {@inheritdoc} * Factory method for chainability.
*
* Example:
*
* return JsonResponse::create($data, 200)
* ->setSharedMaxAge(300);
*
* @param mixed $data The json response data
* @param int $status The response status code
* @param array $headers An array of response headers
*
* @return JsonResponse
*/ */
public static function create($data = null, $status = 200, $headers = array()) public static function create($data = null, $status = 200, $headers = array())
{ {

View File

@ -72,6 +72,8 @@ interface FlashBagInterface extends SessionBagInterface
/** /**
* Sets all flash messages. * Sets all flash messages.
*
* @param array $messages
*/ */
public function setAll(array $messages); public function setAll(array $messages);

View File

@ -214,6 +214,8 @@ class MongoDbSessionHandler implements \SessionHandlerInterface
* Return an instance of a MongoDate or \MongoDB\BSON\UTCDateTime * Return an instance of a MongoDate or \MongoDB\BSON\UTCDateTime
* *
* @param int $seconds An integer representing UTC seconds since Jan 1 1970. Defaults to now. * @param int $seconds An integer representing UTC seconds since Jan 1 1970. Defaults to now.
*
* @return \MongoDate|\MongoDB\BSON\UTCDateTime
*/ */
private function createDateTime($seconds = null) private function createDateTime($seconds = null)
{ {

View File

@ -42,6 +42,7 @@ class LazyLoadingFragmentHandler extends FragmentHandler
/** /**
* Adds a service as a fragment renderer. * Adds a service as a fragment renderer.
* *
* @param string $name The service name
* @param string $renderer The render service id * @param string $renderer The render service id
*/ */
public function addRendererService($name, $renderer) public function addRendererService($name, $renderer)

View File

@ -78,7 +78,7 @@ class Profiler
* *
* @param Response $response A Response instance * @param Response $response A Response instance
* *
* @return Profile A Profile instance * @return Profile|false A Profile instance
*/ */
public function loadProfileFromResponse(Response $response) public function loadProfileFromResponse(Response $response)
{ {

View File

@ -21,7 +21,7 @@ use Symfony\Component\HttpKernel\KernelEvents;
class ValidateRequestListenerTest extends \PHPUnit_Framework_TestCase class ValidateRequestListenerTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* @expectedException Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException * @expectedException \Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException
*/ */
public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps() public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps()
{ {

View File

@ -303,7 +303,7 @@ class HttpKernelTest extends \PHPUnit_Framework_TestCase
} }
/** /**
* @expectedException Symfony\Component\HttpKernel\Exception\BadRequestHttpException * @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
*/ */
public function testInconsistentClientIpsOnMasterRequests() public function testInconsistentClientIpsOnMasterRequests()
{ {

View File

@ -98,7 +98,7 @@ class UriSigner
$host = isset($url['host']) ? $url['host'] : ''; $host = isset($url['host']) ? $url['host'] : '';
$port = isset($url['port']) ? ':'.$url['port'] : ''; $port = isset($url['port']) ? ':'.$url['port'] : '';
$user = isset($url['user']) ? $url['user'] : ''; $user = isset($url['user']) ? $url['user'] : '';
$pass = isset($url['pass']) ? ':'.$url['pass'] : ''; $pass = isset($url['pass']) ? ':'.$url['pass'] : '';
$pass = ($user || $pass) ? "$pass@" : ''; $pass = ($user || $pass) ? "$pass@" : '';
$path = isset($url['path']) ? $url['path'] : ''; $path = isset($url['path']) ? $url['path'] : '';
$query = isset($url['query']) && $url['query'] ? '?'.$url['query'] : ''; $query = isset($url['query']) && $url['query'] ? '?'.$url['query'] : '';

View File

@ -550,7 +550,7 @@ class IntlDateFormatter
try { try {
$this->dateTimeZone = new \DateTimeZone($timeZoneId); $this->dateTimeZone = new \DateTimeZone($timeZoneId);
if ('GMT' !== $timeZoneId && $this->dateTimeZone->getName() !== $timeZoneId) { if ('GMT' !== $timeZoneId && $this->dateTimeZone->getName() !== $timeZoneId) {
$timeZoneId = $timeZone = $this->getTimeZoneId(); $timeZone = $this->getTimeZoneId();
} }
} catch (\Exception $e) { } catch (\Exception $e) {
$timeZoneId = $timeZone = $this->getTimeZoneId(); $timeZoneId = $timeZone = $this->getTimeZoneId();

View File

@ -42,6 +42,7 @@ class LanguageBundle extends LanguageDataProvider implements LanguageBundleInter
* @param string $path * @param string $path
* @param BundleEntryReaderInterface $reader * @param BundleEntryReaderInterface $reader
* @param LocaleDataProvider $localeProvider * @param LocaleDataProvider $localeProvider
* @param ScriptDataProvider $scriptProvider
*/ */
public function __construct($path, BundleEntryReaderInterface $reader, LocaleDataProvider $localeProvider, ScriptDataProvider $scriptProvider) public function __construct($path, BundleEntryReaderInterface $reader, LocaleDataProvider $localeProvider, ScriptDataProvider $scriptProvider)
{ {

View File

@ -939,7 +939,7 @@ class ProcessTest extends \PHPUnit_Framework_TestCase
/** /**
* @dataProvider provideMethodsThatNeedATerminatedProcess * @dataProvider provideMethodsThatNeedATerminatedProcess
* @expectedException Symfony\Component\Process\Exception\LogicException * @expectedException \Symfony\Component\Process\Exception\LogicException
* @expectedExceptionMessage Process must be terminated before calling * @expectedExceptionMessage Process must be terminated before calling
*/ */
public function testMethodsThatNeedATerminatedProcess($method) public function testMethodsThatNeedATerminatedProcess($method)

View File

@ -101,7 +101,7 @@ class RememberMeListenerTest extends \PHPUnit_Framework_TestCase
} }
/** /**
* @expectedException Symfony\Component\Security\Core\Exception\AuthenticationException * @expectedException \Symfony\Component\Security\Core\Exception\AuthenticationException
* @expectedExceptionMessage Authentication failed. * @expectedExceptionMessage Authentication failed.
*/ */
public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation() public function testOnCoreSecurityIgnoresAuthenticationOptionallyRethrowsExceptionThrownAuthenticationManagerImplementation()

View File

@ -142,6 +142,7 @@ class PhpEngine implements EngineInterface, \ArrayAccess
throw new \InvalidArgumentException('Invalid parameter (view)'); throw new \InvalidArgumentException('Invalid parameter (view)');
} }
// the view variable is exposed to the require file below
$view = $this; $view = $this;
if ($this->evalTemplate instanceof FileStorage) { if ($this->evalTemplate instanceof FileStorage) {
extract($this->evalParameters, EXTR_SKIP); extract($this->evalParameters, EXTR_SKIP);

View File

@ -26,7 +26,7 @@ class MoFileDumper extends FileDumper
*/ */
public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array()) public function formatCatalogue(MessageCatalogue $messages, $domain, array $options = array())
{ {
$output = $sources = $targets = $sourceOffsets = $targetOffsets = ''; $sources = $targets = $sourceOffsets = $targetOffsets = '';
$offsets = array(); $offsets = array();
$size = 0; $size = 0;

View File

@ -80,7 +80,7 @@ class MoFileLoader extends FileLoader
$messages = array(); $messages = array();
for ($i = 0; $i < $count; ++$i) { for ($i = 0; $i < $count; ++$i) {
$singularId = $pluralId = null; $pluralId = null;
$translated = null; $translated = null;
fseek($stream, $offsetId + $i * 8); fseek($stream, $offsetId + $i * 8);

View File

@ -17,7 +17,7 @@ namespace Symfony\Component\Validator\Constraints;
* When validating a group sequence, each group will only be validated if all * When validating a group sequence, each group will only be validated if all
* of the previous groups in the sequence succeeded. For example: * of the previous groups in the sequence succeeded. For example:
* *
* $validator->validate($address, null, new GroupSequence('Basic', 'Strict')); * $validator->validate($address, null, new GroupSequence(array('Basic', 'Strict')));
* *
* In the first step, all constraints that belong to the group "Basic" will be * In the first step, all constraints that belong to the group "Basic" will be
* validated. If none of the constraints fail, the validator will then validate * validated. If none of the constraints fail, the validator will then validate

View File

@ -37,6 +37,7 @@ abstract class AbstractTest extends AbstractValidatorTest
/** /**
* @param MetadataFactoryInterface $metadataFactory * @param MetadataFactoryInterface $metadataFactory
* @param array $objectInitializers
* *
* @return ValidatorInterface * @return ValidatorInterface
*/ */

View File

@ -25,7 +25,6 @@ class VarCloner extends AbstractCloner
protected function doClone($var) protected function doClone($var)
{ {
$useExt = $this->useExt; $useExt = $this->useExt;
$i = 0; // Current iteration position in $queue
$len = 1; // Length of $queue $len = 1; // Length of $queue
$pos = 0; // Number of cloned items past the first level $pos = 0; // Number of cloned items past the first level
$refsCounter = 0; // Hard references counter $refsCounter = 0; // Hard references counter

View File

@ -158,8 +158,9 @@ abstract class AbstractDumper implements DataDumperInterface, DumperInterface
/** /**
* Generic line dumper callback. * Generic line dumper callback.
* *
* @param string $line The line to write * @param string $line The line to write
* @param int $depth The recursive depth in the dumped structure * @param int $depth The recursive depth in the dumped structure
* @param string $indentPad The line indent pad
*/ */
protected function echoLine($line, $depth, $indentPad) protected function echoLine($line, $depth, $indentPad)
{ {