Skip to content

Commit 43f8662

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: [Symfony UX] reference React component in React page [Symfony UX] reference Vue component in VueJs page Reword "max lifetime" to "default lifetime"
2 parents 1544a18 + 8112798 commit 43f8662

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

components/cache/adapters/chain_adapter.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ This adapter allows combining any number of the other
1212
fetched from the first adapter containing them and cache items are saved to all the
1313
given adapters. This exposes a simple and efficient method for creating a layered cache.
1414

15-
The ChainAdapter must be provided an array of adapters and optionally a maximum cache
15+
The ChainAdapter must be provided an array of adapters and optionally a default cache
1616
lifetime as its constructor arguments::
1717

1818
use Symfony\Component\Cache\Adapter\ChainAdapter;
@@ -21,8 +21,8 @@ lifetime as its constructor arguments::
2121
// The ordered list of adapters used to fetch cached items
2222
array $adapters,
2323

24-
// The max lifetime of items propagated from lower adapters to upper ones
25-
$maxLifetime = 0
24+
// The default lifetime of items propagated from lower adapters to upper ones
25+
$defaultLifetime = 0
2626
);
2727

2828
.. note::

frontend/encore/reactjs.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Enabling React.js
66

77
Do you prefer video tutorials? Check out the `React.js screencast series`_.
88

9+
.. tip::
10+
11+
Check out live demos of Symfony UX React component at `https://ux.symfony.com/react`_!
12+
913
Using React? First add some dependencies with Yarn:
1014

1115
.. code-block:: terminal
@@ -36,3 +40,4 @@ Encore, you're done!
3640
Your ``.js`` and ``.jsx`` files will now be transformed through ``babel-preset-react``.
3741

3842
.. _`React.js screencast series`: https://symfonycasts.com/screencast/reactjs
43+
.. _`https://ux.symfony.com/react`: https://ux.symfony.com/react

frontend/encore/vuejs.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Enabling Vue.js (``vue-loader``)
66

77
Do you prefer video tutorials? Check out the `Vue screencast series`_.
88

9+
.. tip::
10+
11+
Check out live demos of Symfony UX Vue.js component at `https://ux.symfony.com/vue`_!
12+
913
Want to use `Vue.js`_? No problem! First enable it in ``webpack.config.js``:
1014

1115
.. code-block:: diff
@@ -212,3 +216,4 @@ following in your Twig templates:
212216
.. _`Scoped Styles`: https://vue-loader.vuejs.org/guide/scoped-css.html
213217
.. _`CSS Modules`: https://github.com/css-modules/css-modules
214218
.. _`Vue screencast series`: https://symfonycasts.com/screencast/vue
219+
.. _`https://ux.symfony.com/vue`: https://ux.symfony.com/vue

0 commit comments

Comments
 (0)