Pmiazga has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/364851 )
Change subject: Re-enable
MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment sniff
......................................................................
Re-enable MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment sniff
Bug: T168384
Change-Id: Id64269f5950d6da5fee3f18825ce2d713d0446b0
---
M includes/PopupsContext.php
M phpcs.xml
M tests/phpunit/PopupsContextTest.php
3 files changed, 16 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/51/364851/1
diff --git a/includes/PopupsContext.php b/includes/PopupsContext.php
index f3408b8..390275b 100644
--- a/includes/PopupsContext.php
+++ b/includes/PopupsContext.php
@@ -210,7 +210,8 @@
'pageIdSource' => -1,
'hovercardsSuppressedByGadget' => false,
'pageToken' => wfRandomString(),
- 'sessionToken' => wfRandomString(), // we don't have
access to mw.user.sessionId()
+ // we don't have access to mw.user.sessionId()
+ 'sessionToken' => wfRandomString(),
'action' => 'disabled',
'isAnon' => false,
'popupEnabled' => false,
diff --git a/phpcs.xml b/phpcs.xml
index 26c9398..e105516 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -6,7 +6,6 @@
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
<exclude
name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
<exclude
name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
- <exclude
name="MediaWiki.WhiteSpace.SpaceBeforeSingleLineComment.NewLineComment" />
</rule>
<file>.</file>
<arg name="extensions" value="php,php5,inc" />
diff --git a/tests/phpunit/PopupsContextTest.php
b/tests/phpunit/PopupsContextTest.php
index 6ad80d0..7ac4589 100644
--- a/tests/phpunit/PopupsContextTest.php
+++ b/tests/phpunit/PopupsContextTest.php
@@ -225,31 +225,40 @@
*/
public function provideTestDataForTestAreDependenciesMet() {
return [
- [ // Beta is off, dependencies are met even
BetaFeatures ext is not available
+ // Beta is off, dependencies are met even BetaFeatures
ext is not available
+ [
"betaOn" => false,
"textExtracts" => true,
"pageImages" => true,
"betaFeatures" => false,
"expected" => true
- ], [ // textExtracts dep is missing
+ ],
+ // textExtracts dep is missing
+ [
"betaOn" => false,
"textExtracts" => false,
"pageImages" => true,
"betaFeatures" => false,
"expected" => false
- ], [ // PageImages dep is missing
+ ],
+ // PageImages dep is missing
+ [
"betaOn" => false,
"textExtracts" => true,
"pageImages" => false,
"betaFeatures" => false,
"expected" => false
- ], [ // Beta is on but BetaFeatures dep is missing
+ ],
+ // Beta is on but BetaFeatures dep is missing
+ [
"betaOn" => true,
"textExtracts" => true,
"pageImages" => true,
"betaFeatures" => false,
"expected" => false
- ], [ // beta is on and all deps are available
+ ],
+ // beta is on and all deps are available
+ [
"betaOn" => true,
"textExtracts" => true,
"pageImages" => true,
--
To view, visit https://gerrit.wikimedia.org/r/364851
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id64269f5950d6da5fee3f18825ce2d713d0446b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Pmiazga <pmia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
