Merge branch '2.2'

* 2.2:
  bumped Symfony version to 2.1.11-DEV
  updated VERSION for 2.1.10
  update CONTRIBUTORS for 2.1.10
  updated CHANGELOG for 2.1.10
  fixed CS
  [Process] Cleanup tests & prevent assertion that kills randomly Travis-CI
  [Filesystem] Fix regression introduced in 10dea948

Conflicts:
	src/Symfony/Component/Process/Tests/AbstractProcessTest.php
This commit is contained in:
Fabien Potencier 2013-05-06 22:03:44 +02:00
commit 14cb1fa3d0
16 changed files with 163 additions and 82 deletions

View File

@ -7,6 +7,41 @@ in 2.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 between two versions, go to https://github.com/symfony/symfony/compare/v2.1.0...v2.1.1
* 2.1.10 (2013-05-06)
* 5b7e1e6: added a missing check for the provider key
* bcb5400: [Form] Fixed transform()/reverseTransform() to always throw TransformationFailedExceptions
* 7b2ebbf: [Form] Fixed: String validation groups are never interpreted as callbacks
* 0610750: if the repository method returns an array ensure that it's internal poin...
* 2b554d7: remove validation related headers when needed
* 2a531d7: Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is set to https
* 10dea94: [Filesystem] copy() is not working when open_basedir is set
* 8757ad4: [Process] Fix #5594 : `termsig` must be used instead of `stopsig` in exceptions when a process is signaled
* 06e21ff: Filesystem::touch() not working with different owners (utime/atime issue)
* 36d057b: [HttpFoundation][BrowserKit] fixed path when converting a cookie to a string
* 495d0e3: [HttpFoundation] fixed empty domain= in Cookie::__toString()
* c2bc707: fixed detection of secure cookies received over https
* 54bcf5c: [Translator] added additional conversion for encodings other than utf-8
* 8a434ed: fix a DI circular reference recognition bug
* 5abf887: Fix default value handling for multi-value options
* da156d3: fix overwriting of request's locale if attribute _locale is missing
* d552e4c: [HttpFoundation] do not use server variable PATH_INFO because it is already decoded and thus symfony is fragile to double encoding of the path
* 047212a: [Yaml] fixed handling an empty value
* 94a9cdc: [Routing][XML Loader] Add a possibility to set a default value to null
* 0f0c29c: [HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
* 7fc429f: [Form] DateTimeToRfc3339Transformer use proper transformation exteption in reverse transformation
* 9fcd2f6: [HttpFoundation] fixed the creation of sub-requests under some circumstances for IIS
* a3826ab: #7531: [HttpKernel][Config] FileLocator adds NULL as global resource path
* 9d71ebe: Fix autocompletion of command names when namespaces conflict
* bec8ff1: Fix timeout in Process::stop method
* bf4a9b0: Round stream_select fifth argument up.
* 3780fdb: Fix Process timeout
* 375ded4: [FrameworkBundle] fixed the discovery of the PHPUnit configuration file when using aggregate options like in -vc app/ (closes #7562)
* 673fd9b: idAsIndex should be true with a smallint or bigint id field.
* 64a1d39: Fixed long multibyte parameter logging in DbalLogger:startQuery
* 4cf06c1: Keep the file extension in the temporary copy and test that it exists (closes #7482)
* c4da2d9: [HttpFoundation] getClientIp is fixed.
* 2.1.9 (2013-03-26)
* 9875c4b: Added '@@' escaping strategy for YamlFileLoader and YamlDumper

View File

@ -14,10 +14,10 @@ Symfony2 is the result of the work of many people who made the code better
- Christophe Coevoet (stof)
- Pascal Borreli (pborreli)
- Karma Dordrak (drak)
- Ryan Weaver
- Lukas Kahwe Smith (lsmith)
- Jeremy Mikola (jmikola)
- Ryan Weaver
- Joseph Bielawski (stloyd)
- Jeremy Mikola (jmikola)
- Igor Wiedler (igorw)
- Benjamin Eberlei (beberlei)
- Jean-François Simon (jfsimon)
@ -26,40 +26,42 @@ Symfony2 is the result of the work of many people who made the code better
- Martin Hasoň (hason)
- Jonathan Wage (jwage)
- William Durand (couac)
- Jakub Zalas (jakubzalas)
- Alexandre Salomé (alexandresalome)
- ornicar
- stealth35 (stealth35)
- Alexander Mols (asm89)
- Jakub Zalas (jakubzalas)
- Bulat Shakirzyanov (avalanche123)
- Francis Besset (francisbesset)
- Henrik Bjørnskov (henrikbjorn)
- Miha Vrhovnik
- Konstantin Kudryashov (everzet)
- Саша Стаменковић (umpirsky)
- Arnaud Le Blanc (arnaud-lb)
- Florin Patan (florinpatan)
- Eric Clemmons (ericclemmons)
- Bilal Amarni (bamarni)
- Henrik Westphal (snc)
- Romain Neutron (romain)
- Deni
- Konstantin Kudryashov (everzet)
- Saša Stamenković (umpirsky)
- Florin Patan (florinpatan)
- Bilal Amarni (bamarni)
- Arnaud Le Blanc (arnaud-lb)
- Eric Clemmons (ericclemmons)
- Dariusz Górecki (canni)
- Henrik Westphal (snc)
- Deni
- Marc Weistroff (futurecat)
- Jordan Alliot (jalliot)
- Arnout Boks (aboks)
- Hidenori Goto (hidenorigoto)
- Fran Moreno (franmomu)
- Lee McDermott
- Brandon Turner
- Andrej Hudec (pulzarraider)
- Daniel Holmes (dholmes)
- Brikou Carré (brikou)
- John Wards (johnwards)
- Fran Moreno (franmomu)
- Grégoire Pineau (lyrixx)
- Antoine Hérault (herzult)
- Daniel Holmes (dholmes)
- Bart van den Burg (burgov)
- Tim Nagel (merk)
- Włodzimierz Gajda (gajdaw)
- Bart van den Burg (burgov)
- Michel Weimerskirch (mweimerskirch)
- Christian Raue
- Michal Piotrowski (eventhorizon)
- Toni Uebernickel (havvg)
@ -68,8 +70,6 @@ Symfony2 is the result of the work of many people who made the code better
- Fabien Pennequin (fabienpennequin)
- excelwebzone
- woodspire
- Michel Weimerskirch (mweimerskirch)
- Grégoire Pineau (lyrixx)
- Mario A. Alvarez Garcia (nomack84)
- Douglas Greenshields (shieldo)
- Kevin Bond (kbond)
@ -77,20 +77,21 @@ Symfony2 is the result of the work of many people who made the code better
- Jacob Dreesen (jdreesen)
- Richard Shank (iampersistent)
- Sebastian Hörl (blogsh)
- Gábor Egyed (1ed)
- David Buchmann (dbu)
- Juti Noppornpitak
- Robert Schönthal (digitalkaoz)
- Felix Labrecque
- Michał Pipa (michal.pipa)
- Gordon Franke (gimler)
- Daniel Gomes (danielcsgomes)
- Gábor Egyed (1ed)
- Tigran Azatyan (tigranazatyan)
- Pierre Minnieur (pminnieur)
- Larry Garfield (crell)
- Arnaud Kleinpeter (nanocom)
- David Buchmann (dbu)
- Jonathan Ingram (jonathaningram)
- Sebastiaan Stok (sstok)
- Jérémie Augustin (jaugustin)
- Javier Eguiluz (javier.eguiluz)
- Matthieu Ouellette-Vachon (maoueh)
- Amal Raghav (kertz)
@ -103,16 +104,19 @@ Symfony2 is the result of the work of many people who made the code better
- Benjamin Dulau (dbenjamin)
- Andreas Hucks (meandmymonkey)
- Noel Guilbert (noel)
- Jérémie Augustin (jaugustin)
- Hiromi Hishida (77web)
- Guilherme Blanco (guilhermeblanco)
- Martin Schuhfuß (usefulthink)
- Thomas Rabaix (rande)
- Dennis Benkert (denderello)
- Marcel Beerta (mazen)
- Albert Casademont (acasademont)
- Matthieu Bontemps (mbontemps)
- fivestar
- Dominique Bongiraud
- Leszek Prabucki (l3l0)
- Danny Berger (dpb587)
- Eric GELOEN (gelo)
- Dustin Whittle (dustinwhittle)
- jeff
- Clemens Tolboom
@ -120,15 +124,17 @@ Symfony2 is the result of the work of many people who made the code better
- Sven Paulus (subsven)
- Xavier Perez
- Rui Marinho (ruimarinho)
- Dorian Villet (gnutix)
- Ray
- Joseph Rouff (rouffj)
- Albert Casademont (acasademont)
- Guilherme Blanco (guilhermeblanco)
- Francois Zaninotto
- Alexander Kotynia (olden)
- François Zaninotto (fzaninotto)
- Xavier Montaña Carreras (xmontana)
- Katsuhiro OGAWA
- Andréia Bohner (andreia)
- Peter Kokot (maastermedia)
- Terje Bråten
- Alif Rachmawadi
- boombatower
- Florian Klein (docteurklein)
@ -138,6 +144,7 @@ Symfony2 is the result of the work of many people who made the code better
- jdhoek
- geoffrey
- Wodor Wodorski
- Elnur Abdurrakhimov (elnur)
- Matthew Lewinski (lewinski)
- Kim Hemsø Rasmussen
- Dirk Pahl (dirkaholic)
@ -145,8 +152,6 @@ Symfony2 is the result of the work of many people who made the code better
- Gyula Sallai (salla)
- Michael Holm (hollo)
- Yaroslav Kiliba
- Andréia Bohner (andreia)
- Eric GELOEN (gelo)
- Sebastian Bergmann
- arjen
- sun (sun)
@ -158,7 +163,9 @@ Symfony2 is the result of the work of many people who made the code better
- Tamas Szijarto
- Thomas Adam
- Grégoire Passault (gregwar)
- Uwe Jäger (uwej711)
- Aurelijus Valeiša (aurelijus)
- Ait Boudad Abdellatif (aitboudad)
- Gustavo Piltcher
- Stepan Tanasiychuk (stfalcon)
- Albert Jessurum (ajessu)
@ -170,18 +177,25 @@ Symfony2 is the result of the work of many people who made the code better
- Michel Salib (michelsalib)
- Jeanmonod David (jeanmonod)
- Thomas Lallement (raziel057)
- Ricard Clau (ricardclau)
- Niklas Fiekas
- Konstantin Myakshin (koc)
- Wouter De Jong (wouterj)
- Manuel Reinhard (sprain)
- Francesco Levorato
- Michele Orselli (orso)
- Tom Van Looy (tvlooy)
- Brouznouf
- Peter Kruithof (pkruithof)
- Dmitrii Chekaliuk
- Matthias Pigulla (mpdude)
- Greg Thornton (xdissent)
- Lars Strojny
- Terje Bråten
- Costin Bereveanu (schniper)
- Markus Lanthaler (lanthaler)
- Jérôme Vieilledent (lolautruche)
- realmfoo
- Pavel Volokitin (pvolok)
- Tobias Naumann
- Ismael Ambrosi (iambrosi)
- Shein Alexey
@ -192,19 +206,20 @@ Symfony2 is the result of the work of many people who made the code better
- Laszlo Korte
- Alessandro Desantis (alessandro1997)
- hubert lecorche (hlecorche)
- Eugene Leonovich (rybakit)
- Oscar Cubo Medina (ocubom)
- Karel Souffriau
- Christophe L. (christophelau)
- Michael Ridgway
- Pavel Campr (pcampr)
- janschoenherr
- Emanuele Gaspari (inmarelibero)
- Brian King
- Ricard Clau (ricardclau)
- Jan Schumann
- Erin Millard
- Antonio J. García Lagar (ajgarlag)
- Olivier Dolbeau (odolbeau)
- Konstantin Myakshin (koc)
- Elnur Abdurrakhimov (elnur)
- Michele Orselli (orso)
- Robert Kiss (kepten)
- Asier Illarramendi (doup)
- Javier López (loalf)
- Chris Heng (gigablah)
@ -214,12 +229,12 @@ Symfony2 is the result of the work of many people who made the code better
- Marcin Sikoń (marphi)
- Miquel Rodríguez Telep (mrtorrent)
- Filippo Tessarotto
- Kristen Gilden (kgilden)
- Adam Harvey
- Laurent Bachelier (laurentb)
- Fabian Lange (codingfabian)
- Yoshio HANAWA
- Tiago Brito (blackmx)
- Hiromi Hishida (77web)
- hossein zolfi (ocean)
- Kevin McBride
- Pablo Díez (pablodip)
@ -234,20 +249,19 @@ Symfony2 is the result of the work of many people who made the code better
- Vicent Soria Durá (vicentgodella)
- Erik Trapman (eriktrapman)
- De Cock Xavier (xdecock)
- Manuel Reinhard (sprain)
- Matthijs van den Bos
- Joel Wurtz
- Uwe Jäger (uwej711)
- Nils Adermann (naderman)
- Gábor Fási
- Leevi Graham
- Michaël Perrin (michael.perrin)
- sasezaki
- Loïc Chardonnet (gnusat)
- Xavier HAUSHERR
- Steven Surowiec
- Marek Kalnik (marekkalnik)
- Chris Smith
- Anthon Pang
- Eugene Leonovich
- Ryan
- Alexander Deruwe (aderuwe)
- Ivan Rey (ivanrey)
@ -259,9 +273,9 @@ Symfony2 is the result of the work of many people who made the code better
- Zach Badgett (zachbadgett)
- Aurélien Fredouelle
- Karoly Negyesi (chx)
- janschoenherr
- Thomas Tourlourat (armetiz)
- jamogon
- Miha Vrhovnik
- Geoffrey Tran (geoff)
- Florian Rey (nervo)
- Maks
@ -282,6 +296,7 @@ Symfony2 is the result of the work of many people who made the code better
- Chris Boden (cboden)
- Roumen Damianoff (roumen)
- Pierre du Plessis (pierredup)
- Josip Kruslin
- Åsmund Garfors
- Jeremy David (jeremy.david)
- Tobias Sjösten (tobiassjosten)
@ -295,7 +310,7 @@ Symfony2 is the result of the work of many people who made the code better
- yktd26
- Jakub Kucharovic
- umpirski
- Dmitrii Chekaliuk
- Antoine Corcy
- cedric lombardot (cedriclombardot)
- John Kary (johnkary)
- Hossein Bukhamsin
@ -327,16 +342,20 @@ Symfony2 is the result of the work of many people who made the code better
- Josiah (josiah)
- John Bohn (jbohn)
- Nicolas Schwartz (nicoschwartz)
- Andrew Hilobok
- Christian Soronellas Vallespí (theunic)
- Benjamin Grandfond (benjamin)
- Degory Valentine
- Krzysiek Łabuś
- Andrew Udvare
- Xavier Lacot (xavier)
- Olivier Maisonneuve
- Iwan van Staveren (istaveren)
- cgonzalez
- matt foster
- Evan S Kaufman (evanskaufman)
- Iker Ibarguren (ikerib)
- Ricardo Oliveira (ricardolotr)
- Jayson Xu (superjavason)
- Jan Prieser
- James Michael DuPont
@ -346,6 +365,7 @@ Symfony2 is the result of the work of many people who made the code better
- Paul Kamer (pkamer)
- Pierre Vanliefland (pvanliefland)
- Martin Parsiegla (spea)
- Luis Cordova (cordoval)
- Philipp Kräutli (pkraeutli)
- Stefano Sala (stefano.sala)
- frost-nzcr4
@ -373,10 +393,12 @@ Symfony2 is the result of the work of many people who made the code better
- Alexander Miehe (engerim)
- Titouan Galopin (tgalopin)
- Don Pinkster
- Maksim Muruev
- Emil Einarsson
- Thibault Duplessis
- Marc Abramowitz
- Martijn Evers
- alexpods
- Mathias Rohnstock (drmonty)
- Harry Walter (haswalt)
- Michael Roterman (wtfzdotnet)
@ -384,7 +406,6 @@ Symfony2 is the result of the work of many people who made the code better
- Adán Lobato (adanlobato)
- Mikhail Yurasov
- Sam Williams
- Miha Vrhovnik
- Moritz Borgmann
- Daniel Cestari
- Magnus Nordlander (magnusnordlander)
@ -392,38 +413,47 @@ Symfony2 is the result of the work of many people who made the code better
- LOUARDI Abdeltif (ouardisoft)
- Robert Gruendler (pulse00)
- ragtek (ragtek)
- Simon Terrien (sterrien)
- Benoît Merlet (trompette)
- Jan Behrens
- Raul Fraile (raulfraile)
- sensio
- Théophile Helleboid - chtitux
- The Whole Life to Learn
- xaav
- Mahmoud Mostafa (mahmoud)
- Juti Noppornpitak
- Mei Gwilym
- ttomor
- Sander Coolen
- Josip Kruslin
- Nicolas Le Goff (nlegoff)
- Manuele Menozzi
- Anton Babenko (antonbabenko)
- Irmantas Šiupšinskas (irmantas)
- dantleech
- Tero Alén (tero)
- Artem (digi)
- dantleech
- Vadim Tyukov (vatson)
- Sortex
- arjenjb
- chispita
- Wojciech Sznapka
- Máximo Cuadros (mcuadros)
- Alex Bogomazov
- julien.galenski
- Sébastien Lavoie
- Per Sandström (per)
- Troy McCabe
- Ville Mattila
- Sescandell (sescandell)
- Ben Davies
- Max Beutel
- Marcos Quesada (marcos_quesada)
- Robert Kiss (kepten)
- Dan Finnie
- Vitaliy Tverdokhlib (vitaliytv)
- Martijn Evers
- Benjamin Paap (benjaminpaap)
- Sergii Smertin (nfx)
- Eddie Jaoude
- Nerijus Arlauskas
@ -431,7 +461,6 @@ Symfony2 is the result of the work of many people who made the code better
- SPolischook
- Diego Sapriza
- Joan Cruz
- Antoine Corcy
- inspiran
- Cristobal Dabed
- matteo giachino
@ -441,17 +470,22 @@ Symfony2 is the result of the work of many people who made the code better
- Vincent AUBERT (vincent)
- Benoit Garret
- DerManoMann
- Roland Franssen (ro0)
- Jochen Bayer (jocl)
- Jeremy Bush
- Evan Villemez
- Péter Buri (burci)
- Davide Borsatto (davide.borsatto)
- kaiwa
- Albert Ganiev (helios-ag)
- Neil Katin
- Gustavo Adrian
- Brooks Boyd
- Roger Webb
- Nicolas Fabre (nfabre)
- Felicitus
- Paul Matthews
- Philipp Strube
- Clement Herreman (clemherreman)
- Marco
- Alberto Aldegheri
@ -460,22 +494,27 @@ Symfony2 is the result of the work of many people who made the code better
- modi
- Sergey Yuferev
- Richard van den Brand (ricbra)
- Quique Porta
- Aharon Perkel
- Malaney J. Hill
- Andy Cox (ringo)
- Sebastian Göttschkes (sgoettschkes)
- erikaheidi
- Pierre Tachoire
- Ludek Stepan
- Balázs Benyó (duplabe)
- Marc Morera (mmoreram)
- Sebastian Utz
- Keri Henare (kerihenare)
- Cédric Lahouste (rapotor)
- Anthony Ferrara
- Janusz Jablonski
- George Giannoulopoulos
- Chris Wilkinson (thewilkybarkid)
- Ilya Biryukov
- Lance McNearney
- Alberto Pirovano (geezmo)
- Gabor Toth (tgabi333)
- Xavier Briand (xavierbriand)
- Evan Kaufman
- Romain Geissler
@ -484,6 +523,7 @@ Symfony2 is the result of the work of many people who made the code better
- Jay Severson
- René Kerner
- Adrien Samson (adriensamson)
- Samuel Gordalina (gordalina)
- Martin Eckhardt
- Michael Dowling (mtdowling)
- Robert Queck
@ -492,18 +532,23 @@ Symfony2 is the result of the work of many people who made the code better
- Thomas Chmielowiec (chmielot)
- Jānis Lukss
- fdgdfg (psampaz)
- Maxwell Vandervelde
- kaywalker
- Sebastian Ionescu
- Simon Neidhold
- Kevin Dew
- James Cowgill
- Patrik Gmitter (patie)
- Thomas Ploch (tploch)
- Benjamin Bender
- Konrad Mohrfeldt
- Benoit Lévêque (benoit_leveque)
- jskvara
- Mephistofeles
- pscheit
- Ramon Kleiss (akathos)
- Nicolas Badey (nico-b)
- Vitaliy Zakharov (zakharovvi)
- Gunnar Lium
- povilas
- Lars Strojny
@ -511,6 +556,7 @@ Symfony2 is the result of the work of many people who made the code better
- Harm van Tilborg
- Martin Eckhardt
- Leonid Terentyev
- Przemysław Piechota (kibao)
- Tom Adam (tomadam)
- Francisco Facioni (fran6co)
- Paweł Wacławczyk (pwc)
@ -518,17 +564,16 @@ Symfony2 is the result of the work of many people who made the code better
- 2manypeople
- Thomas Bibb
- Josef Cech
- Ait Boudad Abdellatif (aitboudad)
- Andrey Esaulov (andremaha)
- hicham ELGUAROUANI (hiiimoo)
- Stefan Koopmanschap (skoop)
- Ivan Kurnosov
- stloyd
- Andrew Coulton
- Chris Tickner (tickner)
- Luis Muñoz
- Thomas Chmielowiec
- Christoph Nissle (derstoffel)
- Xavier HAUSHERR
- Benjamin Zikarsky
- Romain Dorgueil
- Patrick Allaert
@ -536,6 +581,7 @@ Symfony2 is the result of the work of many people who made the code better
- Andy Stanberry
- alefranz
- alsar
- Mike Meier
- efeen
- Bob den Otter (bopp)
- Simone Fumagalli (hpatoio)
@ -544,18 +590,24 @@ Symfony2 is the result of the work of many people who made the code better
- Jordi Llonch (jordillonch)
- Cédric Dugat (ph3nol)
- Philip Dahlstrøm (phidah)
- Rénald Casagraude (rcasagraude)
- Robin Duval (robin-duval)
- Artem Lopata (bumz)
- Iltar van der Berg
- Alexey Popkov
- Artyom Protaskin
- Nathanael d. Noblet
- helmer
- Bram Van der Sype (brammm)
- Diego Saint Esteben (dii3g0)
- Julien Moulin (lizjulien)
- dened
- devel
- gedrox
- hirocaster
- Andrey Chernykh
- François Pluchino
- Alexey Prilipko
- Jörn Lang (j.lang)
- Jan Marek (janmarek)
- Dan Patrick (mdpatrick)
@ -579,6 +631,9 @@ Symfony2 is the result of the work of many people who made the code better
- Robert Campbell
- Matt Lehner
- cyrillej
- Alex Pods
- timaschew
- Christian Morgan
- Haritz
- Grummfy
- Rowan Manning
@ -598,10 +653,10 @@ Symfony2 is the result of the work of many people who made the code better
- ddebree
- Alex
- Klaas Naaijkens
- Alexander Kotynia
- Rafał
- Masao Maeda (brtriver)
- Dave Marshall (davedevelopment)
- David Marín Carreño (davefx)
- Denis Klementjev (dklementjev)
- Kévin Dunglas (dunglas)
- Vincent Composieux (eko)
@ -610,7 +665,6 @@ Symfony2 is the result of the work of many people who made the code better
- giulio de donato (liuggio)
- Matthew Davis (mdavis1982)
- Muriel Lusseau (metalmumu)
- Matthias Pigulla (mpdude)
- Pablo Monterde Perez (plebs)
- Jimmy Leger (redpanda)
- Baptiste Clavié (talus)
@ -637,7 +691,6 @@ Symfony2 is the result of the work of many people who made the code better
- Christian Eikermann
- Vladimir Sazhin
- Vyacheslav Slinko
- Maksim Muruev
- Johannes
- Jörg Rühl
- patrick-mcdougle
@ -667,7 +720,6 @@ Symfony2 is the result of the work of many people who made the code better
- Sergiy Sokolenko
- dinitrol
- Penny Leach
- Gábor Fási
- oscartv
- Philipp Rieber
- DanSync
@ -678,6 +730,7 @@ Symfony2 is the result of the work of many people who made the code better
- Christian Stocker
- dorkitude
- tirnanog06
- phc
- Besnik Br
- sualko
- Nicolas Roudaire
@ -686,7 +739,6 @@ Symfony2 is the result of the work of many people who made the code better
- Bernd Matzner (bmatzner)
- Chris Sedlmayr (catchamonkey)
- Kousuke Ebihara (co3k)
- Luis Cordova (cordoval)
- Christoph Schaefer (cvschaefer)
- Damien Alexandre (damienalexandre)
- Damon Jones (damon__jones)
@ -713,7 +765,6 @@ Symfony2 is the result of the work of many people who made the code better
- Ruud Kamphuis (ruudk)
- Sarah Khalil (saro0h)
- Sebastian Busch (sebu)
- Simon Terrien (sterrien)
- Markus Tacker (tacker)
- Tyler Stroud (tystr)
- Víctor Mateo (victormateo)
@ -737,3 +788,4 @@ Symfony2 is the result of the work of many people who made the code better
- Erik Saunier (snickers)
- Tony Piper (tonypiper)
- Vladislav Vlastovskiy (vlastv)
- Christian Flothmann (xabbuh)

View File

@ -118,7 +118,7 @@ class DbalLoggerTest extends \PHPUnit_Framework_TestCase
$shortString = '';
$longString = '';
for($i=1; $i<=DbalLogger::MAX_STRING_LENGTH; $i++) {
for ($i = 1; $i <= DbalLogger::MAX_STRING_LENGTH; $i++) {
$shortString .= $testStringArray[$i % $testStringCount];
$longString .= $testStringArray[$i % $testStringCount];
}

View File

@ -300,6 +300,7 @@ class UniqueValidatorTest extends DoctrineOrmTestCase
$entity,
);
next($returnValue);
return $returnValue;
})
)

View File

@ -42,6 +42,7 @@ class DebugClassLoaderTest extends \PHPUnit_Framework_TestCase
$reflProp->setAccessible(true);
$this->assertNotInstanceOf('Symfony\Component\ClassLoader\DebugClassLoader', $reflProp->getValue($function[0]));
return;
}
}

View File

@ -35,7 +35,7 @@ class Filesystem
*/
public function copy($originFile, $targetFile, $override = false)
{
if (!is_file($originFile)) {
if (stream_is_local($originFile) && !is_file($originFile)) {
throw new IOException(sprintf('Failed to copy %s because file not exists', $originFile));
}

View File

@ -11,6 +11,8 @@
namespace Symfony\Component\Form;
use Symfony\Component\Form\Exception\TransformationFailedException;
/**
* Transforms a value between different representations.
*
@ -43,7 +45,7 @@ interface DataTransformerInterface
*
* @return mixed The value in the transformed representation
*
* @throws \Symfony\Component\Form\Exception\TransformationFailedException When the transformation fails.
* @throws TransformationFailedException When the transformation fails.
*/
public function transform($value);
@ -69,7 +71,7 @@ interface DataTransformerInterface
*
* @return mixed The value in the original representation
*
* @throws \Symfony\Component\Form\Exception\TransformationFailedException When the transformation fails.
* @throws TransformationFailedException When the transformation fails.
*/
public function reverseTransform($value);
}

View File

@ -13,7 +13,6 @@ namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\DataTransformerInterface;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**
* Passes a value through multiple value transformers

View File

@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**
* Transforms between a normalized time and a localized time string/array.
@ -33,7 +34,7 @@ class DateTimeToArrayTransformer extends BaseDateTimeTransformer
* @param array $fields The date fields
* @param Boolean $pad Whether to use padding
*
* @throws \Symfony\Component\Form\Exception\UnexpectedTypeException if a timezone is not a string
* @throws UnexpectedTypeException if a timezone is not a string
*/
public function __construct($inputTimezone = null, $outputTimezone = null, array $fields = null, $pad = false)
{

View File

@ -12,6 +12,7 @@
namespace Symfony\Component\Form\Extension\Core\DataTransformer;
use Symfony\Component\Form\Exception\TransformationFailedException;
use Symfony\Component\Form\Exception\UnexpectedTypeException;
/**
* Transforms between a date string and a DateTime object
@ -57,7 +58,7 @@ class DateTimeToStringTransformer extends BaseDateTimeTransformer
* @param string $format The date format
* @param Boolean $parseUsingPipe Whether to parse by appending a pipe "|" to the parse format
*
* @throws \Symfony\Component\Form\Exception\UnexpectedTypeException if a timezone is not a string
* @throws UnexpectedTypeException if a timezone is not a string
*/
public function __construct($inputTimezone = null, $outputTimezone = null, $format = 'Y-m-d H:i:s', $parseUsingPipe = null)
{

View File

@ -124,7 +124,7 @@ class DateTimeToRfc3339TransformerTest extends DateTimeTestCase
* @expectedException \Symfony\Component\Form\Exception\TransformationFailedException
*/
public function testReverseTransformExpectsValidDateString()
{
{
$transformer = new DateTimeToRfc3339Transformer('UTC', 'UTC');
$transformer->reverseTransform('2010-2010-2010');

View File

@ -238,17 +238,17 @@ class RedisMock
return true;
}
public function select($dbnum)
{
if (!$this->connected) {
return false;
}
if (0 > $dbnum) {
return false;
}
return true;
return true;
}
}

View File

@ -85,18 +85,21 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
*
* @dataProvider pipesCodeProvider
*/
public function testProcessPipes($expected, $code)
public function testProcessPipes($code, $size)
{
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
$this->markTestSkipped('Test hangs on Windows & PHP due to https://bugs.php.net/bug.php?id=60120 and https://bugs.php.net/bug.php?id=51800');
}
$expected = str_repeat(str_repeat('*', 1024), $size) . '!';
$expectedLength = (1024 * $size) + 1;
$p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
$p->setStdin($expected);
$p->run();
$this->assertSame($expected, $p->getOutput());
$this->assertSame($expected, $p->getErrorOutput());
$this->assertEquals($expectedLength, strlen($p->getOutput()));
$this->assertEquals($expectedLength, strlen($p->getErrorOutput()));
}
public function chainedCommandsOutputProvider()
@ -524,13 +527,11 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
'fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);',
'include \''.__DIR__.'/ProcessTestHelper.php\';',
);
$baseData = str_repeat('*', 1024);
$codes = array();
foreach (array(1, 16, 64, 1024, 4096) as $size) {
$data = str_repeat($baseData, $size).'!';
foreach ($variations as $code) {
$codes[] = array($data, $code);
$codes[] = array($code, $size);
}
}

View File

@ -15,7 +15,6 @@ use Symfony\Component\Process\PhpProcess;
class PhpProcessTest extends \PHPUnit_Framework_TestCase
{
public function testNonBlockingWorks()
{
$expected = 'hello world!';

View File

@ -15,10 +15,7 @@ use Symfony\Component\Process\ProcessBuilder;
class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
{
/**
* @test
*/
public function shouldInheritEnvironmentVars()
public function testInheritEnvironmentVars()
{
$snapshot = $_ENV;
$_ENV = $expected = array('foo' => 'bar');
@ -32,10 +29,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
$_ENV = $snapshot;
}
/**
* @test
*/
public function shouldInheritAndOverrideEnvironmentVars()
public function testProcessShouldInheritAndOverrideEnvironmentVars()
{
$snapshot = $_ENV;
$_ENV = array('foo' => 'bar', 'bar' => 'baz');
@ -51,10 +45,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
$_ENV = $snapshot;
}
/**
* @test
*/
public function shouldInheritEnvironmentVarsByDefault()
public function testInheritEnvironmentVarsByDefault()
{
$pb = new ProcessBuilder();
$proc = $pb->add('foo')->getProcess();
@ -62,10 +53,7 @@ class ProcessBuilderTest extends \PHPUnit_Framework_TestCase
$this->assertNull($proc->getEnv());
}
/**
* @test
*/
public function shouldNotReplaceExplicitlySetVars()
public function testNotReplaceExplicitlySetVars()
{
$snapshot = $_ENV;
$_ENV = array('foo' => 'bar');

View File

@ -36,7 +36,8 @@ class ProcessFailedExceptionTest extends \PHPUnit_Framework_TestCase
'\InvalidArgumentException',
'Expected a failed process, but the given process was successful.'
);
$exception = new ProcessFailedException($process);
new ProcessFailedException($process);
}
/**