Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2084125 by pwolanin: Fixed Bug in active detection in LinkGenerator - need to extract array from _raw_variables() ParameterBag.

8.0.x
Nathaniel Catchpole 2013-09-09 22:28:48 +01:00
parent b8016410aa
commit 044a4adf47
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/lib/Drupal/Core/Utility/LinkGenerator.php
View File

@ -74,10 +74,13 @@ class LinkGenerator implements LinkGeneratorInterface {
public function setRequest(Request $request) {
// Pre-calculate and store values based on the request that may be used
// repeatedly in generate().
$raw_variables = $request->attributes->get('_raw_variables');
// $raw_variables is a ParameterBag object or NULL.
$parameters = $raw_variables ? $raw_variables->all() : array();
$this->active = array(
'route_name' => $request->attributes->get(RouteObjectInterface::ROUTE_NAME),
'language' => $this->languageManager->getLanguage(Language::TYPE_URL)->id,
'parameters' => (array) $request->attributes->get('_raw_variables') + (array) $request->query->all(),
'parameters' => $parameters + (array) $request->query->all(),
);
}

38
core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
View File

@ -7,11 +7,12 @@
namespace Drupal\Tests\Core\Utility {
use Drupal\Core\Language\Language;
use Drupal\Core\Utility\LinkGenerator;
use Drupal\Tests\UnitTestCase;
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
use Symfony\Component\HttpFoundation\Request;
use Drupal\Core\Language\Language;
use Drupal\Core\Utility\LinkGenerator;
use Drupal\Tests\UnitTestCase;
use Symfony\Cmf\Component\Routing\RouteObjectInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
/**
* Tests the link generator.
@ -311,7 +312,7 @@ class LinkGeneratorTest extends UnitTestCase {
* service.
*/
public function testGenerateActive() {
$this->urlGenerator->expects($this->exactly(6))
$this->urlGenerator->expects($this->exactly(7))
->method('generateFromRoute')
->will($this->returnValueMap(array(
array('test_route_1', array(), FALSE, '/test-route-1'),
@ -320,9 +321,10 @@ class LinkGeneratorTest extends UnitTestCase {
array('test_route_1', array(), FALSE, '/test-route-1'),
array('test_route_3', array(), FALSE, '/test-route-3'),
array('test_route_3', array(), FALSE, '/test-route-3'),
array('test_route_4', array('object' => '1'), FALSE, '/test-route-4/1'),
)));
$this->moduleHandler->expects($this->exactly(6))
$this->moduleHandler->expects($this->exactly(7))
->method('alter');
$this->setUpLanguageManager();
@ -338,6 +340,10 @@ class LinkGeneratorTest extends UnitTestCase {
// Render a link with the same path as the current path.
$request = new Request(array(), array(), array('system_path' => 'test-route-1', RouteObjectInterface::ROUTE_NAME => 'test_route_1'));
// This attribute is expected to be set in a Drupal request by
// \Drupal\Core\ParamConverter\ParamConverterManager
$raw_variables = new ParameterBag();
$request->attributes->set('_raw_variables', $raw_variables);
$this->linkGenerator->setRequest($request);
$result = $this->linkGenerator->generate('Test', 'test_route_1');
$this->assertTag(array(
@ -367,7 +373,8 @@ class LinkGeneratorTest extends UnitTestCase {
// Render a link with the same path and query parameter as the current path.
$request = new Request(array('value' => 'example_1'), array(), array('system_path' => 'test-route-3', RouteObjectInterface::ROUTE_NAME => 'test_route_3'));
$parameters = $request->query->all();
$raw_variables = new ParameterBag();
$request->attributes->set('_raw_variables', $raw_variables);
$this->linkGenerator->setRequest($request);
$result = $this->linkGenerator->generate(
'Test',
@ -392,6 +399,21 @@ class LinkGeneratorTest extends UnitTestCase {
'tag' => 'a',
'attributes' => array('class' => 'active'),
), $result);
// Render a link with the same path and query parameter as the current path.
$request = new Request(array('value' => 'example_1'), array(), array('system_path' => 'test-route-4/1', RouteObjectInterface::ROUTE_NAME => 'test_route_4'));
$raw_variables = new ParameterBag(array('object' => '1'));
$request->attributes->set('_raw_variables', $raw_variables);
$this->linkGenerator->setRequest($request);
$result = $this->linkGenerator->generate(
'Test',
'test_route_4',
array('object' => '1'),
array('query' => array('value' => 'example_1'))
);
$this->assertTag(array(
'tag' => 'a',
'attributes' => array('class' => 'active'),
), $result);
}
}