Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit a3644f69cb25 · 2018-12-26T09:25:31.000+01:00
* 3.4:
  using open_basedir will disable the realpath cache
  fix(FileUpload): Addition on multiple files
  better readability
diff --git a/.symfony/routes.yaml b/.symfony/routes.yaml
@@ -1,11 +1,11 @@
 https://{default}/:
   cache:
     cookies:
-    - '*'
+      - '*'
     default_ttl: 0
     enabled: true
     headers:
-    - Accept
-    - Accept-Language
+      - Accept
+      - Accept-Language
   type: upstream
   upstream: symfonydocs:http
diff --git a/performance.rst b/performance.rst
@@ -103,6 +103,11 @@ such as Symfony projects, should use at least these values:
     ; save the results for 10 minutes (600 seconds)
     realpath_cache_ttl=600
 
+.. note::
+
+    PHP disables the ``realpath`` cache when the `open_basedir`_ config option
+    is enabled.
+
 .. _performance-optimize-composer-autoloader:
 
 Optimize Composer Autoloader
@@ -143,3 +148,4 @@ Learn more
 .. _`APCu Polyfill component`: https://github.com/symfony/polyfill-apcu
 .. _`APCu PHP functions`: https://php.net/manual/en/ref.apcu.php
 .. _`cachetool`: https://github.com/gordalina/cachetool
+.. _`open_basedir`: https://php.net/manual/ini.core.php#ini.open-basedir
diff --git a/testing.rst b/testing.rst
@@ -793,6 +793,10 @@ their type::
     // uploads a file
     $form['photo']->upload('/path/to/lucas.jpg');
 
+    // In the case of a multiple file upload
+    $form['my_form[field][O]']->upload('/path/to/lucas.jpg');
+    $form['my_form[field][1]']->upload('/path/to/lisa.jpg');
+
 .. tip::
 
     If you purposefully want to select "invalid" select/radio values, see
