Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230089
Change subject: Do not use globals in ChangeHandlerTest
......................................................................
Do not use globals in ChangeHandlerTest
This code makes the custom PHPCS sniff
MediaWiki.NamingConventions.ValidGlobalName.wgPrefix complain.
I'm very happy with my solution. I think this is the most mininal
implementation of a spy you can have.
Change-Id: I72bff4836e359d72c3b11bfbc811eca056ff3d2d
---
M client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
1 file changed, 10 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/89/230089/1
diff --git a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
index d3e0e61..9e695b4 100644
--- a/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
+++ b/client/tests/phpunit/includes/Changes/ChangeHandlerTest.php
@@ -153,36 +153,30 @@
* @dataProvider provideHandleChanges
*/
public function testHandleChanges() {
- global $handleChangeCallCount, $handleChangesCallCount;
$changes = func_get_args();
+ $spy = new \stdClass();
+ $spy->handleChangeCallCount = 0;
+ $spy->handleChangesCallCount = 0;
+
$testHooks = array(
- 'WikibaseHandleChange' => array( function( Change
$change ) {
- global $handleChangeCallCount;
- $handleChangeCallCount++;
+ 'WikibaseHandleChange' => array( function( Change
$change ) use ( $spy ) {
+ $spy->handleChangeCallCount++;
return true;
} ),
- 'WikibaseHandleChanges' => array( function( array
$changes ) {
- global $handleChangesCallCount;
- $handleChangesCallCount++;
+ 'WikibaseHandleChanges' => array( function( array
$changes ) use ( $spy ) {
+ $spy->handleChangesCallCount++;
return true;
} )
);
$this->mergeMwGlobalArrayValue( 'wgHooks', $testHooks );
- $handleChangeCallCount = 0;
- $handleChangesCallCount = 0;
-
$changeHandler = $this->getChangeHandler();
-
$changeHandler->handleChanges( $changes );
- $this->assertEquals( count( $changes ), $handleChangeCallCount
);
- $this->assertEquals( 1, $handleChangesCallCount );
-
- unset( $handleChangeCallCount );
- unset( $handleChangesCallCount );
+ $this->assertEquals( count( $changes ),
$spy->handleChangeCallCount );
+ $this->assertEquals( 1, $spy->handleChangesCallCount );
}
public function provideGetUpdateActions() {
--
To view, visit https://gerrit.wikimedia.org/r/230089
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72bff4836e359d72c3b11bfbc811eca056ff3d2d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
