diff --git a/core/includes/theme.inc b/core/includes/theme.inc index d8df7d7..7442761 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -2326,7 +2326,7 @@ function drupal_common_theme() { ), // From menu.inc. 'menu' => array( - 'variables' => array('items' => array(), 'attributes' => []), + 'variables' => array('items' => array(), 'attributes' => array()), 'template' => 'menu', ), 'menu_local_task' => array( diff --git a/core/modules/system/src/Tests/Theme/EngineTwigTest.php b/core/modules/system/src/Tests/Theme/EngineTwigTest.php index a179379..a98bb3c 100644 --- a/core/modules/system/src/Tests/Theme/EngineTwigTest.php +++ b/core/modules/system/src/Tests/Theme/EngineTwigTest.php @@ -76,8 +76,7 @@ public function testTwigLinkGenerator() { 'link via the linkgenerator: ' . $link_generator->generateFromUrl('register', new Url('user.register')), ]; - $content = $this->drupalGetContent(); - debug($content); + $content = $this->getRawContent(); $this->assertFalse(empty($content), 'Page content is not empty'); foreach ($expected as $string) { $this->assertRaw('
' . $string . '
'); diff --git a/core/modules/system/templates/menu.html.twig b/core/modules/system/templates/menu.html.twig index 392263b..4f6daed 100644 --- a/core/modules/system/templates/menu.html.twig +++ b/core/modules/system/templates/menu.html.twig @@ -16,10 +16,11 @@ */ #} {% import _self as menus %} -{# @TODO Add a nav element around.#} +{# @TODO Add a nav element around. #} -{#We call a macro which calls itself to render the full tree. -@see http://twig.sensiolabs.org/doc/tags/macro.html +{# + We call a macro which calls itself to render the full tree. + @see http://twig.sensiolabs.org/doc/tags/macro.html #} {{ menus.menu_links(items, attributes, 0) }} diff --git a/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php b/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php index 528f7aa..9441a50 100644 --- a/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php +++ b/core/modules/system/tests/modules/twig_theme_test/src/TwigThemeTestController.php @@ -6,6 +6,7 @@ */ namespace Drupal\twig_theme_test; + use Drupal\Core\Url; /** @@ -44,7 +45,7 @@ public function urlGeneratorRender() { public function linkGeneratorRender() { return array( '#theme' => 'twig_theme_test_link_generator', - '#test_url' => new Url('user.register') + '#test_url' => new Url('user.register'), ); }