diff --git a/bundles/best_practices.rst b/bundles/best_practices.rst index 44e65e1d66c..fb22e55d44e 100644 --- a/bundles/best_practices.rst +++ b/bundles/best_practices.rst @@ -348,9 +348,17 @@ The end user can provide values in any configuration file: .. code-block:: xml - - fabien@example.com - + + + + + fabien@example.com + + + .. code-block:: php diff --git a/bundles/configuration.rst b/bundles/configuration.rst index 252eff7487a..081e7df682a 100644 --- a/bundles/configuration.rst +++ b/bundles/configuration.rst @@ -225,7 +225,7 @@ thrown):: $configuration = new Configuration(); $config = $this->processConfiguration($configuration, $configs); - + // you now have these 2 config keys // $config['twitter']['client_id'] and $config['twitter']['client_secret'] } @@ -424,7 +424,6 @@ Assuming the XSD file is called ``hello-1.0.xsd``, the schema location will be - - - non_default - + + - + + non_default + + + + + .. code-block:: php diff --git a/configuration/environments.rst b/configuration/environments.rst index f89ce2d6501..e1ff4635de8 100644 --- a/configuration/environments.rst +++ b/configuration/environments.rst @@ -69,11 +69,22 @@ accomplished easily and transparently: .. code-block:: xml - - - + + - + + + + + + + .. code-block:: php @@ -104,11 +115,22 @@ configuration file: .. code-block:: xml - - - + + + + + + + + - + .. code-block:: php @@ -201,7 +223,18 @@ this code and changing the environment string. .. code-block:: xml - + + + + + + .. code-block:: php @@ -283,13 +316,24 @@ The best way to accomplish this is via a new environment called, for example, .. code-block:: xml - - - - - - - + + + + + + + + + + + + .. code-block:: php diff --git a/configuration/external_parameters.rst b/configuration/external_parameters.rst index a04eb59c997..93ee262ed91 100644 --- a/configuration/external_parameters.rst +++ b/configuration/external_parameters.rst @@ -103,17 +103,26 @@ You can now reference these parameters wherever you need them. .. code-block:: xml - - - - - - + + + + + + + + + .. code-block:: php @@ -150,9 +159,17 @@ in the container. The following imports a file named ``parameters.php``. .. code-block:: xml - - - + + + + + + + + .. code-block:: php diff --git a/configuration/override_dir_structure.rst b/configuration/override_dir_structure.rst index 2ad097b0c05..146debeabe3 100644 --- a/configuration/override_dir_structure.rst +++ b/configuration/override_dir_structure.rst @@ -115,6 +115,7 @@ define your own templates directory (or directories): %kernel.root_dir%/../templates + .. code-block:: php @@ -192,6 +193,7 @@ file: + .. code-block:: php diff --git a/configuration/using_parameters_in_dic.rst b/configuration/using_parameters_in_dic.rst index 6e68ed5eef1..4d45d7738c2 100644 --- a/configuration/using_parameters_in_dic.rst +++ b/configuration/using_parameters_in_dic.rst @@ -56,10 +56,10 @@ Now, examine the results to see this closely: - - + + + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -104,6 +105,7 @@ First configure a listener for console exception events in the service container + .. code-block:: php @@ -189,8 +191,9 @@ First configure a listener for console terminate events in the service container + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -198,6 +201,7 @@ First configure a listener for console terminate events in the service container + .. code-block:: php diff --git a/console/request_context.rst b/console/request_context.rst index 3bd7568c18a..b0983d270ed 100644 --- a/console/request_context.rst +++ b/console/request_context.rst @@ -41,7 +41,6 @@ will override the defaults. - @@ -50,6 +49,7 @@ will override the defaults. https my/path + .. code-block:: php diff --git a/controller/error_pages.rst b/controller/error_pages.rst index c1389b848b4..9953fb990cd 100644 --- a/controller/error_pages.rst +++ b/controller/error_pages.rst @@ -251,6 +251,7 @@ configuration option to point to it: AppBundle:Exception:showException + .. code-block:: php @@ -299,11 +300,12 @@ In that case, you might want to override one or both of the ``showAction()`` and .. code-block:: xml - + + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + %kernel.debug% + .. code-block:: php diff --git a/controller/service.rst b/controller/service.rst index 28836464cd0..8c9c0179a70 100644 --- a/controller/service.rst +++ b/controller/service.rst @@ -72,9 +72,17 @@ Then you can define it as a service as follows: .. code-block:: xml - - - + + + + + + + + .. code-block:: php @@ -112,9 +120,17 @@ the route ``_controller`` value: .. code-block:: xml - - app.hello_controller:indexAction - + + + + + app.hello_controller:indexAction + + + .. code-block:: php @@ -219,11 +235,19 @@ argument: .. code-block:: xml - - - - - + + + + + + + + + + .. code-block:: php diff --git a/controller/soap_web_service.rst b/controller/soap_web_service.rst index 6a2fe21940e..4ef063c0e05 100644 --- a/controller/soap_web_service.rst +++ b/controller/soap_web_service.rst @@ -68,11 +68,19 @@ a ``HelloService`` object properly: .. code-block:: xml - - - - - + + + + + + + + + + .. code-block:: php diff --git a/controller/upload_file.rst b/controller/upload_file.rst index 6621862ff72..c2d88bb9205 100644 --- a/controller/upload_file.rst +++ b/controller/upload_file.rst @@ -274,13 +274,13 @@ Then, define a service for this class: + http://symfony.com/schema/dic/services/services-1.0.xsd"> %brochures_directory% + .. code-block:: php @@ -394,8 +394,7 @@ Now, register this class as a Doctrine listener: + http://symfony.com/schema/dic/services/services-1.0.xsd"> + .. code-block:: php diff --git a/doctrine/custom_dql_functions.rst b/doctrine/custom_dql_functions.rst index 77f38f7022f..bc9687c065a 100644 --- a/doctrine/custom_dql_functions.rst +++ b/doctrine/custom_dql_functions.rst @@ -32,8 +32,10 @@ In Symfony, you can register your custom DQL functions as follows: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/doctrine + http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> diff --git a/doctrine/dbal.rst b/doctrine/dbal.rst index 70e183d84c5..99f06981e1f 100644 --- a/doctrine/dbal.rst +++ b/doctrine/dbal.rst @@ -40,17 +40,28 @@ To get started, configure the database connection parameters: .. code-block:: xml - - - + + + + + + + + .. code-block:: php @@ -107,8 +118,10 @@ mapping types, read Doctrine's `Custom Mapping Types`_ section of their document + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/doctrine + http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> @@ -159,8 +172,10 @@ mapping type: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/doctrine + http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> diff --git a/doctrine/multiple_entity_managers.rst b/doctrine/multiple_entity_managers.rst index 5f73f8701e9..d468a233b83 100644 --- a/doctrine/multiple_entity_managers.rst +++ b/doctrine/multiple_entity_managers.rst @@ -59,15 +59,17 @@ The following configuration code shows how you can configure two entity managers .. code-block:: xml - - - - - + + + + - - + - - - - - + + + + + - - - - - - + + + + + + .. code-block:: php @@ -227,4 +229,3 @@ The same applies to repository calls:: ; } } - diff --git a/doctrine/pdo_session_storage.rst b/doctrine/pdo_session_storage.rst index daf0c0ada6c..42166ca5d19 100644 --- a/doctrine/pdo_session_storage.rst +++ b/doctrine/pdo_session_storage.rst @@ -40,19 +40,28 @@ To use it, you just need to change some parameters in the main configuration fil .. code-block:: xml - - - - - - - mysql:dbname=mydatabase - - myuser - mypassword - - - + + + + + + + + + + mysql:dbname=mydatabase + + myuser + mypassword + + + + .. code-block:: php @@ -99,16 +108,23 @@ a second array argument to ``PdoSessionHandler``: .. code-block:: xml - - - mysql:dbname=mydatabase - - sessions - myuser - mypassword - - - + + + + + + mysql:dbname=mydatabase + + sessions + myuser + mypassword + + + + .. code-block:: php @@ -170,13 +186,22 @@ of your project's data, you can use the connection settings from the .. code-block:: xml - - mysql:host=%database_host%;port=%database_port%;dbname=%database_name% - - %database_user% - %database_password% - - + + + + + + mysql:host=%database_host%;port=%database_port%;dbname=%database_name% + + %database_user% + %database_password% + + + + .. code-block:: php diff --git a/doctrine/resolve_target_entity.rst b/doctrine/resolve_target_entity.rst index 92b2f1297e9..9c5901b354d 100644 --- a/doctrine/resolve_target_entity.rst +++ b/doctrine/resolve_target_entity.rst @@ -123,11 +123,14 @@ about the replacement: .. code-block:: xml + + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/doctrine + http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> diff --git a/email.rst b/email.rst index 6b6af8c4768..3e736791b40 100644 --- a/email.rst +++ b/email.rst @@ -45,7 +45,8 @@ already included: @@ -77,7 +78,8 @@ via the ``delivery_addresses`` option: @@ -159,7 +161,8 @@ by adding the ``delivery_whitelist`` option: @@ -215,16 +218,19 @@ you to open the report with details of the sent emails. .. code-block:: xml - - - - + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/webprofiler + http://symfony.com/schema/dic/webprofiler/webprofiler-1.0.xsd"> + + + .. code-block:: php diff --git a/email/spool.rst b/email/spool.rst index 825a9d3ee6b..2621be481b4 100644 --- a/email/spool.rst +++ b/email/spool.rst @@ -60,9 +60,9 @@ swiftmailer with the memory option, use the following configuration: Spool Using Files ------------------ -When you use the filesystem for spooling, Symfony creates a folder in the given +When you use the filesystem for spooling, Symfony creates a folder in the given path for each mail service (e.g. "default" for the default service). This folder -will contain files for each email in the spool. So make sure this directory is +will contain files for each email in the spool. So make sure this directory is writable by Symfony (or your webserver/php)! In order to use the spool with files, use the following configuration: @@ -85,7 +85,8 @@ In order to use the spool with files, use the following configuration: @@ -150,12 +151,12 @@ at a regular interval. If you use the memory spool, this change is transparent and has no impact. But when using the filesystem spool, the message class is serialized in - a file with the randomized class name. The problem is that this random + a file with the randomized class name. The problem is that this random class name changes on every cache clear. So if you send a mail and then you clear the cache, the message will not be unserializable. On the next execution of ``swiftmailer:spool:send`` an error will raise because the class ``Swift_Message_`` doesn't exist (anymore). - The solutions are either to use the memory spool or to load the + The solutions are either to use the memory spool or to load the ``swiftmailer`` service without the ``lazy`` option (see :doc:`/service_container/lazy_services`). diff --git a/event_dispatcher.rst b/event_dispatcher.rst index 59d909f715a..8bc88be3cbb 100644 --- a/event_dispatcher.rst +++ b/event_dispatcher.rst @@ -88,7 +88,8 @@ using a special "tag": + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - pass1 - pass2 - - + + + + + + pass1 + pass2 + + + .. code-block:: php @@ -164,10 +171,19 @@ your listener to be called just before any controller is executed. .. code-block:: xml - - %tokens% - - + + + + + + %tokens% + + + + .. code-block:: php @@ -260,11 +276,20 @@ event: .. code-block:: xml - - %tokens% - - - + + + + + + %tokens% + + + + + .. code-block:: php diff --git a/form/create_custom_field_type.rst b/form/create_custom_field_type.rst index 09da766b1b8..fc8c0d905f2 100644 --- a/form/create_custom_field_type.rst +++ b/form/create_custom_field_type.rst @@ -172,9 +172,19 @@ link for details), create a ``gender_widget`` block to handle this: .. code-block:: xml - - form/fields.html.twig - + + + + + form/fields.html.twig + + .. code-block:: php @@ -283,12 +293,19 @@ example, suppose that you're storing the gender parameters in configuration: .. code-block:: xml - - - Male - Female - - + + + + + + Male + Female + + + .. code-block:: php @@ -316,10 +333,19 @@ the ``genders`` parameter value as the first argument to its to-be-created .. code-block:: xml - - %genders% - - + + + + + + %genders% + + + + .. code-block:: php diff --git a/form/create_form_type_extension.rst b/form/create_form_type_extension.rst index 4368d920c4c..c3af5806d1f 100644 --- a/form/create_form_type_extension.rst +++ b/form/create_form_type_extension.rst @@ -108,11 +108,20 @@ tag: .. code-block:: xml - - - + + + + + + + + + .. code-block:: php diff --git a/form/dynamic_form_modification.rst b/form/dynamic_form_modification.rst index 7d68af38e53..6c8dc979405 100644 --- a/form/dynamic_form_modification.rst +++ b/form/dynamic_form_modification.rst @@ -390,12 +390,19 @@ it with :ref:`dic-tags-form-type`. .. code-block:: xml - - - - - - + + + + + + + + + + .. code-block:: php diff --git a/form/form_collections.rst b/form/form_collections.rst index 6e62a4d71bd..26fc88ea9fa 100644 --- a/form/form_collections.rst +++ b/form/form_collections.rst @@ -521,6 +521,7 @@ you will learn about next!). .. code-block:: xml + + + + + form/fields.html.twig + + + .. code-block:: php @@ -512,10 +522,20 @@ resource to use such a layout: .. code-block:: xml - - form_table_layout.html.twig - - + + + + + form_table_layout.html.twig + + + .. code-block:: php @@ -560,14 +580,24 @@ form is rendered. .. code-block:: xml - - - - AppBundle:Form - - - - + + + + + + + AppBundle:Form + + + + + .. code-block:: php @@ -603,14 +633,24 @@ resource to use such a layout: .. code-block:: xml - - - - FrameworkBundle:FormTable - - - - + + + + + + + FrameworkBundle:FormTable + + + + + .. code-block:: php diff --git a/form/form_dependencies.rst b/form/form_dependencies.rst index 916694b4ca6..80173f97c2e 100644 --- a/form/form_dependencies.rst +++ b/form/form_dependencies.rst @@ -110,7 +110,8 @@ Next, register this as a service and tag it with ``form.type``: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/form/form_themes.rst b/form/form_themes.rst index 00026637dc8..76c29d3a612 100644 --- a/form/form_themes.rst +++ b/form/form_themes.rst @@ -212,7 +212,8 @@ file: @@ -294,7 +295,8 @@ file: diff --git a/form/type_guesser.rst b/form/type_guesser.rst index 2ce5d264de4..ecf5be7928e 100644 --- a/form/type_guesser.rst +++ b/form/type_guesser.rst @@ -194,15 +194,14 @@ creating a service and tagging it as ``form.type_guesser``: - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + - diff --git a/introduction/symfony1.rst b/introduction/symfony1.rst index 43df70e94dd..428462e0e00 100644 --- a/introduction/symfony1.rst +++ b/introduction/symfony1.rst @@ -274,10 +274,10 @@ do the following: - + xsi:schemaLocation="http://symfony.com/schema/routing + http://symfony.com/schema/routing/routing-1.0.xsd"> @@ -309,9 +309,16 @@ You can use this same strategy to bring in configuration from a bundle: .. code-block:: xml - - - + + + + + + + .. code-block:: php @@ -342,9 +349,16 @@ key of your configuration: .. code-block:: xml - - foo.bar@example.com - + + + + + foo.bar@example.com + + .. code-block:: php diff --git a/logging/channels_handlers.rst b/logging/channels_handlers.rst index 918ed2a0142..f149f31c7e0 100644 --- a/logging/channels_handlers.rst +++ b/logging/channels_handlers.rst @@ -56,8 +56,8 @@ in all environments, or just ``config_prod.yml`` to happen only in ``prod``: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/monolog - http://symfony.com/schema/dic/monolog/monolog-1.0.xsd" - > + http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"> + @@ -152,8 +152,8 @@ need to tag your services: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/monolog - http://symfony.com/schema/dic/monolog/monolog-1.0.xsd" - > + http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"> + foo bar diff --git a/logging/monolog_console.rst b/logging/monolog_console.rst index ad8db9c1f0c..d56a5f9949b 100644 --- a/logging/monolog_console.rst +++ b/logging/monolog_console.rst @@ -76,7 +76,10 @@ the default in Symfony Standard Edition 2.4 too. + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:monolog="http://symfony.com/schema/dic/monolog" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -121,7 +124,10 @@ information): + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:monolog="http://symfony.com/schema/dic/monolog" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -163,15 +169,15 @@ information): + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> [%%datetime%%] %%start_tag%%%%message%%%%end_tag%% (%%level_name%%) %%context%% %%extra%%\n - .. code-block:: php diff --git a/logging/monolog_email.rst b/logging/monolog_email.rst index c7c4f773351..800c93ac009 100644 --- a/logging/monolog_email.rst +++ b/logging/monolog_email.rst @@ -47,11 +47,12 @@ it is broken down. + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/monolog http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"> - diff --git a/profiler/data_collector.rst b/profiler/data_collector.rst index 6c37816a81c..f19e9c65b73 100644 --- a/profiler/data_collector.rst +++ b/profiler/data_collector.rst @@ -104,8 +104,8 @@ To enable a data collector, define it as a regular service and tag it as + http://symfony.com/schema/dic/services/services-1.0.xsd"> + + http://symfony.com/schema/dic/services/services-1.0.xsd"> + - - - + + + + + + + + + .. code-block:: php diff --git a/profiler/matchers.rst b/profiler/matchers.rst index 3ba3702e956..aabebbf33a7 100644 --- a/profiler/matchers.rst +++ b/profiler/matchers.rst @@ -40,8 +40,7 @@ configuration: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/symfony - http://symfony.com/schema/dic/symfony/symfony-1.0.xsd" - > + http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> @@ -128,12 +127,19 @@ won't use it directly: .. code-block:: xml - - - - - + + + + + + + + + .. code-block:: php @@ -173,8 +179,7 @@ profiler to use this service as the matcher: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/symfony - http://symfony.com/schema/dic/symfony/symfony-1.0.xsd" - > + http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> diff --git a/profiler/storage.rst b/profiler/storage.rst index fa242f1d478..206e3f12e03 100644 --- a/profiler/storage.rst +++ b/profiler/storage.rst @@ -31,8 +31,8 @@ uses MySQL as the storage for the profiler with a lifetime of one hour: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/symfony - http://symfony.com/schema/dic/symfony/symfony-1.0.xsd" - > + http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> + diff --git a/reference/configuration/doctrine.rst b/reference/configuration/doctrine.rst index fa94fa6e177..2e736926be2 100644 --- a/reference/configuration/doctrine.rst +++ b/reference/configuration/doctrine.rst @@ -421,8 +421,7 @@ The following block shows all possible configuration keys: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/doctrine - http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd" - > + http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:doctrine="http://symfony.com/schema/dic/doctrine" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -614,7 +616,10 @@ namespace in the ``src/Entity`` directory and gives them an ``App`` alias + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:doctrine="http://symfony.com/schema/dic/doctrine" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst index e706b7ef00e..fa9c18ec4cc 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -197,7 +197,8 @@ details, see :doc:`/request/load_balancer_reverse_proxy`. @@ -249,7 +250,8 @@ you use PHPstorm on the Mac OS platform, you will do something like: @@ -345,7 +347,8 @@ respond and the user will receive a 500 response. @@ -472,7 +475,8 @@ You can also set ``esi`` to ``true`` to enable it: @@ -833,7 +837,8 @@ setting the value to ``null``: @@ -879,7 +884,8 @@ This option allows you to define a base path to be used for assets: @@ -927,7 +933,8 @@ collection each time it generates an asset's path: @@ -969,7 +976,8 @@ You can group assets into packages, to specify different base URLs for them: @@ -1059,7 +1067,8 @@ Now, activate the ``version`` option: @@ -1180,7 +1189,8 @@ Assume you have custom global form themes in diff --git a/reference/configuration/monolog.rst b/reference/configuration/monolog.rst index 6c69c07e31a..a067d95bc10 100644 --- a/reference/configuration/monolog.rst +++ b/reference/configuration/monolog.rst @@ -84,8 +84,7 @@ Full Default Configuration xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/monolog - http://symfony.com/schema/dic/monolog/monolog-1.0.xsd" - > + http://symfony.com/schema/dic/monolog/monolog-1.0.xsd"> - - - - + + + + + + + + .. code-block:: php @@ -492,14 +500,22 @@ multiple firewalls, the "context" could actually be shared: .. code-block:: xml - - - - - - - - + + + + + + + + + + + + .. code-block:: php @@ -544,11 +560,19 @@ To use HTTP-Digest authentication you need to provide a realm and a key: .. code-block:: xml - - - - - + + + + + + + + + .. code-block:: php diff --git a/reference/configuration/swiftmailer.rst b/reference/configuration/swiftmailer.rst index 53555680760..f9bc62b6c83 100644 --- a/reference/configuration/swiftmailer.rst +++ b/reference/configuration/swiftmailer.rst @@ -267,7 +267,8 @@ Full Default Configuration + http://symfony.com/schema/dic/swiftmailer/swiftmailer-1.0.xsd"> + diff --git a/reference/configuration/twig.rst b/reference/configuration/twig.rst index 2ccfb9dc718..d07e522de0a 100644 --- a/reference/configuration/twig.rst +++ b/reference/configuration/twig.rst @@ -56,11 +56,13 @@ TwigBundle Configuration ("twig") .. code-block:: xml + + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd"> @@ -320,8 +323,9 @@ for that directory: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/twig http://symfony.com/schema/dic/twig/twig-1.0.xsd"> diff --git a/reference/configuration/web_profiler.rst b/reference/configuration/web_profiler.rst index ebc0f35695d..bfbd4c75a44 100644 --- a/reference/configuration/web_profiler.rst +++ b/reference/configuration/web_profiler.rst @@ -33,9 +33,19 @@ Full Default Configuration .. code-block:: xml - + + + + + diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index 574023da1d7..8f630cfcef8 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -100,7 +100,8 @@ And then register it as a tagged service: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -161,7 +162,8 @@ Second, define a service: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -263,7 +265,8 @@ services: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -544,7 +549,8 @@ tag: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -762,7 +770,8 @@ You can add a processor globally: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -803,7 +812,8 @@ attribute: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -840,7 +850,8 @@ You can also add a processor for a specific logging channel by using the + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -886,7 +897,8 @@ of your configuration and tag it with ``routing.loader``: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -1383,7 +1401,8 @@ the new loader and tag it with ``twig.loader``: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> diff --git a/request/mime_type.rst b/request/mime_type.rst index 269156654c3..ea431d070f8 100644 --- a/request/mime_type.rst +++ b/request/mime_type.rst @@ -43,8 +43,8 @@ All you have to do is to configure the ``jsonp`` format: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/symfony - http://symfony.com/schema/dic/symfony/symfony-1.0.xsd" - > + http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> + @@ -91,8 +91,8 @@ All you have to do is to configure the ``jsonp`` format: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/symfony - http://symfony.com/schema/dic/symfony/symfony-1.0.xsd" - > + http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> + diff --git a/routing/custom_route_loader.rst b/routing/custom_route_loader.rst index 9184d65cf13..0dbd3e0f920 100644 --- a/routing/custom_route_loader.rst +++ b/routing/custom_route_loader.rst @@ -155,7 +155,8 @@ Now define a service for the ``ExtraLoader``: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -198,7 +199,8 @@ What remains to do is adding a few lines to the routing configuration: + xsi:schemaLocation="http://symfony.com/schema/routing + http://symfony.com/schema/routing/routing-1.0.xsd"> diff --git a/routing/service_container_parameters.rst b/routing/service_container_parameters.rst index dcfe60f8650..8e24657a40d 100644 --- a/routing/service_container_parameters.rst +++ b/routing/service_container_parameters.rst @@ -31,7 +31,8 @@ inside your routing configuration: + xsi:schemaLocation="http://symfony.com/schema/routing + http://symfony.com/schema/routing/routing-1.0.xsd"> AppBundle:Main:contact @@ -68,9 +69,16 @@ in your container: .. code-block:: xml - - en|es - + + + + + en|es + + .. code-block:: php @@ -95,7 +103,8 @@ path): + xsi:schemaLocation="http://symfony.com/schema/routing + http://symfony.com/schema/routing/routing-1.0.xsd"> AppBundle:Main:contact diff --git a/routing/slash_in_parameter.rst b/routing/slash_in_parameter.rst index 9a2801705cd..a7415fb165b 100644 --- a/routing/slash_in_parameter.rst +++ b/routing/slash_in_parameter.rst @@ -50,10 +50,10 @@ a more permissive regex path. .. code-block:: xml - + xsi:schemaLocation="http://symfony.com/schema/routing + http://symfony.com/schema/routing/routing-1.0.xsd"> AppBundle:Demo:hello diff --git a/serializer.rst b/serializer.rst index eb462ba0f61..f36ea204470 100644 --- a/serializer.rst +++ b/serializer.rst @@ -36,14 +36,24 @@ it in your configuration: .. code-block:: xml - - - - - + + + + + + + + + .. code-block:: php @@ -115,11 +125,18 @@ Here is an example on how to load the .. code-block:: xml - - - - - + + + + + + + + + .. code-block:: php @@ -155,10 +172,20 @@ with the following configuration: .. code-block:: xml - - - - + + + + + + + + .. code-block:: php @@ -178,7 +205,7 @@ to your class and choose which groups to use when serializing:: $someObject, 'json', array('groups' => array('group1')) ); - + In addition to the ``@Groups`` annotation, the Serializer component also supports Yaml or XML files. These files are automatically loaded when being stored in one of the following locations: @@ -216,10 +243,20 @@ A service leveraging `APCu`_ (and APC for PHP < 5.5) is built-in. .. code-block:: xml - - - - + + + + + + + + .. code-block:: php diff --git a/service_container/alias_private.rst b/service_container/alias_private.rst index 60a736f1766..f38c987b090 100644 --- a/service_container/alias_private.rst +++ b/service_container/alias_private.rst @@ -97,7 +97,8 @@ services. + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/service_container/configurators.rst b/service_container/configurators.rst index 4c999af6137..01590b62f54 100644 --- a/service_container/configurators.rst +++ b/service_container/configurators.rst @@ -140,7 +140,8 @@ You can configure the service configurator using the ``configurator`` option: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/service_container/expression_language.rst b/service_container/expression_language.rst index 100d06b4e93..9889485cd56 100644 --- a/service_container/expression_language.rst +++ b/service_container/expression_language.rst @@ -37,8 +37,7 @@ of the new ``mailer_configuration`` service? One way is to use an expression: + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -83,8 +82,7 @@ via a ``container`` variable. Here's another example: + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/service_container/factories.rst b/service_container/factories.rst index cce11ebd0fb..4814ff6edfe 100644 --- a/service_container/factories.rst +++ b/service_container/factories.rst @@ -55,7 +55,8 @@ configure the service container to use the + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -114,7 +115,8 @@ Configuration of the service container then looks like this: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/service_container/import.rst b/service_container/import.rst index 75fa0722ad1..bc9da428f28 100644 --- a/service_container/import.rst +++ b/service_container/import.rst @@ -157,9 +157,9 @@ invokes the service container extension inside the FrameworkBundle: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> diff --git a/service_container/injection_types.rst b/service_container/injection_types.rst index 1cad6337089..ab6b2a64bf4 100644 --- a/service_container/injection_types.rst +++ b/service_container/injection_types.rst @@ -53,7 +53,8 @@ service container configuration: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -133,7 +134,8 @@ that accepts the dependency:: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -204,7 +206,8 @@ Another possibility is just setting public fields of the class directly:: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/service_container/lazy_services.rst b/service_container/lazy_services.rst index a1f31f9c9c1..11f55bfc1aa 100644 --- a/service_container/lazy_services.rst +++ b/service_container/lazy_services.rst @@ -60,7 +60,8 @@ You can mark the service as ``lazy`` by manipulating its definition: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/service_container/parameters.rst b/service_container/parameters.rst index d8a01d728f6..d9ca1e3b637 100644 --- a/service_container/parameters.rst +++ b/service_container/parameters.rst @@ -25,7 +25,8 @@ Use the ``parameters`` section of a config file to set parameters: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> sendmail @@ -62,7 +63,8 @@ and hidden with the service definition: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> sendmail @@ -183,7 +185,8 @@ for all parameters that are arrays. + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -236,7 +239,8 @@ key and define the type as ``constant``. + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> GLOBAL_CONSTANT diff --git a/service_container/parent_services.rst b/service_container/parent_services.rst index 914da6ccab8..7aeba899625 100644 --- a/service_container/parent_services.rst +++ b/service_container/parent_services.rst @@ -63,11 +63,12 @@ duplicated service definitions: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> - + @@ -169,7 +170,8 @@ in the child class: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/service_container/request.rst b/service_container/request.rst index 30989ec1dee..7a54a00c2d0 100644 --- a/service_container/request.rst +++ b/service_container/request.rst @@ -50,7 +50,8 @@ Now, just inject the ``request_stack``, which behaves like any normal service: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> - - - - - + + + + + + + + + .. code-block:: php @@ -212,11 +219,18 @@ The service configuration for this class would look something like this: .. code-block:: xml - - - - - + + + + + + + + + .. code-block:: php diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst index 530a2596029..f5c144f58e1 100644 --- a/service_container/service_decoration.rst +++ b/service_container/service_decoration.rst @@ -25,16 +25,14 @@ the original service is lost: - + xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> + - @@ -73,8 +71,8 @@ a reference of the old one as ``app.decorating_mailer.inner``: + xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> + @@ -140,8 +138,8 @@ convention, the old ``app.mailer`` service is renamed to + xsd:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> + diff --git a/service_container/synthetic_services.rst b/service_container/synthetic_services.rst index 301e6cae18b..9788cb59bea 100644 --- a/service_container/synthetic_services.rst +++ b/service_container/synthetic_services.rst @@ -47,7 +47,8 @@ configuration: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/service_container/tags.rst b/service_container/tags.rst index 555a2d8d88a..c1b7515e90c 100644 --- a/service_container/tags.rst +++ b/service_container/tags.rst @@ -114,14 +114,13 @@ Then, define the chain as a service: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> - - @@ -159,7 +158,8 @@ For example, you may add the following transports as services: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -300,7 +300,8 @@ To answer this, change the service declaration: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/session/limit_metadata_writes.rst b/session/limit_metadata_writes.rst index 5708a793567..de28ccb52a8 100644 --- a/session/limit_metadata_writes.rst +++ b/session/limit_metadata_writes.rst @@ -33,8 +33,9 @@ than zero: + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd + http://symfony.com/schema/dic/symfony http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> diff --git a/session/locale_sticky_session.rst b/session/locale_sticky_session.rst index 2ac8bbf4d6a..b07e53b8f73 100644 --- a/session/locale_sticky_session.rst +++ b/session/locale_sticky_session.rst @@ -75,12 +75,21 @@ Then register the listener: .. code-block:: xml - - %kernel.default_locale% + + - - + + + %kernel.default_locale% + + + + + .. code-block:: php diff --git a/session/php_bridge.rst b/session/php_bridge.rst index c122337c0c8..125909d8cd6 100644 --- a/session/php_bridge.rst +++ b/session/php_bridge.rst @@ -27,7 +27,10 @@ for the ``handler_id``: + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:framework="http://symfony.com/schema/dic/symfony" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:framework="http://symfony.com/schema/dic/symfony" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> + diff --git a/session/sessions_directory.rst b/session/sessions_directory.rst index 4bfedda6304..ce3df13f908 100644 --- a/session/sessions_directory.rst +++ b/session/sessions_directory.rst @@ -28,8 +28,8 @@ to store session data. This is because of the following configuration: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/symfony - http://symfony.com/schema/dic/symfony/symfony-1.0.xsd" - > + http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> + @@ -71,8 +71,8 @@ means that when you clear the cache, any current sessions will also be deleted: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/symfony - http://symfony.com/schema/dic/symfony/symfony-1.0.xsd" - > + http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> + @@ -121,8 +121,8 @@ session directory to ``app/sessions``: xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd http://symfony.com/schema/dic/symfony - http://symfony.com/schema/dic/symfony/symfony-1.0.xsd" - > + http://symfony.com/schema/dic/symfony/symfony-1.0.xsd"> + '%kernel.root_dir%/sessions', ), )); - diff --git a/templating/PHP.rst b/templating/PHP.rst index 79a73734d49..80e74d31431 100644 --- a/templating/PHP.rst +++ b/templating/PHP.rst @@ -33,13 +33,23 @@ your application configuration file: .. code-block:: xml - - - - - - - + + + + + + + + + + + .. code-block:: php diff --git a/templating/global_variables.rst b/templating/global_variables.rst index 3509df5005c..c2a0551fdd1 100644 --- a/templating/global_variables.rst +++ b/templating/global_variables.rst @@ -20,10 +20,20 @@ This is possible inside your ``app/config/config.yml`` file: .. code-block:: xml - - - UA-xxxxx-x - + + + + + + UA-xxxxx-x + + .. code-block:: php @@ -67,9 +77,19 @@ system, which lets you isolate or reuse the value: .. code-block:: xml - - %ga_tracking% - + + + + + %ga_tracking% + + .. code-block:: php @@ -111,10 +131,20 @@ This should feel familiar, as it's the same syntax you use in service configurat .. code-block:: xml - - - @app.user_management - + + + + + + @app.user_management + + .. code-block:: php @@ -124,4 +154,4 @@ This should feel familiar, as it's the same syntax you use in service configurat 'globals' => array( 'user_management' => '@app.user_management', ), - )); \ No newline at end of file + )); diff --git a/templating/hinclude.rst b/templating/hinclude.rst index 19d471a6fa2..60b50a862ce 100644 --- a/templating/hinclude.rst +++ b/templating/hinclude.rst @@ -53,7 +53,8 @@ tags: @@ -90,7 +91,8 @@ in your application configuration: diff --git a/templating/namespaced_paths.rst b/templating/namespaced_paths.rst index 543d4dc9601..03834cc06ba 100644 --- a/templating/namespaced_paths.rst +++ b/templating/namespaced_paths.rst @@ -51,11 +51,12 @@ directory: .. code-block:: xml - + + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:twig="http://symfony.com/schema/dic/twig" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> %kernel.root_dir%/../vendor/acme/foo-bar/templates @@ -110,10 +111,12 @@ specific template doesn't exist. .. code-block:: xml - + + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:twig="http://symfony.com/schema/dic/twig" + xsi:schemaLocation="http://symfony.com/schema/dic/services + http://symfony.com/schema/dic/services/services-1.0.xsd"> %kernel.root_dir%/../vendor/acme/themes/theme1 diff --git a/templating/render_without_controller.rst b/templating/render_without_controller.rst index 236a9a33359..20e2ca240c3 100644 --- a/templating/render_without_controller.rst +++ b/templating/render_without_controller.rst @@ -27,7 +27,6 @@ can do this without creating a controller: .. code-block:: xml - @@ -100,7 +99,6 @@ other variables in your route, you can control exactly how your page is cached: .. code-block:: xml - diff --git a/templating/templating_service.rst b/templating/templating_service.rst index 7b1ef51ae0b..48912791c31 100644 --- a/templating/templating_service.rst +++ b/templating/templating_service.rst @@ -42,7 +42,8 @@ configuration file: diff --git a/templating/twig_extension.rst b/templating/twig_extension.rst index 183302a4778..53c320defc3 100644 --- a/templating/twig_extension.rst +++ b/templating/twig_extension.rst @@ -84,13 +84,20 @@ Now you must let the Service Container know about your newly created Twig Extens .. code-block:: xml - - - - - + + + + + + + + + .. code-block:: php diff --git a/validation.rst b/validation.rst index 6a1a7ac316a..017f2aff3f0 100644 --- a/validation.rst +++ b/validation.rst @@ -71,7 +71,8 @@ following: + xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping + http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> @@ -229,7 +230,8 @@ file: @@ -264,7 +266,8 @@ previous configuration by the following: @@ -360,7 +363,8 @@ constraint, have several configuration options available. Suppose that the + xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping + http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> @@ -444,7 +448,8 @@ options can be specified in this way. + xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping + http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> @@ -573,7 +578,8 @@ class to have at least 3 characters. + xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping + http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> @@ -658,7 +664,8 @@ this method must return ``true``: + xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping + http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd"> diff --git a/validation/custom_constraint.rst b/validation/custom_constraint.rst index c6ba3a01b25..2430143dd0e 100644 --- a/validation/custom_constraint.rst +++ b/validation/custom_constraint.rst @@ -183,10 +183,19 @@ tag so that the validation system knows about it: .. code-block:: xml - - - - + + + + + + + + + + .. code-block:: php