commit 5127bb81f794eea33a555f2ff5527abce067d24c Author: Joel Pittet Date: Sun Jun 21 12:07:43 2015 -0700 fix tests 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 47d491d..b6c4149 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 @@ -7,6 +7,7 @@ namespace Drupal\twig_theme_test; +use Drupal\Core\Template\Attribute; use Drupal\Core\Url; /** @@ -57,7 +58,7 @@ public function linkGeneratorRender() { '#theme' => 'twig_theme_test_link_generator', '#test_url' => new Url('user.register', [], ['absolute' => TRUE]), '#test_url_attribute' => new Url('user.register', [], ['attributes' => ['foo' => 'bar']]), - '#attributes' => new Attribute(['class' => 'llama', 'kitten', 'panda']), + '#attributes' => new Attribute(['class' => ['llama', 'kitten', 'panda']]), ); } diff --git a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig index 348e2c0..8925705 100644 --- a/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig +++ b/core/modules/system/tests/modules/twig_theme_test/templates/twig_theme_test.link_generator.html.twig @@ -2,4 +2,4 @@
link via the linkgenerator: {{ link('register', test_url, {'foo': 'bar'}) }}
link via the linkgenerator: {{ link('register', test_url_attribute, {'id': 'kitten'}) }}
link via the linkgenerator: {{ link('register', 'route:user.register', {'id': 'kitten'}) }}
-
link via the linkgenerator: {{ link('register', test_url, attributes) }}
+
link via the linkgenerator: {{ link('register', 'route:user.register', attributes) }}
diff --git a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module index d5e098c..52c0ef4 100644 --- a/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module +++ b/core/modules/system/tests/modules/twig_theme_test/twig_theme_test.module @@ -43,7 +43,11 @@ function twig_theme_test_theme($existing, $type, $theme, $path) { 'template' => 'twig_theme_test.url_generator', ); $items['twig_theme_test_link_generator'] = array( - 'variables' => array('test_url' => NULL, 'test_url_attribute' => NULL), + 'variables' => [ + 'test_url' => NULL, + 'test_url_attribute' => NULL, + 'attributes' => [], + ], 'template' => 'twig_theme_test.link_generator', ); $items['twig_theme_test_url_to_string'] = array(