Commit 8a1ec839 authored by Omkar Deshpande's avatar Omkar Deshpande Committed by Peter Droogmans
Browse files

Issue #3287850 by Project Update Bot, omkar-pd, attiks: Automated Drupal 10 compatibility fixes

parent d953e2e1
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
name: 'Guidelines'
type: module
description: 'Add guidelines to entities and fields'
core_version_requirement: ^9
core_version_requirement: ^9 || ^10
package: 'Custom'
configure: guidelines.settings
+10 −2
Original line number Diff line number Diff line
@@ -36,6 +36,13 @@ class GuidelineRevisionRevertForm extends ConfirmFormBase {
   */
  protected $dateFormatter;

  /**
   * The time service.
   *
   * @var \Drupal\Component\Datetime\TimeInterface
   */
  protected $time;

  /**
   * {@inheritdoc}
   */
@@ -43,6 +50,8 @@ class GuidelineRevisionRevertForm extends ConfirmFormBase {
    $instance = parent::create($container);
    $instance->guidelineStorage = $container->get('entity_type.manager')->getStorage('guideline');
    $instance->dateFormatter = $container->get('date.formatter');
    $instance->time = $container->get('datetime.time');

    return $instance;
  }

@@ -135,8 +144,7 @@ class GuidelineRevisionRevertForm extends ConfirmFormBase {
  protected function prepareRevertedRevision(GuidelineInterface $revision, FormStateInterface $form_state) {
    $revision->setNewRevision();
    $revision->isDefaultRevision(TRUE);
    $revision->setRevisionCreationTime(REQUEST_TIME);

    $revision->setRevisionCreationTime($this->time->getRequestTime());
    return $revision;
  }

+10 −1
Original line number Diff line number Diff line
@@ -27,12 +27,21 @@ class GuidelineRevisionRevertTranslationForm extends GuidelineRevisionRevertForm
   */
  protected $languageManager;

  /**
   * The time service.
   *
   * @var \Drupal\Component\Datetime\TimeInterface
   */
  protected $time;

  /**
   * {@inheritdoc}
   */
  public static function create(ContainerInterface $container) {
    $instance = parent::create($container);
    $instance->languageManager = $container->get('language_manager');
    $instance->time = $container->get('datetime.time');

    return $instance;
  }

@@ -89,7 +98,7 @@ class GuidelineRevisionRevertTranslationForm extends GuidelineRevisionRevertForm

    $latest_revision_translation->setNewRevision();
    $latest_revision_translation->isDefaultRevision(TRUE);
    $revision->setRevisionCreationTime(REQUEST_TIME);
    $revision->setRevisionCreationTime($this->time->getRequestTime());

    return $latest_revision_translation;
  }