diff --git a/composer.json b/composer.json index f340fe9bc3dbef34dc699c212a97919d3803bb74..b41c15ad71d28b224183e6e06f59cf67127088a4 100644 --- a/composer.json +++ b/composer.json @@ -3,5 +3,8 @@ "type": "drupal-module", "description": "Provides expanded entity APIs, which will be moved to Drupal core one day.", "homepage": "http://drupal.org/project/entity", - "license": "GPL-2.0+" + "license": "GPL-2.0+", + "require": { + "drupal/core": "~8.1" + } } diff --git a/entity.info.yml b/entity.info.yml index cf0997138b13ada1ae1757745303d83212287001..0b032e65dcede43c83c258dfb8d41bacee4f7aaa 100644 --- a/entity.info.yml +++ b/entity.info.yml @@ -2,3 +2,5 @@ name: Entity description: Provides expanded entity APIs, which will be moved to Drupal core one day. type: module core: 8.x +dependencies: + - system (>=8.1.0) diff --git a/src/Controller/RevisionController.php b/src/Controller/RevisionController.php deleted file mode 100644 index b85ee8329d8465caf9e316ee1b2a98fbb4234db2..0000000000000000000000000000000000000000 --- a/src/Controller/RevisionController.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php - -/** - * @file - * Contains \Drupal\entity\Controller\RevisionController. - */ - -namespace Drupal\entity\Controller; - -use Drupal\Core\Entity\Controller\EntityViewController; -use Drupal\Core\Entity\EntityInterface; - -/** - * Provides some controllers related with entity revisions. - */ -class RevisionController extends EntityViewController { - - /** - * Provides a page to render a single entity revision. - * - * @param \Drupal\Core\Entity\EntityInterface $_entity_revision - * The Entity to be rendered. Note this variable is named $_entity_revision - * rather than $entity to prevent collisions with other named placeholders - * in the route. - * @param string $view_mode - * (optional) The view mode that should be used to display the entity. - * Defaults to 'full'. - * - * @return array - * A render array. - */ - public function view(EntityInterface $_entity_revision, $view_mode = 'full') { - return parent::view($_entity_revision, $view_mode); - } - -} diff --git a/src/Routing/RevisionRouteProvider.php b/src/Routing/RevisionRouteProvider.php index 33d2766f9d3af38c54c6abe78705b7b7dad3a9cf..7e3afe227a7b4766a6d663137b272138d9cb1350 100644 --- a/src/Routing/RevisionRouteProvider.php +++ b/src/Routing/RevisionRouteProvider.php @@ -51,7 +51,7 @@ class RevisionRouteProvider implements EntityRouteProviderInterface { $entity_type_id = $entity_type->id(); $route = new Route($entity_type->getLinkTemplate('revision')); $route->addDefaults([ - '_controller' => '\Drupal\entity\Controller\RevisionController::view', + '_controller' => '\Drupal\Core\Entity\Controller\EntityViewController::viewRevision', '_title_callback' => '\Drupal\Core\Entity\Controller\EntityController::title', ]); $route->addRequirements([