Skip to content

Commit 0665ace

Browse files
fabpotfabpot
committed
[Routing] fixed tests
1 parent 626209b commit 0665ace

File tree

4 files changed

+23
-23
lines changed

4 files changed

+23
-23
lines changed

‎Tests/Fixtures/dumper/url_matcher4.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public function __construct(RequestContext $context)
1515
$this->context = $context;
1616
}
1717

18-
public function match($pathinfo)
18+
public function match($rawPathinfo)
1919
{
2020
$allow = array();
21-
$pathinfo = rawurldecode($pathinfo);
21+
$pathinfo = rawurldecode($rawPathinfo);
2222
$trimmedPathinfo = rtrim($pathinfo, '/');
2323
$context = $this->context;
2424
$request = $this->request;

‎Tests/Fixtures/dumper/url_matcher5.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public function __construct(RequestContext $context)
1515
$this->context = $context;
1616
}
1717

18-
public function match($pathinfo)
18+
public function match($rawPathinfo)
1919
{
2020
$allow = array();
21-
$pathinfo = rawurldecode($pathinfo);
21+
$pathinfo = rawurldecode($rawPathinfo);
2222
$trimmedPathinfo = rtrim($pathinfo, '/');
2323
$context = $this->context;
2424
$request = $this->request;
@@ -57,7 +57,7 @@ public function match($pathinfo)
5757
// a_fourth
5858
if ('/a/44' === $trimmedPathinfo) {
5959
if (substr($pathinfo, -1) !== '/') {
60-
return $this->redirect($pathinfo.'/', 'a_fourth');
60+
return $this->redirect($rawPathinfo.'/', 'a_fourth');
6161
}
6262

6363
return array('_route' => 'a_fourth');
@@ -66,7 +66,7 @@ public function match($pathinfo)
6666
// a_fifth
6767
if ('/a/55' === $trimmedPathinfo) {
6868
if (substr($pathinfo, -1) !== '/') {
69-
return $this->redirect($pathinfo.'/', 'a_fifth');
69+
return $this->redirect($rawPathinfo.'/', 'a_fifth');
7070
}
7171

7272
return array('_route' => 'a_fifth');
@@ -75,7 +75,7 @@ public function match($pathinfo)
7575
// a_sixth
7676
if ('/a/66' === $trimmedPathinfo) {
7777
if (substr($pathinfo, -1) !== '/') {
78-
return $this->redirect($pathinfo.'/', 'a_sixth');
78+
return $this->redirect($rawPathinfo.'/', 'a_sixth');
7979
}
8080

8181
return array('_route' => 'a_sixth');
@@ -92,7 +92,7 @@ public function match($pathinfo)
9292
// nested_a
9393
if ('/nested/group/a' === $trimmedPathinfo) {
9494
if (substr($pathinfo, -1) !== '/') {
95-
return $this->redirect($pathinfo.'/', 'nested_a');
95+
return $this->redirect($rawPathinfo.'/', 'nested_a');
9696
}
9797

9898
return array('_route' => 'nested_a');
@@ -101,7 +101,7 @@ public function match($pathinfo)
101101
// nested_b
102102
if ('/nested/group/b' === $trimmedPathinfo) {
103103
if (substr($pathinfo, -1) !== '/') {
104-
return $this->redirect($pathinfo.'/', 'nested_b');
104+
return $this->redirect($rawPathinfo.'/', 'nested_b');
105105
}
106106

107107
return array('_route' => 'nested_b');
@@ -110,7 +110,7 @@ public function match($pathinfo)
110110
// nested_c
111111
if ('/nested/group/c' === $trimmedPathinfo) {
112112
if (substr($pathinfo, -1) !== '/') {
113-
return $this->redirect($pathinfo.'/', 'nested_c');
113+
return $this->redirect($rawPathinfo.'/', 'nested_c');
114114
}
115115

116116
return array('_route' => 'nested_c');
@@ -122,7 +122,7 @@ public function match($pathinfo)
122122
// slashed_a
123123
if ('/slashed/group' === $trimmedPathinfo) {
124124
if (substr($pathinfo, -1) !== '/') {
125-
return $this->redirect($pathinfo.'/', 'slashed_a');
125+
return $this->redirect($rawPathinfo.'/', 'slashed_a');
126126
}
127127

128128
return array('_route' => 'slashed_a');
@@ -131,7 +131,7 @@ public function match($pathinfo)
131131
// slashed_b
132132
if ('/slashed/group/b' === $trimmedPathinfo) {
133133
if (substr($pathinfo, -1) !== '/') {
134-
return $this->redirect($pathinfo.'/', 'slashed_b');
134+
return $this->redirect($rawPathinfo.'/', 'slashed_b');
135135
}
136136

137137
return array('_route' => 'slashed_b');
@@ -140,7 +140,7 @@ public function match($pathinfo)
140140
// slashed_c
141141
if ('/slashed/group/c' === $trimmedPathinfo) {
142142
if (substr($pathinfo, -1) !== '/') {
143-
return $this->redirect($pathinfo.'/', 'slashed_c');
143+
return $this->redirect($rawPathinfo.'/', 'slashed_c');
144144
}
145145

146146
return array('_route' => 'slashed_c');

‎Tests/Fixtures/dumper/url_matcher6.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public function __construct(RequestContext $context)
1515
$this->context = $context;
1616
}
1717

18-
public function match($pathinfo)
18+
public function match($rawPathinfo)
1919
{
2020
$allow = array();
21-
$pathinfo = rawurldecode($pathinfo);
21+
$pathinfo = rawurldecode($rawPathinfo);
2222
$trimmedPathinfo = rtrim($pathinfo, '/');
2323
$context = $this->context;
2424
$request = $this->request;

‎Tests/Fixtures/dumper/url_matcher7.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ public function __construct(RequestContext $context)
1515
$this->context = $context;
1616
}
1717

18-
public function match($pathinfo)
18+
public function match($rawPathinfo)
1919
{
2020
$allow = array();
21-
$pathinfo = rawurldecode($pathinfo);
21+
$pathinfo = rawurldecode($rawPathinfo);
2222
$trimmedPathinfo = rtrim($pathinfo, '/');
2323
$context = $this->context;
2424
$request = $this->request;
@@ -34,7 +34,7 @@ public function match($pathinfo)
3434
// simple_trailing_slash_no_methods
3535
if ('/trailing/simple/no-methods' === $trimmedPathinfo) {
3636
if (substr($pathinfo, -1) !== '/') {
37-
return $this->redirect($pathinfo.'/', 'simple_trailing_slash_no_methods');
37+
return $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_no_methods');
3838
}
3939

4040
return array('_route' => 'simple_trailing_slash_no_methods');
@@ -48,7 +48,7 @@ public function match($pathinfo)
4848
}
4949

5050
if (substr($pathinfo, -1) !== '/') {
51-
return $this->redirect($pathinfo.'/', 'simple_trailing_slash_GET_method');
51+
return $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_GET_method');
5252
}
5353

5454
return array('_route' => 'simple_trailing_slash_GET_method');
@@ -63,7 +63,7 @@ public function match($pathinfo)
6363
}
6464

6565
if (substr($pathinfo, -1) !== '/') {
66-
return $this->redirect($pathinfo.'/', 'simple_trailing_slash_HEAD_method');
66+
return $this->redirect($rawPathinfo.'/', 'simple_trailing_slash_HEAD_method');
6767
}
6868

6969
return array('_route' => 'simple_trailing_slash_HEAD_method');
@@ -87,7 +87,7 @@ public function match($pathinfo)
8787
// regex_trailing_slash_no_methods
8888
if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P<param>[^/]++)/?$#s', $pathinfo, $matches)) {
8989
if (substr($pathinfo, -1) !== '/') {
90-
return $this->redirect($pathinfo.'/', 'regex_trailing_slash_no_methods');
90+
return $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_no_methods');
9191
}
9292

9393
return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_no_methods')), array ());
@@ -101,7 +101,7 @@ public function match($pathinfo)
101101
}
102102

103103
if (substr($pathinfo, -1) !== '/') {
104-
return $this->redirect($pathinfo.'/', 'regex_trailing_slash_GET_method');
104+
return $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_GET_method');
105105
}
106106

107107
return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_GET_method')), array ());
@@ -116,7 +116,7 @@ public function match($pathinfo)
116116
}
117117

118118
if (substr($pathinfo, -1) !== '/') {
119-
return $this->redirect($pathinfo.'/', 'regex_trailing_slash_HEAD_method');
119+
return $this->redirect($rawPathinfo.'/', 'regex_trailing_slash_HEAD_method');
120120
}
121121

122122
return $this->mergeDefaults(array_replace($matches, array('_route' => 'regex_trailing_slash_HEAD_method')), array ());

0 commit comments

Comments
 (0)