8000 Revert "Merge branch '2.3' into 2.5" · symfony/symfony@c0115af · GitHub
[go: up one dir, main page]
Skip to content

Commit c0115af

Browse files
fabpotfabpot
committed
Revert "Merge branch '2.3' into 2.5"
This reverts commit f7a1adb, reversing changes made to 45e42a8.
1 parent b45428e commit c0115af

File tree

26 files changed

+339
-373
lines changed

26 files changed

+339
-373
lines changed

‎src/Symfony/Bridge/Twig/Extension/FormExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public function humanize($text)
144144
public function isSelectedChoice(ChoiceView $choice, $selectedValue)
145145
{
146146
if (is_array($selectedValue)) {
147-
return in_array($choice->value, $selectedValue, true);
147+
return false !== array_search($choice->value, $selectedValue, true);
148148
}
149149

150150
return $choice->value === $selectedValue;

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public function testTranslator()
246246
$this->assertEquals(array('fr'), $calls[0][1][0]);
247247
}
248248

249-
public function testTranslatorMultipleFallbacks()
249+
public function testTranslatorMultipleFullback()
250250
{
251251
$container = $this->createContainerFromFile('translator_fallbacks');
252252

‎src/Symfony/Component/Console/Application.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ public function getHelp()
253253
$this->getLongVersion(),
254254
'',
255255
'<comment>Usage:</comment>',
256-
' command [options] [arguments]',
256+
' [options] command [arguments]',
257257
'',
258258
'<comment>Options:</comment>',
259259
);

‎src/Symfony/Component/Console/Tests/Fixtures/application_1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>Console Tool</info>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>My Symfony application</info> version <comment>v1.0</comment>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>Console Tool</info>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>Console Tool</info>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<info>Console Tool</info>
22

33
<comment>Usage:</comment>
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
<comment>Options:</comment>
77
<info>--help</info> <info>-h</info> Display this help message

‎src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Console Tool
22

33
Usage:
4-
command [options] [arguments]
4+
[options] command [arguments]
55

66
Options:
77
--help -h Display this help message

‎src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ protected function addChoice(array &$bucketForPreferred, array &$bucketForRemain
385385
*/
386386
protected function isPreferred($choice, array $preferredChoices)
387387
{
388-
return in_array($choice, $preferredChoices, true);
388+
return false !== array_search($choice, $preferredChoices, true);
389389
}
390390

391391
/**

‎src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
110110
// avoid making the type check inside the closure.
111111
if ($options['multiple']) {
112112
$view->vars['is_selected'] = function ($choice, array $values) {
113-
return in_array($choice, $values, true);
113+
return false !== array_search($choice, $values, true);
114114
};
115115
} else {
116116
$view->vars['is_selected'] = function ($choice, $value) {

‎src/Symfony/Component/Form/Resources/translations/validators.bg.xlf

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
<?xml version="1.0"?>
2-
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
3-
<file source-language="en" datatype="plaintext" original="file.ext">
4-
<body>
5-
<trans-unit id="28">
6-
<source>This form should not contain extra fields.</source>
7-
<target>Тази форма не трябва да съдържа допълнителни полета.</target>
8-
</trans-unit>
9-
<trans-unit id="29">
10-
<source>The uploaded file was too large. Please try to upload a smaller file.</source>
11-
<target>Каченият файл е твърде голям. Моля, опитайте да качите по-малък файл.</target>
12-
</trans-unit>
13-
<trans-unit id="30">
14-
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
15-
<target>Невалиден CSRF токен. Моля, опитайте да изпратите формата отново.</target>
16-
</trans-unit>
17-
</body>
18-
</file>
19-
</xliff>
1+
<?xml version="1.0"?>
2+
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
3+
<file source-language="en" datatype="plaintext" original="file.ext">
4+
<body>
5+
<trans-unit id="28">
6+
<source>This form should not contain extra fields.</source>
7+
<target>Тази форма не трябва да съдържа допълнителни полета.</target>
8+
</trans-unit>
9+
<trans-unit id="29">
10+
<source>The uploaded file was too large. Please try to upload a smaller file.</source>
11+
<target>Каченият файл е твърде голям. Моля, опитайте да качите по-малък файл.</target>
12+
</trans-unit>
13+
<trans-unit id="30">
14+
<source>The CSRF token is invalid. Please try to resubmit the form.</source>
15+
<target>Невалиден CSRF токен. Моля, опитайте да изпратите формата отново.</target>
16+
</trans-unit>
17+
</body>
18+
</file>
19+
</xliff>

‎src/Symfony/Component/HttpFoundation/Request.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1884,7 +1884,7 @@ private function getUrlencodedPrefix($string, $prefix)
18841884

18851885
$len = strlen($prefix);
18861886

1887-
if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $len), $string, $match)) {
1887+
if (preg_match("#^(%[[:xdigit:]]{2}|.){{$len}}#", $string, $match)) {
18881888
return $match[0];
18891889
}
18901890

‎src/Symfony/Component/Process/Tests/AbstractProcessTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -820,13 +820,13 @@ public function testIdleTimeoutNotExceededWhenOutputIsSent()
820820

821821
public function testStartAfterATimeout()
822822
{
823-
$process = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 1000; while ($n--) {echo \'\'; usleep(1000); }')));
823+
$process = $this->getProcess('php -r "$n = 1000; while ($n--) {echo \'\'; usleep(1000); }"');
824824
$process->setTimeout(0.1);
825825

826826
try {
827827
$process->run();
828-
$this->fail('A RuntimeException should have been raised.');
829-
} catch (RuntimeException $e) {
828+
$this->fail('An exception should have been raised.');
829+
} catch (\Exception $e) {
830830
}
831831
$process->start();
832832
usleep(1000);

‎src/Symfony/Component/Routing/Generator/UrlGenerator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
229229
$routeHost = '';
230230
foreach ($hostTokens as $token) {
231231
if ('variable' === $token[0]) {
232-
if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#i', $mergedParams[$token[3]])) {
232+
if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) {
233233
$message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given) to generate a corresponding URL.', $token[3], $name, $token[2], $mergedParams[$token[3]]);
234234

235235
if ($this->strictRequirements) {

‎src/Symfony/Component/Routing/RouteCompiler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static function compile(Route $route)
4646
$result = self::compilePattern($route, $host, true);
4747

4848
$hostVariables = $result['variables'];
49-
$variables = $hostVariables;
49+
$variables = array_merge($variables, $hostVariables);
5050

5151
$hostTokens = $result['tokens'];
5252
$hostRegex = $result['regex'];
@@ -163,7 +163,7 @@ private static function compilePattern(Route $route, $pattern, $isHost)
163163

164164
return array(
165165
'staticPrefix' => 'text' === $tokens[0][0] ? $tokens[0][1] : '',
166-
'regex' => self::REGEX_DELIMITER.'^'.$regexp.'$'.self::REGEX_DELIMITER.'s'.($isHost ? 'i' : ''),
166+
'regex' => self::REGEX_DELIMITER.'^'.$regexp.'$'.self::REGEX_DELIMITER.'s',
167167
'tokens' => array_reverse($tokens),
168168
'variables' => $variables,
169169
);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public function match($pathinfo)
197197

198198
$host = $this->context->getHost();
199199

200-
if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
200+
if (preg_match('#^a\\.example\\.com$#s', $host, $hostMatches)) {
201201
// route1
202202
if ($pathinfo === '/route1') {
203203
return array('_route' => 'route1');
@@ -210,23 +210,23 @@ public function match($pathinfo)
210210

211211
}
212212

213-
if (preg_match('#^b\\.example\\.com$#si', $host, $hostMatches)) {
213+
if (preg_match('#^b\\.example\\.com$#s', $host, $hostMatches)) {
214214
// route3
215215
if ($pathinfo === '/c2/route3') {
216216
return array('_route' => 'route3');
217217
}
218218

219219
}
220220

221-
if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
221+
if (preg_match('#^a\\.example\\.com$#s', $host, $hostMatches)) {
222222
// route4
223223
if ($pathinfo === '/route4') {
224224
return array('_route' => 'route4');
225225
}
226226

227227
}
228228

229-
if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
229+
if (preg_match('#^c\\.example\\.com$#s', $host, $hostMatches)) {
230230
// route5
231231
if ($pathinfo === '/route5') {
232232
return array('_route' => 'route5');
@@ -239,7 +239,7 @@ public function match($pathinfo)
239239
return array('_route' => 'route6');
240240
}
241241

242-
if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#si', $host, $hostMatches)) {
242+
if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#s', $host, $hostMatches)) {
243243
if (0 === strpos($pathinfo, '/route1')) {
244244
// route11
245245
if ($pathinfo === '/route11') {
@@ -265,7 +265,7 @@ public function match($pathinfo)
265265

266266
}
267267

268-
if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
268+
if (preg_match('#^c\\.example\\.com$#s', $host, $hostMatches)) {
269269
// route15
270270
if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#s', $pathinfo, $matches)) {
271271
return $this->mergeDefaults(array_replace($matches, array('_route' => 'route15')), array ());

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public function match($pathinfo)
209209

210210
$host = $this->context->getHost();
211211

212-
if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
212+
if (preg_match('#^a\\.example\\.com$#s', $host, $hostMatches)) {
213213
// route1
214214
if ($pathinfo === '/route1') {
215215
return array('_route' => 'route1');
@@ -222,23 +222,23 @@ public function match($pathinfo)
222222

223223
}
224224

225-
if (preg_match('#^b\\.example\\.com$#si', $host, $hostMatches)) {
225+
if (preg_match('#^b\\.example\\.com$#s', $host, $hostMatches)) {
226226
// route3
227227
if ($pathinfo === '/c2/route3') {
228228
return array('_route' => 'route3');
229229
}
230230

231231
}
232232

233-
if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
233+
if (preg_match('#^a\\.example\\.com$#s', $host, $hostMatches)) {
234234
// route4
235235
if ($pathinfo === '/route4') {
236236
return array('_route' => 'route4');
237237
}
238238

239239
}
240240

241-
if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
241+
if (preg_match('#^c\\.example\\.com$#s', $host, $hostMatches)) {
242242
// route5
243243
if ($pathinfo === '/route5') {
244244
return array('_route' => 'route5');
@@ -251,7 +251,7 @@ public function match($pathinfo)
251251
return array('_route' => 'route6');
252252
}
253253

254-
if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#si', $host, $hostMatches)) {
254+
if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#s', $host, $hostMatches)) {
255255
if (0 === strpos($pathinfo, '/route1')) {
256256
// route11
257257
if ($pathinfo === '/route11') {
@@ -277,7 +277,7 @@ public function match($pathinfo)
277277

278278
}
279279

280-
if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
280+
if (preg_match('#^c\\.example\\.com$#s', $host, $hostMatches)) {
281281
// route15
282282
if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#s', $pathinfo, $matches)) {
283283
return $this->mergeDefaults(array_replace($matches, array('_route' => 'route15')), array ());

‎src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -461,13 +461,6 @@ public function testUrlWithInvalidParameterInHostInNonStrictMode()
461461
$this->assertNull($generator->generate('test', array('foo' => 'baz'), false));
462462
}
463463

464-
public function testHostIsCaseInsensitive()
465-
{
466-
$routes = $this->getRoutes('test', new Route('/', array(), array('locale' => 'en|de|fr'), array(), '{locale}.FooBar.com'));
467-
$generator = $this->getGenerator($routes);
468-
$this->assertSame('//EN.FooBar.com/app.php/', $generator->generate('test', array('locale' => 'EN'), UrlGeneratorInterface::NETWORK_PATH));
469-
}
470-
471464
public function testGenerateNetworkPathBC()
472465
{
473466
$routes = $this->getRoutes('test', new Route('/{name}', array(), array('_scheme' => 'http'), array(), '{locale}.example.com'));

‎src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -405,25 +405,4 @@ public function testWithOutHostHostDoesNotMatch()
405405
$matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'example.com'));
406406
$matcher->match('/foo/bar');
407407
}
408-
409-
/**
410-
* @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
411-
*/
412-
public function testPathIsCaseSensitive()
413-
{
414-
$coll = new RouteCollection();
415-
$coll->add('foo', new Route('/locale', array(), array('locale' => 'EN|FR|DE')));
416-
417-
$matcher = new UrlMatcher($coll, new RequestContext());
418-
$matcher->match('/en');
419-
}
420-
421-
public function testHostIsCaseInsensitive()
422-
{
423-
$coll = new RouteCollection();
424-
$coll->add('foo', new Route('/', array(), array('locale' => 'EN|FR|DE'), array(), '{locale}.example.com'));
425-
426-
$matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
427-
$this->assertEquals(array('_route' => 'foo', 'locale' => 'en'), $matcher->match('/'));
428-
}
429408
}

‎src/Symfony/Component/Routing/Tests/RouteCompilerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public function provideCompileWithHostData()
208208
'/hello', '#^/hello$#s', array(), array(), array(
209209
array('text', '/hello'),
210210
),
211-
'#^www\.example\.com$#si', array(), array(
211+
'#^www\.example\.com$#s', array(), array(
212212
array('text', 'www.example.com'),
213213
),
214214
),
@@ -219,7 +219,7 @@ public function provideCompileWithHostData()
219219
array('variable', '/', '[^/]++', 'name'),
220220
array('text', '/hello'),
221221
),
222-
'#^www\.example\.(?P<tld>[^\.]++)$#si', array('tld'), array(
222+
'#^www\.example\.(?P<tld>[^\.]++)$#s', array('tld'), array(
223223
array('variable', '.', '[^\.]++', 'tld'),
224224
array('text', 'www.example'),
225225
),
@@ -230,7 +230,7 @@ public function provideCompileWithHostData()
230230
'/hello', '#^/hello$#s', array('locale', 'tld'), array(), array(
231231
array('text', '/hello'),
232232
),
233-
'#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#si', array('locale', 'tld'), array(
233+
'#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#s', array('locale', 'tld'), array(
234234
array('variable', '.', '[^\.]++', 'tld'),
235235
array('text', '.example'),
236236
array('variable', '', '[^\.]++', 'locale'),
@@ -242,7 +242,7 @@ public function provideCompileWithHostData()
242242
'/hello', '#^/hello$#s', array('locale', 'tld'), array(), array(
243243
array('text', '/hello'),
244244
),
245-
'#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#si', array('locale', 'tld'), array(
245+
'#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#s', array('locale', 'tld'), array(
246246
array('variable', '.', '[^\.]++', 'tld'),
247247
array('text', '.example'),
248248
array('variable', '', '[^\.]++', 'locale'),

‎src/Symfony/Component/Routing/Tests/RouteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ public function testSerializeWhenCompiled()
264264
*/
265265
public function testSerializedRepresentationKeepsWorking()
266266
{
267-
$serialized = 'C:31:"Symfony\Component\Routing\Route":934:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":569:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:30:"#^/prefix(?:/(?P<foo>\d+))?$#s";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:39:"#^(?P<locale>[^\.]++)\.example\.net$#si";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}';
267+
$serialized = 'C:31:"Symfony\Component\Routing\Route":933:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":568:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:30:"#^/prefix(?:/(?P<foo>\d+))?$#s";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:38:"#^(?P<locale>[^\.]++)\.example\.net$#s";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}';
268268
$unserialized = unserialize($serialized);
269269

270270
$route = new Route('/prefix/{foo}', array('foo' => 'default'), array('foo' => '\d+'));

0 commit comments

Comments
 (0)
0