build: Updating mediawiki/mediawiki-codesniffer to 17.0.0

Change-Id: Ib494b47c54fe6354d166055b1e1b31d3583bb992

diff --git a/.phpcs.xml b/.phpcs.xml
index d77d398..31e6eeb 100644 (file)
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,7 +2,6 @@
 <ruleset name="MediaWiki">
        <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
                <exclude name="Generic.ControlStructures.InlineControlStructure" />
-               <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
                <exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
                <exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
                <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
@@ -11,12 +10,14 @@
                <exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle" />
                <exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentStart" />
                <exclude name="MediaWiki.Commenting.IllegalSingleLineComment.IllegalSingleLineCommentEnd" />
+               <exclude name="MediaWiki.Commenting.LicenseComment.InvalidLicenseTag" />
                <exclude name="MediaWiki.ControlStructures.AssignmentInControlStructures.AssignmentInControlStructures" />
                <exclude name="MediaWiki.NamingConventions.LowerCamelFunctionsName.FunctionName" />
                <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
                <exclude name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.SingleSpaceBeforeSingleLineComment" />
                <exclude name="MediaWiki.Usage.DbrQueryUsage.DbrQueryFound" />
                <exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionVarUsage" />
+               <exclude name="MediaWiki.Usage.ForbiddenFunctions.assert" />
                <exclude name="MediaWiki.Usage.SuperGlobalsUsage.SuperGlobals" />
                <exclude name="MediaWiki.Files.ClassMatchesFilename.WrongCase" />
                <exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
@@ -73,10 +74,10 @@
                </properties>
        </rule>
        <rule ref="Generic.Files.LineLength">
-               <exclude-pattern>*/languages/messages/Messages*.php</exclude-pattern>
+               <exclude-pattern>*/languages/messages/Messages*\.php</exclude-pattern>
        </rule>
        <rule ref="PSR2.Methods.MethodDeclaration.Underscore">
-               <exclude-pattern>*/includes/StubObject.php</exclude-pattern>
+               <exclude-pattern>*/includes/StubObject\.php</exclude-pattern>
        </rule>
        <file>.</file>
        <arg name="encoding" value="UTF-8"/>

diff --git a/composer.json b/composer.json
index cab51fa..67a8e6c 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -55,7 +55,7 @@
                "jakub-onderka/php-parallel-lint": "0.9.2",
                "jetbrains/phpstorm-stubs": "dev-master#1b9906084d6635456fcf3f3a01f0d7d5b99a578a",
                "justinrainbow/json-schema": "~5.2",
-               "mediawiki/mediawiki-codesniffer": "16.0.0",
+               "mediawiki/mediawiki-codesniffer": "17.0.0",
                "monolog/monolog": "~1.22.1",
                "nikic/php-parser": "3.1.3",
                "nmred/kafka-php": "0.1.5",

diff --git a/includes/composer/ComposerHookHandler.php b/includes/composer/ComposerHookHandler.php
index 2587b1d..a1943be 100644 (file)
--- a/includes/composer/ComposerHookHandler.php
+++ b/includes/composer/ComposerHookHandler.php
@@ -7,7 +7,7 @@ $GLOBALS['IP'] = __DIR__ . '/../../';
 require_once __DIR__ . '/../AutoLoader.php';
 
 /**
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
 class ComposerHookHandler {

diff --git a/includes/composer/ComposerPackageModifier.php b/includes/composer/ComposerPackageModifier.php
index 9f60394..168336b 100644 (file)
--- a/includes/composer/ComposerPackageModifier.php
+++ b/includes/composer/ComposerPackageModifier.php
@@ -5,7 +5,7 @@ use Composer\Package\Package;
 use Composer\Semver\Constraint\Constraint;
 
 /**
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
 class ComposerPackageModifier {

diff --git a/includes/composer/ComposerVersionNormalizer.php b/includes/composer/ComposerVersionNormalizer.php
index a0d31cf..2194bed 100644 (file)
--- a/includes/composer/ComposerVersionNormalizer.php
+++ b/includes/composer/ComposerVersionNormalizer.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
 class ComposerVersionNormalizer {

diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php
index 6e171d5..3947f4b 100644 (file)
--- a/includes/dao/DBAccessBase.php
+++ b/includes/dao/DBAccessBase.php
@@ -27,7 +27,7 @@ use Wikimedia\Rdbms\LoadBalancer;
  * @file
  * @ingroup Database
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Daniel Kinzler
  */
 abstract class DBAccessBase implements IDBAccessObject {

diff --git a/maintenance/exportSites.php b/maintenance/exportSites.php
index 2462eaf..736b12b 100644 (file)
--- a/maintenance/exportSites.php
+++ b/maintenance/exportSites.php
@@ -9,7 +9,7 @@ require_once $basePath . '/maintenance/Maintenance.php';
  *
  * @since 1.25
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Daniel Kinzler
  */
 class ExportSites extends Maintenance {

diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index c91d4ed..4458901 100644 (file)
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -20,7 +20,7 @@
  * @file
  * @ingroup Maintenance
  * @author Rob Church <robchur@gmail.com>
- * @licence GNU General Public Licence 2.0 or later
+ * @license GNU General Public Licence 2.0 or later
  */
 
 use Wikimedia\Rdbms\IDatabase;

diff --git a/tests/integration/includes/http/CurlHttpRequestTest.php b/tests/integration/includes/http/CurlHttpRequestTest.php
index 48a78d3..c1884b8 100644 (file)
--- a/tests/integration/includes/http/CurlHttpRequestTest.php
+++ b/tests/integration/includes/http/CurlHttpRequestTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @large
+ * @group large
  * @covers CurlHttpRequest
  */
 class CurlHttpRequestTest extends MWHttpRequestTestCase {

diff --git a/tests/integration/includes/http/PhpHttpRequestTest.php b/tests/integration/includes/http/PhpHttpRequestTest.php
index 90bf532..8c461f3 100644 (file)
--- a/tests/integration/includes/http/PhpHttpRequestTest.php
+++ b/tests/integration/includes/http/PhpHttpRequestTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @large
+ * @group large
  * @covers PhpHttpRequest
  */
 class PhpHttpRequestTest extends MWHttpRequestTestCase {

diff --git a/tests/integration/includes/shell/FirejailCommandTest.php b/tests/integration/includes/shell/FirejailCommandTest.php
index 9ee157b..1e008ee 100644 (file)
--- a/tests/integration/includes/shell/FirejailCommandTest.php
+++ b/tests/integration/includes/shell/FirejailCommandTest.php
@@ -8,7 +8,7 @@ use MediaWiki\Shell\Shell;
  * Meant to run on vagrant, although will probably work on other setups
  * as long as firejail and sudo has similar config.
  *
- * @large
+ * @group large
  * @group Shell
  * @covers FirejailCommand
  */

diff --git a/tests/phpunit/includes/actions/ActionTest.php b/tests/phpunit/includes/actions/ActionTest.php
index 4d54334..b96b491 100644 (file)
--- a/tests/phpunit/includes/actions/ActionTest.php
+++ b/tests/phpunit/includes/actions/ActionTest.php
@@ -6,7 +6,7 @@
  * @group Action
  * @group Database
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Thiemo Kreuz
  */
 class ActionTest extends MediaWikiTestCase {

diff --git a/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php b/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php
index 8417f5c..a78a4c9 100644 (file)
--- a/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php
+++ b/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php
@@ -4,7 +4,7 @@ use MediaWiki\Linker\LinkTarget;
 use MediaWiki\MediaWikiServices;
 
 /**
- * @medium
+ * @group medium
  * @group API
  * @group Database
  *

diff --git a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
index 944d31c..334fd5d 100644 (file)
--- a/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinue2Test.php
@@ -46,7 +46,7 @@ class ApiQueryContinue2Test extends ApiQueryContinueTestBase {
        }
 
        /**
-        * @medium
+        * @group medium
         */
        public function testA() {
                $this->mVerbose = false;

diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
index b31627b..7259bb8 100644 (file)
--- a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php
@@ -56,7 +56,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 
        /**
         * Test smart continue - list=allpages
-        * @medium
+        * @group medium
         */
        public function test1List() {
                $this->mVerbose = false;
@@ -80,7 +80,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 
        /**
         * Test smart continue - list=allpages|alltransclusions
-        * @medium
+        * @group medium
         */
        public function test2Lists() {
                $this->mVerbose = false;
@@ -106,7 +106,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 
        /**
         * Test smart continue - generator=allpages, prop=links
-        * @medium
+        * @group medium
         */
        public function testGen1Prop() {
                $this->mVerbose = false;
@@ -131,7 +131,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 
        /**
         * Test smart continue - generator=allpages, prop=links|templates
-        * @medium
+        * @group medium
         */
        public function testGen2Prop() {
                $this->mVerbose = false;
@@ -162,7 +162,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 
        /**
         * Test smart continue - generator=allpages, prop=links, list=alltransclusions
-        * @medium
+        * @group medium
         */
        public function testGen1Prop1List() {
                $this->mVerbose = false;
@@ -194,7 +194,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
        /**
         * Test smart continue - generator=allpages, prop=links|templates,
         *                       list=alllinks|alltransclusions, meta=siteinfo
-        * @medium
+        * @group medium
         */
        public function testGen2Prop2List1Meta() {
                $this->mVerbose = false;
@@ -233,7 +233,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 
        /**
         * Test smart continue - generator=templates, prop=templates
-        * @medium
+        * @group medium
         */
        public function testSameGenAndProp() {
                $this->mVerbose = false;
@@ -279,7 +279,7 @@ class ApiQueryContinueTest extends ApiQueryContinueTestBase {
 
        /**
         * Test smart continue - generator=allpages, list=allpages
-        * @medium
+        * @group medium
         */
        public function testSameGenList() {
                $this->mVerbose = false;

diff --git a/tests/phpunit/includes/htmlform/HTMLFormTest.php b/tests/phpunit/includes/htmlform/HTMLFormTest.php
index f74f60a..e20cf94 100644 (file)
--- a/tests/phpunit/includes/htmlform/HTMLFormTest.php
+++ b/tests/phpunit/includes/htmlform/HTMLFormTest.php
@@ -3,7 +3,7 @@
 /**
  * @covers HTMLForm
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Gergő Tisza
  * @author Thiemo Mättig
  */

diff --git a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
index 97ea326..1db2215 100644 (file)
--- a/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
+++ b/tests/phpunit/includes/import/ImportLinkCacheIntegrationTest.php
@@ -5,7 +5,7 @@ use MediaWiki\MediaWikiServices;
  * Integration test that checks import success and
  * LinkCache integration.
  *
- * @large
+ * @group large
  * @group Database
  * @covers ImportStreamSource
  * @covers ImportReporter

diff --git a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
index b5d6144..bf8603d 100644 (file)
--- a/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueMemoryTest.php
@@ -5,7 +5,7 @@
  *
  * @group JobQueue
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Thiemo Kreuz
  */
 class JobQueueMemoryTest extends PHPUnit\Framework\TestCase {

diff --git a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
index 656be38..5960a16 100644 (file)
--- a/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
+++ b/tests/phpunit/includes/jobqueue/jobs/CategoryMembershipChangeJobTest.php
@@ -6,7 +6,7 @@
  * @group JobQueue
  * @group Database
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Addshore
  */
 class CategoryMembershipChangeJobTest extends MediaWikiTestCase {

diff --git a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
index b5257a3..6ae7d60 100644 (file)
--- a/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
+++ b/tests/phpunit/includes/jobqueue/jobs/ClearUserWatchlistJobTest.php
@@ -7,7 +7,7 @@ use MediaWiki\MediaWikiServices;
  * @group JobQueue
  * @group Database
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Addshore
  */
 class ClearUserWatchlistJobTest extends MediaWikiTestCase {

diff --git a/tests/phpunit/includes/parser/ParserIntegrationTest.php b/tests/phpunit/includes/parser/ParserIntegrationTest.php
index c25329f..91653b5 100644 (file)
--- a/tests/phpunit/includes/parser/ParserIntegrationTest.php
+++ b/tests/phpunit/includes/parser/ParserIntegrationTest.php
@@ -8,7 +8,7 @@ use Wikimedia\ScopedCallback;
  * Note: the following groups are not used by PHPUnit.
  * The list in ParserTestFileSuite::__construct() is used instead.
  *
- * @large
+ * @group large
  * @group Database
  * @group Parser
  * @group ParserTests

diff --git a/tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php b/tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php
index edc2eff..871ea91 100644 (file)
--- a/tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php
+++ b/tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @medium
+ * @group medium
  * @group Database
  * @covers FormattedRCFeed
  * @covers RecentChange

diff --git a/tests/phpunit/includes/specials/SpecialBlankPageTest.php b/tests/phpunit/includes/specials/SpecialBlankPageTest.php
index 7bfb861..e0d059f 100644 (file)
--- a/tests/phpunit/includes/specials/SpecialBlankPageTest.php
+++ b/tests/phpunit/includes/specials/SpecialBlankPageTest.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Addshore
  *
  * @covers SpecialBlankpage

diff --git a/tests/phpunit/includes/specials/SpecialPageTestBase.php b/tests/phpunit/includes/specials/SpecialPageTestBase.php
index b1d8c69..274a23c 100644 (file)
--- a/tests/phpunit/includes/specials/SpecialPageTestBase.php
+++ b/tests/phpunit/includes/specials/SpecialPageTestBase.php
@@ -5,7 +5,7 @@
  *
  * @since 1.26
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  * @author Daniel Kinzler
  * @author Addshore

diff --git a/tests/phpunit/includes/specials/SpecialShortpagesTest.php b/tests/phpunit/includes/specials/SpecialShortpagesTest.php
index a5fb50e..f799b11 100644 (file)
--- a/tests/phpunit/includes/specials/SpecialShortpagesTest.php
+++ b/tests/phpunit/includes/specials/SpecialShortpagesTest.php
@@ -5,7 +5,7 @@
  *
  * @since 1.30
  *
- * @licence GNU GPL v2+
+ * @license GNU GPL v2+
  */
 class SpecialShortpagesTest extends MediaWikiTestCase {