Address feedback from bojanz

src/Form/RevisionRevertForm.php

@@ -19,7 +19,7 @@ use Symfony\Component\HttpFoundation\Request;
 class RevisionRevertForm extends ConfirmFormBase {
 
   /**
-   * The node revision.
+   * The entity revision.
    *
    * @var \Drupal\Core\Entity\EntityInterface|\Drupal\Core\Entity\RevisionableInterface|\Drupal\entity\Revision\EntityRevisionLogInterface
    */
@@ -124,9 +124,7 @@ class RevisionRevertForm extends ConfirmFormBase {
     if ($this->revision instanceof EntityRevisionLogInterface) {
       $original_revision_timestamp = $this->revision->getRevisionCreationTime();
 
-      if ($this->revision instanceof EntityRevisionLogInterface) {
-        $this->revision->setRevisionLogMessage($this->t('Copy of the revision from %date.', ['%date' => $this->dateFormatter->format($original_revision_timestamp)]));
-      }
+      $this->revision->setRevisionLogMessage($this->t('Copy of the revision from %date.', ['%date' => $this->dateFormatter->format($original_revision_timestamp)]));
       drupal_set_message(t('@type %title has been reverted to the revision from %revision-date.', ['@type' => $this->getBundleLabel($this->revision), '%title' => $this->revision->label(), '%revision-date' => $this->dateFormatter->format($original_revision_timestamp)]));
     }
     else {
@@ -138,7 +136,7 @@ class RevisionRevertForm extends ConfirmFormBase {
     $this->logger('content')->notice('@type: reverted %title revision %revision.', ['@type' => $this->revision->bundle(), '%title' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
     $form_state->setRedirect(
       "entity.{$this->revision->getEntityTypeId()}.version_history",
-      array($this->revision->getEntityTypeId() => $this->revision->id())
+      [$this->revision->getEntityTypeId() => $this->revision->id()]
     );
   }
 

src/EntityRevisionTrait.php → src/Revision/RevisionableContentEntityBase.php

@@ -2,45 +2,22 @@
 
 /**
  * @file
- * Contains \Drupal\entity\EntityRevisionTrait.
+ * Contains \Drupal\entity\Revision\RevisionableContentEntityBase.
  */
 
-namespace Drupal\entity;
+namespace Drupal\entity\Revision;
+
+use Drupal\Core\Entity\ContentEntityBase;
 
 /**
- * Provides fixes for revisions
+ * Provides an entity class with revisions.
  */
-trait EntityRevisionTrait {
-
-  /**
-   * @return \Drupal\Core\Entity\EntityTypeInterface
-   */
-  abstract protected function getEntityType();
-
-  /**
-   * @return string
-   */
-  abstract protected function getEntityTypeId();
-
-  /**
-   * @return mixed
-   */
-  abstract protected function getRevisionId();
+abstract class RevisionableContentEntityBase extends ContentEntityBase {
 
   /**
-   * Gets an array of placeholders for this entity.
-   *
-   * Individual entity classes may override this method to add additional
-   * placeholders if desired. If so, they should be sure to replicate the
-   * property caching logic.
-   *
-   * @param string $rel
-   *   The link relationship type, for example: canonical or edit-form.
-   *
-   * @return array
-   *   An array of URI placeholders.
+   * {@inheritdoc}
    */
-  protected function urlRouteParametersWithRevisionSupport($rel) {
+  protected function urlRouteParameters($rel) {
     $uri_route_parameters = [];
 
     if ($rel != 'collection') {

src/Routing/RevisionRouteProvider.php

@@ -26,7 +26,7 @@ class RevisionRouteProvider implements EntityRouteProviderInterface {
     if ($view_route = $this->getRevisionViewRoute($entity_type)) {
       $collection->add("entity.$entity_type_id.revision", $view_route);
     }
-    if ($view_route = $this->getRevisionrevertRoute($entity_type)) {
+    if ($view_route = $this->getRevisionRevertRoute($entity_type)) {
       $collection->add("entity.$entity_type_id.revision_revert_form", $view_route);
     }
 
@@ -74,7 +74,7 @@ class RevisionRouteProvider implements EntityRouteProviderInterface {
    * @return \Symfony\Component\Routing\Route|null
    *   The generated route, if available.
    */
-  protected function getRevisionrevertRoute(EntityTypeInterface $entity_type) {
+  protected function getRevisionRevertRoute(EntityTypeInterface $entity_type) {
     if ($entity_type->hasLinkTemplate('revision-revert-form')) {
       $entity_type_id = $entity_type->id();
       $route = new Route($entity_type->getLinkTemplate('revision-revert-form'));

tests/src/Kernel/RevisionBasicUITest.php

@@ -43,7 +43,7 @@ class RevisionBasicUITest extends KernelTestBase {
     \Drupal::service('router.builder')->rebuild();
   }
 
-  public function ptestRevisionView() {
+  public function testRevisionView() {
     $entity = EnhancedEntity::create([
       'name' => 'rev 1',
       'type' => 'default',