Skip to content

Commit 2c980e6

Browse files
wouterjwouterj
committed
Merge branch '3.4' into 4.2
* 3.4: Don't use Flex config in 3.4 branch
2 parents 5e1360b + 77c8614 commit 2c980e6

File tree

5 files changed

+49
-49
lines changed

5 files changed

+49
-49
lines changed

‎cache.rst‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ adapter (template) they use by using the ``app`` and ``system`` key like:
5959

6060
.. code-block:: yaml
6161
62-
# config/packages/cache.yaml
62+
# app/config/config.yml
6363
framework:
6464
cache:
6565
app: cache.adapter.filesystem
6666
system: cache.adapter.system
6767
6868
.. code-block:: xml
6969
70-
<!-- config/packages/cache.xml -->
70+
<!-- app/config/config.xml -->
7171
<?xml version="1.0" encoding="UTF-8" ?>
7272
<container xmlns="http://symfony.com/schema/dic/services"
7373
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -84,7 +84,7 @@ adapter (template) they use by using the ``app`` and ``system`` key like:
8484
8585
.. code-block:: php
8686
87-
// config/packages/cache.php
87+
// app/config/config.php
8888
$container->loadFromExtension('framework', [
8989
'cache' => [
9090
'app' => 'cache.adapter.filesystem',
@@ -118,7 +118,7 @@ will create pool with service id of ``cache.[type]``
118118

119119
.. code-block:: yaml
120120
121-
# config/packages/cache.yaml
121+
# app/config/config.yml
122122
framework:
123123
cache:
124124
directory: '%kernel.cache_dir%/pools' # Only used with cache.adapter.filesystem
@@ -136,7 +136,7 @@ will create pool with service id of ``cache.[type]``
136136
137137
.. code-block:: xml
138138
139-
<!-- config/packages/cache.xml -->
139+
<!-- app/config/config.xml -->
140140
<?xml version="1.0" encoding="UTF-8" ?>
141141
<container xmlns="http://symfony.com/schema/dic/services"
142142
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -164,7 +164,7 @@ will create pool with service id of ``cache.[type]``
164164
165165
.. code-block:: php
166166
167-
// config/packages/cache.php
167+
// app/config/config.php
168168
$container->loadFromExtension('framework', [
169169
'cache' => [
170170
// Only used with cache.adapter.filesystem
@@ -192,7 +192,7 @@ You can also create more customized pools. All you need is an adapter:
192192

193193
.. code-block:: yaml
194194
195-
# config/packages/cache.yaml
195+
# app/config/config.yml
196196
framework:
197197
cache:
198198
default_memcached_provider: 'memcached://localhost'
@@ -207,7 +207,7 @@ You can also create more customized pools. All you need is an adapter:
207207
208208
.. code-block:: xml
209209
210-
<!-- config/packages/cache.xml -->
210+
<!-- app/config/config.xml -->
211211
<?xml version="1.0" encoding="UTF-8" ?>
212212
<container xmlns="http://symfony.com/schema/dic/services"
213213
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -226,7 +226,7 @@ You can also create more customized pools. All you need is an adapter:
226226
227227
.. code-block:: php
228228
229-
// config/packages/cache.php
229+
// app/config/config.php
230230
$container->loadFromExtension('framework', [
231231
'cache' => [
232232
'default_memcached_provider' => 'memcached://localhost',
@@ -258,7 +258,7 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
258258

259259
.. code-block:: yaml
260260
261-
# config/packages/cache.yaml
261+
# app/config/config.yml
262262
framework:
263263
cache:
264264
app: my_configured_app_cache
@@ -279,7 +279,7 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
279279
280280
.. code-block:: xml
281281
282-
<!-- config/packages/cache.xml -->
282+
<!-- app/config/config.xml -->
283283
<?xml version="1.0" encoding="UTF-8" ?>
284284
<container xmlns="http://symfony.com/schema/dic/services"
285285
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -300,7 +300,7 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
300300
301301
.. code-block:: php
302302
303-
// config/packages/cache.php
303+
// app/config/config.php
304304
$container->loadFromExtension('framework', [
305305
'cache' => [
306306
'app' => 'my_configured_app_cache',
@@ -339,7 +339,7 @@ and use that when configuring the pool.
339339

340340
.. code-block:: yaml
341341
342-
# config/packages/cache.yaml
342+
# app/config/config.yml
343343
framework:
344344
cache:
345345
pools:
@@ -357,7 +357,7 @@ and use that when configuring the pool.
357357
358358
.. code-block:: xml
359359
360-
<!-- config/packages/cache.xml -->
360+
<!-- app/config/config.xml -->
361361
<?xml version="1.0" encoding="UTF-8" ?>
362362
<container xmlns="http://symfony.com/schema/dic/services"
363363
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -384,7 +384,7 @@ and use that when configuring the pool.
384384
385385
.. code-block:: php
386386
387-
// config/packages/cache.php
387+
// app/config/config.php
388388
$container->loadFromExtension('framework', [
389389
'cache' => [
390390
'pools' => [
@@ -416,7 +416,7 @@ case the value needs to be recalculated.
416416

417417
.. code-block:: yaml
418418
419-
# config/packages/cache.yaml
419+
# app/config/config.yml
420420
framework:
421421
cache:
422422
pools:
@@ -435,7 +435,7 @@ case the value needs to be recalculated.
435435
436436
.. code-block:: xml
437437
438-
<!-- config/packages/cache.xml -->
438+
<!-- app/config/config.xml -->
439439
<?xml version="1.0" encoding="UTF-8" ?>
440440
<container xmlns="http://symfony.com/schema/dic/services"
441441
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -464,7 +464,7 @@ case the value needs to be recalculated.
464464
465465
.. code-block:: php
466466
467-
// config/packages/cache.php
467+
// app/config/config.php
468468
$container->loadFromExtension('framework', [
469469
'cache' => [
470470
'pools' => [

‎configuration/environment_variables.rst‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,14 @@ turn the value of the ``HTTP_PORT`` env var into an integer:
145145

146146
.. code-block:: yaml
147147
148-
# config/packages/framework.yaml
148+
# app/config/config.yml
149149
framework:
150150
router:
151151
http_port: env(int:HTTP_PORT)
152152
153153
.. code-block:: xml
154154
155-
<!-- config/packages/framework.xml -->
155+
<!-- app/config/config.xml -->
156156
<?xml version="1.0" encoding="UTF-8" ?>
157157
<container xmlns="http://symfony.com/schema/dic/services"
158158
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -169,7 +169,7 @@ turn the value of the ``HTTP_PORT`` env var into an integer:
169169
170170
.. code-block:: php
171171
172-
// config/packages/framework.php
172+
// app/config/config.php
173173
$container->loadFromExtension('framework', [
174174
'router' => [
175175
'http_port' => '%env(int:HTTP_PORT)%',
@@ -185,15 +185,15 @@ Symfony provides the following env var processors:
185185

186186
.. code-block:: yaml
187187
188-
# config/packages/framework.yaml
188+
# app/config/config.yml
189189
parameters:
190190
env(SECRET): 'some_secret'
191191
framework:
192192
secret: '%env(string:SECRET)%'
193193
194194
.. code-block:: xml
195195
196-
<!-- config/packages/framework.xml -->
196+
<!-- app/config/config.xml -->
197197
<?xml version="1.0" encoding="UTF-8" ?>
198198
<container xmlns="http://symfony.com/schema/dic/services"
199199
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -212,7 +212,7 @@ Symfony provides the following env var processors:
212212
213213
.. code-block:: php
214214
215-
// config/packages/framework.php
215+
// app/config/config.php
216216
$container->setParameter('env(SECRET)', 'some_secret');
217217
$container->loadFromExtension('framework', [
218218
'secret' => '%env(string:SECRET)%',
@@ -225,15 +225,15 @@ Symfony provides the following env var processors:
225225

226226
.. code-block:: yaml
227227
228-
# config/packages/framework.yaml
228+
# app/config/config.yml
229229
parameters:
230230
env(HTTP_METHOD_OVERRIDE): 'true'
231231
framework:
232232
http_method_override: '%env(bool:HTTP_METHOD_OVERRIDE)%'
233233
234234
.. code-block:: xml
235235
236-
<!-- config/packages/framework.xml -->
236+
<!-- app/config/config.xml -->
237237
<?xml version="1.0" encoding="UTF-8" ?>
238238
<container xmlns="http://symfony.com/schema/dic/services"
239239
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -252,7 +252,7 @@ Symfony provides the following env var processors:
252252
253253
.. code-block:: php
254254
255-
// config/packages/framework.php
255+
// app/config/config.php
256256
$container->setParameter('env(HTTP_METHOD_OVERRIDE)', 'true');
257257
$container->loadFromExtension('framework', [
258258
'http_method_override' => '%env(bool:HTTP_METHOD_OVERRIDE)%',
@@ -271,7 +271,7 @@ Symfony provides the following env var processors:
271271

272272
.. code-block:: yaml
273273
274-
# config/packages/security.yaml
274+
# app/config/config.yml
275275
parameters:
276276
env(HEALTH_CHECK_METHOD): 'Symfony\Component\HttpFoundation\Request::METHOD_HEAD'
277277
security:
@@ -280,7 +280,7 @@ Symfony provides the following env var processors:
280280
281281
.. code-block:: xml
282282
283-
<!-- config/packages/security.xml -->
283+
<!-- app/config/config.xml -->
284284
<?xml version="1.0" encoding="UTF-8" ?>
285285
<container xmlns="http://symfony.com/schema/dic/services"
286286
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -299,7 +299,7 @@ Symfony provides the following env var processors:
299299
300300
.. code-block:: php
301301
302-
// config/packages/security.php
302+
// app/config/config.php
303303
$container->setParameter('env(HEALTH_CHECK_METHOD)', 'Symfony\Component\HttpFoundation\Request::METHOD_HEAD');
304304
$container->loadFromExtension('security', [
305305
'access_control' => [
@@ -321,15 +321,15 @@ Symfony provides the following env var processors:
321321

322322
.. code-block:: yaml
323323
324-
# config/packages/framework.yaml
324+
# app/config/config.yml
325325
parameters:
326326
env(TRUSTED_HOSTS): '["10.0.0.1", "10.0.0.2"]'
327327
framework:
328328
trusted_hosts: '%env(json:TRUSTED_HOSTS)%'
329329
330330
.. code-block:: xml
331331
332-
<!-- config/packages/framework.xml -->
332+
<!-- app/config/config.xml -->
333333
<?xml version="1.0" encoding="UTF-8" ?>
334334
<container xmlns="http://symfony.com/schema/dic/services"
335335
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -348,7 +348,7 @@ Symfony provides the following env var processors:
348348
349349
.. code-block:: php
350350
351-
// config/packages/framework.php
351+
// app/config/config.php
352352
$container->setParameter('env(TRUSTED_HOSTS)', '["10.0.0.1", "10.0.0.2"]');
353353
$container->loadFromExtension('framework', [
354354
'trusted_hosts' => '%env(json:TRUSTED_HOSTS)%',
@@ -362,7 +362,7 @@ Symfony provides the following env var processors:
362362

363363
.. code-block:: yaml
364364
365-
# config/packages/sentry.yaml
365+
# app/config/config.yml
366366
parameters:
367367
env(HOST): '10.0.0.1'
368368
sentry_host: '%env(HOST)%'
@@ -372,7 +372,7 @@ Symfony provides the following env var processors:
372372
373373
.. code-block:: xml
374374
375-
<!-- config/packages/sentry.xml -->
375+
<!-- app/config/config.xml -->
376376
<?xml version="1.0" encoding="UTF-8" ?>
377377
<container xmlns="http://symfony.com/schema/dic/services"
378378
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -390,7 +390,7 @@ Symfony provides the following env var processors:
390390
391391
.. code-block:: php
392392
393-
// config/packages/sentry.php
393+
// app/config/config.php
394394
$container->setParameter('env(HOST)', '10.0.0.1');
395395
$container->setParameter('sentry_host', '%env(HOST)%');
396396
$container->setParameter('env(SENTRY_DSN)', 'http://%sentry_host%/project');
@@ -415,15 +415,15 @@ Symfony provides the following env var processors:
415415

416416
.. code-block:: yaml
417417
418-
# config/packages/framework.yaml
418+
# app/config/config.yml
419419
parameters:
420420
env(AUTH_FILE): '../config/auth.json'
421421
google:
422422
auth: '%env(file:AUTH_FILE)%'
423423
424424
.. code-block:: xml
425425
426-
<!-- config/packages/framework.xml -->
426+
<!-- app/config/config.xml -->
427427
<?xml version="1.0" encoding="UTF-8" ?>
428428
<container xmlns="http://symfony.com/schema/dic/services"
429429
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -442,7 +442,7 @@ Symfony provides the following env var processors:
442442
443443
.. code-block:: php
444444
445-
// config/packages/framework.php
445+
// app/config/config.php
446446
$container->setParameter('env(AUTH_FILE)', '../config/auth.json');
447447
$container->loadFromExtension('google', [
448448
'auth' => '%env(file:AUTH_FILE)%',

‎form/bootstrap4.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ configuration:
3030

3131
.. code-block:: yaml
3232
33-
# config/packages/twig.yaml
33+
# app/config/config.yml
3434
twig:
3535
form_themes: ['bootstrap_4_layout.html.twig']
3636
3737
.. code-block:: xml
3838
39-
<!-- config/packages/twig.xml -->
39+
<!-- app/config/config.xml -->
4040
<?xml version="1.0" encoding="UTF-8" ?>
4141
<container xmlns="http://symfony.com/schema/dic/services"
4242
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -54,7 +54,7 @@ configuration:
5454
5555
.. code-block:: php
5656
57-
// config/packages/twig.php
57+
// app/config/config.php
5858
$container->loadFromExtension('twig', [
5959
'form_themes' => [
6060
'bootstrap_4_layout.html.twig',

‎frontend/encore/advanced-config.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Next, define the output directories of each build:
104104

105105
.. code-block:: yaml
106106
107-
# config/packages/webpack_encore.yaml
107+
# app/config/config.yml
108108
webpack_encore:
109109
output_path: '%kernel.public_dir%/public/default_build'
110110
builds:

0 commit comments

Comments
 (0)