From 337a9cd8cf65a565d886c6dced791cda20b1555e Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Mon, 14 Dec 2015 19:44:21 +0100 Subject: [PATCH] [Assetic] complete XML configuration examples --- cookbook/assetic/apply_to_option.rst | 50 +++++--- cookbook/assetic/asset_management.rst | 36 ++++-- cookbook/assetic/jpeg_optimize.rst | 115 ++++++++++++------ cookbook/assetic/php.rst | 12 +- cookbook/assetic/uglifyjs.rst | 61 +++++++--- cookbook/assetic/yuicompressor.rst | 25 ++-- .../configuration/override_dir_structure.rst | 14 ++- reference/configuration/assetic.rst | 90 +++++++------- 8 files changed, 274 insertions(+), 129 deletions(-) diff --git a/cookbook/assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst index 22c7506075f..264f1787a1c 100644 --- a/cookbook/assetic/apply_to_option.rst +++ b/cookbook/assetic/apply_to_option.rst @@ -27,14 +27,23 @@ An example configuration might look like this: .. code-block:: xml - - - /usr/lib/node_modules/ - - + + + + + + /usr/lib/node_modules/ + + + .. code-block:: php @@ -137,14 +146,23 @@ In this case you can specify that the ``coffee`` filter is applied to all .. code-block:: xml - - - /usr/lib/node_modules/ - + + + + + + /usr/lib/node_modules/ + + .. code-block:: php diff --git a/cookbook/assetic/asset_management.rst b/cookbook/assetic/asset_management.rst index af0055f5795..37fceba54fd 100644 --- a/cookbook/assetic/asset_management.rst +++ b/cookbook/assetic/asset_management.rst @@ -301,7 +301,11 @@ configuration under the ``assetic`` section. Read more in the + xmlns:assetic="http://symfony.com/schema/dic/assetic" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/assetic + http://symfony.com/schema/dic/assetic/assetic-1.0.xsd"> @@ -388,11 +392,20 @@ should be defined: .. code-block:: xml - - - + + + + + + + .. code-block:: php @@ -528,7 +541,16 @@ the following change in your ``config_dev.yml`` file: .. code-block:: xml - + + + + + .. code-block:: php diff --git a/cookbook/assetic/jpeg_optimize.rst b/cookbook/assetic/jpeg_optimize.rst index c55a32dc800..0c8745155ba 100644 --- a/cookbook/assetic/jpeg_optimize.rst +++ b/cookbook/assetic/jpeg_optimize.rst @@ -30,11 +30,20 @@ using the ``bin`` option of the ``jpegoptim`` filter: .. code-block:: xml - - - + + + + + + + .. code-block:: php @@ -88,12 +97,21 @@ to ``true``: .. code-block:: xml - - - + + + + + + + .. code-block:: php @@ -129,12 +147,21 @@ be at the expense of its quality: .. code-block:: xml - - - + + + + + + + .. code-block:: php @@ -171,15 +198,24 @@ following configuration: .. code-block:: xml - - - - - - + + + + + + + + + + .. code-block:: php @@ -221,16 +257,25 @@ file: .. code-block:: xml - - - - + + + + - - + bin="path/to/jpegoptim" /> + + + + + .. code-block:: php diff --git a/cookbook/assetic/php.rst b/cookbook/assetic/php.rst index c7e8c2e6b26..52fba78e593 100644 --- a/cookbook/assetic/php.rst +++ b/cookbook/assetic/php.rst @@ -91,7 +91,11 @@ First, configure a new ``scssphp`` Assetic filter: + xmlns:assetic="http://symfony.com/schema/dic/assetic" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/assetic + http://symfony.com/schema/dic/assetic/assetic-1.0.xsd"> @@ -159,7 +163,11 @@ First, configure a new ``jsqueeze`` Assetic filter as follows: + xmlns:assetic="http://symfony.com/schema/dic/assetic" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/assetic + http://symfony.com/schema/dic/assetic/assetic-1.0.xsd"> diff --git a/cookbook/assetic/uglifyjs.rst b/cookbook/assetic/uglifyjs.rst index a08569647a3..dfcf67453ef 100644 --- a/cookbook/assetic/uglifyjs.rst +++ b/cookbook/assetic/uglifyjs.rst @@ -79,12 +79,21 @@ your JavaScripts: .. code-block:: xml - - - - + + + + + + + + .. code-block:: php @@ -137,12 +146,21 @@ can configure its location using the ``node`` key: .. code-block:: xml - - - + + + + + + + .. code-block:: php @@ -253,11 +271,20 @@ Next, add the configuration for this filter: .. code-block:: xml - - - + + + + + + + .. code-block:: php diff --git a/cookbook/assetic/yuicompressor.rst b/cookbook/assetic/yuicompressor.rst index 6ae078a8eac..83e6c3e2dfe 100644 --- a/cookbook/assetic/yuicompressor.rst +++ b/cookbook/assetic/yuicompressor.rst @@ -43,14 +43,23 @@ stylesheets: .. code-block:: xml - - - - + + + + + + + + .. code-block:: php diff --git a/cookbook/configuration/override_dir_structure.rst b/cookbook/configuration/override_dir_structure.rst index 821c9601ac7..d355269afc9 100644 --- a/cookbook/configuration/override_dir_structure.rst +++ b/cookbook/configuration/override_dir_structure.rst @@ -135,9 +135,17 @@ the ``extra.symfony-web-dir`` option in the ``composer.json`` file: .. code-block:: xml - - - + + + + + + .. code-block:: php diff --git a/reference/configuration/assetic.rst b/reference/configuration/assetic.rst index 8c0ba8be7fc..6b54878827d 100644 --- a/reference/configuration/assetic.rst +++ b/reference/configuration/assetic.rst @@ -55,49 +55,57 @@ Full Default Configuration .. code-block:: xml - - - FrameworkBundle - SecurityBundle - TwigBundle - MonologBundle - SwiftmailerBundle - DoctrineBundle - AsseticBundle - ... - - - - - - - - - - - - - - + + + + - - - - + + FrameworkBundle + SecurityBundle + TwigBundle + MonologBundle + SwiftmailerBundle + DoctrineBundle + AsseticBundle + ... - - + + + + + + + + + + + + + + + - - + - + + + + + + + +