Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 87ef723

Browse filesBrowse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.1'
* 3.1: [PhpUnitBridge] Fix undefined variable Compatibility with Twig 1.27 Remove extra line in doc-block comment [VarDumper] Fix dumping Twig source in stack traces Enhance GAE compat by removing some realpath() [DependencyInjection] Remove old code in XML loader bumped Symfony version to 3.1.7 updated VERSION for 3.1.6 updated CHANGELOG for 3.1.6 bumped Symfony version to 2.8.14 updated VERSION for 2.8.13 updated CHANGELOG for 2.8.13 bumped Symfony version to 2.7.21 updated VERSION for 2.7.20 update CONTRIBUTORS for 2.7.20 updated CHANGELOG for 2.7.20 [SecurityBundle] Fix twig-bridge lowest dep
2 parents 1d96df0 + b77d6d9 commit 87ef723
Copy full SHA for 87ef723

File tree

25 files changed

+114
-65
lines changed
Filter options

25 files changed

+114
-65
lines changed

‎CHANGELOG-3.1.md

Copy file name to clipboardExpand all lines: CHANGELOG-3.1.md
+30Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,36 @@ in 3.1 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.1.0...v3.1.1
99

10+
* 3.1.6 (2016-10-27)
11+
12+
* bug #20291 [Yaml] Fix 7.1 compat (nicolas-grekas)
13+
* bug #20289 Fix edge case with StreamedResponse where headers are sent twice (Nicofuma)
14+
* bug #20267 [DependencyInjection] A decorated service should not keep the autowiring types (chalasr)
15+
* bug #20278 [DependencyInjection] merge tags instead of completely replacing them (xabbuh)
16+
* bug #20271 Changes related to Twig 1.27 (fabpot)
17+
* bug #20252 Trim constant values in XmlFileLoader (lstrojny)
18+
* bug #20239 [HttpKernel] Fix a regression in the RequestDataCollector (jakzal)
19+
* bug #20253 [TwigBridge] Use non-deprecated Twig_Node::getTemplateLine() (fabpot)
20+
* bug #20243 [WebProfilerBundle][btn-link] add `cursor: pointer` (aitboudad)
21+
* bug #20175 [VarDumper] Fix source links with latests Twig versions (nicolas-grekas)
22+
* bug #20235 [DomCrawler] Allow pipe (|) character in link tags when using Xpath expressions (klausi, nicolas-grekas)
23+
* bug #20224 [Twig] removed deprecations added in Twig 1.27 (fabpot)
24+
* bug #19478 fixed Filesystem:makePathRelative and added 2 more testcases (muhammedeminakbulut)
25+
* bug #20218 [HttpFoundation] no 304 response if method is not cacheable (xabbuh)
26+
* bug #20207 [DependencyInjection] move tags from decorated to decorating service (xabbuh)
27+
* bug #20205 [HttpCache] fix: do not cache OPTIONS request (dmaicher)
28+
* bug #20146 [Validator] Prevent infinite loop in PropertyMetadata (wesleylancel)
29+
* bug #20184 [FrameworkBundle] Convert null prefix to an empty string in translation:update (chalasr)
30+
* bug #20154 [PropertyInfo] Fix edge cases in ReflectionExtractor (nicolas-grekas)
31+
* bug #19725 [Security] $attributes can be anything, but RoleVoter assumes strings (Jonatan Männchen)
32+
* bug #20127 [HttpFoundation] JSONP callback validation (ro0NL)
33+
* bug #20163 add missing use statement (xabbuh)
34+
* bug #19961 [Console] Escape question text and default value in SymfonyStyle::ask() (chalasr)
35+
* bug #20141 [Console] Fix validation of empty values using SymfonyQuestionHelper::ask() (chalasr)
36+
* bug #20147 [FrameworkBundle] Alter container class instead of kernel name in cache:clear command (nicolas-grekas)
37+
* bug #20156 Fix event annotation for arguments resolving event (Koc)
38+
* bug #20152 [HttpKernel] Fix nullable types handling (nicolas-grekas)
39+
1040
* 3.1.5 (2016-10-03)
1141

1242
* bug #20102 [Validator] Url validator not validating hosts ending in a number (gwkunze)

‎CONTRIBUTORS.md

Copy file name to clipboardExpand all lines: CONTRIBUTORS.md
+24-14Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ Symfony is the result of the work of many people who made the code better
3333
- Igor Wiedler (igorw)
3434
- Grégoire Pineau (lyrixx)
3535
- Eriksen Costa (eriksencosta)
36-
- Sarah Khalil (saro0h)
3736
- Jules Pietri (heah)
37+
- Sarah Khalil (saro0h)
3838
- Maxime Steinhausser (ogizanagi)
3939
- Jonathan Wage (jwage)
4040
- Diego Saint Esteben (dosten)
@@ -49,13 +49,13 @@ Symfony is the result of the work of many people who made the code better
4949
- Henrik Bjørnskov (henrikbjorn)
5050
- Miha Vrhovnik
5151
- Diego Saint Esteben (dii3g0)
52+
- Robin Chalas (chalas_r)
5253
- Ener-Getick (energetick)
5354
- Konstantin Kudryashov (everzet)
5455
- Bilal Amarni (bamarni)
5556
- Florin Patan (florinpatan)
5657
- Peter Rehm (rpet)
5758
- Iltar van der Berg (kjarli)
58-
- Robin Chalas (chalas_r)
5959
- Kevin Bond (kbond)
6060
- Andrej Hudec (pulzarraider)
6161
- Gábor Egyed (1ed)
@@ -69,32 +69,34 @@ Symfony is the result of the work of many people who made the code better
6969
- Henrik Westphal (snc)
7070
- Dariusz Górecki (canni)
7171
- Douglas Greenshields (shieldo)
72+
- Konstantin Myakshin (koc)
7273
- Lee McDermott
7374
- Brandon Turner
7475
- Luis Cordova (cordoval)
7576
- Graham Campbell (graham)
7677
- Titouan Galopin (tgalopin)
7778
- Daniel Holmes (dholmes)
7879
- Pierre du Plessis (pierredup)
79-
- Konstantin Myakshin (koc)
8080
- Bart van den Burg (burgov)
8181
- Jordan Alliot (jalliot)
8282
- John Wards (johnwards)
8383
- Toni Uebernickel (havvg)
8484
- Fran Moreno (franmomu)
8585
- Antoine Hérault (herzult)
8686
- Paráda József (paradajozsef)
87+
- Jáchym Toušek (enumag)
8788
- Arnaud Le Blanc (arnaud-lb)
8889
- Jérôme Tamarelle (gromnan)
8990
- Michal Piotrowski (eventhorizon)
9091
- Tim Nagel (merk)
92+
- Dariusz Ruminski
9193
- Brice BERNARD (brikou)
9294
- Alexander M. Turek (derrabus)
93-
- Dariusz Ruminski
9495
- marc.weistroff
9596
- Issei Murasawa (issei_m)
9697
- lenar
9798
- Włodzimierz Gajda (gajdaw)
99+
- Roland Franssen (ro0)
98100
- Baptiste Clavié (talus)
99101
- Alexander Schwenn (xelaris)
100102
- Florian Voutzinos (florianv)
@@ -104,8 +106,6 @@ Symfony is the result of the work of many people who made the code better
104106
- Peter Kokot (maastermedia)
105107
- excelwebzone
106108
- Jacob Dreesen (jdreesen)
107-
- Jáchym Toušek (enumag)
108-
- Roland Franssen (ro0)
109109
- Jérémy DERUSSÉ (jderusse)
110110
- Vladimir Reznichenko (kalessil)
111111
- Tomáš Votruba (tomas_votruba)
@@ -131,6 +131,7 @@ Symfony is the result of the work of many people who made the code better
131131
- Andréia Bohner (andreia)
132132
- Rafael Dohms (rdohms)
133133
- Arnaud Kleinpeter (nanocom)
134+
- jwdeitch
134135
- Joel Wurtz (brouznouf)
135136
- Philipp Wahala (hifi)
136137
- Vyacheslav Pavlov
@@ -139,6 +140,7 @@ Symfony is the result of the work of many people who made the code better
139140
- Thomas Rabaix (rande)
140141
- Vincent AUBERT (vincent)
141142
- Rouven Weßling (realityking)
143+
- Teoh Han Hui (teohhanhui)
142144
- Mikael Pajunen
143145
- Clemens Tolboom
144146
- Helmer Aaviksoo
@@ -149,7 +151,6 @@ Symfony is the result of the work of many people who made the code better
149151
- Amal Raghav (kertz)
150152
- Jonathan Ingram (jonathaningram)
151153
- Artur Kotyrba
152-
- Teoh Han Hui (teohhanhui)
153154
- Warnar Boekkooi (boekkooi)
154155
- Dmitrii Chekaliuk (lazyhammer)
155156
- Clément JOBEILI (dator)
@@ -159,10 +160,12 @@ Symfony is the result of the work of many people who made the code better
159160
- Richard Miller (mr_r_miller)
160161
- Mario A. Alvarez Garcia (nomack84)
161162
- Dennis Benkert (denderello)
163+
- jeremyFreeAgent (Jérémy Romey) (jeremyfreeagent)
162164
- Benjamin Dulau (dbenjamin)
163165
- Mathieu Lemoine (lemoinem)
164166
- Andreas Hucks (meandmymonkey)
165167
- Noel Guilbert (noel)
168+
- Lars Strojny (lstrojny)
166169
- Yonel Ceruto González (yonelceruto)
167170
- Stepan Anchugov (kix)
168171
- bronze1man
@@ -185,13 +188,11 @@ Symfony is the result of the work of many people who made the code better
185188
- Michele Orselli (orso)
186189
- Tom Van Looy (tvlooy)
187190
- Sven Paulus (subsven)
188-
- Lars Strojny (lstrojny)
189191
- Rui Marinho (ruimarinho)
190192
- Daniel Espendiller
191193
- Dawid Nowak
192194
- Eugene Wissner
193195
- Julien Brochet (mewt)
194-
- jeremyFreeAgent (jeremyfreeagent)
195196
- Sergey Linnik (linniksa)
196197
- Michaël Perrin (michael.perrin)
197198
- Marcel Beerta (mazen)
@@ -226,6 +227,7 @@ Symfony is the result of the work of many people who made the code better
226227
- Jakub Kucharovic (jkucharovic)
227228
- Eugene Leonovich (rybakit)
228229
- Filippo Tessarotto
230+
- Tristan Darricau (nicofuma)
229231
- Joseph Rouff (rouffj)
230232
- Félix Labrecque (woodspire)
231233
- GordonsLondon
@@ -262,7 +264,6 @@ Symfony is the result of the work of many people who made the code better
262264
- Oleg Voronkovich
263265
- Manuel Kiessling (manuelkiessling)
264266
- Daniel Wehner
265-
- Tristan Darricau (nicofuma)
266267
- Atsuhiro KUBO (iteman)
267268
- Andrew Moore (finewolf)
268269
- Bertrand Zuchuat (garfield-fr)
@@ -387,6 +388,7 @@ Symfony is the result of the work of many people who made the code better
387388
- Ariel Ferrandini (aferrandini)
388389
- Dirk Pahl (dirkaholic)
389390
- cedric lombardot (cedriclombardot)
391+
- David Maicher (dmaicher)
390392
- Jonas Flodén (flojon)
391393
- Christian Schmidt
392394
- Marcin Sikoń (marphi)
@@ -535,6 +537,7 @@ Symfony is the result of the work of many people who made the code better
535537
- Daisuke Ohata
536538
- Vincent Simonin
537539
- Alex Bogomazov (alebo)
540+
- maxime.steinhausser
538541
- Stefan Warman
539542
- Tristan Maindron (tmaindron)
540543
- Ke WANG (yktd26)
@@ -546,11 +549,11 @@ Symfony is the result of the work of many people who made the code better
546549
- Ulumuddin Yunus (joenoez)
547550
- Luc Vieillescazes (iamluc)
548551
- Johann Saunier (prophet777)
552+
- Michael Devery (mickadoo)
549553
- Antoine Corcy
550554
- Artur Eshenbrener
551555
- Arturs Vonda
552556
- Sascha Grossenbacher
553-
- David Maicher (dmaicher)
554557
- Szijarto Tamas
555558
- Catalin Dan
556559
- Stephan Vock
@@ -593,6 +596,7 @@ Symfony is the result of the work of many people who made the code better
593596
- Vladyslav Petrovych
594597
- Alex Xandra Albert Sim
595598
- Carson Full
599+
- Andrey Astakhov (aast)
596600
- Trent Steel (trsteel88)
597601
- Yuen-Chi Lian
598602
- Besnik Br
@@ -602,12 +606,14 @@ Symfony is the result of the work of many people who made the code better
602606
- avorobiev
603607
- Venu
604608
- Lars Vierbergen
609+
- Jonatan Männchen
605610
- Dennis Hotson
606611
- Andrew Tchircoff (andrewtch)
607612
- michaelwilliams
608613
- 1emming
609614
- Victor Bocharsky (bocharsky_bw)
610615
- Leevi Graham (leevigraham)
616+
- Jordan Deitch
611617
- Casper Valdemar Poulsen
612618
- Josiah (josiah)
613619
- Joschi Kuphal
@@ -740,6 +746,7 @@ Symfony is the result of the work of many people who made the code better
740746
- Alexandru Furculita (afurculita)
741747
- Ben Ramsey (ramsey)
742748
- Christian Jul Jensen
749+
- Alexandre GESLIN (alexandregeslin)
743750
- The Whole Life to Learn
744751
- Farhad Safarov
745752
- Liverbool (liverbool)
@@ -870,12 +877,14 @@ Symfony is the result of the work of many people who made the code better
870877
- James Gilliland
871878
- Rhodri Pugh (rodnaph)
872879
- David de Boer (ddeboer)
880+
- Klaus Purer
873881
- Gilles Doge (gido)
874882
- abulford
875883
- antograssiot
876884
- Brooks Boyd
877885
- Roger Webb
878886
- Dmitriy Simushev
887+
- Ivo Bathke (ivoba)
879888
- Max Voloshin (maxvoloshin)
880889
- Nicolas Fabre (nfabre)
881890
- Raul Rodriguez (raul782)
@@ -964,7 +973,6 @@ Symfony is the result of the work of many people who made the code better
964973
- ChrisC
965974
- Ilya Biryukov
966975
- Kim Laï Trinh
967-
- Jonatan Männchen
968976
- Jason Desrosiers
969977
- m.chwedziak
970978
- Philip Frank
@@ -994,7 +1002,6 @@ Symfony is the result of the work of many people who made the code better
9941002
- Emmanuel Vella (emmanuel.vella)
9951003
- Carsten Nielsen (phreaknerd)
9961004
- Mathieu Rochette
997-
- maxime.steinhausser
9981005
- Jay Severson
9991006
- René Kerner
10001007
- Nathaniel Catchpole
@@ -1044,7 +1051,6 @@ Symfony is the result of the work of many people who made the code better
10441051
- Benjamin Bender
10451052
- Konrad Mohrfeldt
10461053
- Lance Chen
1047-
- Andrey Astakhov (aast)
10481054
- Andrew (drew)
10491055
- Nikolay Labinskiy (e-moe)
10501056
- kor3k kor3k (kor3k)
@@ -1055,6 +1061,7 @@ Symfony is the result of the work of many people who made the code better
10551061
- Mephistofeles
10561062
- Hoffmann András
10571063
- Olivier
1064+
- Wesley Lancel
10581065
- pscheit
10591066
- Zdeněk Drahoš
10601067
- Dan Harper
@@ -1160,6 +1167,7 @@ Symfony is the result of the work of many people who made the code better
11601167
- JakeFr
11611168
- Simon Sargeant
11621169
- efeen
1170+
- Muhammed Akbulut
11631171
- Michał Dąbrowski (defrag)
11641172
- Simone Fumagalli (hpatoio)
11651173
- Brian Graham (incognito)
@@ -1176,6 +1184,7 @@ Symfony is the result of the work of many people who made the code better
11761184
- Artem Lopata (bumz)
11771185
- Nicole Cordes
11781186
- Alexey Popkov
1187+
- Gijs Kunze
11791188
- Artyom Protaskin
11801189
- Nathanael d. Noblet
11811190
- helmer
@@ -1445,6 +1454,7 @@ Symfony is the result of the work of many people who made the code better
14451454
- Matthias Althaus
14461455
- Michaël VEROUX
14471456
- Julia
1457+
- Lin Lu
14481458
- arduanov
14491459
- sualko
14501460
- Nicolas Roudaire

‎src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DependencyInjection/AbstractDoctrineExtension.php
+1-4Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,7 @@ protected function setMappingDriverConfig(array $mappingConfig, $mappingName)
134134
throw new \InvalidArgumentException(sprintf('Invalid Doctrine mapping path given. Cannot load Doctrine mapping/bundle named "%s".', $mappingName));
135135
}
136136

137-
if (substr($mappingDirectory, 0, 7) !== 'phar://') {
138-
$mappingDirectory = realpath($mappingDirectory);
139-
}
140-
$this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = $mappingDirectory;
137+
$this->drivers[$mappingConfig['type']][$mappingConfig['prefix']] = realpath($mappingDirectory) ?: $mappingDirectory;
141138
}
142139

143140
/**

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/DoctrineValidationPass.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ private function updateValidatorMappingFiles(ContainerBuilder $container, $mappi
6161
foreach ($container->getParameter('kernel.bundles') as $bundle) {
6262
$reflection = new \ReflectionClass($bundle);
6363
if (is_file($file = dirname($reflection->getFileName()).'/'.$validationPath)) {
64-
$files[] = realpath($file);
64+
$files[] = $file;
6565
$container->addResource(new FileResource($file));
6666
}
6767
}

‎src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/PhpUnit/DeprecationErrorHandler.php
+2-1Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public static function register($mode = 0)
6868
'other' => array(),
6969
);
7070
$deprecationHandler = function ($type, $msg, $file, $line, $context) use (&$deprecations, $getMode) {
71-
if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode = $getMode()) {
71+
$mode = $getMode();
72+
if ((E_USER_DEPRECATED !== $type && E_DEPRECATED !== $type) || DeprecationErrorHandler::MODE_DISABLED === $mode) {
7273
return \PHPUnit_Util_ErrorHandler::handleError($type, $msg, $file, $line, $context);
7374
}
7475

‎src/Symfony/Bridge/Twig/Translation/TwigExtractor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bridge/Twig/Translation/TwigExtractor.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public function extract($resource, MessageCatalogue $catalogue)
6464
if ($file instanceof SplFileInfo) {
6565
$e->setTemplateName($file->getRelativePathname());
6666
} elseif ($file instanceof \SplFileInfo) {
67-
$e->setTemplateName($file->getRealPath());
67+
$e->setTemplateName($file->getRealPath() ?: $file->getPathname());
6868
}
6969

7070
throw $e;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.