Merge "REST: Avoid relying on error message params"

Author: jenkins-bot

repo/rest-api/src/Infrastructure/DataAccess/EntityUpdater.php

@@ -14,6 +14,7 @@
 use Wikibase\DataModel\Entity\EntityDocument;
 use Wikibase\DataModel\Entity\StatementListProvidingEntity;
 use Wikibase\DataModel\Services\Statement\GuidGenerator;
+use Wikibase\Lib\SettingsArray;
 use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityStore;
 use Wikibase\Repo\EditEntity\MediaWikiEditEntityFactory;
@@ -36,6 +37,7 @@ class EntityUpdater {
 	private PermissionManager $permissionManager;
 	private EntityStore $entityStore;
 	private GuidGenerator $statementIdGenerator;
+	private SettingsArray $repoSettings;
 
 	public function __construct(
 		IContextSource $context,
@@ -44,7 +46,8 @@ public function __construct(
 		EditSummaryFormatter $summaryFormatter,
 		PermissionManager $permissionManager,
 		EntityStore $entityStore,
-		GuidGenerator $statementIdGenerator
+		GuidGenerator $statementIdGenerator,
+		SettingsArray $repoSettings
 	) {
 		$this->context = $context;
 		$this->editEntityFactory = $editEntityFactory;
@@ -53,6 +56,7 @@ public function __construct(
 		$this->permissionManager = $permissionManager;
 		$this->entityStore = $entityStore;
 		$this->statementIdGenerator = $statementIdGenerator;
+		$this->repoSettings = $repoSettings;
 	}
 
 	/**
@@ -104,8 +108,7 @@ private function createOrUpdate(
 		if ( !$status->isOK() ) {
 			$entityTooBigError = $this->findErrorInStatus( $status, 'wikibase-error-entity-too-big' );
 			if ( $entityTooBigError ) {
-				$maxSizeInKiloBytes = $entityTooBigError->getParams()[0]['size'] / 1024;
-				throw new ResourceTooLargeException( $maxSizeInKiloBytes );
+				throw new ResourceTooLargeException( $this->repoSettings->getSetting( 'maxSerializedEntitySize' ) );
 			}
 
 			$abuseFilterError = $this->findAbuseFilterError( $status->getMessages() );

repo/rest-api/src/WbRestApi.ServiceWiring.php

@@ -504,7 +504,8 @@ function( MediaWikiServices $services ): ItemSerializationRequestValidatingDeser
 			),
 			$services->getPermissionManager(),
 			WikibaseRepo::getEntityStore( $services ),
-			new GuidGenerator()
+			new GuidGenerator(),
+			WikibaseRepo::getSettings( $services )
 		);
 	},
 

repo/rest-api/tests/phpunit/Infrastructure/DataAccess/EntityUpdaterIntegrationTest.php

@@ -18,6 +18,7 @@
 use Wikibase\DataModel\Statement\StatementList;
 use Wikibase\DataModel\Tests\NewItem;
 use Wikibase\DataModel\Tests\NewStatement;
+use Wikibase\Lib\SettingsArray;
 use Wikibase\Repo\RestApi\Domain\Model\EditMetadata;
 use Wikibase\Repo\RestApi\Infrastructure\DataAccess\EntityUpdater;
 use Wikibase\Repo\RestApi\Infrastructure\EditSummaryFormatter;
@@ -166,7 +167,8 @@ private function newEntityUpdater(): EntityUpdater {
 			$this->createStub( EditSummaryFormatter::class ),
 			$permissionManager,
 			WikibaseRepo::getEntityStore(),
-			new GuidGenerator()
+			new GuidGenerator(),
+			new SettingsArray()
 		);
 	}
 

repo/rest-api/tests/phpunit/Infrastructure/DataAccess/EntityUpdaterTest.php

@@ -22,6 +22,7 @@
 use Wikibase\DataModel\Statement\StatementList;
 use Wikibase\DataModel\Tests\NewItem;
 use Wikibase\DataModel\Tests\NewStatement;
+use Wikibase\Lib\SettingsArray;
 use Wikibase\Lib\Store\EntityRevision;
 use Wikibase\Lib\Store\EntityStore;
 use Wikibase\Repo\EditEntity\EditEntity;
@@ -45,6 +46,8 @@
  */
 class EntityUpdaterTest extends TestCase {
 
+	private const MAX_ENTITY_SIZE = 1;
+
 	private IContextSource $context;
 	private MediaWikiEditEntityFactory $editEntityFactory;
 	private LoggerInterface $logger;
@@ -211,18 +214,17 @@ public function testGivenSavingFails_throwsGenericException( EntityDocument $ent
 	 * @dataProvider provideEntity
 	 */
 	public function testGivenResourceTooLarge_throwsCorrespondingException( EntityDocument $entity ): void {
-		$maxSizeAsBytes = 1024;
-		$maxSizeAsKiloBytes = 1;
+		$maxSizeAsBytes = self::MAX_ENTITY_SIZE * 1024;
 
-		$errorStatus = EditEntityStatus::newFatal( 'wikibase-error-entity-too-big', [ 'size' => $maxSizeAsBytes ] );
+		$errorStatus = EditEntityStatus::newFatal( wfMessage( 'wikibase-error-entity-too-big' )->sizeParams( $maxSizeAsBytes ) );
 
 		$editEntity = $this->createStub( EditEntity::class );
 		$editEntity->method( 'attemptSave' )->willReturn( $errorStatus );
 
 		$this->editEntityFactory = $this->createStub( MediaWikiEditEntityFactory::class );
 		$this->editEntityFactory->method( 'newEditEntity' )->willReturn( $editEntity );
 
-		$this->expectExceptionObject( new ResourceTooLargeException( $maxSizeAsKiloBytes ) );
+		$this->expectExceptionObject( new ResourceTooLargeException( $maxSizeAsBytes ) );
 		$this->newEntityUpdater()->update( $entity, $this->createStub( EditMetadata::class ) );
 	}
 
@@ -364,7 +366,8 @@ private function newEntityUpdater(): EntityUpdater {
 			$this->summaryFormatter,
 			$this->permissionManager,
 			$this->entityStore,
-			new GuidGenerator()
+			new GuidGenerator(),
+			new SettingsArray( [ 'maxSerializedEntitySize' => self::MAX_ENTITY_SIZE ] )
 		);
 	}