From 7126c8d5d2db1e285b29ece62a1e62ed117f3ebe Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 5 Feb 2015 09:31:48 +0100
Subject: [PATCH] [FrameworkBundle] fixed tests

---
 .../FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json    | 2 +-
 .../FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md      | 2 +-
 .../FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt     | 2 +-
 .../FrameworkBundle/Tests/Fixtures/Descriptor/route_1.xml     | 2 +-
 .../FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json    | 2 +-
 .../FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md      | 2 +-
 .../FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt     | 2 +-
 .../FrameworkBundle/Tests/Fixtures/Descriptor/route_2.xml     | 2 +-
 .../Tests/Fixtures/Descriptor/route_collection_1.json         | 4 ++--
 .../Tests/Fixtures/Descriptor/route_collection_1.md           | 4 ++--
 .../Tests/Fixtures/Descriptor/route_collection_1.xml          | 4 ++--
 src/Symfony/Component/Process/ProcessBuilder.php              | 2 --
 12 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json
index c8ead96966..beac79f1f8 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json
+++ b/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",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md
index 5bb091889b..5bfba18b2c 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md
+++ b/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
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt
index d6d2aa38b7..1c07ccde50 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt
+++ b/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
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.xml
index 164282c5f6..b6040bdad1 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.xml
+++ b/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>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json
index 8e9b899b24..d34b3a77ae 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json
+++ b/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",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md
index 41b1854952..0a3f84be17 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md
+++ b/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
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt
index 8c1a143123..560c474ae9 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt
+++ b/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
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.xml
index 333eeaa1b4..0f94cf7c41 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.xml
+++ b/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>
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json
index a78320387d..7170953f5f 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json
+++ b/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",
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
index a1ae684674..87efcc22e4 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
+++ b/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
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.xml b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.xml
index aa5adb482a..6d17820c31 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.xml
+++ b/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>
diff --git a/src/Symfony/Component/Process/ProcessBuilder.php b/src/Symfony/Component/Process/ProcessBuilder.php
index 189ab8a3d1..fab6194a5e 100644
--- a/src/Symfony/Component/Process/ProcessBuilder.php
+++ b/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