From 88f56151660eb74ff5bb27caf027ba8aafacd054 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Mon, 14 Nov 2016 10:17:40 -0600 Subject: [PATCH 1/3] Add version_strategy parameter for FrameworkBundle --- reference/configuration/framework.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 21a30013794..bfbd094babb 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -69,6 +69,7 @@ Configuration * `base_path`_ * `base_urls`_ * `packages`_ + * `version_strategy`_ * `version`_ * `version_format`_ * `templating`_ @@ -958,9 +959,26 @@ Each package can configure the following options: * :ref:`base_path ` * :ref:`base_urls ` +* :ref:`version_strategy ` * :ref:`version ` * :ref:`version_format ` +.. _reference-templating-version-strategy: +.. _reference-assets-version-strategy: + +version_strategy +.............. + +**type**: ``string`` **default**: ``null`` + +This specifies a service id of a service to use as the version strategy for +all rendered asset paths. Version strategies must implement +:class:`Symfony\\Component\\Asset\\VersionStrategy\\VersionStrategy`. + +.. note:: + + This parameter cannot be set at the same time as ``version``. + .. _reference-framework-assets-version: .. _ref-framework-assets-version: @@ -1031,6 +1049,10 @@ before each deployment so that the query parameters change. You can also control how the query string works via the `version_format`_ option. +.. note:: + + This parameter cannot be set at the same time as ``version_strategy``. + .. tip:: As with all settings, you can use a parameter as value for the From e487508ad12b57ee5b0aad39ce39236cff943867 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Tue, 15 Nov 2016 09:41:11 +0100 Subject: [PATCH 2/3] Minor tweaks --- reference/configuration/framework.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index bfbd094babb..92b2ea040cf 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -967,13 +967,13 @@ Each package can configure the following options: .. _reference-assets-version-strategy: version_strategy -.............. +................ **type**: ``string`` **default**: ``null`` -This specifies a service id of a service to use as the version strategy for +This specifies the id of the service to use as the version strategy for all rendered asset paths. Version strategies must implement -:class:`Symfony\\Component\\Asset\\VersionStrategy\\VersionStrategy`. +:class:`Symfony\\Component\\Asset\\VersionStrategy\\VersionStrategyInterface`. .. note:: From 6727badda43ecefd46ae1910d2fb64b24812c345 Mon Sep 17 00:00:00 2001 From: Michael Babker Date: Tue, 15 Nov 2016 07:39:52 -0600 Subject: [PATCH 3/3] Fix label reference --- reference/configuration/framework.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index 92b2ea040cf..10fe29967b4 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -959,7 +959,7 @@ Each package can configure the following options: * :ref:`base_path ` * :ref:`base_urls ` -* :ref:`version_strategy ` +* :ref:`version_strategy ` * :ref:`version ` * :ref:`version_format `