Skip to content

Commit 99f4ec6

Browse files
committed
Merge branch '6.4' into 7.0
* 6.4: Small type fixes for scheduler.rst feat(templates): recommend Asset Mapper instead of Webpack
2 parents 97c9246 + 13ec7f9 commit 99f4ec6

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

scheduler.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,7 @@ being transferred and processed by its handler::
634634
return $this->schedule ??= (new Schedule())
635635
->with(
636636
// ...
637-
);
637+
)
638638
->before(function(PreRunEvent $event) {
639639
$message = $event->getMessage();
640640
$messageContext = $event->getMessageContext();
@@ -647,13 +647,13 @@ being transferred and processed by its handler::
647647

648648
// allow to call the ShouldCancel() and avoid the message to be handled
649649
$event->shouldCancel(true);
650-
}
650+
})
651651
->after(function(PostRunEvent $event) {
652652
// Do what you want
653-
}
653+
})
654654
->onFailure(function(FailureEvent $event) {
655655
// Do what you want
656-
}
656+
});
657657
}
658658
}
659659

templates.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ as follows:
329329
Build, Versioning & More Advanced CSS, JavaScript and Image Handling
330330
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
331331

332-
For help building, versioning and minifying your JavaScript and
333-
CSS assets in a modern way, read about :doc:`Symfony's Webpack Encore </frontend>`.
332+
For help building and versioning your JavaScript and
333+
CSS assets in a modern way, read about :doc:`Symfony's AssetMapper </frontend>`.
334334

335335
.. _twig-app-variable:
336336

@@ -1070,7 +1070,7 @@ JavaScript library.
10701070

10711071
First, include the `hinclude.js`_ library in your page
10721072
:ref:`linking to it <templates-link-to-assets>` from the template or adding it
1073-
to your application JavaScript :doc:`using Webpack Encore </frontend>`.
1073+
to your application JavaScript :doc:`using AssetMapper </frontend>`.
10741074

10751075
As the embedded content comes from another page (or controller for that matter),
10761076
Symfony uses a version of the standard ``render()`` function to configure

0 commit comments

Comments
 (0)