Skip to content

Commit 3c4ac06

Browse files
committed
Merge remote-tracking branch 'upstream/7.0' into 7.0
* upstream/7.0: - fix(doc): typo HttpKernelInterface::handle parameter and return types docs: fix typo remove versionadded directive for 6.3 Typo
2 parents fa0ee23 + 9a03c91 commit 3c4ac06

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

components/serializer.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1275,11 +1275,6 @@ to ``true``::
12751275
$result = $normalizer->denormalize($data, Dummy::class, 'json', [AbstractNormalizer::REQUIRE_ALL_PROPERTIES => true]);
12761276
// throws Symfony\Component\Serializer\Exception\MissingConstructorArgumentException
12771277

1278-
.. versionadded:: 6.3
1279-
1280-
The ``AbstractNormalizer::PREVENT_NULLABLE_FALLBACK`` context option
1281-
was introduced in Symfony 6.3.
1282-
12831278
Skipping Uninitialized Properties
12841279
---------------------------------
12851280

create_framework/http_kernel_httpkernelinterface.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ goal by making our framework implement ``HttpKernelInterface``::
1616
*/
1717
public function handle(
1818
Request $request,
19-
$type = self::MAIN_REQUEST,
20-
$catch = true
21-
);
19+
int $type = self::MAIN_REQUEST,
20+
bool $catch = true
21+
): Response;
2222
}
2323

2424
``HttpKernelInterface`` is probably the most important piece of code in the
@@ -39,8 +39,8 @@ Update your framework so that it implements this interface::
3939

4040
public function handle(
4141
Request $request,
42-
$type = HttpKernelInterface::MAIN_REQUEST,
43-
$catch = true
42+
int $type = HttpKernelInterface::MAIN_REQUEST,
43+
bool $catch = true
4444
) {
4545
// ...
4646
}

frontend/asset_mapper.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ When the browser downloads the page, this happens:
618618
3. It *then* sees the ``bootstrap`` import and downloads ``assets/bootstrap.js``.
619619

620620
Instead of downloading all 3 files in parallel, the browser is forced to
621-
download them one-by-one as it discovers them. This is hurts performance. To fix
621+
download them one-by-one as it discovers them. This hurts performance. To fix
622622
this, in ``importmap.php``, add a ``preload`` key to the ``app`` entry, which
623623
points to the ``assets/app.js`` file. Actually, this should already be
624624
done for you::
@@ -991,7 +991,7 @@ pages. To add a CSS file to a specific page, create the file, then add a
991991
{% endblock %}
992992

993993
For JavaScript, first create the new file (e.g. ``assets/checkout.js``). Then,
994-
add a ``script``` tag that imports it:
994+
add a ``script`` tag that imports it:
995995

996996
.. code-block:: html+twig
997997

security/remember_me.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ present:
235235
.. image:: /_images/security/profiler-badges.png
236236
:alt: The Security page of the Symfony profiler, with the "Authenticators" tab showing the remember me badge in the passport object.
237237

238-
Without this badge, remember me will be not be activated (regardless of all
238+
Without this badge, remember me will not be activated (regardless of all
239239
other settings).
240240

241241
Add Remember Me Support to Custom Authenticators

0 commit comments

Comments
 (0)