uppgrade to 2.0.22

app/bootstrap.php.cache

@@ -458,11 +458,11 @@ abstract class Kernel implements KernelInterface
     protected $startTime;
     protected $classes;
 
-    const VERSION         = '2.0.19';
-    const VERSION_ID      = '20019';
+    const VERSION         = '2.0.22';
+    const VERSION_ID      = '20022';
     const MAJOR_VERSION   = '2';
     const MINOR_VERSION   = '0';
-    const RELEASE_VERSION = '19';
+    const RELEASE_VERSION = '22';
     const EXTRA_VERSION   = '';
 
     
@@ -1373,7 +1373,7 @@ abstract class Bundle extends ContainerAware implements BundleInterface
     
     public function registerCommands(Application $application)
     {
-        if (!$dir = realpath($this->getPath().'/Command')) {
+        if (!is_dir($dir = $this->getPath().'/Command')) {
             return;
         }
 

deps

@@ -1,6 +1,6 @@
 [symfony]
     git=http://github.com/symfony/symfony.git
-    version=v2.0.19
+    version=v2.0.22
 
 [twig]
     git=http://github.com/fabpot/Twig.git

deps.lock

@@ -1,4 +1,4 @@
-symfony v2.0.19
+symfony v2.0.22
 twig v1.10.3
 monolog 1.2.1
 doctrine-common 2.1.4
@@ -8,8 +8,8 @@ swiftmailer v4.2.2
 assetic v1.0.4
 twig-extensions v1.0.0-alpha
 metadata 1.0.0
-SensioFrameworkExtraBundle v2.0.17
+SensioFrameworkExtraBundle v2.0.22
 JMSSecurityExtraBundle e752f888c51425f71382c056961f10f2be642102
-SensioDistributionBundle v2.0.17
-SensioGeneratorBundle v2.0.19
+SensioDistributionBundle v2.0.22
+SensioGeneratorBundle v2.0.22
 AsseticBundle 6f15728c1aefa5246caa83730e3dbf70b0d46052

vendor/bundles/Sensio/Bundle/FrameworkExtraBundle/EventListener/CacheListener.php

@@ -35,7 +35,8 @@ class CacheListener
 
         $response = $event->getResponse();
 
-        if (!$response->isSuccessful()) {
+        // http://tools.ietf.org/html/draft-ietf-httpbis-p4-conditional-12#section-3.1
+        if (!$response->isSuccessful() && 304 != $response->getStatusCode()) {
             return;
         }
 

vendor/bundles/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/annotations/routing.rst

@@ -49,6 +49,8 @@ annotations::
     {
     }
 
+.. _annotated-routes-activation:
+
 Activation
 ----------
 

vendor/bundles/Sensio/Bundle/FrameworkExtraBundle/Resources/doc/index.rst

@@ -141,5 +141,18 @@ annotations::
     {
     }
 
+The routes need to be imported to be active as any other routing resources, for example:
+
+.. code-block:: yaml
+
+    # app/config/routing.yml
+
+    # import routes from a controller directory
+    annot:
+        resource: "@AnnotRoutingBundle/Controller"
+        type:     annotation
+
+see :ref:`Annotated Routes Activation<annotated-routes-activation>` for more details.
+
 .. _`SensioFrameworkExtraBundle`: https://github.com/sensio/SensioFrameworkExtraBundle
 .. _`Download`: http://github.com/sensio/SensioFrameworkExtraBundle

vendor/bundles/Sensio/Bundle/GeneratorBundle/Resources/doc/index.rst

@@ -35,8 +35,8 @@ new commands are listed below:
    :maxdepth: 1
 
    commands/generate_bundle
-   commands/generate_doctrine_crud
    commands/generate_doctrine_entity
+   commands/generate_doctrine_crud
    commands/generate_doctrine_form
 
 .. _Download: http://github.com/sensio/SensioGeneratorBundle

vendor/symfony/.travis.yml

@@ -4,5 +4,10 @@ php:
   - 5.3.3
   - 5.3
   - 5.4
+  - 5.5
+
+matrix:
+  allow_failures:
+    - php: 5.5
 
 before_script: php vendors.php

vendor/symfony/CHANGELOG-2.0.md

@@ -7,6 +7,39 @@ in 2.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/v2.0.0...v2.0.1
 
+* 2.0.22 (2013-01-17)
+
+ * 3c87e2e: Added Yaml\Dumper::setIndentation() method to allow a custom indentation level of nested nodes.
+ * ba6e315: added a way to enable/disable object support when parsing/dumping
+ * ac756bf: added a way to enable/disable PHP support when parsing a YAML input via Yaml::parse()
+ * dc2cc6b: [Console] fixed input bug when the value of an option is empty (closes #6649, closes #6689)
+ * 880da01: [Process] In edge cases `getcwd()` can return `false`, then `proc_open()` should get `null` to use default value (the working dir of the current PHP process)
+ * 1d362b8: [DependencyInjection] fixed a bug where the strict flag on references were lost (closes #6607)
+ * 3195122: [HttpFoundation] Check if required shell functions for `FileBinaryMimeTypeGuesser` are not disabled
+ * dbafc2c: [CssSelector] added css selector with empty string
+ * ba2d035: Restrict Monolog version to be in version <1.3
+ * e0923ae: [DependencyInjection] fixed PhpDumper optimizations when an inlined service depends on the current one indirectly
+ * cd15390: [DependencyInjection] fixed PhpDumper when an inlined service definition has some properties
+ * 73d9cef: [Locale] Adjust `StubIntlDateFormatter` to have new methods added in PHP 5.5
+ * 913b564: [Locale] Fix failing `StubIntlDateFormatter` in PHP 5.5
+ * 8ae773b: [Form] Fix failing `MonthChoiceList` in PHP 5.5
+
+* 2.0.21 (2012-12-21)
+
+ * b8e5689: [FrameworkBundle] fixed ESI calls
+
+* 2.0.20 (2012-12-20)
+
+ * 532cc9a: [FrameworkBundle] added support for URIs as an argument to HttpKernel::render()
+ * 1f8c501: [FrameworkBundle] restricted the type of controllers that can be executed by InternalController
+ * 8b2c17f: fix double-decoding in the routing system
+ * 773d818: [FrameworkBundle] Added a check on file mime type for CodeHelper::fileExcerpt()
+ * a0e2391: [FrameworkBundle] used the new method for trusted proxies
+ * 8bb3208: [Config] Loader::import must return imported data
+ * 447ff91: [HttpFoundation] changed UploadedFile::move() to use move_uploaded_file() when possible
+ * 0489799: [HttpFoundation] added a check for the host header value
+ * ae3d531: [TwigBundle] Moved the registration of the app global to the environment
+
 * 2.0.19 (2012-11-29)
 
  * e5536f0: replaced magic strings by proper constants

vendor/symfony/CONTRIBUTING.md

@@ -3,7 +3,9 @@ Contributing
 
 Symfony2 is an open source, community-driven project. If you'd like to contribute,
 please read the [Contributing Code][1] part of the documentation. If you're submitting
-a pull request, please follow the guidelines in the [Submitting a Patch][2] section.
+a pull request, please follow the guidelines in the [Submitting a Patch][2] section
+and use the [Pull Request Template][3].
 
 [1]: http://symfony.com/doc/current/contributing/code/index.html
 [2]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
+[3]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request

vendor/symfony/CONTRIBUTORS.md

@@ -10,84 +10,96 @@ Symfony2 is the result of the work of many people who made the code better
  - Jordi Boggiano (seldaek)
  - Johannes S (johannes)
  - Kris Wallsmith (kriswallsmith)
- - Christophe Coevoet (stof)
  - Tobias Schultze (tobion)
- - Karma Dordrak (drak)
+ - Christophe Coevoet (stof)
  - Pascal Borreli (pborreli)
+ - Karma Dordrak (drak)
  - Ryan Weaver
  - Lukas Kahwe Smith (lsmith)
  - Jeremy Mikola (jmikola)
- - Benjamin Eberlei (beberlei)
- - Igor Wiedler (igorw)
  - Joseph Bielawski (stloyd)
- - Eriksen Costa (eriksencosta)
+ - Igor Wiedler (igorw)
+ - Benjamin Eberlei (beberlei)
  - Hugo Hamon (hhamon)
- - Jonathan Wage (jwage)
+ - Eriksen Costa (eriksencosta)
  - Martin Hasoň (hason)
+ - Jonathan Wage (jwage)
  - William Durand (couac)
  - Alexandre Salomé (alexandresalome)
  - ornicar
  - stealth35 ‏ (stealth35)
- - Bulat Shakirzyanov (avalanche123)
  - Jean-François Simon (jfsimon)
+ - Alexander Mols (asm89)
+ - Bulat Shakirzyanov (avalanche123)
  - Francis Besset (francisbesset)
+ - Jakub Zalas (jakubzalas)
  - Miha Vrhovnik
  - Henrik Bjørnskov (henrikbjorn)
  - Konstantin Kudryashov (everzet)
- - Jakub Zalas (jakubzalas)
+ - Саша Стаменковић (umpirsky)
+ - Arnaud Le Blanc (arnaud-lb)
  - Eric Clemmons (ericclemmons)
  - Henrik Westphal (snc)
+ - Romain Neutron (romain)
  - Deni
+ - Florin Patan (florinpatan)
  - Dariusz Górecki (canni)
- - Alexander Mols (asm89)
+ - Marc Weistroff (futurecat)
+ - Jordan Alliot (jalliot)
  - Arnout Boks (aboks)
  - Hidenori Goto (hidenorigoto)
- - Jordan Alliot (jalliot)
- - Marc Weistroff (futurecat)
+ - Bilal Amarni (bamarni)
  - Brandon Turner
- - Саша Стаменковић (umpirsky)
  - Andrej Hudec (pulzarraider)
  - Brikou Carré (brikou)
  - John Wards (johnwards)
  - Antoine Hérault (herzult)
  - Daniel Holmes (dholmes)
- - Arnaud Le Blanc (arnaud-lb)
  - Christian Raue
- - lenar
- - Fabien Pennequin (fabienpennequin)
  - Tim Nagel (merk)
+ - Michal Piotrowski (eventhorizon)
+ - Bart van den Burg (burgov)
  - Włodzimierz Gajda (gajdaw)
+ - Colin Frei
+ - lenar
+ - Lee McDermott
+ - Fabien Pennequin (fabienpennequin)
  - excelwebzone
- - Bilal Amarni (bamarni)
- - Romain Neutron (romain)
- - Bart van den Burg (burgov)
- - Kevin Bond (kbond)
- - Florin Patan (florinpatan)
  - Toni Uebernickel (havvg)
- - Jacob Dreesen (jdreesen)
+ - woodspire
+ - Grégoire Pineau (lyrixx)
+ - Mario A. Alvarez Garcia (nomack84)
  - Douglas Greenshields (shieldo)
+ - Kevin Bond (kbond)
  - Richard Miller (mr_r_miller)
- - Grégoire Pineau (lyrixx)
+ - Jacob Dreesen (jdreesen)
+ - Michel Weimerskirch (mweimerskirch)
  - Richard Shank (iampersistent)
  - Sebastian Hörl (blogsh)
- - Michal Piotrowski (eventhorizon)
+ - Fran Moreno (franmomu)
  - Juti Noppornpitak
  - Robert Schönthal (digitalkaoz)
+ - Felix Labrecque
  - Michał Pipa (michal.pipa)
  - Daniel Gomes (danielcsgomes)
- - Michel Weimerskirch (mweimerskirch)
  - Tigran Azatyan (tigranazatyan)
  - Pierre Minnieur (pminnieur)
+ - Larry Garfield (crell)
+ - Arnaud Kleinpeter (nanocom)
+ - David Buchmann (dbu)
+ - Jonathan Ingram (jonathaningram)
  - Javier Eguiluz (javier.eguiluz)
  - Matthieu Ouellette-Vachon (maoueh)
  - Amal Raghav (kertz)
- - Jonathan Ingram (jonathaningram)
  - Artur Kotyrba
  - Pablo Godel (pgodel)
+ - Sebastiaan Stok (sstok)
  - Helmer Aaviksoo
+ - Gábor Egyed (1ed)
  - Clément JOBEILI (dator)
  - Julien Brochet (mewt)
- - Arnaud Kleinpeter (nanocom)
+ - Rafael Dohms (rdohms)
+ - Gordon Franke (gimler)
  - Benjamin Dulau (dbenjamin)
  - Andreas Hucks (meandmymonkey)
  - Noel Guilbert (noel)
@@ -95,74 +107,81 @@ Symfony2 is the result of the work of many people who made the code better
  - Martin Schuhfuß (usefulthink)
  - Thomas Rabaix (rande)
  - Dennis Benkert (denderello)
- - Rafael Dohms (rdohms)
+ - Marcel Beerta (mazen)
  - Matthieu Bontemps (mbontemps)
  - fivestar
  - Dominique Bongiraud
  - Leszek Prabucki (l3l0)
+ - Danny Berger (dpb587)
  - Dustin Whittle (dustinwhittle)
  - jeff
+ - Clemens Tolboom
  - Justin Hileman (bobthecow)
  - Sven Paulus (subsven)
  - Xavier Perez
  - Rui Marinho (ruimarinho)
- - Larry Garfield (crell)
- - David Buchmann (dbu)
+ - Ray
  - Joseph Rouff (rouffj)
- - Marcel Beerta (mazen)
- - Gordon Franke (gimler)
+ - Albert Casademont (acasademont)
  - Francois Zaninotto
  - François Zaninotto (fzaninotto)
- - Danny Berger (dpb587)
  - Xavier Montaña Carreras (xmontana)
- - Gábor Egyed (1ed)
  - Katsuhiro OGAWA
- - Clemens Tolboom
+ - Peter Kokot (maastermedia)
  - Alif Rachmawadi
+ - boombatower
+ - Florian Klein (docteurklein)
  - jules boussekeyt (gordonslondon)
  - Jan Sorgalla (jsor)
- - Ray
- - Lee McDermott
- - Mario A. Alvarez Garcia (nomack84)
  - Guilherme Blanco (guilhermeblanco)
  - jdhoek
  - geoffrey
  - Wodor Wodorski
  - Matthew Lewinski (lewinski)
  - Kim Hemsø Rasmussen
+ - Dirk Pahl (dirkaholic)
  - Wouter Van Hecke
  - Gyula Sallai (salla)
  - Michael Holm (hollo)
- - Peter Kokot (maastermedia)
+ - Yaroslav Kiliba
+ - Andréia Bohner (andreia)
+ - Eric GELOEN (gelo)
  - arjen
- - Florian Klein (docteurklein)
  - Adrien Brault (adrienbrault)
  - Manuel Kiessling (manuelkiessling)
  - Sergey Linnik
  - Bertrand Zuchuat (garfield-fr)
+ - Beau Simensen (simensen)
  - Grégoire Paris (greg0ire)
+ - Tamas Szijarto
+ - Thomas Adam
  - Grégoire Passault (gregwar)
  - Aurelijus Valeiša (aurelijus)
  - Gustavo Piltcher
- - Albert Casademont (acasademont)
+ - Stepan Tanasiychuk (stfalcon)
  - Albert Jessurum (ajessu)
  - Tiago Ribeiro (fixe)
  - Adrian Rudnik (kreischweide)
  - Francesc Rosàs (frosas)
+ - Julien Galenski (ruian)
  - Bongiraud Dominique
  - Michel Salib (michelsalib)
+ - Jeanmonod David (jeanmonod)
+ - Thomas Lallement (raziel057)
+ - Niklas Fiekas
+ - Tom Van Looy (tvlooy)
  - Brouznouf
- - Andréia Bohner (andreia)
- - Sebastiaan Stok (sstok)
  - Sebastian Bergmann
- - Fran Moreno (franmomu)
  - Greg Thornton (xdissent)
+ - sun (sun)
  - Lars Strojny
- - Beau Simensen (simensen)
+ - Terje Bråten
  - Costin Bereveanu (schniper)
+ - Markus Lanthaler (lanthaler)
+ - Jérôme Vieilledent (lolautruche)
  - realmfoo
- - Tamas Szijarto
  - Tobias Naumann
+ - Ismael Ambrosi (iambrosi)
  - Shein Alexey
  - Joe Lencioni
  - Chekote
@@ -172,51 +191,55 @@ Symfony2 is the result of the work of many people who made the code better
  - hubert lecorche (hlecorche)
  - Oscar Cubo Medina (ocubom)
  - Christophe L. (christophelau)
- - Julien Galenski (ruian)
  - Michael Ridgway
- - Stepan Tanasiychuk (stfalcon)
  - Pavel Campr (pcampr)
  - Brian King
- - Jeanmonod David (jeanmonod)
+ - Ricard Clau (ricardclau)
  - Jan Schumann
- - Niklas Fiekas
  - Olivier Dolbeau (odolbeau)
+ - Konstantin Myakshin (koc)
  - Michele Orselli (orso)
  - Asier Illarramendi (doup)
+ - Chris Heng (gigablah)
  - Christoph Mewes (xrstf)
- - Dirk Pahl (dirkaholic)
+ - Jonas Flodén (flojon)
  - Shigenibu Nishikawa
  - Marcin Sikoń (marphi)
  - Miquel Rodríguez Telep (mrtorrent)
- - boombatower
+ - Filippo Tessarotto
  - Laurent Bachelier (laurentb)
  - Fabian Lange (codingfabian)
  - Yoshio HANAWA
+ - Tiago Brito (blackmx)
+ - hossein zolfi (ocean)
  - Kevin McBride
  - Pablo Díez (pablodip)
  - Michael Piecko (michael.piecko)
+ - Sebastian Krebs
  - Manuel de Ruiter (manuel)
- - sun (sun)
  - ondrowan
+ - Roman Marintsenko (inori)
  - mcben
- - Markus Lanthaler (lanthaler)
- - Yaroslav Kiliba
+ - Vicent Soria Durá (vicentgodella)
  - Peter Kruithof (pkruithof)
  - Erik Trapman (eriktrapman)
  - De Cock Xavier (xdecock)
  - Manuel Reinhard (sprain)
- - Thomas Adam
  - Joel Wurtz
  - Uwe Jäger (uwej711)
  - Nils Adermann (naderman)
+ - Leevi Graham
  - sasezaki
  - Steven Surowiec
  - Marek Kalnik (marekkalnik)
+ - Denis Gorbachev (starfall)
  - Chris Smith
  - Anthon Pang
+ - Eugene Leonovich
  - Ryan
  - Alexander Deruwe (aderuwe)
  - Ivan Rey (ivanrey)
+ - Jan Kramer (jankramer)
  - Marcin Chyłek (songoq)
  - Ned Schwartz
  - Ziumin
@@ -224,61 +247,92 @@ Symfony2 is the result of the work of many people who made the code better
  - Zach Badgett (zachbadgett)
  - Aurélien Fredouelle
  - Francesco Levorato
+ - Thomas Tourlourat (armetiz)
+ - jamogon
  - Geoffrey Tran (geoff)
+ - Florian Rey (nervo)
  - Christian Schaefer (caefer)
  - Elliot Anderson (elliot)
- - Thomas Lallement (raziel057)
+ - Patrick Kaufmann
+ - Ben Ramsey (ramsey)
+ - Christian Jul Jensen
+ - Chris Jones (leek)
+ - vitaliytv
  - Markus Bachmann (baachi)
  - aubx
  - Max Rath (drak3)
+ - Ruben Gonzalez (rubenrua)
+ - Sinan Eldem
+ - DerManoMann
  - Nahuel Cuesta (ncuesta)
  - Chris Boden (cboden)
+ - Roumen Damianoff (roumen)
+ - Pierre du Plessis (pierredup)
+ - Åsmund Garfors
+ - Jeremy David (jeremy.david)
+ - Tobias Sjösten (tobiassjosten)
  - Dustin Dobervich (dustin10)
  - Sebastian Marek (proofek)
  - Erkhembayar Gantulga (erheme318)
+ - Ken Marfilla (marfillaster)
  - Rostyslav Kinash
+ - jfcixmedia
+ - Vincent Simonin
  - yktd26
- - Tom Van Looy (tvlooy)
+ - Jakub Kucharovic
  - umpirski
  - cedric lombardot (cedriclombardot)
  - John Kary (johnkary)
  - Hossein Bukhamsin
+ - Pierre-Yves LEBECQ (pylebecq)
  - Fabrice Bernhard (fabriceb)
+ - Mark Sonnabaum
  - develop
- - Filippo Tessarotto
- - hossein zolfi (ocean)
  - Atsuhiro KUBO (iteman)
+ - Samy Dindane (dinduks)
  - yclian
  - Jérémy Romey (jeremyfreeagent)
+ - Pascal Helfenstein
+ - Matt Daum (daum)
+ - Baldur Rensch
  - Hiromi Hishida (77web)
+ - Alex Xandra Albert Sim
  - Yuen-Chi Lian
  - Joshua Nye
  - avorobiev
+ - Stéphane PY (steph_py)
  - Mark Challoner
  - Andrew Tchircoff (andrewtch)
+ - BilgeXA
  - michaelwilliams
  - Casper Valdemar Poulsen
+ - Eduardo Gulias (egulias)
  - Josiah (josiah)
  - John Bohn (jbohn)
- - Roman Marintsenko (inori)
+ - Nicolas Schwartz (nicoschwartz)
+ - Christian Soronellas Vallespí (theunic)
+ - Benjamin Grandfond (benjamin)
  - Degory Valentine
  - Krzysiek Łabuś
  - Xavier Lacot (xavier)
  - Olivier Maisonneuve
+ - Iwan van Staveren (istaveren)
  - cgonzalez
  - matt foster
  - Evan S Kaufman (evanskaufman)
- - Ismael Ambrosi (iambrosi)
  - Jayson Xu (superjavason)
  - Jan Prieser
  - James Michael DuPont
  - Tom Klingenberg
+ - Gunther Konig
  - Christopher Hall (mythmakr)
  - Paul Kamer (pkamer)
  - Pierre Vanliefland (pvanliefland)
- - Eric GELOEN (gelo)
+ - Martin Parsiegla (spea)
  - Philipp Kräutli (pkraeutli)
+ - Stefano Sala (stefano.sala)
  - frost-nzcr4
+ - Loïc Chardonnet (gnusat)
  - Michaël Perrin (michael.perrin)
  - Abhoryo
  - Fabian Vogler (fabian)
@@ -294,71 +348,85 @@ Symfony2 is the result of the work of many people who made the code better
  - Matt Robinson (inanimatt)
  - julien pauli (jpauli)
  - mwsaz
+ - Benoît Bourgeois
+ - Filipe Guerra
  - corphi
  - grizlik
  - Derek ROTH
  - Shin Ohno (ganchiku)
  - Drew Butler (nodrew)
+ - Alexander Miehe (engerim)
+ - Titouan Galopin (tgalopin)
  - Don Pinkster
  - Emil Einarsson
  - Thibault Duplessis
  - Marc Abramowitz
  - Mathias Rohnstock (drmonty)
+ - Harry Walter (haswalt)
  - Michael Roterman (wtfzdotnet)
  - Arno Geurts
  - Adán Lobato (adanlobato)
  - Mikhail Yurasov
+ - Sam Williams
  - Miha Vrhovnik
+ - Moritz Borgmann
  - Daniel Cestari
- - Thomas Tourlourat (armetiz)
  - Karoly Negyesi (chx)
  - Javier López (loalf)
  - Magnus Nordlander (magnusnordlander)
  - Adam Monsen (meonkeys)
- - Florian Rey (nervo)
  - LOUARDI Abdeltif (ouardisoft)
  - Robert Gruendler (pulse00)
+ - ragtek (ragtek)
  - Benoît Merlet (trompette)
  - Maks
  - Jan Behrens
  - Raul Fraile (raulfraile)
  - sensio
- - Patrick Kaufmann
  - Théophile Helleboid - chtitux
- - Ben Ramsey (ramsey)
- - Christian Jul Jensen
- - Chris Jones (leek)
  - xaav
  - Juti Noppornpitak
- - Roumen Damianoff
+ - Mei Gwilym
+ - ttomor
  - Sander Coolen
  - Josip Kruslin
+ - Manuele Menozzi
  - Anton Babenko (antonbabenko)
  - Irmantas Šiupšinskas (irmantas)
+ - dantleech
  - Tero Alén (tero)
- - DerManoMann
  - Vadim Tyukov (vatson)
  - Sortex
  - arjenjb
  - chispita
  - Wojciech Sznapka
- - Tobias Sjösten (tobiassjosten)
  - Alex Bogomazov
  - julien.galenski
  - Sébastien Lavoie
  - Per Sandström (per)
- - Jeremy David (jeremy.david)
- - Ken Marfilla (marfillaster)
+ - Ville Mattila
  - Robert Kiss (kepten)
- - jfcixmedia
  - Vitaliy Tverdokhlib (vitaliytv)
  - Martijn Evers
- - Chris Heng
+ - Sergii Smertin (nfx)
  - Nerijus Arlauskas
+ - Haritz Iturbe (hizai)
+ - SPolischook
+ - Diego Sapriza
+ - Joan Cruz
+ - Antoine Corcy
+ - inspiran
+ - Cristobal Dabed
+ - matteo giachino
+ - Daniel Mecke (daniel_mecke)
+ - Alex Demchenko (pilot)
+ - Tomasz Kowalczyk (thunderer)
+ - Vincent AUBERT (vincent)
  - DerManoMann
  - Jochen Bayer (jocl)
  - Jeremy Bush
  - Evan Villemez
+ - Dmitrii Chekaliuk
  - Davide Borsatto (davide.borsatto)
  - kaiwa
  - Albert Ganiev (helios-ag)
@@ -372,21 +440,23 @@ Symfony2 is the result of the work of many people who made the code better
  - Marco
  - Alberto Aldegheri
  - heccjj
+ - Alexandre Melard
  - modi
  - Sergey Yuferev
  - Richard van den Brand (ricbra)
- - Mark Sonnabaum
  - Aharon Perkel
+ - Malaney J. Hill
  - Andy Cox (ringo)
+ - Sebastian Göttschkes (sgoettschkes)
+ - Pierre Tachoire
  - Balázs Benyó (duplabe)
  - Sebastian Utz
- - Samy Dindane (dinduks)
  - Keri Henare (kerihenare)
  - Cédric Lahouste (rapotor)
- - Terje Bråten
+ - Anthony Ferrara
  - Janusz Jablonski
  - George Giannoulopoulos
- - Matt Daum (daum)
+ - Ilya Biryukov
  - Alberto Pirovano (geezmo)
  - Xavier Briand (xavierbriand)
  - Evan Kaufman
@@ -394,21 +464,20 @@ Symfony2 is the result of the work of many people who made the code better
  - Marcus Stöhr (dafish)
  - Carsten Nielsen (phreaknerd)
  - Jay Severson
- - Stéphane PY (steph_py)
  - Martin Eckhardt
  - Michael Dowling (mtdowling)
- - BilgeXA
+ - Robert Queck
  - mlively
+ - Fabian Steiner (fabstei)
  - Thomas Chmielowiec (chmielot)
+ - kaywalker
  - Sebastian Ionescu
  - Simon Neidhold
  - Kevin Dew
  - James Cowgill
- - Nicolas Schwartz (nicoschwartz)
  - Konrad Mohrfeldt
  - Mephistofeles
  - pscheit
- - Jérôme Vieilledent (lolautruche)
  - Nicolas Badey (nico-b)
  - Lars Strojny
  - Bouke Haarsma
@@ -419,28 +488,33 @@ Symfony2 is the result of the work of many people who made the code better
  - Paweł Wacławczyk (pwc)
  - Thomas Bibb
  - Josef Cech
+ - Andrey Esaulov (andremaha)
  - hicham ELGUAROUANI (hiiimoo)
+ - Stefan Koopmanschap (skoop)
  - Ivan Kurnosov
  - stloyd
- - Martin Parsiegla (spea)
  - Chris Tickner (tickner)
  - Luis Muñoz
  - Thomas Chmielowiec
- - Gunther Konig
  - Oleg Zinchenko
- - Benjamin Grandfond (benjamin)
  - Christoph Nissle (derstoffel)
- - Stefano Sala (stefano.sala)
+ - Xavier HAUSHERR
  - Benjamin Zikarsky
  - Romain Dorgueil
+ - Patrick Allaert
  - Grayson Koonce (breerly)
  - Andy Stanberry
  - alefranz
- - Loïc Chardonnet (gnusat)
+ - alsar
+ - efeen
+ - Bob den Otter (bopp)
+ - Simone Fumagalli (hpatoio)
  - Alessio Baglio (ioalessio)
  - Jérôme Macias (jeromemacias)
+ - Jordi Llonch (jordillonch)
  - Cédric Dugat (ph3nol)
  - Philip Dahlstrøm (phidah)
+ - Robin Duval (robin-duval)
  - Artem Lopata (bumz)
  - Alexey Popkov
  - Artyom Protaskin
@@ -450,13 +524,13 @@ Symfony2 is the result of the work of many people who made the code better
  - gedrox
  - hirocaster
  - Andrey Chernykh
- - Alexander Miehe (engerim)
+ - François Pluchino
  - Jörn Lang (j.lang)
  - Jan Marek (janmarek)
  - Dan Patrick (mdpatrick)
- - Pierre-Yves LEBECQ (pylebecq)
  - Rares Vlaseanu (raresvla)
- - Denis Gorbachev (starfall)
+ - tante kinast (tante)
+ - Tugdual Saunier (tucksaun)
  - Alexander Zogheb
  - Florian Pfitzer
  - Linnik Sergey
@@ -473,15 +547,15 @@ Symfony2 is the result of the work of many people who made the code better
  - Robert Campbell
  - Matt Lehner
  - cyrillej
+ - Haritz
  - Grummfy
- - Eduardo Gulias
- - Filipe Guerra
  - Rowan Manning
  - David Windell
  - Gabriel Birke
  - Alan Chen
  - Maerlyn
  - Even André Fiskvik
+ - Rafał Wrzeszcz
  - Frédéric Hardy
  - Lenar Lõhmus
  - Cristian Gonzalez
@@ -497,13 +571,16 @@ Symfony2 is the result of the work of many people who made the code better
  - Kévin Dunglas (dunglas)
  - Vincent Composieux (eko)
  - Osman Üngür (import)
+ - Jorge Martin (jorgemartind)
  - giulio de donato (liuggio)
  - Matthew Davis (mdavis1982)
  - Matthias Pigulla (mpdude)
+ - Pablo Monterde Perez (plebs)
  - Jimmy Leger (redpanda)
  - Baptiste Clavié (talus)
  - Yanick Witschi
  - Till Klampaeckel
+ - srsbiz
  - Nicolas A. Bérard-Nault
  - Saem Ghani
  - Alexey Popkov
@@ -511,6 +588,7 @@ Symfony2 is the result of the work of many people who made the code better
  - Elnur Abdurrakhimov
  - Arnaud Buathier (arnapou)
  - chesteroni (chesteroni)
+ - Simon CONSTANS (kosssi)
  - Mauricio Lopez (sanctuary29)
  - Wotre
  - goohib
@@ -518,19 +596,21 @@ Symfony2 is the result of the work of many people who made the code better
  - Lars Vierbergen
  - Sylvain Lorinet
  - jc
+ - BenjaminBeck
  - Vladimir Sazhin
  - Vyacheslav Slinko
  - Johannes
  - Jörg Rühl
  - patrick-mcdougle
+ - andreabreu98
  - Michael Schneider
  - Jerome Tamarelle
  - xanido
  - Kaipi Yann
  - Samuel Laulhau
  - Oleg Stepura
- - Sam Williams
  - James Michael DuPont
+ - Tammy D
  - Ondrej Slinták
  - vlechemin
  - Skorney
@@ -539,7 +619,7 @@ Symfony2 is the result of the work of many people who made the code better
  - djama
  - Sébastien HOUZE
  - Abdulkadir N. A.
- - Moritz Borgmann
+ - Sema
  - Thorsten Hallwas
  - Vincent
  - Chris Smith
@@ -547,6 +627,9 @@ Symfony2 is the result of the work of many people who made the code better
  - David Soria Parra
  - Sergiy Sokolenko
  - Penny Leach
+ - Gábor Fási
+ - oscartv
+ - Philipp Rieber
  - DanSync
  - Peter Zwosta
  - parhs
@@ -555,6 +638,7 @@ Symfony2 is the result of the work of many people who made the code better
  - dorkitude
  - tirnanog06
  - Besnik Br
+ - Alex Olmos (alexolmos)
  - Juan Ases García (ases)
  - Bernd Matzner (bmatzner)
  - Chris Sedlmayr (catchamonkey)
@@ -566,25 +650,30 @@ Symfony2 is the result of the work of many people who made the code better
  - Daniel Londero (dlondero)
  - Adel ELHAIBA (eadel)
  - Fabien Dosse (fabd)
- - Jonas Flodén (flojon)
  - Yohan Giarelli (frequence-web)
  - Massimiliano Arione (garak)
  - Vladislav Krupenkin (ideea)
+ - Emanuele Gaspari (inmarelibero)
  - joris de wit (jdewit)
  - Jérémy CROMBEZ (jeremy)
+ - Jorge Maiden (jorgemaiden)
  - Justin Rainbow (jrainbow)
  - Sébastien Armand (khepin)
  - Krzysztof Menżyk (krymen)
+ - Martin Ledgard (le6o)
  - Matthieu Moquet (mattketmo)
  - Matt Drollette (mdrollette)
  - Florent CAILHOL (ooflorent)
  - Petr Jaroš (petajaros)
+ - Philipp Hoffmann (philipphoffmann)
+ - Alex Carol (picard89)
  - Daniel Perez Pinazo (pitiflautico)
- - ragtek (ragtek)
  - Ruud Kamphuis (ruudk)
  - Sebastian Busch (sebu)
+ - Simon Terrien (sterrien)
  - Markus Tacker (tacker)
  - Tyler Stroud (tystr)
+ - Víctor Mateo (victormateo)
  - Eugene Babushkin (warl)
  - Florent Cailhol
  - craigmarvelley

vendor/symfony/README.md

@@ -1,8 +1,6 @@
 README
 ======
 
-[![Build Status](https://secure.travis-ci.org/symfony/symfony.png?branch=2.0)](http://travis-ci.org/symfony/symfony)
-
 What is Symfony2?
 -----------------
 
@@ -37,10 +35,12 @@ Contributing
 
 Symfony2 is an open source, community-driven project. If you'd like to contribute,
 please read the [Contributing Code][4] part of the documentation. If you're submitting
-a pull request, please follow the guidelines in the [Submitting a Patch][5] section.
+a pull request, please follow the guidelines in the [Submitting a Patch][5] section
+and use [Pull Request Template][6].
 
 [1]: http://symfony.com/download
 [2]: http://symfony.com/get_started
 [3]: http://symfony.com/doc/current/
 [4]: http://symfony.com/doc/current/contributing/code/index.html
 [5]: http://symfony.com/doc/current/contributing/code/patches.html#check-list
+[6]: http://symfony.com/doc/current/contributing/code/patches.html#make-a-pull-request

vendor/symfony/phpunit.xml.dist

@@ -11,6 +11,10 @@
          syntaxCheck="false"
          bootstrap="tests/bootstrap.php"
 >
+    <php>
+        <ini name="intl.default_locale" value="en"/>
+        <ini name="intl.error_level" value="0"/>
+    </php>
     <testsuites>
         <testsuite name="Symfony Test Suite">
             <directory>./tests/Symfony/</directory>

vendor/symfony/src/Symfony/Bridge/Monolog/composer.json

@@ -18,7 +18,7 @@
     "require": {
         "php": ">=5.3.2",
         "symfony/http-kernel": "self.version",
-        "monolog/monolog": "1.*"
+        "monolog/monolog": ">=1.0,<1.3-dev"
     },
     "autoload": {
         "psr-0": { "Symfony\\Bridge\\Monolog": "" }

vendor/symfony/src/Symfony/Bridge/Twig/Extension/FormExtension.php

@@ -212,7 +212,6 @@ class FormExtension extends \Twig_Extension
     {
         $mainTemplate = in_array($section, array('widget', 'row'));
         if ($mainTemplate && $view->isRendered()) {
-
                 return '';
         }
 

vendor/symfony/src/Symfony/Bridge/Twig/Extension/YamlExtension.php

@@ -31,7 +31,7 @@ class YamlExtension extends \Twig_Extension
         );
     }
 
-    public function encode($input, $inline = 0)
+    public function encode($input, $inline = 0, $dumpObjects = false)
     {
         static $dumper;
 
@@ -39,20 +39,20 @@ class YamlExtension extends \Twig_Extension
             $dumper = new YamlDumper();
         }
 
-        return $dumper->dump($input, $inline);
+        return $dumper->dump($input, $inline, false, $dumpObjects);
     }
 
-    public function dump($value)
+    public function dump($value, $inline = 0, $dumpObjects = false)
     {
         if (is_resource($value)) {
             return '%Resource%';
         }
 
         if (is_array($value) || is_object($value)) {
-            return '%'.gettype($value).'% '.$this->encode($value);
+            return '%'.gettype($value).'% '.$this->encode($value, $inline, $dumpObjects);
         }
 
-        return $this->encode($value);
+        return $this->encode($value, $inline, $dumpObjects);
     }
 
     /**

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Controller/InternalController.php

@@ -31,6 +31,35 @@ class InternalController extends ContainerAware
      */
     public function indexAction($path, $controller)
     {
+        // safeguard
+        if (!is_string($controller)) {
+            throw new \RuntimeException('A Controller must be a string.');
+        }
+
+        // check that the controller looks like a controller
+        if (false === strpos($controller, '::')) {
+            $count = substr_count($controller, ':');
+            if (2 == $count) {
+                // the convention already enforces the Controller suffix
+            } elseif (1 == $count) {
+                // controller in the service:method notation
+                list($service, $method) = explode(':', $controller, 2);
+                $class = get_class($this->container->get($service));
+
+                if (!preg_match('/Controller$/', $class)) {
+                    throw new \RuntimeException('A Controller class name must end with Controller.');
+                }
+            } else {
+                throw new \LogicException('Unable to parse the Controller name.');
+            }
+        } else {
+            list($class, $method) = explode('::', $controller, 2);
+
+            if (!preg_match('/Controller$/', $class)) {
+                throw new \RuntimeException('A Controller class name must end with Controller.');
+            }
+        }
+
         $request = $this->container->get('request');
         $attributes = $request->attributes;
 

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php

@@ -47,7 +47,19 @@ class Configuration implements ConfigurationInterface
         $rootNode
             ->children()
                 ->scalarNode('charset')->end()
-                ->scalarNode('trust_proxy_headers')->defaultFalse()->end()
+                ->arrayNode('trusted_proxies')
+                    ->beforeNormalization()
+                        ->ifTrue(function($v) { return !is_array($v) && !is_null($v); })
+                        ->then(function($v) { return is_bool($v) ? array() : preg_split('/\s*,\s*/', $v); })
+                    ->end()
+                    ->prototype('scalar')
+                        ->validate()
+                            ->ifTrue(function($v) { return !empty($v) && !filter_var($v, FILTER_VALIDATE_IP); })
+                            ->thenInvalid('Invalid proxy IP "%s"')
+                        ->end()
+                    ->end()
+                ->end()
+                ->scalarNode('trust_proxy_headers')->defaultFalse()->end() // @deprecated, to be removed in 2.3
                 ->scalarNode('secret')->isRequired()->end()
                 ->scalarNode('ide')->defaultNull()->end()
                 ->booleanNode('test')->end()

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php

@@ -62,6 +62,9 @@ class FrameworkExtension extends Extension
         }
         $container->setParameter('kernel.secret', $config['secret']);
 
+        $container->setParameter('kernel.trusted_proxies', $config['trusted_proxies']);
+
+        // @deprecated, to be removed in 2.3
         $container->setParameter('kernel.trust_proxy_headers', $config['trust_proxy_headers']);
 
         if (!empty($config['test'])) {

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/EventListener/RouterListener.php

@@ -70,7 +70,10 @@ class RouterListener
 
         // add attributes based on the path info (routing)
         try {
-            $parameters = $this->router->match($request->getPathInfo());
+            // The path is returned in decoded form from the request, so we need to
+            // encode it again as the router applies its own decoding. This prevents
+            // double-decoding.
+            $parameters = $this->router->match(urlencode($request->getPathInfo()));
 
             if (null !== $this->logger) {
                 $this->logger->info(sprintf('Matched route "%s" (parameters: %s)', $parameters['_route'], $this->parametersToString($parameters)));

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php

@@ -17,7 +17,7 @@ use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\HttpKernel\Event\GetResponseEvent;
 
 /**
- * Sets the session on the request.
+ * Sets the session in the request.
  *
  * This will also start the session if it was already started during a previous
  * request.

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php

@@ -37,8 +37,10 @@ class FrameworkBundle extends Bundle
 {
     public function boot()
     {
-        if ($this->container->getParameter('kernel.trust_proxy_headers')) {
-            Request::trustProxyData();
+        if ($trustedProxies = $this->container->getParameter('kernel.trusted_proxies')) {
+            Request::setTrustedProxies($trustedProxies);
+        } elseif ($this->container->getParameter('kernel.trust_proxy_headers')) {
+            Request::trustProxyData(); // @deprecated, to be removed in 2.3
         }
     }
 

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/HttpKernel.php

@@ -113,11 +113,19 @@ class HttpKernel extends BaseHttpKernel
         }
 
         if ($this->esiSupport && $options['standalone']) {
-            $uri = $this->generateInternalUri($controller, $options['attributes'], $options['query']);
+            if (0 === strpos($controller, 'http://') || 0 === strpos($controller, 'https://')) {
+                $uri = $controller;
+            } else {
+                $uri = $this->generateInternalUri($controller, $options['attributes'], $options['query']);
+            }
 
             $alt = '';
             if ($options['alt']) {
-                $alt = $this->generateInternalUri($options['alt'][0], isset($options['alt'][1]) ? $options['alt'][1] : array(), isset($options['alt'][2]) ? $options['alt'][2] : array());
+                if (is_string($options['alt']) && (0 === strpos($options['alt'], 'http://') || 0 === strpos($options['alt'], 'https://'))) {
+                    $alt = $options['alt'];
+                } else {
+                    $alt = $this->generateInternalUri($options['alt'][0], isset($options['alt'][1]) ? $options['alt'][1] : array(), isset($options['alt'][2]) ? $options['alt'][2] : array());
+                }
             }
 
             return $this->container->get('esi')->renderIncludeTag($uri, $alt, $options['ignore_errors'], $options['comment']);
@@ -125,8 +133,13 @@ class HttpKernel extends BaseHttpKernel
 
         $request = $this->container->get('request');
 
-        // controller or URI?
-        if (0 === strpos($controller, '/')) {
+        // controller or URI or path?
+        if (0 === strpos($controller, 'http://') || 0 === strpos($controller, 'https://')) {
+            $subRequest = Request::create($controller, 'get', array(), $request->cookies->all(), array(), $request->server->all());
+            if ($session = $request->getSession()) {
+                $subRequest->setSession($session);
+            }
+        } elseif (0 === strpos($controller, '/')) {
             $subRequest = Request::create($request->getUriForPath($controller), 'get', array(), $request->cookies->all(), array(), $request->server->all());
             if ($session = $request->getSession()) {
                 $subRequest->setSession($session);

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/esi.xml

@@ -13,8 +13,8 @@
         <service id="esi" class="%esi.class%" />
 
         <service id="esi_listener" class="%esi_listener.class%">
-          <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
-          <argument type="service" id="esi" on-invalid="ignore" />
+            <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
+            <argument type="service" id="esi" on-invalid="ignore" />
         </service>
     </services>
 </container>

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/config/schema/symfony-1.0.xsd

@@ -23,6 +23,7 @@
 
         <xsd:attribute name="charset" type="xsd:string" />
         <xsd:attribute name="trust-proxy-headers" type="xsd:string" />
+        <xsd:attribute name="trusted-proxies" type="xsd:string" />
         <xsd:attribute name="ide" type="xsd:string" />
         <xsd:attribute name="secret" type="xsd:string" />
         <xsd:attribute name="test" type="xsd:boolean" />

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php

@@ -5,4 +5,3 @@ name="<?php echo $view->escape($full_name) ?>"
 <?php if ($max_length): ?>maxlength="<?php echo $view->escape($max_length) ?>" <?php endif ?>
 <?php if ($pattern): ?>pattern="<?php echo $view->escape($pattern) ?>" <?php endif ?>
 <?php foreach ($attr as $k => $v) { printf('%s="%s" ', $view->escape($k), $view->escape($v)); } ?>
-

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php

@@ -2,4 +2,3 @@
     <?php echo $view['form']->renderBlock('field_rows') ?>
     <?php echo $view['form']->rest($form) ?>
 </div>
-

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php

@@ -143,6 +143,15 @@ class CodeHelper extends Helper
     public function fileExcerpt($file, $line)
     {
         if (is_readable($file)) {
+            if (extension_loaded('fileinfo')) {
+                $finfo = new \Finfo();
+
+                // Check if the file is an application/octet-stream (eg. Phar file) because hightlight_file cannot parse these files
+                if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) {
+                    return;
+                }
+            }
+
             $code = highlight_file($file, true);
             // remove main code/span tags
             $code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php

@@ -193,7 +193,6 @@ class FormHelper extends Helper
     {
         $mainTemplate = in_array($section, array('row', 'widget'));
         if ($mainTemplate && $view->isRendered()) {
-
                 return '';
         }
 

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/Controller/InternalControllerTest.php

@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\InternalController;
+use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
+use Symfony\Component\HttpFoundation\Request;
+
+class InternalControllerTest extends TestCase
+{
+    /**
+     * @expectedException        \RuntimeException
+     * @expectedExceptionMessage A Controller class name must end with Controller.
+     */
+    public function testWithAClassMethodController()
+    {
+        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+
+        $controller = new InternalController();
+        $controller->setContainer($container);
+
+        $controller->indexAction('/', 'Symfony\Component\HttpFoundation\Request::getPathInfo');
+    }
+
+    /**
+     * @expectedException        \RuntimeException
+     * @expectedExceptionMessage A Controller class name must end with Controller.
+     */
+    public function testWithAServiceController()
+    {
+        $container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
+        $container
+            ->expects($this->once())
+            ->method('get')
+            ->will($this->returnValue(new Request()))
+        ;
+
+        $controller = new InternalController();
+        $controller->setContainer($container);
+
+        $controller->indexAction('/', 'service:method');
+    }
+}

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php

@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection;
+
+use Symfony\Bundle\FrameworkBundle\DependencyInjection\Configuration;
+use Symfony\Component\Config\Definition\Processor;
+
+class ConfigurationTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider getTestConfigTreeData
+     */
+    public function testConfigTree($options, $results)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(array());
+        $config = $processor->processConfiguration($configuration, array($options));
+
+        $this->assertEquals($results, $config);
+    }
+
+    public function getTestConfigTreeData()
+    {
+        return array(
+            array(array('secret' => 's3cr3t'), array('secret' => 's3cr3t', 'trusted_proxies' => array(), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
+        );
+    }
+
+    /**
+     * @dataProvider getTestValidTrustedProxiesData
+     */
+    public function testValidTrustedProxies($options, $results)
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(array());
+        $config = $processor->processConfiguration($configuration, array($options));
+
+        $this->assertEquals($results, $config);
+    }
+
+    public function getTestValidTrustedProxiesData()
+    {
+        return array(
+            array(array('secret' => 's3cr3t', 'trusted_proxies' => array('127.0.0.1')), array('secret' => 's3cr3t', 'trusted_proxies' => array('127.0.0.1'), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
+            array(array('secret' => 's3cr3t', 'trusted_proxies' => array('::1')), array('secret' => 's3cr3t', 'trusted_proxies' => array('::1'), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
+            array(array('secret' => 's3cr3t', 'trusted_proxies' => array('127.0.0.1', '::1')), array('secret' => 's3cr3t', 'trusted_proxies' => array('127.0.0.1', '::1'), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
+            array(array('secret' => 's3cr3t', 'trusted_proxies' => null), array('secret' => 's3cr3t', 'trusted_proxies' => array(), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
+            array(array('secret' => 's3cr3t', 'trusted_proxies' => false), array('secret' => 's3cr3t', 'trusted_proxies' => array(), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
+            array(array('secret' => 's3cr3t', 'trusted_proxies' => array()), array('secret' => 's3cr3t', 'trusted_proxies' => array(), 'trust_proxy_headers' => false, 'ide' => NULL, 'annotations' => array('cache' => 'file', 'file_cache_dir' => '%kernel.cache_dir%/annotations', 'debug' => false))),
+        );
+    }
+
+    /**
+     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     */
+    public function testInvalidTypeTrustedProxies()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(array());
+        $config = $processor->processConfiguration($configuration, array(array('secret' => 's3cr3t', 'trusted_proxies' => 'Not an IP address')));
+    }
+
+    /**
+     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     */
+    public function testInvalidValueTrustedProxies()
+    {
+        $processor = new Processor();
+        $configuration = new Configuration(array());
+        $config = $processor->processConfiguration($configuration, array(array('secret' => 's3cr3t', 'trusted_proxies' => array('Not an IP address'))));
+    }
+}

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/php/full.php

@@ -3,6 +3,8 @@
 $container->loadFromExtension('framework', array(
     'secret' => 's3cr3t',
     'form' => null,
+    'trust_proxy_headers' => true,
+    'trusted_proxies' => array('127.0.0.1', '10.0.0.1'),
     'csrf_protection' => array(
         'enabled'    => true,
         'field_name' => '_csrf',

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml

@@ -6,7 +6,7 @@
     xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
                         http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
-    <framework:config secret="s3cr3t" ide="file%%link%%format">
+    <framework:config secret="s3cr3t" ide="file%%link%%format" trust-proxy-headers="true" trusted-proxies="127.0.0.1, 10.0.0.1">
         <framework:csrf-protection enabled="true" field-name="_csrf" />
         <framework:form />
         <framework:esi enabled="true" />

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/yml/full.yml

@@ -1,6 +1,8 @@
 framework:
     secret: s3cr3t
     form: ~
+    trust_proxy_headers: true
+    trusted_proxies: ['127.0.0.1', '10.0.0.1']
     csrf_protection:
         enabled:    true
         field_name: _csrf

vendor/symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -33,6 +33,14 @@ abstract class FrameworkExtensionTest extends TestCase
         $this->assertEquals('s3cr3t', $container->getParameterBag()->resolveValue($container->findDefinition('form.csrf_provider')->getArgument(1)));
     }
 
+    public function testProxies()
+    {
+        $container = $this->createContainerFromFile('full');
+
+        $this->assertTrue($container->getParameter('kernel.trust_proxy_headers'));
+        $this->assertEquals(array('127.0.0.1', '10.0.0.1'), $container->getParameter('kernel.trusted_proxies'));
+    }
+
     public function testEsi()
     {
         $container = $this->createContainerFromFile('full');

vendor/symfony/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml

@@ -23,6 +23,10 @@
         <service id="twig" class="%twig.class%">
             <argument type="service" id="twig.loader" />
             <argument>%twig.options%</argument>
+            <call method="addGlobal">
+                <argument>app</argument>
+                <argument type="service" id="templating.globals" />
+            </call>
         </service>
 
         <service id="twig.cache_warmer" class="%twig.cache_warmer.class%" public="false">
@@ -39,7 +43,6 @@
         <service id="templating.engine.twig" class="%templating.engine.twig.class%" public="false">
             <argument type="service" id="twig" />
             <argument type="service" id="templating.name_parser" />
-            <argument type="service" id="templating.globals" />
         </service>
 
         <service id="twig.extension.trans" class="%twig.extension.trans.class%" public="false">

vendor/symfony/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig

@@ -12,8 +12,8 @@
     in {{ trace.file|format_file(trace.line) }} 
     {% spaceless %}
     <a href="#" onclick="toggle('trace_{{ prefix ~ '_' ~ i }}'); switchIcons('icon_{{ prefix ~ '_' ~ i }}_open', 'icon_{{ prefix ~ '_' ~ i }}_close'); return false;">
-        <img class="toggle" id="icon_{{ prefix ~ '_' ~ i }}_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == i ? 'display' : 'hidden' }}" />
-        <img class="toggle" id="icon_{{ prefix ~ '_' ~ i }}_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == i ? 'hidden' : 'display' }}; margin-left: -18px" />
+        <img class="toggle" id="icon_{{ prefix ~ '_' ~ i }}_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == i ? 'visible' : 'hidden' }}" />
+        <img class="toggle" id="icon_{{ prefix ~ '_' ~ i }}_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == i ? 'hidden' : 'visible' }}; margin-left: -18px" />
     </a>
     {% endspaceless %}
     <div id="trace_{{ prefix ~ '_' ~ i }}" style="display: {{ 0 == i ? 'block' : 'none' }}" class="trace">

vendor/symfony/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig

@@ -5,8 +5,8 @@
             {{ exception.class|abbr_class }}: {{ exception.message|e|replace({"\n": '<br />'})|format_file_from_text }}&nbsp;
             {% spaceless %}
             <a href="#" onclick="toggle('traces_{{ position }}', 'traces'); switchIcons('icon_traces_{{ position }}_open', 'icon_traces_{{ position }}_close'); return false;">
-                <img class="toggle" id="icon_traces_{{ position }}_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == count ? 'display' : 'hidden' }}" />
-                <img class="toggle" id="icon_traces_{{ position }}_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == count ? 'hidden' : 'display' }}; margin-left: -18px" />
+                <img class="toggle" id="icon_traces_{{ position }}_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == count ? 'visible' : 'hidden' }}" />
+                <img class="toggle" id="icon_traces_{{ position }}_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == count ? 'hidden' : 'visible' }}; margin-left: -18px" />
             </a>
             {% endspaceless %}
         </h2>

vendor/symfony/src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php

@@ -59,15 +59,17 @@ class TwigExtensionTest extends TestCase
 
         // Globals
         $calls = $container->getDefinition('twig')->getMethodCalls();
-        $this->assertEquals('foo', $calls[0][1][0], '->load() registers services as Twig globals');
-        $this->assertEquals(new Reference('bar'), $calls[0][1][1], '->load() registers services as Twig globals');
-        $this->assertEquals('pi', $calls[1][1][0], '->load() registers variables as Twig globals');
-        $this->assertEquals(3.14, $calls[1][1][1], '->load() registers variables as Twig globals');
+        $this->assertEquals('app', $calls[0][1][0]);
+        $this->assertEquals(new Reference('templating.globals'), $calls[0][1][1]);
+        $this->assertEquals('foo', $calls[1][1][0], '->load() registers services as Twig globals');
+        $this->assertEquals(new Reference('bar'), $calls[1][1][1], '->load() registers services as Twig globals');
+        $this->assertEquals('pi', $calls[2][1][0], '->load() registers variables as Twig globals');
+        $this->assertEquals(3.14, $calls[2][1][1], '->load() registers variables as Twig globals');
 
         // Yaml and Php specific configs
         if (in_array($format, array('yml', 'php'))) {
-            $this->assertEquals('bad', $calls[2][1][0], '->load() registers variables as Twig globals');
-            $this->assertEquals(array('key' => 'foo'), $calls[2][1][1], '->load() registers variables as Twig globals');
+            $this->assertEquals('bad', $calls[3][1][0], '->load() registers variables as Twig globals');
+            $this->assertEquals(array('key' => 'foo'), $calls[3][1][1], '->load() registers variables as Twig globals');
         }
 
         // Twig options
@@ -101,7 +103,7 @@ class TwigExtensionTest extends TestCase
 
         $calls = $container->getDefinition('twig')->getMethodCalls();
 
-        foreach ($calls as $call) {
+        foreach (array_slice($calls, 1) as $call) {
             list($name, $value) = each($globals);
             $this->assertEquals($name, $call[1][0]);
             $this->assertSame($value, $call[1][1]);

vendor/symfony/src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php

@@ -1,92 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Bundle\TwigBundle\Tests;
-
-use Symfony\Bundle\TwigBundle\TwigEngine;
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Session;
-use Symfony\Component\HttpFoundation\SessionStorage\ArraySessionStorage;
-use Symfony\Component\Templating\TemplateNameParser;
-use Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables;
-
-class TwigEngineTest extends TestCase
-{
-    public function testEvaluateAddsAppGlobal()
-    {
-        $environment = $this->getTwigEnvironment();
-        $container = $this->getContainer();
-        $engine = new TwigEngine($environment, new TemplateNameParser(), $app = new GlobalVariables($container));
-
-        $template = $this->getMock('\Twig_TemplateInterface');
-
-        $environment->expects($this->once())
-            ->method('loadTemplate')
-            ->will($this->returnValue($template));
-
-        $engine->render('name');
-
-        $request = $container->get('request');
-        $globals = $environment->getGlobals();
-        $this->assertSame($app, $globals['app']);
-    }
-
-    public function testEvaluateWithoutAvailableRequest()
-    {
-        $environment = $this->getTwigEnvironment();
-        $container = new Container();
-        $engine = new TwigEngine($environment, new TemplateNameParser(), new GlobalVariables($container));
-
-        $template = $this->getMock('\Twig_TemplateInterface');
-
-        $environment->expects($this->once())
-            ->method('loadTemplate')
-            ->will($this->returnValue($template));
-
-        $container->set('request', null);
-
-        $engine->render('name');
-
-        $globals = $environment->getGlobals();
-        $this->assertEmpty($globals['app']->getRequest());
-    }
-
-    /**
-     * Creates a Container with a Session-containing Request service.
-     *
-     * @return Container
-     */
-    protected function getContainer()
-    {
-        $container = new Container();
-        $request = new Request();
-        $session = new Session(new ArraySessionStorage());
-
-        $request->setSession($session);
-        $container->set('request', $request);
-
-        return $container;
-    }
-
-    /**
-     * Creates a mock Twig_Environment object.
-     *
-     * @return \Twig_Environment
-     */
-    protected function getTwigEnvironment()
-    {
-        return $this
-            ->getMockBuilder('\Twig_Environment')
-            ->setMethods(array('loadTemplate'))
-            ->getMock();
-    }
-}

vendor/symfony/src/Symfony/Bundle/TwigBundle/TwigEngine.php

@@ -12,7 +12,6 @@
 namespace Symfony\Bundle\TwigBundle;
 
 use Symfony\Bundle\FrameworkBundle\Templating\EngineInterface;
-use Symfony\Bundle\FrameworkBundle\Templating\GlobalVariables;
 use Symfony\Component\Templating\TemplateNameParserInterface;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -31,16 +30,11 @@ class TwigEngine implements EngineInterface
      *
      * @param \Twig_Environment           $environment A \Twig_Environment instance
      * @param TemplateNameParserInterface $parser      A TemplateNameParserInterface instance
-     * @param GlobalVariables|null        $globals     A GlobalVariables instance or null
      */
-    public function __construct(\Twig_Environment $environment, TemplateNameParserInterface $parser, GlobalVariables $globals = null)
+    public function __construct(\Twig_Environment $environment, TemplateNameParserInterface $parser)
     {
         $this->environment = $environment;
         $this->parser = $parser;
-
-        if (null !== $globals) {
-            $environment->addGlobal('app', $globals);
-        }
     }
 
     /**

vendor/symfony/src/Symfony/Component/Config/Loader/Loader.php

@@ -47,10 +47,12 @@ abstract class Loader implements LoaderInterface
      *
      * @param mixed  $resource A Resource
      * @param string $type     The resource type
+     *
+     * @return mixed
      */
     public function import($resource, $type = null)
     {
-        $this->resolve($resource)->load($resource, $type);
+        return $this->resolve($resource)->load($resource, $type);
     }
 
     /**

vendor/symfony/src/Symfony/Component/Console/Input/ArgvInput.php

@@ -210,12 +210,14 @@ class ArgvInput extends Input
 
         $option = $this->definition->getOption($name);
 
-        if (null === $value && $option->acceptValue()) {
+        if (null === $value && $option->acceptValue() && count($this->parsed)) {
             // if option accepts an optional or mandatory argument
             // let's see if there is one provided
             $next = array_shift($this->parsed);
-            if ('-' !== $next[0]) {
+            if (isset($next[0]) && '-' !== $next[0]) {
                 $value = $next;
+            } elseif (empty($next)) {
+                $value = '';
             } else {
                 array_unshift($this->parsed, $next);
             }

vendor/symfony/src/Symfony/Component/Console/Input/Input.php

@@ -37,6 +37,8 @@ abstract class Input implements InputInterface
     public function __construct(InputDefinition $definition = null)
     {
         if (null === $definition) {
+            $this->arguments = array();
+            $this->options = array();
             $this->definition = new InputDefinition();
         } else {
             $this->bind($definition);

vendor/symfony/src/Symfony/Component/CssSelector/Node/FunctionNode.php

@@ -209,7 +209,6 @@ class FunctionNode implements NodeInterface
         $xpath->addCondition(sprintf('contains(string(.), %s)', XPathExpr::xpathLiteral($expr)));
 
         // FIXME: Currently case insensitive matching doesn't seem to be happening
-
         return $xpath;
     }
 
@@ -264,7 +263,6 @@ class FunctionNode implements NodeInterface
 
         if (false === strpos($s, 'n')) {
             // Just a b
-
             return array(0, intval((string) $s));
         }
 

vendor/symfony/src/Symfony/Component/CssSelector/Tokenizer.php

@@ -129,7 +129,7 @@ class Tokenizer
             }
 
             $result = substr($s, $start, $next - $start);
-            if ('\\' === $result[strlen($result) - 1]) {
+            if (strlen($result) > 0 && '\\' === $result[strlen($result) - 1]) {
                 // next quote character is escaped
                 $pos = $next + 1;
                 continue;

vendor/symfony/src/Symfony/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPass.php

@@ -88,7 +88,7 @@ class ResolveInvalidReferencesPass implements CompilerPassInterface
 
                 // resolve invalid behavior
                 if ($exists && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE !== $invalidBehavior) {
-                    $arguments[$k] = new Reference($id);
+                    $arguments[$k] = new Reference($id, ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE, $argument->isStrict());
                 } elseif (!$exists && ContainerInterface::NULL_ON_INVALID_REFERENCE === $invalidBehavior) {
                     $arguments[$k] = null;
                 } elseif (!$exists && ContainerInterface::IGNORE_ON_INVALID_REFERENCE === $invalidBehavior) {

vendor/symfony/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -201,7 +201,7 @@ class PhpDumper extends Dumper
                 $nbOccurrences->offsetSet($definition, 1);
             } else {
                 $i = $nbOccurrences->offsetGet($definition);
-                $nbOccurrences->offsetSet($definition, $i+1);
+                $nbOccurrences->offsetSet($definition, $i + 1);
             }
         }
 
@@ -212,7 +212,7 @@ class PhpDumper extends Dumper
             $processed->offsetSet($sDefinition);
 
             $class = $this->dumpValue($sDefinition->getClass());
-            if ($nbOccurrences->offsetGet($sDefinition) > 1 || count($sDefinition->getMethodCalls()) > 0 || $sDefinition->getProperties() || null !== $sDefinition->getConfigurator() || false !== strpos($class, '$')) {
+            if ($nbOccurrences->offsetGet($sDefinition) > 1 || $sDefinition->getMethodCalls() || $sDefinition->getProperties() || null !== $sDefinition->getConfigurator() || false !== strpos($class, '$')) {
                 $name = $this->getNextVariableName();
                 $variableMap->offsetSet($sDefinition, new Variable($name));
 
@@ -227,26 +227,9 @@ class PhpDumper extends Dumper
                     throw new ServiceCircularReferenceException($id, array($id));
                 }
 
-                $arguments = array();
-                foreach ($sDefinition->getArguments() as $argument) {
-                    $arguments[] = $this->dumpValue($argument);
-                }
-
-                if (null !== $sDefinition->getFactoryMethod()) {
-                    if (null !== $sDefinition->getFactoryClass()) {
-                        $code .= sprintf("        \$%s = call_user_func(array(%s, '%s')%s);\n", $name, $this->dumpValue($sDefinition->getFactoryClass()), $sDefinition->getFactoryMethod(), count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
-                    } elseif (null !== $sDefinition->getFactoryService()) {
-                        $code .= sprintf("        \$%s = %s->%s(%s);\n", $name, $this->getServiceCall($sDefinition->getFactoryService()), $sDefinition->getFactoryMethod(), implode(', ', $arguments));
-                    } else {
-                        throw new \RuntimeException('Factory service or factory class must be defined in service definition for '.$id);
-                    }
-                } elseif (false !== strpos($class, '$')) {
-                    $code .= sprintf("        \$class = %s;\n        \$%s = new \$class(%s);\n", $class, $name, implode(', ', $arguments));
-                } else {
-                    $code .= sprintf("        \$%s = new \\%s(%s);\n", $name, substr(str_replace('\\\\', '\\', $class), 1, -1), implode(', ', $arguments));
-                }
+                $code .= $this->addNewInstance($id, $sDefinition, '$'.$name, ' = ');
 
-                if (!$this->hasReference($id, $sDefinition->getMethodCalls()) && !$this->hasReference($id, $sDefinition->getProperties())) {
+                if (!$this->hasReference($id, $sDefinition->getMethodCalls(), true) && !$this->hasReference($id, $sDefinition->getProperties(), true)) {
                     $code .= $this->addServiceMethodCalls(null, $sDefinition, $name);
                     $code .= $this->addServiceProperties(null, $sDefinition, $name);
                     $code .= $this->addServiceConfigurator(null, $sDefinition, $name);
@@ -295,11 +278,6 @@ class PhpDumper extends Dumper
             throw new \InvalidArgumentException(sprintf('"%s" is not a valid class name for the "%s" service.', $class, $id));
         }
 
-        $arguments = array();
-        foreach ($definition->getArguments() as $value) {
-            $arguments[] = $this->dumpValue($value);
-        }
-
         $simple = $this->isSimpleInstance($id, $definition);
 
         $instantiation = '';
@@ -318,19 +296,7 @@ class PhpDumper extends Dumper
             $instantiation .= ' = ';
         }
 
-        if (null !== $definition->getFactoryMethod()) {
-            if (null !== $definition->getFactoryClass()) {
-                $code = sprintf("        $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($definition->getFactoryClass()), $definition->getFactoryMethod(), $arguments ? ', '.implode(', ', $arguments) : '');
-            } elseif (null !== $definition->getFactoryService()) {
-                $code = sprintf("        $return{$instantiation}%s->%s(%s);\n", $this->getServiceCall($definition->getFactoryService()), $definition->getFactoryMethod(), implode(', ', $arguments));
-            } else {
-                throw new \RuntimeException('Factory method requires a factory service or factory class in service definition for '.$id);
-            }
-        } elseif (false !== strpos($class, '$')) {
-            $code = sprintf("        \$class = %s;\n        $return{$instantiation}new \$class(%s);\n", $class, implode(', ', $arguments));
-        } else {
-            $code = sprintf("        $return{$instantiation}new \\%s(%s);\n", substr(str_replace('\\\\', '\\', $class), 1, -1), implode(', ', $arguments));
-        }
+        $code = $this->addNewInstance($id, $definition, $return, $instantiation);
 
         if (!$simple) {
             $code .= "\n";
@@ -415,16 +381,14 @@ class PhpDumper extends Dumper
             }
             $processed->offsetSet($iDefinition);
 
-            if (!$this->hasReference($id, $iDefinition->getMethodCalls())) {
+            if (!$this->hasReference($id, $iDefinition->getMethodCalls(), true) && !$this->hasReference($id, $iDefinition->getProperties(), true)) {
                 continue;
             }
 
-            if ($iDefinition->getMethodCalls()) {
-                $code .= $this->addServiceMethodCalls(null, $iDefinition, (string) $this->definitionVariables->offsetGet($iDefinition));
-            }
-            if ($iDefinition->getConfigurator()) {
-                $code .= $this->addServiceConfigurator(null, $iDefinition, (string) $this->definitionVariables->offsetGet($iDefinition));
-            }
+            $name = (string) $this->definitionVariables->offsetGet($iDefinition);
+            $code .= $this->addServiceMethodCalls(null, $iDefinition, $name);
+            $code .= $this->addServiceProperties(null, $iDefinition, $name);
+            $code .= $this->addServiceConfigurator(null, $iDefinition, $name);
         }
 
         if ('' !== $code) {
@@ -611,6 +575,34 @@ EOF;
         return $publicServices.$aliasServices.$privateServices;
     }
 
+    private function addNewInstance($id, Definition $definition, $return, $instantiation)
+    {
+        $class = $this->dumpValue($definition->getClass());
+
+        $arguments = array();
+        foreach ($definition->getArguments() as $value) {
+            $arguments[] = $this->dumpValue($value);
+        }
+
+        if (null !== $definition->getFactoryMethod()) {
+            if (null !== $definition->getFactoryClass()) {
+                return sprintf("        $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($definition->getFactoryClass()), $definition->getFactoryMethod(), $arguments ? ', '.implode(', ', $arguments) : '');
+            }
+
+            if (null !== $definition->getFactoryService()) {
+                return sprintf("        $return{$instantiation}%s->%s(%s);\n", $this->getServiceCall($definition->getFactoryService()), $definition->getFactoryMethod(), implode(', ', $arguments));
+            }
+
+            throw new RuntimeException('Factory method requires a factory service or factory class in service definition for '.$id);
+        }
+
+        if (false !== strpos($class, '$')) {
+            return sprintf("        \$class = %s;\n\n        $return{$instantiation}new \$class(%s);\n", $class, implode(', ', $arguments));
+        }
+
+        return sprintf("        $return{$instantiation}new \\%s(%s);\n", substr(str_replace('\\\\', '\\', $class), 1, -1), implode(', ', $arguments));
+    }
+
     /**
      * Adds the class headers.
      *
@@ -960,17 +952,26 @@ EOF;
      *
      * @return Boolean
      */
-    private function hasReference($id, array $arguments)
+    private function hasReference($id, array $arguments, $deep = false)
     {
         foreach ($arguments as $argument) {
             if (is_array($argument)) {
-                if ($this->hasReference($id, $argument)) {
+                if ($this->hasReference($id, $argument, $deep)) {
                     return true;
                 }
             } elseif ($argument instanceof Reference) {
                 if ($id === (string) $argument) {
                     return true;
                 }
+
+                if ($deep) {
+                    $service = $this->container->getDefinition((string) $argument);
+                    $arguments = array_merge($service->getMethodCalls(), $service->getArguments(), $service->getProperties());
+
+                    if ($this->hasReference($id, $arguments, $deep)) {
+                        return true;
+                    }
+                }
             }
         }
 

vendor/symfony/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php

@@ -166,11 +166,7 @@ class YamlDumper extends Dumper
             return '';
         }
 
-        if ($this->container->isFrozen()) {
-            $parameters = $this->prepareParameters($this->container->getParameterBag()->all());
-        } else {
-            $parameters = $this->container->getParameterBag()->all();
-        }
+        $parameters = $this->prepareParameters($this->container->getParameterBag()->all(), $this->container->isFrozen());
 
         return Yaml::dump(array('parameters' => $parameters), 2);
     }
@@ -240,12 +236,12 @@ class YamlDumper extends Dumper
      *
      * @return array
      */
-    private function prepareParameters($parameters)
+    private function prepareParameters($parameters, $escape = true)
     {
         $filtered = array();
         foreach ($parameters as $key => $value) {
             if (is_array($value)) {
-                $value = $this->prepareParameters($value);
+                $value = $this->prepareParameters($value, $escape);
             } elseif ($value instanceof Reference) {
                 $value = '@'.$value;
             }
@@ -253,7 +249,7 @@ class YamlDumper extends Dumper
             $filtered[$key] = $value;
         }
 
-        return $this->escape($filtered);
+        return $escape ? $this->escape($filtered) : $filtered;
     }
 
     /**

vendor/symfony/src/Symfony/Component/Form/Extension/Core/ChoiceList/MonthChoiceList.php

@@ -39,7 +39,11 @@ class MonthChoiceList extends PaddedChoiceList
         $pattern = $this->formatter->getPattern();
         $timezone = $this->formatter->getTimezoneId();
 
-        $this->formatter->setTimezoneId('UTC');
+        if (version_compare(phpversion(), '5.5.0-dev', '<')) {
+            $this->formatter->setTimezoneId('UTC');
+        } else {
+            $this->formatter->setTimezone('UTC');
+        }
 
         if (preg_match('/M+/', $pattern, $matches)) {
             $this->formatter->setPattern($matches[0]);
@@ -53,6 +57,10 @@ class MonthChoiceList extends PaddedChoiceList
             $this->formatter->setPattern($pattern);
         }
 
-        $this->formatter->setTimezoneId($timezone);
+        if (version_compare(phpversion(), '5.5.0-dev', '<')) {
+            $this->formatter->setTimezoneId($timezone);
+        } else {
+            $this->formatter->setTimezone($timezone);
+        }
     }
 }

vendor/symfony/src/Symfony/Component/Form/Form.php

@@ -266,7 +266,6 @@ class Form implements \IteratorAggregate, FormInterface
     public function isRequired()
     {
         if (null === $this->parent || $this->parent->isRequired()) {
-
             return $this->required;
         }
 
@@ -287,7 +286,6 @@ class Form implements \IteratorAggregate, FormInterface
     public function isReadOnly()
     {
         if (null === $this->parent || !$this->parent->isReadOnly()) {
-
             return $this->readOnly;
         }
 
@@ -661,7 +659,6 @@ class Form implements \IteratorAggregate, FormInterface
     {
         foreach ($this->children as $child) {
             if (!$child->isEmpty()) {
-
                 return false;
             }
         }
@@ -687,7 +684,6 @@ class Form implements \IteratorAggregate, FormInterface
         if (!$this->readOnly) {
             foreach ($this->children as $child) {
                 if (!$child->isValid()) {
-
                     return false;
                 }
             }
@@ -822,7 +818,6 @@ class Form implements \IteratorAggregate, FormInterface
     public function get($name)
     {
         if (isset($this->children[$name])) {
-
             return $this->children[$name];
         }
 

vendor/symfony/src/Symfony/Component/HttpFoundation/File/File.php

@@ -524,6 +524,20 @@ class File extends \SplFileInfo
      */
     public function move($directory, $name = null)
     {
+        $target = $this->getTargetFile($directory, $name);
+
+        if (!@rename($this->getPathname(), $target)) {
+            $error = error_get_last();
+            throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error['message'])));
+        }
+
+        @chmod($target, 0666 & ~umask());
+
+        return $target;
+    }
+
+    protected function getTargetFile($directory, $name = null)
+    {
         if (!is_dir($directory)) {
             if (false === @mkdir($directory, 0777, true)) {
                 throw new FileException(sprintf('Unable to create the "%s" directory', $directory));
@@ -534,14 +548,7 @@ class File extends \SplFileInfo
 
         $target = $directory.DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
 
-        if (!@rename($this->getPathname(), $target)) {
-            $error = error_get_last();
-            throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error['message'])));
-        }
-
-        chmod($target, 0666);
-
-        return new File($target);
+        return new File($target, false);
     }
 
     /**

vendor/symfony/src/Symfony/Component/HttpFoundation/File/MimeType/FileBinaryMimeTypeGuesser.php

@@ -28,8 +28,9 @@ class FileBinaryMimeTypeGuesser implements MimeTypeGuesserInterface
      */
     public static function isSupported()
     {
-        return !strstr(PHP_OS, 'WIN');
+        return !defined('PHP_WINDOWS_VERSION_BUILD') && function_exists('passthru') && function_exists('escapeshellarg');
     }
+
     /**
      * Guesses the mime type of the file with the given path
      *

vendor/symfony/src/Symfony/Component/HttpFoundation/File/UploadedFile.php

@@ -189,8 +189,21 @@ class UploadedFile extends File
      */
     public function move($directory, $name = null)
     {
-        if ($this->isValid() && ($this->test || is_uploaded_file($this->getPathname()))) {
-            return parent::move($directory, $name);
+        if ($this->isValid()) {
+            if ($this->test) {
+                return parent::move($directory, $name);
+            } elseif (is_uploaded_file($this->getPathname())) {
+                $target = $this->getTargetFile($directory, $name);
+
+                if (!@move_uploaded_file($this->getPathname(), $target)) {
+                    $error = error_get_last();
+                    throw new FileException(sprintf('Could not move the file "%s" to "%s" (%s)', $this->getPathname(), $target, strip_tags($error['message'])));
+                }
+
+                @chmod($target, 0666 & ~umask());
+
+                return $target;
+            }
         }
 
         throw new FileException(sprintf('The file "%s" has not been uploaded via Http', $this->getPathname()));

vendor/symfony/src/Symfony/Component/HttpFoundation/Request.php

@@ -796,6 +796,8 @@ class Request
      *
      * @return string
      *
+     * @throws \UnexpectedValueException when the host name is invalid
+     *
      * @api
      */
     public function getHost()
@@ -803,19 +805,23 @@ class Request
         if (self::$trustProxy && self::$trustedHeaders[self::HEADER_CLIENT_HOST] && $host = $this->headers->get(self::$trustedHeaders[self::HEADER_CLIENT_HOST])) {
             $elements = explode(',', $host);
 
-            $host = trim($elements[count($elements) - 1]);
-        } else {
-            if (!$host = $this->headers->get('HOST')) {
-                if (!$host = $this->server->get('SERVER_NAME')) {
-                    $host = $this->server->get('SERVER_ADDR', '');
-                }
+            $host = $elements[count($elements) - 1];
+        } elseif (!$host = $this->headers->get('HOST')) {
+            if (!$host = $this->server->get('SERVER_NAME')) {
+                $host = $this->server->get('SERVER_ADDR', '');
             }
         }
 
-        // Remove port number from host
-        $host = preg_replace('/:\d+$/', '', $host);
+        // Trim and remove port number from host
+        $host = preg_replace('/:\d+$/', '', trim($host));
+
+        // as the host can come from the user (HTTP_HOST and depending on the configuration, SERVER_NAME too can come from the user)
+        // check that it does not contain forbidden characters (see RFC 952 and RFC 2181)
+        if ($host && !preg_match('/^\[?(?:[a-zA-Z0-9-:\]_]+\.?)+$/', $host)) {
+            throw new \UnexpectedValueException('Invalid Host');
+        }
 
-        return trim($host);
+        return $host;
     }
 
     /**
@@ -1126,7 +1132,8 @@ class Request
      * Returns true if the request is a XMLHttpRequest.
      *
      * It works if your JavaScript library set an X-Requested-With HTTP header.
-     * It is known to work with Prototype, Mootools, jQuery.
+     * It is known to work with common JavaScript frameworks:
+     * @link http://en.wikipedia.org/wiki/List_of_Ajax_frameworks#JavaScript
      *
      * @return Boolean true if the request is an XMLHttpRequest, false otherwise
      *

vendor/symfony/src/Symfony/Component/HttpFoundation/RequestMatcher.php

@@ -237,4 +237,3 @@ class RequestMatcher implements RequestMatcherInterface
         return true;
     }
 }
-

vendor/symfony/src/Symfony/Component/HttpFoundation/Response.php

@@ -505,7 +505,7 @@ class Response
     }
 
     /**
-     * Sets the number of seconds after the time specified in the response's Date
+     * Returns the number of seconds after the time specified in the response's Date
      * header when the the response should no longer be considered fresh.
      *
      * First, it checks for a s-maxage directive, then a max-age directive, and then it falls

vendor/symfony/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php

@@ -182,6 +182,7 @@ class PdoSessionStorage extends NativeSessionStorage
 
             if (count($sessionRows) == 1) {
                 $session = is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
+
                 return base64_decode($session);
             }
 

vendor/symfony/src/Symfony/Component/HttpKernel/Bundle/Bundle.php

@@ -172,7 +172,7 @@ abstract class Bundle extends ContainerAware implements BundleInterface
      */
     public function registerCommands(Application $application)
     {
-        if (!$dir = realpath($this->getPath().'/Command')) {
+        if (!is_dir($dir = $this->getPath().'/Command')) {
             return;
         }
 

vendor/symfony/src/Symfony/Component/HttpKernel/Exception/FlattenException.php

@@ -161,7 +161,7 @@ class FlattenException
                 'short_class' => $class,
                 'class'       => isset($entry['class']) ? $entry['class'] : '',
                 'type'        => isset($entry['type']) ? $entry['type'] : '',
-                'function'    => $entry['function'],
+                'function'    => isset($entry['function']) ? $entry['function'] : null,
                 'file'        => isset($entry['file']) ? $entry['file'] : null,
                 'line'        => isset($entry['line']) ? $entry['line'] : null,
                 'args'        => isset($entry['args']) ? $this->flattenArgs($entry['args']) : array(),

vendor/symfony/src/Symfony/Component/HttpKernel/Kernel.php

@@ -56,11 +56,11 @@ abstract class Kernel implements KernelInterface
     protected $startTime;
     protected $classes;
 
-    const VERSION         = '2.0.19';
-    const VERSION_ID      = '20019';
+    const VERSION         = '2.0.22';
+    const VERSION_ID      = '20022';
     const MAJOR_VERSION   = '2';
     const MINOR_VERSION   = '0';
-    const RELEASE_VERSION = '19';
+    const RELEASE_VERSION = '22';
     const EXTRA_VERSION   = '';
 
     /**

vendor/symfony/src/Symfony/Component/Locale/Stub/StubIntlDateFormatter.php

@@ -188,6 +188,9 @@ class StubIntlDateFormatter
             $argumentError = 'datefmt_format: takes either an array  or an integer timestamp value ';
         } elseif (version_compare(\PHP_VERSION, '5.3.4', '>=') && !is_int($timestamp) && !$timestamp instanceof \DateTime) {
             $argumentError = 'datefmt_format: takes either an array or an integer timestamp value or a DateTime object';
+            if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=') && !is_int($timestamp)) {
+                $argumentError = sprintf('datefmt_format: string \'%s\' is not numeric, which would be required for it to be a valid date', $timestamp);
+            }
         }
 
         if (null !== $argumentError) {
@@ -215,6 +218,24 @@ class StubIntlDateFormatter
     }
 
     /**
+     * Formats an object
+     *
+     * @param object $object
+     * @param mixed  $format
+     * @param string $locale
+     *
+     * @return string   The formatted value
+     *
+     * @see    http://www.php.net/manual/en/intldateformatter.formatobject.php
+     *
+     * @throws MethodNotImplementedException
+     */
+    public function formatObject($object, $format = null, $locale = null)
+    {
+        throw new MethodNotImplementedException(__METHOD__);
+    }
+
+    /**
      * Returns the formatter's calendar
      *
      * @return int   The calendar being used by the formatter
@@ -227,6 +248,20 @@ class StubIntlDateFormatter
     }
 
     /**
+     * Returns the formatter's calendar object
+     *
+     * @return object The calendar's object being used by the formatter
+     *
+     * @see    http://www.php.net/manual/en/intldateformatter.getcalendarobject.php
+     *
+     * @throws MethodNotImplementedException
+     */
+    public function getCalendarObject()
+    {
+        throw new MethodNotImplementedException(__METHOD__);
+    }
+
+    /**
      * Returns the formatter's datetype
      *
      * @return int   The current value of the formatter
@@ -313,10 +348,29 @@ class StubIntlDateFormatter
             return $this->timeZoneId;
         }
 
+        // In PHP 5.5 default timezone depends on `date_default_timezone_get()` method
+        if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
+            return date_default_timezone_get();
+        }
+
         return null;
     }
 
     /**
+     * Returns the formatter's timezone
+     *
+     * @return mixed    The timezone used by the formatter
+     *
+     * @see    http://www.php.net/manual/en/intldateformatter.gettimezone.php
+     *
+     * @throws MethodNotImplementedException
+     */
+    public function getTimeZone()
+    {
+        throw new MethodNotImplementedException(__METHOD__);
+    }
+
+    /**
      * Returns whether the formatter is lenient
      *
      * @return string   The timezone identifier used by the formatter
@@ -458,11 +512,16 @@ class StubIntlDateFormatter
     public function setTimeZoneId($timeZoneId)
     {
         if (null === $timeZoneId) {
-            // TODO: changes were made to ext/intl in PHP 5.4.4 release that need to be investigated since it will
-            // use ini's date.timezone when the time zone is not provided. As a not well tested workaround, uses UTC.
-            // See the first two items of the commit message for more information:
-            // https://github.com/php/php-src/commit/eb346ef0f419b90739aadfb6cc7b7436c5b521d9
-            $timeZoneId = getenv('TZ') ?: 'UTC';
+            // In PHP 5.5 if $timeZoneId is null it fallbacks to `date_default_timezone_get()` method
+            if (version_compare(\PHP_VERSION, '5.5.0-dev', '>=')) {
+                $timeZoneId = date_default_timezone_get();
+            } else {
+                // TODO: changes were made to ext/intl in PHP 5.4.4 release that need to be investigated since it will
+                // use ini's date.timezone when the time zone is not provided. As a not well tested workaround, uses UTC.
+                // See the first two items of the commit message for more information:
+                // https://github.com/php/php-src/commit/eb346ef0f419b90739aadfb6cc7b7436c5b521d9
+                $timeZoneId = getenv('TZ') ?: 'UTC';
+            }
 
             $this->unitializedTimeZoneId = true;
         }
@@ -491,12 +550,26 @@ class StubIntlDateFormatter
     }
 
     /**
+     * This method was added in PHP 5.5 as replacement for `setTimeZoneId()`
+     *
+     * @param  mixed $timeZone
+     *
+     * @return Boolean true on success or false on failure
+     *
+     * @see    http://www.php.net/manual/en/intldateformatter.settimezone.php
+     */
+    public function setTimeZone($timeZone)
+    {
+        return $this->setTimeZoneId($timeZone);
+    }
+
+    /**
      * Create and returns a DateTime object with the specified timestamp and with the
      * current time zone
      *
      * @param int $timestamp
      *
-     * @return DateTime
+     * @return \DateTime
      */
     protected function createDateTime($timestamp)
     {

vendor/symfony/src/Symfony/Component/Process/Process.php

@@ -53,7 +53,7 @@ class Process
         }
 
         $this->commandline = $commandline;
-        $this->cwd = null === $cwd ? getcwd() : $cwd;
+        $this->cwd = $cwd;
         if (null !== $env) {
             $this->env = array();
             foreach ($env as $key => $value) {
@@ -359,6 +359,13 @@ class Process
      */
     public function getWorkingDirectory()
     {
+        // This is for BC only
+        if (null === $this->cwd) {
+            // getcwd() will return false if any one of the parent directories does not have
+            // the readable or search mode set, even if the current directory does
+            return getcwd() ?: null;
+        }
+
         return $this->cwd;
     }
 

vendor/symfony/src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd

@@ -29,10 +29,13 @@
     <xsd:attribute name="resource" type="xsd:string" />
     <xsd:attribute name="type" type="xsd:string" />
     <xsd:attribute name="prefix" type="xsd:string" />
-    <xsd:attribute name="class" type="xsd:string" />
   </xsd:complexType>
 
-  <xsd:complexType name="element" mixed="true">
-    <xsd:attribute name="key" type="xsd:string" />
+  <xsd:complexType name="element">
+    <xsd:simpleContent>
+      <xsd:extension base="xsd:string">
+        <xsd:attribute name="key" type="xsd:string" />
+      </xsd:extension>
+    </xsd:simpleContent>
   </xsd:complexType>
 </xsd:schema>

vendor/symfony/src/Symfony/Component/Security/Http/Firewall/ContextListener.php

@@ -66,6 +66,7 @@ class ContextListener implements ListenerInterface
 
         if (null === $session || null === $token = $session->get('_security_'.$this->contextKey)) {
             $this->context->setToken(null);
+
             return;
         }
 

vendor/symfony/src/Symfony/Component/Security/Http/HttpUtils.php

@@ -107,7 +107,7 @@ class HttpUtils
     {
         if ('/' !== $path[0]) {
             try {
-                $parameters = $this->router->match($request->getPathInfo());
+                $parameters = $this->router->match(urlencode($request->getPathInfo()));
 
                 return $path === $parameters['_route'];
             } catch (MethodNotAllowedException $e) {
@@ -129,7 +129,7 @@ class HttpUtils
         }
 
         try {
-            $parameters = $this->router->match($request->getPathInfo());
+            $parameters = $this->router->match(urlencode($request->getPathInfo()));
 
             if (isset($parameters['_locale'])) {
                 $context->setParameter('_locale', $parameters['_locale']);

vendor/symfony/src/Symfony/Component/Yaml/Dumper.php

@@ -19,21 +19,40 @@ namespace Symfony\Component\Yaml;
 class Dumper
 {
     /**
+     * The amount of spaces to use for indentation of nested nodes.
+     *
+     * @var integer
+     */
+    protected $indentation = 2;
+
+    /**
+     * Sets the indentation.
+     *
+     * @param integer $num The amount of spaces to use for intendation of nested nodes.
+     */
+    public function setIndentation($num)
+    {
+        $this->indentation = $num;
+    }
+
+    /**
      * Dumps a PHP value to YAML.
      *
-     * @param mixed   $input  The PHP value
-     * @param integer $inline The level where you switch to inline YAML
-     * @param integer $indent The level of indentation (used internally)
+     * @param mixed   $input                  The PHP value
+     * @param integer $inline                 The level where you switch to inline YAML
+     * @param integer $indent                 The level of indentation (used internally)
+     * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param Boolean $objectSupport          true if object support is enabled, false otherwise
      *
      * @return string  The YAML representation of the PHP value
      */
-    public function dump($input, $inline = 0, $indent = 0)
+    public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false)
     {
         $output = '';
         $prefix = $indent ? str_repeat(' ', $indent) : '';
 
         if ($inline <= 0 || !is_array($input) || empty($input)) {
-            $output .= $prefix.Inline::dump($input);
+            $output .= $prefix.Inline::dump($input, $exceptionOnInvalidType, $objectSupport);
         } else {
             $isAHash = array_keys($input) !== range(0, count($input) - 1);
 
@@ -42,9 +61,9 @@ class Dumper
 
                 $output .= sprintf('%s%s%s%s',
                     $prefix,
-                    $isAHash ? Inline::dump($key).':' : '-',
+                    $isAHash ? Inline::dump($key, $exceptionOnInvalidType, $objectSupport).':' : '-',
                     $willBeInlined ? ' ' : "\n",
-                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + 2)
+                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $exceptionOnInvalidType, $objectSupport)
                 ).($willBeInlined ? "\n" : '');
             }
         }

vendor/symfony/src/Symfony/Component/Yaml/Inline.php

@@ -22,15 +22,23 @@ class Inline
 {
     const REGEX_QUOTED_STRING = '(?:"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\']*(?:\'\'[^\']*)*)\')';
 
+    private static $exceptionOnInvalidType = false;
+    private static $objectSupport = false;
+
     /**
      * Converts a YAML string to a PHP array.
      *
-     * @param string $value A YAML string
+     * @param string  $value                  A YAML string
+     * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param Boolean $objectSupport          true if object support is enabled, false otherwise
      *
      * @return array A PHP array representing the YAML string
      */
-    public static function parse($value)
+    public static function parse($value, $exceptionOnInvalidType = false, $objectSupport = false)
     {
+        self::$exceptionOnInvalidType = $exceptionOnInvalidType;
+        self::$objectSupport = $objectSupport;
+
         $value = trim($value);
 
         if (0 == strlen($value)) {
@@ -63,21 +71,35 @@ class Inline
     /**
      * Dumps a given PHP variable to a YAML string.
      *
-     * @param mixed $value The PHP variable to convert
+     * @param mixed   $value                  The PHP variable to convert
+     * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param Boolean $objectSupport          true if object support is enabled, false otherwise
      *
      * @return string The YAML string representing the PHP array
      *
      * @throws DumpException When trying to dump PHP resource
      */
-    public static function dump($value)
+    public static function dump($value, $exceptionOnInvalidType = false, $objectSupport = false)
     {
         switch (true) {
             case is_resource($value):
-                throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
+                if ($exceptionOnInvalidType) {
+                    throw new DumpException(sprintf('Unable to dump PHP resources in a YAML file ("%s").', get_resource_type($value)));
+                }
+
+                return 'null';
             case is_object($value):
-                return '!!php/object:'.serialize($value);
+                if ($objectSupport) {
+                    return '!!php/object:'.serialize($value);
+                }
+
+                if ($exceptionOnInvalidType) {
+                    throw new DumpException('Object support when dumping a YAML file has been disabled.');
+                }
+
+                return 'null';
             case is_array($value):
-                return self::dumpArray($value);
+                return self::dumpArray($value, $exceptionOnInvalidType, $objectSupport);
             case null === $value:
                 return 'null';
             case true === $value:
@@ -115,11 +137,13 @@ class Inline
     /**
      * Dumps a PHP array to a YAML string.
      *
-     * @param array $value The PHP array to dump
+     * @param array   $value                  The PHP array to dump
+     * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param Boolean $objectSupport          true if object support is enabled, false otherwise
      *
      * @return string The YAML string representing the PHP array
      */
-    private static function dumpArray($value)
+    private static function dumpArray($value, $exceptionOnInvalidType, $objectSupport)
     {
         // array
         $keys = array_keys($value);
@@ -128,7 +152,7 @@ class Inline
         ) {
             $output = array();
             foreach ($value as $val) {
-                $output[] = self::dump($val);
+                $output[] = self::dump($val, $exceptionOnInvalidType, $objectSupport);
             }
 
             return sprintf('[%s]', implode(', ', $output));
@@ -137,7 +161,7 @@ class Inline
         // mapping
         $output = array();
         foreach ($value as $key => $val) {
-            $output[] = sprintf('%s: %s', self::dump($key), self::dump($val));
+            $output[] = sprintf('%s: %s', self::dump($key, $exceptionOnInvalidType, $objectSupport), self::dump($val, $exceptionOnInvalidType, $objectSupport));
         }
 
         return sprintf('{ %s }', implode(', ', $output));
@@ -355,7 +379,15 @@ class Inline
             case 0 === strpos($scalar, '! '):
                 return intval(self::parseScalar(substr($scalar, 2)));
             case 0 === strpos($scalar, '!!php/object:'):
-                return unserialize(substr($scalar, 13));
+                if (self::$objectSupport) {
+                    return unserialize(substr($scalar, 13));
+                }
+
+                if (self::$exceptionOnInvalidType) {
+                    throw new ParseException('Object support when parsing a YAML file has been disabled.');
+                }
+
+                return null;
             case ctype_digit($scalar):
                 $raw = $scalar;
                 $cast = intval($scalar);

vendor/symfony/src/Symfony/Component/Yaml/Parser.php

@@ -38,13 +38,15 @@ class Parser
     /**
      * Parses a YAML string to a PHP value.
      *
-     * @param string $value A YAML string
+     * @param string  $value                  A YAML string
+     * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param Boolean $objectSupport          true if object support is enabled, false otherwise
      *
      * @return mixed  A PHP value
      *
      * @throws ParseException If the YAML is not valid
      */
-    public function parse($value)
+    public function parse($value, $exceptionOnInvalidType = false, $objectSupport = false)
     {
         $this->currentLineNb = -1;
         $this->currentLine = '';
@@ -82,7 +84,7 @@ class Parser
                     $c = $this->getRealCurrentLineNb() + 1;
                     $parser = new Parser($c);
                     $parser->refs =& $this->refs;
-                    $data[] = $parser->parse($this->getNextEmbedBlock());
+                    $data[] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport);
                 } else {
                     if (isset($values['leadspaces'])
                         && ' ' == $values['leadspaces']
@@ -98,12 +100,14 @@ class Parser
                             $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
                         }
 
-                        $data[] = $parser->parse($block);
+                        $data[] = $parser->parse($block, $exceptionOnInvalidType, $objectSupport);
                     } else {
-                        $data[] = $this->parseValue($values['value']);
+                        $data[] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport);
                     }
                 }
             } elseif (preg_match('#^(?P<key>'.Inline::REGEX_QUOTED_STRING.'|[^ \'"\[\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values)) {
+                // force correct settings
+                Inline::parse(null, $exceptionOnInvalidType, $objectSupport);
                 try {
                     $key = Inline::parseScalar($values['key']);
                 } catch (ParseException $e) {
@@ -128,7 +132,7 @@ class Parser
                         $c = $this->getRealCurrentLineNb() + 1;
                         $parser = new Parser($c);
                         $parser->refs =& $this->refs;
-                        $parsed = $parser->parse($value);
+                        $parsed = $parser->parse($value, $exceptionOnInvalidType, $objectSupport);
 
                         $merged = array();
                         if (!is_array($parsed)) {
@@ -165,20 +169,20 @@ class Parser
                         $c = $this->getRealCurrentLineNb() + 1;
                         $parser = new Parser($c);
                         $parser->refs =& $this->refs;
-                        $data[$key] = $parser->parse($this->getNextEmbedBlock());
+                        $data[$key] = $parser->parse($this->getNextEmbedBlock(), $exceptionOnInvalidType, $objectSupport);
                     }
                 } else {
                     if ($isInPlace) {
                         $data = $this->refs[$isInPlace];
                     } else {
-                        $data[$key] = $this->parseValue($values['value']);
+                        $data[$key] = $this->parseValue($values['value'], $exceptionOnInvalidType, $objectSupport);
                     }
                 }
             } else {
                 // 1-liner followed by newline
                 if (2 == count($this->lines) && empty($this->lines[1])) {
                     try {
-                        $value = Inline::parse($this->lines[0]);
+                        $value = Inline::parse($this->lines[0], $exceptionOnInvalidType, $objectSupport);
                     } catch (ParseException $e) {
                         $e->setParsedLine($this->getRealCurrentLineNb() + 1);
                         $e->setSnippet($this->currentLine);
@@ -345,7 +349,7 @@ class Parser
      *
      * @throws ParseException When reference does not exist
      */
-    private function parseValue($value)
+    private function parseValue($value, $exceptionOnInvalidType, $objectSupport)
     {
         if (0 === strpos($value, '*')) {
             if (false !== $pos = strpos($value, '#')) {
@@ -368,7 +372,7 @@ class Parser
         }
 
         try {
-            return Inline::parse($value);
+            return Inline::parse($value, $exceptionOnInvalidType, $objectSupport);
         } catch (ParseException $e) {
             $e->setParsedLine($this->getRealCurrentLineNb() + 1);
             $e->setSnippet($this->currentLine);

vendor/symfony/src/Symfony/Component/Yaml/Yaml.php

@@ -23,6 +23,53 @@ use Symfony\Component\Yaml\Exception\ParseException;
 class Yaml
 {
     /**
+     * Be warned that PHP support will be removed in Symfony 2.3.
+     *
+     * @deprecated Deprecated since version 2.0, to be removed in 2.3.
+     */
+    public static $enablePhpParsing = false;
+
+    /**
+     * Enables PHP support when parsing YAML files.
+     *
+     * Be warned that PHP support will be removed in Symfony 2.3.
+     *
+     * @deprecated Deprecated since version 2.0, to be removed in 2.3.
+     */
+    public static function enablePhpParsing()
+    {
+        self::$enablePhpParsing = true;
+    }
+
+    /**
+     * Sets the PHP support flag when parsing YAML files.
+     *
+     * Be warned that PHP support will be removed in Symfony 2.3.
+     *
+     * @param Boolean $boolean true if PHP parsing support is enabled, false otherwise
+     *
+     * @deprecated Deprecated since version 2.0, to be removed in 2.3.
+     */
+    public static function setPhpParsing($boolean)
+    {
+        self::$enablePhpParsing = (Boolean) $boolean;
+    }
+
+    /**
+     * Checks if PHP support is enabled when parsing YAML files.
+     *
+     * Be warned that PHP support will be removed in Symfony 2.3.
+     *
+     * @return Boolean true if PHP parsing support is enabled, false otherwise
+     *
+     * @deprecated Deprecated since version 2.0, to be removed in 2.3.
+     */
+    public static function supportsPhpParsing()
+    {
+        return self::$enablePhpParsing;
+    }
+
+    /**
      * Parses YAML into a PHP array.
      *
      * The parse method, when supplied with a YAML stream (string or file),
@@ -42,35 +89,37 @@ class Yaml
      *
      * @api
      */
-    public static function parse($input)
+    public static function parse($input, $exceptionOnInvalidType = false, $objectSupport = false)
     {
-        $file = '';
-
         // if input is a file, process it
+        $file = '';
         if (strpos($input, "\n") === false && is_file($input)) {
             if (false === is_readable($input)) {
                 throw new ParseException(sprintf('Unable to parse "%s" as the file is not readable.', $input));
             }
 
             $file = $input;
+            if (self::$enablePhpParsing) {
+                ob_start();
+                $retval = include($file);
+                $content = ob_get_clean();
 
-            ob_start();
-            $retval = include($input);
-            $content = ob_get_clean();
-
-            // if an array is returned by the config file assume it's in plain php form else in YAML
-            $input = is_array($retval) ? $retval : $content;
-        }
+                // if an array is returned by the config file assume it's in plain php form else in YAML
+                $input = is_array($retval) ? $retval : $content;
 
-        // if an array is returned by the config file assume it's in plain php form else in YAML
-        if (is_array($input)) {
-            return $input;
+                // if an array is returned by the config file assume it's in plain php form else in YAML
+                if (is_array($input)) {
+                    return $input;
+                }
+            } else {
+                $input = file_get_contents($file);
+            }
         }
 
         $yaml = new Parser();
 
         try {
-            return $yaml->parse($input);
+            return $yaml->parse($input, $exceptionOnInvalidType, $objectSupport);
         } catch (ParseException $e) {
             if ($file) {
                 $e->setParsedFile($file);
@@ -86,17 +135,21 @@ class Yaml
      * The dump method, when supplied with an array, will do its best
      * to convert the array into friendly YAML.
      *
-     * @param array   $array  PHP array
-     * @param integer $inline The level where you switch to inline YAML
+     * @param array   $array                  PHP array
+     * @param integer $inline                 The level where you switch to inline YAML
+     * @param integer $indent                 The amount of spaces to use for indentation of nested nodes.
+     * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
+     * @param Boolean $objectSupport          true if object support is enabled, false otherwise
      *
      * @return string A YAML string representing the original PHP array
      *
      * @api
      */
-    public static function dump($array, $inline = 2)
+    public static function dump($array, $inline = 2, $indent = 2, $exceptionOnInvalidType = false, $objectSupport = false)
     {
         $yaml = new Dumper();
+        $yaml->setIndentation($indent);
 
-        return $yaml->dump($array, $inline);
+        return $yaml->dump($array, $inline, 0, $exceptionOnInvalidType, $objectSupport);
     }
 }

vendor/symfony/tests/Symfony/Tests/Bridge/Doctrine/Logger/DbalLoggerTest.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Tests\Bridge\Doctrine\Logger;
 
-
 class DbalLoggerTest extends \PHPUnit_Framework_TestCase
 {
     public function testLogNonUtf8()

vendor/symfony/tests/Symfony/Tests/Component/Config/Loader/LoaderTest.php

@@ -55,6 +55,15 @@ class LoaderTest extends \PHPUnit_Framework_TestCase
             $this->assertInstanceOf('Symfony\Component\Config\Exception\FileLoaderLoadException', $e, '->resolve() throws a FileLoaderLoadException if the resource cannot be loaded');
         }
     }
+
+    public function testImport()
+    {
+        $loader = $this->getMock('Symfony\Component\Config\Loader\Loader', array('supports', 'load'));
+        $loader->expects($this->once())->method('supports')->will($this->returnValue(true));
+        $loader->expects($this->once())->method('load')->will($this->returnValue('yes'));
+
+        $this->assertEquals('yes', $loader->import('foo'));
+    }
 }
 
 class ProjectLoader1 extends Loader

vendor/symfony/tests/Symfony/Tests/Component/Config/Resource/DirectoryResourceTest.php

@@ -38,7 +38,7 @@ class DirectoryResourceTest extends \PHPUnit_Framework_TestCase
     {
         $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($directory), \RecursiveIteratorIterator::CHILD_FIRST);
         foreach ($iterator as $path) {
-            if (preg_match('#/\.\.?$#', $path->__toString())) {
+            if (preg_match('#[/\\\\]\.\.?$#', $path->__toString())) {
                 continue;
             }
             if ($path->isDir()) {

vendor/symfony/tests/Symfony/Tests/Component/Console/Input/ArgvInputTest.php

@@ -71,6 +71,18 @@ class ArgvInputTest extends \PHPUnit_Framework_TestCase
         $input->bind(new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_REQUIRED))));
         $this->assertEquals(array('foo' => 'bar'), $input->getOptions(), '->parse() parses short options with a required value (with a space separator)');
 
+        $input = new ArgvInput(array('cli.php', '-f', ''));
+        $input->bind(new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL))));
+        $this->assertEquals(array('foo' => ''), $input->getOptions(), '->parse() parses short options with an optional empty value');
+
+        $input = new ArgvInput(array('cli.php', '-f', '', 'foo'));
+        $input->bind(new InputDefinition(array(new InputArgument('name'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL))));
+        $this->assertEquals(array('foo' => ''), $input->getOptions(), '->parse() parses short options with an optional empty value followed by an argument');
+
+        $input = new ArgvInput(array('cli.php', '-f', '', '-b'));
+        $input->bind(new InputDefinition(array(new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b'))));
+        $this->assertEquals(array('foo' => '', 'bar' => true), $input->getOptions(), '->parse() parses short options with an optional empty value followed by an option');
+
         $input = new ArgvInput(array('cli.php', '-f', '-b', 'foo'));
         $input->bind(new InputDefinition(array(new InputArgument('name'), new InputOption('foo', 'f', InputOption::VALUE_OPTIONAL), new InputOption('bar', 'b'))));
         $this->assertEquals(array('foo' => null, 'bar' => true), $input->getOptions(), '->parse() parses short options with an optional value which is not present');

vendor/symfony/tests/Symfony/Tests/Component/CssSelector/TokenizerTest.php

@@ -34,6 +34,7 @@ class TokenizerTest extends \PHPUnit_Framework_TestCase
     {
         $this->assertEquals('foo[class=foo bar  ]', $this->tokensToString($this->tokenizer->tokenize('foo[class="foo bar"]')), '->tokenize() lexes an input string and returns an array of tokens');
         $this->assertEquals("foo[class=foo Abar     ]", $this->tokensToString($this->tokenizer->tokenize('foo[class="foo \\65 bar"]')), '->tokenize() lexes an input string and returns an array of tokens');
+        $this->assertEquals("img[alt=  ]", $this->tokensToString($this->tokenizer->tokenize('img[alt=""]')), '->tokenize() lexes an input string and returns an array of tokens');
     }
 
     /**

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Compiler/ResolveInvalidReferencesPassTest.php

@@ -61,6 +61,20 @@ class ResolveInvalidReferencesPassTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals(array(), $def->getProperties());
     }
 
+    public function testStrictFlagIsPreserved()
+    {
+        $container = new ContainerBuilder();
+        $container->register('bar');
+        $def = $container
+            ->register('foo')
+            ->addArgument(new Reference('bar', ContainerInterface::NULL_ON_INVALID_REFERENCE, false))
+        ;
+
+        $this->process($container);
+
+        $this->assertFalse($def->getArgument(0)->isStrict());
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $pass = new ResolveInvalidReferencesPass();

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Dumper/PhpDumperTest.php

@@ -96,10 +96,17 @@ class PhpDumperTest extends \PHPUnit_Framework_TestCase
 
     public function testAddService()
     {
+        // without compilation
         $container = include self::$fixturesPath.'/containers/container9.php';
         $dumper = new PhpDumper($container);
         $this->assertEquals(str_replace('%path%', str_replace('\\','\\\\',self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services9.php')), $dumper->dump(), '->dump() dumps services');
 
+        // with compilation
+        $container = include self::$fixturesPath.'/containers/container9.php';
+        $container->compile();
+        $dumper = new PhpDumper($container);
+        $this->assertEquals(str_replace('%path%', str_replace('\\','\\\\',self::$fixturesPath.DIRECTORY_SEPARATOR.'includes'.DIRECTORY_SEPARATOR), file_get_contents(self::$fixturesPath.'/php/services9_compiled.php')), $dumper->dump(), '->dump() dumps services');
+
         $dumper = new PhpDumper($container = new ContainerBuilder());
         $container->register('foo', 'FooClass')->addArgument(new \stdClass());
         try {

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/containers/container9.php

@@ -14,9 +14,8 @@ $container->
     addTag('foo', array('bar' => 'bar'))->
     setFactoryClass('FooClass')->
     setFactoryMethod('getInstance')->
-    setArguments(array('foo', new Reference('foo.baz'), array('%foo%' => 'foo is %foo%', 'bar' => '%foo%'), true, new Reference('service_container')))->
+    setArguments(array('foo', new Reference('foo.baz'), array('%foo%' => 'foo is %foo%', 'foobar' => '%foo%'), true, new Reference('service_container')))->
     setProperties(array('foo' => 'bar', 'moo' => new Reference('foo.baz')))->
-    setScope('prototype')->
     addMethodCall('setBar', array(new Reference('bar')))->
     addMethodCall('initialize')->
     setConfigurator('sc_configure')
@@ -33,7 +32,10 @@ $container->
     setFactoryMethod('getInstance')->
     setConfigurator(array('%baz_class%', 'configureStatic1'))
 ;
-$container->register('foo_bar', '%foo_class%');
+$container->
+    register('foo_bar', '%foo_class%')->
+    setScope('prototype')
+;
 $container->getParameterBag()->clear();
 $container->getParameterBag()->add(array(
     'baz_class' => 'BazClass',
@@ -50,9 +52,24 @@ $container->
     addMethodCall('setBar', array(new Reference('foobaz', ContainerInterface::IGNORE_ON_INVALID_REFERENCE)))
 ;
 $container->
-    register('factory_service')->
+    register('factory_service', 'Bar')->
     setFactoryService('foo.baz')->
     setFactoryMethod('getInstance')
 ;
 
+$container
+    ->register('foo_with_inline', 'Foo')
+    ->addMethodCall('setBar', array(new Reference('inlined')))
+;
+$container
+    ->register('inlined', 'Bar')
+    ->setProperty('pub', 'pub')
+    ->addMethodCall('setBaz', array(new Reference('baz')))
+    ->setPublic(false)
+;
+$container
+    ->register('baz', 'Baz')
+    ->addMethodCall('setFoo', array(new Reference('foo_with_inline')))
+;
+
 return $container;

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/graphviz/services9.dot

@@ -3,12 +3,15 @@ digraph sc {
   node [fontsize="11" fontname="Arial" shape="record"];
   edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
 
-  node_foo [label="foo (alias_for_foo)\nFooClass\n", shape=record, fillcolor="#eeeeee", style="dotted"];
+  node_foo [label="foo (alias_for_foo)\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_bar [label="bar\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_foo_baz [label="foo.baz\nBazClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
-  node_foo_bar [label="foo_bar\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo_bar [label="foo_bar\nFooClass\n", shape=record, fillcolor="#eeeeee", style="dotted"];
   node_method_call1 [label="method_call1\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
-  node_factory_service [label="factory_service\n\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_factory_service [label="factory_service\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo_with_inline [label="foo_with_inline\nFoo\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_inlined [label="inlined\nBar\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_baz [label="baz\nBaz\n", shape=record, fillcolor="#eeeeee", style="filled"];
   node_service_container [label="service_container\nSymfony\\Component\\DependencyInjection\\ContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
   node_foo2 [label="foo2\n\n", shape=record, fillcolor="#ff9999", style="filled"];
   node_foo3 [label="foo3\n\n", shape=record, fillcolor="#ff9999", style="filled"];
@@ -22,4 +25,7 @@ digraph sc {
   node_method_call1 -> node_foo2 [label="setBar()" style="dashed"];
   node_method_call1 -> node_foo3 [label="setBar()" style="dashed"];
   node_method_call1 -> node_foobaz [label="setBar()" style="dashed"];
+  node_foo_with_inline -> node_inlined [label="setBar()" style="dashed"];
+  node_inlined -> node_baz [label="setBaz()" style="dashed"];
+  node_baz -> node_foo_with_inline [label="setFoo()" style="dashed"];
 }

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/includes/classes.php

@@ -7,10 +7,23 @@ function sc_configure($instance)
 
 class BarClass
 {
+    protected $baz;
+
+    public function setBaz(BazClass $baz)
+    {
+        $this->baz = $baz;
+    }
 }
 
 class BazClass
 {
+    protected $foo;
+
+    public function setFoo(Foo $foo)
+    {
+        $this->foo = $foo;
+    }
+
     public function configure($instance)
     {
         $instance->configure();

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services9.php

@@ -41,12 +41,29 @@ class ProjectServiceContainer extends Container
     }
 
     /**
+     * Gets the 'baz' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return Baz A Baz instance.
+     */
+    protected function getBazService()
+    {
+        $this->services['baz'] = $instance = new \Baz();
+
+        $instance->setFoo($this->get('foo_with_inline'));
+
+        return $instance;
+    }
+
+    /**
      * Gets the 'factory_service' service.
      *
      * This service is shared.
      * This method always returns the same instance of the service.
      *
-     * @return Object An instance returned by foo.baz::getInstance().
+     * @return Bar A Bar instance.
      */
     protected function getFactoryServiceService()
     {
@@ -56,13 +73,16 @@ class ProjectServiceContainer extends Container
     /**
      * Gets the 'foo' service.
      *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
      * @return FooClass A FooClass instance.
      */
     protected function getFooService()
     {
         $a = $this->get('foo.baz');
 
-        $instance = call_user_func(array('FooClass', 'getInstance'), 'foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo'), 'bar' => $this->getParameter('foo')), true, $this);
+        $this->services['foo'] = $instance = call_user_func(array('FooClass', 'getInstance'), 'foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo'), 'foobar' => $this->getParameter('foo')), true, $this);
 
         $instance->setBar($this->get('bar'));
         $instance->initialize();
@@ -93,15 +113,30 @@ class ProjectServiceContainer extends Container
     /**
      * Gets the 'foo_bar' service.
      *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
      * @return Object A %foo_class% instance.
      */
     protected function getFooBarService()
     {
         $class = $this->getParameter('foo_class');
-        return $this->services['foo_bar'] = new $class();
+
+        return new $class();
+    }
+
+    /**
+     * Gets the 'foo_with_inline' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return Foo A Foo instance.
+     */
+    protected function getFooWithInlineService()
+    {
+        $this->services['foo_with_inline'] = $instance = new \Foo();
+
+        $instance->setBar($this->get('inlined'));
+
+        return $instance;
     }
 
     /**
@@ -141,6 +176,28 @@ class ProjectServiceContainer extends Container
     }
 
     /**
+     * Gets the 'inlined' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return Bar A Bar instance.
+     */
+    protected function getInlinedService()
+    {
+        $this->services['inlined'] = $instance = new \Bar();
+
+        $instance->setBaz($this->get('baz'));
+        $instance->pub = 'pub';
+
+        return $instance;
+    }
+
+    /**
      * Gets the default parameters.
      *
      * @return array An array of the default parameters

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/php/services9_compiled.php

@@ -0,0 +1,238 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
+use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\Parameter;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * ProjectServiceContainer
+ *
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ */
+class ProjectServiceContainer extends Container
+{
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        $this->parameters = $this->getDefaultParameters();
+
+        $this->services =
+        $this->scopedServices =
+        $this->scopeStacks = array();
+
+        $this->set('service_container', $this);
+
+        $this->scopes = array();
+        $this->scopeChildren = array();
+    }
+
+    /**
+     * Gets the 'bar' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return FooClass A FooClass instance.
+     */
+    protected function getBarService()
+    {
+        $this->services['bar'] = $instance = new \FooClass('foo', $this->get('foo.baz'), $this->getParameter('foo_bar'));
+
+        $this->get('foo.baz')->configure($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the 'baz' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return Baz A Baz instance.
+     */
+    protected function getBazService()
+    {
+        $this->services['baz'] = $instance = new \Baz();
+
+        $instance->setFoo($this->get('foo_with_inline'));
+
+        return $instance;
+    }
+
+    /**
+     * Gets the 'factory_service' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return Bar A Bar instance.
+     */
+    protected function getFactoryServiceService()
+    {
+        return $this->services['factory_service'] = $this->get('foo.baz')->getInstance();
+    }
+
+    /**
+     * Gets the 'foo' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return FooClass A FooClass instance.
+     */
+    protected function getFooService()
+    {
+        $a = $this->get('foo.baz');
+
+        $this->services['foo'] = $instance = call_user_func(array('FooClass', 'getInstance'), 'foo', $a, array('bar' => 'foo is bar', 'foobar' => 'bar'), true, $this);
+
+        $instance->setBar($this->get('bar'));
+        $instance->initialize();
+        $instance->foo = 'bar';
+        $instance->moo = $a;
+        sc_configure($instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the 'foo.baz' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return BazClass A BazClass instance.
+     */
+    protected function getFoo_BazService()
+    {
+        $this->services['foo.baz'] = $instance = call_user_func(array('BazClass', 'getInstance'));
+
+        call_user_func(array('BazClass', 'configureStatic1'), $instance);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the 'foo_bar' service.
+     *
+     * @return FooClass A FooClass instance.
+     */
+    protected function getFooBarService()
+    {
+        return new \FooClass();
+    }
+
+    /**
+     * Gets the 'foo_with_inline' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return Foo A Foo instance.
+     */
+    protected function getFooWithInlineService()
+    {
+        $a = new \Bar();
+
+        $this->services['foo_with_inline'] = $instance = new \Foo();
+
+        $a->setBaz($this->get('baz'));
+        $a->pub = 'pub';
+
+        $instance->setBar($a);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the 'method_call1' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * @return FooClass A FooClass instance.
+     */
+    protected function getMethodCall1Service()
+    {
+        require_once '%path%foo.php';
+
+        $this->services['method_call1'] = $instance = new \FooClass();
+
+        $instance->setBar($this->get('foo'));
+        $instance->setBar(NULL);
+
+        return $instance;
+    }
+
+    /**
+     * Gets the alias_for_foo service alias.
+     *
+     * @return FooClass An instance of the foo service
+     */
+    protected function getAliasForFooService()
+    {
+        return $this->get('foo');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getParameter($name)
+    {
+        $name = strtolower($name);
+
+        if (!array_key_exists($name, $this->parameters)) {
+            throw new \InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+        }
+
+        return $this->parameters[$name];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hasParameter($name)
+    {
+        return array_key_exists(strtolower($name), $this->parameters);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setParameter($name, $value)
+    {
+        throw new \LogicException('Impossible to call set() on a frozen ParameterBag.');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getParameterBag()
+    {
+        if (null === $this->parameterBag) {
+            $this->parameterBag = new FrozenParameterBag($this->parameters);
+        }
+
+        return $this->parameterBag;
+    }
+    /**
+     * Gets the default parameters.
+     *
+     * @return array An array of the default parameters
+     */
+    protected function getDefaultParameters()
+    {
+        return array(
+            'baz_class' => 'BazClass',
+            'foo_class' => 'FooClass',
+            'foo' => 'bar',
+        );
+    }
+}

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/xml/services9.xml

@@ -6,14 +6,14 @@
     <parameter key="foo">bar</parameter>
   </parameters>
   <services>
-    <service id="foo" class="FooClass" factory-method="getInstance" scope="prototype">
+    <service id="foo" class="FooClass" factory-method="getInstance">
       <tag name="foo" foo="foo"/>
       <tag name="foo" bar="bar"/>
       <argument>foo</argument>
       <argument type="service" id="foo.baz"/>
       <argument type="collection">
         <argument key="%foo%">foo is %foo%</argument>
-        <argument key="bar">%foo%</argument>
+        <argument key="foobar">%foo%</argument>
       </argument>
       <argument>true</argument>
       <argument type="service" id="service_container"/>
@@ -34,7 +34,7 @@
     <service id="foo.baz" class="%baz_class%" factory-method="getInstance">
       <configurator class="%baz_class%" method="configureStatic1"/>
     </service>
-    <service id="foo_bar" class="%foo_class%"/>
+    <service id="foo_bar" class="%foo_class%" scope="prototype"/>
     <service id="method_call1" class="FooClass">
       <file>%path%foo.php</file>
       <call method="setBar">
@@ -50,7 +50,23 @@
         <argument type="service" id="foobaz" on-invalid="ignore"/>
       </call>
     </service>
-    <service id="factory_service" factory-method="getInstance" factory-service="foo.baz"/>
+    <service id="factory_service" class="Bar" factory-method="getInstance" factory-service="foo.baz"/>
+    <service id="foo_with_inline" class="Foo">
+      <call method="setBar">
+        <argument type="service" id="inlined"/>
+      </call>
+    </service>
+    <service id="inlined" class="Bar" public="false">
+      <property name="pub">pub</property>
+      <call method="setBaz">
+        <argument type="service" id="baz"/>
+      </call>
+    </service>
+    <service id="baz" class="Baz">
+      <call method="setFoo">
+        <argument type="service" id="foo_with_inline"/>
+      </call>
+    </service>
     <service id="alias_for_foo" alias="foo"/>
   </services>
 </container>

vendor/symfony/tests/Symfony/Tests/Component/DependencyInjection/Fixtures/yaml/services9.yml

@@ -10,13 +10,12 @@ services:
       - { name: foo, foo: foo }
       - { name: foo, bar: bar }
     factory_method: getInstance
-    arguments: [foo, '@foo.baz', { '%foo%': 'foo is %foo%', bar: '%foo%' }, true, '@service_container']
+    arguments: [foo, '@foo.baz', { '%foo%': 'foo is %foo%', foobar: '%foo%' }, true, '@service_container']
     properties: { foo: bar, moo: '@foo.baz' }
     calls:
       - [setBar, ['@bar']]
       - [initialize, {  }]
       
-    scope: prototype
     configurator: sc_configure
   bar:
     class: FooClass
@@ -28,6 +27,7 @@ services:
     configurator: ['%baz_class%', configureStatic1]
   foo_bar:
     class: %foo_class%
+    scope: prototype
   method_call1:
     class: FooClass
     file: %path%foo.php
@@ -38,6 +38,23 @@ services:
       - [setBar, ['@?foobaz']]
       
   factory_service:
+    class: Bar
     factory_method: getInstance
     factory_service: foo.baz
+  foo_with_inline:
+    class: Foo
+    calls:
+      - [setBar, ['@inlined']]
+      
+  inlined:
+    class: Bar
+    properties: { pub: pub }
+    calls:
+      - [setBaz, ['@baz']]
+      
+  baz:
+    class: Baz
+    calls:
+      - [setFoo, ['@foo_with_inline']]
+      
   alias_for_foo: @foo

vendor/symfony/tests/Symfony/Tests/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformerTest.php

@@ -91,7 +91,9 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
     {
         $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::LONG);
 
-        $this->assertEquals('03.02.2010 04:05:06 GMT+00:00', $transformer->transform($this->dateTime));
+        $expected = $this->isLowerThanIcuVersion('4.8') ? '03.02.2010 04:05:06 GMT+00:00' : '03.02.2010 04:05:06 GMT';
+
+        $this->assertEquals($expected, $transformer->transform($this->dateTime));
     }
 
     public function testTransformFullTime()
@@ -102,7 +104,9 @@ class DateTimeToLocalizedStringTransformerTest extends DateTimeTestCase
 
         $transformer = new DateTimeToLocalizedStringTransformer('UTC', 'UTC', null, \IntlDateFormatter::FULL);
 
-        $this->assertEquals('03.02.2010 04:05:06 GMT+00:00', $transformer->transform($this->dateTime));
+        $expected = $this->isLowerThanIcuVersion('4.8') ? '03.02.2010 04:05:06 GMT+00:00' : '03.02.2010 04:05:06 GMT';
+
+        $this->assertEquals($expected, $transformer->transform($this->dateTime));
     }
 
     public function testTransformToDifferentLocale()

vendor/symfony/tests/Symfony/Tests/Component/HttpFoundation/RequestMatcherTest.php

@@ -199,4 +199,3 @@ class RequestMatcherTest extends \PHPUnit_Framework_TestCase
         $this->assertFalse($matcher->matches($request));
     }
 }
-

vendor/symfony/tests/Symfony/Tests/Component/HttpFoundation/RequestTest.php

@@ -412,9 +412,6 @@ class RequestTest extends \PHPUnit_Framework_TestCase
         $this->assertEquals('foo=1&foo=2', $request->getQueryString(), '->getQueryString() allows repeated parameters');
     }
 
-    /**
-     * @covers Symfony\Component\HttpFoundation\Request::getHost
-     */
     public function testGetHost()
     {
         $request = new Request();
@@ -435,6 +432,17 @@ class RequestTest extends \PHPUnit_Framework_TestCase
 
         $request->initialize(array(), array(), array(), array(), array(), array('SERVER_NAME' => 'www.exemple.com', 'HTTP_HOST' => 'www.host.com'));
         $this->assertEquals('www.host.com', $request->getHost(), '->getHost() value from Host header has priority over SERVER_NAME ');
+
+    }
+
+    /**
+     * @expectedException RuntimeException
+     */
+    public function testGetHostWithFakeHttpHostValue()
+    {
+        $request = new Request();
+        $request->initialize(array(), array(), array(), array(), array(), array('HTTP_HOST' => 'www.host.com?query=string'));
+        $request->getHost();
     }
 
     /**

vendor/symfony/tests/Symfony/Tests/Component/Locale/Stub/StubIntlDateFormatterTest.php

@@ -43,14 +43,26 @@ class StubIntlDateFormatterTest extends LocaleTestCase
     public function testConstructorDefaultTimeZoneStub()
     {
         $formatter = new StubIntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT);
-        $this->assertNull($formatter->getTimeZoneId());
+
+        // In PHP 5.5 default timezone depends on `date_default_timezone_get()` method
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $this->assertEquals(date_default_timezone_get(), $formatter->getTimeZoneId());
+        } else {
+            $this->assertNull($formatter->getTimeZoneId());
+        }
     }
 
     public function testConstructorDefaultTimeZoneIntl()
     {
         $this->skipIfIntlExtensionIsNotLoaded();
         $formatter = new \IntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT);
-        $this->assertNull($formatter->getTimeZoneId());
+
+        // In PHP 5.5 default timezone depends on `date_default_timezone_get()` method
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $this->assertEquals(date_default_timezone_get(), $formatter->getTimeZoneId());
+        } else {
+            $this->assertNull($formatter->getTimeZoneId());
+        }
     }
 
     public function testFormatWithUnsupportedTimestampArgument()
@@ -123,10 +135,8 @@ class StubIntlDateFormatterTest extends LocaleTestCase
         $formatData = array(
             /* general */
             array('y-M-d', 0, '1970-1-1'),
-            array("yyyy.MM.dd 'at' HH:mm:ss zzz", 0, '1970.01.01 at 00:00:00 GMT+00:00'),
             array("EEE, MMM d, ''yy", 0, "Thu, Jan 1, '70"),
             array('h:mm a', 0, '12:00 AM'),
-            array('K:mm a, z', 0, '0:00 AM, GMT+00:00'),
             array('yyyyy.MMMM.dd hh:mm aaa', 0, '01970.January.01 12:00 AM'),
 
             /* escaping */
@@ -287,26 +297,36 @@ class StubIntlDateFormatterTest extends LocaleTestCase
             array('s', 3601, '1'),
             array('s', 3630, '30'),
             array('s', 43200, '0'), // 12 hours
-
-            /* timezone */
-            array('z', 0, 'GMT+00:00'),
-            array('zz', 0, 'GMT+00:00'),
-            array('zzz', 0, 'GMT+00:00'),
-            array('zzzz', 0, 'GMT+00:00'),
-            array('zzzzz', 0, 'GMT+00:00'),
         );
 
+        // Timezone
+        if (!$this->isIntlExtensionLoaded() || $this->isLowerThanIcuVersion('4.8')) {
+            // general
+            $formatData[] = array("yyyy.MM.dd 'at' HH:mm:ss zzz", 0, '1970.01.01 at 00:00:00 GMT+00:00');
+            $formatData[] = array('K:mm a, z', 0, '0:00 AM, GMT+00:00');
+
+            // timezone
+            $formatData[] = array('z', 0, 'GMT+00:00');
+            $formatData[] = array('zz', 0, 'GMT+00:00');
+            $formatData[] = array('zzz', 0, 'GMT+00:00');
+            $formatData[] = array('zzzz', 0, 'GMT+00:00');
+            $formatData[] = array('zzzzz', 0, 'GMT+00:00');
+        }
+
         // As of PHP 5.3.4, IntlDateFormatter::format() accepts DateTime instances
         if ($this->isGreaterOrEqualThanPhpVersion('5.3.4')) {
             $dateTime = new \DateTime('@0');
 
             /* general, DateTime */
             $formatData[] = array('y-M-d', $dateTime, '1970-1-1');
-            $formatData[] = array("yyyy.MM.dd 'at' HH:mm:ss zzz", $dateTime, '1970.01.01 at 00:00:00 GMT+00:00');
             $formatData[] = array("EEE, MMM d, ''yy", $dateTime, "Thu, Jan 1, '70");
             $formatData[] = array('h:mm a', $dateTime, '12:00 AM');
-            $formatData[] = array('K:mm a, z', $dateTime, '0:00 AM, GMT+00:00');
             $formatData[] = array('yyyyy.MMMM.dd hh:mm aaa', $dateTime, '01970.January.01 12:00 AM');
+
+            if (!$this->isIntlExtensionLoaded() || $this->isLowerThanIcuVersion('4.8')) {
+                $formatData[] = array("yyyy.MM.dd 'at' HH:mm:ss zzz", $dateTime, '1970.01.01 at 00:00:00 GMT+00:00');
+                $formatData[] = array('K:mm a, z', $dateTime, '0:00 AM, GMT+00:00');
+            }
         }
 
         return $formatData;
@@ -348,6 +368,13 @@ class StubIntlDateFormatterTest extends LocaleTestCase
 
     public function formatErrorProvider()
     {
+        // With PHP 5.5 IntlDateFormatter accepts empty values ('0')
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            return array(
+                array('y-M-d', 'foobar', 'datefmt_format: string \'foobar\' is not numeric, which would be required for it to be a valid date: U_ILLEGAL_ARGUMENT_ERROR')
+            );
+        }
+
         $message = 'datefmt_format: takes either an array  or an integer timestamp value : U_ILLEGAL_ARGUMENT_ERROR';
 
         if ($this->isGreaterOrEqualThanPhpVersion('5.3.4')) {
@@ -383,7 +410,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
 
     public function formatWithTimezoneProvider()
     {
-        return array(
+        $data = array(
             array(0, 'UTC', '1970-01-01 00:00:00'),
             array(0, 'GMT', '1970-01-01 00:00:00'),
             array(0, 'GMT-03:00', '1969-12-31 21:00:00'),
@@ -407,12 +434,17 @@ class StubIntlDateFormatterTest extends LocaleTestCase
             array(0, 'Europe/Dublin', '1970-01-01 01:00:00'),
             array(0, 'Europe/Warsaw', '1970-01-01 01:00:00'),
             array(0, 'Pacific/Fiji', '1970-01-01 12:00:00'),
+        );
 
+        // As of PHP 5.5, intl ext no longer fallbacks invalid time zones to UTC
+        if (!$this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
             // When time zone not exists, uses UTC by default
-            array(0, 'Foo/Bar', '1970-01-01 00:00:00'),
-            array(0, 'UTC+04:30', '1970-01-01 00:00:00'),
-            array(0, 'UTC+04:AA', '1970-01-01 00:00:00'),
-        );
+            $data[] = array(0, 'Foo/Bar', '1970-01-01 00:00:00');
+            $data[] = array(0, 'UTC+04:30', '1970-01-01 00:00:00');
+            $data[] = array(0, 'UTC+04:AA', '1970-01-01 00:00:00');
+        }
+
+        return $data;
     }
 
     /**
@@ -421,7 +453,13 @@ class StubIntlDateFormatterTest extends LocaleTestCase
     public function testFormatWithTimezoneFormatOptionAndDifferentThanUtcStub()
     {
         $formatter = $this->createStubFormatter('zzzz');
-        $formatter->setTimeZoneId('Pacific/Fiji');
+
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $formatter->setTimeZone('Pacific/Fiji');
+        } else {
+            $formatter->setTimeZoneId('Pacific/Fiji');
+        }
+
         $formatter->format(0);
     }
 
@@ -429,14 +467,27 @@ class StubIntlDateFormatterTest extends LocaleTestCase
     {
         $this->skipIfIntlExtensionIsNotLoaded();
         $formatter = $this->createIntlFormatter('zzzz');
-        $formatter->setTimeZoneId('Pacific/Fiji');
-        $this->assertEquals('Fiji Time', $formatter->format(0));
+
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $formatter->setTimeZone('Pacific/Fiji');
+        } else {
+            $formatter->setTimeZoneId('Pacific/Fiji');
+        }
+
+        $expected = $this->isGreaterOrEqualThanIcuVersion('49') ? 'Fiji Standard Time' : 'Fiji Time';
+        $this->assertEquals($expected, $formatter->format(0));
     }
 
     public function testFormatWithGmtTimezoneStub()
     {
         $formatter = $this->createStubFormatter('zzzz');
-        $formatter->setTimeZoneId('GMT+03:00');
+
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $formatter->setTimeZone('GMT+03:00');
+        } else {
+            $formatter->setTimeZoneId('GMT+03:00');
+        }
+
         $this->assertEquals('GMT+03:00', $formatter->format(0));
     }
 
@@ -444,7 +495,13 @@ class StubIntlDateFormatterTest extends LocaleTestCase
     {
         $this->skipIfIntlExtensionIsNotLoaded();
         $formatter = $this->createIntlFormatter('zzzz');
-        $formatter->setTimeZoneId('GMT+03:00');
+
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $formatter->setTimeZone('GMT+03:00');
+        } else {
+            $formatter->setTimeZoneId('GMT+03:00');
+        }
+
         $this->assertEquals('GMT+03:00', $formatter->format(0));
     }
 
@@ -464,7 +521,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
         $this->skipIfIntlExtensionIsNotLoaded();
         $this->skipIfICUVersionIsTooOld();
 
-        $formatter = new \IntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT);
+        $formatter = new \IntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT, 'UTC');
         $formatter->setPattern('yyyy-MM-dd HH:mm:ss');
 
         $this->assertEquals(
@@ -475,6 +532,10 @@ class StubIntlDateFormatterTest extends LocaleTestCase
 
     public function testFormatWithDefaultTimezoneStubShouldUseTheTzEnvironmentVariableWhenAvailable()
     {
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $this->markTestSkipped('StubIntlDateFormatter in PHP 5.5 no longer depends on TZ environment.');
+        }
+
         $tz = getenv('TZ');
         putenv('TZ=Europe/London');
 
@@ -492,8 +553,31 @@ class StubIntlDateFormatterTest extends LocaleTestCase
         putenv('TZ='.$tz);
     }
 
+    public function testFormatWithDefaultTimezoneStubShouldUseDefaultDateTimeZoneVariable()
+    {
+        if (!$this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $this->markTestSkipped('Only in PHP 5.5 StubIntlDateFormatter depends on default timezone (`date_default_timezone_get()`).');
+        }
+
+        $tz = date_default_timezone_get();
+        date_default_timezone_set('Europe/London');
+
+        $formatter = new \IntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT);
+        $formatter->setPattern('yyyy-MM-dd HH:mm:ss');
+
+        $this->assertEquals(
+            $this->createDateTime(0)->format('Y-m-d H:i:s'),
+            $formatter->format(0)
+        );
+
+        $this->assertEquals('Europe/London', date_default_timezone_get());
+
+        // Restores TZ.
+        date_default_timezone_set($tz);
+    }
+
     /**
-     * It seems IntlDateFormatter caches the timezone id when not explicitely set via constructor or by the
+     * It seems IntlDateFormatter caches the timezone id when not explicitly set via constructor or by the
      * setTimeZoneId() method. Since testFormatWithDefaultTimezoneIntl() runs using the default environment
      * time zone, this test would use it too if not running in a separated process.
      *
@@ -501,6 +585,10 @@ class StubIntlDateFormatterTest extends LocaleTestCase
      */
     public function testFormatWithDefaultTimezoneIntlShouldUseTheTzEnvironmentVariableWhenAvailable()
     {
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $this->markTestSkipped('IntlDateFormatter in PHP 5.5 no longer depends on TZ environment.');
+        }
+
         $this->skipIfIntlExtensionIsNotLoaded();
         $this->skipIfICUVersionIsTooOld();
 
@@ -522,6 +610,35 @@ class StubIntlDateFormatterTest extends LocaleTestCase
     }
 
     /**
+     * @runInSeparateProcess
+     */
+    public function testFormatWithDefaultTimezoneIntlShouldUseDefaultDateTimeZoneVariable()
+    {
+        if (!$this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $this->markTestSkipped('Only in PHP 5.5 IntlDateFormatter depends on default timezone (`date_default_timezone_get()`).');
+        }
+
+        $this->skipIfIntlExtensionIsNotLoaded();
+        $this->skipIfICUVersionIsTooOld();
+
+        $tz = date_default_timezone_get();
+        date_default_timezone_set('Europe/Paris');
+
+        $formatter = new \IntlDateFormatter('en', StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::SHORT);
+        $formatter->setPattern('yyyy-MM-dd HH:mm:ss');
+
+        $this->assertEquals('Europe/Paris', date_default_timezone_get());
+
+        $this->assertEquals(
+            $this->createDateTime(0)->format('Y-m-d H:i:s'),
+            $formatter->format(0)
+        );
+
+        // Restores TZ.
+        date_default_timezone_set($tz);
+    }
+
+    /**
      * @expectedException Symfony\Component\Locale\Exception\NotImplementedException
      */
     public function testFormatWithUnimplementedCharsStub()
@@ -561,17 +678,21 @@ class StubIntlDateFormatterTest extends LocaleTestCase
 
     public function dateAndTimeTypeProvider()
     {
-        return array(
+        $data = array(
             array(0, StubIntlDateFormatter::FULL, StubIntlDateFormatter::NONE, 'Thursday, January 1, 1970'),
             array(0, StubIntlDateFormatter::LONG, StubIntlDateFormatter::NONE, 'January 1, 1970'),
             array(0, StubIntlDateFormatter::MEDIUM, StubIntlDateFormatter::NONE, 'Jan 1, 1970'),
             array(0, StubIntlDateFormatter::SHORT, StubIntlDateFormatter::NONE, '1/1/70'),
-
-            array(0, StubIntlDateFormatter::NONE, StubIntlDateFormatter::FULL, '12:00:00 AM GMT+00:00'),
-            array(0, StubIntlDateFormatter::NONE, StubIntlDateFormatter::LONG, '12:00:00 AM GMT+00:00'),
             array(0, StubIntlDateFormatter::NONE, StubIntlDateFormatter::MEDIUM, '12:00:00 AM'),
             array(0, StubIntlDateFormatter::NONE, StubIntlDateFormatter::SHORT, '12:00 AM'),
         );
+
+        if (!$this->isIntlExtensionLoaded() || $this->isLowerThanIcuVersion('4.8')) {
+            $data[] = array(0, StubIntlDateFormatter::NONE, StubIntlDateFormatter::FULL, '12:00:00 AM GMT+00:00');
+            $data[] = array(0, StubIntlDateFormatter::NONE, StubIntlDateFormatter::LONG, '12:00:00 AM GMT+00:00');
+        }
+
+        return $data;
     }
 
     public function testGetCalendar()
@@ -847,10 +968,7 @@ class StubIntlDateFormatterTest extends LocaleTestCase
 
     public function parseErrorProvider()
     {
-        return array(
-            array('y-M-d', '1970/1/1'),
-            array('yy-M-d', '70/1/1'),
-
+        $data = array(
             // 1 char month
             array('y-MMMMM-d', '1970-J-1'),
             array('y-MMMMM-d', '1970-S-1'),
@@ -859,6 +977,13 @@ class StubIntlDateFormatterTest extends LocaleTestCase
             array('y-LLLLL-d', '1970-J-1'),
             array('y-LLLLL-d', '1970-S-1'),
         );
+
+        if (!$this->isIntlExtensionLoaded() || $this->isLowerThanIcuVersion('4.8')) {
+            $data[] = array('y-M-d', '1970/1/1');
+            $data[] = array('yy-M-d', '70/1/1');
+        }
+
+        return $data;
     }
 
     /**
@@ -976,38 +1101,59 @@ class StubIntlDateFormatterTest extends LocaleTestCase
      * @covers Symfony\Component\Locale\Stub\StubIntlDateFormatter::getTimeZoneId
      * @dataProvider setTimeZoneIdProvider()
      */
-    public function testSetTimeZoneIdStub($timeZoneId)
+    public function testSetTimeZoneIdStub($timeZoneId, $expectedTimeZoneId)
     {
         $formatter = $this->createStubFormatter();
-        $formatter->setTimeZoneId($timeZoneId);
+
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $formatter->setTimeZone($timeZoneId);
+        } else {
+            $formatter->setTimeZoneId($timeZoneId);
+        }
+
         $this->assertEquals($timeZoneId, $formatter->getTimeZoneId());
     }
 
     /**
      * @dataProvider setTimeZoneIdProvider()
      */
-    public function testSetTimeZoneIdIntl($timeZoneId)
+    public function testSetTimeZoneIdIntl($timeZoneId, $expectedTimeZoneId)
     {
         $this->skipIfIntlExtensionIsNotLoaded();
         $formatter = $this->createIntlFormatter();
-        $formatter->setTimeZoneId($timeZoneId);
-        $this->assertEquals($timeZoneId, $formatter->getTimeZoneId());
+
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $formatter->setTimeZone($timeZoneId);
+        } else {
+            $formatter->setTimeZoneId($timeZoneId);
+        }
+
+        $this->assertEquals($expectedTimeZoneId, $formatter->getTimeZoneId());
     }
 
     public function setTimeZoneIdProvider()
     {
-        return array(
-            array('UTC'),
-            array('GMT'),
-            array('GMT-03:00'),
-            array('GMT-0300'),
-            array('Europe/Zurich'),
-
-            // When time zone not exists, uses UTC by default
-            array('Foo/Bar'),
-            array('GMT+00:AA'),
-            array('GMT+00AA'),
+        $data = array(
+            array('UTC', 'UTC'),
+            array('GMT', 'GMT'),
+            array('GMT-03:00', 'GMT-03:00'),
+            array('Europe/Zurich', 'Europe/Zurich'),
         );
+
+        // When time zone not exists, uses UTC by default
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $data[] = array('GMT-0300', 'UTC');
+            $data[] = array('Foo/Bar', 'UTC');
+            $data[] = array('GMT+00:AA', 'UTC');
+            $data[] = array('GMT+00AA', 'UTC');
+        } else {
+            $data[] = array('GMT-0300', 'GMT-0300');
+            $data[] = array('Foo/Bar', 'Foo/Bar');
+            $data[] = array('GMT+00:AA', 'GMT+00:AA');
+            $data[] = array('GMT+00AA', 'GMT+00AA');
+        }
+
+        return $data;
     }
 
     /**
@@ -1016,14 +1162,25 @@ class StubIntlDateFormatterTest extends LocaleTestCase
     public function testSetTimeZoneIdWithGmtTimeZoneWithMinutesOffsetStub()
     {
         $formatter = $this->createStubFormatter();
-        $formatter->setTimeZoneId('GMT+00:30');
+
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $formatter->setTimeZone('GMT+00:30');
+        } else {
+            $formatter->setTimeZoneId('GMT+00:30');
+        }
     }
 
     public function testSetTimeZoneIdWithGmtTimeZoneWithMinutesOffsetIntl()
     {
         $this->skipIfIntlExtensionIsNotLoaded();
         $formatter = $this->createIntlFormatter();
-        $formatter->setTimeZoneId('GMT+00:30');
+
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $formatter->setTimeZone('GMT+00:30');
+        } else {
+            $formatter->setTimeZoneId('GMT+00:30');
+        }
+
         $this->assertEquals('GMT+00:30', $formatter->getTimeZoneId());
     }
 
@@ -1045,7 +1202,11 @@ class StubIntlDateFormatterTest extends LocaleTestCase
 
     protected function createDateTime($timestamp = null)
     {
-        $timeZone = getenv('TZ') ?: 'UTC';
+        if ($this->isGreaterOrEqualThanPhpVersion('5.5.0-dev')) {
+            $timeZone = date_default_timezone_get();
+        } else {
+            $timeZone = getenv('TZ') ?: 'UTC';
+        }
 
         $dateTime = new \DateTime();
         $dateTime->setTimestamp(null === $timestamp ? time() : $timestamp);

vendor/symfony/tests/Symfony/Tests/Component/Locale/Stub/StubNumberFormatterTest.php

@@ -142,19 +142,11 @@ class StubNumberFormatterTest extends LocaleTestCase
 
     public function formatCurrencyWithCurrencyStyleProvider()
     {
-        return array(
+        $data = array(
             array(100, 'ALL', 'ALL100'),
             array(-100, 'ALL', '(ALL100)'),
             array(1000.12, 'ALL', 'ALL1,000'),
 
-            array(100, 'BRL', 'R$100.00'),
-            array(-100, 'BRL', '(R$100.00)'),
-            array(1000.12, 'BRL', 'R$1,000.12'),
-
-            array(100, 'CRC', '₡100'),
-            array(-100, 'CRC', '(₡100)'),
-            array(1000.12, 'CRC', '₡1,000'),
-
             array(100, 'JPY', '¥100'),
             array(-100, 'JPY', '(¥100)'),
             array(1000.12, 'JPY', '¥1,000'),
@@ -162,16 +154,29 @@ class StubNumberFormatterTest extends LocaleTestCase
             array(100, 'EUR', '€100.00'),
             array(-100, 'EUR', '(€100.00)'),
             array(1000.12, 'EUR', '€1,000.12'),
+        );
 
+        if (!$this->isIntlExtensionLoaded() || !$this->isSameAsIcuVersion('4.8')) {
             // Rounding checks
-            array(1000.121, 'BRL', 'R$1,000.12'),
-            array(1000.123, 'BRL', 'R$1,000.12'),
-            array(1000.125, 'BRL', 'R$1,000.12'),
-            array(1000.127, 'BRL', 'R$1,000.13'),
-            array(1000.129, 'BRL', 'R$1,000.13'),
-            array(11.50999, 'BRL', 'R$11.51'),
-            array(11.9999464, 'BRL', 'R$12.00')
-        );
+            $data[] = array(100, 'BRL', 'R$100.00');
+            $data[] = array(-100, 'BRL', '(R$100.00)');
+            $data[] = array(1000.12, 'BRL', 'R$1,000.12');
+            $data[] = array(1000.121, 'BRL', 'R$1,000.12');
+            $data[] = array(1000.123, 'BRL', 'R$1,000.12');
+            $data[] = array(1000.125, 'BRL', 'R$1,000.12');
+            $data[] = array(1000.127, 'BRL', 'R$1,000.13');
+            $data[] = array(1000.129, 'BRL', 'R$1,000.13');
+            $data[] = array(11.50999, 'BRL', 'R$11.51');
+            $data[] = array(11.9999464, 'BRL', 'R$12.00');
+        }
+
+        if (!$this->isIntlExtensionLoaded() || $this->isLowerThanIcuVersion('4.8')) {
+            $data[] = array(100, 'CRC', '₡100');
+            $data[] = array(-100, 'CRC', '(₡100)');
+            $data[] = array(1000.12, 'CRC', '₡1,000');
+        }
+
+        return $data;
     }
 
     /**
@@ -180,7 +185,7 @@ class StubNumberFormatterTest extends LocaleTestCase
     public function testFormatCurrencyWithCurrencyStyleSwissRoundingStub($value, $currency, $symbol, $expected)
     {
         $formatter = $this->getStubFormatterWithCurrencyStyle();
-        $this->assertEquals(sprintf($expected, 'CHF'), $formatter->formatCurrency($value, $currency));
+        $this->assertEquals(sprintf($expected, $symbol), $formatter->formatCurrency($value, $currency));
     }
 
     /**

vendor/symfony/tests/Symfony/Tests/Component/Locale/TestCase.php

@@ -71,6 +71,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase
         return $icuVersion >= $version;
     }
 
+    protected function isSameAsIcuVersion($version)
+    {
+        $version = $this->normalizeIcuVersion($version);
+        $icuVersion = $this->normalizeIcuVersion($this->getIntlExtensionIcuVersion());
+
+        return $icuVersion === $version;
+    }
+
     protected function isLowerThanIcuVersion($version)
     {
         $version = $this->normalizeIcuVersion($version);

vendor/symfony/tests/Symfony/Tests/Component/Yaml/DumperTest.php

@@ -152,11 +152,26 @@ EOF;
         $this->assertEquals($expected, $this->dumper->dump($array, 10), '->dump() takes an inline level argument');
     }
 
-    public function testObjectsSupport()
+    public function testObjectSupportEnabled()
     {
-        $a = array('foo' => new A(), 'bar' => 1);
+        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, true);
 
-        $this->assertEquals('{ foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $this->dumper->dump($a), '->dump() is able to dump objects');
+        $this->assertEquals('{ foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $dump, '->dump() is able to dump objects');
+    }
+
+    public function testObjectSupportDisabledButNoExceptions()
+    {
+        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1));
+
+        $this->assertEquals('{ foo: null, bar: 1 }', $dump, '->dump() does not dump objects when disabled');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\DumpException
+     */
+    public function testObjectSupportDisabledWithExceptions()
+    {
+        $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, true, false);
     }
 }
 

vendor/symfony/tests/Symfony/Tests/Component/Yaml/ParserTest.php

@@ -13,7 +13,6 @@ namespace Symfony\Tests\Component\Yaml;
 
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Yaml\Parser;
-use Symfony\Component\Yaml\Exception\ParseException;
 
 class ParserTest extends \PHPUnit_Framework_TestCase
 {
@@ -106,14 +105,31 @@ EOF;
         $this->assertEquals('foo', $this->parser->parse($yaml));
     }
 
-    public function testObjectsSupport()
+    public function testObjectSupportEnabled()
     {
-        $b = array('foo' => new B(), 'bar' => 1);
-        $this->assertEquals($this->parser->parse(<<<EOF
+        $input = <<<EOF
 foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}
 bar: 1
-EOF
-        ), $b, '->parse() is able to dump objects');
+EOF;
+        $this->assertEquals(array('foo' => new B(), 'bar' => 1), $this->parser->parse($input, false, true), '->parse() is able to parse objects');
+    }
+
+    public function testObjectSupportDisabledButNoExceptions()
+    {
+        $input = <<<EOF
+foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}
+bar: 1
+EOF;
+
+        $this->assertEquals(array('foo' => null, 'bar' => 1), $this->parser->parse($input), '->parse() does not parse objects');
+    }
+
+    /**
+     * @expectedException \Symfony\Component\Yaml\Exception\ParseException
+     */
+    public function testObjectsSupportDisabledWithExceptions()
+    {
+        $this->parser->parse('foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\B":1:{s:1:"b";s:3:"foo";}', true, false);
     }
 
     public function testNonUtf8Exception()

web/css/3a5c85c_base_2.css

@@ -1,89 +0,0 @@
-/* --- STYLES DE BASE --- */
-
-/* Page */
-html {
-  font-size: 100%; /* Évite un bug d'IE 6-7. (1) */
-}
-body {
-  margin: 0;
-  padding: 0; /* Remettre à zéro si nécessaire. */
-  /* Pensez à utiliser une collection de polices (2), par ex:
-  font-family: Arial, Helvetica, FreeSans, sans-serif; */
-  /*font-size: .8em;*/ /* À adapter pour la police choisie. (3) */
-  color: black;
-  /*background-color: #9AE4E8;*/
-  font: 13.34px helvetica,arial,freesans,clean,sans-serif;
-  line-height: 1.4;
-}
-
-/* Titres */
-h1, h2, h3, h4, h5, h6 {
-  margin: 1em 0 .5em 0; /* Rapproche le titre du texte. (5) */
-  line-height: 1.2;
-  font-weight: bold; /* Valeur par défaut. (6) */
-  font-style: normal;
-}
-h1 {
-  font-size: 1.75em;
-}
-h2 {
-  font-size: 1.5em;
-}
-h3 {
-  font-size: 1.25em;
-}
-h4 {
-  font-size: 1em;
-}
-
-/* Listes */
-ul, ol {
-  margin: .75em 0 .75em 32px;
-  padding: 0;
-}
-
-/* Paragraphes */
-p {
-  margin: .75em 0; /* Marges plus faibles que par défaut. (7) */
-}
-address {
-  margin: .75em 0;
-  font-style: normal;
-}
-
-/* Liens */
-a {
-  text-decoration: underline;
-}
-a:link {
-  /*color: #11C;*/
-}
-a:visited {
-  color: #339;
-}
-/*a:hover, a:focus, a:active {
-  color: #00F;
-}*/
-
-/* Pas de bordure autour des images dans les liens */
-a img {
-  border: none;
-}
-
-/* Divers éléments de type en-ligne (8) */
-em {
-  font-style: italic;
-}
-strong {
-  font-weight: bold;
-}
-
-/* Formulaires */
-form, fieldset {
-  margin: 0;
-  padding: 0;
-  border: none;
-}
-input, button, select {
-  vertical-align: middle; /* Solution pb. d'alignement. (9) */
-}

web/css/3a5c85c_main_5.css

@@ -1674,4 +1674,11 @@ div#presubscription input[type="submit"]
 ul.element_thumb_actions li.score
 {
   color: black;
+}
+
+div#myaccount_preferences input[type="submit"]
+{
+  float: right;
+  margin-right: 7px;
+  margin-top: 5px;
 }

web/js/f792d24.js

@@ -3379,16 +3379,18 @@ function Autoplay()
   var _playlist = new Array();
   var _player = null;
   var _current_index = 0;
+  var _link = null;
   
-  this.start = function()
+  this.start = function(link)
   {
+    _link = link;
     open_popin_dialog('autoplay');
     initializePlaylist(this.play);
   }
   
   var initializePlaylist = function(callback)
   {
-    JQueryJson($('a#autoplay_launch').attr('href'), {}, function(response){
+    JQueryJson(_link.attr('href'), {}, function(response){
       if (response.status == 'success')
       {
         if (response.data.length)
@@ -3506,8 +3508,9 @@ $(document).ready(function() {
   
   window.autoplay = new Autoplay();
   
-  $('a#autoplay_launch').click(function(){
-    window.autoplay.start();
+  $('a.autoplay_link').live('click', function(){
+    window.autoplay.start($(this));
+    $('html, body').animate({ scrollTop: 0 }, 'fast');
     return false;
   });
   
@@ -3901,7 +3904,11 @@ $(document).ready(function(){
       window.search_tag_prompt_connector.initializeTags([tag]);
       
       form.submit();
+      
     }
+    
+    $('html, body').animate({ scrollTop: 0 }, 'fast');
+    return false;
   });
   
   function element_last_opened(li)
@@ -3913,7 +3920,7 @@ $(document).ready(function(){
   // Affichage un/des embed
   // 1328283150_media-playback-start.png
   // 1328283201_emblem-symbolic-link.png
-  $('a.element_embed_open_link').live("click", function(){
+  $('a.element_embed_open_link, a.element_name_embed_open_link').live("click", function(){
     
      var li = $(this).parents('li.element');
      
@@ -3936,17 +3943,17 @@ $(document).ready(function(){
      return false;
   });
   
-  $('a.element_name_embed_open_link').live("click", function(){
-    
-     var li = $(this).parents('li.element');
-     
-     element_last_opened(li);
-     li.find('a.element_embed_close_link').show();
-     li.find('a.element_embed_open_link_text').hide();
-     li.find('div.element_embed').show();
-     
-     return false;
-  });
+  //$('a.element_name_embed_open_link').live("click", function(){
+  //  
+  //   var li = $(this).parents('li.element');
+  //   
+  //   element_last_opened(li);
+  //   li.find('a.element_embed_close_link').show();
+  //   li.find('a.element_embed_open_link_text').hide();
+  //   li.find('div.element_embed').show();
+  //   
+  //   return false;
+  //});
 
   // Fermeture du embed si demandé
   $('a.element_embed_close_link').live("click", function(){
@@ -5130,7 +5137,14 @@ $(document).ready(function(){
     a_more.attr('href', $('input#more_elements_url').val()+'/'+array2json(tags_ids_for_filter));
     
     // On adapte aussi le lien de l'autoplay
-    $('a#autoplay_launch').attr('href', $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter));
+    //$('a.autoplay_link').attr('href', $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter));
+    //$('a.autoplay_link').each(function(){
+    //  console.debug($(this));
+    //  console.log(
+    //    str_replace('__ELEMENT_ID__', $(this).data('element_id'), $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter))
+    //  );
+    //  $(this).attr('href', str_replace('__ELEMENT_ID__', $(this).data('element_id'), $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter)));
+    //});
     
     return check_timelaps_and_find_with_tags(link, new Date().getTime(), false);
   }

web/js/f792d24_autoplay_14.js

@@ -4,16 +4,18 @@ function Autoplay()
   var _playlist = new Array();
   var _player = null;
   var _current_index = 0;
+  var _link = null;
   
-  this.start = function()
+  this.start = function(link)
   {
+    _link = link;
     open_popin_dialog('autoplay');
     initializePlaylist(this.play);
   }
   
   var initializePlaylist = function(callback)
   {
-    JQueryJson($('a#autoplay_launch').attr('href'), {}, function(response){
+    JQueryJson(_link.attr('href'), {}, function(response){
       if (response.status == 'success')
       {
         if (response.data.length)
@@ -131,8 +133,9 @@ $(document).ready(function() {
   
   window.autoplay = new Autoplay();
   
-  $('a#autoplay_launch').click(function(){
-    window.autoplay.start();
+  $('a.autoplay_link').live('click', function(){
+    window.autoplay.start($(this));
+    $('html, body').animate({ scrollTop: 0 }, 'fast');
     return false;
   });
   

web/js/f792d24_muzich_15.js

@@ -375,7 +375,11 @@ $(document).ready(function(){
       window.search_tag_prompt_connector.initializeTags([tag]);
       
       form.submit();
+      
     }
+    
+    $('html, body').animate({ scrollTop: 0 }, 'fast');
+    return false;
   });
   
   function element_last_opened(li)
@@ -387,7 +391,7 @@ $(document).ready(function(){
   // Affichage un/des embed
   // 1328283150_media-playback-start.png
   // 1328283201_emblem-symbolic-link.png
-  $('a.element_embed_open_link').live("click", function(){
+  $('a.element_embed_open_link, a.element_name_embed_open_link').live("click", function(){
     
      var li = $(this).parents('li.element');
      
@@ -410,17 +414,17 @@ $(document).ready(function(){
      return false;
   });
   
-  $('a.element_name_embed_open_link').live("click", function(){
-    
-     var li = $(this).parents('li.element');
-     
-     element_last_opened(li);
-     li.find('a.element_embed_close_link').show();
-     li.find('a.element_embed_open_link_text').hide();
-     li.find('div.element_embed').show();
-     
-     return false;
-  });
+  //$('a.element_name_embed_open_link').live("click", function(){
+  //  
+  //   var li = $(this).parents('li.element');
+  //   
+  //   element_last_opened(li);
+  //   li.find('a.element_embed_close_link').show();
+  //   li.find('a.element_embed_open_link_text').hide();
+  //   li.find('div.element_embed').show();
+  //   
+  //   return false;
+  //});
 
   // Fermeture du embed si demandé
   $('a.element_embed_close_link').live("click", function(){
@@ -1604,7 +1608,14 @@ $(document).ready(function(){
     a_more.attr('href', $('input#more_elements_url').val()+'/'+array2json(tags_ids_for_filter));
     
     // On adapte aussi le lien de l'autoplay
-    $('a#autoplay_launch').attr('href', $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter));
+    //$('a.autoplay_link').attr('href', $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter));
+    //$('a.autoplay_link').each(function(){
+    //  console.debug($(this));
+    //  console.log(
+    //    str_replace('__ELEMENT_ID__', $(this).data('element_id'), $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter))
+    //  );
+    //  $(this).attr('href', str_replace('__ELEMENT_ID__', $(this).data('element_id'), $('input#autoplay_url').val()+'/'+array2json(tags_ids_for_filter)));
+    //});
     
     return check_timelaps_and_find_with_tags(link, new Date().getTime(), false);
   }