jenkins-bot has submitted this change and it was merged.

Change subject: Add some more PHPCS sniffs
......................................................................


Add some more PHPCS sniffs

This is a small subset of additional rules we found useful in Wikibase
and related components.

Change-Id: I62a54e57bc25037cc759e9e9c9757046658d69e6
---
M includes/Api.php
M phpcs.xml
2 files changed, 27 insertions(+), 3 deletions(-)

Approvals:
  Ladsgroup: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Api.php b/includes/Api.php
index 9ac1bc9..e771d17 100644
--- a/includes/Api.php
+++ b/includes/Api.php
@@ -38,7 +38,7 @@
        public static function request( $params = [] ) {
                $logger = LoggerFactory::getInstance( 'ORES' );
 
-               $url = Api::getUrl();
+               $url = self::getUrl();
                $url = wfAppendQuery( $url, $params );
                $logger->debug( "Requesting: {$url}" );
                $req = MWHttpRequest::factory( $url, null, __METHOD__ );
diff --git a/phpcs.xml b/phpcs.xml
index cb19440..7c4adbe 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,7 +1,31 @@
 <?xml version="1.0"?>
 <ruleset>
-       <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+       <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki" />
+
+       <rule ref="Generic.ControlStructures" />
+       <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
+
+       <rule ref="PSR2.Files" />
+
+       <rule ref="Squiz.Classes.DuplicateProperty" />
+       <rule ref="Squiz.Classes.SelfMemberReference" />
+       <rule ref="Squiz.ControlStructures.ControlSignature" />
+       <rule ref="Squiz.Functions.FunctionDuplicateArgument" />
+       <rule ref="Squiz.Functions.GlobalFunction" />
+       <rule ref="Squiz.Scope" />
+       <rule ref="Squiz.WhiteSpace.FunctionSpacing">
+               <properties>
+                       <property name="spacing" value="1" />
+               </properties>
+       </rule>
+       <rule ref="Squiz.WhiteSpace.OperatorSpacing">
+               <properties>
+                       <property name="ignoreNewlines" value="true" />
+               </properties>
+       </rule>
+
        <file>.</file>
-       <arg name="extensions" value="php"/>
+       <arg name="extensions" value="php" />
+       <arg name="encoding" value="utf8" />
        <exclude-pattern>vendor</exclude-pattern>
 </ruleset>

-- 
To view, visit https://gerrit.wikimedia.org/r/322649
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I62a54e57bc25037cc759e9e9c9757046658d69e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ORES
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to