Skip to content

Commit 6c2a590

Browse files
committed
Merge branch '4.4' into 5.2
* 4.4: Unifying wording to "configuration parameter"
2 parents f473995 + 9807a2f commit 6c2a590

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

best_practices.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Use Constants to Define Options that Rarely Change
130130
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
131131

132132
Configuration options like the number of items to display in some listing rarely
133-
change. Instead of defining them as :ref:`service container parameters <configuration-parameters>`,
133+
change. Instead of defining them as :ref:`configuration parameters <configuration-parameters>`,
134134
define them as PHP constants in the related classes. Example::
135135

136136
// src/Entity/Post.php

routing.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ arbitrary matching logic:
328328
* condition="context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'"
329329
* )
330330
*
331-
* expressions can also include config parameters:
331+
* expressions can also include configuration parameters:
332332
* condition: "request.headers.get('User-Agent') matches '%app.allowed_browsers%'"
333333
*/
334334
public function contact(): Response
@@ -367,7 +367,7 @@ arbitrary matching logic:
367367
path: /contact
368368
controller: 'App\Controller\DefaultController::contact'
369369
condition: "context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'"
370-
# expressions can also include config parameters:
370+
# expressions can also include configuration parameters:
371371
# condition: "request.headers.get('User-Agent') matches '%app.allowed_browsers%'"
372372
373373
.. code-block:: xml
@@ -381,7 +381,7 @@ arbitrary matching logic:
381381
382382
<route id="contact" path="/contact" controller="App\Controller\DefaultController::contact">
383383
<condition>context.getMethod() in ['GET', 'HEAD'] and request.headers.get('User-Agent') matches '/firefox/i'</condition>
384-
<!-- expressions can also include config parameters: -->
384+
<!-- expressions can also include configuration parameters: -->
385385
<!-- <condition>request.headers.get('User-Agent') matches '%app.allowed_browsers%'</condition> -->
386386
</route>
387387
</routes>
@@ -396,7 +396,7 @@ arbitrary matching logic:
396396
$routes->add('contact', '/contact')
397397
->controller([DefaultController::class, 'contact'])
398398
->condition('context.getMethod() in ["GET", "HEAD"] and request.headers.get("User-Agent") matches "/firefox/i"')
399-
// expressions can also include config parameters:
399+
// expressions can also include configuration parameters:
400400
// 'request.headers.get("User-Agent") matches "%app.allowed_browsers%"'
401401
;
402402
};
@@ -702,7 +702,7 @@ URL Route Parameters
702702
.. tip::
703703

704704
Route requirements (and route paths too) can include
705-
:ref:`container parameters <configuration-parameters>`, which is useful to
705+
:ref:`configuration parameters <configuration-parameters>`, which is useful to
706706
define complex regular expressions once and reuse them in multiple routes.
707707

708708
.. tip::
@@ -2047,7 +2047,7 @@ these routes.
20472047
[],
20482048
[],
20492049
['HTTP_HOST' => 'm.example.com']
2050-
// or get the value from some container parameter:
2050+
// or get the value from some configuration parameter:
20512051
// ['HTTP_HOST' => 'm.' . $client->getContainer()->getParameter('domain')]
20522052
);
20532053

0 commit comments

Comments
 (0)