diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-10 20:50:08 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-10 20:50:08 -0500 |
| commit | f7020fb5d1368020cf780deaeba56fee56e3dcfa (patch) | |
| tree | 66f95cb75cf7c892c9ccebc830a654c3a896086e /tests/controller/ext | |
| parent | 235f7c3721f792e0f732ed086e1118a2f08e37a6 (diff) | |
| parent | 0119a21862bc433b50fe3914e3bae6f12f61129c (diff) | |
| download | forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.tar forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.tar.gz forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.tar.bz2 forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.tar.xz forums-f7020fb5d1368020cf780deaeba56fee56e3dcfa.zip | |
Merge pull request #2092 from nickvergessen/ticket/12090
[ticket/12090] Pass route name to url() instead of the url itself
Diffstat (limited to 'tests/controller/ext')
| -rw-r--r-- | tests/controller/ext/foo/config/routing_2.yml | 3 | ||||
| -rw-r--r-- | tests/controller/ext/vendor2/foo/config/routing.yml (renamed from tests/controller/ext/foo/config/routing.yml) | 0 | ||||
| -rw-r--r-- | tests/controller/ext/vendor2/foo/config/routing_2.yml | 6 | ||||
| -rw-r--r-- | tests/controller/ext/vendor2/foo/config/services.yml (renamed from tests/controller/ext/foo/config/services.yml) | 0 | ||||
| -rw-r--r-- | tests/controller/ext/vendor2/foo/controller.php (renamed from tests/controller/ext/foo/controller.php) | 0 |
5 files changed, 6 insertions, 3 deletions
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/routing.yml b/tests/controller/ext/vendor2/foo/config/routing.yml index 6cc275d96d..6cc275d96d 100644 --- a/tests/controller/ext/foo/config/routing.yml +++ b/tests/controller/ext/vendor2/foo/config/routing.yml 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/foo/config/services.yml b/tests/controller/ext/vendor2/foo/config/services.yml index 9ed67d5bc2..9ed67d5bc2 100644 --- a/tests/controller/ext/foo/config/services.yml +++ b/tests/controller/ext/vendor2/foo/config/services.yml diff --git a/tests/controller/ext/foo/controller.php b/tests/controller/ext/vendor2/foo/controller.php index ce2233b3c9..ce2233b3c9 100644 --- a/tests/controller/ext/foo/controller.php +++ b/tests/controller/ext/vendor2/foo/controller.php |