Merge branch '2.7' into 2.8

* 2.7:
  allow to configure custom formats in XML configs
  require the XML PHP extension
  Fixed absolute url generation for query strings and hash urls
  bumped Symfony version to 2.7.32
  [Filesystem] Dont copy perms when origin is remote
  updated VERSION for 2.7.31
  update CONTRIBUTORS for 2.7.31
  updated CHANGELOG for 2.7.31

Author: nicolas-grekas

CHANGELOG-2.7.md

@@ -7,6 +7,10 @@ in 2.7 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.7.0...v2.7.1
 
+* 2.7.31 (2017-07-05)
+
+ * bug #23378 [FrameworkBundle] Do not remove files from assets dir (1ed)
+
 * 2.7.30 (2017-07-03)
 
  * bug #23341 [DoctrineBridge][Security][Validator] do not validate empty values (xabbuh)

CONTRIBUTORS.md

@@ -70,9 +70,9 @@ Symfony is the result of the work of many people who made the code better
  - Deni
  - Henrik Westphal (snc)
  - Dariusz Górecki (canni)
+ - Jáchym Toušek (enumag)
  - Titouan Galopin (tgalopin)
  - Douglas Greenshields (shieldo)
- - Jáchym Toušek (enumag)
  - Konstantin Myakshin (koc)
  - Lee McDermott
  - Brandon Turner
@@ -99,19 +99,19 @@ Symfony is the result of the work of many people who made the code better
  - Baptiste Clavié (talus)
  - Vladimir Reznichenko (kalessil)
  - marc.weistroff
+ - Yonel Ceruto González (yonelceruto)
  - lenar
  - Włodzimierz Gajda (gajdaw)
- - Yonel Ceruto González (yonelceruto)
  - Alexander Schwenn (xelaris)
  - Jacob Dreesen (jdreesen)
+ - Tobias Nyholm (tobias)
  - Florian Voutzinos (florianv)
  - Colin Frei
  - Adrien Brault (adrienbrault)
  - Joshua Thijssen
  - Peter Kokot (maastermedia)
  - David Buchmann (dbu)
  - excelwebzone
- - Tobias Nyholm (tobias)
  - Tomáš Votruba (tomas_votruba)
  - Fabien Pennequin (fabienpennequin)
  - Gordon Franke (gimler)
@@ -133,12 +133,15 @@ Symfony is the result of the work of many people who made the code better
  - Guilherme Blanco (guilhermeblanco)
  - Pablo Godel (pgodel)
  - Jérémie Augustin (jaugustin)
+ - Dany Maillard (maidmaid)
  - Andréia Bohner (andreia)
  - Rafael Dohms (rdohms)
  - Arnaud Kleinpeter (nanocom)
  - jwdeitch
+ - David Maicher (dmaicher)
  - Mikael Pajunen
  - Joel Wurtz (brouznouf)
+ - Grégoire Paris (greg0ire)
  - Philipp Wahala (hifi)
  - Vyacheslav Pavlov
  - Richard van Laak (rvanlaak)
@@ -147,11 +150,9 @@ Symfony is the result of the work of many people who made the code better
  - Thomas Rabaix (rande)
  - Rouven Weßling (realityking)
  - Teoh Han Hui (teohhanhui)
- - David Maicher (dmaicher)
  - Jérôme Vasseur (jvasseur)
  - Clemens Tolboom
  - Helmer Aaviksoo
- - Grégoire Paris (greg0ire)
  - Hiromi Hishida (77web)
  - Matthieu Ouellette-Vachon (maoueh)
  - Michał Pipa (michal.pipa)
@@ -234,7 +235,6 @@ Symfony is the result of the work of many people who made the code better
  - Arjen Brouwer (arjenjb)
  - Katsuhiro OGAWA
  - Patrick McDougle (patrick-mcdougle)
- - Dany Maillard (maidmaid)
  - Alif Rachmawadi
  - Kristen Gilden (kgilden)
  - Pierre-Yves LEBECQ (pylebecq)
@@ -620,6 +620,7 @@ Symfony is the result of the work of many people who made the code better
  - develop
  - ReenExe
  - Mark Sonnabaum
+ - Maxime Veber (nek-)
  - Richard Quadling
  - jochenvdv
  - Arturas Smorgun (asarturas)
@@ -642,6 +643,7 @@ Symfony is the result of the work of many people who made the code better
  - Trent Steel (trsteel88)
  - Yuen-Chi Lian
  - Besnik Br
+ - Jose Gonzalez
  - Dariusz Ruminski
  - Joshua Nye
  - Claudio Zizza
@@ -1081,7 +1083,6 @@ Symfony is the result of the work of many people who made the code better
  - Max Summe
  - WedgeSama
  - Felds Liscia
- - Maxime Veber (nek-)
  - Sullivan SENECHAL
  - Tadcka
  - Beth Binkovitz
@@ -1092,12 +1093,12 @@ Symfony is the result of the work of many people who made the code better
  - Tomaz Ahlin
  - Marcus Stöhr (dafish)
  - Emmanuel Vella (emmanuel.vella)
+ - Adam Szaraniec (mimol)
  - Carsten Nielsen (phreaknerd)
  - Mathieu Rochette
  - Jay Severson
  - René Kerner
  - Nathaniel Catchpole
- - Jose Gonzalez
  - Adrien Samson (adriensamson)
  - Samuel Gordalina (gordalina)
  - Max Romanovsky (maxromanovsky)
@@ -1258,6 +1259,7 @@ Symfony is the result of the work of many people who made the code better
  - Aarón Nieves Fernández
  - Mike Meier
  - Kirill Saksin
+ - Julien Pauli
  - Koalabaerchen
  - michalmarcinkowski
  - Warwick
@@ -1305,6 +1307,7 @@ Symfony is the result of the work of many people who made the code better
  - klemens
  - dened
  - Dmitry Korotovsky
+ - mcorteel
  - Michael van Tricht
  - Sam Ward
  - Walther Lalk
@@ -1335,6 +1338,7 @@ Symfony is the result of the work of many people who made the code better
  - Jan Marek (janmarek)
  - Mark de Haan (markdehaan)
  - Dan Patrick (mdpatrick)
+ - Pedro Magalhães (pmmaga)
  - Rares Vlaseanu (raresvla)
  - tante kinast (tante)
  - Vincent LEFORT (vlefort)
@@ -1542,6 +1546,7 @@ Symfony is the result of the work of many people who made the code better
  - Abdulkadir N. A.
  - Yevgen Kovalienia
  - Lebnik
+ - Shude
  - Ondřej Führer
  - Sema
  - Elan Ruusamäe

composer.json

@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
+        "ext-xml": "*",
         "doctrine/common": "~2.4",
         "twig/twig": "~1.34|~2.4",
         "psr/log": "~1.0",

src/Symfony/Bridge/Twig/Extension/HttpFoundationExtension.php

@@ -72,6 +72,13 @@ public function generateAbsoluteUrl($path)
                     $port = ':'.$this->requestContext->getHttpsPort();
                 }
 
+                if ('#' === $path[0]) {
+                    $queryString = $this->requestContext->getQueryString();
+                    $path = $this->requestContext->getPathInfo().($queryString ? '?'.$queryString : '').$path;
+                } elseif ('?' === $path[0]) {
+                    $path = $this->requestContext->getPathInfo().$path;
+                }
+
                 if ('/' !== $path[0]) {
                     $path = rtrim($this->requestContext->getBaseUrl(), '/').'/'.$path;
                 }
@@ -82,6 +89,12 @@ public function generateAbsoluteUrl($path)
             return $path;
         }
 
+        if ('#' === $path[0]) {
+            $path = $request->getRequestUri().$path;
+        } elseif ('?' === $path[0]) {
+            $path = $request->getPathInfo().$path;
+        }
+
         if (!$path || '/' !== $path[0]) {
             $prefix = $request->getPathInfo();
             $last = strlen($prefix) - 1;

src/Symfony/Bridge/Twig/Tests/Extension/HttpFoundationExtensionTest.php

@@ -42,6 +42,15 @@ public function getGenerateAbsoluteUrlData()
             array('http://example.com/baz', 'http://example.com/baz', '/'),
             array('https://example.com/baz', 'https://example.com/baz', '/'),
             array('//example.com/baz', '//example.com/baz', '/'),
+
+            array('http://localhost/foo/bar?baz', '?baz', '/foo/bar'),
+            array('http://localhost/foo/bar?baz=1', '?baz=1', '/foo/bar?foo=1'),
+            array('http://localhost/foo/baz?baz=1', 'baz?baz=1', '/foo/bar?foo=1'),
+
+            array('http://localhost/foo/bar#baz', '#baz', '/foo/bar'),
+            array('http://localhost/foo/bar?0#baz', '#baz', '/foo/bar?0'),
+            array('http://localhost/foo/bar?baz=1#baz', '?baz=1#baz', '/foo/bar?foo=1'),
+            array('http://localhost/foo/baz?baz=1#baz', 'baz?baz=1#baz', '/foo/bar?foo=1'),
         );
     }
 

src/Symfony/Bundle/DebugBundle/composer.json

@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
+        "ext-xml": "*",
         "symfony/http-kernel": "~2.6|~3.0.0",
         "symfony/twig-bridge": "~2.6|~3.0.0",
         "symfony/var-dumper": "~2.6|~3.0.0"

src/Symfony/Bundle/SecurityBundle/composer.json

@@ -17,6 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.9",
+        "ext-xml": "*",
         "symfony/security": "~2.8|~3.0.0",
         "symfony/security-acl": "~2.7|~3.0.0",
         "symfony/http-kernel": "~2.7|~3.0.0",

src/Symfony/Bundle/TwigBundle/Resources/config/schema/twig-1.0.xsd

@@ -9,6 +9,9 @@
 
     <xsd:complexType name="config">
         <xsd:sequence>
+            <xsd:element name="date" type="date" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="number-format" type="number_format" minOccurs="0" maxOccurs="1" />
+
             <!-- @deprecated since version 2.6, to be removed in 3.0 -->
             <xsd:element name="form" type="form" minOccurs="0" maxOccurs="1" />
             <xsd:element name="form-theme" type="xsd:string" minOccurs="0" maxOccurs="unbounded" />
@@ -28,6 +31,18 @@
         <xsd:attribute name="exception-controller" type="xsd:string" />
     </xsd:complexType>
 
+    <xsd:complexType name="date">
+        <xsd:attribute name="format" type="xsd:string" />
+        <xsd:attribute name="interval-format" type="xsd:string" />
+        <xsd:attribute name="timezone" type="xsd:string" />
+    </xsd:complexType>
+
+    <xsd:complexType name="number_format">
+        <xsd:attribute name="decimals" type="xsd:integer" />
+        <xsd:attribute name="decimal-point" type="xsd:string" />
+        <xsd:attribute name="thousands-separator" type="xsd:string" />
+    </xsd:complexType>
+
     <xsd:complexType name="form">
         <xsd:choice minOccurs="1" maxOccurs="unbounded">
             <xsd:element name="resource" type="xsd:string" />

src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/php/formats.php

@@ -0,0 +1,14 @@
+<?php
+
+$container->loadFromExtension('twig', array(
+    'date' => array(
+        'format' => 'Y-m-d',
+        'interval_format' => '%d',
+        'timezone' => 'Europe/Berlin',
+    ),
+    'number_format' => array(
+        'decimals' => 2,
+        'decimal_point' => ',',
+        'thousands_separator' => '.',
+    ),
+));

src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/Fixtures/xml/formats.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+<container xmlns="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:twig="http://symfony.com/schema/dic/twig"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+        http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd">
+
+    <twig:config>
+        <twig:date format="Y-m-d" interval-format="%d" timezone="Europe/Berlin" />
+        <twig:number-format decimals="2" decimal-point="," thousands-separator="." />
+    </twig:config>
+</container>