Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb9e3d03

Browse files
committed
QC fixes
1 parent6faae44 commitb9e3d03

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
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 $containerA ContainerInterface instance
40-
* @param mixed $resourceThe main resource to load
41-
* @param array $optionsAn array of options
42-
* @param RequestContext $contextThe context
43-
* @param ContainerInterface|null $parametersA 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-
publicfunction__construct(ContainerInterface$container,$resource,array$options = [],RequestContext$context =null,ContainerInterface$parameters =null,LoggerInterface$logger =null,?string$defaultLocale =null)
46+
publicfunction__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/composer.json‎

Lines changed: 1 addition & 1 deletion
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: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,11 @@ 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
*/
9998
publicfunction__construct(LoaderInterface$loader,$resource,array$options = [],RequestContext$context =null,LoggerInterface$logger =null, ?string$defaultLocale =null)
10099
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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-
protectedfunctiongetGenerator(RouteCollection$routes,array$parameters = [],$logger =null,?string$defaultLocale =null)
822+
protectedfunctiongetGenerator(RouteCollection$routes,array$parameters = [],$logger =null,string$defaultLocale =null)
823823
{
824824
$context =newRequestContext('/app.php');
825825
foreach ($parametersas$key =>$value) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp