8000 QC fixes · symfony/symfony@2cea5b6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2cea5b6

Browse files
X-Coder264X-Coder264
committed
QC fixes
1 parent 6faae44 commit 2cea5b6

File tree

5 files changed

+19
-21
lines changed

5 files changed

+19
-21
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Routing/Router.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
3636
private $paramFetcher;
3737

3838
/**
39-
* @param ContainerInterface $container A ContainerInterface instance
40-
* @param mixed $resource The main resource to load
41-
* @param array $options An array of options
42-
* @param RequestContext $context The context
43-
* @param ContainerInterface|null $parameters A ContainerInterface instance allowing to fetch parameters
39+
* @param ContainerInterface $container A ContainerInterface instance
40+
* @param mixed $resource The main resource to load
41+
* @param array $options An array of options
42+
* @param RequestContext $context The context
43+
* @param ContainerInterface|null $parameters A ContainerInterface instance allowing to fetch parameters
4444
* @param LoggerInterface|null $logger
45-
* @param string|null $defaultLocale The default locale
4645
*/
47-
public function __construct(ContainerInterface $container, $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null, ?string $defaultLocale = null)
46+
public function __construct(ContainerInterface $container, $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null, string $defaultLocale = null)
4847
{
4948
$this->container = $container;
5049
$this->resource = $resource;

‎src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RouterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function testGenerateWithServiceParamWithSfContainer()
8282
$this->assertSame('"bar" == "bar"', $router->getRouteCollection()->get('foo')->getCondition());
8383
}
8484

85-
public function testGenerateWithDefaultLocale(): void
85+
public function testGenerateWithDefaultLocale()
8686
{
8787
$routes = new RouteCollection();
8888

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
8000
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"symfony/polyfill-mbstring": "~1.0",
2929
"symfony/filesystem": "~3.4|~4.0",
3030
"symfony/finder": "~3.4|~4.0",
31-
"symfony/routing": "^4.1"
31+
"symfony/routing": "^4.2.6"
3232
},
3333
"require-dev": {
3434
"doctrine/cache": "~1.0",

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,13 @@ class Router implements RouterInterface, RequestMatcherInterface
8989
private $expressionLanguageProviders = [];
9090

9191
/**
92-
* @param LoaderInterface $loader A LoaderInterface instance
93-
* @param mixed $resource The main resource to load
94-
* @param array $options An array of options
95-
* @param RequestContext $context The context
96-
* @param LoggerInterface $logger A logger instance
97-
* @param string|null $defaultLocale The default locale
92+
* @param LoaderInterface $loader A LoaderInterface instance
93+
* @param mixed $resource The main resource to load
94+
* @param array $options An array of options
95+
* @param RequestContext $context The context
96+
* @param LoggerInterface $logger A logger instance
9897
*/
99-
public function __construct(LoaderInterface $loader, $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null, ?string $defaultLocale = null)
98+
public function __construct(LoaderInterface $loader, $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null, string $defaultLocale = null)
10099
{
101100
$this->loader = $loader;
102101
$this->resource = $resource;

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public function testGlobalParameterHasHigherPriorityThanDefault()
162162
$this->assertSame('/app.php/de', $url);
163163
}
164164

165-
public function testGenerateWithDefaultLocale(): void
165+
public function testGenerateWithDefaultLocale()
166166
{
167167
$routes = new RouteCollection();
168168

@@ -186,7 +186,7 @@ public function testGenerateWithDefaultLocale(): void
186186
);
187187
}
188188

189-
public function testGenerateWithOverriddenParameterLocale(): void
189+
public function testGenerateWithOverriddenParameterLocale()
190190
{
191191
$routes = new RouteCollection();
192192

@@ -210,7 +210,7 @@ public function testGenerateWithOverriddenParameterLocale(): void
210210
);
211211
}
212212

213-
public function testGenerateWithOverriddenParameterLocaleFromRequestContext(): void
213+
public function testGenerateWithOverriddenParameterLocaleFromRequestContext()
214214
{
215215
$routes = new RouteCollection();
216216

@@ -250,7 +250,7 @@ public function testGenerateWithoutRoutes()
250250
/**
251251
* @expectedException \Symfony\Component\Routing\Exception\RouteNotFoundException
252252
*/
253-
public function testGenerateWithInvalidLocale(): void
253+
public function testGenerateWithInvalidLocale()
254254
{
255255
$routes = new RouteCollection();
256256

@@ -819,7 +819,7 @@ public function provideLookAroundRequirementsInPath()
819819
yield ['/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(?<!^).+'];
820820
}
821821

822-
protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null, ?string $defaultLocale = null)
822+
protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null, string $defaultLocale = null)
823823
{
824824
$context = new RequestContext('/app.php');
825825
foreach ($parameters as $key => $value) {

0 commit comments

Comments
 (0)
0