wikimedia/mediawiki-extensions-Popups
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups synced 2024-09-23 18:29:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHP tests: Use the . not + operator to join strings

Browse source 
This unbreaks the test suite in PHP 7.1+.

Bug: T206297
Change-Id: I29677e84f41da447180beb58ffbc60655640890c
This commit is contained in:
James D. Forrester 2018-10-05 15:46:27 -07:00
parent 1c3b5307e7
commit 505ddc61fa
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tests/phpunit/PopupsContextTest.php
View file

@ -69,7 +69,7 @@ class PopupsContextTest extends MediaWikiTestCase {
$context = $this->getContext();
$this->assertEquals( $expected,
$context->showPreviewsOptInOnPreferencesPage(),
'The previews opt-in is ' + ( $expected ? 'shown.' : 'hidden.' ) );
'The previews opt-in is ' . ( $expected ? 'shown.' : 'hidden.' ) );
}
/**
@ -104,7 +104,7 @@ class PopupsContextTest extends MediaWikiTestCase {
$user->setOption( PopupsContext::PREVIEWS_OPTIN_PREFERENCE_NAME, $optIn );
$this->assertEquals( $expected,
$context->shouldSendModuleToUser( $user ),
( $expected ? 'A' : 'No' ) + ' module is sent to the user.' );
( $expected ? 'A' : 'No' ) . ' module is sent to the user.' );
}
/**
@ -137,7 +137,7 @@ class PopupsContextTest extends MediaWikiTestCase {
$context = $this->getContext();
$this->assertEquals( $expected,
$context->shouldSendModuleToUser( $user ),
( $expected ? 'A' : 'No' ) + ' module is sent to the user.' );
( $expected ? 'A' : 'No' ) . ' module is sent to the user.' );
}
public static function providerAnonUserHasDisabledPagePreviews() {
@ -168,7 +168,7 @@ class PopupsContextTest extends MediaWikiTestCase {
$context = $this->getContext( $mock );
$this->assertEquals( $expected,
$context->areDependenciesMet(),
'Dependencies are ' + ( $expected ? '' : 'not ' ) + 'met.' );
'Dependencies are ' . ( $expected ? '' : 'not ' ) . 'met.' );
}
/**
@ -219,7 +219,7 @@ class PopupsContextTest extends MediaWikiTestCase {
$context = $this->getContext();
$this->assertEquals( $expected,
$context->isTitleBlacklisted( $title ),
'The title is' + ( $expected ? ' ' : ' not ' ) + 'blacklisted.' );
'The title is' . ( $expected ? ' ' : ' not ' ) . 'blacklisted.' );
}
/**

2
tests/phpunit/PopupsGadgetsIntegrationTest.php
View file

@ -240,7 +240,7 @@ class PopupsGadgetsIntegrationTest extends MediaWikiTestCase {
$this->getExtensionRegistryMock( true ) );
$this->assertEquals( $expected,
$integration->conflictsWithNavPopupsGadget( $user ),
( $expected ? 'A' : 'No' ) + ' conflict is identified.' );
( $expected ? 'A' : 'No' ) . ' conflict is identified.' );
GadgetRepo::setSingleton( $origGadgetsRepo );
}