From 57daa9e1c2697a1239e248365f55b43baa02ff99 Mon Sep 17 00:00:00 2001
From: Karel Souffriau <karel@hardware.info>
Date: Tue, 4 Dec 2018 11:22:43 +0100
Subject: [PATCH] Revert "New rounting files for Symfonyf4.1"

This reverts commit 7a9408f1e83d8d5271585d31efbe0fd5b8327af5.

Conflicts:
	Resources/doc/index.rst
---
 Resources/config/routing_41/all.xml           | 21 ---------------
 .../config/routing_41/change_password.xml     | 11 --------
 Resources/config/routing_41/group.xml         | 27 -------------------
 Resources/config/routing_41/profile.xml       | 15 -----------
 Resources/config/routing_41/registration.xml  | 23 ----------------
 Resources/config/routing_41/resetting.xml     | 23 ----------------
 Resources/config/routing_41/security.xml      | 19 -------------
 Resources/doc/index.rst                       |  2 --
 Resources/doc/routing.rst                     |  3 ---
 9 files changed, 144 deletions(-)
 delete mode 100644 Resources/config/routing_41/all.xml
 delete mode 100644 Resources/config/routing_41/change_password.xml
 delete mode 100644 Resources/config/routing_41/group.xml
 delete mode 100644 Resources/config/routing_41/profile.xml
 delete mode 100644 Resources/config/routing_41/registration.xml
 delete mode 100644 Resources/config/routing_41/resetting.xml
 delete mode 100644 Resources/config/routing_41/security.xml

diff --git a/Resources/config/routing_41/all.xml b/Resources/config/routing_41/all.xml
deleted file mode 100644
index 3550ded2ce..0000000000
--- a/Resources/config/routing_41/all.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <import
-        resource="@FOSUserBundle/Resources/config/routing_41/security.xml" />
-    <import
-        resource="@FOSUserBundle/Resources/config/routing_41/profile.xml"
-        prefix="/profile" />
-    <import
-        resource="@FOSUserBundle/Resources/config/routing_41/registration.xml"
-        prefix="/register" />
-    <import
-        resource="@FOSUserBundle/Resources/config/routing_41/resetting.xml"
-        prefix="/resetting" />
-    <import
-        resource="@FOSUserBundle/Resources/config/routing_41/change_password.xml"
-        prefix="/profile" />
-</routes>
diff --git a/Resources/config/routing_41/change_password.xml b/Resources/config/routing_41/change_password.xml
deleted file mode 100644
index 456e1fa32b..0000000000
--- a/Resources/config/routing_41/change_password.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <route id="fos_user_change_password" path="/change-password" methods="GET POST">
-        <default key="_controller">fos_user.change_password.controller::changePasswordAction</default>
-    </route>
-
-</routes>
diff --git a/Resources/config/routing_41/group.xml b/Resources/config/routing_41/group.xml
deleted file mode 100644
index ebd0d02fc0..0000000000
--- a/Resources/config/routing_41/group.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <route id="fos_user_group_list" path="/list" methods="GET">
-        <default key="_controller">fos_user.group.controller::listAction</default>
-    </route>
-
-    <route id="fos_user_group_new" path="/new" methods="GET POST">
-        <default key="_controller">fos_user.group.controller::newAction</default>
-    </route>
-
-    <route id="fos_user_group_show" path="/{groupName}" methods="GET">
-        <default key="_controller">fos_user.group.controller::showAction</default>
-    </route>
-
-    <route id="fos_user_group_edit" path="/{groupName}/edit" methods="GET POST">
-        <default key="_controller">fos_user.group.controller::editAction</default>
-    </route>
-
-    <route id="fos_user_group_delete" path="/{groupName}/delete" methods="GET">
-        <default key="_controller">fos_user.group.controller::deleteAction</default>
-    </route>
-
-</routes>
diff --git a/Resources/config/routing_41/profile.xml b/Resources/config/routing_41/profile.xml
deleted file mode 100644
index 390c392f14..0000000000
--- a/Resources/config/routing_41/profile.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <route id="fos_user_profile_show" path="/" methods="GET">
-        <default key="_controller">fos_user.profile.controller::showAction</default>
-    </route>
-
-    <route id="fos_user_profile_edit" path="/edit" methods="GET POST">
-        <default key="_controller">fos_user.profile.controller::editAction</default>
-    </route>
-
-</routes>
diff --git a/Resources/config/routing_41/registration.xml b/Resources/config/routing_41/registration.xml
deleted file mode 100644
index 411760d641..0000000000
--- a/Resources/config/routing_41/registration.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <route id="fos_user_registration_register" path="/" methods="GET POST">
-        <default key="_controller">fos_user.registration.controller::registerAction</default>
-    </route>
-
-    <route id="fos_user_registration_check_email" path="/check-email" methods="GET">
-        <default key="_controller">fos_user.registration.controller::checkEmailAction</default>
-    </route>
-
-    <route id="fos_user_registration_confirm" path="/confirm/{token}" methods="GET">
-        <default key="_controller">fos_user.registration.controller::confirmAction</default>
-    </route>
-
-    <route id="fos_user_registration_confirmed" path="/confirmed" methods="GET">
-        <default key="_controller">fos_user.registration.controller::confirmedAction</default>
-    </route>
-
-</routes>
diff --git a/Resources/config/routing_41/resetting.xml b/Resources/config/routing_41/resetting.xml
deleted file mode 100644
index b11a2360e8..0000000000
--- a/Resources/config/routing_41/resetting.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <route id="fos_user_resetting_request" path="/request" methods="GET">
-        <default key="_controller">fos_user.resetting.controller::requestAction</default>
-    </route>
-
-    <route id="fos_user_resetting_send_email" path="/send-email" methods="POST">
-        <default key="_controller">fos_user.resetting.controller::sendEmailAction</default>
-    </route>
-
-    <route id="fos_user_resetting_check_email" path="/check-email" methods="GET">
-        <default key="_controller">fos_user.resetting.controller::checkEmailAction</default>
-    </route>
-
-    <route id="fos_user_resetting_reset" path="/reset/{token}" methods="GET POST">
-        <default key="_controller">fos_user.resetting.controller::resetAction</default>
-    </route>
-
-</routes>
diff --git a/Resources/config/routing_41/security.xml b/Resources/config/routing_41/security.xml
deleted file mode 100644
index beeb036491..0000000000
--- a/Resources/config/routing_41/security.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<routes xmlns="http://symfony.com/schema/routing"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://symfony.com/schema/routing http://symfony.com/schema/routing/routing-1.0.xsd">
-
-    <route id="fos_user_security_login" path="/login" methods="GET POST">
-        <default key="_controller">fos_user.security.controller::loginAction</default>
-    </route>
-
-    <route id="fos_user_security_check" path="/login_check" methods="POST">
-        <default key="_controller">fos_user.security.controller::checkAction</default>
-    </route>
-
-    <route id="fos_user_security_logout" path="/logout" methods="GET POST">
-        <default key="_controller">fos_user.security.controller::logoutAction</default>
-    </route>
-
-</routes>
diff --git a/Resources/doc/index.rst b/Resources/doc/index.rst
index fea173725d..a334051030 100644
--- a/Resources/doc/index.rst
+++ b/Resources/doc/index.rst
@@ -384,8 +384,6 @@ import the FOSUserBundle routing files.
 By importing the routing files you will have ready made pages for things such as
 logging in, creating users, etc.
 
-Use `routing_41` instead of `routing` for `Symfony4.1`.
-
 .. configuration-block::
 
     .. code-block:: yaml
diff --git a/Resources/doc/routing.rst b/Resources/doc/routing.rst
index 26a8c85dcd..03f86d23c7 100644
--- a/Resources/doc/routing.rst
+++ b/Resources/doc/routing.rst
@@ -3,12 +3,9 @@ Advanced routing configuration
 
 By default, the routing file ``@FOSUserBundle/Resources/config/routing/all.xml`` imports
 all the routing files (except groups) and enables all the routes.
-Use ``@FOSUserBundle/Resources/config/routing_41/all.xml`` for `Symfony4.1`.
 In the case you want to enable or disable the different available routes, just use the
 single routing configuration files.
 
-Use `routing_41` instead of `routing` for `Symfony4.1`.
-
 .. configuration-block::
 
     .. code-block:: yaml