jenkins-bot has submitted this change and it was merged.
Change subject: build: Enable phpcs rule
'Squiz.WhiteSpace.LanguageConstructSpacing.Incorrect' and make pass
......................................................................
build: Enable phpcs rule 'Squiz.WhiteSpace.LanguageConstructSpacing.Incorrect'
and make pass
Change-Id: I9379c18263474ed13921791b920c7b06e58a84ad
---
M maintenance/processEchoEmailBatch.php
M maintenance/removeInvalidNotification.php
M maintenance/removeInvalidTargetPage.php
M maintenance/testDiscussionParser.php
M maintenance/updateEchoSchemaForSuppression.php
M phpcs.xml
M tests/bootstrap.php
7 files changed, 11 insertions(+), 12 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/maintenance/processEchoEmailBatch.php
b/maintenance/processEchoEmailBatch.php
index f826a5d..9cb3e9f 100644
--- a/maintenance/processEchoEmailBatch.php
+++ b/maintenance/processEchoEmailBatch.php
@@ -4,7 +4,7 @@
if ( $IP === false ) {
$IP = dirname( __FILE__ ) . '/../../..';
}
-require_once( "$IP/maintenance/Maintenance.php" );
+require_once ( "$IP/maintenance/Maintenance.php" );
/**
* A maintenance script that processes email digest
@@ -75,4 +75,4 @@
}
$maintClass = "ProcessEchoEmailBatch";
-require_once( DO_MAINTENANCE );
+require_once ( DO_MAINTENANCE );
diff --git a/maintenance/removeInvalidNotification.php
b/maintenance/removeInvalidNotification.php
index fab5051..c7dd8ec 100644
--- a/maintenance/removeInvalidNotification.php
+++ b/maintenance/removeInvalidNotification.php
@@ -4,7 +4,7 @@
*
* @ingroup Maintenance
*/
-require_once( getenv( 'MW_INSTALL_PATH' ) !== false
+require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
: dirname( __FILE__ ) . '/../../../maintenance/Maintenance.php' );
@@ -79,4 +79,4 @@
}
$maintClass = 'removeInvalidNotification'; // Tells it to run the class
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once ( RUN_MAINTENANCE_IF_MAIN );
diff --git a/maintenance/removeInvalidTargetPage.php
b/maintenance/removeInvalidTargetPage.php
index 7faf04c..72c67b8 100644
--- a/maintenance/removeInvalidTargetPage.php
+++ b/maintenance/removeInvalidTargetPage.php
@@ -5,7 +5,7 @@
*
* @ingroup Maintenance
*/
-require_once( getenv( 'MW_INSTALL_PATH' ) !== false
+require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
: __DIR__ . '/../../../maintenance/Maintenance.php' );
@@ -110,4 +110,4 @@
}
$maintClass = 'removeInvalidTargetPage'; // Tells it to run the class
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once ( RUN_MAINTENANCE_IF_MAIN );
diff --git a/maintenance/testDiscussionParser.php
b/maintenance/testDiscussionParser.php
index d356446..917c6fb 100644
--- a/maintenance/testDiscussionParser.php
+++ b/maintenance/testDiscussionParser.php
@@ -4,7 +4,7 @@
if ( $IP === false ) {
$IP = dirname( __FILE__ ) . '/../../..';
}
-require_once( "$IP/maintenance/Maintenance.php" );
+require_once ( "$IP/maintenance/Maintenance.php" );
class TestDiscussionParser extends Maintenance {
public function __construct() {
@@ -88,4 +88,4 @@
}
$maintClass = "TestDiscussionParser";
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once ( RUN_MAINTENANCE_IF_MAIN );
diff --git a/maintenance/updateEchoSchemaForSuppression.php
b/maintenance/updateEchoSchemaForSuppression.php
index af3c758..1f186f1 100644
--- a/maintenance/updateEchoSchemaForSuppression.php
+++ b/maintenance/updateEchoSchemaForSuppression.php
@@ -5,7 +5,7 @@
*
* @ingroup Maintenance
*/
-require_once( getenv( 'MW_INSTALL_PATH' ) !== false
+require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
: __DIR__ . '/../../../maintenance/Maintenance.php' );
@@ -59,4 +59,4 @@
}
$maintClass = 'UpdateEchoSchemaForSuppression'; // Tells it to run the class
-require_once( RUN_MAINTENANCE_IF_MAIN );
+require_once ( RUN_MAINTENANCE_IF_MAIN );
diff --git a/phpcs.xml b/phpcs.xml
index d7ede6b..d76bf9d 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -15,7 +15,6 @@
<exclude
name="PSR2.Methods.MethodDeclaration.AbstractAfterVisibility"/>
<exclude
name="PSR2.Methods.MethodDeclaration.StaticBeforeVisibility"/>
<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
- <exclude
name="Squiz.WhiteSpace.LanguageConstructSpacing.Incorrect"/>
</rule>
<arg name="encoding" value="utf8"/>
<arg name="extensions" value="php,php5,inc"/>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index cddd5d5..b0d8fcc 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -15,5 +15,5 @@
}
}
-require_once( $IP . "/tests/phpunit/bootstrap.php" );
+require_once ( $IP . "/tests/phpunit/bootstrap.php" );
--
To view, visit https://gerrit.wikimedia.org/r/249770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9379c18263474ed13921791b920c7b06e58a84ad
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
