Skip to content

Commit b7acb42

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: tweak the AssetMapper docs replace get() with all() method to support non-scalar types
2 parents 317e973 + 0580b4d commit b7acb42

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

form/direct_submit.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ control over when exactly your form is submitted and what data is passed to it::
1717
$form = $this->createForm(TaskType::class, $task);
1818

1919
if ($request->isMethod('POST')) {
20-
$form->submit($request->request->get($form->getName()));
20+
$form->submit($request->request->all($form->getName()));
2121

2222
if ($form->isSubmitted() && $form->isValid()) {
2323
// perform some action...

frontend/asset_mapper.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ CSS can be added to your page by importing it from a JavaScript file. The defaul
390390
// ...
391391
392392
When you call ``importmap('app')`` in ``base.html.twig``, AssetMapper parses
393-
``assets/app.js`` (and any JavaScript files that *it* imports) looking for ``import``
393+
``assets/app.js`` (and any JavaScript files that it imports) looking for ``import``
394394
statements for CSS files. The final collection of CSS files is rendered onto
395395
the page as ``link`` tags in the order they were imported.
396396

@@ -497,7 +497,7 @@ Missing importmap Entry
497497
~~~~~~~~~~~~~~~~~~~~~~~
498498

499499
One of the most common errors will come from your browser's console, and
500-
will something like this:
500+
will look something like this:
501501

502502
Failed to resolve module specifier " bootstrap". Relative references must start
503503
with either "/", "./", or "../".
@@ -739,25 +739,25 @@ If you *do* need to support very old browsers, you should use a tool like
739739
(https://caniuse.com/import-maps), you can use an ``importShim()`` function
740740
from the shim: https://www.npmjs.com/package/es-module-shims#user-content-polyfill-edge-case-dynamic-import
741741

742-
Can I Use with Sass or Tailwind?
743-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
742+
Can I Use it with Sass or Tailwind?
743+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
744744

745745
Sure! See :ref:`Using Tailwind CSS <asset-mapper-tailwind>` or :ref:`Using Sass <asset-mapper-sass>`.
746746

747-
Can I use with TypeScript?
748-
~~~~~~~~~~~~~~~~~~~~~~~~~~
747+
Can I Use it with TypeScript?
748+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
749749

750750
Sure! See :ref:`Using TypeScript <asset-mapper-ts>`.
751751

752-
Can I use with JSX or Vue?
753-
~~~~~~~~~~~~~~~~~~~~~~~~~~
752+
Can I Use it with JSX or Vue?
753+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
754754

755755
Probably not. And if you're writing an application in React, Svelte or another
756756
frontend framework, you'll probably be better off using *their* tools directly.
757757

758758
JSX *can* be compiled directly to a native JavaScript file but if you're using a lot of JSX,
759759
you'll probably want to use a tool like :ref:`Encore <frontend-webpack-encore>`.
760-
See the `UX React Documentation`_ for more details about using with the AssetMapper
760+
See the `UX React Documentation`_ for more details about using it with the AssetMapper
761761
component.
762762

763763
Vue files *can* be written in native JavaScript, and those *will* work with
@@ -771,7 +771,7 @@ component.
771771
Using TypeScript
772772
----------------
773773

774-
To use TypeScript with AssetMapper component, check out `sensiolabs/typescript-bundle`_.
774+
To use TypeScript with the AssetMapper component, check out `sensiolabs/typescript-bundle`_.
775775

776776
Third-Party Bundles & Custom Asset Paths
777777
----------------------------------------
@@ -850,7 +850,7 @@ Then try the command again.
850850
Configuration Options
851851
---------------------
852852

853-
You can see every available configuration option and some info by running:
853+
You can see every available configuration options and some info by running:
854854

855855
.. code-block:: terminal
856856
@@ -872,7 +872,7 @@ can be a simple list:
872872
- assets/
873873
- vendor/some/package/assets
874874
875-
Of you can give each path a "namespace" that will be used in the asset map:
875+
Or you can give each path a "namespace" that will be used in the asset map:
876876

877877
.. code-block:: yaml
878878
@@ -1066,7 +1066,7 @@ command that checks security vulnerabilities in the dependencies of your applica
10661066
6 vulnerabilities found: 1 Critical / 1 High / 4 Medium
10671067
10681068
The command will return the ``0`` exit code if no vulnerability is found, or
1069-
the ``-1`` exit code otherwise. This means that you can seamlessly integrate this
1069+
the ``1`` exit code otherwise. This means that you can seamlessly integrate this
10701070
command as part of your CI to be warned anytime a new vulnerability is found.
10711071

10721072
.. tip::

0 commit comments

Comments
 (0)