From ac0ff219c61bd187dd3fbde5b6808624bd8ef077 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 19 Nov 2014 20:04:00 +0100 Subject: [ticket/12620] Move the routing.yml file to routing/environment.yml PHPBB3-12620 --- phpBB/config/default/routing.yml | 9 --------- phpBB/config/default/routing/routing.yml | 9 +++++++++ phpBB/config/development/routing.yml | 2 -- phpBB/config/development/routing/environment.yml | 2 ++ phpBB/config/production/routing.yml | 2 -- phpBB/config/production/routing/environment.yml | 2 ++ phpBB/config/test/routing.yml | 2 -- phpBB/config/test/routing/environment.yml | 2 ++ tests/controller/config/test/routing.yml | 3 --- tests/controller/config/test/routing/environment.yml | 3 +++ tests/controller/ext/vendor2/bar/config/test/routing.yml | 3 --- .../ext/vendor2/bar/config/test/routing/environment.yml | 3 +++ tests/pagination/config/test/routing.yml | 6 ------ tests/pagination/config/test/routing/environment.yml | 6 ++++++ 14 files changed, 27 insertions(+), 27 deletions(-) delete mode 100644 phpBB/config/default/routing.yml create mode 100644 phpBB/config/default/routing/routing.yml delete mode 100644 phpBB/config/development/routing.yml create mode 100644 phpBB/config/development/routing/environment.yml delete mode 100644 phpBB/config/production/routing.yml create mode 100644 phpBB/config/production/routing/environment.yml delete mode 100644 phpBB/config/test/routing.yml create mode 100644 phpBB/config/test/routing/environment.yml delete mode 100644 tests/controller/config/test/routing.yml create mode 100644 tests/controller/config/test/routing/environment.yml delete mode 100644 tests/controller/ext/vendor2/bar/config/test/routing.yml create mode 100644 tests/controller/ext/vendor2/bar/config/test/routing/environment.yml delete mode 100644 tests/pagination/config/test/routing.yml create mode 100644 tests/pagination/config/test/routing/environment.yml diff --git a/phpBB/config/default/routing.yml b/phpBB/config/default/routing.yml deleted file mode 100644 index d8e890d063..0000000000 --- a/phpBB/config/default/routing.yml +++ /dev/null @@ -1,9 +0,0 @@ -# Structure: -# -# foo_controller: -# pattern: /foo -# defaults: { _controller: foo_sevice:method } -# -# The above will be accessed via app.php?controller=foo and it will -# instantiate the "foo_service" service and call the "method" method. -# diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml new file mode 100644 index 0000000000..d8e890d063 --- /dev/null +++ b/phpBB/config/default/routing/routing.yml @@ -0,0 +1,9 @@ +# Structure: +# +# foo_controller: +# pattern: /foo +# defaults: { _controller: foo_sevice:method } +# +# The above will be accessed via app.php?controller=foo and it will +# instantiate the "foo_service" service and call the "method" method. +# diff --git a/phpBB/config/development/routing.yml b/phpBB/config/development/routing.yml deleted file mode 100644 index 9ee3e5ae3a..0000000000 --- a/phpBB/config/development/routing.yml +++ /dev/null @@ -1,2 +0,0 @@ -core.default: - resource: "../default/routing.yml" diff --git a/phpBB/config/development/routing/environment.yml b/phpBB/config/development/routing/environment.yml new file mode 100644 index 0000000000..9ee3e5ae3a --- /dev/null +++ b/phpBB/config/development/routing/environment.yml @@ -0,0 +1,2 @@ +core.default: + resource: "../default/routing.yml" diff --git a/phpBB/config/production/routing.yml b/phpBB/config/production/routing.yml deleted file mode 100644 index 9ee3e5ae3a..0000000000 --- a/phpBB/config/production/routing.yml +++ /dev/null @@ -1,2 +0,0 @@ -core.default: - resource: "../default/routing.yml" diff --git a/phpBB/config/production/routing/environment.yml b/phpBB/config/production/routing/environment.yml new file mode 100644 index 0000000000..9ee3e5ae3a --- /dev/null +++ b/phpBB/config/production/routing/environment.yml @@ -0,0 +1,2 @@ +core.default: + resource: "../default/routing.yml" diff --git a/phpBB/config/test/routing.yml b/phpBB/config/test/routing.yml deleted file mode 100644 index 9ee3e5ae3a..0000000000 --- a/phpBB/config/test/routing.yml +++ /dev/null @@ -1,2 +0,0 @@ -core.default: - resource: "../default/routing.yml" diff --git a/phpBB/config/test/routing/environment.yml b/phpBB/config/test/routing/environment.yml new file mode 100644 index 0000000000..9ee3e5ae3a --- /dev/null +++ b/phpBB/config/test/routing/environment.yml @@ -0,0 +1,2 @@ +core.default: + resource: "../default/routing.yml" diff --git a/tests/controller/config/test/routing.yml b/tests/controller/config/test/routing.yml deleted file mode 100644 index 175b11f130..0000000000 --- a/tests/controller/config/test/routing.yml +++ /dev/null @@ -1,3 +0,0 @@ -core_controller: - pattern: /core_foo - defaults: { _controller: core_foo.controller:bar } diff --git a/tests/controller/config/test/routing/environment.yml b/tests/controller/config/test/routing/environment.yml new file mode 100644 index 0000000000..175b11f130 --- /dev/null +++ b/tests/controller/config/test/routing/environment.yml @@ -0,0 +1,3 @@ +core_controller: + pattern: /core_foo + defaults: { _controller: core_foo.controller:bar } diff --git a/tests/controller/ext/vendor2/bar/config/test/routing.yml b/tests/controller/ext/vendor2/bar/config/test/routing.yml deleted file mode 100644 index 85c93b453f..0000000000 --- a/tests/controller/ext/vendor2/bar/config/test/routing.yml +++ /dev/null @@ -1,3 +0,0 @@ -controller3: - pattern: /bar - defaults: { _controller: bar.controller:handle } diff --git a/tests/controller/ext/vendor2/bar/config/test/routing/environment.yml b/tests/controller/ext/vendor2/bar/config/test/routing/environment.yml new file mode 100644 index 0000000000..85c93b453f --- /dev/null +++ b/tests/controller/ext/vendor2/bar/config/test/routing/environment.yml @@ -0,0 +1,3 @@ +controller3: + pattern: /bar + defaults: { _controller: bar.controller:handle } diff --git a/tests/pagination/config/test/routing.yml b/tests/pagination/config/test/routing.yml deleted file mode 100644 index dd667274cd..0000000000 --- a/tests/pagination/config/test/routing.yml +++ /dev/null @@ -1,6 +0,0 @@ -core_controller: - pattern: /test - defaults: { _controller: core_foo.controller:bar, page: 1} -core_page_controller: - pattern: /test/page/{page} - defaults: { _controller: core_foo.controller:bar} diff --git a/tests/pagination/config/test/routing/environment.yml b/tests/pagination/config/test/routing/environment.yml new file mode 100644 index 0000000000..dd667274cd --- /dev/null +++ b/tests/pagination/config/test/routing/environment.yml @@ -0,0 +1,6 @@ +core_controller: + pattern: /test + defaults: { _controller: core_foo.controller:bar, page: 1} +core_page_controller: + pattern: /test/page/{page} + defaults: { _controller: core_foo.controller:bar} -- cgit v1.2.1