Skip to content

Commit 1ca9d40

Browse files
committed
Merge remote-tracking branch 'upstream/7.0' into 7.0
* upstream/7.0: - Fix comma fopen http_client [Constraints] Update `callback` argument type Update asset_mapper.rst Fix wrong reStructuredText references - Remove semicolon marking previous end of statement [Lock] 15952 Remove mention off DBAL Connection support for locking
2 parents b434faa + ba94e0b commit 1ca9d40

File tree

9 files changed

+13
-19
lines changed

9 files changed

+13
-19
lines changed

components/lock.rst

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -512,13 +512,12 @@ MongoDB Connection String:
512512
PdoStore
513513
~~~~~~~~
514514

515-
The PdoStore saves locks in an SQL database. It is identical to DoctrineDbalStore
516-
but requires a `PDO`_ connection or a `Data Source Name (DSN)`_. This store does
517-
not support blocking, and expects a TTL to avoid stalled locks::
515+
The PdoStore saves locks in an SQL database. It requires a `PDO`_ connection or a `Data Source Name (DSN)`_.
516+
This store does not support blocking, and expects a TTL to avoid stalled locks::
518517

519518
use Symfony\Component\Lock\Store\PdoStore;
520519

521-
// a PDO or DSN for lazy connecting through PDO
520+
// a PDO instance or DSN for lazy connecting through PDO
522521
$databaseConnectionOrDSN = 'mysql:host=127.0.0.1;dbname=app';
523522
$store = new PdoStore($databaseConnectionOrDSN, ['db_username' => 'myuser', 'db_password' => 'mypassword']);
524523

@@ -573,9 +572,8 @@ the :method:`Symfony\\Component\\Lock\\Store\\DoctrineDbalStore::save` method.
573572
PostgreSqlStore
574573
~~~~~~~~~~~~~~~
575574

576-
The PostgreSqlStore and DoctrineDbalPostgreSqlStore uses `Advisory Locks`_ provided by PostgreSQL.
577-
It is identical to DoctrineDbalPostgreSqlStore but requires `PDO`_ connection or
578-
a `Data Source Name (DSN)`_. It supports native blocking, as well as sharing
575+
The PostgreSqlStore uses `Advisory Locks`_ provided by PostgreSQL. It requires a
576+
`PDO`_ connection or a `Data Source Name (DSN)`_. It supports native blocking, as well as sharing
579577
locks::
580578

581579
use Symfony\Component\Lock\Store\PostgreSqlStore;

components/serializer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ data.
233233
Context
234234
-------
235235

236-
Many Serializer features can be configured :doc:`using a context </serializer#serializer_serializer-context>`.
236+
Many Serializer features can be configured :ref:`using a context <serializer_serializer-context>`.
237237

238238
.. _component-serializer-attributes-groups:
239239

configuration.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ reusable configuration value. By convention, parameters are defined under the
259259
260260
// PHP constants as parameter values
261261
->set('app.some_constant', GLOBAL_CONSTANT)
262-
->set('app.another_constant', BlogPost::MAX_ITEMS);
262+
->set('app.another_constant', BlogPost::MAX_ITEMS)
263263
264264
// Enum case as parameter values
265265
->set('app.some_enum', PostState::Published);

configuration/multiple_kernels.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ requirements, so it's up to you to decide which best suits your project.
5353

5454
First, create a new ``apps`` directory at the root of your project, which will
5555
hold all the necessary applications. Each application will follow a simplified
56-
directory structure like the one described in :ref:`Symfony Best Practice </best_practices>`:
56+
directory structure like the one described in :doc:`Symfony Best Practice </best_practices>`:
5757

5858
.. code-block:: text
5959
@@ -321,7 +321,7 @@ Rendering Templates
321321
-------------------
322322

323323
Let's consider that you need to create another app called ``admin``. If you
324-
follow the :ref:`Symfony Best Practices </best_practices>`, the shared Kernel
324+
follow the :doc:`Symfony Best Practices </best_practices>`, the shared Kernel
325325
templates will be located in the ``templates/`` directory at the project's root.
326326
For admin-specific templates, you can create a new directory
327327
``apps/admin/templates/`` which you will need to manually configure under the

console.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -611,10 +611,6 @@ profile is accessible through the web page of the profiler.
611611
terminal supports links). If you run it in debug verbosity (``-vvv``) you'll
612612
also see the time and memory consumed by the command.
613613

614-
.. versionadded:: 6.4
615-
616-
The ``--profile`` option was introduced in Symfony 6.4.
617-
618614
Learn More
619615
----------
620616

frontend/asset_mapper.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ both ``app`` and ``checkout``:
10071007
{% block importmap %}
10081008
{# do NOT call parent() #}
10091009
1010-
{{ importmap('app', 'checkout') }}
1010+
{{ importmap(['app', 'checkout']) }}
10111011
{% endblock %}
10121012
10131013
By passing both ``app`` and ``checkout``, the ``importmap()`` function will

http_client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ A generator or any ``Traversable`` can also be used instead of a closure.
619619

620620
To submit a form with file uploads, pass the file handle to the ``body`` option::
621621

622-
$fileHandle = fopen('/path/to/the/file' 'r');
622+
$fileHandle = fopen('/path/to/the/file', 'r');
623623
$client->request('POST', 'https://...', ['body' => ['the_file' => $fileHandle]]);
624624

625625
By default, this code will populate the filename and content-type with the data

mercure.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ that handles persistent SSE connections with the clients.
5353
The Symfony app publishes the updates to the hub, that will broadcast them to
5454
clients.
5555

56-
Thanks to :ref:`the Docker integration of Symfony </setup/docker>`,
56+
Thanks to :doc:`the Docker integration of Symfony </setup/docker>`,
5757
:ref:`Flex <symfony-flex>` proposes to install a Mercure hub.
5858
Run ``docker-compose up`` to start the hub if you have chosen this option.
5959

reference/constraints/Choice.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ Available Options
262262
``callback``
263263
~~~~~~~~~~~~
264264

265-
**type**: ``string|array|Closure``
265+
**type**: ``callable|string|null`` **default**: ``null``
266266

267267
This is a callback method that can be used instead of the `choices`_ option
268268
to return the choices array. See

0 commit comments

Comments
 (0)