From 014eed385bf761d9e3f0992835f44f58bf055afd Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 5 Sep 2014 16:33:57 +0200 Subject: [ticket/12620] Add support of the environments for the ext routing files PHPBB3-12620 --- .../ext/vendor2/bar/config/production/routing.yml | 3 +++ tests/controller/ext/vendor2/bar/config/services.yml | 3 +++ tests/controller/ext/vendor2/bar/controller.php | 18 ++++++++++++++++++ 3 files changed, 24 insertions(+) create mode 100644 tests/controller/ext/vendor2/bar/config/production/routing.yml create mode 100644 tests/controller/ext/vendor2/bar/config/services.yml create mode 100644 tests/controller/ext/vendor2/bar/controller.php (limited to 'tests/controller/ext') diff --git a/tests/controller/ext/vendor2/bar/config/production/routing.yml b/tests/controller/ext/vendor2/bar/config/production/routing.yml new file mode 100644 index 0000000000..85c93b453f --- /dev/null +++ b/tests/controller/ext/vendor2/bar/config/production/routing.yml @@ -0,0 +1,3 @@ +controller3: + pattern: /bar + defaults: { _controller: bar.controller:handle } diff --git a/tests/controller/ext/vendor2/bar/config/services.yml b/tests/controller/ext/vendor2/bar/config/services.yml new file mode 100644 index 0000000000..05a8a1994d --- /dev/null +++ b/tests/controller/ext/vendor2/bar/config/services.yml @@ -0,0 +1,3 @@ +services: + bar.controller: + class: bar\controller diff --git a/tests/controller/ext/vendor2/bar/controller.php b/tests/controller/ext/vendor2/bar/controller.php new file mode 100644 index 0000000000..ad35f5a051 --- /dev/null +++ b/tests/controller/ext/vendor2/bar/controller.php @@ -0,0 +1,18 @@ + Date: Thu, 2 Oct 2014 00:45:22 +0200 Subject: [ticket/12620] Updates test environment (production => development) PHPBB3-12620 --- tests/controller/ext/vendor2/bar/config/development/routing.yml | 3 +++ tests/controller/ext/vendor2/bar/config/production/routing.yml | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 tests/controller/ext/vendor2/bar/config/development/routing.yml delete mode 100644 tests/controller/ext/vendor2/bar/config/production/routing.yml (limited to 'tests/controller/ext') diff --git a/tests/controller/ext/vendor2/bar/config/development/routing.yml b/tests/controller/ext/vendor2/bar/config/development/routing.yml new file mode 100644 index 0000000000..85c93b453f --- /dev/null +++ b/tests/controller/ext/vendor2/bar/config/development/routing.yml @@ -0,0 +1,3 @@ +controller3: + pattern: /bar + defaults: { _controller: bar.controller:handle } diff --git a/tests/controller/ext/vendor2/bar/config/production/routing.yml b/tests/controller/ext/vendor2/bar/config/production/routing.yml deleted file mode 100644 index 85c93b453f..0000000000 --- a/tests/controller/ext/vendor2/bar/config/production/routing.yml +++ /dev/null @@ -1,3 +0,0 @@ -controller3: - pattern: /bar - defaults: { _controller: bar.controller:handle } -- cgit v1.2.1 From dd4f2387fd2f4df0e1513c251c9044f5bef60618 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 19 Nov 2014 19:50:07 +0100 Subject: [ticket/12620] Use the test environment for the tests PHPBB3-12620 --- tests/controller/ext/vendor2/bar/config/development/routing.yml | 3 --- tests/controller/ext/vendor2/bar/config/test/routing.yml | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 tests/controller/ext/vendor2/bar/config/development/routing.yml create mode 100644 tests/controller/ext/vendor2/bar/config/test/routing.yml (limited to 'tests/controller/ext') diff --git a/tests/controller/ext/vendor2/bar/config/development/routing.yml b/tests/controller/ext/vendor2/bar/config/development/routing.yml deleted file mode 100644 index 85c93b453f..0000000000 --- a/tests/controller/ext/vendor2/bar/config/development/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.yml b/tests/controller/ext/vendor2/bar/config/test/routing.yml new file mode 100644 index 0000000000..85c93b453f --- /dev/null +++ b/tests/controller/ext/vendor2/bar/config/test/routing.yml @@ -0,0 +1,3 @@ +controller3: + pattern: /bar + defaults: { _controller: bar.controller:handle } -- cgit v1.2.1 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/ext/vendor2/bar/config/test/routing.yml | 3 --- tests/controller/ext/vendor2/bar/config/test/routing/environment.yml | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) 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 (limited to 'tests/controller/ext') 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 } -- cgit v1.2.1 From 216fb13c2ad119e3a7f1b3aea497fdb825c80136 Mon Sep 17 00:00:00 2001 From: Nicofuma Date: Tue, 3 Feb 2015 16:30:41 +0100 Subject: [ticket/13407] Remove the last occurence of pattern in routing files PHPBB3-13407 --- tests/controller/ext/vendor2/bar/config/test/routing/environment.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/controller/ext') diff --git a/tests/controller/ext/vendor2/bar/config/test/routing/environment.yml b/tests/controller/ext/vendor2/bar/config/test/routing/environment.yml index 85c93b453f..5696ecb180 100644 --- a/tests/controller/ext/vendor2/bar/config/test/routing/environment.yml +++ b/tests/controller/ext/vendor2/bar/config/test/routing/environment.yml @@ -1,3 +1,3 @@ controller3: - pattern: /bar + path: /bar defaults: { _controller: bar.controller:handle } -- cgit v1.2.1 From 66c0e0c6a83fbf091aa078ab06dd6467c8c6aa11 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Mon, 4 May 2015 15:10:33 +0200 Subject: [ticket/13388] Integrate routing and di parameters resolution PHPBB3-13388 --- tests/controller/ext/vendor2/foo/config/routing.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/controller/ext') diff --git a/tests/controller/ext/vendor2/foo/config/routing.yml b/tests/controller/ext/vendor2/foo/config/routing.yml index e3e8ee5f98..7d4ac7be93 100644 --- a/tests/controller/ext/vendor2/foo/config/routing.yml +++ b/tests/controller/ext/vendor2/foo/config/routing.yml @@ -5,3 +5,7 @@ controller1: include_controller2: resource: "routing_2.yml" prefix: /foo + +controller4: + path: /foo/%core.environment% + defaults: { _controller: foo.controller:handle } -- cgit v1.2.1 From 91045879df2ee9918c7a03a58c64a74335ac67c1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 30 Mar 2016 17:44:38 +0200 Subject: [ticket/13502] Test getArguments() method of controller resolver PHPBB3-13502 --- tests/controller/ext/vendor2/foo/controller.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tests/controller/ext') diff --git a/tests/controller/ext/vendor2/foo/controller.php b/tests/controller/ext/vendor2/foo/controller.php index ce2233b3c9..b2c3df616c 100644 --- a/tests/controller/ext/vendor2/foo/controller.php +++ b/tests/controller/ext/vendor2/foo/controller.php @@ -11,8 +11,18 @@ class controller * * @return null */ - public function handle() + public function handle($optional = 'foo') { return new Response('Test', 200); } + + public function handle2($foo = 'foo', $very_optional = 0) + { + return new Response('Test2', 200); + } + + public function handle_fail($no_default) + { + return new Response('Test_fail', 200); + } } -- cgit v1.2.1 From 01d56673889cb12a11fca24b62f6e93e1c9f8dd8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 30 Mar 2016 17:49:10 +0200 Subject: [ticket/13502] Also cover passing object to resolver in tests PHPBB3-13502 --- tests/controller/ext/vendor2/foo/controller.php | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests/controller/ext') diff --git a/tests/controller/ext/vendor2/foo/controller.php b/tests/controller/ext/vendor2/foo/controller.php index b2c3df616c..cabcae042b 100644 --- a/tests/controller/ext/vendor2/foo/controller.php +++ b/tests/controller/ext/vendor2/foo/controller.php @@ -25,4 +25,9 @@ class controller { return new Response('Test_fail', 200); } + + public function __invoke() + { + $this->handle(); + } } -- cgit v1.2.1