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

Issue #2298993 by alexpott, tim.plunkett: Fixed routes using _entity_list wrongly are marked for upcasting.

8.0.x
Dries 2014-07-09 11:23:36 -04:00
parent 4baeb8d8c5
commit 30c3117542
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/lib/Drupal/Core/Entity/EntityResolverManager.php
View File

@ -136,8 +136,7 @@ class EntityResolverManager {
/**
* Sets the upcasting information using the _entity_* route defaults.
*
* Supported are the '_entity_view', '_entity_list' and '_entity_form' route
* defaults.
* Supports the '_entity_view' and '_entity_form' route defaults.
*
* @param \Symfony\Component\Routing\Route $route
* The route object.
@ -146,9 +145,6 @@ class EntityResolverManager {
if ($entity_view = $route->getDefault('_entity_view')) {
list($entity_type) = explode('.', $entity_view, 2);
}
elseif ($entity_list = $route->getDefault('_entity_list')) {
$entity_type = $entity_list;
}
elseif ($entity_form = $route->getDefault('_entity_form')) {
list($entity_type) = explode('.', $entity_form, 2);
}
@ -194,7 +190,7 @@ class EntityResolverManager {
}
}
// Try to use _entity_view, _entity_list information on the route.
// Try to use _entity_* information on the route.
$this->setParametersFromEntityInformation($route);
}

2
core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
View File

@ -327,7 +327,7 @@ class EntityResolverManagerTest extends UnitTestCase {
$this->entityResolverManager->setRouteOptions($route);
$this->assertEquals($defaults, $route->getDefaults());
$parameters = $route->getOption('parameters');
$this->assertEquals(array('entity_test' => array('type' => 'entity:entity_test')), $parameters);
$this->assertNull($parameters);
}
/**