mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-15 13:14:09 +02:00
Code Issues Releases Wiki Activity

Merge pull request #2092 from nickvergessen/ticket/12090

Browse Source 
[ticket/12090] Pass route name to url() instead of the url itself
This commit is contained in:
Nathan Guse
2014-03-10 20:50:08 -05:00
parent 235f7c3721 0119a21862
commit f7020fb5d1
21 changed files with 305 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/functional/fixtures/ext/foo/bar/config/routing.yml
View File

@@ -17,3 +17,15 @@ foo_exception_controller:
foo_redirect_controller:
pattern: /foo/redirect
defaults: { _controller: foo_bar.controller:redirect }
foo_index_controller:
pattern: /index
defaults: { _controller: foo_bar.controller:redirect }
foo_tests_index_controller:
pattern: /tests/index
defaults: { _controller: foo_bar.controller:redirect }
foo_tests_dotdot_index_controller:
pattern: /tests/../index
defaults: { _controller: foo_bar.controller:redirect }

31
tests/functional/fixtures/ext/foo/bar/controller/controller.php
View File

@@ -63,40 +63,19 @@ class controller
'tests/index.php',
),
array(
$this->helper->url('index'),
$this->helper->route('foo_index_controller'),
$rewrite_prefix . 'index',
),
array(
$this->helper->url('tests/index'),
$this->helper->route('foo_tests_index_controller'),
$rewrite_prefix . 'tests/index',
),
/**
* Symfony does not allow /../ in routes
array(
$this->helper->url('tests/../index'),
$this->helper->route('foo_tests_dotdot_index_controller'),
$rewrite_prefix . 'index',
),
/*
// helper URLs starting with ../ are prone to failure.
// Do not test them right now.
array(
$this->helper->url('../index'),
'../index',
),
array(
$this->helper->url('../../index'),
'../index',
),
array(
$this->helper->url('../tests/index'),
$rewrite_prefix . '../tests/index',
),
array(
$this->helper->url('../tests/../index'),
'../index',
),
array(
$this->helper->url('../../tests/index'),
'../tests/index',
),
*/
);