From 69dbaf3f883a8b43df5579641bdf1d61898b1012 Mon Sep 17 00:00:00 2001 From: Umherirrender Date: Thu, 29 Mar 2018 21:53:10 +0200 Subject: [PATCH] build: Updating mediawiki/mediawiki-codesniffer to 17.0.0 Change-Id: Ib494b47c54fe6354d166055b1e1b31d3583bb992 --- .phpcs.xml | 7 ++++--- composer.json | 2 +- includes/composer/ComposerHookHandler.php | 2 +- includes/composer/ComposerPackageModifier.php | 2 +- includes/composer/ComposerVersionNormalizer.php | 2 +- includes/dao/DBAccessBase.php | 2 +- maintenance/exportSites.php | 2 +- maintenance/reassignEdits.php | 2 +- .../includes/http/CurlHttpRequestTest.php | 2 +- .../includes/http/PhpHttpRequestTest.php | 2 +- .../includes/shell/FirejailCommandTest.php | 2 +- tests/phpunit/includes/actions/ActionTest.php | 2 +- .../api/ApiQueryWatchlistIntegrationTest.php | 2 +- .../includes/api/query/ApiQueryContinue2Test.php | 2 +- .../includes/api/query/ApiQueryContinueTest.php | 16 ++++++++-------- tests/phpunit/includes/htmlform/HTMLFormTest.php | 2 +- .../import/ImportLinkCacheIntegrationTest.php | 2 +- .../includes/jobqueue/JobQueueMemoryTest.php | 2 +- .../jobs/CategoryMembershipChangeJobTest.php | 2 +- .../jobqueue/jobs/ClearUserWatchlistJobTest.php | 2 +- .../includes/parser/ParserIntegrationTest.php | 2 +- .../includes/rcfeed/RCFeedIntegrationTest.php | 2 +- .../includes/specials/SpecialBlankPageTest.php | 2 +- .../includes/specials/SpecialPageTestBase.php | 2 +- .../includes/specials/SpecialShortpagesTest.php | 2 +- 25 files changed, 35 insertions(+), 34 deletions(-) diff --git a/.phpcs.xml b/.phpcs.xml index d77d398d1f..31e6eebc71 100644 --- a/.phpcs.xml +++ b/.phpcs.xml @@ -2,7 +2,6 @@ - @@ -11,12 +10,14 @@ + + @@ -73,10 +74,10 @@ - */languages/messages/Messages*.php + */languages/messages/Messages*\.php - */includes/StubObject.php + */includes/StubObject\.php . diff --git a/composer.json b/composer.json index cab51fae8e..67a8e6c507 100644 --- 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 2587b1d850..a1943be5ac 100644 --- 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 9f60394780..168336b214 100644 --- 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 a0d31cf2a9..2194bede69 100644 --- a/includes/composer/ComposerVersionNormalizer.php +++ b/includes/composer/ComposerVersionNormalizer.php @@ -1,7 +1,7 @@ */ class ComposerVersionNormalizer { diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php index 6e171d52e6..3947f4b19c 100644 --- 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 2462eaf8fd..736b12b304 100644 --- 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 c91d4ed888..44589016af 100644 --- a/maintenance/reassignEdits.php +++ b/maintenance/reassignEdits.php @@ -20,7 +20,7 @@ * @file * @ingroup Maintenance * @author Rob Church - * @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 48a78d3ee1..c1884b87c4 100644 --- a/tests/integration/includes/http/CurlHttpRequestTest.php +++ b/tests/integration/includes/http/CurlHttpRequestTest.php @@ -1,7 +1,7 @@ mVerbose = false; diff --git a/tests/phpunit/includes/api/query/ApiQueryContinueTest.php b/tests/phpunit/includes/api/query/ApiQueryContinueTest.php index b31627b4d4..7259bb81f7 100644 --- 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 f74f60af05..e20cf94201 100644 --- 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 97ea326560..1db2215ecb 100644 --- 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 b5d6144242..bf8603dd9e 100644 --- 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 656be381dd..5960a16b00 100644 --- 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 b5257a33f9..6ae7d60527 100644 --- 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 c25329fe83..91653b5d86 100644 --- 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 edc2eff334..871ea91196 100644 --- a/tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php +++ b/tests/phpunit/includes/rcfeed/RCFeedIntegrationTest.php @@ -1,7 +1,7 @@ * @author Daniel Kinzler * @author Addshore diff --git a/tests/phpunit/includes/specials/SpecialShortpagesTest.php b/tests/phpunit/includes/specials/SpecialShortpagesTest.php index a5fb50e062..f799b11586 100644 --- 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 { -- 2.20.1