diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.0'

Browse Source 
* 3.0:
  [travis] timeout the sigchild tests at 60s
  CS: Single line comments should use double slashes (//) and not hash (#).
  Do not use HttpKernel Extension when not needed for 2.7
  bumped Symfony version to 3.0.2
  Do not use HttpKernel Extension when not needed
  updated VERSION for 3.0.1
  updated CHANGELOG for 3.0.1
  bumped Symfony version to 2.8.2
  updated VERSION for 2.8.1
  updated CHANGELOG for 2.8.1
  bumped Symfony version to 2.7.9
  updated VERSION for 2.7.8
  updated CHANGELOG for 2.7.8
  bumped Symfony version to 2.3.37
  updated VERSION for 2.3.36
  update CONTRIBUTORS for 2.3.36
  updated CHANGELOG for 2.3.36
  Revert "Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)""
  Revert "bug #17052 [2.7] Fixed flatten exception recursion with errors (GrahamCampbell)"
  use nowdoc instead of heredoc

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
This commit is contained in:
Nicolas Grekas 2015-12-28 14:15:29 +01:00
commit 586c58a354
41 changed files with 211 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.php_cs
View File

@ -24,5 +24,7 @@ return Symfony\CS\Config\Config::create()
->notPath('src/Symfony/Component/Yaml/Tests/Fixtures/sfTests.yml')
// test template
->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/Resources/Custom/_name_entry_label.html.php')
// explicit heredoc test
->notPath('src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
)
;

2
.travis.yml
View File

@ -58,7 +58,7 @@ install:
script:
- if [[ ! $deps ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi;
- if [[ ! $deps ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi;
- if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | parallel --gnu 'echo -e "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi;
- if [[ ! $deps && $TRAVIS_PHP_VERSION = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | parallel --gnu --timeout 60 'echo -e "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi;
- if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY; fi;
- if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
- if [[ $deps = skip ]]; then echo This matrix line is skipped for pull requests.; fi;

54
CHANGELOG-3.0.md
View File

@ -7,6 +7,60 @@ in 3.0 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/v3.0.0...v3.0.1
* 3.0.1 (2015-12-26)
* bug #16864 [Yaml] fix indented line handling in folded blocks (xabbuh)
* bug #17052 Fixed flatten exception recursion with errors (GrahamCampbell)
* bug #16826 Embedded identifier support (mihai-stancu)
* bug #17079 Also transform inline mappings to objects (WouterJ)
* bug #17129 [Config] Fix array sort on normalization in edge case (romainneutron)
* feature #17035 [DomCrawler] Revert previous restriction, allow selection of every DOMNode object (EdgarPE)
* bug #17094 [Process] More robustness and deterministic tests (nicolas-grekas)
* bug #17112 [PropertyAccess] Reorder elements array after PropertyPathBuilder::replace (alekitto)
* bug #17109 Improved the design of the web debug toolbar (javiereguiluz)
* bug #16797 [Filesystem] Recursivly widen non-executable directories (Slamdunk)
* bug #16926 [DependencyInjection] fixed definition loosing property shared when decorated by a parent definition (wahler)
* bug #17040 [Console] Avoid extra blank lines when rendering exceptions (ogizanagi)
* bug #17044 [Form] fix BC break introduced with prototype_data option (memphys)
* bug #17055 [Security] Verify if a password encoded with bcrypt is no longer than 72 characters (jakzal)
* bug #16959 [Form] fix #15544 when a collection type attribute "required" is false, "prototype" should too (HeahDude)
* bug #16806 [Validator] BicValidator - fixed raising violations to a maximum of one (mvhirsch)
* bug #16842 [Ldap] Escape carriage returns in LDAP DNs. (ChadSikorra)
* bug #16860 [Yaml] do not remove "comments" in scalar blocks (xabbuh)
* bug #17002 [Console][Table] fixed render row that contains multiple cells. (aitboudad)
* bug #16964 CSS min-height and min-width should not be "auto" (aschempp)
* bug #16971 [HttpFoundation] Added the ability of using BinaryFileResponse with stream wrappers (jakzal, Sander-Toonen)
* bug #17048 Fix the logout path when not using the router (stof)
* bug #17049 Fix the logout path when not using the router (stof)
* bug #17057 [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands (xabbuh)
* bug #17059 [HttpFoundation] fix error level for deprecation (xabbuh)
* bug #17006 [Form] Fix casting regression in DoctrineChoiceLoader (bendavies)
* bug #16911 [PropertyInfo] Update List Information from ReflectionExtractor (zanderbaldwin)
* bug #16955 [FrameworkBundle] ContainerDebugCommand: pass the right object to the descriptors (xabbuh)
* bug #16970 [HttpKernel] HttpCache: remove an ESI instance checking (voronkovich)
* feature #16760 Show silenced errors in separate tab (peterrehm)
* feature #16937 [PhpUnitBridge] Replace "weak-verbose" by "deprecations upper bound" mode (nicolas-grekas)
* bug #16953 return ajax collector to collectors.php (NothingWeAre)
* bug #16915 [Process] Enhance compatiblity with --enable-sigchild (nicolas-grekas)
* bug #16829 [FrameworkBundle] prevent cache:clear creating too long paths (Tobion)
* bug #16922 [FrameworkBundle] [Bug] Fixes new InputStyle bug #16920 (AlmogBaku)
* bug #16921 Fix short array syntax for php 5.3 (ewgRa)
* bug #16450 [Serializer] Fixed `array_unique` on array of objects in `getAllowedAttributes`. (CornyPhoenix)
* bug #16757 [FrameworkBundle] [Translation] Fixed translations not written when no translations directory in update command (jeremyFreeAgent)
* bug #16902 [Security] Fix a Polyfill import statement in StringUtils (magnetik)
* bug #16871 [FrameworkBundle] Disable built-in server commands when Process component is missing (gnugat, xabbuh)
* bug #16870 [FrameworkBundle] Disable the server:run command when Process component is missing (gnugat, xabbuh)
* feature #16789 [PhpUnitBridge] Add weak-verbose mode and match against message instead of test name (nicolas-grekas)
* minor #16850 [MonologBridge] Added a test case for the Logger class (derrabus)
* bug #16796 [Form] Fix choices defined as Traversable (nicolas-grekas)
* bug #16742 [Console][ProgressBar] redrawFrequency should never be 0 (dritter)
* bug #16846 [MonologBridge] Monolog Bridge 2.8 is incompatible with HttpKernel 3.0 (derrabus)
* bug #16816 [Config] Throw an exception when using cannotBeEmpty() with numeric or boolean nodes (Ener-Getick)
* bug #16799 Improve error message for undefined DIC aliases (mpdude)
* bug #16825 [VarDumper] fix .sf-dump z-index (debug bar conflict) (Antoine LA)
* bug #16772 Refactoring EntityUserProvider::__construct() to not do work, cause cache warm error (weaverryan)
* bug #16788 Reapply the Yaml bugfix of #16745 (stof)
* 3.0.0 (2015-11-30)
* bug #16758 Fix BC for the default root form name (stof)

71
CONTRIBUTORS.md
View File

@ -13,8 +13,8 @@ Symfony is the result of the work of many people who made the code better
- Christophe Coevoet (stof)
- Johannes S (johannes)
- Kris Wallsmith (kriswallsmith)
- Jakub Zalas (jakubzalas)
- Christian Flothmann (xabbuh)
- Jakub Zalas (jakubzalas)
- Ryan Weaver (weaverryan)
- Pascal Borreli (pborreli)
- Hugo Hamon (hhamon)
@ -30,8 +30,8 @@ Symfony is the result of the work of many people who made the code better
- Martin Hasoň (hason)
- Wouter De Jong (wouterj)
- Eriksen Costa (eriksencosta)
- Grégoire Pineau (lyrixx)
- Javier Eguiluz (javier.eguiluz)
- Grégoire Pineau (lyrixx)
- Kévin Dunglas (dunglas)
- Jonathan Wage (jwage)
- Alexandre Salomé (alexandresalome)
@ -49,17 +49,17 @@ Symfony is the result of the work of many people who made the code better
- Konstantin Kudryashov (everzet)
- Bilal Amarni (bamarni)
- Florin Patan (florinpatan)
- Maxime Steinhausser (ogizanagi)
- Eric Clemmons (ericclemmons)
- Andrej Hudec (pulzarraider)
- Maxime Steinhausser (ogizanagi)
- Deni
- Henrik Westphal (snc)
- Dariusz Górecki (canni)
- Gábor Egyed (1ed)
- Christian Raue
- Michel Weimerskirch (mweimerskirch)
- Arnout Boks (aboks)
- Kevin Bond (kbond)
- Michel Weimerskirch (mweimerskirch)
- Douglas Greenshields (shieldo)
- Lee McDermott
- Brandon Turner
@ -67,11 +67,11 @@ Symfony is the result of the work of many people who made the code better
- Daniel Holmes (dholmes)
- Bart van den Burg (burgov)
- Jordan Alliot (jalliot)
- Matthias Pigulla (mpdude)
- John Wards (johnwards)
- Fran Moreno (franmomu)
- Antoine Hérault (herzult)
- Toni Uebernickel (havvg)
- Matthias Pigulla (mpdude)
- Arnaud Le Blanc (arnaud-lb)
- Tim Nagel (merk)
- Brice BERNARD (brikou)
@ -80,21 +80,21 @@ Symfony is the result of the work of many people who made the code better
- lenar
- Graham Campbell (graham)
- Włodzimierz Gajda (gajdaw)
- Michal Piotrowski (eventhorizon)
- Florian Voutzinos (florianv)
- Peter Rehm (rpet)
- Colin Frei
- Adrien Brault (adrienbrault)
- excelwebzone
- Jacob Dreesen (jdreesen)
- Michal Piotrowski (eventhorizon)
- Dariusz Ruminski
- Peter Kokot (maastermedia)
- Fabien Pennequin (fabienpennequin)
- Peter Rehm (rpet)
- Pierre du Plessis (pierredup)
- Alexander Schwenn (xelaris)
- Gordon Franke (gimler)
- Robert Schönthal (digitalkaoz)
- Jérémy DERUSSÉ (jderusse)
- Dariusz Ruminski
- Joshua Thijssen
- Stefano Sala (stefano.sala)
- David Buchmann (dbu)
@ -112,12 +112,15 @@ Symfony is the result of the work of many people who made the code better
- Sebastiaan Stok (sstok)
- Rafael Dohms (rdohms)
- Arnaud Kleinpeter (nanocom)
- Alexander M. Turek (derrabus)
- Tigran Azatyan (tigranazatyan)
- Richard Shank (iampersistent)
- Charles Sarrazin (csarrazi)
- Clemens Tolboom
- Helmer Aaviksoo
- Baptiste Clavié (talus)
- Tugdual Saunier (tucksaun)
- Andréia Bohner (andreia)
- Hiromi Hishida (77web)
- Matthieu Ouellette-Vachon (maoueh)
- Michał Pipa (michal.pipa)
@ -125,9 +128,7 @@ Symfony is the result of the work of many people who made the code better
- Jonathan Ingram (jonathaningram)
- Artur Kotyrba
- Rouven Weßling (realityking)
- Charles Sarrazin (csarrazi)
- Warnar Boekkooi (boekkooi)
- Andréia Bohner (andreia)
- Dmitrii Chekaliuk (lazyhammer)
- Clément JOBEILI (dator)
- Dorian Villet (gnutix)
@ -135,19 +136,19 @@ Symfony is the result of the work of many people who made the code better
- Richard Miller (mr_r_miller)
- hacfi (hifi)
- Mario A. Alvarez Garcia (nomack84)
- Thomas Rabaix (rande)
- Dennis Benkert (denderello)
- Alexander M. Turek (derrabus)
- Konstantin Myakshin (koc)
- Benjamin Dulau (dbenjamin)
- Andreas Hucks (meandmymonkey)
- Mikael Pajunen
- Noel Guilbert (noel)
- Joel Wurtz (brouznouf)
- Evgeniy (ewgraf)
- bronze1man
- sun (sun)
- Larry Garfield (crell)
- Martin Schuhfuß (usefulthink)
- Thomas Rabaix (rande)
- Matthieu Bontemps (mbontemps)
- Pierre Minnieur (pminnieur)
- fivestar
@ -163,7 +164,6 @@ Symfony is the result of the work of many people who made the code better
- Lars Strojny (lstrojny)
- Daniel Wehner
- Rui Marinho (ruimarinho)
- Evgeniy (ewgraf)
- Julien Brochet (mewt)
- Sergey Linnik (linniksa)
- Jáchym Toušek
@ -244,6 +244,7 @@ Symfony is the result of the work of many people who made the code better
- Julien Galenski (ruian)
- Bongiraud Dominique
- janschoenherr
- Jannik Zschiesche (apfelbox)
- Thomas Schulz (king2500)
- Marco Pivetta (ocramius)
- Ricard Clau (ricardclau)
@ -252,6 +253,7 @@ Symfony is the result of the work of many people who made the code better
- Erin Millard
- Matthew Lewinski (lewinski)
- Antonio J. García Lagar (ajgarlag)
- Roumen Damianoff (roumen)
- alquerci
- Francesco Levorato
- Vitaliy Zakharov (zakharovvi)
@ -273,7 +275,9 @@ Symfony is the result of the work of many people who made the code better
- Stéphane PY (steph_py)
- Philipp Kräutli (pkraeutli)
- Kirill chEbba Chebunin (chebba)
- Filippo Tessarotto
- Greg Thornton (xdissent)
- jeremyFreeAgent (jeremyfreeagent)
- Costin Bereveanu (schniper)
- Loïc Chardonnet (gnusat)
- Marek Kalnik (marekkalnik)
@ -306,7 +310,6 @@ Symfony is the result of the work of many people who made the code better
- Christophe L. (christophelau)
- Massimiliano Arione (garak)
- Anthon Pang (robocoder)
- Jannik Zschiesche (apfelbox)
- Emanuele Gaspari (inmarelibero)
- Dariusz Rumiński
- Brian King
@ -321,9 +324,10 @@ Symfony is the result of the work of many people who made the code better
- Markus Bachmann (baachi)
- lancergr
- Olivier Dolbeau (odolbeau)
- Roumen Damianoff (roumen)
- Ben Davies (bendavies)
- vagrant
- Asier Illarramendi (doup)
- Artur Melo (restless)
- Chris Sedlmayr (catchamonkey)
- Seb Koelen
- Christoph Mewes (xrstf)
@ -348,10 +352,11 @@ Symfony is the result of the work of many people who made the code better
- Sebastian Bergmann
- Pablo Díez (pablodip)
- Kevin McBride
- Ener-Getick (energetick)
- Philipp Rieber (bicpi)
- Manuel de Ruiter (manuel)
- Jérémy Romey (jeremyfreeagent)
- Eduardo Oliveira (entering)
- Eugene Wissner
- Iker Ibarguren (ikerib)
- Ricardo Oliveira (ricardolotr)
- ondrowan
@ -406,6 +411,7 @@ Symfony is the result of the work of many people who made the code better
- Lenar Lõhmus
- Benjamin Laugueux (yzalis)
- Zach Badgett (zachbadgett)
- Loïc Faugeron
- Aurélien Fredouelle
- Pavel Campr (pcampr)
- Johnny Robeson (johnny)
@ -435,6 +441,7 @@ Symfony is the result of the work of many people who made the code better
- Åsmund Garfors
- Maxime Douailin
- Gregor Harlan
- Michael Hirschler (mvhirsch)
- Javier López (loalf)
- Reinier Kip
- Dustin Dobervich (dustin10)
@ -465,7 +472,6 @@ Symfony is the result of the work of many people who made the code better
- Sascha Grossenbacher
- Szijarto Tamas
- Benjamin Zikarsky (bzikarsky)
- Ben Davies (bendavies)
- Mickaël Andrieu (mickaelandrieu)
- Simon Schick (simonsimcity)
- redstar504
@ -485,13 +491,13 @@ Symfony is the result of the work of many people who made the code better
- Mark Sonnabaum
- Alexander Obuhovich (aik099)
- jochenvdv
- Filippo Tessarotto
- Arturas Smorgun (asarturas)
- Alexander Volochnev (exelenz)
- Michael Piecko
- yclian
- Sergio Santoro
- Sebastian Grodzicki (sgrodzicki)
- Martin Hujer (martinhujer)
- Pascal Helfenstein
- Baldur Rensch (brensch)
- Vladyslav Petrovych
@ -521,6 +527,7 @@ Symfony is the result of the work of many people who made the code better
- Benoit Lévêque (benoit_leveque)
- Jeroen Fiege (fieg)
- Krzysiek Łabuś
- Ilya Antipenko (aivus)
- Nicolas Dewez (nicolas_dewez)
- Xavier Lacot (xavier)
- Olivier Maisonneuve (olineuve)
@ -532,7 +539,6 @@ Symfony is the result of the work of many people who made the code better
- fago
- Harm van Tilborg
- Jan Prieser
- Artur Melo (restless)
- James Michael DuPont
- Tom Klingenberg
- Christopher Hall (mythmakr)
@ -628,6 +634,7 @@ Symfony is the result of the work of many people who made the code better
- xaav
- Jean-Christophe Cuvelier [Artack]
- Mahmoud Mostafa (mahmoud)
- Pieter
- Michael Tibben
- Sander Marechal
- Radosław Benkel
@ -635,7 +642,6 @@ Symfony is the result of the work of many people who made the code better
- Mei Gwilym (meigwilym)
- Michael H. Arieli (excelwebzone)
- Luciano Mammino (loige)
- Michael Hirschler (mvhirsch)
- fabios
- Jérôme Vasseur
- Sander Coolen (scoolen)
@ -646,6 +652,7 @@ Symfony is the result of the work of many people who made the code better
- Irmantas Šiupšinskas (irmantas)
- Charles-Henri Bruyand
- Danilo Silva
- Konstantin S. M. Möllers (ksmmoellers)
- Zachary Tong (polyfractal)
- Hryhorii Hrebiniuk
- dantleech
@ -748,7 +755,6 @@ Symfony is the result of the work of many people who made the code better
- Brooks Boyd
- Roger Webb
- Dmitriy Simushev
- Martin Hujer (martinhujer)
- Max Voloshin (maxvoloshin)
- Nicolas Fabre (nfabre)
- Raul Rodriguez (raul782)
@ -765,6 +771,7 @@ Symfony is the result of the work of many people who made the code better
- Philipp Strube
- Christian Sciberras
- Anton Bakai
- Chad Sikorra (chadsikorra)
- Clement Herreman (clemherreman)
- Nyro (nyro)
- Trent Steel (trsteel88)
@ -779,6 +786,8 @@ 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)
- Christian Wahler
- Jelte Steijaert (jelte)
- Quique Porta (quiqueporta)
- Tomasz Szymczyk (karion)
- ConneXNL
@ -796,6 +805,7 @@ Symfony is the result of the work of many people who made the code better
- Sebastian Göttschkes (sgoettschkes)
- Tatsuya Tsuruoka
- Ross Tuck
- Zander Baldwin
- Kévin Gomez (kevin)
- azine
- Dawid Sajdak
@ -835,11 +845,14 @@ Symfony is the result of the work of many people who made the code better
- m.chwedziak
- Philip Frank
- Lance McNearney
- Dominik Ritter (dritter)
- Frank Neff (fneff)
- Roman Lapin (memphys)
- Giorgio Premi
- caponica
- Matt Daum (daum)
- Alberto Pirovano (geezmo)
- Jules Pietri (heah)
- Pete Mitchell (peterjmit)
- Tom Corrigan (tomcorrigan)
- Martin Pärtel
@ -868,6 +881,7 @@ Symfony is the result of the work of many people who made the code better
- Adrien Samson (adriensamson)
- Samuel Gordalina (gordalina)
- Max Romanovsky (maxromanovsky)
- Dariusz Ruminski
- Mathieu Morlon
- Daniel Tschinder
- Rafał Muszyński (rafmus90)
@ -948,6 +962,7 @@ Symfony is the result of the work of many people who made the code better
- 2manypeople
- Wing
- Thomas Bibb
- Alessandro Chitolina
- Matt Farmer
- catch
- Alexandre Segura
@ -977,6 +992,7 @@ Symfony is the result of the work of many people who made the code better
- nuncanada
- flack
- František Bereň
- Almog Baku (almogbaku)
- Christoph Nissle (derstoffel)
- Ionel Scutelnicu (ionelscutelnicu)
- Nicolas Tallefourtané (nicolab)
@ -1046,6 +1062,7 @@ Symfony is the result of the work of many people who made the code better
- Drew Butler
- J Bruni
- Alexey Prilipko
- Oleg Voronkovich
- bertillon
- Victor Bocharsky (bocharsky_bw)
- Luca Genuzio (genuzio)
@ -1092,6 +1109,7 @@ Symfony is the result of the work of many people who made the code better
- Alex Pods
- hadriengem
- timaschew
- Jelle Kapitein
- Ian Phillips
- Haritz
- Matthieu Prat
@ -1104,6 +1122,7 @@ Symfony is the result of the work of many people who made the code better
- David Windell
- Gabriel Birke
- skafandri
- NothingWeAre
- Alan Chen
- Maerlyn
- Even André Fiskvik
@ -1112,6 +1131,7 @@ Symfony is the result of the work of many people who made the code better
- Lenar Lõhmus
- Cristian Gonzalez
- AlberT
- hainey
- Juan M Martínez
- Gilles Gauthier
- ddebree
@ -1121,6 +1141,7 @@ Symfony is the result of the work of many people who made the code better
- possum
- Rafał
- Adria Lopez (adlpz)
- Andreas Schempp (aschempp)
- Rosio (ben-rosio)
- Simon Paarlberg (blamh)
- Jeroen Thora (bolle)
@ -1147,7 +1168,9 @@ Symfony is the result of the work of many people who made the code better
- Pablo Monterde Perez (plebs)
- Jimmy Leger (redpanda)
- Pavel Batanov (scaytrase)
- Simone Di Maulo (toretto460)
- Cyrille Jouineau (tuxosaurus)
- Sander Toonen (xatoo)
- Yorkie Chadwick (yorkie76)
- Yanick Witschi
- Ondrej Mirtes
@ -1197,6 +1220,7 @@ Symfony is the result of the work of many people who made the code better
- Vladimir Sazhin
- lol768
- jamogon
- Antoine LA
- Vyacheslav Slinko
- Johannes
- Jörg Rühl
@ -1219,7 +1243,6 @@ Symfony is the result of the work of many people who made the code better
- Sam Williams
- Adrian Philipp
- James Michael DuPont
- Eugene Wissner
- Kasperki
- Tammy D
- Ondrej Slinták
@ -1237,6 +1260,7 @@ Symfony is the result of the work of many people who made the code better
- Pierre-Louis LAUNAY
- djama
- Eduardo Conceição
- Sébastien Santoro
- Jon Cave
- Sébastien HOUZE
- Abdulkadir N. A.
@ -1248,6 +1272,7 @@ Symfony is the result of the work of many people who made the code better
- Norman Soetbeer
- Benjamin Long
- Matt Janssen
- Jeremy Benoist
- Peter Gribanov
- kwiateusz
- David Soria Parra
@ -1267,6 +1292,7 @@ Symfony is the result of the work of many people who made the code better
- Dawid Nowak
- Richard Quadling
- Karolis Daužickas
- Baptiste Lafontaine
- tirnanog06
- phc
- Дмитрий Пацура
@ -1314,6 +1340,7 @@ Symfony is the result of the work of many people who made the code better
- Ismail Faizi (kanafghan)
- Sébastien Armand (khepin)
- Krzysztof Menżyk (krymen)
- Krzysztof Piasecki (krzysztek)
- samuel laulhau (lalop)
- Laurent Bachelier (laurentb)
- Jérôme Parmentier (lctrs)

2
src/Symfony/Bundle/DebugBundle/DependencyInjection/DebugExtension.php
View File

@ -13,9 +13,9 @@ namespace Symfony\Bundle\DebugBundle\DependencyInjection;
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
/**
* DebugExtension.

2
src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
View File

@ -52,7 +52,7 @@ class AssetsInstallCommand extends ContainerAwareCommand
->addOption('symlink', null, InputOption::VALUE_NONE, 'Symlinks the assets instead of copying it')
->addOption('relative', null, InputOption::VALUE_NONE, 'Make relative symlinks')
->setDescription('Installs bundles web assets under a public web directory')
->setHelp(<<<EOT
->setHelp(<<<'EOT'
The <info>%command.name%</info> command installs bundle assets into a given
directory (e.g. the <comment>web</comment> directory).

2
src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
View File

@ -38,7 +38,7 @@ class CacheClearCommand extends ContainerAwareCommand
new InputOption('no-optional-warmers', '', InputOption::VALUE_NONE, 'Skip optional cache warmers (faster)'),
))
->setDescription('Clears the cache')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> command clears the application cache for a given environment
and debug mode:

2
src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
View File

@ -34,7 +34,7 @@ class CacheWarmupCommand extends ContainerAwareCommand
new InputOption('no-optional-warmers', '', InputOption::VALUE_NONE, 'Skip optional cache warmers (faster)'),
))
->setDescription('Warms up an empty cache')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> command warms up the cache.
Before running this command, the cache must be empty.

2
src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
View File

@ -40,7 +40,7 @@ class ConfigDumpReferenceCommand extends AbstractConfigCommand
new InputOption('format', null, InputOption::VALUE_REQUIRED, 'The output format (yaml or xml)', 'yaml'),
))
->setDescription('Dumps the default configuration for an extension')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> command dumps the default configuration for an
extension/bundle.

2
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
View File

@ -51,7 +51,7 @@ class ContainerDebugCommand extends ContainerAwareCommand
new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw description'),
))
->setDescription('Displays current services for an application')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> command displays all configured <comment>public</comment> services:
<info>php %command.full_name%</info>

2
src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
View File

@ -58,7 +58,7 @@ class RouterDebugCommand extends ContainerAwareCommand
new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw route(s)'),
))
->setDescription('Displays current routes for an application')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> displays the configured routes:
<info>php %command.full_name%</info>

2
src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
View File

@ -57,7 +57,7 @@ class RouterMatchCommand extends ContainerAwareCommand
new InputOption('host', null, InputOption::VALUE_REQUIRED, 'Sets the URI host'),
))
->setDescription('Helps debug routes by simulating a path info match')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> shows which routes match a given request and which don't and for what reason:
<info>php %command.full_name% /foo</info>

2
src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
View File

@ -40,7 +40,7 @@ class ServerRunCommand extends ServerCommand
))
->setName('server:run')
->setDescription('Runs PHP built-in web server')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> runs PHP built-in web server:
<info>%command.full_name%</info>

2
src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
View File

@ -46,7 +46,7 @@ class TranslationUpdateCommand extends ContainerAwareCommand
new InputOption('clean', null, InputOption::VALUE_NONE, 'Should clean not found messages'),
))
->setDescription('Updates the translation file')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> command extract translation strings from templates
of a given bundle or the app folder. It can display them or merge the new ones into the translation files.
When new translation strings are found it can automatically add a prefix to the translation

2
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/DependencyInjection/TestExtension.php
View File

@ -12,7 +12,7 @@
namespace Symfony\Bundle\FrameworkBundle\Tests\Functional\Bundle\TestBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
class TestExtension extends Extension implements PrependExtensionInterface

2
src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
View File

@ -43,7 +43,7 @@ class InitAclCommand extends ContainerAwareCommand
$this
->setName('init:acl')
->setDescription('Mounts ACL tables in the database')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> command mounts ACL tables in the database.
<info>php %command.full_name%</info>

2
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FirewallEntryPointBundle/DependencyInjection/FirewallEntryPointExtension.php
View File

@ -13,8 +13,8 @@ namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FirewallEntryPoi
use Symfony\Component\Config\FileLocator;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Extension\Extension;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
class FirewallEntryPointExtension extends Extension
{

2
src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php
View File

@ -13,7 +13,7 @@ namespace Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\FormLoginBundle\
use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\Extension\Extension;;
class FormLoginExtension extends Extension
{

2
src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
View File

@ -43,7 +43,7 @@ final class LintCommand extends BaseLintCommand implements ContainerAwareInterfa
$this
->setHelp(
$this->getHelp().<<<EOF
$this->getHelp().<<<'EOF'
Or all template files in a bundle:

2
src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
View File

@ -11,7 +11,7 @@
namespace Symfony\Bundle\WebProfilerBundle\DependencyInjection;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\Extension\Extension;;
use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\Config\FileLocator;

16
src/Symfony/Component/ClassLoader/Tests/ClassCollectionLoaderTest.php
View File

@ -234,26 +234,26 @@ class ClassCollectionLoaderTest extends \PHPUnit_Framework_TestCase
spl_autoload_unregister($r);
$this->assertEquals(<<<EOF
$this->assertEquals(<<<'EOF'
namespace Namespaced
{
class WithComments
{
public static \$loaded = true;
public static $loaded = true;
}
\$string ='string should not be modified {\$string}';
\$heredoc = (<<<HD
$string ='string should not be modified {$string}';
$heredoc = (<<<HD
Heredoc should not be modified {\$string}
Heredoc should not be modified {$string}
HD
);
\$nowdoc =<<<'ND'
$nowdoc =<<<'ND'
Nowdoc should not be modified {\$string}
Nowdoc should not be modified {$string}
ND
@ -263,7 +263,7 @@ namespace
{
class Pearlike_WithComments
{
public static \$loaded = true;
public static $loaded = true;
}
}
EOF

2
src/Symfony/Component/Config/Tests/Definition/Dumper/YamlReferenceDumperTest.php
View File

@ -28,7 +28,7 @@ class YamlReferenceDumperTest extends \PHPUnit_Framework_TestCase
private function getConfigurationAsString()
{
return <<<EOL
return <<<'EOL'
acme_root:
boolean: true
scalar_empty: ~

2
src/Symfony/Component/Console/Command/HelpCommand.php
View File

@ -41,7 +41,7 @@ class HelpCommand extends Command
new InputOption('raw', null, InputOption::VALUE_NONE, 'To output raw command help'),
))
->setDescription('Displays help for a command')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> command displays help for a given command:
<info>php %command.full_name% list</info>

2
src/Symfony/Component/Console/Command/ListCommand.php
View File

@ -34,7 +34,7 @@ class ListCommand extends Command
->setName('list')
->setDefinition($this->createDefinition())
->setDescription('Lists commands')
->setHelp(<<<EOF
->setHelp(<<<'EOF'
The <info>%command.name%</info> command lists all commands:
<info>php %command.full_name%</info>

8
src/Symfony/Component/Console/Tests/Command/ListCommandTest.php
View File

@ -38,7 +38,7 @@ class ListCommandTest extends \PHPUnit_Framework_TestCase
$application = new Application();
$commandTester = new CommandTester($command = $application->get('list'));
$commandTester->execute(array('command' => $command->getName(), '--raw' => true));
$output = <<<EOF
$output = <<<'EOF'
help Displays help for a command
list Lists commands
@ -54,7 +54,7 @@ EOF;
$application->add(new \FooCommand());
$commandTester = new CommandTester($command = $application->get('list'));
$commandTester->execute(array('command' => $command->getName(), 'namespace' => 'foo', '--raw' => true));
$output = <<<EOF
$output = <<<'EOF'
foo:bar The foo:bar command
EOF;
@ -69,7 +69,7 @@ EOF;
$application->add(new \Foo6Command());
$commandTester = new CommandTester($command = $application->get('list'));
$commandTester->execute(array('command' => $command->getName()), array('decorated' => false));
$output = <<<EOF
$output = <<<'EOF'
Console Tool
Usage:
@ -101,7 +101,7 @@ EOF;
$application->add(new \Foo6Command());
$commandTester = new CommandTester($command = $application->get('list'));
$commandTester->execute(array('command' => $command->getName(), '--raw' => true));
$output = <<<EOF
$output = <<<'EOF'
help Displays help for a command
list Lists commands
0foo:bar 0foo:bar command

8
src/Symfony/Component/Console/Tests/Formatter/OutputFormatterTest.php
View File

@ -220,7 +220,7 @@ class OutputFormatterTest extends \PHPUnit_Framework_TestCase
\033[32m
some text\033[39m
EOF
, $formatter->format(<<<EOF
, $formatter->format(<<<'EOF'
<info>
some text</info>
EOF
@ -230,7 +230,7 @@ EOF
\033[32msome text
\033[39m
EOF
, $formatter->format(<<<EOF
, $formatter->format(<<<'EOF'
<info>some text
</info>
EOF
@ -241,7 +241,7 @@ EOF
some text
\033[39m
EOF
, $formatter->format(<<<EOF
, $formatter->format(<<<'EOF'
<info>
some text
</info>
@ -254,7 +254,7 @@ some text
more text
\033[39m
EOF
, $formatter->format(<<<EOF
, $formatter->format(<<<'EOF'
<info>
some text
more text

4
src/Symfony/Component/Debug/ExceptionHandler.php
View File

@ -218,7 +218,7 @@ class ExceptionHandler
$ind = $count - $position + 1;
$class = $this->formatClass($e['class']);
$message = nl2br($this->escapeHtml($e['message']));
$content .= sprintf(<<<EOF
$content .= sprintf(<<<'EOF'
<h2 class="block_exception clear_fix">
<span class="exception_counter">%d/%d</span>
<span class="exception_title">%s%s:</span>
@ -269,7 +269,7 @@ EOF;
*/
public function getStylesheet(FlattenException $exception)
{
return <<<EOF
return <<<'EOF'
.sf-reset { font: 11px Verdana, Arial, sans-serif; color: #333 }
.sf-reset .clear { clear:both; height:0; font-size:0; line-height:0; }
.sf-reset .clear_fix:after { display:block; height:0; clear:both; visibility:hidden; }

36
src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
View File

@ -578,7 +578,7 @@ class PhpDumper extends Dumper
$doc = '';
if ($definition->isShared()) {
$doc .= <<<EOF
$doc .= <<<'EOF'
*
* This service is shared.
@ -587,7 +587,7 @@ EOF;
}
if (!$definition->isPublic()) {
$doc .= <<<EOF
$doc .= <<<'EOF'
*
* This service is private.
@ -779,7 +779,7 @@ EOF;
$code .= $this->addMethodMap();
$code .= $this->addAliases();
$code .= <<<EOF
$code .= <<<'EOF'
}
EOF;
@ -813,7 +813,7 @@ EOF;
$code .= $this->addMethodMap();
$code .= $this->addAliases();
$code .= <<<EOF
$code .= <<<'EOF'
}
EOF;
@ -904,36 +904,36 @@ EOF;
$code = '';
if ($this->container->isFrozen()) {
$code .= <<<EOF
$code .= <<<'EOF'
/**
* {@inheritdoc}
*/
public function getParameter(\$name)
public function getParameter($name)
{
\$name = strtolower(\$name);
$name = strtolower($name);
if (!(isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', \$name));
if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
}
return \$this->parameters[\$name];
return $this->parameters[$name];
}
/**
* {@inheritdoc}
*/
public function hasParameter(\$name)
public function hasParameter($name)
{
\$name = strtolower(\$name);
$name = strtolower($name);
return isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters);
return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
}
/**
* {@inheritdoc}
*/
public function setParameter(\$name, \$value)
public function setParameter($name, $value)
{
throw new LogicException('Impossible to call set() on a frozen ParameterBag.');
}
@ -943,11 +943,11 @@ EOF;
*/
public function getParameterBag()
{
if (null === \$this->parameterBag) {
\$this->parameterBag = new FrozenParameterBag(\$this->parameters);
if (null === $this->parameterBag) {
$this->parameterBag = new FrozenParameterBag($this->parameters);
}
return \$this->parameterBag;
return $this->parameterBag;
}
EOF;
@ -1012,7 +1012,7 @@ EOF;
*/
private function endClass()
{
return <<<EOF
return <<<'EOF'
}
EOF;

10
src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
View File

@ -136,7 +136,7 @@ class CrawlerTest extends \PHPUnit_Framework_TestCase
$internalErrors = libxml_use_internal_errors(true);
$crawler = new Crawler();
$crawler->addHtmlContent(<<<EOF
$crawler->addHtmlContent(<<<'EOF'
<!DOCTYPE html>
<html>
<head>
@ -177,7 +177,7 @@ EOF
$internalErrors = libxml_use_internal_errors(true);
$crawler = new Crawler();
$crawler->addXmlContent(<<<EOF
$crawler->addXmlContent(<<<'EOF'
<!DOCTYPE html>
<html>
<head>
@ -677,7 +677,7 @@ EOF
public function testSelectButtonWithSingleQuotesInNameAttribute()
{
$html = <<<HTML
$html = <<<'HTML'
<!DOCTYPE html>
<html lang="en">
<body>
@ -698,7 +698,7 @@ HTML;
public function testSelectButtonWithDoubleQuotesInNameAttribute()
{
$html = <<<HTML
$html = <<<'HTML'
<!DOCTYPE html>
<html lang="en">
<body>
@ -757,7 +757,7 @@ HTML;
public function testSelectLinkAndLinkFiltered()
{
$html = <<<HTML
$html = <<<'HTML'
<!DOCTYPE html>
<html lang="en">
<body>

2
src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
View File

@ -215,7 +215,7 @@ class RequestTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('/?foo', $request->getRequestUri());
$this->assertEquals(array('foo' => ''), $request->query->all());
## assume rewrite rule: (.*) --> app/app.php ; app/ is a symlink to a symfony web/ directory
// assume rewrite rule: (.*) --> app/app.php ; app/ is a symlink to a symfony web/ directory
$request = Request::create('http://test.com/apparthotel-1234', 'GET', array(), array(), array(),
array(
'DOCUMENT_ROOT' => '/var/www/www.test.com',

2
src/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionLoadedBundle/DependencyInjection/ExtensionLoadedExtension.php
View File

@ -12,7 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionLoadedBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\Extension\Extension;
class ExtensionLoadedExtension extends Extension
{

2
src/Symfony/Component/HttpKernel/Tests/Fixtures/ExtensionPresentBundle/DependencyInjection/ExtensionPresentExtension.php
View File

@ -12,7 +12,7 @@
namespace Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\DependencyInjection;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\DependencyInjection\Extension;
use Symfony\Component\DependencyInjection\Extension\Extension;
class ExtensionPresentExtension extends Extension
{

2
src/Symfony/Component/HttpKernel/Tests/HttpCache/HttpCacheTest.php
View File

@ -716,7 +716,7 @@ class HttpCacheTest extends HttpCacheTestCase
$this->assertTraceContains('store');
$this->assertEquals('Hello World', $this->response->getContent());
# go in and play around with the cached metadata directly ...
// go in and play around with the cached metadata directly ...
$values = $this->getMetaStorageValues();
$this->assertCount(1, $values);
$tmp = unserialize($values[0]);

2
src/Symfony/Component/Intl/Data/Bundle/Writer/PhpBundleWriter.php
View File

@ -25,7 +25,7 @@ class PhpBundleWriter implements BundleWriterInterface
*/
public function write($path, $locale, $data)
{
$template = <<<TEMPLATE
$template = <<<'TEMPLATE'
<?php
return %s;

2
src/Symfony/Component/Intl/Resources/bin/update-data.php
View File

@ -35,7 +35,7 @@ $argc = $_SERVER['argc'];
$argv = $_SERVER['argv'];
if ($argc > 3 || 2 === $argc && '-h' === $argv[1]) {
bailout(<<<MESSAGE
bailout(<<<'MESSAGE'
Usage: php update-icu-component.php <path/to/icu/source> <path/to/icu/build>
Updates the ICU data for Symfony to the latest version of ICU.

2
src/Symfony/Component/Process/Tests/PhpProcessTest.php
View File

@ -30,7 +30,7 @@ PHP
public function testCommandLine()
{
$process = new PhpProcess(<<<PHP
$process = new PhpProcess(<<<'PHP'
<?php echo 'foobar';
PHP
);

12
src/Symfony/Component/Routing/Generator/Dumper/PhpGeneratorDumper.php
View File

@ -107,16 +107,16 @@ EOF;
*/
private function generateGenerateMethod()
{
return <<<EOF
public function generate(\$name, \$parameters = array(), \$referenceType = self::ABSOLUTE_PATH)
return <<<'EOF'
public function generate($name, $parameters = array(), $referenceType = self::ABSOLUTE_PATH)
{
if (!isset(self::\$declaredRoutes[\$name])) {
throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', \$name));
if (!isset(self::$declaredRoutes[$name])) {
throw new RouteNotFoundException(sprintf('Unable to generate a URL for the named route "%s" as such route does not exist.', $name));
}
list(\$variables, \$defaults, \$requirements, \$tokens, \$hostTokens, \$requiredSchemes) = self::\$declaredRoutes[\$name];
list($variables, $defaults, $requirements, $tokens, $hostTokens, $requiredSchemes) = self::$declaredRoutes[$name];
return \$this->doGenerate(\$variables, \$defaults, \$requirements, \$tokens, \$parameters, \$name, \$referenceType, \$hostTokens, \$requiredSchemes);
return $this->doGenerate($variables, $defaults, $requirements, $tokens, $parameters, $name, $referenceType, $hostTokens, $requiredSchemes);
}
EOF;
}

2
src/Symfony/Component/Validator/Tests/ConstraintViolationListTest.php
View File

@ -110,7 +110,7 @@ class ConstraintViolationListTest extends \PHPUnit_Framework_TestCase
$this->getViolation('Error 5', '', '[baz]'),
));
$expected = <<<EOF
$expected = <<<'EOF'
Root:
Error 1
Root.foo.bar:

4
src/Symfony/Component/Validator/Tests/ConstraintViolationTest.php
View File

@ -26,7 +26,7 @@ class ConstraintViolationTest extends \PHPUnit_Framework_TestCase
null
);
$expected = <<<EOF
$expected = <<<'EOF'
Root.property.path:
Array
EOF;
@ -45,7 +45,7 @@ EOF;
null
);
$expected = <<<EOF
$expected = <<<'EOF'
Array.some_value:
42 cannot be used here
EOF;

12
src/Symfony/Component/Yaml/Tests/DumperTest.php
View File

@ -54,7 +54,7 @@ class DumperTest extends \PHPUnit_Framework_TestCase
{
$this->dumper->setIndentation(7);
$expected = <<<EOF
$expected = <<<'EOF'
'': bar
foo: '#bar'
'foo''bar': { }
@ -103,13 +103,13 @@ EOF;
public function testInlineLevel()
{
$expected = <<<EOF
$expected = <<<'EOF'
{ '': bar, foo: '#bar', 'foo''bar': { }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
EOF;
$this->assertEquals($expected, $this->dumper->dump($this->array, -10), '->dump() takes an inline level argument');
$this->assertEquals($expected, $this->dumper->dump($this->array, 0), '->dump() takes an inline level argument');
$expected = <<<EOF
$expected = <<<'EOF'
'': bar
foo: '#bar'
'foo''bar': { }
@ -119,7 +119,7 @@ foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } }
EOF;
$this->assertEquals($expected, $this->dumper->dump($this->array, 1), '->dump() takes an inline level argument');
$expected = <<<EOF
$expected = <<<'EOF'
'': bar
foo: '#bar'
'foo''bar': { }
@ -134,7 +134,7 @@ foobar:
EOF;
$this->assertEquals($expected, $this->dumper->dump($this->array, 2), '->dump() takes an inline level argument');
$expected = <<<EOF
$expected = <<<'EOF'
'': bar
foo: '#bar'
'foo''bar': { }
@ -153,7 +153,7 @@ foobar:
EOF;
$this->assertEquals($expected, $this->dumper->dump($this->array, 3), '->dump() takes an inline level argument');
$expected = <<<EOF
$expected = <<<'EOF'
'': bar
foo: '#bar'
'foo''bar': { }

46
src/Symfony/Component/Yaml/Tests/ParserTest.php
View File

@ -90,7 +90,7 @@ class ParserTest extends \PHPUnit_Framework_TestCase
public function testEndOfTheDocumentMarker()
{
$yaml = <<<EOF
$yaml = <<<'EOF'
--- %YAML:1.0
foo
...
@ -495,7 +495,7 @@ EOF;
*/
public function testUnindentedCollectionException()
{
$yaml = <<<EOF
$yaml = <<<'EOF'
collection:
-item1
@ -512,7 +512,7 @@ EOF;
*/
public function testShortcutKeyUnindentedCollectionException()
{
$yaml = <<<EOF
$yaml = <<<'EOF'
collection:
- key: foo
@ -529,7 +529,7 @@ EOF;
*/
public function testMultipleDocumentsNotSupportedException()
{
Yaml::parse(<<<EOL
Yaml::parse(<<<'EOL'
# Ranking of 1998 home runs
---
- Mark McGwire
@ -549,7 +549,7 @@ EOL
*/
public function testSequenceInAMapping()
{
Yaml::parse(<<<EOF
Yaml::parse(<<<'EOF'
yaml:
hash: me
- array stuff
@ -562,7 +562,7 @@ EOF
*/
public function testMappingInASequence()
{
Yaml::parse(<<<EOF
Yaml::parse(<<<'EOF'
yaml:
- array stuff
hash: me
@ -629,7 +629,7 @@ EOD;
public function testEmptyValue()
{
$input = <<<EOF
$input = <<<'EOF'
hash:
EOF;
@ -647,7 +647,7 @@ EOF;
'class' => 'Bar',
),
),
), Yaml::parse(<<<EOF
), Yaml::parse(<<<'EOF'
# comment 1
services:
# comment 2
@ -664,7 +664,7 @@ EOF
public function testStringBlockWithComments()
{
$this->assertEquals(array('content' => <<<EOT
$this->assertEquals(array('content' => <<<'EOT'
# comment 1
header
@ -675,7 +675,7 @@ header
footer # comment3
EOT
), Yaml::parse(<<<EOF
), Yaml::parse(<<<'EOF'
content: |
# comment 1
header
@ -692,7 +692,7 @@ EOF
public function testFoldedStringBlockWithComments()
{
$this->assertEquals(array(array('content' => <<<EOT
$this->assertEquals(array(array('content' => <<<'EOT'
# comment 1
header
@ -703,7 +703,7 @@ header
footer # comment3
EOT
)), Yaml::parse(<<<EOF
)), Yaml::parse(<<<'EOF'
-
content: |
# comment 1
@ -723,7 +723,7 @@ EOF
{
$this->assertEquals(array(array(
'title' => 'some title',
'content' => <<<EOT
'content' => <<<'EOT'
# comment 1
header
@ -734,7 +734,7 @@ header
footer # comment3
EOT
)), Yaml::parse(<<<EOF
)), Yaml::parse(<<<'EOF'
-
title: some title
content: |
@ -763,7 +763,7 @@ EOF
'map' => array('key' => 'var-value'),
'list_in_map' => array('key' => array('var-value')),
'map_in_map' => array('foo' => array('bar' => 'var-value')),
), Yaml::parse(<<<EOF
), Yaml::parse(<<<'EOF'
var: &var var-value
scalar: *var
list: [ *var ]
@ -779,7 +779,7 @@ EOF
public function testYamlDirective()
{
$yaml = <<<EOF
$yaml = <<<'EOF'
%YAML 1.2
---
foo: 1
@ -790,7 +790,7 @@ EOF;
public function testFloatKeys()
{
$yaml = <<<EOF
$yaml = <<<'EOF'
foo:
1.2: "bar"
1.3: "baz"
@ -839,7 +839,7 @@ EOT;
public function getCommentLikeStringInScalarBlockData()
{
$yaml1 = <<<EOT
$yaml1 = <<<'EOT'
pages:
-
title: some title
@ -858,7 +858,7 @@ EOT;
'pages' => array(
array(
'title' => 'some title',
'content' => <<<EOT
'content' => <<<'EOT'
# comment 1
header
@ -874,7 +874,7 @@ EOT
),
);
$yaml2 = <<<EOT
$yaml2 = <<<'EOT'
test: |
foo
# bar
@ -890,7 +890,7 @@ collection:
baz
EOT;
$expected2 = array(
'test' => <<<EOT
'test' => <<<'EOT'
foo
# bar
baz
@ -899,7 +899,7 @@ EOT
,
'collection' => array(
array(
'one' => <<<EOT
'one' => <<<'EOT'
foo
# bar
baz
@ -907,7 +907,7 @@ EOT
,
),
array(
'two' => <<<EOT
'two' => <<<'EOT'
foo
# bar
baz