diff --git c/core/modules/system/tests/modules/menu_test/menu_test.module w/core/modules/system/tests/modules/menu_test/menu_test.module index 5315f00..b45eae8 100644 --- c/core/modules/system/tests/modules/menu_test/menu_test.module +++ w/core/modules/system/tests/modules/menu_test/menu_test.module @@ -58,21 +58,21 @@ function menu_test_menu() { // Hidden link for menu_link_maintain tests $items['menu_test_maintain/%'] = array( 'title' => 'Menu maintain test', - 'page callback' => 'test_page_test_page', + 'route_name' => 'menu_test_maintain', 'access arguments' => array('access content'), ); // Hierarchical tests. $items['menu-test/hierarchy/parent'] = array( 'title' => 'Parent menu router', - 'page callback' => 'test_page_test_page', + 'route_name' => 'menu_test_heirarchy_parent', ); $items['menu-test/hierarchy/parent/child'] = array( 'title' => 'Child menu router', - 'page callback' => 'test_page_test_page', + 'route_name' => 'menu_test_heirarchy_parent_child', ); $items['menu-test/hierarchy/parent/child2/child'] = array( 'title' => 'Unattached subchild router', - 'page callback' => 'test_page_test_page', + 'route_name' => 'menu_test_heirarchy_parent_child2_child', ); // Theme callback tests. $items['menu-test/theme-callback/%'] = array( @@ -108,42 +108,37 @@ function menu_test_menu() { // change, we need to simulate our own in here. $items['menu-test'] = array( 'title' => 'Menu test root', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test', ); $items['menu-test/hidden'] = array( 'title' => 'Hidden test root', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden', ); // Hidden tests; one dynamic argument. $items['menu-test/hidden/menu'] = array( 'title' => 'Menus', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_menu', ); $items['menu-test/hidden/menu/list'] = array( 'title' => 'List menus', + 'route_name' => 'menu_test_hidden_menu_list', 'type' => MENU_DEFAULT_LOCAL_TASK, ); $items['menu-test/hidden/menu/add'] = array( 'title' => 'Add menu', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_menu_add', 'type' => MENU_LOCAL_ACTION, ); $items['menu-test/hidden/menu/settings'] = array( 'title' => 'Settings', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_menu_settings', 'type' => MENU_LOCAL_TASK, 'weight' => 5, ); $items['menu-test/hidden/menu/manage/%menu'] = array( + 'route_name' => 'menu_test_hidden_menu_manage_menu', 'title' => 'Customize menu', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), ); $items['menu-test/hidden/menu/manage/%menu/list'] = array( 'title' => 'List links', @@ -152,28 +147,24 @@ function menu_test_menu() { ); $items['menu-test/hidden/menu/manage/%menu/add'] = array( 'title' => 'Add link', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_menu_manage_menu_add', 'type' => MENU_LOCAL_ACTION, ); $items['menu-test/hidden/menu/manage/%menu/edit'] = array( 'title' => 'Edit menu', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_menu_manage_menu_edit', 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_PAGE | MENU_CONTEXT_INLINE, ); $items['menu-test/hidden/menu/manage/%menu/delete'] = array( 'title' => 'Delete menu', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_menu_manage_menu_delete', ); // Hidden tests; two dynamic arguments. $items['menu-test/hidden/block'] = array( 'title' => 'Blocks', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_block', ); $items['menu-test/hidden/block/list'] = array( 'title' => 'List', @@ -181,14 +172,12 @@ function menu_test_menu() { ); $items['menu-test/hidden/block/add'] = array( 'title' => 'Add block', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_block_add', 'type' => MENU_LOCAL_ACTION, ); $items['menu-test/hidden/block/manage/%/%'] = array( 'title' => 'Configure block', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_block_manage_default', ); $items['menu-test/hidden/block/manage/%/%/configure'] = array( 'title' => 'Configure block', @@ -197,8 +186,7 @@ function menu_test_menu() { ); $items['menu-test/hidden/block/manage/%/%/delete'] = array( 'title' => 'Delete block', - 'page callback' => 'test_page_test_page', - 'access arguments' => array('access content'), + 'route_name' => 'menu_test_hidden_block_manage_delete', 'type' => MENU_LOCAL_TASK, 'context' => MENU_CONTEXT_NONE, ); diff --git c/core/modules/system/tests/modules/menu_test/menu_test.routing.yml w/core/modules/system/tests/modules/menu_test/menu_test.routing.yml index 99cb83d..01e354d 100644 --- c/core/modules/system/tests/modules/menu_test/menu_test.routing.yml +++ w/core/modules/system/tests/modules/menu_test/menu_test.routing.yml @@ -122,3 +122,130 @@ menu_test_optional_placeholder: placeholder: NULL requirements: _access: 'TRUE' + +menu_test_maintain: + pattern: '/menu_test_maintain/{placeholder}' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_heirarchy_parent: + pattern: '/menu-test/hierarchy/parent' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _access: 'TRUE' + +menu_test_heirarchy_parent_child: + pattern: '/menu-test/hierarchy/parent/child' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _access: 'TRUE' + +menu_test_heirarchy_parent_child2_child: + pattern: '/menu-test/hierarchy/parent/child2/child' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _access: 'TRUE' + +menu_test: + pattern: '/menu-test' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden: + pattern: '/menu-test/hidden' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_menu: + pattern: '/menu-test/hidden/menu' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_menu_list: + pattern: '/menu-test/hidden/menu/list' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_menu_add: + pattern: '/menu-test/hidden/menu/add' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_menu_settings: + pattern: '/menu-test/hidden/menu/settings' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_menu_manage_menu: + pattern: '/menu-test/hidden/menu/manage/{menu}' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_menu_manage_menu_add: + pattern: '/menu-test/hidden/menu/manage/{menu}/add' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_menu_manage_menu_edit: + pattern: '/menu-test/hidden/menu/manage/{menu}/edit' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_menu_manage_menu_delete: + pattern: '/menu-test/hidden/menu/manage/{menu}/delete' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_block: + pattern: '/menu-test/hidden/block' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_block_add: + pattern: '/menu-test/hidden/block/add' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_block_manage_default: + pattern: '/menu-test/hidden/block/manage/{placeholder1}/{placeholder2}' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + +menu_test_hidden_block_manage_delete: + pattern: '/menu-test/hidden/block/manage/{placeholder1}/{placeholder2}/delete' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + requirements: + _permission: 'access content' + diff --git c/core/modules/system/tests/modules/test_page_test/lib/Drupal/test_page_test/Controller/Test.php w/core/modules/system/tests/modules/test_page_test/lib/Drupal/test_page_test/Controller/Test.php index c0c10d3..91247f4 100644 --- c/core/modules/system/tests/modules/test_page_test/lib/Drupal/test_page_test/Controller/Test.php +++ w/core/modules/system/tests/modules/test_page_test/lib/Drupal/test_page_test/Controller/Test.php @@ -39,4 +39,25 @@ public function staticTitle() { return $build; } + /** + * Renders a test page. + * + * @return array + * A render array as expected by drupal_render() + */ + public function testPage() { + $build = array(); + $build['#attached']['js'] = array( + 'type' => 'setting', + 'data' => array( + 'test_page_test' => array( + 'test-setting' => 'azAZ09();.,\\\/-_{}' + ), + ), + ); + $build['#title'] = 'Test page'; + $build['#markup'] = 'Test page text.'; + return $build; + } + } diff --git c/core/modules/system/tests/modules/test_page_test/test_page_test.module w/core/modules/system/tests/modules/test_page_test/test_page_test.module index 71a804c..96fc52b 100644 --- c/core/modules/system/tests/modules/test_page_test/test_page_test.module +++ w/core/modules/system/tests/modules/test_page_test/test_page_test.module @@ -1,26 +1,9 @@ 'Test front page', - 'page callback' => 'test_page_test_page', - 'access callback' => TRUE, + 'route_name' => 'test_page_test_page', 'type' => MENU_CALLBACK, ); - return $items; } - -/** - * Page callback: Returns a test page and sets the title. - * - * @see test_page_test_menu() - */ -function test_page_test_page() { - drupal_add_js(array('test-setting' => 'azAZ09();.,\\\/-_{}'), array('type' => 'setting')); - drupal_set_title(t('Test page')); - return t('Test page text.'); -} diff --git c/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml w/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml index 3a03389..c4d003c 100644 --- c/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml +++ w/core/modules/system/tests/modules/test_page_test/test_page_test.routing.yml @@ -27,3 +27,10 @@ test_page_render_title_controller: requirements: _access: 'TRUE' +test_page_test_page: + pattern: '/test-page' + defaults: + _content: '\Drupal\test_page_test\Controller\Test::testPage' + _title: 'Test front page' + requirements: + _access: 'TRUE'