Merge "Set content language for test to en to ensure it passes"

[lhc/web/wiklou.git] / tests / phpunit / includes / poolcounter / PoolCounterTest.php

diff --git a/tests/phpunit/includes/poolcounter/PoolCounterTest.php b/tests/phpunit/includes/poolcounter/PoolCounterTest.php
index 6caf3e5..28cd503 100644 (file)
--- a/tests/phpunit/includes/poolcounter/PoolCounterTest.php
+++ b/tests/phpunit/includes/poolcounter/PoolCounterTest.php
@@ -1,14 +1,5 @@
 <?php
 
-// We will use this class with getMockForAbstractClass to create a concrete mock class.
-// That call will die if the contructor is not public, unless we use disableOriginalConstructor(),
-// in which case we could not test the constructor.
-abstract class PoolCounterAbstractMock extends PoolCounter {
-       public function __construct() {
-               call_user_func_array( 'parent::__construct', func_get_args() );
-       }
-}
-
 /**
  * @covers PoolCounter
  */
@@ -21,13 +12,13 @@ class PoolCounterTest extends MediaWikiTestCase {
                        'maxqueue' => 100,
                ];
 
-               $poolCounter = $this->getMockBuilder( 'PoolCounterAbstractMock' )
+               $poolCounter = $this->getMockBuilder( PoolCounterAbstractMock::class )
                        ->setConstructorArgs( [ $poolCounterConfig, 'testCounter', 'someKey' ] )
                        // don't mock anything - the proper syntax would be setMethods(null), but due
                        // to a PHPUnit bug that does not work with getMockForAbstractClass()
                        ->setMethods( [ 'idontexist' ] )
                        ->getMockForAbstractClass();
-               $this->assertInstanceOf( 'PoolCounter', $poolCounter );
+               $this->assertInstanceOf( PoolCounter::class, $poolCounter );
        }
 
        public function testConstructWithSlots() {
@@ -39,15 +30,15 @@ class PoolCounterTest extends MediaWikiTestCase {
                        'maxqueue' => 100,
                ];
 
-               $poolCounter = $this->getMockBuilder( 'PoolCounterAbstractMock' )
+               $poolCounter = $this->getMockBuilder( PoolCounterAbstractMock::class )
                        ->setConstructorArgs( [ $poolCounterConfig, 'testCounter', 'key' ] )
                        ->setMethods( [ 'idontexist' ] ) // don't mock anything
                        ->getMockForAbstractClass();
-               $this->assertInstanceOf( 'PoolCounter', $poolCounter );
+               $this->assertInstanceOf( PoolCounter::class, $poolCounter );
        }
 
        public function testHashKeyIntoSlots() {
-               $poolCounter = $this->getMockBuilder( 'PoolCounterAbstractMock' )
+               $poolCounter = $this->getMockBuilder( PoolCounterAbstractMock::class )
                        // don't mock anything - the proper syntax would be setMethods(null), but due
                        // to a PHPUnit bug that does not work with getMockForAbstractClass()
                        ->setMethods( [ 'idontexist' ] )
@@ -82,3 +73,12 @@ class PoolCounterTest extends MediaWikiTestCase {
                );
        }
 }
+
+// We will use this class with getMockForAbstractClass to create a concrete mock class.
+// That call will die if the contructor is not public, unless we use disableOriginalConstructor(),
+// in which case we could not test the constructor.
+abstract class PoolCounterAbstractMock extends PoolCounter {
+       public function __construct( ...$args ) {
+               call_user_func_array( 'parent::__construct', $args );
+       }
+}