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 --- 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 --- .../controller/ext/vendor2/bar/config/test/routing/environment.yml | 3 +++ tests/pagination/config/test/routing.yml | 6 ------ tests/pagination/config/test/routing/environment.yml | 6 ++++++ 6 files changed, 12 insertions(+), 12 deletions(-) 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 (limited to 'tests') 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