From 9e0f1b448dc5d0c0ef0d1d82acc2671803fd6976 Mon Sep 17 00:00:00 2001 From: Sylvain Combes Date: Sat, 23 May 2015 18:11:36 +0200 Subject: [PATCH 1/4] Move some articles from wrong sections --- cookbook/controller/error_pages.rst | 2 +- .../pdo_session_storage.rst | 0 cookbook/event_dispatcher/before_after_filters.rst | 2 +- .../event_listener.rst | 0 cookbook/map.rst.inc | 10 +++++----- cookbook/session/locale_sticky_session.rst | 2 +- cookbook/session/sessions_directory.rst | 2 +- redirection_map | 2 ++ reference/dic_tags.rst | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) rename cookbook/{configuration => doctrine}/pdo_session_storage.rst (100%) rename cookbook/{service_container => event_dispatcher}/event_listener.rst (100%) diff --git a/cookbook/controller/error_pages.rst b/cookbook/controller/error_pages.rst index a76fd767d24..e2a5de8acc3 100644 --- a/cookbook/controller/error_pages.rst +++ b/cookbook/controller/error_pages.rst @@ -233,7 +233,7 @@ before, but also requires a thorough understanding of Symfony internals. Suppose that your code throws specialized exceptions with a particular meaning to your application domain. -:doc:`Writing your own event listener ` +:doc:`Writing your own event listener ` for the ``kernel.exception`` event allows you to have a closer look at the exception and take different actions depending on it. Those actions might include logging the exception, redirecting the user to another page or rendering specialized diff --git a/cookbook/configuration/pdo_session_storage.rst b/cookbook/doctrine/pdo_session_storage.rst similarity index 100% rename from cookbook/configuration/pdo_session_storage.rst rename to cookbook/doctrine/pdo_session_storage.rst diff --git a/cookbook/event_dispatcher/before_after_filters.rst b/cookbook/event_dispatcher/before_after_filters.rst index d1c5acddbf8..2b7d25d6a9d 100644 --- a/cookbook/event_dispatcher/before_after_filters.rst +++ b/cookbook/event_dispatcher/before_after_filters.rst @@ -102,7 +102,7 @@ Creating an Event Listener Next, you'll need to create an event listener, which will hold the logic that you want executed before your controllers. If you're not familiar with -event listeners, you can learn more about them at :doc:`/cookbook/service_container/event_listener`:: +event listeners, you can learn more about them at :doc:`/cookbook/event_dispatcher/event_listener`:: // src/AppBundle/EventListener/TokenListener.php namespace AppBundle\EventListener; diff --git a/cookbook/service_container/event_listener.rst b/cookbook/event_dispatcher/event_listener.rst similarity index 100% rename from cookbook/service_container/event_listener.rst rename to cookbook/event_dispatcher/event_listener.rst diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc index 74048d3f60d..e7e5b7e1d99 100644 --- a/cookbook/map.rst.inc +++ b/cookbook/map.rst.inc @@ -34,7 +34,7 @@ * :doc:`/cookbook/configuration/using_parameters_in_dic` * :doc:`/cookbook/configuration/front_controllers_and_kernel` * :doc:`/cookbook/configuration/external_parameters` - * :doc:`/cookbook/configuration/pdo_session_storage` + * :doc:`/cookbook/doctrine/pdo_session_storage` * :doc:`/cookbook/configuration/apache_router` * :doc:`/cookbook/configuration/web_server_configuration` * :doc:`/cookbook/configuration/configuration_organization` @@ -78,7 +78,7 @@ * :doc:`/cookbook/doctrine/mapping_model_classes` * :doc:`/cookbook/doctrine/registration_form` * :doc:`/cookbook/doctrine/console` - * (configuration) :doc:`/cookbook/configuration/pdo_session_storage` + * (configuration) :doc:`/cookbook/doctrine/pdo_session_storage` * :doc:`/cookbook/email/index` @@ -94,7 +94,7 @@ * :doc:`/cookbook/event_dispatcher/before_after_filters` * :doc:`/cookbook/event_dispatcher/class_extension` * :doc:`/cookbook/event_dispatcher/method_behavior` - * (service container) :doc:`/cookbook/service_container/event_listener` + * (service container) :doc:`/cookbook/event_dispatcher/event_listener` * :doc:`/cookbook/form/index` @@ -179,7 +179,7 @@ * :doc:`/cookbook/service_container/index` - * :doc:`/cookbook/service_container/event_listener` + * :doc:`/cookbook/event_dispatcher/event_listener` * :doc:`/cookbook/service_container/scopes` * :doc:`/cookbook/service_container/compiler_passes` @@ -189,7 +189,7 @@ * :doc:`/cookbook/session/locale_sticky_session` * :doc:`/cookbook/session/sessions_directory` * :doc:`/cookbook/session/php_bridge` - * (configuration) :doc:`/cookbook/configuration/pdo_session_storage` + * (configuration) :doc:`/cookbook/doctrine/pdo_session_storage` * (configuration) :doc:`/cookbook/configuration/mongodb_session_storage` * :doc:`/cookbook/session/avoid_session_start` diff --git a/cookbook/session/locale_sticky_session.rst b/cookbook/session/locale_sticky_session.rst index c9ac75b55b9..978ab473764 100644 --- a/cookbook/session/locale_sticky_session.rst +++ b/cookbook/session/locale_sticky_session.rst @@ -14,7 +14,7 @@ Creating a LocaleListener ------------------------- To simulate that the locale is stored in a session, you need to create and -register a :doc:`new event listener `. +register a :doc:`new event listener `. The listener will look something like this. Typically, ``_locale`` is used as a routing parameter to signify the locale, though it doesn't really matter how you determine the desired locale from the request:: diff --git a/cookbook/session/sessions_directory.rst b/cookbook/session/sessions_directory.rst index 5ecc133ae9f..13414826dc0 100644 --- a/cookbook/session/sessions_directory.rst +++ b/cookbook/session/sessions_directory.rst @@ -94,7 +94,7 @@ that your current sessions aren't lost when you clear Symfony's cache. method of session management available within Symfony. See :doc:`/components/http_foundation/session_configuration` for a discussion of session save handlers. There are also entries in the cookbook - about storing sessions in a :doc:`relational database ` + about storing sessions in a :doc:`relational database ` or a :doc:`NoSQL database `. To change the directory in which Symfony saves session data, you only need diff --git a/redirection_map b/redirection_map index 1ebc69ced38..d98d5e697e3 100644 --- a/redirection_map +++ b/redirection_map @@ -26,3 +26,5 @@ /components/templating /components/templating/introduction /cookbook/upgrading /cookbook/upgrade/index /cookbook/security/voters_data_permission /cookbook/security/voters +/cookbook/configuration/pdo_session_storage /cookbook/doctrine/pdo_session_storage +/cookbook/service_container/event_listener /cookbook/event_dispatcher/event_listener diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst index 67a2a8aaa1b..fe56ed9ce3b 100644 --- a/reference/dic_tags.rst +++ b/reference/dic_tags.rst @@ -543,7 +543,7 @@ kernel.event_listener This tag allows you to hook your own classes into Symfony's process at different points. -For a full example of this listener, read the :doc:`/cookbook/service_container/event_listener` +For a full example of this listener, read the :doc:`/cookbook/event_dispatcher/event_listener` cookbook entry. For another practical example of a kernel listener, see the cookbook From fb7be616292a1cdc764b3bcfa27c0584cbb2ffd5 Mon Sep 17 00:00:00 2001 From: Sylvain Combes Date: Sat, 23 May 2015 18:57:14 +0200 Subject: [PATCH 2/4] Move some articles from wrong sections, updated indexs --- cookbook/configuration/index.rst | 1 - cookbook/doctrine/index.rst | 1 + cookbook/event_dispatcher/index.rst | 1 + cookbook/service_container/index.rst | 1 - 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbook/configuration/index.rst b/cookbook/configuration/index.rst index 8bac5cf43be..c53f6e0a6bd 100644 --- a/cookbook/configuration/index.rst +++ b/cookbook/configuration/index.rst @@ -9,7 +9,6 @@ Configuration using_parameters_in_dic front_controllers_and_kernel external_parameters - pdo_session_storage apache_router web_server_configuration configuration_organization diff --git a/cookbook/doctrine/index.rst b/cookbook/doctrine/index.rst index a62c736db11..1c9565871c5 100644 --- a/cookbook/doctrine/index.rst +++ b/cookbook/doctrine/index.rst @@ -14,4 +14,5 @@ Doctrine resolve_target_entity mapping_model_classes registration_form + pdo_session_storage console diff --git a/cookbook/event_dispatcher/index.rst b/cookbook/event_dispatcher/index.rst index 8dfe9a541f4..27a9adfcc3d 100644 --- a/cookbook/event_dispatcher/index.rst +++ b/cookbook/event_dispatcher/index.rst @@ -4,6 +4,7 @@ Event Dispatcher .. toctree:: :maxdepth: 2 + event_listener before_after_filters class_extension method_behavior diff --git a/cookbook/service_container/index.rst b/cookbook/service_container/index.rst index be8ad17868b..f66a455b788 100644 --- a/cookbook/service_container/index.rst +++ b/cookbook/service_container/index.rst @@ -4,6 +4,5 @@ Service Container .. toctree:: :maxdepth: 2 - event_listener scopes compiler_passes From e755522cae64ec15e811e4028439658acf87a6f7 Mon Sep 17 00:00:00 2001 From: Sylvain Combes Date: Tue, 2 Jun 2015 21:51:02 +0200 Subject: [PATCH 3/4] Fixing remaining reference of old emplacement of pdo_session_storage page due to the rebase --- 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 75af745849a..cace8c57949 100644 --- a/reference/configuration/framework.rst +++ b/reference/configuration/framework.rst @@ -713,7 +713,7 @@ installation. .. seealso:: You can see an example of the usage of this in - :doc:`/cookbook/configuration/pdo_session_storage`. + :doc:`/cookbook/doctrine/pdo_session_storage`. name .... From 0b3da6fc6612a5b8b23983c7ab71690b2b8cc761 Mon Sep 17 00:00:00 2001 From: WouterJ Date: Tue, 28 Jul 2015 23:53:01 +0200 Subject: [PATCH 4/4] Moved mongodb article and cleanup --- cookbook/configuration/index.rst | 1 - cookbook/doctrine/index.rst | 1 + .../mongodb_session_storage.rst | 0 cookbook/map.rst.inc | 19 ++++++++++--------- cookbook/session/sessions_directory.rst | 2 +- redirection_map | 1 + 6 files changed, 13 insertions(+), 11 deletions(-) rename cookbook/{configuration => doctrine}/mongodb_session_storage.rst (100%) diff --git a/cookbook/configuration/index.rst b/cookbook/configuration/index.rst index c53f6e0a6bd..11838c6fa38 100644 --- a/cookbook/configuration/index.rst +++ b/cookbook/configuration/index.rst @@ -12,4 +12,3 @@ Configuration apache_router web_server_configuration configuration_organization - mongodb_session_storage \ No newline at end of file diff --git a/cookbook/doctrine/index.rst b/cookbook/doctrine/index.rst index 1c9565871c5..d14ecb20536 100644 --- a/cookbook/doctrine/index.rst +++ b/cookbook/doctrine/index.rst @@ -15,4 +15,5 @@ Doctrine mapping_model_classes registration_form pdo_session_storage + mongodb_session_storage console diff --git a/cookbook/configuration/mongodb_session_storage.rst b/cookbook/doctrine/mongodb_session_storage.rst similarity index 100% rename from cookbook/configuration/mongodb_session_storage.rst rename to cookbook/doctrine/mongodb_session_storage.rst diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc index e7e5b7e1d99..5ba5d97ff1c 100644 --- a/cookbook/map.rst.inc +++ b/cookbook/map.rst.inc @@ -34,11 +34,11 @@ * :doc:`/cookbook/configuration/using_parameters_in_dic` * :doc:`/cookbook/configuration/front_controllers_and_kernel` * :doc:`/cookbook/configuration/external_parameters` - * :doc:`/cookbook/doctrine/pdo_session_storage` * :doc:`/cookbook/configuration/apache_router` * :doc:`/cookbook/configuration/web_server_configuration` * :doc:`/cookbook/configuration/configuration_organization` - * :doc:`/cookbook/configuration/mongodb_session_storage` + * (Doctrine) :doc:`/cookbook/doctrine/pdo_session_storage` + * (Doctrine) :doc:`/cookbook/doctrine/mongodb_session_storage` * :doc:`/cookbook/console/index` @@ -77,8 +77,9 @@ * :doc:`/cookbook/doctrine/resolve_target_entity` * :doc:`/cookbook/doctrine/mapping_model_classes` * :doc:`/cookbook/doctrine/registration_form` + * :doc:`/cookbook/doctrine/pdo_session_storage` + * :doc:`/cookbook/doctrine/mongodb_session_storage` * :doc:`/cookbook/doctrine/console` - * (configuration) :doc:`/cookbook/doctrine/pdo_session_storage` * :doc:`/cookbook/email/index` @@ -94,7 +95,7 @@ * :doc:`/cookbook/event_dispatcher/before_after_filters` * :doc:`/cookbook/event_dispatcher/class_extension` * :doc:`/cookbook/event_dispatcher/method_behavior` - * (service container) :doc:`/cookbook/event_dispatcher/event_listener` + * :doc:`/cookbook/event_dispatcher/event_listener` * :doc:`/cookbook/form/index` @@ -108,8 +109,8 @@ * :doc:`/cookbook/form/unit_testing` * :doc:`/cookbook/form/use_empty_data` * :doc:`/cookbook/form/direct_submit` - * (validation) :doc:`/cookbook/validation/custom_constraint` - * (doctrine) :doc:`/cookbook/doctrine/file_uploads` + * (Validation) :doc:`/cookbook/validation/custom_constraint` + * (Doctrine) :doc:`/cookbook/doctrine/file_uploads` * :doc:`/cookbook/frontend/index` @@ -179,9 +180,9 @@ * :doc:`/cookbook/service_container/index` - * :doc:`/cookbook/event_dispatcher/event_listener` * :doc:`/cookbook/service_container/scopes` * :doc:`/cookbook/service_container/compiler_passes` + * (Event Dispatcher) :doc:`/cookbook/event_dispatcher/event_listener` * :doc:`/cookbook/session/index` @@ -189,9 +190,9 @@ * :doc:`/cookbook/session/locale_sticky_session` * :doc:`/cookbook/session/sessions_directory` * :doc:`/cookbook/session/php_bridge` - * (configuration) :doc:`/cookbook/doctrine/pdo_session_storage` - * (configuration) :doc:`/cookbook/configuration/mongodb_session_storage` * :doc:`/cookbook/session/avoid_session_start` + * (Doctrine) :doc:`/cookbook/doctrine/pdo_session_storage` + * (Doctrine) :doc:`/cookbook/doctrine/mongodb_session_storage` * **PSR-7** diff --git a/cookbook/session/sessions_directory.rst b/cookbook/session/sessions_directory.rst index 13414826dc0..3b62b62cb95 100644 --- a/cookbook/session/sessions_directory.rst +++ b/cookbook/session/sessions_directory.rst @@ -95,7 +95,7 @@ that your current sessions aren't lost when you clear Symfony's cache. :doc:`/components/http_foundation/session_configuration` for a discussion of session save handlers. There are also entries in the cookbook about storing sessions in a :doc:`relational database ` - or a :doc:`NoSQL database `. + or a :doc:`NoSQL database `. To change the directory in which Symfony saves session data, you only need change the framework configuration. In this example, you will change the diff --git a/redirection_map b/redirection_map index d98d5e697e3..2abbaf55500 100644 --- a/redirection_map +++ b/redirection_map @@ -27,4 +27,5 @@ /cookbook/upgrading /cookbook/upgrade/index /cookbook/security/voters_data_permission /cookbook/security/voters /cookbook/configuration/pdo_session_storage /cookbook/doctrine/pdo_session_storage +/cookbook/configuration/mongodb_session_storage /cookbook/doctrine/mongodb_session_storage /cookbook/service_container/event_listener /cookbook/event_dispatcher/event_listener