Skip to content

Commit 5d6766a

Browse files
OskarStarkOskarStark
committed
Merge branch '4.2'
* 4.2: use use statement instead of namespace
2 parents 3ac6680 + 1bb7072 commit 5d6766a

21 files changed

+48
-84
lines changed

‎components/routing.rst

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ have to provide the name of a PHP file which returns a callable handling a :clas
319319
This class allows to chain imports, collections or simple route definition calls::
320320

321321
// RouteProvider.php
322-
namespace Symfony\Component\Routing\Loader\Configurator;
322+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
323323

324324
return function (RoutingConfigurator $routes) {
325325
$routes->add('route_name', '/foo')
@@ -444,9 +444,8 @@ routes with UTF-8 characters:
444444
.. code-block:: php
445445
446446
// config/routes.php
447-
namespace Symfony\Component\Routing\Loader\Configurator;
448-
449447
use App\Controller\DefaultController;
448+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
450449
451450
return function (RoutingConfigurator $routes) {
452451
$routes->add('route1', '/category/{name}')
@@ -565,9 +564,8 @@ You can also include UTF-8 strings as routing requirements:
565564
.. code-block:: php
566565
567566
// config/routes.php
568-
namespace Symfony\Component\Routing\Loader\Configurator;
569-
570567
use App\Controller\DefaultController;
568+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
571569
572570
return function (RoutingConfigurator $routes) {
573571
$routes->add('route2', '/category/{name}')

‎controller/error_pages.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ automatically when installing Twig support):
177177
.. code-block:: php
178178
179179
// config/routes/dev/twig.php
180-
namespace Symfony\Component\Routing\Loader\Configurator;
180+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
181181
182182
return function (RoutingConfigurator $routes) {
183183
$routes->import('@TwigBundle/Resources/config/routing/errors.xml')

‎controller/service.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,12 @@ a service like: ``App\Controller\HelloController::index``:
6363
.. code-block:: php
6464
6565
// config/routes.php
66-
namespace Symfony\Component\Routing\Loader\Configurator;
67-
6866
use App\Controller\HelloController;
67+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
6968
7069
return function (RoutingConfigurator $routes) {
7170
$routes->add('hello', '/hello')
72-
->controller(['HelloController::class, 'index'])
71+
->controller([HelloController::class, 'index'])
7372
->methods(['GET'])
7473
;
7574
};

‎routing.rst

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,8 @@ Now you can configure the routes:
112112
.. code-block:: php
113113
114114
// config/routes.php
115-
namespace Symfony\Component\Routing\Loader\Configurator;
116-
117115
use App\Controller\BlogController;
116+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
118117
119118
return function (RoutingConfigurator $routes) {
120119
// Matches /blog exactly
@@ -220,9 +219,8 @@ Symfony provides a handy way to declare localized routes without duplication.
220219
.. code-block:: php
221220
222221
// config/routes.php
223-
namespace Symfony\Component\Routing\Loader\Configurator;
224-
225222
use App\Controller\CompanyController;
223+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
226224
227225
return function (RoutingConfigurator $routes) {
228226
$routes->add('about_us', [
@@ -280,7 +278,7 @@ with a locale. This can be done by defining a different prefix for each locale
280278
.. code-block:: php
281279
282280
// config/routes/annotations.php
283-
namespace Symfony\Component\Routing\Loader\Configurator;
281+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
284282
285283
return function (RoutingConfigurator $routes) {
286284
$routes->import('../src/Controller/', 'annotation')
@@ -370,9 +368,8 @@ To fix this, add a *requirement* that the ``{page}`` wildcard can *only* match n
370368
.. code-block:: php
371369
372370
// config/routes.php
373-
namespace Symfony\Component\Routing\Loader\Configurator;
374-
375371
use App\Controller\BlogController;
372+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
376373
377374
return function (RoutingConfigurator $routes) {
378375
$routes->add('blog_list', '/blog/{page}')
@@ -440,9 +437,8 @@ concise, but it can decrease route readability when requirements are complex:
440437
.. code-block:: php
441438
442439
// config/routes.php
443-
namespace Symfony\Component\Routing\Loader\Configurator;
444-
445440
use App\Controller\BlogController;
441+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
446442
447443
return function (RoutingConfigurator $routes) {
448444
$routes->add('blog_list', '/blog/{page<\d+>}')
@@ -521,9 +517,8 @@ So how can you make ``blog_list`` once again match when the user visits
521517
.. code-block:: php
522518
523519
// config/routes.php
524-
namespace Symfony\Component\Routing\Loader\Configurator;
525-
526520
use App\Controller\BlogController;
521+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
527522
528523
return function (RoutingConfigurator $routes) {
529524
$routes->add('blog_list', '/blog/{page}')
@@ -595,9 +590,8 @@ placeholder:
595590
.. code-block:: php
596591
597592
// config/routes.php
598-
namespace Symfony\Component\Routing\Loader\Configurator;
599-
600593
use App\Controller\BlogController;
594+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
601595
602596
return function (RoutingConfigurator $routes) {
603597
$routes->add('blog_list', '/blog/{page<\d+>?1}')
@@ -704,9 +698,8 @@ With all of this in mind, check out this advanced example:
704698
.. code-block:: php
705699
706700
// config/routes.php
707-
namespace Symfony\Component\Routing\Loader\Configurator;
708-
709701
use App\Controller\ArticleController;
702+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
710703
711704
return function (RoutingConfigurator $routes) {
712705
$routes->add('article_show', '/articles/{_locale}/{year}/{slug}.{_format}')

‎routing/conditions.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ define arbitrary matching logic, use the ``condition`` routing setting:
6565
.. code-block:: php
6666
6767
// config/routes.php
68-
namespace Symfony\Component\Routing\Loader\Configurator;
69-
7068
use App\Controller\DefaultController;
69+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
7170
7271
return function (RoutingConfigurator $routes) {
7372
$routes->add('contact', '')

‎routing/custom_route_loader.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Take these lines from the ``routes.yaml``:
6262
.. code-block:: php
6363
6464
// config/routes.php
65-
namespace Symfony\Component\Routing\Loader\Configurator;
65+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
6666
6767
return function (RoutingConfigurator $routes) {
6868
$routes->import('../src/Controller', 'annotation');
@@ -116,7 +116,7 @@ and configure the service and method to call:
116116
.. code-block:: php
117117
118118
// config/routes.php
119-
namespace Symfony\Component\Routing\Loader\Configurator;
119+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
120120
121121
return function (RoutingConfigurator $routes) {
122122
$routes->import('admin_route_loader::loadRoutes', 'service');
@@ -294,7 +294,7 @@ What remains to do is adding a few lines to the routing configuration:
294294
.. code-block:: php
295295
296296
// config/routes.php
297-
namespace Symfony\Component\Routing\Loader\Configurator;
297+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
298298
299299
return function (RoutingConfigurator $routes) {
300300
$routes->import('.', 'extra');

‎routing/external_resources.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ This can be done by importing routing resources from the main routing file:
6161
.. code-block:: php
6262
6363
// config/routes.php
64-
namespace Symfony\Component\Routing\Loader\Configurator;
64+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
6565
6666
return function (RoutingConfigurator $routes) {
6767
// loads routes from the given routing file stored in some bundle
@@ -128,7 +128,7 @@ instead of ``/blog/{slug}``):
128128
.. code-block:: php
129129
130130
// config/routes.php
131-
namespace Symfony\Component\Routing\Loader\Configurator;
131+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
132132
133133
return function (RoutingConfigurator $routes) {
134134
$routes->import('../src/Controller/', 'annotation')
@@ -175,9 +175,8 @@ be prefixed with the string ``/site``.
175175
.. code-block:: php
176176
177177
// config/routes.php
178-
namespace Symfony\Component\Routing\Loader\Configurator;
179-
180178
use App\Controller\ArticleController;
179+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
181180
182181
return function (RoutingConfigurator $routes) {
183182
$routes->import('../src/Controller/', 'annotation')
@@ -244,7 +243,7 @@ a controller class or imported from a configuration file:
244243
.. code-block:: php
245244
246245
// config/routes.php
247-
namespace Symfony\Component\Routing\Loader\Configurator;
246+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
248247
249248
return function (RoutingConfigurator $routes) {
250249
$routes->import('../src/Controller/', 'annotation')

‎routing/extra_information.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,8 @@ to your controller, and as attributes of the ``Request`` object:
6565
.. code-block:: php
6666
6767
// config/routes.php
68-
namespace Symfony\Component\Routing\Loader\Configurator;
69-
7068
use App\Controller\BlogController;
69+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
7170
7271
return function (RoutingConfigurator $routes) {
7372
$routes->add('blog', '/blog/{page}')

‎routing/hostname_pattern.rst

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ You can also match any route with the HTTP *host* of the incoming request.
6767
.. code-block:: php
6868
6969
// config/routes.php
70-
namespace Symfony\Component\Routing\Loader\Configurator;
71-
7270
use App\Controller\MainController;
71+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
7372
7473
return function (RoutingConfigurator $routes) {
7574
$routes->add('mobile_homepage', '/')
@@ -153,9 +152,8 @@ you can use placeholders in your hostname:
153152
.. code-block:: php
154153
155154
// config/routes.php
156-
namespace Symfony\Component\Routing\Loader\Configurator;
157-
158155
use App\Controller\MainController;
156+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
159157
160158
return function (RoutingConfigurator $routes) {
161159
$routes->add('project_homepage', '/')
@@ -245,9 +243,8 @@ instance, if you want to match both ``m.example.com`` and
245243
.. code-block:: php
246244
247245
// config/routes.php
248-
namespace Symfony\Component\Routing\Loader\Configurator;
249-
250246
use App\Controller\MainController;
247+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
251248
252249
return function (RoutingConfigurator $routes) {
253250
$routes->add('mobile_homepage', '/')
@@ -344,9 +341,8 @@ instance, if you want to match both ``m.example.com`` and
344341
.. code-block:: php
345342
346343
// config/routes.php
347-
namespace Symfony\Component\Routing\Loader\Configurator;
348-
349344
use App\Controller\MainController;
345+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
350346
351347
return function (RoutingConfigurator $routes) {
352348
$routes->add('mobile_homepage', '/')
@@ -417,7 +413,7 @@ You can also set the host option on imported routes:
417413
.. code-block:: php
418414
419415
// config/routes.php
420-
namespace Symfony\Component\Routing\Loader\Configurator;
416+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
421417
422418
return function (RoutingConfigurator $routes) {
423419
$routes->import("@AcmeHelloBundle/Resources/config/routing.php")

‎routing/optional_placeholders.rst

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ the available blog posts for this imaginary blog application:
4848
.. code-block:: php
4949
5050
// config/routes.php
51-
namespace Symfony\Component\Routing\Loader\Configurator;
52-
5351
use App\Controller\BlogController;
52+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
5453
5554
return function (RoutingConfigurator $routes) {
5655
$routes->add('blog', '/blog')
@@ -101,9 +100,8 @@ entries? Update the route to have a new ``{page}`` placeholder:
101100
.. code-block:: php
102101
103102
// config/routes.php
104-
namespace Symfony\Component\Routing\Loader\Configurator;
105-
106103
use App\Controller\BlogController;
104+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
107105
108106
return function (RoutingConfigurator $routes) {
109107
$routes->add('blog', '/blog/{page}')
@@ -162,9 +160,8 @@ This is done by including it in the ``defaults`` collection:
162160
.. code-block:: php
163161
164162
// config/routes.php
165-
namespace Symfony\Component\Routing\Loader\Configurator;
166-
167163
use App\Controller\BlogController;
164+
use Symfony\Component\Routing\Loader\Configurator\RoutingConfigurator;
168165
169166
return function (RoutingConfigurator $routes) {
170167
$routes->add('blog', '/blog/{page}')

0 commit comments

Comments
 (0)