Merge "Make phpunit dataProviders static, part 3"

wikimedia · Nov 1, 2024 · 00de17c · 00de17c
2 parents 6093f8c + d214592
commit 00de17c
Show file tree

Hide file tree

Showing 15 changed files with 42 additions and 42 deletions.
diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpQualifierRemoveTest.php
@@ -38,11 +38,11 @@ public function testInvalidConstruct( $guid, $snakHash ) {
 		new ChangeOpQualifierRemove( $guid, $snakHash );
 	}
 
-	public function changeOpRemoveProvider() {
+	public static function changeOpRemoveProvider() {
 		$snak = new PropertyValueSnak( 2754236, new StringValue( 'test' ) );
 		$args = [];
 
-		$item = $this->newItemWithClaim( 'q345', $snak );
+		$item = self::newItemWithClaim( 'q345', $snak );
 		$statements = $item->getStatements()->toArray();
 		/** @var Statement $statement */
 		$statement = reset( $statements );
@@ -69,7 +69,7 @@ public function testApplyRemoveQualifier( Item $item, ChangeOpQualifierRemove $c
 		$this->assertTrue( $changeOpResult->isEntityChanged() );
 	}
 
-	private function newItemWithClaim( $itemIdString, $snak ) {
+	private static function newItemWithClaim( $itemIdString, $snak ) {
 		$item = new Item( new ItemId( $itemIdString ) );
 
 		$item->getStatements()->addNewStatement(

diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpRemoveStatementTest.php
@@ -44,11 +44,11 @@ public function testGetClaimGuid() {
 		$this->assertEquals( $guid, $changeop->getGuid() );
 	}
 
-	public function changeOpProvider() {
+	public static function changeOpProvider() {
 		$snak = new PropertyValueSnak( 2754236, new StringValue( 'test' ) );
 		$args = [];
 
-		$item = $this->newItemWithClaim( 'q345', $snak );
+		$item = self::newItemWithClaim( 'q345', $snak );
 		$statements = $item->getStatements()->toArray();
 		/** @var Statement $statement */
 		$statement = reset( $statements );
@@ -71,7 +71,7 @@ public function testApplyAddNewClaim( Item $item, ChangeOpRemoveStatement $chang
 		$this->assertTrue( $changeOpResult->isEntityChanged() );
 	}
 
-	private function newItemWithClaim( $itemIdString, $snak ) {
+	private static function newItemWithClaim( $itemIdString, $snak ) {
 		$item = new Item( new ItemId( $itemIdString ) );
 
 		$item->getStatements()->addNewStatement(

diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementRankTest.php
@@ -45,11 +45,11 @@ public function testInvalidConstruct( $guid, $rank ) {
 		new ChangeOpStatementRank( $guid, $rank );
 	}
 
-	public function changeOpProvider() {
+	public static function changeOpProvider() {
 		$snak = new PropertyValueSnak( 2754236, new StringValue( 'test' ) );
 		$args = [];
 
-		$item = $this->newItemWithClaim( 'q123', $snak );
+		$item = self::newItemWithClaim( 'q123', $snak );
 		$statements = $item->getStatements()->toArray();
 		/** @var Statement $statement */
 		$statement = reset( $statements );
@@ -76,7 +76,7 @@ public function testApplyStatementRank( Item $item, ChangeOpStatementRank $chang
 		$this->assertTrue( $changeOpResult->isEntityChanged() );
 	}
 
-	private function newItemWithClaim( $itemIdString, $mainSnak ) {
+	private static function newItemWithClaim( $itemIdString, $mainSnak ) {
 		$item = new Item( new ItemId( $itemIdString ) );
 
 		$item->getStatements()->addNewStatement(

diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpStatementTest.php
@@ -96,9 +96,9 @@ public function testApply( StatementListProvider $entity, Statement $statement,
 		$this->assertTrue( $changeOpResult->isEntityChanged() );
 	}
 
-	public function provideTestApply() {
-		$item777 = $this->makeNewItemWithStatement( 'Q777', new PropertyNoValueSnak( 45 ) );
-		$item666 = $this->makeNewItemWithStatement( 'Q666', new PropertySomeValueSnak( 44 ) );
+	public static function provideTestApply() {
+		$item777 = self::makeNewItemWithStatement( 'Q777', new PropertyNoValueSnak( 45 ) );
+		$item666 = self::makeNewItemWithStatement( 'Q666', new PropertySomeValueSnak( 44 ) );
 
 		$item777Statements = $item777->getStatements()->toArray();
 		$item666Statements = $item666->getStatements()->toArray();
@@ -243,16 +243,16 @@ public function testApplyInvalidThrowsException( Item $item, Statement $statemen
 		$changeOpStatement->apply( $item );
 	}
 
-	public function applyInvalidThrowsExceptionProvider() {
+	public static function applyInvalidThrowsExceptionProvider() {
 		$itemEmpty = new Item( new ItemId( 'Q888' ) );
 		$noValueSnak = new PropertyNoValueSnak( new NumericPropertyId( 'P45' ) );
 		$someValueSnak = new PropertySomeValueSnak( new NumericPropertyId( 'P44' ) );
 
 		$statementWithInvalidGuid = new Statement( $noValueSnak );
 		$statementWithInvalidGuid->setGuid( 'Q0$' );
 
-		$item777 = $this->makeNewItemWithStatement( 'Q777', $noValueSnak );
-		$item666 = $this->makeNewItemWithStatement( 'Q666', $someValueSnak );
+		$item777 = self::makeNewItemWithStatement( 'Q777', $noValueSnak );
+		$item666 = self::makeNewItemWithStatement( 'Q666', $someValueSnak );
 
 		$item777Statements = $item777->getStatements()->toArray();
 		$item666Statements = $item666->getStatements()->toArray();
@@ -335,7 +335,7 @@ public function testInvalidApply( EntityDocument $item, ChangeOpStatement $chang
 	 *
 	 * @return Item
 	 */
-	private function makeNewItemWithStatement( $idString, Snak $mainSnak ) {
+	private static function makeNewItemWithStatement( $idString, Snak $mainSnak ) {
 		$id = new ItemId( $idString );
 
 		$statement = new Statement( $mainSnak );

diff --git a/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php b/repo/tests/phpunit/includes/ChangeOp/ChangeOpsMergeTest.php
@@ -126,9 +126,9 @@ public function testCanConstruct( Item $from, Item $to, array $ignoreConflicts )
 		$this->assertInstanceOf( ChangeOpsMerge::class, $changeOps );
 	}
 
-	public function provideValidConstruction() {
-		$from = $this->newItemWithId( 'Q111' );
-		$to = $this->newItemWithId( 'Q222' );
+	public static function provideValidConstruction() {
+		$from = self::newItemWithId( 'Q111' );
+		$to = self::newItemWithId( 'Q222' );
 		return [
 			[ $from, $to, [] ],
 			[ $from, $to, [ 'sitelink' ] ],
@@ -150,17 +150,17 @@ public function testInvalidIgnoreConflicts( Item $from, Item $to, array $ignoreC
 		);
 	}
 
-	public function provideInvalidConstruction() {
-		$from = $this->newItemWithId( 'Q111' );
-		$to = $this->newItemWithId( 'Q222' );
+	public static function provideInvalidConstruction() {
+		$from = self::newItemWithId( 'Q111' );
+		$to = self::newItemWithId( 'Q222' );
 		return [
 			[ $from, $to, [ 'label' ] ],
 			[ $from, $to, [ 'foo' ] ],
 			[ $from, $to, [ 'description', 'foo' ] ],
 		];
 	}
 
-	private function newItemWithId( $idString ) {
+	private static function newItemWithId( $idString ) {
 		return NewItem::withId( $idString )
 			->build();
 	}

diff --git a/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasChangeOpDeserializationTester.php b/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasChangeOpDeserializationTester.php
@@ -88,7 +88,7 @@ private function getEntityWithExistingAliases() {
 	/**
 	 * @return AliasesProvider|EntityDocument
 	 */
-	abstract protected function getEntity();
+	abstract protected static function getEntity();
 
 	/**
 	 * @return ChangeOpDeserializer

diff --git a/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializerTest.php b/repo/tests/phpunit/includes/ChangeOp/Deserialization/AliasesChangeOpDeserializerTest.php
@@ -98,7 +98,7 @@ public function getChangeOpDeserializer() {
 		return $this->newAliasesChangeOpDeserializer( $this->getTermChangeOpValidator() );
 	}
 
-	public function getEntity() {
+	public static function getEntity() {
 		return new Item();
 	}
 

diff --git a/repo/tests/phpunit/includes/ChangeOp/Deserialization/ClaimsChangeOpDeserializationTester.php b/repo/tests/phpunit/includes/ChangeOp/Deserialization/ClaimsChangeOpDeserializationTester.php
@@ -35,11 +35,11 @@ public function testGivenNewStatementChangeRequest_setsStatement( $changeRequest
 		);
 	}
 
-	public function setStatementProvider() {
+	public static function setStatementProvider() {
 		$property = new NumericPropertyId( 'P7' );
 		$statement = new Statement( new PropertyNoValueSnak( $property ) );
-		$statementSerialization = $this->getStatementSerializer()->serialize( $statement );
-		$entity = $this->getEntity();
+		$statementSerialization = self::getStatementSerializer()->serialize( $statement );
+		$entity = self::getEntity();
 
 		return [
 			'numeric index format' => [ [ 'claims' => [ $statementSerialization ] ], $entity, $property ],
@@ -57,11 +57,11 @@ public function testGivenRemoveChangeRequest_removesStatement( $changeRequest, E
 		$this->assertTrue( $entity->getStatements()->getByPropertyId( $property )->isEmpty() );
 	}
 
-	public function deleteStatementProvider() {
+	public static function deleteStatementProvider() {
 		$property = new NumericPropertyId( 'P7' );
 		$statement = new Statement( new PropertyNoValueSnak( $property ) );
 		$statement->setGuid( 'test-guid' );
-		$entity = $this->getEntity();
+		$entity = self::getEntity();
 		$entity->setStatements( new StatementList( $statement ) );
 
 		return [
@@ -99,13 +99,13 @@ public function testGivenEditChangeRequest_statementGetsChanged( $changeRequest,
 		);
 	}
 
-	public function editStatementProvider() {
+	public static function editStatementProvider() {
 		$property = new NumericPropertyId( 'P7' );
 		$statement = new Statement( new PropertyValueSnak( $property, new StringValue( 'foo' ) ) );
-		$entity = $this->getEntity();
+		$entity = self::getEntity();
 		$statement->setGuid( ( new GuidGenerator() )->newGuid( $entity->getId() ) );
 		$entity->setStatements( new StatementList( $statement ) );
-		$statementSerialization = $this->getStatementSerializer()->serialize( $statement );
+		$statementSerialization = self::getStatementSerializer()->serialize( $statement );
 		$statementSerialization['mainsnak']['datavalue']['value'] = 'bar';
 
 		return [
@@ -120,14 +120,14 @@ public function editStatementProvider() {
 		];
 	}
 
-	private function getStatementSerializer() {
+	private static function getStatementSerializer() {
 		return WikibaseRepo::getBaseDataModelSerializerFactory()->newStatementSerializer();
 	}
 
 	/**
 	 * @return StatementListProvider|EntityDocument
 	 */
-	abstract protected function getEntity();
+	abstract protected static function getEntity();
 
 	/**
 	 * @return ChangeOpDeserializer

diff --git a/repo/tests/phpunit/includes/ChangeOp/Deserialization/ClaimsChangeOpDeserializerTest.php b/repo/tests/phpunit/includes/ChangeOp/Deserialization/ClaimsChangeOpDeserializerTest.php
@@ -61,7 +61,7 @@ public function getChangeOpDeserializer() {
 		return $this->newClaimsChangeOpDeserializer();
 	}
 
-	public function getEntity() {
+	public static function getEntity() {
 		return new Item( new ItemId( 'Q123' ) );
 	}
 

diff --git a/...s/phpunit/includes/ChangeOp/Deserialization/DescriptionsChangeOpDeserializationTester.php b/...s/phpunit/includes/ChangeOp/Deserialization/DescriptionsChangeOpDeserializationTester.php
@@ -69,7 +69,7 @@ private function getEntityWithEnDescription() {
 	/**
 	 * @return DescriptionsProvider|EntityDocument
 	 */
-	abstract protected function getEntity();
+	abstract protected static function getEntity();
 
 	/**
 	 * @return ChangeOpDeserializer

diff --git a/.../tests/phpunit/includes/ChangeOp/Deserialization/DescriptionsChangeOpDeserializerTest.php b/.../tests/phpunit/includes/ChangeOp/Deserialization/DescriptionsChangeOpDeserializerTest.php
@@ -76,7 +76,7 @@ public function getChangeOpDeserializer() {
 		return $this->newDescriptionsChangeOpDeserializer( $this->getTermChangeOpValidator() );
 	}
 
-	public function getEntity() {
+	public static function getEntity() {
 		return new Item();
 	}
 

diff --git a/repo/tests/phpunit/includes/ChangeOp/Deserialization/ItemChangeOpDeserializerTest.php b/repo/tests/phpunit/includes/ChangeOp/Deserialization/ItemChangeOpDeserializerTest.php
@@ -123,7 +123,7 @@ public function getChangeOpDeserializer() {
 		return $this->newItemChangeOpDeserializer();
 	}
 
-	public function getEntity() {
+	public static function getEntity() {
 		return new Item( new ItemId( 'Q23' ) );
 	}
 

diff --git a/repo/tests/phpunit/includes/ChangeOp/Deserialization/LabelsChangeOpDeserializationTester.php b/repo/tests/phpunit/includes/ChangeOp/Deserialization/LabelsChangeOpDeserializationTester.php
@@ -67,7 +67,7 @@ private function getEntityWithEnLabel() {
 	/**
 	 * @return LabelsProvider|EntityDocument
 	 */
-	abstract protected function getEntity();
+	abstract protected static function getEntity();
 
 	/**
 	 * @return ChangeOpDeserializer

diff --git a/repo/tests/phpunit/includes/ChangeOp/Deserialization/LabelsChangeOpDeserializerTest.php b/repo/tests/phpunit/includes/ChangeOp/Deserialization/LabelsChangeOpDeserializerTest.php
@@ -76,7 +76,7 @@ public function getChangeOpDeserializer() {
 		return $this->newLabelsChangeOpDeserializer( $this->getTermChangeOpValidator() );
 	}
 
-	public function getEntity() {
+	public static function getEntity() {
 		return new Item();
 	}
 

diff --git a/repo/tests/phpunit/includes/ChangeOp/Deserialization/PropertyChangeOpDeserializerTest.php b/repo/tests/phpunit/includes/ChangeOp/Deserialization/PropertyChangeOpDeserializerTest.php
@@ -32,7 +32,7 @@ class PropertyChangeOpDeserializerTest extends \PHPUnit\Framework\TestCase {
 	use DescriptionsChangeOpDeserializationTester;
 	use LabelsChangeOpDeserializationTester;
 
-	public function getEntity() {
+	public static function getEntity() {
 		return new Property( new NumericPropertyId( 'P100' ), null, 'foo' );
 	}