Merge branch '2.5' into 2.6

* 2.5:
  [FrameworkBundle] fixed tests

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json

@@ -2,7 +2,7 @@
     "path": "\/hello\/{name}",
     "pathRegex": "#^\/hello(?:\/(?P<name>[a-z]+))?$#s",
     "host": "localhost",
-    "hostRegex": "#^localhost$#s",
+    "hostRegex": "#^localhost$#si",
     "scheme": "http|https",
     "method": "GET|HEAD",
     "class": "Symfony\\Component\\Routing\\Route",

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md

@@ -1,7 +1,7 @@
 - Path: /hello/{name}
 - Path Regex: #^/hello(?:/(?P<name>[a-z]+))?$#s
 - Host: localhost
-- Host Regex: #^localhost$#s
+- Host Regex: #^localhost$#si
 - Scheme: http|https
 - Method: GET|HEAD
 - Class: Symfony\Component\Routing\Route

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt

@@ -1,7 +1,7 @@
 <comment>Path</comment>         /hello/{name}
 <comment>Path Regex</comment>   #^/hello(?:/(?P<name>[a-z]+))?$#s
 <comment>Host</comment>         localhost
-<comment>Host Regex</comment>   #^localhost$#s
+<comment>Host Regex</comment>   #^localhost$#si
 <comment>Scheme</comment>       http|https
 <comment>Method</comment>       GET|HEAD
 <comment>Class</comment>        Symfony\Component\Routing\Route

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <route class="Symfony\Component\Routing\Route">
   <path regex="#^/hello(?:/(?P&lt;name&gt;[a-z]+))?$#s">/hello/{name}</path>
-  <host regex="#^localhost$#s">localhost</host>
+  <host regex="#^localhost$#si">localhost</host>
   <scheme>http</scheme>
   <scheme>https</scheme>
   <method>GET</method>

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json

@@ -2,7 +2,7 @@
     "path": "\/name\/add",
     "pathRegex": "#^\/name\/add$#s",
     "host": "localhost",
-    "hostRegex": "#^localhost$#s",
+    "hostRegex": "#^localhost$#si",
     "scheme": "http|https",
     "method": "PUT|POST",
     "class": "Symfony\\Component\\Routing\\Route",

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md

@@ -1,7 +1,7 @@
 - Path: /name/add
 - Path Regex: #^/name/add$#s
 - Host: localhost
-- Host Regex: #^localhost$#s
+- Host Regex: #^localhost$#si
 - Scheme: http|https
 - Method: PUT|POST
 - Class: Symfony\Component\Routing\Route

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt

@@ -1,7 +1,7 @@
 <comment>Path</comment>         /name/add
 <comment>Path Regex</comment>   #^/name/add$#s
 <comment>Host</comment>         localhost
-<comment>Host Regex</comment>   #^localhost$#s
+<comment>Host Regex</comment>   #^localhost$#si
 <comment>Scheme</comment>       http|https
 <comment>Method</comment>       PUT|POST
 <comment>Class</comment>        Symfony\Component\Routing\Route

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <route class="Symfony\Component\Routing\Route">
   <path regex="#^/name/add$#s">/name/add</path>
-  <host regex="#^localhost$#s">localhost</host>
+  <host regex="#^localhost$#si">localhost</host>
   <scheme>http</scheme>
   <scheme>https</scheme>
   <method>PUT</method>

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json

@@ -3,7 +3,7 @@
         "path": "\/hello\/{name}",
         "pathRegex": "#^\/hello(?:\/(?P<name>[a-z]+))?$#s",
         "host": "localhost",
-        "hostRegex": "#^localhost$#s",
+        "hostRegex": "#^localhost$#si",
         "scheme": "http|https",
         "method": "GET|HEAD",
         "class": "Symfony\\Component\\Routing\\Route",
@@ -23,7 +23,7 @@
         "path": "\/name\/add",
         "pathRegex": "#^\/name\/add$#s",
         "host": "localhost",
-        "hostRegex": "#^localhost$#s",
+        "hostRegex": "#^localhost$#si",
         "scheme": "http|https",
         "method": "PUT|POST",
         "class": "Symfony\\Component\\Routing\\Route",

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md

@@ -4,7 +4,7 @@ route_1
 - Path: /hello/{name}
 - Path Regex: #^/hello(?:/(?P<name>[a-z]+))?$#s
 - Host: localhost
-- Host Regex: #^localhost$#s
+- Host Regex: #^localhost$#si
 - Scheme: http|https
 - Method: GET|HEAD
 - Class: Symfony\Component\Routing\Route
@@ -24,7 +24,7 @@ route_2
 - Path: /name/add
 - Path Regex: #^/name/add$#s
 - Host: localhost
-- Host Regex: #^localhost$#s
+- Host Regex: #^localhost$#si
 - Scheme: http|https
 - Method: PUT|POST
 - Class: Symfony\Component\Routing\Route

src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.xml

@@ -2,7 +2,7 @@
 <routes>
   <route name="route_1" class="Symfony\Component\Routing\Route">
     <path regex="#^/hello(?:/(?P&lt;name&gt;[a-z]+))?$#s">/hello/{name}</path>
-    <host regex="#^localhost$#s">localhost</host>
+    <host regex="#^localhost$#si">localhost</host>
     <scheme>http</scheme>
     <scheme>https</scheme>
     <method>GET</method>
@@ -21,7 +21,7 @@
   </route>
   <route name="route_2" class="Symfony\Component\Routing\Route">
     <path regex="#^/name/add$#s">/name/add</path>
-    <host regex="#^localhost$#s">localhost</host>
+    <host regex="#^localhost$#si">localhost</host>
     <scheme>http</scheme>
     <scheme>https</scheme>
     <method>PUT</method>

src/Symfony/Component/Process/ProcessBuilder.php

@@ -167,8 +167,6 @@ class ProcessBuilder
     /**
      * Sets the input of the process.
      *
-     * Deprecation: As of Symfony 2.5, this method only accepts string values.
-     *
      * @param string|null $input The input as a string
      *
      * @return ProcessBuilder