jenkins-bot has submitted this change and it was merged.
Change subject: PHPCS: reenable Generic.WhiteSpace.DisallowSpaceIndent and make
pass
......................................................................
PHPCS: reenable Generic.WhiteSpace.DisallowSpaceIndent and make pass
Also specify that only files with php extension must be checked.
Change-Id: I86da7871b61b23b45bbcec8cf84cd59c1469040c
---
M includes/page/PageContent.php
M maintenance/fixProofreadPagePagesContentModel.php
M phpcs.xml
M tests/includes/index/ProofreadIndexPageTest.php
4 files changed, 9 insertions(+), 11 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/page/PageContent.php b/includes/page/PageContent.php
index 3bffff1..c4e31fa 100644
--- a/includes/page/PageContent.php
+++ b/includes/page/PageContent.php
@@ -12,10 +12,10 @@
use WikitextContent;
/**
- * @licence GNU GPL v2+
- *
- * Content of a Page: page
- */
+ * @licence GNU GPL v2+
+ *
+ * Content of a Page: page
+ */
class PageContent extends TextContent {
/**
diff --git a/maintenance/fixProofreadPagePagesContentModel.php
b/maintenance/fixProofreadPagePagesContentModel.php
index f5aeeba..c823451 100644
--- a/maintenance/fixProofreadPagePagesContentModel.php
+++ b/maintenance/fixProofreadPagePagesContentModel.php
@@ -24,9 +24,9 @@
require_once $basePath . '/maintenance/Maintenance.php';
}
- /**
- * Set the content model type for Page: pages
- */
+/**
+ * Set the content model type for Page: pages
+ */
class FixProofreadPagePagesContentModel extends LoggedUpdateMaintenance {
public function __construct() {
diff --git a/phpcs.xml b/phpcs.xml
index d4141c6..05fa8de 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -31,9 +31,6 @@
<rule ref="Generic.PHP.ForbiddenFunctions.FoundWithAlternative">
<severity>0</severity>
</rule>
- <rule ref="Generic.WhiteSpace.DisallowSpaceIndent.SpacesUsed">
- <severity>0</severity>
- </rule>
<rule
ref="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures">
<severity>0</severity>
</rule>
@@ -58,6 +55,7 @@
<severity>0</severity>
</rule>
<file>.</file>
+ <arg name="extensions" value="php" />
<exclude-pattern>node_modules/</exclude-pattern>
<exclude-pattern>vendor/</exclude-pattern>
</ruleset>
diff --git a/tests/includes/index/ProofreadIndexPageTest.php
b/tests/includes/index/ProofreadIndexPageTest.php
index 4a74640..3a6c1a9 100644
--- a/tests/includes/index/ProofreadIndexPageTest.php
+++ b/tests/includes/index/ProofreadIndexPageTest.php
@@ -172,7 +172,7 @@
$links = array(
array( Title::newFromText( 'Test/Chapter 1' ), 'Chapter
1' ),
array( Title::newFromText( 'Azerty:Test/Chapter_2' ),
'Chapter 2' )
- );
+ );
$this->assertEquals( $links, $page->getLinksToMainNamespace() );
}
--
To view, visit https://gerrit.wikimedia.org/r/287502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86da7871b61b23b45bbcec8cf84cd59c1469040c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa <ricordisa...@openmailbox.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
