jenkins-bot has submitted this change and it was merged.
Change subject: Remove not needed parameters from ChangeRow constructor
......................................................................
Remove not needed parameters from ChangeRow constructor
Change-Id: I2f353a90493f05c9980732513eafbc9ef4029653
---
M client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
M lib/includes/changes/ChangeRow.php
M lib/includes/changes/EntityChangeFactory.php
M lib/includes/store/sql/ChangeLookup.php
M lib/tests/phpunit/changes/ChangeRowTest.php
M lib/tests/phpunit/changes/ItemChangeTest.php
M lib/tests/phpunit/store/Sql/ChangeLookupTest.php
M repo/tests/phpunit/includes/ChangePrunerTest.php
8 files changed, 12 insertions(+), 25 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
b/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
index 2a96dab..426f657 100644
--- a/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeRunCoalescerTest.php
@@ -130,7 +130,7 @@
$class = 'Wikibase\ItemChange';
}
- $change = new $class( null, $values, false );
+ $change = new $class( $values );
$change->setDiff( $diff );
return $change;
diff --git a/lib/includes/changes/ChangeRow.php
b/lib/includes/changes/ChangeRow.php
index 4216dbe..583c42a 100644
--- a/lib/includes/changes/ChangeRow.php
+++ b/lib/includes/changes/ChangeRow.php
@@ -81,10 +81,9 @@
}
/**
- * @param null $table Ignored
* @param array|null $fields
*/
- public function __construct( $table = null, $fields = null ) {
+ public function __construct( array $fields = null ) {
$this->setFields( is_array( $fields ) ? $fields : array() );
$this->postConstruct();
diff --git a/lib/includes/changes/EntityChangeFactory.php
b/lib/includes/changes/EntityChangeFactory.php
index 7cf0525..8f33f3e 100644
--- a/lib/includes/changes/EntityChangeFactory.php
+++ b/lib/includes/changes/EntityChangeFactory.php
@@ -72,9 +72,7 @@
/** @var EntityChange $instance */
$instance = new $class(
- null,
- $fields,
- false
+ $fields
);
if ( !$instance->hasField( 'object_id' ) ) {
diff --git a/lib/includes/store/sql/ChangeLookup.php
b/lib/includes/store/sql/ChangeLookup.php
index d233262..609de28 100644
--- a/lib/includes/store/sql/ChangeLookup.php
+++ b/lib/includes/store/sql/ChangeLookup.php
@@ -155,7 +155,7 @@
'revision_id' => $row->change_revision_id,
);
- $changes[] = new $class( null, $data, false );
+ $changes[] = new $class( $data );
}
return $changes;
diff --git a/lib/tests/phpunit/changes/ChangeRowTest.php
b/lib/tests/phpunit/changes/ChangeRowTest.php
index 59ab373..45b17ff 100644
--- a/lib/tests/phpunit/changes/ChangeRowTest.php
+++ b/lib/tests/phpunit/changes/ChangeRowTest.php
@@ -25,7 +25,6 @@
return array(
array(
new ChangeRow(
- null,
array(
'user_id' => 1,
'time' => '20130101000000'
@@ -65,8 +64,7 @@
}
public function testGetObjectId() {
- $data = array( 'object_id' => 'p100' );
- $change = new ChangeRow( null, $data );
+ $change = new ChangeRow( array( 'object_id' => 'p100' ) );
$this->assertEquals(
'p100',
diff --git a/lib/tests/phpunit/changes/ItemChangeTest.php
b/lib/tests/phpunit/changes/ItemChangeTest.php
index 4fd7b31..5e04e69 100644
--- a/lib/tests/phpunit/changes/ItemChangeTest.php
+++ b/lib/tests/phpunit/changes/ItemChangeTest.php
@@ -96,11 +96,7 @@
$diff = new Diff();
- $change = new ItemChange(
- $this->getMock( 'IORMTable' ),
- array( 'type' => 'test' ),
- false
- );
+ $change = new ItemChange( array( 'type' => 'test' ) );
$change->setDiff( $diff );
$cases['plain-diff'] = array( $change );
@@ -121,11 +117,7 @@
assert( $diff->getSiteLinkDiff() !== null );
//NOTE: ItemChange's constructor may or may not already
fix the bad diff.
- $change = new ItemChange(
- $this->getMock( 'IORMTable' ),
- array( 'type' => 'test' ),
- false
- );
+ $change = new ItemChange( array( 'type' => 'test' ) );
$change->setDiff( $diff );
$cases['atomic-sitelink-diff'] = array( $change );
diff --git a/lib/tests/phpunit/store/Sql/ChangeLookupTest.php
b/lib/tests/phpunit/store/Sql/ChangeLookupTest.php
index 83705db..1427357 100644
--- a/lib/tests/phpunit/store/Sql/ChangeLookupTest.php
+++ b/lib/tests/phpunit/store/Sql/ChangeLookupTest.php
@@ -211,9 +211,9 @@
'"parent_id":897,"comment":"Fake data!"}}',
);
- $changeOne = new EntityChange( null, $changeOne, false );
- $changeTwo = new EntityChange( null, $changeTwo, false );
- $changeThree = new EntityChange( null, $changeThree, false );
+ $changeOne = new EntityChange( $changeOne );
+ $changeTwo = new EntityChange( $changeTwo );
+ $changeThree = new EntityChange( $changeThree );
return array( $changeOne, $changeTwo, $changeThree );
}
diff --git a/repo/tests/phpunit/includes/ChangePrunerTest.php
b/repo/tests/phpunit/includes/ChangePrunerTest.php
index 99fcb7a..e30285d 100644
--- a/repo/tests/phpunit/includes/ChangePrunerTest.php
+++ b/repo/tests/phpunit/includes/ChangePrunerTest.php
@@ -53,10 +53,10 @@
private function addTestChanges() {
$changeStore = new SqlChangeStore( wfGetLB() );
- $change = new EntityChange( null, $this->getChangeRowData(
'20150101000005' ) );
+ $change = new EntityChange( $this->getChangeRowData(
'20150101000005' ) );
$changeStore->saveChange( $change );
- $change = new EntityChange( null, $this->getChangeRowData(
'20150101000300' ) );
+ $change = new EntityChange( $this->getChangeRowData(
'20150101000300' ) );
$changeStore->saveChange( $change );
}
--
To view, visit https://gerrit.wikimedia.org/r/245953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2f353a90493f05c9980732513eafbc9ef4029653
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
