From 51273f6fb1421b68c1931c3960f68cd483f1ee95 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Mar 2014 12:32:38 +0100
Subject: [ticket/12090] Pass route name to url() to allow admins to change the
 routes

PHPBB3-12090
---
 tests/controller/ext/foo/config/routing.yml           |  7 -------
 tests/controller/ext/foo/config/routing_2.yml         |  3 ---
 tests/controller/ext/foo/config/services.yml          |  3 ---
 tests/controller/ext/foo/controller.php               | 18 ------------------
 tests/controller/ext/vendor2/foo/config/routing.yml   |  7 +++++++
 tests/controller/ext/vendor2/foo/config/routing_2.yml |  6 ++++++
 tests/controller/ext/vendor2/foo/config/services.yml  |  3 +++
 tests/controller/ext/vendor2/foo/controller.php       | 18 ++++++++++++++++++
 8 files changed, 34 insertions(+), 31 deletions(-)
 delete mode 100644 tests/controller/ext/foo/config/routing.yml
 delete mode 100644 tests/controller/ext/foo/config/routing_2.yml
 delete mode 100644 tests/controller/ext/foo/config/services.yml
 delete mode 100644 tests/controller/ext/foo/controller.php
 create mode 100644 tests/controller/ext/vendor2/foo/config/routing.yml
 create mode 100644 tests/controller/ext/vendor2/foo/config/routing_2.yml
 create mode 100644 tests/controller/ext/vendor2/foo/config/services.yml
 create mode 100644 tests/controller/ext/vendor2/foo/controller.php

(limited to 'tests/controller/ext')

diff --git a/tests/controller/ext/foo/config/routing.yml b/tests/controller/ext/foo/config/routing.yml
deleted file mode 100644
index 6cc275d96d..0000000000
--- a/tests/controller/ext/foo/config/routing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-controller1:
-    pattern: /foo
-    defaults: { _controller: foo.controller:handle }
-
-include_controller2:
-    resource: "routing_2.yml"
-    prefix:   /foo
diff --git a/tests/controller/ext/foo/config/routing_2.yml b/tests/controller/ext/foo/config/routing_2.yml
deleted file mode 100644
index 35fff27037..0000000000
--- a/tests/controller/ext/foo/config/routing_2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-controller2:
-    pattern: /bar
-    defaults: { _controller: foo.controller:handle }
diff --git a/tests/controller/ext/foo/config/services.yml b/tests/controller/ext/foo/config/services.yml
deleted file mode 100644
index 9ed67d5bc2..0000000000
--- a/tests/controller/ext/foo/config/services.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-services:
-    foo.controller:
-        class: foo\controller
diff --git a/tests/controller/ext/foo/controller.php b/tests/controller/ext/foo/controller.php
deleted file mode 100644
index ce2233b3c9..0000000000
--- a/tests/controller/ext/foo/controller.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace foo;
-
-use Symfony\Component\HttpFoundation\Response;
-
-class controller
-{
-	/**
-	* Handle method
-	*
-	* @return null
-	*/
-	public function handle()
-	{
-		return new Response('Test', 200);
-	}
-}
diff --git a/tests/controller/ext/vendor2/foo/config/routing.yml b/tests/controller/ext/vendor2/foo/config/routing.yml
new file mode 100644
index 0000000000..6cc275d96d
--- /dev/null
+++ b/tests/controller/ext/vendor2/foo/config/routing.yml
@@ -0,0 +1,7 @@
+controller1:
+    pattern: /foo
+    defaults: { _controller: foo.controller:handle }
+
+include_controller2:
+    resource: "routing_2.yml"
+    prefix:   /foo
diff --git a/tests/controller/ext/vendor2/foo/config/routing_2.yml b/tests/controller/ext/vendor2/foo/config/routing_2.yml
new file mode 100644
index 0000000000..d987a65aea
--- /dev/null
+++ b/tests/controller/ext/vendor2/foo/config/routing_2.yml
@@ -0,0 +1,6 @@
+controller2:
+    pattern: /bar
+    defaults: { _controller: foo.controller:handle }
+controller3:
+    pattern: /bar/p-{p}
+    defaults: { _controller: foo.controller:handle }
diff --git a/tests/controller/ext/vendor2/foo/config/services.yml b/tests/controller/ext/vendor2/foo/config/services.yml
new file mode 100644
index 0000000000..9ed67d5bc2
--- /dev/null
+++ b/tests/controller/ext/vendor2/foo/config/services.yml
@@ -0,0 +1,3 @@
+services:
+    foo.controller:
+        class: foo\controller
diff --git a/tests/controller/ext/vendor2/foo/controller.php b/tests/controller/ext/vendor2/foo/controller.php
new file mode 100644
index 0000000000..ce2233b3c9
--- /dev/null
+++ b/tests/controller/ext/vendor2/foo/controller.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace foo;
+
+use Symfony\Component\HttpFoundation\Response;
+
+class controller
+{
+	/**
+	* Handle method
+	*
+	* @return null
+	*/
+	public function handle()
+	{
+		return new Response('Test', 200);
+	}
+}
-- 
cgit v1.2.1