Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 6e9b59d

Browse filesBrowse files
OskarStarkOskarStark
committed
Merge branch '5.4' into 6.3
* 5.4: [DotEnv] Update configuration.rst Formatting typo [Container] Missing link RST link begin Minor: remove duplicated lines
2 parents 5ccc143 + ac59689 commit 6e9b59d
Copy full SHA for 6e9b59d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner

47 files changed

+15
-57
lines changed

‎cache.rst

Copy file name to clipboardExpand all lines: cache.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,6 @@ and use that when configuring the pool.
467467
->adapters(['cache.adapter.redis'])
468468
->provider('app.my_custom_redis_provider');
469469
470-
471470
$container->register('app.my_custom_redis_provider', \Redis::class)
472471
->setFactory([RedisAdapter::class, 'createConnection'])
473472
->addArgument('redis://localhost')

‎components/cache.rst

Copy file name to clipboardExpand all lines: components/cache.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ The following cache adapters are available:
135135

136136
cache/adapters/*
137137

138-
139138
.. _cache-component-psr6-caching:
140139

141140
Generic Caching (PSR-6)

‎components/cache/adapters/couchbasebucket_adapter.rst

Copy file name to clipboardExpand all lines: components/cache/adapters/couchbasebucket_adapter.rst
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ the second and third parameters::
3535
$defaultLifetime
3636
);
3737

38-
3938
Configure the Connection
4039
------------------------
4140

@@ -67,7 +66,6 @@ helper method allows creating and configuring a `Couchbase Bucket`_ class instan
6766
'couchbase:?host[localhost]&host[localhost:12345]'
6867
);
6968

70-
7169
Configure the Options
7270
---------------------
7371

‎components/cache/adapters/couchbasecollection_adapter.rst

Copy file name to clipboardExpand all lines: components/cache/adapters/couchbasecollection_adapter.rst
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ the second and third parameters::
3232
$defaultLifetime
3333
);
3434

35-
3635
Configure the Connection
3736
------------------------
3837

@@ -64,7 +63,6 @@ helper method allows creating and configuring a `Couchbase Collection`_ class in
6463
'couchbase:?host[localhost]&host[localhost:12345]'
6564
);
6665

67-
6866
Configure the Options
6967
---------------------
7068

‎components/cache/adapters/filesystem_adapter.rst

Copy file name to clipboardExpand all lines: components/cache/adapters/filesystem_adapter.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,5 @@ adapter offers better read performance when using tag-based invalidation::
6363

6464
$cache = new FilesystemTagAwareAdapter();
6565

66-
6766
.. _`tmpfs`: https://wiki.archlinux.org/index.php/tmpfs
6867
.. _`RAM disk solutions`: https://en.wikipedia.org/wiki/List_of_RAM_drive_software

‎components/cache/cache_pools.rst

Copy file name to clipboardExpand all lines: components/cache/cache_pools.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ ready to use in your applications.
2525

2626
adapters/*
2727

28-
2928
Using the Cache Contracts
3029
-------------------------
3130

‎components/event_dispatcher/generic_event.rst

Copy file name to clipboardExpand all lines: components/event_dispatcher/generic_event.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,3 @@ Filtering data::
9999
$event['data'] = strtolower($event['data']);
100100
}
101101
}
102-

‎components/http_kernel.rst

Copy file name to clipboardExpand all lines: components/http_kernel.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ The Workflow of a Request
2626
:doc:`/event_dispatcher` articles to learn about how to use it to create
2727
controllers and define events in Symfony applications.
2828

29-
3029
Every HTTP web interaction begins with a request and ends with a response.
3130
Your job as a developer is to create PHP code that reads the request information
3231
(e.g. the URL) and creates and returns a response (e.g. an HTML page or JSON string).

‎components/process.rst

Copy file name to clipboardExpand all lines: components/process.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Installation
1010
1111
$ composer require symfony/process
1212
13-
1413
.. include:: /components/require_autoload.rst.inc
1514

1615
Usage

‎configuration.rst

Copy file name to clipboardExpand all lines: configuration.rst
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,6 @@ configuration file using a special syntax: wrap the parameter name in two ``%``
349349
]);
350350
};
351351
352-
353352
.. note::
354353

355354
If some parameter value includes the ``%`` character, you need to escape it
@@ -1084,7 +1083,7 @@ already existing ``.env`` files).
10841083
# .env (or .env.local)
10851084
APP_ENV=prod
10861085
1087-
# .env.prod (or .env.local.prod) - this will fallback on the loaders you defined
1086+
# .env.prod (or .env.prod.local) - this will fallback on the loaders you defined
10881087
APP_ENV=
10891088
10901089
.. _configuration-accessing-parameters:

‎configuration/override_dir_structure.rst

Copy file name to clipboardExpand all lines: configuration/override_dir_structure.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ Web front-controller::
7474
require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
7575
// ...
7676

77-
7877
.. _override-config-dir:
7978

8079
Override the Configuration Directory

‎console.rst

Copy file name to clipboardExpand all lines: console.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,6 @@ call ``setAutoExit(false)`` on it to get the command result in ``CommandTester``
563563

564564
$tester = new ApplicationTester($application);
565565

566-
567566
.. caution::
568567

569568
When testing ``InputOption::VALUE_NONE`` command options, you must pass an

‎contributing/community/review-comments.rst

Copy file name to clipboardExpand all lines: contributing/community/review-comments.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ you don't have to use "Please" all the time. But it wouldn't hurt.
149149
It may not seem like much, but saying "Thank you" does make others feel
150150
more welcome.
151151

152-
153152
Preventing Escalations
154153
----------------------
155154

‎contributing/documentation/standards.rst

Copy file name to clipboardExpand all lines: contributing/documentation/standards.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ Images and Diagrams
175175
alt="Some concise description."
176176
></object>
177177
178-
179178
English Language Standards
180179
--------------------------
181180

‎doctrine/associations.rst

Copy file name to clipboardExpand all lines: doctrine/associations.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,6 @@ that behavior, use the `orphanRemoval`_ option inside ``Category``:
605605
#[ORM\OneToMany(targetEntity: Product::class, mappedBy: 'category', orphanRemoval: true)]
606606
private array $products;
607607
608-
609608
Thanks to this, if the ``Product`` is removed from the ``Category``, it will be
610609
removed from the database entirely.
611610

‎form/create_custom_field_type.rst

Copy file name to clipboardExpand all lines: form/create_custom_field_type.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,6 @@ Symfony passes a series of variables to the template used to render the form
465465
type. You can also pass your own variables, which can be based on the options
466466
defined by the form or be completely independent::
467467

468-
469468
// src/Form/Type/PostalAddressType.php
470469
namespace App\Form\Type;
471470

‎form/form_collections.rst

Copy file name to clipboardExpand all lines: form/form_collections.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,6 @@ Now, you need to put some code into the ``removeTag()`` method of ``Task``::
573573
}
574574
}
575575

576-
577576
The ``allow_delete`` option means that if an item of a collection
578577
isn't sent on submission, the related data is removed from the collection
579578
on the server. In order for this to work in an HTML form, you must remove

‎frontend/custom_version_strategy.rst

Copy file name to clipboardExpand all lines: frontend/custom_version_strategy.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ After creating the strategy PHP class, register it as a Symfony service.
141141
);
142142
};
143143
144-
145144
Finally, enable the new asset versioning for all the application assets or just
146145
for some :ref:`asset package <reference-framework-assets-packages>` thanks to
147146
the :ref:`version_strategy <reference-assets-version-strategy>` option:

‎frontend/encore/dev-server.rst

Copy file name to clipboardExpand all lines: frontend/encore/dev-server.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ Live Reloading when changing PHP / Twig Files
122122
To utilize the HMR superpower along with live reload for your PHP code and
123123
templates, set the following options:
124124

125-
126125
.. code-block:: javascript
127126
128127
// webpack.config.js

‎frontend/encore/reactjs.rst

Copy file name to clipboardExpand all lines: frontend/encore/reactjs.rst
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Enabling React.js
99
.. tip::
1010

1111
Check out live demos of Symfony UX React component at `https://ux.symfony.com/react`_!
12-
12+
1313
Using React? First add some dependencies with npm:
1414

1515
.. code-block:: terminal
@@ -28,7 +28,6 @@ Enable react in your ``webpack.config.js``:
2828
+ .enableReactPreset()
2929
;
3030
31-
3231
Then restart Encore. When you do, it will give you a command you can run to
3332
install any missing dependencies. After running that command and restarting
3433
Encore, you're done!

‎frontend/encore/split-chunks.rst

Copy file name to clipboardExpand all lines: frontend/encore/split-chunks.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ To enable this, call ``splitEntryChunks()``:
2222
2323
+ .splitEntryChunks()
2424
25-
2625
Now, each output file (e.g. ``homepage.js``) *may* be split into multiple file
2726
(e.g. ``homepage.js`` & ``vendors-node_modules_jquery_dist_jquery_js.js`` - the
2827
filename of the second will be less obvious when you build for production). This

‎mailer.rst

Copy file name to clipboardExpand all lines: mailer.rst
+5Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,6 +1430,7 @@ you have a transport called ``async``, you can route the message there:
14301430
->senders(['async']);
14311431
};
14321432
1433+
<<<<<<< HEAD
14331434
Thanks to this, instead of being delivered immediately, messages will be sent
14341435
to the transport to be handled later (see :ref:`messenger-worker`). Note that
14351436
the "rendering" of the email (computed headers, body rendering, ...) is also
@@ -1462,6 +1463,10 @@ render the email before calling ``$mailer->send($email)``::
14621463

14631464
$mailer->send($email);
14641465
}
1466+
=======
1467+
Thanks to this, instead of being delivered immediately, messages will be sent to
1468+
the transport to be handled later (see :ref:`messenger-worker`).
1469+
>>>>>>> 5.4
14651470

14661471
You can configure which bus is used to dispatch the message using the ``message_bus`` option.
14671472
You can also set this to ``false`` to call the Mailer transport directly and

‎mercure.rst

Copy file name to clipboardExpand all lines: mercure.rst
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,14 +501,12 @@ And here is the controller::
501501
}
502502
}
503503

504-
505504
.. tip::
506505

507506
You cannot use the ``mercure()`` helper and the ``setCookie()``
508507
method at the same time (it would set the cookie twice on a single request). Choose
509508
either one method or the other.
510509

511-
512510
Programmatically Generating The JWT Used to Publish
513511
---------------------------------------------------
514512

‎messenger.rst

Copy file name to clipboardExpand all lines: messenger.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2607,7 +2607,6 @@ and a different instance will be created per bus.
26072607
- 'App\Middleware\MyMiddleware'
26082608
- 'App\Middleware\AnotherMiddleware'
26092609
2610-
26112610
.. code-block:: xml
26122611
26132612
<!-- config/packages/messenger.xml -->

‎profiler.rst

Copy file name to clipboardExpand all lines: profiler.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ production. To do that, create an :doc:`event subscriber </event_dispatcher>`
223223
and listen to the :ref:`kernel.response <component-http-kernel-kernel-response>`
224224
event::
225225

226-
227226
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
228227
use Symfony\Component\HttpKernel\Event\ResponseEvent;
229228
use Symfony\Component\HttpKernel\KernelInterface;

‎reference/constraints/Country.rst

Copy file name to clipboardExpand all lines: reference/constraints/Country.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,3 @@ Parameter Description
103103

104104
.. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
105105
.. _`ISO 3166-1 alpha-3`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3#Current_codes
106-

‎reference/constraints/EqualTo.rst

Copy file name to clipboardExpand all lines: reference/constraints/EqualTo.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ To force that a value is *not* equal, see :doc:`/reference/constraints/NotEqualT
1010
equal. Use :doc:`/reference/constraints/IdenticalTo` to compare with
1111
``===``.
1212

13-
1413
========== ===================================================================
1514
Applies to :ref:`property or method <validation-property-target>`
1615
Class :class:`Symfony\\Component\\Validator\\Constraints\\EqualTo`

‎reference/constraints/Length.rst

Copy file name to clipboardExpand all lines: reference/constraints/Length.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ and ``50``, you might add the following:
3535
protected string $firstName;
3636
}
3737
38-
3938
.. code-block:: yaml
4039
4140
# config/validator/validation.yaml

‎reference/constraints/Positive.rst

Copy file name to clipboardExpand all lines: reference/constraints/Positive.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ positive number (greater than zero):
6363
use Symfony\Component\Validator\Constraints as Assert;
6464
use Symfony\Component\Validator\Mapping\ClassMetadata;
6565
66-
6766
class Employee
6867
{
6968
// ...

‎reference/constraints/Ulid.rst

Copy file name to clipboardExpand all lines: reference/constraints/Ulid.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,4 @@ Parameter Description
9595

9696
.. include:: /reference/constraints/_payload-option.rst.inc
9797

98-
9998
.. _`Universally Unique Lexicographically Sortable Identifier (ULID)`: https://github.com/ulid/spec

‎reference/constraints/UniqueEntity.rst

Copy file name to clipboardExpand all lines: reference/constraints/UniqueEntity.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ the combination value is unique (e.g. two users could have the same email,
269269
as long as they don't have the same name also).
270270

271271
If you need to require two fields to be individually unique (e.g. a unique
272-
``email`` *and* a unique ``username``), you use two ``UniqueEntity`` entries,
272+
``email`` and a unique ``username``), you use two ``UniqueEntity`` entries,
273273
each with a single field.
274274

275275
.. include:: /reference/constraints/_groups-option.rst.inc

‎reference/formats/message_format.rst

Copy file name to clipboardExpand all lines: reference/formats/message_format.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ The basic usage of the MessageFormat allows you to use placeholders (called
6363
'say_hello' => "Hello {name}!",
6464
];
6565
66-
6766
.. caution::
6867

6968
In the previous translation format, placeholders were often wrapped in ``%``

‎routing.rst

Copy file name to clipboardExpand all lines: routing.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1844,7 +1844,6 @@ host name:
18441844
;
18451845
};
18461846
1847-
18481847
The value of the ``host`` option can include parameters (which is useful in
18491848
multi-tenant applications) and these parameters can be validated too with
18501849
``requirements``:

‎security/custom_authenticator.rst

Copy file name to clipboardExpand all lines: security/custom_authenticator.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ The following credential classes are supported by default:
281281
$apiToken
282282
));
283283

284-
285284
Self Validating Passport
286285
~~~~~~~~~~~~~~~~~~~~~~~~
287286

‎security/entry_point.rst

Copy file name to clipboardExpand all lines: security/entry_point.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ You can configure this using the ``entry_point`` setting:
6767
$security->enableAuthenticatorManager(true);
6868
// ....
6969
70-
7170
// allow authentication using a form or HTTP basic
7271
$mainFirewall = $security->firewall('main');
7372
$mainFirewall

‎security/ldap.rst

Copy file name to clipboardExpand all lines: security/ldap.rst
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ use the ``ldap`` user provider.
197197
;
198198
};
199199
200-
201200
.. caution::
202201

203202
The Security component escapes provided input data when the LDAP user
@@ -535,4 +534,3 @@ Configuration example for form login and query_string
535534
.. _`LDAP PHP extension`: https://www.php.net/manual/en/intro.ldap.php
536535
.. _`RFC4515`: https://datatracker.ietf.org/doc/rfc4515/
537536
.. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection
538-

‎serializer/custom_encoders.rst

Copy file name to clipboardExpand all lines: serializer/custom_encoders.rst
+6Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@ create your own encoder that uses the
4646
}
4747
}
4848

49+
.. tip::
50+
51+
If you need access to ``$context`` in your ``supportsDecoding`` or
52+
``supportsEncoding`` method, make sure to implement
53+
``Symfony\Component\Serializer\Encoder\ContextAwareDecoderInterface``
54+
or ``Symfony\Component\Serializer\Encoder\ContextAwareEncoderInterface`` accordingly.
4955

5056
Registering it in your app
5157
--------------------------

‎service_container.rst

Copy file name to clipboardExpand all lines: service_container.rst
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ service's class or interface name. Want to :doc:`log </logging>` something? No p
4343
}
4444
}
4545

46-
4746
What other services are available? Find out by running:
4847

4948
.. code-block:: terminal
@@ -502,7 +501,6 @@ pass here. No problem! In your configuration, you can explicitly set this argume
502501
;
503502
};
504503
505-
506504
Thanks to this, the container will pass ``manager@example.com`` to the ``$adminEmail``
507505
argument of ``__construct`` when creating the ``SiteUpdateManager`` service. The
508506
other arguments will still be autowired.
@@ -1378,7 +1376,7 @@ and ``site_update_manager.normal_users``. Thanks to the alias, if you type-hint
13781376
``SiteUpdateManager`` the first (``site_update_manager.superadmin``) will be passed.
13791377

13801378
If you want to pass the second, you'll need to :ref:`manually wire the service <services-wire-specific-service>`
1381-
or to create a named ref:`autowiring alias <autowiring-alias>`.
1379+
or to create a named :ref:`autowiring alias <autowiring-alias>`.
13821380

13831381
.. caution::
13841382

‎service_container/autowiring.rst

Copy file name to clipboardExpand all lines: service_container/autowiring.rst
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ both services:
117117
->autowire();
118118
};
119119
120-
121120
Now, you can use the ``TwitterClient`` service immediately in a controller::
122121

123122
// src/Controller/DefaultController.php
@@ -252,7 +251,6 @@ adding a service alias:
252251
$services->alias(Rot13Transformer::class, 'app.rot13.transformer');
253252
};
254253
255-
256254
This creates a service "alias", whose id is ``App\Util\Rot13Transformer``.
257255
Thanks to this, autowiring sees this and uses it whenever the ``Rot13Transformer``
258256
class is type-hinted.
@@ -357,7 +355,6 @@ To fix that, add an :ref:`alias <service-autowiring-alias>`:
357355
$services->alias(TransformerInterface::class, Rot13Transformer::class);
358356
};
359357
360-
361358
Thanks to the ``App\Util\TransformerInterface`` alias, the autowiring subsystem
362359
knows that the ``App\Util\Rot13Transformer`` service should be injected when
363360
dealing with the ``TransformerInterface``.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.