Skip to content

Commit

Permalink
Merge branch '3.4' into 4.1
Browse files Browse the repository at this point in the history
* 3.4:
  change timezone to fix tests on Windows
  bumped Symfony version to 3.4.21
  updated VERSION for 3.4.20
  update CONTRIBUTORS for 3.4.20
  updated CHANGELOG for 3.4.20
  • Loading branch information
xabbuh committed Dec 8, 2018
2 parents 9455c0b + 6f5356c commit 23e5e45
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 14 deletions.
36 changes: 24 additions & 12 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Symfony is the result of the work of many people who made the code better
- Ryan Weaver (weaverryan)
- Javier Eguiluz (javier.eguiluz)
- Grégoire Pineau (lyrixx)
- Hugo Hamon (hhamon)
- Roland Franssen (ro0)
- Hugo Hamon (hhamon)
- Abdellatif Ait boudad (aitboudad)
- Romain Neutron (romain)
- Pascal Borreli (pborreli)
Expand Down Expand Up @@ -56,12 +56,12 @@ Symfony is the result of the work of many people who made the code better
- Bulat Shakirzyanov (avalanche123)
- Matthias Pigulla (mpdude)
- Peter Rehm (rpet)
- Jérémy DERUSSÉ (jderusse)
- Saša Stamenković (umpirsky)
- Pierre du Plessis (pierredup)
- Kevin Bond (kbond)
- Henrik Bjørnskov (henrikbjorn)
- Miha Vrhovnik
- Jérémy DERUSSÉ (jderusse)
- Diego Saint Esteben (dii3g0)
- Alexander M. Turek (derrabus)
- Konstantin Kudryashov (everzet)
Expand Down Expand Up @@ -122,18 +122,18 @@ Symfony is the result of the work of many people who made the code better
- Joshua Thijssen
- excelwebzone
- Gordon Franke (gimler)
- Chris Wilkinson (thewilkybarkid)
- Javier Spagnoletti (phansys)
- Fabien Pennequin (fabienpennequin)
- Eric GELOEN (gelo)
- Sebastiaan Stok (sstok)
- Jérôme Vasseur (jvasseur)
- Lars Strojny (lstrojny)
- Daniel Wehner (dawehner)
- Tugdual Saunier (tucksaun)
- Javier Spagnoletti (phansys)
- Théo FIDRY (theofidry)
- Robert Schönthal (digitalkaoz)
- Florian Lonqueu-Brochard (florianlb)
- Chris Wilkinson (thewilkybarkid)
- Stefano Sala (stefano.sala)
- Evgeniy (ewgraf)
- Alex Pott
Expand Down Expand Up @@ -165,6 +165,7 @@ Symfony is the result of the work of many people who made the code better
- Rouven Weßling (realityking)
- Clemens Tolboom
- Helmer Aaviksoo
- Alessandro Chitolina (alekitto)
- Hiromi Hishida (77web)
- Niels Keurentjes (curry684)
- Matthieu Ouellette-Vachon (maoueh)
Expand All @@ -181,7 +182,7 @@ Symfony is the result of the work of many people who made the code better
- Matthieu Napoli (mnapoli)
- Florent Mata (fmata)
- Warnar Boekkooi (boekkooi)
- Alessandro Chitolina (alekitto)
- Thomas Calvet (fancyweb)
- Dmitrii Chekaliuk (lazyhammer)
- Clément JOBEILI (dator)
- Daniel Espendiller
Expand All @@ -195,7 +196,6 @@ Symfony is the result of the work of many people who made the code better
- DQNEO
- Benjamin Dulau (dbenjamin)
- Mathieu Lemoine (lemoinem)
- Thomas Calvet (fancyweb)
- Christian Schmidt
- Andreas Hucks (meandmymonkey)
- Noel Guilbert (noel)
Expand All @@ -217,6 +217,7 @@ Symfony is the result of the work of many people who made the code better
- Jeremy Livingston (jeremylivingston)
- Michael Lee (zerustech)
- Matthieu Auger (matthieuauger)
- Oskar Stark (oskarstark)
- Leszek Prabucki (l3l0)
- François Zaninotto (fzaninotto)
- Dustin Whittle (dustinwhittle)
Expand All @@ -241,12 +242,12 @@ Symfony is the result of the work of many people who made the code better
- Rob Frawley 2nd (robfrawley)
- julien pauli (jpauli)
- Lorenz Schori
- Oskar Stark (oskarstark)
- Sébastien Lavoie (lavoiesl)
- Gregor Harlan (gharlan)
- Dariusz
- Francois Zaninotto
- Alexander Kotynia (olden)
- Fabien Bourigault (fbourigault)
- Daniel Tschinder
- Christian Schmidt
- Marcos Sánchez
Expand Down Expand Up @@ -295,7 +296,6 @@ Symfony is the result of the work of many people who made the code better
- Thomas Lallement (raziel057)
- mcfedr (mcfedr)
- Colin O'Dell (colinodell)
- Fabien Bourigault (fbourigault)
- Giorgio Premi
- Jan Schädlich (jschaedl)
- Beau Simensen (simensen)
Expand Down Expand Up @@ -571,6 +571,7 @@ Symfony is the result of the work of many people who made the code better
- Marcin Chyłek (songoq)
- Ben Scott
- Ned Schwartz
- Samuel NELA (snela)
- Ziumin
- Jeremy Benoist
- fritzmg
Expand Down Expand Up @@ -621,6 +622,7 @@ Symfony is the result of the work of many people who made the code better
- Gunnstein Lye (glye)
- Maxime Douailin
- Jean Pasdeloup (pasdeloup)
- Sylvain Fabre (sylfabre)
- Benjamin Cremer (bcremer)
- Javier López (loalf)
- Reinier Kip
Expand Down Expand Up @@ -698,6 +700,7 @@ Symfony is the result of the work of many people who made the code better
- Tiago Brito (blackmx)
-
- Richard van den Brand (ricbra)
- Thomas Bisignani (toma)
- develop
- flip111
- Greg Anderson
Expand Down Expand Up @@ -841,7 +844,6 @@ Symfony is the result of the work of many people who made the code better
- Jörn Lang (j.lang)
- Omar Yepez (oyepez003)
- Gawain Lynch (gawain)
- Samuel NELA (snela)
- mwsaz
- Jelle Kapitein
- Benoît Bourgeois
Expand All @@ -862,6 +864,7 @@ Symfony is the result of the work of many people who made the code better
- Christian Morgan
- Alexander Miehe (engerim)
- Morgan Auchede (mauchede)
- Sascha Dens (saschadens)
- Don Pinkster
- Maksim Muruev
- Emil Einarsson
Expand Down Expand Up @@ -1034,6 +1037,7 @@ Symfony is the result of the work of many people who made the code better
- Dominic Tubach
- Nikita Konstantinov
- Martijn Evers
- Vitaliy Ryaboy (vitaliy)
- Benjamin Paap (benjaminpaap)
- Christian
- Denis Golubovskiy (bukashk0zzz)
Expand Down Expand Up @@ -1061,6 +1065,7 @@ Symfony is the result of the work of many people who made the code better
- Jakub Sacha
- Olaf Klischat
- orlovv
- Claude Dioudonnat
- Jonathan Hedstrom
- Peter Smeets (darkspartan)
- Jhonny Lidfors (jhonny)
Expand Down Expand Up @@ -1244,6 +1249,7 @@ Symfony is the result of the work of many people who made the code better
- Sandro Hopf
- Łukasz Makuch
- George Giannoulopoulos
- Alexander Pasichnick
- Luis Ramirez (luisdeimos)
- Daniel Richter (richtermeister)
- ChrisC
Expand Down Expand Up @@ -1308,7 +1314,6 @@ Symfony is the result of the work of many people who made the code better
- Jon Gotlin (jongotlin)
- Michael Dowling (mtdowling)
- Karlos Presumido (oneko)
- Sylvain Fabre (sylfabre)
- Thomas Counsell
- BilgeXA
- r1pp3rj4ck
Expand Down Expand Up @@ -1354,7 +1359,6 @@ Symfony is the result of the work of many people who made the code better
- Andrew (drew)
- kor3k kor3k (kor3k)
- Stelian Mocanita (stelian)
- Thomas Bisignani (toma)
- Justin (wackymole)
- Flavian (2much)
- Gautier Deuette
Expand Down Expand Up @@ -1396,6 +1400,7 @@ Symfony is the result of the work of many people who made the code better
- Alan Poulain
- Martin Eckhardt
- natechicago
- Sergei Gorjunov
- Jonathan Poston
- Adrian Olek (adrianolek)
- Jody Mickey (jwmickey)
Expand Down Expand Up @@ -1486,6 +1491,7 @@ Symfony is the result of the work of many people who made the code better
- me_shaon
- 蝦米
- Grayson Koonce (breerly)
- Andrey Helldar (helldar)
- Karim Cassam Chenaï (ka)
- Maksym Slesarenko (maksym_slesarenko)
- Michal Kurzeja (mkurzeja)
Expand Down Expand Up @@ -1612,6 +1618,7 @@ Symfony is the result of the work of many people who made the code better
- Joel Marcey
- David Christmann
- root
- pf
- Vincent Chalnot
- James Hudson
- Tom Maguire
Expand Down Expand Up @@ -1754,6 +1761,7 @@ Symfony is the result of the work of many people who made the code better
- Damian Sromek
- Ben
- Evgeniy Tetenchuk
- Shrey Puranik
- dasmfm
- Mathias Geat
- Arnaud Buathier (arnapou)
Expand All @@ -1774,6 +1782,7 @@ Symfony is the result of the work of many people who made the code better
- Ulf Reimers (ureimers)
- Wotre
- goohib
- Tom Counsell
- Xavier HAUSHERR
- Ron Gähler
- Edwin Hageman
Expand Down Expand Up @@ -1811,6 +1820,7 @@ Symfony is the result of the work of many people who made the code better
- Jörg Rühl
- wesleyh
- sergey
- Michael Hudson-Doyle
- Daniel Bannert
- Karim Miladi
- Michael Genereux
Expand Down Expand Up @@ -1840,11 +1850,13 @@ Symfony is the result of the work of many people who made the code better
- Kasperki
- Tammy D
- Daniel STANCU
- Ryan Rud
- Ondrej Slinták
- vlechemin
- Brian Corrigan
- Ladislav Tánczos
- Skorney
- Lucas Matte
- fmarchalemisys
- mieszko4
- Steve Preston
Expand Down Expand Up @@ -1923,6 +1935,7 @@ Symfony is the result of the work of many people who made the code better
- sualko
- Bilge
- ADmad
- Stéphane Delprat
- Nicolas Roudaire
- Alfonso (afgar)
- Andreas Forsblom (aforsblo)
Expand Down Expand Up @@ -2004,7 +2017,6 @@ Symfony is the result of the work of many people who made the code better
- Rich Sage (richsage)
- Rokas Mikalkėnas (rokasm)
- Bart Ruysseveldt (ruyss)
- Sascha Dens (saschadens)
- scourgen hung (scourgen)
- Sebastian Busch (sebu)
- Sepehr Lajevardi (sepehr)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,14 @@ public function normalizeUsingTimeZonePassedInContextAndExpectedFormatWithMicros
);

yield array(
'2018-12-01T21:03:06.067634',
'2018-12-01T19:03:06.067634',
'Y-m-d\TH:i:s.u',
\DateTime::createFromFormat(
'Y-m-d\TH:i:s.u',
'2018-12-01T18:03:06.067634',
new \DateTimeZone('UTC')
),
new \DateTimeZone('Europe/Moscow'),
new \DateTimeZone('Europe/Berlin'),
);
}

Expand Down

0 comments on commit 23e5e45

Please sign in to comment.