Skip to content

Commit

Permalink
[FrameworkBundle] fixed tests
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Feb 5, 2015
1 parent f7a1adb commit 7126c8d
Show file tree
Hide file tree
Showing 12 changed files with 14 additions and 16 deletions.
Expand Up @@ -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",
Expand Down
@@ -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
Expand Down
@@ -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
Expand Down
@@ -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>
Expand Down
Expand Up @@ -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",
Expand Down
@@ -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
Expand Down
@@ -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
Expand Down
@@ -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>
Expand Down
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Expand Up @@ -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
Expand All @@ -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
Expand Down
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/Symfony/Component/Process/ProcessBuilder.php
Expand Up @@ -167,8 +167,6 @@ public function addEnvironmentVariables(array $variables)
/**
* 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
Expand Down

0 comments on commit 7126c8d

Please sign in to comment.