<?php
+
use MediaWiki\MediaWikiServices;
+use MediaWiki\Revision\SlotRecord;
use MediaWiki\Storage\SqlBlobStore;
-use MediaWiki\Tests\Storage\PreMcrSchemaOverride;
+use MediaWiki\Tests\Revision\PreMcrSchemaOverride;
/**
* Test class for page archiving, using the pre-MCR schema.
use PreMcrSchemaOverride;
- /**
- * @covers PageArchive::getTextFromRow
- */
- public function testGetTextFromRow() {
- $this->hideDeprecated( PageArchive::class . '::getTextFromRow' );
-
- /** @var SqlBlobStore $blobStore */
- $blobStore = MediaWikiServices::getInstance()->getBlobStore();
-
- $textId = $blobStore->getTextIdFromAddress(
- $this->firstRev->getSlot( 'main' )->getAddress()
- );
-
- $row = (object)[ 'ar_text_id' => $textId ];
- $text = $this->archivedPage->getTextFromRow( $row );
- $this->assertSame( 'testing', $text );
- }
-
protected function getExpectedArchiveRows() {
/** @var SqlBlobStore $blobStore */
$blobStore = MediaWikiServices::getInstance()->getBlobStore();
return [
[
'ar_minor_edit' => '0',
- 'ar_user' => '0',
+ 'ar_user' => null,
'ar_user_text' => $this->ipEditor,
- 'ar_actor' => null,
+ 'ar_actor' => (string)User::newFromName( $this->ipEditor, false )->getActorId( $this->db ),
'ar_len' => '11',
'ar_deleted' => '0',
'ar_rev_id' => strval( $this->ipRev->getId() ),
'ar_page_id' => strval( $this->ipRev->getPageId() ),
'ar_comment_text' => 'just a test',
'ar_comment_data' => null,
- 'ar_comment_cid' => null,
+ 'ar_comment_cid' => '2',
'ar_content_format' => null,
'ar_content_model' => null,
'ts_tags' => null,
'ar_namespace' => '0',
'ar_title' => 'PageArchiveTest_thePage',
'ar_text_id' => (string)$blobStore->getTextIdFromAddress(
- $this->ipRev->getSlot( 'main' )->getAddress()
+ $this->ipRev->getSlot( SlotRecord::MAIN )->getAddress()
),
'ar_parent_id' => strval( $this->ipRev->getParentId() ),
],
'ar_minor_edit' => '0',
'ar_user' => (string)$this->getTestUser()->getUser()->getId(),
'ar_user_text' => $this->getTestUser()->getUser()->getName(),
- 'ar_actor' => null,
+ 'ar_actor' => (string)$this->getTestUser()->getUser()->getActorId(),
'ar_len' => '7',
'ar_deleted' => '0',
'ar_rev_id' => strval( $this->firstRev->getId() ),
'ar_page_id' => strval( $this->firstRev->getPageId() ),
'ar_comment_text' => 'testing',
'ar_comment_data' => null,
- 'ar_comment_cid' => null,
+ 'ar_comment_cid' => '1',
'ar_content_format' => null,
'ar_content_model' => null,
'ts_tags' => null,
'ar_namespace' => '0',
'ar_title' => 'PageArchiveTest_thePage',
'ar_text_id' => (string)$blobStore->getTextIdFromAddress(
- $this->firstRev->getSlot( 'main' )->getAddress()
+ $this->firstRev->getSlot( SlotRecord::MAIN )->getAddress()
),
'ar_parent_id' => '0',
],