Skip to content

Commit c6a8f6c

Browse files
fabpotfabpot
committed
fixed CS
1 parent 8bc2600 commit c6a8f6c

14 files changed

+1246
-1246
lines changed

‎Matcher/Dumper/PhpMatcherDumper.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,15 @@ private function compileStaticRoutes(array $staticRoutes, array &$conditions): s
207207
$code = '';
208208

209209
foreach ($staticRoutes as $url => $routes) {
210-
$code .= self::export($url)." => array(\n";
210+
$code .= self::export($url)." => [\n";
211211
foreach ($routes as $name => list($route, $hasTrailingSlash)) {
212212
$code .= $this->compileRoute($route, $name, !$route->compile()->getHostVariables() ? $route->getHost() : $route->compile()->getHostRegex() ?: null, $hasTrailingSlash, false, $conditions);
213213
}
214-
$code .= "),\n";
214+
$code .= "],\n";
215215
}
216216

217217
if ($code) {
218-
return "\$this->staticRoutes = array(\n{$this->indent($code, 1)});\n";
218+
return "\$this->staticRoutes = [\n{$this->indent($code, 1)}];\n";
219219
}
220220

221221
return $code;
@@ -348,8 +348,8 @@ private function compileDynamicRoutes(RouteCollection $collection, bool $matchHo
348348

349349
unset($state->getVars);
350350

351-
return "\$this->regexpList = array({$code}\n);\n"
352-
."\$this->dynamicRoutes = array(\n{$this->indent($state->routes, 1)});\n";
351+
return "\$this->regexpList = [{$code}\n];\n"
352+
."\$this->dynamicRoutes = [\n{$this->indent($state->routes, 1)}];\n";
353353
}
354354

355355
/**
@@ -394,7 +394,7 @@ private function compileStaticPrefixCollection(StaticPrefixCollection $tree, \st
394394
$state->regex .= $rx;
395395

396396
$prevRegex = $compiledRoute->getRegex();
397-
$state->routes .= sprintf("%s => array(\n%s),\n", $state->mark, $this->compileRoute($route, $name, $vars, $hasTrailingSlash, $hasTrailingVar, $conditions));
397+
$state->routes .= sprintf("%s => [\n%s],\n", $state->mark, $this->compileRoute($route, $name, $vars, $hasTrailingSlash, $hasTrailingVar, $conditions));
398398
}
399399

400400
return $code;
@@ -420,7 +420,7 @@ private function compileRoute(Route $route, string $name, $vars, bool $hasTraili
420420
}
421421

422422
return sprintf(
423-
" array(%s, %s, %s, %s, %s, %s, %s),\n",
423+
" [%s, %s, %s, %s, %s, %s, %s],\n",
424424
self::export(['_route' => $name] + $defaults),
425425
self::export($vars),
426426
self::export(array_flip($route->getMethods()) ?: null),
@@ -445,7 +445,7 @@ private function getExpressionLanguage()
445445

446446
private function indent($code, $level = 1)
447447
{
448-
$code = preg_replace('/ => array\(\n (array\(.+),\n\),/', ' => array($1),', $code);
448+
$code = preg_replace('/ => \[\n (\[.+),\n\],/', ' => [$1],', $code);
449449

450450
return preg_replace('/^./m', str_repeat(' ', $level).'$0', $code);
451451
}
@@ -466,11 +466,11 @@ public static function export($value): string
466466
return str_replace("\n", '\'."\n".\'', var_export($value, true));
467467
}
468468
if (!$value) {
469-
return 'array()';
469+
return '[]';
470470
}
471471

472472
$i = 0;
473-
$export = 'array(';
473+
$export = '[';
474474

475475
foreach ($value as $k => $v) {
476476
if ($i === $k) {
@@ -486,6 +486,6 @@ public static function export($value): string
486486
$export .= self::export($v).', ';
487487
}
488488

489-
return substr_replace($export, ')', -2);
489+
return substr_replace($export, ']', -2);
490490
}
491491
}

‎Tests/Fixtures/dumper/url_matcher1.php

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@ public function __construct(RequestContext $context)
1515
{
1616
$this->context = $context;
1717
$this->matchHost = true;
18-
$this->staticRoutes = array(
19-
'/test/baz' => array(array(array('_route' => 'baz'), null, null, null, false, false, null)),
20-
'/test/baz.html' => array(array(array('_route' => 'baz2'), null, null, null, false, false, null)),
21-
'/test/baz3' => array(array(array('_route' => 'baz3'), null, null, null, true, false, null)),
22-
'/foofoo' => array(array(array('_route' => 'foofoo', 'def' => 'test'), null, null, null, false, false, null)),
23-
'/spa ce' => array(array(array('_route' => 'space'), null, null, null, false, false, null)),
24-
'/multi/new' => array(array(array('_route' => 'overridden2'), null, null, null, false, false, null)),
25-
'/multi/hey' => array(array(array('_route' => 'hey'), null, null, null, true, false, null)),
26-
'/ababa' => array(array(array('_route' => 'ababa'), null, null, null, false, false, null)),
27-
'/route1' => array(array(array('_route' => 'route1'), 'a.example.com', null, null, false, false, null)),
28-
'/c2/route2' => array(array(array('_route' => 'route2'), 'a.example.com', null, null, false, false, null)),
29-
'/route4' => array(array(array('_route' => 'route4'), 'a.example.com', null, null, false, false, null)),
30-
'/c2/route3' => array(array(array('_route' => 'route3'), 'b.example.com', null, null, false, false, null)),
31-
'/route5' => array(array(array('_route' => 'route5'), 'c.example.com', null, null, false, false, null)),
32-
'/route6' => array(array(array('_route' => 'route6'), null, null, null, false, false, null)),
33-
'/route11' => array(array(array('_route' => 'route11'), '#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', null, null, false, false, null)),
34-
'/route12' => array(array(array('_route' => 'route12', 'var1' => 'val'), '#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', null, null, false, false, null)),
35-
'/route17' => array(array(array('_route' => 'route17'), null, null, null, false, false, null)),
36-
);
37-
$this->regexpList = array(
18+
$this->staticRoutes = [
19+
'/test/baz' => [[['_route' => 'baz'], null, null, null, false, false, null]],
20+
'/test/baz.html' => [[['_route' => 'baz2'], null, null, null, false, false, null]],
21+
'/test/baz3' => [[['_route' => 'baz3'], null, null, null, true, false, null]],
22+
'/foofoo' => [[['_route' => 'foofoo', 'def' => 'test'], null, null, null, false, false, null]],
23+
'/spa ce' => [[['_route' => 'space'], null, null, null, false, false, null]],
24+
'/multi/new' => [[['_route' => 'overridden2'], null, null, null, false, false, null]],
25+
'/multi/hey' => [[['_route' => 'hey'], null, null, null, true, false, null]],
26+
'/ababa' => [[['_route' => 'ababa'], null, null, null, false, false, null]],
27+
'/route1' => [[['_route' => 'route1'], 'a.example.com', null, null, false, false, null]],
28+
'/c2/route2' => [[['_route' => 'route2'], 'a.example.com', null, null, false, false, null]],
29+
'/route4' => [[['_route' => 'route4'], 'a.example.com', null, null, false, false, null]],
30+
'/c2/route3' => [[['_route' => 'route3'], 'b.example.com', null, null, false, false, null]],
31+
'/route5' => [[['_route' => 'route5'], 'c.example.com', null, null, false, false, null]],
32+
'/route6' => [[['_route' => 'route6'], null, null, null, false, false, null]],
33+
'/route11' => [[['_route' => 'route11'], '#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', null, null, false, false, null]],
34+
'/route12' => [[['_route' => 'route12', 'var1' => 'val'], '#^(?P<var1>[^\\.]++)\\.example\\.com$#sDi', null, null, false, false, null]],
35+
'/route17' => [[['_route' => 'route17'], null, null, null, false, false, null]],
36+
];
37+
$this->regexpList = [
3838
0 => '{^(?'
3939
.'|(?:(?:[^./]*+\\.)++)(?'
4040
.'|/foo/(baz|symfony)(*:47)'
@@ -81,33 +81,33 @@ public function __construct(RequestContext $context)
8181
.')'
8282
.')'
8383
.')/?$}sD',
84-
);
85-
$this->dynamicRoutes = array(
86-
47 => array(array(array('_route' => 'foo', 'def' => 'test'), array('bar'), null, null, false, true, null)),
87-
70 => array(array(array('_route' => 'bar'), array('foo'), array('GET' => 0, 'HEAD' => 1), null, false, true, null)),
88-
90 => array(array(array('_route' => 'barhead'), array('foo'), array('GET' => 0), null, false, true, null)),
89-
115 => array(
90-
array(array('_route' => 'baz4'), array('foo'), null, null, true, true, null),
91-
array(array('_route' => 'baz5'), array('foo'), array('POST' => 0), null, true, true, null),
92-
array(array('_route' => 'baz.baz6'), array('foo'), array('PUT' => 0), null, true, true, null),
93-
),
94-
131 => array(array(array('_route' => 'quoter'), array('quoter'), null, null, false, true, null)),
95-
160 => array(array(array('_route' => 'foo1'), array('foo'), array('PUT' => 0), null, false, true, null)),
96-
168 => array(array(array('_route' => 'bar1'), array('bar'), null, null, false, true, null)),
97-
181 => array(array(array('_route' => 'overridden'), array('var'), null, null, false, true, null)),
98-
204 => array(array(array('_route' => 'foo2'), array('foo1'), null, null, false, true, null)),
99-
212 => array(array(array('_route' => 'bar2'), array('bar1'), null, null, false, true, null)),
100-
248 => array(array(array('_route' => 'helloWorld', 'who' => 'World!'), array('who'), null, null, false, true, null)),
101-
279 => array(array(array('_route' => 'foo3'), array('_locale', 'foo'), null, null, false, true, null)),
102-
287 => array(array(array('_route' => 'bar3'), array('_locale', 'bar'), null, null, false, true, null)),
103-
309 => array(array(array('_route' => 'foo4'), array('foo'), null, null, false, true, null)),
104-
371 => array(array(array('_route' => 'route13'), array('var1', 'name'), null, null, false, true, null)),
105-
389 => array(array(array('_route' => 'route14', 'var1' => 'val'), array('var1', 'name'), null, null, false, true, null)),
106-
441 => array(array(array('_route' => 'route15'), array('name'), null, null, false, true, null)),
107-
489 => array(array(array('_route' => 'route16', 'var1' => 'val'), array('name'), null, null, false, true, null)),
108-
510 => array(array(array('_route' => 'a'), array(), null, null, false, false, null)),
109-
531 => array(array(array('_route' => 'b'), array('var'), null, null, false, true, null)),
110-
549 => array(array(array('_route' => 'c'), array('var'), null, null, false, true, null)),
111-
);
84+
];
85+
$this->dynamicRoutes = [
86+
47 => [[['_route' => 'foo', 'def' => 'test'], ['bar'], null, null, false, true, null]],
87+
70 => [[['_route' => 'bar'], ['foo'], ['GET' => 0, 'HEAD' => 1], null, false, true, null]],
88+
90 => [[['_route' => 'barhead'], ['foo'], ['GET' => 0], null, false, true, null]],
89+
115 => [
90+
[['_route' => 'baz4'], ['foo'], null, null, true, true, null],
91+
[['_route' => 'baz5'], ['foo'], ['POST' => 0], null, true, true, null],
92+
[['_route' => 'baz.baz6'], ['foo'], ['PUT' => 0], null, true, true, null],
93+
],
94+
131 => [[['_route' => 'quoter'], ['quoter'], null, null, false, true, null]],
95+
160 => [[['_route' => 'foo1'], ['foo'], ['PUT' => 0], null, false, true, null]],
96+
168 => [[['_route' => 'bar1'], ['bar'], null, null, false, true, null]],
97+
181 => [[['_route' => 'overridden'], ['var'], null, null, false, true, null]],
98+
204 => [[['_route' => 'foo2'], ['foo1'], null, null, false, true, null]],
99+
212 => [[['_route' => 'bar2'], ['bar1'], null, null, false, true, null]],
100+
248 => [[['_route' => 'helloWorld', 'who' => 'World!'], ['who'], null, null, false, true, null]],
101+
279 => [[['_route' => 'foo3'], ['_locale', 'foo'], null, null, false, true, null]],
102+
287 => [[['_route' => 'bar3'], ['_locale', 'bar'], null, null, false, true, null]],
103+
309 => [[['_route' => 'foo4'], ['foo'], null, null, false, true, null]],
104+
371 => [[['_route' => 'route13'], ['var1', 'name'], null, null, false, true, null]],
105+
389 => [[['_route' => 'route14', 'var1' => 'val'], ['var1', 'name'], null, null, false, true, null]],
106+
441 => [[['_route' => 'route15'], ['name'], null, null, false, true, null]],
107+
489 => [[['_route' => 'route16', 'var1' => 'val'], ['name'], null, null, false, true, null]],
108+
510 => [[['_route' => 'a'], [], null, null, false, false, null]],
109+
531 => [[['_route' => 'b'], ['var'], null, null, false, true, null]],
110+
549 => [[['_route' => 'c'], ['var'], null, null, false, true, null]],
111+
];
112112
}
113113
}

0 commit comments

Comments
 (0)