diff --git a/.travis.yml b/.travis.yml
index 011e8eb70b..90eebdb528 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,10 @@ matrix:
- php: 5.6
env: deps=2.8
- php: 7.0
+ - php: 5.6
env: deps=low
+ allow_failures:
+ - php: 7
fast_finish: true
services: mongodb
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index af5724f4a7..3ce8e41098 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -14,8 +14,8 @@ Symfony is the result of the work of many people who made the code better
- Kris Wallsmith (kriswallsmith)
- Christophe Coevoet (stof)
- Jakub Zalas (jakubzalas)
- - Pascal Borreli (pborreli)
- Christian Flothmann (xabbuh)
+ - Pascal Borreli (pborreli)
- Hugo Hamon (hhamon)
- Joseph Bielawski (stloyd)
- Karma Dordrak (drak)
@@ -26,15 +26,16 @@ Symfony is the result of the work of many people who made the code better
- Jean-François Simon (jfsimon)
- Benjamin Eberlei (beberlei)
- Igor Wiedler (igorw)
- - Martin Hasoň (hason)
- Abdellatif Ait boudad (aitboudad)
+ - Martin Hasoň (hason)
- Eriksen Costa (eriksencosta)
- Grégoire Pineau (lyrixx)
- Wouter De Jong (wouterj)
- Jonathan Wage (jwage)
+ - Javier Eguiluz (javier.eguiluz)
+ - Kévin Dunglas (dunglas)
- Alexandre Salomé (alexandresalome)
- William Durand (couac)
- - Kévin Dunglas (dunglas)
- ornicar
- stealth35 (stealth35)
- Alexander Mols (asm89)
@@ -84,43 +85,42 @@ Symfony is the result of the work of many people who made the code better
- excelwebzone
- Jacob Dreesen (jdreesen)
- Matthias Pigulla (mpdude)
- - Javier Eguiluz (javier.eguiluz)
- Fabien Pennequin (fabienpennequin)
- Peter Rehm (rpet)
- Peter Kokot (maastermedia)
- Gordon Franke (gimler)
- Robert Schönthal (digitalkaoz)
+ - Jérémy DERUSSÉ (jderusse)
- Dariusz Ruminski
- Michal Piotrowski (eventhorizon)
- Stefano Sala (stefano.sala)
+ - David Buchmann (dbu)
- Juti Noppornpitak (shiroyuki)
- Sebastian Hörl (blogsh)
- Daniel Gomes (danielcsgomes)
- Hidenori Goto (hidenorigoto)
- - David Buchmann (dbu)
+ - Alexander Schwenn (xelaris)
- Guilherme Blanco (guilhermeblanco)
- - Jérémy DERUSSÉ (jderusse)
- Pablo Godel (pgodel)
- Eric GELOEN (gelo)
+ - Vladimir Reznichenko (kalessil)
- Jérémie Augustin (jaugustin)
- - Alexander Schwenn (xelaris)
+ - Issei Murasawa (issei_m)
- Rafael Dohms (rdohms)
- Arnaud Kleinpeter (nanocom)
+ - Iltar van der Berg (kjarli)
- Joshua Thijssen
- - Vladimir Reznichenko (kalessil)
- Tigran Azatyan (tigranazatyan)
- - Issei Murasawa (issei_m)
+ - Sebastiaan Stok (sstok)
- Richard Shank (iampersistent)
- Clemens Tolboom
- Helmer Aaviksoo
- - Sebastiaan Stok (sstok)
- Hiromi Hishida (77web)
- Matthieu Ouellette-Vachon (maoueh)
- Michał Pipa (michal.pipa)
- Amal Raghav (kertz)
- Jonathan Ingram (jonathaningram)
- Artur Kotyrba
- - Iltar van der Berg
- Rouven Weßling (realityking)
- Andréia Bohner (andreia)
- Dmitrii Chekaliuk (lazyhammer)
@@ -146,6 +146,7 @@ Symfony is the result of the work of many people who made the code better
- fivestar
- Dominique Bongiraud
- Leszek Prabucki (l3l0)
+ - Alexander M. Turek (derrabus)
- François Zaninotto (fzaninotto)
- Dustin Whittle (dustinwhittle)
- jeff
@@ -164,7 +165,6 @@ Symfony is the result of the work of many people who made the code better
- Francois Zaninotto
- Alexander Kotynia (olden)
- Daniel Tschinder
- - Alexander M. Turek (derrabus)
- Elnur Abdurrakhimov (elnur)
- John Kary (johnkary)
- Manuel Reinhard (sprain)
@@ -197,6 +197,7 @@ Symfony is the result of the work of many people who made the code better
- Robert Kiss (kepten)
- Ruben Gonzalez (rubenrua)
- Kim Hemsø Rasmussen (kimhemsoe)
+ - Diego Saint Esteben (dosten)
- Florian Lonqueu-Brochard (florianlb)
- Tom Van Looy (tvlooy)
- Wouter Van Hecke
@@ -212,6 +213,7 @@ Symfony is the result of the work of many people who made the code better
- Andrew Moore (finewolf)
- Bertrand Zuchuat (garfield-fr)
- Gabor Toth (tgabi333)
+ - Grégoire Paris (greg0ire)
- Alex Pott
- realmfoo
- Thomas Tourlourat (armetiz)
@@ -232,8 +234,11 @@ Symfony is the result of the work of many people who made the code better
- Thomas Schulz (king2500)
- Marco Pivetta (ocramius)
- Ricard Clau (ricardclau)
+ - Lorenz Schori
+ - Giorgio Premi
- Erin Millard
- Matthew Lewinski (lewinski)
+ - Marcos Sánchez
- alquerci
- Francesco Levorato
- Vitaliy Zakharov (zakharovvi)
@@ -260,13 +265,13 @@ Symfony is the result of the work of many people who made the code better
- Kirill chEbba Chebunin (chebba)
- Greg Thornton (xdissent)
- Baptiste Clavié (talus)
- - Grégoire Paris (greg0ire)
- Costin Bereveanu (schniper)
- Loïc Chardonnet (gnusat)
- Marek Kalnik (marekkalnik)
- Vyacheslav Salakhutdinov (megazoll)
- Hassan Amouhzi
- Tamas Szijarto
+ - Michaël Perrin (michael.perrin)
- Pavel Volokitin (pvolok)
- Endre Fejes
- Tobias Naumann (tna)
@@ -297,8 +302,8 @@ Symfony is the result of the work of many people who made the code better
- Brian King
- Michel Salib (michelsalib)
- geoffrey
- - Lorenz Schori
- Jeanmonod David (jeanmonod)
+ - Thomas Lallement (raziel057)
- Jan Schumann
- Niklas Fiekas
- lancergr
@@ -370,6 +375,7 @@ Symfony is the result of the work of many people who made the code better
- Florian Rey (nervo)
- Rodrigo Borrego Bernabé (rodrigobb)
- Denis Gorbachev (starfall)
+ - Titouan Galopin (tgalopin)
- Steven Surowiec
- Kevin Saliou (kbsali)
- Daniel Tschinder
@@ -393,7 +399,6 @@ Symfony is the result of the work of many people who made the code better
- Mantas Var (mvar)
- Sebastian Krebs
- Christopher Davis (chrisguitarguy)
- - Thomas Lallement (raziel057)
- alcaeus
- vitaliytv
- Markus Bachmann (baachi)
@@ -449,6 +454,7 @@ Symfony is the result of the work of many people who made the code better
- Simon Schick (simonsimcity)
- redstar504
- Hossein Bukhamsin
+ - origaminal
- Paweł Wacławczyk (pwc)
- Oleg Zinchenko (cystbear)
- Johannes Klauss (cloppy)
@@ -538,6 +544,7 @@ Symfony is the result of the work of many people who made the code better
- Tony Malzhacker
- Cyril Quintin (cyqui)
- Gerard van Helden (drm)
+ - Johnny Peck (johnnypeck)
- David Romaní
- Patrick Allaert
- Gustavo Falco (gfalco)
@@ -545,6 +552,7 @@ Symfony is the result of the work of many people who made the code better
- Aleksey Podskrebyshev
- David Marín Carreño (davefx)
- Jörn Lang (j.lang)
+ - Leo Feyer
- mwsaz
- Benoît Bourgeois
- corphi
@@ -562,7 +570,6 @@ Symfony is the result of the work of many people who made the code better
- Christian Morgan
- Alexander Miehe (engerim)
- Morgan Auchede (mauchede)
- - Titouan Galopin (tgalopin)
- Don Pinkster
- Maksim Muruev
- Emil Einarsson
@@ -595,6 +602,7 @@ Symfony is the result of the work of many people who made the code better
- Reece Fowell (reecefowell)
- stefan.r
- Matthieu Napoli (mnapoli)
+ - Alexandru Furculita (afurculita)
- Ben Ramsey (ramsey)
- Christian Jul Jensen
- The Whole Life to Learn
@@ -610,7 +618,6 @@ Symfony is the result of the work of many people who made the code better
- Sander Marechal
- Radosław Benkel
- Gennady Telegin (gtelegin)
- - Marcos Sánchez
- ttomor
- Mei Gwilym (meigwilym)
- Michael H. Arieli (excelwebzone)
@@ -647,6 +654,7 @@ Symfony is the result of the work of many people who made the code better
- Per Sandström (per)
- Goran Juric
- Laurent Ghirardotti (laurentg)
+ - Nicolas Macherey
- Jan Rosier (rosier)
- Lin Clark
- Jeremy David (jeremy.david)
@@ -695,7 +703,6 @@ Symfony is the result of the work of many people who made the code better
- Jochen Bayer (jocl)
- Jeremy Bush
- wizhippo
- - Diego Saint Esteben (dosten)
- rpg600
- Péter Buri (burci)
- Davide Borsatto (davide.borsatto)
@@ -750,7 +757,6 @@ Symfony is the result of the work of many people who made the code better
- Jakub Kulhan
- Mo Di (modi)
- Jeroen van den Enden (stoefke)
- - origaminal
- Quique Porta (quiqueporta)
- Tomasz Szymczyk (karion)
- ConneXNL
@@ -782,8 +788,10 @@ Symfony is the result of the work of many people who made the code better
- Adrien Gallou (agallou)
- Karol Sójko (karolsojko)
- sl_toto (sl_toto)
+ - Walter Dal Mut (wdalmut)
- Sébastien HOUZÉ
- Jingyu Wang
+ - Daniel Espendiller
- steveYeah
- Samy Dindane (dinduks)
- Keri Henare (kerihenare)
@@ -823,10 +831,12 @@ Symfony is the result of the work of many people who made the code better
- Tadcka
- Beth Binkovitz
- Romain Geissler
+ - Tomaz Ahlin
- Benjamin Cremer (bcremer)
- Marcus Stöhr (dafish)
- Emmanuel Vella (emmanuel.vella)
- Carsten Nielsen (phreaknerd)
+ - Mathieu Rochette
- Jay Severson
- René Kerner
- Nathaniel Catchpole
@@ -861,6 +871,7 @@ Symfony is the result of the work of many people who made the code better
- Sebastian Ionescu
- Thomas Ploch
- Simon Neidhold
+ - Valentin VALCIU
- Kevin Dew
- James Cowgill
- Nicolas Schwartz (nicoschwartz)
@@ -911,6 +922,7 @@ Symfony is the result of the work of many people who made the code better
- 2manypeople
- Wing
- Thomas Bibb
+ - Matt Farmer
- catch
- Alexandre Segura
- Josef Cech
@@ -936,11 +948,11 @@ Symfony is the result of the work of many people who made the code better
- Manatsawin Hanmongkolchai
- Gunther Konig
- Maciej Schmidt
+ - nuncanada
- flack
- František Bereň
- Christoph Nissle (derstoffel)
- Ionel Scutelnicu (ionelscutelnicu)
- - Johnny Peck (johnnypeck)
- Nicolas Tallefourtané (nicolab)
- Botond Dani (picur)
- Thierry Marianne (thierrymarianne)
@@ -1035,6 +1047,7 @@ Symfony is the result of the work of many people who made the code better
- Florian Pfitzer (marmelatze)
- Martin Mayer (martin)
- Grzegorz Łukaszewicz (newicz)
+ - Veres Lajos
- grifx
- Robert Campbell
- Matt Lehner
@@ -1095,11 +1108,11 @@ Symfony is the result of the work of many people who made the code better
- Kevin Herrera (kherge)
- Luis Ramón López López (lrlopez)
- Muriel (metalmumu)
- - Michaël Perrin (michael.perrin)
- Michael Pohlers (mick_the_big)
- Cayetano Soriano Gallego (neoshadybeat)
- Pablo Monterde Perez (plebs)
- Jimmy Leger (redpanda)
+ - Pavel Batanov (scaytrase)
- Cyrille Jouineau (tuxosaurus)
- Yorkie Chadwick (yorkie76)
- Yanick Witschi
@@ -1123,6 +1136,7 @@ Symfony is the result of the work of many people who made the code better
- Ismail Asci (ismailasci)
- Simon CONSTANS (kosssi)
- Kristof Van Cauwenbergh (kristofvc)
+ - Tristan Darricau (nicofuma)
- Ramon Henrique Ornelas (ramonornela)
- Markus S. (staabm)
- Till Klampaeckel (till)
@@ -1180,6 +1194,7 @@ Symfony is the result of the work of many people who made the code better
- Skorney
- mieszko4
- Neophy7e
+ - bokonet
- Arrilot
- Markus Staab
- Pierre-Louis LAUNAY
@@ -1190,6 +1205,7 @@ Symfony is the result of the work of many people who made the code better
- Abdulkadir N. A.
- Yevgen Kovalienia
- Sema
+ - Elan Ruusamäe
- Thorsten Hallwas
- Michael Squires
- Norman Soetbeer
@@ -1203,7 +1219,6 @@ Symfony is the result of the work of many people who made the code better
- Penny Leach
- Richard Trebichavský
- g123456789l
- - Giorgio Premi
- oscartv
- DanSync
- Peter Zwosta
@@ -1261,6 +1276,7 @@ Symfony is the result of the work of many people who made the code better
- samuel laulhau (lalop)
- Laurent Bachelier (laurentb)
- Jérôme Parmentier (lctrs)
+ - Florent Viel (luxifer)
- Matthieu Moquet (mattketmo)
- Moritz Borgmann (mborgmann)
- Matt Drollette (mdrollette)
@@ -1279,6 +1295,7 @@ Symfony is the result of the work of many people who made the code better
- Rich Sage (richsage)
- Ruud Kamphuis (ruudk)
- Bart Ruysseveldt (ruyss)
+ - Sascha Dens (saschadens)
- scourgen hung (scourgen)
- Sebastian Busch (sebu)
- André Filipe Gonçalves Neves (seven)
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
index 72c6b3b61a..6fa00bea6a 100644
--- a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
+++ b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -479,7 +479,7 @@ class FrameworkExtension extends Extension
'sublime' => 'subl://open?url=file://%%f&line=%%l',
);
- $container->setParameter('templating.helper.code.file_link_format', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format') ?: (isset($links[$ide]) ? $links[$ide] : $ide));
+ $container->setParameter('templating.helper.code.file_link_format', str_replace('%', '%%', ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) ?: (isset($links[$ide]) ? $links[$ide] : $ide));
}
$container->setParameter('fragment.renderer.hinclude.global_template', $config['hinclude_default_template']);
diff --git a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
index c3b2fcdea3..2cc71b344e 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/XmlReferenceDumper.php
@@ -84,14 +84,18 @@ class XmlReferenceDumper
// render prototyped nodes
if ($node instanceof PrototypedArrayNode) {
- array_unshift($rootComments, 'prototype');
+ $prototype = $node->getPrototype();
+
+ $info = 'prototype';
+ if (null !== $prototype->getInfo()) {
+ $info .= ': '.$prototype->getInfo();
+ }
+ array_unshift($rootComments, $info);
if ($key = $node->getKeyAttribute()) {
$rootAttributes[$key] = str_replace('-', ' ', $rootName).' '.$key;
}
- $prototype = $node->getPrototype();
-
if ($prototype instanceof ArrayNode) {
$children = $prototype->getChildren();
} else {
diff --git a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
index 83587fb49c..c33da0b0a2 100644
--- a/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
+++ b/src/Symfony/Component/Config/Definition/Dumper/YamlReferenceDumper.php
@@ -69,7 +69,12 @@ class YamlReferenceDumper
if ($key = $node->getKeyAttribute()) {
$keyNodeClass = 'Symfony\Component\Config\Definition\\'.($prototype instanceof ArrayNode ? 'ArrayNode' : 'ScalarNode');
$keyNode = new $keyNodeClass($key, $node);
- $keyNode->setInfo('Prototype');
+
+ $info = 'Prototype';
+ if (null !== $prototype->getInfo()) {
+ $info .= ': '.$prototype->getInfo();
+ }
+ $keyNode->setInfo($info);
// add children
foreach ($children as $childNode) {
diff --git a/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php b/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
index 699751da7a..55e35b3a7a 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
@@ -64,7 +64,7 @@ class XmlReferenceDumperTest extends \PHPUnit_Framework_TestCase
child3=""
/>
-
+
scalar value
diff --git a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
index 4775235e16..ee5f865bc0 100644
--- a/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
+++ b/src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
@@ -56,7 +56,7 @@ acme_root:
child3: ~ # Example: example setting
parameters:
- # Prototype
+ # Prototype: Parameter name
name: ~
connections:
# Prototype
diff --git a/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php b/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
index df43e8bb1d..2df0f72a1e 100644
--- a/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
+++ b/src/Symfony/Component/Config/Tests/Fixtures/Configuration/ExampleConfiguration.php
@@ -53,7 +53,7 @@ class ExampleConfiguration implements ConfigurationInterface
->end()
->arrayNode('parameters')
->useAttributeAsKey('name')
- ->prototype('scalar')->end()
+ ->prototype('scalar')->info('Parameter name')->end()
->end()
->arrayNode('connections')
->prototype('array')
diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 7fc5862557..349a22b0ed 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -517,7 +517,7 @@ class Command
*/
public function getHelp()
{
- return $this->help;
+ return $this->help ?: $this->description;
}
/**
diff --git a/src/Symfony/Component/Console/Tests/Command/CommandTest.php b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
index b20c1a04e6..fecdb0a68f 100644
--- a/src/Symfony/Component/Console/Tests/Command/CommandTest.php
+++ b/src/Symfony/Component/Console/Tests/Command/CommandTest.php
@@ -131,6 +131,8 @@ class CommandTest extends \PHPUnit_Framework_TestCase
$ret = $command->setHelp('help1');
$this->assertEquals($command, $ret, '->setHelp() implements a fluent interface');
$this->assertEquals('help1', $command->getHelp(), '->setHelp() sets the help');
+ $command->setHelp('');
+ $this->assertEquals('description', $command->getHelp(), '->getHelp() fallback to the description');
}
public function testGetProcessedHelp()
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
index cdcbdbdddd..392903fa02 100644
--- a/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
+++ b/src/Symfony/Component/Console/Tests/Fixtures/application_asxml1.txt
@@ -100,7 +100,7 @@
afoobarThe foo:bar command
-
+ The foo:bar command