jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395726 )
Change subject: Rename TwoColConlict class to InlineTwoColConflict
......................................................................
Rename TwoColConlict class to InlineTwoColConflict
Since we start to implement an alternate UI for edit conflicts based
on this extension it's better to separate the approches.
Change-Id: I5abe921f4434c2d08e559c5a2f107811eee681c3
---
M extension.json
R includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
R includes/InlineTwoColConflict/InlineTwoColConflictTestHelper.php
R includes/InlineTwoColConflict/LineBasedUnifiedDiffFormatter.php
M includes/SpecialConflictTestPage/SpecialConflictTestPage.php
M includes/TwoColConflictHooks.php
R tests/phpunit/includes/InlineTwoColConflict/InlineTwoColConflictHelperTest.php
R
tests/phpunit/includes/InlineTwoColConflict/LineBasedUnifiedDiffFormatterTest.php
8 files changed, 23 insertions(+), 23 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 8f9bdd7..66f3c53 100644
--- a/extension.json
+++ b/extension.json
@@ -21,10 +21,10 @@
},
"AutoloadClasses": {
"TwoColConflictHooks": "includes/TwoColConflictHooks.php",
- "TwoColConflictHelper": "includes/TwoColConflictHelper.php",
- "LineBasedUnifiedDiffFormatter":
"includes/LineBasedUnifiedDiffFormatter.php",
+ "InlineTwoColConflictHelper":
"includes/InlineTwoColConflict/InlineTwoColConflictHelper.php",
+ "InlineTwoColConflictTestHelper":
"includes/InlineTwoColConflict/InlineTwoColConflictTestHelper.php",
+ "LineBasedUnifiedDiffFormatter":
"includes/InlineTwoColConflict/LineBasedUnifiedDiffFormatter.php",
"SpecialConflictTestPage":
"includes/SpecialConflictTestPage/SpecialConflictTestPage.php",
- "TwoColConflictTestHelper":
"includes/SpecialConflictTestPage/TwoColConflictTestHelper.php",
"TwoColConflictTestEditPage":
"includes/SpecialConflictTestPage/TwoColConflictTestEditPage.php",
"HtmlSpecialTestTitleForm":
"includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php",
"HtmlSpecialTestTextForm":
"includes/SpecialConflictTestPage/HtmlSpecialTestTextForm.php",
diff --git a/includes/TwoColConflictHelper.php
b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
similarity index 99%
rename from includes/TwoColConflictHelper.php
rename to includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
index 7f9174d..c671b50 100644
--- a/includes/TwoColConflictHelper.php
+++ b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
@@ -7,7 +7,7 @@
* @license GNU GPL v2+
* @author Christoph Jauera <christoph.jau...@wikimedia.de>
*/
-class TwoColConflictHelper extends TextConflictHelper {
+class InlineTwoColConflictHelper extends TextConflictHelper {
/**
* @var WikiPage
diff --git a/includes/SpecialConflictTestPage/TwoColConflictTestHelper.php
b/includes/InlineTwoColConflict/InlineTwoColConflictTestHelper.php
similarity index 97%
rename from includes/SpecialConflictTestPage/TwoColConflictTestHelper.php
rename to includes/InlineTwoColConflict/InlineTwoColConflictTestHelper.php
index 6e2b8a6..8329f3b 100644
--- a/includes/SpecialConflictTestPage/TwoColConflictTestHelper.php
+++ b/includes/InlineTwoColConflict/InlineTwoColConflictTestHelper.php
@@ -4,7 +4,7 @@
* @license GNU GPL v2+
* @author Christoph Jauera <christoph.jau...@wikimedia.de>
*/
-class TwoColConflictTestHelper extends TwoColConflictHelper {
+class InlineTwoColConflictTestHelper extends InlineTwoColConflictHelper {
/** @var string */
private $conflictingTestText;
diff --git a/includes/LineBasedUnifiedDiffFormatter.php
b/includes/InlineTwoColConflict/LineBasedUnifiedDiffFormatter.php
similarity index 100%
rename from includes/LineBasedUnifiedDiffFormatter.php
rename to includes/InlineTwoColConflict/LineBasedUnifiedDiffFormatter.php
diff --git a/includes/SpecialConflictTestPage/SpecialConflictTestPage.php
b/includes/SpecialConflictTestPage/SpecialConflictTestPage.php
index 6d0bd7d..fa536d7 100644
--- a/includes/SpecialConflictTestPage/SpecialConflictTestPage.php
+++ b/includes/SpecialConflictTestPage/SpecialConflictTestPage.php
@@ -132,7 +132,7 @@
$conflictTestEditPage->setEditConflictHelperFactory(
function ( $submitButtonLabel ) use (
$conflictTestEditPage ) {
- return new TwoColConflictTestHelper(
+ return new InlineTwoColConflictTestHelper(
$conflictTestEditPage->getTitle(),
$conflictTestEditPage->getContext()->getOutput(),
MediaWikiServices::getInstance()->getStatsdDataFactory(),
diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index 47339b4..8255861 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -36,7 +36,7 @@
}
$editPage->setEditConflictHelperFactory( function (
$submitButtonLabel ) use ( $editPage ) {
- return new TwoColConflictHelper(
+ return new InlineTwoColConflictHelper(
$editPage->getTitle(),
$editPage->getContext()->getOutput(),
MediaWikiServices::getInstance()->getStatsdDataFactory(),
diff --git a/tests/phpunit/includes/TwoColConflictHelperTest.php
b/tests/phpunit/includes/InlineTwoColConflict/InlineTwoColConflictHelperTest.php
similarity index 86%
rename from tests/phpunit/includes/TwoColConflictHelperTest.php
rename to
tests/phpunit/includes/InlineTwoColConflict/InlineTwoColConflictHelperTest.php
index dcd7acf..bc719ad 100644
--- a/tests/phpunit/includes/TwoColConflictHelperTest.php
+++
b/tests/phpunit/includes/InlineTwoColConflict/InlineTwoColConflictHelperTest.php
@@ -6,10 +6,10 @@
* @license GNU GPL v2+
* @author Christoph Jauera <christoph.jau...@wikimedia.de>
*/
-class TwoColConflictHelperTest extends MediaWikiTestCase {
+class InlineTwoColConflictHelperTest extends MediaWikiTestCase {
/**
- * @covers TwoColConflictHelperTest::getCollapsedText
+ * @covers InlineTwoColConflictHelperTest::getCollapsedText
*/
public function testGetCollapsedText_returnFalseWhenInLimit() {
$twoColConflictPageMock = $this->getMockPage();
@@ -22,7 +22,7 @@
}
/**
- * @covers TwoColConflictHelperTest::getCollapsedText
+ * @covers InlineTwoColConflictHelperTest::getCollapsedText
*/
public function
testGetCollapsedText_returnFalseWhenWhenOverLimitWithWhitespaces() {
$twoColConflictPageMock = $this->getMockPageWithContext();
@@ -35,7 +35,7 @@
}
/**
- * @covers TwoColConflictHelperTest::getCollapsedText
+ * @covers InlineTwoColConflictHelperTest::getCollapsedText
*/
public function testGetCollapsedText_cutWhenSingleLineOverLimit() {
$twoColConflictPageMock = $this->getMockPageWithContext();
@@ -47,7 +47,7 @@
}
/**
- * @covers TwoColConflictHelperTest::getCollapsedText
+ * @covers InlineTwoColConflictHelperTest::getCollapsedText
*/
public function testGetCollapsedText_returnFalseWhenTwoLinesInLimit() {
$twoColConflictPageMock = $this->getMockPageWithContext();
@@ -57,7 +57,7 @@
}
/**
- * @covers TwoColConflictHelperTest::getCollapsedText
+ * @covers InlineTwoColConflictHelperTest::getCollapsedText
*/
public function testGetCollapsedText_cutWhenTwoLinesOverLimit() {
$twoColConflictPageMock = $this->getMockPageWithContext();
@@ -69,7 +69,7 @@
}
/**
- * @covers TwoColConflictHelperTest::getCollapsedText
+ * @covers InlineTwoColConflictHelperTest::getCollapsedText
*/
public function testGetCollapsedText_cutWhenMultipleLinesInLimit() {
$twoColConflictPageMock = $this->getMockPageWithContext();
@@ -81,7 +81,7 @@
}
/**
- * @covers TwoColConflictHelperTest::trimStringToFullWord
+ * @covers InlineTwoColConflictHelperTest::trimStringToFullWord
*/
public function testTrimStringToFullWord_noCutWhenInLimit() {
$twoColConflictPageMock = $this->getMockPage();
@@ -96,7 +96,7 @@
}
/**
- * @covers TwoColConflictHelperTest::trimStringToFullWord
+ * @covers InlineTwoColConflictHelperTest::trimStringToFullWord
*/
public function testTrimStringToFullWord_trimWhiteSpaceAtEndOfResult() {
$twoColConflictPageMock = $this->getMockPage();
@@ -107,7 +107,7 @@
}
/**
- * @covers TwoColConflictHelperTest::trimStringToFullWord
+ * @covers InlineTwoColConflictHelperTest::trimStringToFullWord
*/
public function
testTrimStringToFullWord_trimWhiteSpaceAtStartOfResult() {
$twoColConflictPageMock = $this->getMockPage();
@@ -122,7 +122,7 @@
* @param int $maxLength
* @param string $result
* @dataProvider provider_trimStringToFullWord_atEnd
- * @covers TwoColConflictHelperTest::trimStringToFullWord
+ * @covers InlineTwoColConflictHelperTest::trimStringToFullWord
*/
public function testTrimStringToFullWord_atEnd( $input, $maxLength,
$result ) {
$twoColConflictPageMock = $this->getMockPage();
@@ -157,7 +157,7 @@
* @param int $maxLength
* @param string $result
* @dataProvider provider_trimStringToFullWord_atStart
- * @covers TwoColConflictHelperTest::trimStringToFullWord
+ * @covers InlineTwoColConflictHelperTest::trimStringToFullWord
*/
public function testTrimStringToFullWord_atStart( $input, $maxLength,
$result ) {
$twoColConflictPageMock = $this->getMockPage();
@@ -192,7 +192,7 @@
* @param null|boolean $trimAtEnd
* @param string $result
* @dataProvider provider_trimWhiteSpaces
- * @covers TwoColConflictHelperTest::trimWhiteSpaces
+ * @covers InlineTwoColConflictHelperTest::trimWhiteSpaces
*/
public function testTrimWhiteSpaces( $input, $trimAtEnd, $result ) {
$twoColConflictPageMock = $this->getMockPage();
@@ -223,18 +223,18 @@
}
/**
- * @return TwoColConflictHelper
+ * @return InlineTwoColConflictHelper
*/
private function getMockPage() {
return TestingAccessWrapper::newFromObject(
- $this->getMockBuilder( TwoColConflictHelper::class )
+ $this->getMockBuilder(
InlineTwoColConflictHelper::class )
->disableOriginalConstructor()
->getMock()
);
}
/**
- * @return TwoColConflictHelper
+ * @return InlineTwoColConflictHelper
*/
private function getMockPageWithContext() {
$mockOut = $this->getMockBuilder( OutputPage::class )
diff --git a/tests/phpunit/includes/LineBasedUnifiedDiffFormatterTest.php
b/tests/phpunit/includes/InlineTwoColConflict/LineBasedUnifiedDiffFormatterTest.php
similarity index 100%
rename from tests/phpunit/includes/LineBasedUnifiedDiffFormatterTest.php
rename to
tests/phpunit/includes/InlineTwoColConflict/LineBasedUnifiedDiffFormatterTest.php
--
To view, visit https://gerrit.wikimedia.org/r/395726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5abe921f4434c2d08e559c5a2f107811eee681c3
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Andrew-WMDE <andrew.kos...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
