Issue #3267723 by apmsooner, mxh: Error on deleting revision

src/Form/StorageRevisionDeleteForm.php

@@ -57,7 +57,7 @@ class StorageRevisionDeleteForm extends ConfirmFormBase {
    */
   public function getQuestion() {
     return $this->t('Are you sure you want to delete the revision from %revision-date?', [
-      '%revision-date' => format_date($this->revision->getRevisionCreationTime()),
+      '%revision-date' => \Drupal::service('date.formatter')->format($this->revision->getRevisionCreationTime()),
     ]);
   }
 
@@ -79,7 +79,7 @@ class StorageRevisionDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, $storage_revision = NULL) {
-    $this->revision = $this->StorageStorage->loadRevision($storage_revision);
+    $this->revision = $this->storageStorage->loadRevision($storage_revision);
     $form = parent::buildForm($form, $form_state);
 
     return $form;
@@ -89,10 +89,10 @@ class StorageRevisionDeleteForm extends ConfirmFormBase {
    * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
-    $this->StorageStorage->deleteRevision($this->revision->getRevisionId());
+    $this->storageStorage->deleteRevision($this->revision->getRevisionId());
 
     $this->logger('content')->notice('Storage: deleted %name revision %revision.', ['%name' => $this->revision->label(), '%revision' => $this->revision->getRevisionId()]);
-    $this->messenger()->addMessage(t('Revision from %revision-date of Storage %name has been deleted.', ['%revision-date' => format_date($this->revision->getRevisionCreationTime()), '%name' => $this->revision->label()]));
+    $this->messenger()->addMessage(t('Revision from %revision-date of Storage %name has been deleted.', ['%revision-date' => \Drupal::service('date.formatter')->format($this->revision->getRevisionCreationTime()), '%name' => $this->revision->label()]));
     $form_state->setRedirect(
       'entity.storage.canonical',
        ['storage' => $this->revision->id()]

src/Form/StorageRevisionRevertTranslationForm.php

@@ -75,8 +75,8 @@ class StorageRevisionRevertTranslationForm extends StorageRevisionRevertForm {
   protected function prepareRevertedRevision(StorageInterface $revision, FormStateInterface $form_state) {
     $revert_untranslated_fields = $form_state->getValue('revert_untranslated_fields');
 
-    /** @var \Drupal\storage\Entity\StorageInterface $default_revision */
-    $latest_revision = $this->StorageStorage->load($revision->id());
+    /** @var \Drupal\storage\Entity\StorageInterface $latest_revision */
+    $latest_revision = $this->storageStorage->load($revision->id());
     $latest_revision_translation = $latest_revision->getTranslation($this->langcode);
 
     $revision_translation = $revision->getTranslation($this->langcode);
@@ -89,7 +89,7 @@ class StorageRevisionRevertTranslationForm extends StorageRevisionRevertForm {
 
     $latest_revision_translation->setNewRevision();
     $latest_revision_translation->isDefaultRevision(TRUE);
-    $revision->setRevisionCreationTime(REQUEST_TIME);
+    $revision->setRevisionCreationTime(\Drupal::time()->getRequestTime());
 
     return $latest_revision_translation;
   }