[MediaWiki-commits] [Gerrit] Enable PHPCS sniff PSR1.Methods.CamelCapsMethodName.NotCamel... - change (mediawiki...Wikibase)

[jenkins-bot (Code Review)]

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

Change subject: Enable PHPCS sniff PSR1.Methods.CamelCapsMethodName.NotCamelCaps
......................................................................


Enable PHPCS sniff PSR1.Methods.CamelCapsMethodName.NotCamelCaps

Change-Id: I0cf33ec33958042dc088c7f1b45565dee8142bcb
---
M phpcs.xml
M repo/Wikibase.hooks.php
M repo/Wikibase.php
M repo/includes/store/sql/EntityPerPageTable.php
4 files changed, 8 insertions(+), 8 deletions(-)

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



diff --git a/phpcs.xml b/phpcs.xml
index 4fbc62c..c24f980 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -45,7 +45,8 @@
                <severity>0</severity>
        </rule>
        <rule ref="PSR1.Methods.CamelCapsMethodName.NotCamelCaps">
-               <severity>0</severity>
+               <!-- Exclude test methods like 
"testGivenInvalidInput_methodThrowsException". -->
+               <exclude-pattern>tests*phpunit*Test*\.php</exclude-pattern>
        </rule>
 
        <!-- TODO: Enable PSR2 sniffs. -->
@@ -53,7 +54,6 @@
        <rule ref="PSR2.Methods.MethodDeclaration" />
 
        <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
-               <!-- FIXME: This indicates an error in the Wikibase codebase 
that should be fixed. -->
                
<exclude-pattern>DataAccess*Scribunto*Scribunto_LuaWikibase*Library*\.php</exclude-pattern>
        </rule>
        <rule ref="Squiz.ControlStructures.ControlSignature" />
diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index b87beb6..55f1c21 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -534,7 +534,7 @@
         *
         * @return bool
         */
-       public static function onSpecialPage_reorderPages( &$groups, 
&$moveOther ) {
+       public static function onSpecialPageReorderPages( &$groups, &$moveOther 
) {
                $groups = array_merge( array( 'wikibaserepo' => null ), $groups 
);
                return true;
        }
@@ -1076,7 +1076,7 @@
         *
         * @return bool
         */
-       public static function onSkinTemplateBuildNavUrlsNav_urlsAfterPermalink(
+       public static function onSkinTemplateBuildNavUrlsNavUrlsAfterPermalink(
                SkinTemplate $skinTemplate,
                array &$navigationUrls
        ) {
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 834711f..8e9db5d 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -218,7 +218,7 @@
        $wgHooks['ShowSearchHitTitle'][]                                        
= 'Wikibase\RepoHooks::onShowSearchHitTitle';
        $wgHooks['TitleGetRestrictionTypes'][]                          = 
'Wikibase\RepoHooks::onTitleGetRestrictionTypes';
        $wgHooks['AbuseFilter-contentToString'][]                       = 
'Wikibase\RepoHooks::onAbuseFilterContentToString';
-       $wgHooks['SpecialPage_reorderPages'][]                          = 
'Wikibase\RepoHooks::onSpecialPage_reorderPages';
+       $wgHooks['SpecialPage_reorderPages'][]                          = 
'Wikibase\RepoHooks::onSpecialPageReorderPages';
        $wgHooks['OutputPageParserOutput'][]                            = 
'Wikibase\RepoHooks::onOutputPageParserOutput';
        $wgHooks['ContentModelCanBeUsedOn'][]                           = 
'Wikibase\RepoHooks::onContentModelCanBeUsedOn';
        $wgHooks['OutputPageBeforeHTML'][]                              = 
'Wikibase\Repo\Hooks\OutputPageBeforeHTMLHookHandler::onOutputPageBeforeHTML';
@@ -227,7 +227,7 @@
        $wgHooks['APIQuerySiteInfoStatisticsInfo'][]    = 
'Wikibase\RepoHooks::onAPIQuerySiteInfoStatisticsInfo';
        $wgHooks['ImportHandleRevisionXMLTag'][]            = 
'Wikibase\RepoHooks::onImportHandleRevisionXMLTag';
        $wgHooks['BaseTemplateToolbox'][]               = 
'Wikibase\RepoHooks::onBaseTemplateToolbox';
-       $wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] = 
'Wikibase\RepoHooks::onSkinTemplateBuildNavUrlsNav_urlsAfterPermalink';
+       $wgHooks['SkinTemplateBuildNavUrlsNav_urlsAfterPermalink'][] = 
'Wikibase\RepoHooks::onSkinTemplateBuildNavUrlsNavUrlsAfterPermalink';
        $wgHooks['SkinMinervaDefaultModules'][]                 = 
'Wikibase\RepoHooks::onSkinMinervaDefaultModules';
        $wgHooks['ResourceLoaderRegisterModules'][]                     = 
'Wikibase\RepoHooks::onResourceLoaderRegisterModules';
 
diff --git a/repo/includes/store/sql/EntityPerPageTable.php 
b/repo/includes/store/sql/EntityPerPageTable.php
index 37b63bf..e9cf73e 100644
--- a/repo/includes/store/sql/EntityPerPageTable.php
+++ b/repo/includes/store/sql/EntityPerPageTable.php
@@ -104,7 +104,7 @@
                        $values['epp_redirect_target'] = $redirectTarget;
                }
 
-               $this->addRow_internal( $values );
+               $this->addRowInternal( $values );
        }
 
        /**
@@ -112,7 +112,7 @@
         *
         * @throws DBError
         */
-       private function addRow_internal( array $values ) {
+       private function addRowInternal( array $values ) {
                $conflictConds = $this->getConflictingRowConditions( $values );
 
                $dbw = wfGetDB( DB_MASTER );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0cf33ec33958042dc088c7f1b45565dee8142bcb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Bene <benestar.wikime...@gmail.com>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Jeroen De Dauw <jeroended...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits