Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit b45428e

Browse filesBrowse files
fabpotfabpot
committed
Revert "[FrameworkBundle] fixed tests"
This reverts commit 7126c8d.
1 parent 7126c8d commit b45428e
Copy full SHA for b45428e

File tree

12 files changed

+16
-14
lines changed
Filter options

12 files changed

+16
-14
lines changed

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"path": "\/hello\/{name}",
33
"pathRegex": "#^\/hello(?:\/(?P<name>[a-z]+))?$#s",
44
"host": "localhost",
5-
"hostRegex": "#^localhost$#si",
5+
"hostRegex": "#^localhost$#s",
66
"scheme": "http|https",
77
"method": "GET|HEAD",
88
"class": "Symfony\\Component\\Routing\\Route",

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- Path: /hello/{name}
22
- Path Regex: #^/hello(?:/(?P<name>[a-z]+))?$#s
33
- Host: localhost
4-
- Host Regex: #^localhost$#si
4+
- Host Regex: #^localhost$#s
55
- Scheme: http|https
66
- Method: GET|HEAD
77
- Class: Symfony\Component\Routing\Route

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<comment>Path</comment> /hello/{name}
22
<comment>Path Regex</comment> #^/hello(?:/(?P<name>[a-z]+))?$#s
33
<comment>Host</comment> localhost
4-
<comment>Host Regex</comment> #^localhost$#si
4+
<comment>Host Regex</comment> #^localhost$#s
55
<comment>Scheme</comment> http|https
66
<comment>Method</comment> GET|HEAD
77
<comment>Class</comment> Symfony\Component\Routing\Route

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<route class="Symfony\Component\Routing\Route">
33
<path regex="#^/hello(?:/(?P&lt;name&gt;[a-z]+))?$#s">/hello/{name}</path>
4-
<host regex="#^localhost$#si">localhost</host>
4+
<host regex="#^localhost$#s">localhost</host>
55
<scheme>http</scheme>
66
<scheme>https</scheme>
77
<method>GET</method>

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"path": "\/name\/add",
33
"pathRegex": "#^\/name\/add$#s",
44
"host": "localhost",
5-
"hostRegex": "#^localhost$#si",
5+
"hostRegex": "#^localhost$#s",
66
"scheme": "http|https",
77
"method": "PUT|POST",
88
"class": "Symfony\\Component\\Routing\\Route",

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- Path: /name/add
22
- Path Regex: #^/name/add$#s
33
- Host: localhost
4-
- Host Regex: #^localhost$#si
4+
- Host Regex: #^localhost$#s
55
- Scheme: http|https
66
- Method: PUT|POST
77
- Class: Symfony\Component\Routing\Route

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<comment>Path</comment> /name/add
22
<comment>Path Regex</comment> #^/name/add$#s
33
<comment>Host</comment> localhost
4-
<comment>Host Regex</comment> #^localhost$#si
4+
<comment>Host Regex</comment> #^localhost$#s
55
<comment>Scheme</comment> http|https
66
<comment>Method</comment> PUT|POST
77
<comment>Class</comment> Symfony\Component\Routing\Route

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.xml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<route class="Symfony\Component\Routing\Route">
33
<path regex="#^/name/add$#s">/name/add</path>
4-
<host regex="#^localhost$#si">localhost</host>
4+
<host regex="#^localhost$#s">localhost</host>
55
<scheme>http</scheme>
66
<scheme>https</scheme>
77
<method>PUT</method>

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"path": "\/hello\/{name}",
44
"pathRegex": "#^\/hello(?:\/(?P<name>[a-z]+))?$#s",
55
"host": "localhost",
6-
"hostRegex": "#^localhost$#si",
6+
"hostRegex": "#^localhost$#s",
77
"scheme": "http|https",
88
"method": "GET|HEAD",
99
"class": "Symfony\\Component\\Routing\\Route",
@@ -23,7 +23,7 @@
2323
"path": "\/name\/add",
2424
"pathRegex": "#^\/name\/add$#s",
2525
"host": "localhost",
26-
"hostRegex": "#^localhost$#si",
26+
"hostRegex": "#^localhost$#s",
2727
"scheme": "http|https",
2828
"method": "PUT|POST",
2929
"class": "Symfony\\Component\\Routing\\Route",

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ route_1
44
- Path: /hello/{name}
55
- Path Regex: #^/hello(?:/(?P<name>[a-z]+))?$#s
66
- Host: localhost
7-
- Host Regex: #^localhost$#si
7+
- Host Regex: #^localhost$#s
88
- Scheme: http|https
99
- Method: GET|HEAD
1010
- Class: Symfony\Component\Routing\Route
@@ -24,7 +24,7 @@ route_2
2424
- Path: /name/add
2525
- Path Regex: #^/name/add$#s
2626
- Host: localhost
27-
- Host Regex: #^localhost$#si
27+
- Host Regex: #^localhost$#s
2828
- Scheme: http|https
2929
- Method: PUT|POST
3030
- Class: Symfony\Component\Routing\Route

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.xml
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<routes>
33
<route name="route_1" class="Symfony\Component\Routing\Route">
44
<path regex="#^/hello(?:/(?P&lt;name&gt;[a-z]+))?$#s">/hello/{name}</path>
5-
<host regex="#^localhost$#si">localhost</host>
5+
<host regex="#^localhost$#s">localhost</host>
66
<scheme>http</scheme>
77
<scheme>https</scheme>
88
<method>GET</method>
@@ -21,7 +21,7 @@
2121
</route>
2222
<route name="route_2" class="Symfony\Component\Routing\Route">
2323
<path regex="#^/name/add$#s">/name/add</path>
24-
<host regex="#^localhost$#si">localhost</host>
24+
<host regex="#^localhost$#s">localhost</host>
2525
<scheme>http</scheme>
2626
<scheme>https</scheme>
2727
<method>PUT</method>

‎src/Symfony/Component/Process/ProcessBuilder.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Process/ProcessBuilder.php
+2Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ public function addEnvironmentVariables(array $variables)
167167
/**
168168
* Sets the input of the process.
169169
*
170+
* Deprecation: As of Symfony 2.5, this method only accepts string values.
171+
*
170172
* @param string|null $input The input as a string
171173
*
172174
* @return ProcessBuilder

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.