QC fixes

X-Coder264 · X-Coder264 · commit b9e3d03e92fc · 2019-04-08T23:05:30.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
@@ -36,15 +36,14 @@ class Router extends BaseRouter implements WarmableInterface, ServiceSubscriberI
     private $paramFetcher;
 
     /**
-     * @param ContainerInterface      $container     A ContainerInterface instance
-     * @param mixed                   $resource      The main resource to load
-     * @param array                   $options       An array of options
-     * @param RequestContext          $context       The context
-     * @param ContainerInterface|null $parameters    A ContainerInterface instance allowing to fetch parameters
+     * @param ContainerInterface      $container  A ContainerInterface instance
+     * @param mixed                   $resource   The main resource to load
+     * @param array                   $options    An array of options
+     * @param RequestContext          $context    The context
+     * @param ContainerInterface|null $parameters A ContainerInterface instance allowing to fetch parameters
      * @param LoggerInterface|null    $logger
-     * @param string|null             $defaultLocale The default locale
      */
-    public function __construct(ContainerInterface $container, $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null, ?string $defaultLocale = null)
+    public function __construct(ContainerInterface $container, $resource, array $options = [], RequestContext $context = null, ContainerInterface $parameters = null, LoggerInterface $logger = null, string $defaultLocale = null)
     {
         $this->container = $container;
         $this->resource = $resource;
diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json
@@ -28,7 +28,7 @@
         "symfony/polyfill-mbstring": "~1.0",
         "symfony/filesystem": "~3.4|~4.0",
         "symfony/finder": "~3.4|~4.0",
-        "symfony/routing": "^4.1"
+        "symfony/routing": "^4.2.6"
     },
     "require-dev": {
         "doctrine/cache": "~1.0",
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
@@ -89,12 +89,11 @@ class Router implements RouterInterface, RequestMatcherInterface
     private $expressionLanguageProviders = [];
 
     /**
-     * @param LoaderInterface $loader        A LoaderInterface instance
-     * @param mixed           $resource      The main resource to load
-     * @param array           $options       An array of options
-     * @param RequestContext  $context       The context
-     * @param LoggerInterface $logger        A logger instance
-     * @param string|null     $defaultLocale The default locale
+     * @param LoaderInterface $loader   A LoaderInterface instance
+     * @param mixed           $resource The main resource to load
+     * @param array           $options  An array of options
+     * @param RequestContext  $context  The context
+     * @param LoggerInterface $logger   A logger instance
      */
     public function __construct(LoaderInterface $loader, $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null, ?string $defaultLocale = null)
     {
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -819,7 +819,7 @@ public function provideLookAroundRequirementsInPath()
         yield ['/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(?<!^).+'];
     }
 
-    protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null, ?string $defaultLocale = null)
+    protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null, string $defaultLocale = null)
     {
         $context = new RequestContext('/app.php');
         foreach ($parameters as $key => $value) {

Original file line number	Diff line number	Diff line change
`@@ -819,7 +819,7 @@ public function provideLookAroundRequirementsInPath()`
`819`	`819`	`yield ['/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(?<!^).+'];`
`820`	`820`	`}`
`821`	`821`
`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)`
`823`	`823`	`{`
`824`	`824`	`$context = new RequestContext('/app.php');`
`825`	`825`	`foreach ($parameters as $key => $value) {`