Phpdoc and UPGRADE fixes

vudaltsov · vudaltsov · commit 41b38f2b76d7 · 2019-11-25T13:39:36.000+03:00
diff --git a/UPGRADE-6.0.md b/UPGRADE-6.0.md
@@ -1,4 +1,4 @@
-UPGRADE FROM 5.0 to 5.1
+UPGRADE FROM 5.x to 6.0
 =======================
 
 FrameworkBundle
diff --git a/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php b/src/Symfony/Bundle/FrameworkBundle/Kernel/MicroKernelTrait.php
@@ -40,7 +40,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes)
     }
 
     /**
-     * Add or import routes into your application.
+     * Adds or imports routes into your application.
      *
      *     $routes->import($this->getProjectDir().'/config/*.{yaml,php}');
      *     $routes
@@ -115,7 +115,7 @@ public function loadRoutes(LoaderInterface $loader)
         $collection = $routes->build();
 
         if (0 !== \count($collection)) {
-            @trigger_error(sprintf('Adding routes via the "%s:configureRoutes()" method is deprecated since Symfony 5.1 and will have no effect in 6.0. Use configureRouting() instead.', self::class), E_USER_DEPRECATED);
+            @trigger_error(sprintf('Adding routes via the "%s:configureRoutes()" method is deprecated since Symfony 5.1 and will have no effect in 6.0; use "configureRouting()" instead.', self::class), E_USER_DEPRECATED);
         }
 
         $file = (new \ReflectionObject($this))->getFileName();

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ protected function configureRoutes(RouteCollectionBuilder $routes)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`/**`
`43`		`- * Add or import routes into your application.`
	`43`	`+ * Adds or imports routes into your application.`
`44`	`44`	`*`
`45`	`45`	`* $routes->import($this->getProjectDir().'/config/*.{yaml,php}');`
`46`	`46`	`* $routes`
`@@ -115,7 +115,7 @@ public function loadRoutes(LoaderInterface $loader)`
`115`	`115`	`$collection = $routes->build();`
`116`	`116`
`117`	`117`	`if (0 !== \count($collection)) {`
`118`		`- @trigger_error(sprintf('Adding routes via the "%s:configureRoutes()" method is deprecated since Symfony 5.1 and will have no effect in 6.0. Use configureRouting() instead.', self::class), E_USER_DEPRECATED);`
	`118`	`+ @trigger_error(sprintf('Adding routes via the "%s:configureRoutes()" method is deprecated since Symfony 5.1 and will have no effect in 6.0; use "configureRouting()" instead.', self::class), E_USER_DEPRECATED);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`	`$file = (new \ReflectionObject($this))->getFileName();`