Issue #3403265 by acbramley: Remove RevisionLogEntityTrait overrides in BlockContent (6118ef1b) · Commits · project / drupal

core/modules/block_content/src/Entity/BlockContent.php

+0 −58

Original line number	Diff line number	Diff line
		@@ -8,7 +8,6 @@
		use Drupal\Core\Entity\EntityTypeInterface;
		use Drupal\Core\Field\BaseFieldDefinition;
		use Drupal\block_content\BlockContentInterface;
		use Drupal\user\UserInterface;

		/**
		* Defines the content block entity class.
		@@ -242,63 +241,6 @@ public function setInfo($info) {
		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function getRevisionCreationTime() {
		return $this->get('revision_created')->value;
		}

		/**
		* {@inheritdoc}
		*/
		public function setRevisionCreationTime($timestamp) {
		$this->set('revision_created', $timestamp);
		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function getRevisionUser() {
		return $this->get('revision_user')->entity;
		}

		public function setRevisionUser(UserInterface $account) {
		$this->set('revision_user', $account);
		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function getRevisionUserId() {
		return $this->get('revision_user')->entity->id();
		}

		/**
		* {@inheritdoc}
		*/
		public function setRevisionUserId($user_id) {
		$this->set('revision_user', $user_id);
		return $this;
		}

		/**
		* {@inheritdoc}
		*/
		public function getRevisionLogMessage() {
		return $this->get('revision_log')->value;
		}

		/**
		* {@inheritdoc}
		*/
		public function setRevisionLogMessage($revision_log_message) {
		$this->set('revision_log', $revision_log_message);
		return $this;
		}

		/**
		* {@inheritdoc}
		*/

0 → 100644

+53 −0

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\Tests\block_content\Kernel;

		use Drupal\block_content\Entity\BlockContent;
		use Drupal\KernelTests\KernelTestBase;
		use Drupal\block_content\Entity\BlockContentType;

		/**
		* Tests revision based functions for Block Content.
		*
		* @group block_content
		*/
		class BlockContentRevisionsTest extends KernelTestBase {

		/**
		* {@inheritdoc}
		*/
		protected static $modules = [
		'block',
		'block_content',
		'system',
		'user',
		];

		/**
		* {@inheritdoc}
		*/
		public function setUp(): void {
		parent::setUp();
		$this->installEntitySchema('user');
		$this->installEntitySchema('block_content');
		}

		/**
		* Tests block content revision user id doesn't throw error with null field.
		*/
		public function testNullRevisionUser(): void {
		BlockContentType::create([
		'id' => 'basic',
		'label' => 'A basic block type',
		])->save();

		$block = BlockContent::create([
		'info' => 'Test',
		'type' => 'basic',
		'revision_user' => NULL,
		]);
		$block->save();
		$this->assertNull($block->getRevisionUserId());
		}

		}