Skip to content

Commit b859d95

Browse files
Merge branch '2.8'
* 2.8: [travis] Disable xdebug on PHP7 Tweaking deprecation message to include class name bumped Symfony version to 2.7.8 updated VERSION for 2.7.7 updated CHANGELOG for 2.7.7 bumped Symfony version to 2.3.36 updated VERSION for 2.3.35 update CONTRIBUTORS for 2.3.35 updated CHANGELOG for 2.3.35 Conflicts: CHANGELOG-2.3.md CHANGELOG-2.7.md src/Symfony/Component/Config/Resource/BCResourceInterfaceChecker.php
2 parents c6f2b65 + e0f5ffc commit b859d95

File tree

2 files changed

+28
-26
lines changed

2 files changed

+28
-26
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ before_install:
3535
- echo "memory_limit = -1" >> $INI_FILE
3636
- echo "session.gc_probability = 0" >> $INI_FILE
3737
- if [ "$deps" != "skip" ]; then composer self-update; fi;
38-
- if [[ "$TRAVIS_PHP_VERSION" = 5.* ]]; then phpenv config-rm xdebug.ini; fi;
38+
- if [[ "$TRAVIS_PHP_VERSION" != "hhvm" ]]; then phpenv config-rm xdebug.ini; fi;
3939
- if [[ "$TRAVIS_PHP_VERSION" = 5.* ]]; then echo "extension = mongo.so" >> $INI_FILE; fi;
4040
- if [[ "$TRAVIS_PHP_VERSION" = 5.* ]]; then echo "extension = memcache.so" >> $INI_FILE; fi;
4141
- if [[ "$TRAVIS_PHP_VERSION" = 5.* ]]; then (echo yes | pecl install -f apcu-4.0.7 && echo "apc.enable_cli = 1" >> $INI_FILE) || echo "Let's continue without apcu extension"; fi;

CONTRIBUTORS.md

+27-25
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ Symfony is the result of the work of many people who made the code better
5151
- Florin Patan (florinpatan)
5252
- Eric Clemmons (ericclemmons)
5353
- Andrej Hudec (pulzarraider)
54-
- Deni
5554
- Maxime Steinhausser (ogizanagi)
55+
- Deni
5656
- Henrik Westphal (snc)
5757
- Dariusz Górecki (canni)
5858
- Gábor Egyed (1ed)
5959
- Christian Raue
6060
- Arnout Boks (aboks)
61-
- Michel Weimerskirch (mweimerskirch)
6261
- Kevin Bond (kbond)
62+
- Michel Weimerskirch (mweimerskirch)
63+
- Douglas Greenshields (shieldo)
6364
- Lee McDermott
6465
- Brandon Turner
6566
- Luis Cordova (cordoval)
66-
- Douglas Greenshields (shieldo)
6767
- Daniel Holmes (dholmes)
6868
- Bart van den Burg (burgov)
6969
- Jordan Alliot (jalliot)
@@ -85,15 +85,17 @@ Symfony is the result of the work of many people who made the code better
8585
- Adrien Brault (adrienbrault)
8686
- excelwebzone
8787
- Jacob Dreesen (jdreesen)
88+
- Michal Piotrowski (eventhorizon)
89+
- Peter Kokot (maastermedia)
8890
- Fabien Pennequin (fabienpennequin)
8991
- Peter Rehm (rpet)
90-
- Peter Kokot (maastermedia)
92+
- Pierre du Plessis (pierredup)
9193
- Alexander Schwenn (xelaris)
9294
- Gordon Franke (gimler)
9395
- Robert Schönthal (digitalkaoz)
9496
- Jérémy DERUSSÉ (jderusse)
9597
- Dariusz Ruminski
96-
- Michal Piotrowski (eventhorizon)
98+
- Joshua Thijssen
9799
- Stefano Sala (stefano.sala)
98100
- David Buchmann (dbu)
99101
- Issei Murasawa (issei_m)
@@ -103,7 +105,6 @@ Symfony is the result of the work of many people who made the code better
103105
- Sebastian Hörl (blogsh)
104106
- Daniel Gomes (danielcsgomes)
105107
- Hidenori Goto (hidenorigoto)
106-
- Joshua Thijssen
107108
- Guilherme Blanco (guilhermeblanco)
108109
- Pablo Godel (pgodel)
109110
- Vladimir Reznichenko (kalessil)
@@ -116,6 +117,7 @@ Symfony is the result of the work of many people who made the code better
116117
- Clemens Tolboom
117118
- Helmer Aaviksoo
118119
- Baptiste Clavié (talus)
120+
- Tugdual Saunier (tucksaun)
119121
- Hiromi Hishida (77web)
120122
- Matthieu Ouellette-Vachon (maoueh)
121123
- Michał Pipa (michal.pipa)
@@ -124,8 +126,7 @@ Symfony is the result of the work of many people who made the code better
124126
- Artur Kotyrba
125127
- Rouven Weßling (realityking)
126128
- Charles Sarrazin (csarrazi)
127-
- Pierre du Plessis (pierredup)
128-
- Tugdual Saunier (tucksaun)
129+
- Warnar Boekkooi (boekkooi)
129130
- Andréia Bohner (andreia)
130131
- Dmitrii Chekaliuk (lazyhammer)
131132
- Clément JOBEILI (dator)
@@ -159,15 +160,17 @@ Symfony is the result of the work of many people who made the code better
159160
- Justin Hileman (bobthecow)
160161
- Michele Orselli (orso)
161162
- Sven Paulus (subsven)
162-
- Warnar Boekkooi (boekkooi)
163163
- Lars Strojny (lstrojny)
164+
- Daniel Wehner
164165
- Rui Marinho (ruimarinho)
166+
- Evgeniy (ewgraf)
165167
- Julien Brochet (mewt)
166168
- Sergey Linnik (linniksa)
167169
- Jáchym Toušek
168170
- Marcel Beerta (mazen)
169171
- Vincent AUBERT (vincent)
170172
- julien pauli (jpauli)
173+
- Florian Lonqueu-Brochard (florianlb)
171174
- Francois Zaninotto
172175
- Alexander Kotynia (olden)
173176
- Daniel Tschinder
@@ -185,6 +188,7 @@ Symfony is the result of the work of many people who made the code better
185188
- Eugene Leonovich (rybakit)
186189
- Joseph Rouff (rouffj)
187190
- Félix Labrecque (woodspire)
191+
- Tomáš Votruba (tomas_votruba)
188192
- GordonsLondon
189193
- Jan Sorgalla (jsor)
190194
- Ray
@@ -201,17 +205,19 @@ Symfony is the result of the work of many people who made the code better
201205
- Beau Simensen (simensen)
202206
- Robert Kiss (kepten)
203207
- Ruben Gonzalez (rubenrua)
208+
- Marcos Sánchez
204209
- Kim Hemsø Rasmussen (kimhemsoe)
205210
- Diego Saint Esteben (dosten)
206-
- Florian Lonqueu-Brochard (florianlb)
207211
- Tom Van Looy (tvlooy)
208212
- Wouter Van Hecke
209213
- Peter Kruithof (pkruithof)
210214
- Michael Holm (hollo)
211215
- Marc Weistroff (futurecat)
216+
- Blanchon Vincent (blanchonvincent)
212217
- Dawid Nowak
213218
- Kristen Gilden (kgilden)
214219
- Chris Smith (cs278)
220+
- Richard van Laak (rvanlaak)
215221
- Florian Klein (docteurklein)
216222
- Manuel Kiessling (manuelkiessling)
217223
- Daniel Wehner
@@ -245,7 +251,7 @@ Symfony is the result of the work of many people who made the code better
245251
- Giorgio Premi
246252
- Erin Millard
247253
- Matthew Lewinski (lewinski)
248-
- Marcos Sánchez
254+
- Antonio J. García Lagar (ajgarlag)
249255
- alquerci
250256
- Francesco Levorato
251257
- Vitaliy Zakharov (zakharovvi)
@@ -255,14 +261,11 @@ Symfony is the result of the work of many people who made the code better
255261
- Christian Gärtner (dagardner)
256262
- Tomasz Kowalczyk (thunderer)
257263
- François-Xavier de Guillebon (de-gui_f)
258-
- Daniel Wehner
259264
- Felix Labrecque
260265
- Yaroslav Kiliba
261266
- Stepan Anchugov (kix)
262267
- Terje Bråten
263-
- Evgeniy (ewgraf)
264268
- Robbert Klarenbeek (robbertkl)
265-
- Blanchon Vincent (blanchonvincent)
266269
- hossein zolfi (ocean)
267270
- Clément Gautier (clementgautier)
268271
- Eduardo Gulias (egulias)
@@ -285,6 +288,7 @@ Symfony is the result of the work of many people who made the code better
285288
- Shein Alexey
286289
- Joe Lencioni
287290
- Daniel Tschinder
291+
- Diego Agulló (aeoris)
288292
- Kai
289293
- Lee Rowlands
290294
- Maximilian Reichel (phramz)
@@ -313,8 +317,9 @@ Symfony is the result of the work of many people who made the code better
313317
- Thomas Lallement (raziel057)
314318
- Jan Schumann
315319
- Niklas Fiekas
320+
- Mark Challoner (markchalloner)
321+
- Markus Bachmann (baachi)
316322
- lancergr
317-
- Antonio J. García Lagar (ajgarlag)
318323
- Olivier Dolbeau (odolbeau)
319324
- Roumen Damianoff (roumen)
320325
- vagrant
@@ -365,9 +370,10 @@ Symfony is the result of the work of many people who made the code better
365370
- Daniel Beyer
366371
- Andrew Udvare (audvare)
367372
- alexpods
368-
- Richard van Laak (rvanlaak)
373+
- Tristan Darricau (nicofuma)
369374
- Erik Trapman (eriktrapman)
370375
- De Cock Xavier (xdecock)
376+
- Possum
371377
- Scott Arciszewski
372378
- Norbert Orzechowicz (norzechowicz)
373379
- Matthijs van den Bos (matthijs)
@@ -381,6 +387,7 @@ Symfony is the result of the work of many people who made the code better
381387
- Dawid Pakuła (zulusx)
382388
- Florian Rey (nervo)
383389
- Rodrigo Borrego Bernabé (rodrigobb)
390+
- Leo Feyer
384391
- MatTheCat
385392
- John Bafford (jbafford)
386393
- Denis Gorbachev (starfall)
@@ -410,7 +417,6 @@ Symfony is the result of the work of many people who made the code better
410417
- Christopher Davis (chrisguitarguy)
411418
- alcaeus
412419
- vitaliytv
413-
- Markus Bachmann (baachi)
414420
- Sebastian Blum
415421
- aubx
416422
- Ricky Su (ricky)
@@ -475,6 +481,7 @@ Symfony is the result of the work of many people who made the code better
475481
- Tiago Brito (blackmx)
476482
- Richard van den Brand (ricbra)
477483
- develop
484+
- Hidde Wieringa
478485
- Mark Sonnabaum
479486
- Alexander Obuhovich (aik099)
480487
- jochenvdv
@@ -496,7 +503,6 @@ Symfony is the result of the work of many people who made the code better
496503
- avorobiev
497504
- Venu
498505
- Lars Vierbergen
499-
- Mark Challoner
500506
- Dennis Hotson
501507
- Andrew Tchircoff (andrewtch)
502508
- michaelwilliams
@@ -534,7 +540,6 @@ Symfony is the result of the work of many people who made the code better
534540
- Rafał Wrzeszcz (rafalwrzeszcz)
535541
- Reen Lokum
536542
- Martin Parsiegla (spea)
537-
- Possum
538543
- Denis Charrier (brucewouaigne)
539544
- Quentin Schuler
540545
- Pierre Vanliefland (pvanliefland)
@@ -558,12 +563,10 @@ Symfony is the result of the work of many people who made the code better
558563
- Patrick Allaert
559564
- Gustavo Falco (gfalco)
560565
- Matt Robinson (inanimatt)
561-
- Tristan Darricau (nicofuma)
562566
- Aleksey Podskrebyshev
563567
- Steffen Roßkamp
564568
- David Marín Carreño (davefx)
565569
- Jörn Lang (j.lang)
566-
- Leo Feyer
567570
- mwsaz
568571
- Benoît Bourgeois
569572
- corphi
@@ -589,7 +592,6 @@ Symfony is the result of the work of many people who made the code better
589592
- Balazs Csaba (balazscsaba2006)
590593
- Harry Walter (haswalt)
591594
- Johnson Page (jwpage)
592-
- Tomáš Votruba (tomas_votruba)
593595
- Michael Roterman (wtfzdotnet)
594596
- Arno Geurts
595597
- Adán Lobato (adanlobato)
@@ -638,6 +640,7 @@ Symfony is the result of the work of many people who made the code better
638640
- Jérôme Vasseur
639641
- Sander Coolen (scoolen)
640642
- Nicolas Le Goff (nlegoff)
643+
- Anne-Sophie Bachelard (annesophie)
641644
- Manuele Menozzi
642645
- Anton Babenko (antonbabenko)
643646
- Irmantas Šiupšinskas (irmantas)
@@ -921,7 +924,6 @@ Symfony is the result of the work of many people who made the code better
921924
- Shane Preece (shane)
922925
- wusuopu
923926
- povilas
924-
- Diego Agulló
925927
- Alessandro Tagliapietra (alex88)
926928
- Biji (biji)
927929
- Gunnar Lium (gunnarlium)
@@ -1082,7 +1084,6 @@ Symfony is the result of the work of many people who made the code better
10821084
- grifx
10831085
- Robert Campbell
10841086
- Matt Lehner
1085-
- Hidde Wieringa
10861087
- Hein Zaw Htet™
10871088
- Ruben Kruiswijk
10881089
- Michael J
@@ -1106,7 +1107,6 @@ Symfony is the result of the work of many people who made the code better
11061107
- Alan Chen
11071108
- Maerlyn
11081109
- Even André Fiskvik
1109-
- Diego Agulló
11101110
- Dane Powell
11111111
- Gerrit Drost
11121112
- Lenar Lõhmus
@@ -1219,6 +1219,7 @@ Symfony is the result of the work of many people who made the code better
12191219
- Sam Williams
12201220
- Adrian Philipp
12211221
- James Michael DuPont
1222+
- Eugene Wissner
12221223
- Kasperki
12231224
- Tammy D
12241225
- Ondrej Slinták
@@ -1276,6 +1277,7 @@ Symfony is the result of the work of many people who made the code better
12761277
- arduanov
12771278
- sualko
12781279
- Nicolas Roudaire
1280+
- Jérôme Vasseur
12791281
- Alfonso (afgar)
12801282
- Andreas Forsblom (aforsblo)
12811283
- Alex Olmos (alexolmos)

0 commit comments

Comments
 (0)