8000 [Routing] minor fix or previous PR · symfony/symfony@1dbb374 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1dbb374

Browse files
nicolas-grekasnicolas-grekas
committed
[Routing] minor fix or previous PR
1 parent 40a79f7 commit 1dbb374

12 files changed

+28
-28
lines changed

‎src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ private function compileSwitchDefault(bool $hasVars, bool $matchHost): string
578578
579579
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
580580
// no-op
581-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
581+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
582582
$matches = $n;
583583
} else {
584584
$hasTrailingSlash = true;
@@ -662,7 +662,7 @@ private function compileRoute(Route $route, string $name, bool $checkHost, bool
662662
if ('/' !== $pathinfo && $trimmedPathinfo === $pathinfo) {%s
663663
goto %s;
664664
}
665-
if ('/' !== $pathinfo && preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
665+
if ('/' !== $pathinfo && preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
666666
$matches = $n;
667667
}
668668
EOF;
@@ -671,7 +671,7 @@ private function compileRoute(Route $route, string $name, bool $checkHost, bool
671671
$hasTrailingSlash = false;
672672
if ($trimmedPathinfo === $pathinfo) {
673673
// no-op
674-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
674+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
675675
$matches = $n;
676676
} else {
677677
$hasTrailingSlash = true;
@@ -687,7 +687,7 @@ private function compileRoute(Route $route, string $name, bool $checkHost, bool
687687
$code .= <<<'EOF'
688688
if ($trimmedPathinfo === $pathinfo) {
689689
// no-op
690-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
690+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
691691
$matches = $n;
692692
} elseif ('/' !== $pathinfo) {
693693
goto %2$s;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public function match($pathinfo)
141141
if ('/' !== $pathinfo && $trimmedPathinfo === $pathinfo) {
142142
goto not_baz4;
143143
}
144-
if ('/' !== $pathinfo && preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
144+
if ('/' !== $pathinfo && preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
145145
$matches = $n;
146146
}
147147

@@ -154,7 +154,7 @@ public function match($pathinfo)
154154
if ('/' !== $pathinfo && $trimmedPathinfo === $pathinfo) {
155155
goto not_baz5;
156156
}
157-
if ('/' !== $pathinfo && preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
157+
if ('/' !== $pathinfo && preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
158158
$matches = $n;
159159
}
160160

@@ -171,7 +171,7 @@ public function match($pathinfo)
171171
if ('/' !== $pathinfo && $trimmedPathinfo === $pathinfo) {
172172
goto not_bazbaz6;
173173
}
174-
if ('/' !== $pathinfo && preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
174+
if ('/' !== $pathinfo && preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
175175
$matches = $n;
176176
}
177177

@@ -189,7 +189,7 @@ public function match($pathinfo)
189189
// foo1
190190
if ($trimmedPathinfo === $pathinfo) {
191191
// no-op
192-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
192+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
193193
$matches = $n;
194194
} elseif ('/' !== $pathinfo) {
195195
goto not_foo1;
@@ -211,7 +211,7 @@ public function match($pathinfo)
211211
// foo2
212212
if ($trimmedPathinfo === $pathinfo) {
213213
// no-op
214-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
214+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
215215
$matches = $n;
216216
} elseif ('/' !== $pathinfo) {
217217
goto not_foo2;
@@ -227,7 +227,7 @@ public function match($pathinfo)
227227
// foo3
228228
if ($trimmedPathinfo === $pathinfo) {
229229
// no-op
230-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
230+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
231231
$matches = $n;
232232
} elseif ('/' !== $pathinfo) {
233233
goto not_foo3;
@@ -264,7 +264,7 @@ public function match($pathinfo)
264264

265265
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
266266
// no-op
267-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
267+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
268268
$matches = $n;
269269
} else {
270270
$hasTrailingSlash = true;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher10.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2796,7 +2796,7 @@ public function match($pathinfo)
27962796

27972797
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
27982798
// no-op
2799-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
2799+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
28002800
$matches = $n;
28012801
} else {
28022802
$hasTrailingSlash = true;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher11.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
121121

122122
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
123123
// no-op
124-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
124+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
125125
$matches = $n;
126126
} else {
127127
$hasTrailingSlash = true;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher12.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function match($pathinfo)
6666

6767
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
6868
// no-op
69-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
69+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
7070
$matches = $n;
7171
} else {
7272
$hasTrailingSlash = true;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher13.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function match($pathinfo)
4646
// r1
4747
if ($trimmedPathinfo === $pathinfo) {
4848
// no-op
49-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
49+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
5050
$matches = $n;
5151
} elseif ('/' !== $pathinfo) {
5252
goto not_r1;
@@ -60,7 +60,7 @@ public function match($pathinfo)
6060
// r2
6161
if ($trimmedPathinfo === $pathinfo) {
6262
// no-op
63-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
63+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
6464
$matches = $n;
6565
} elseif ('/' !== $pathinfo) {
6666
goto not_r2;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
184184
}
185185
goto not_baz4;
186186
}
187-
if ('/' !== $pathinfo && preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
187+
if ('/' !== $pathinfo && preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
188188
$matches = $n;
189189
}
190190

@@ -197,7 +197,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
197197
if ('/' !== $pathinfo && $trimmedPathinfo === $pathinfo) {
198198
goto not_baz5;
199199
}
200-
if ('/' !== $pathinfo && preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
200+
if ('/' !== $pathinfo && preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
201201
$matches = $n;
202202
}
203203

@@ -214,7 +214,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
214214
if ('/' !== $pathinfo && $trimmedPathinfo === $pathinfo) {
215215
goto not_bazbaz6;
216216
}
217-
if ('/' !== $pathinfo && preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
217+
if ('/' !== $pathinfo && preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
218218
$matches = $n;
219219
}
220220

@@ -232,7 +232,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
232232
// foo1
233233
if ($trimmedPathinfo === $pathinfo) {
234234
// no-op
235-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
235+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
236236
$matches = $n;
237237
} elseif ('/' !== $pathinfo) {
238238
goto not_foo1;
@@ -255,7 +255,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
255255
$hasTrailingSlash = false;
256256
if ($trimmedPathinfo === $pathinfo) {
257257
// no-op
258-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
258+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
259259
$matches = $n;
260260
} else {
261261
$hasTrailingSlash = true;
@@ -281,7 +281,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
281281
$hasTrailingSlash = false;
282282
if ($trimmedPathinfo === $pathinfo) {
283283
// no-op
284-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
284+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
285285
$matches = $n;
286286
} else {
287287
$hasTrailingSlash = true;
@@ -327,7 +327,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
327327

328328
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
329329
// no-op
330-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
330+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
331331
$matches = $n;
332332
} else {
333333
$hasTrailingSlash = true;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function match($pathinfo)
8686

8787
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
8888
// no-op
89-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
89+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
9090
$matches = $n;
9191
} else {
9292
$hasTrailingSlash = true;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher5.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
126126

127127
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
128128
// no-op
129-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
129+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
130130
$matches = $n;
131131
} else {
132132
$hasTrailingSlash = true;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher6.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function match($pathinfo)
100100

101101
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
102102
// no-op
103-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
103+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
104104
$matches = $n;
105105
} else {
106106
$hasTrailingSlash = true;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher7.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ private function doMatch(string $pathinfo, array &$allow = array(), array &$allo
138138

139139
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
140140
// no-op
141-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
141+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
142142
$matches = $n;
143143
} else {
144144
$hasTrailingSlash = true;

‎src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher8.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function match($pathinfo)
5454

5555
if ($trimmedPathinfo === $pathinfo || !$hasTrailingVar) {
5656
// no-op
57-
} elseif (preg_match($regex, $trimmedPathinfo, $n) && $m === (int) $n['MARK']) {
57+
} elseif (preg_match($regex, rtrim($matchedPathinfo, '/') ?: '/', $n) && $m === (int) $n['MARK']) {
5858
$matches = $n;
5959
} else {
6060
$hasTrailingSlash = true;

0 commit comments

Comments
 (0)
0