Merge "Title: Refactor JS/CSS page handling to be more sane"

[lhc/web/wiklou.git] / tests / phpunit / includes / libs / MemoizedCallableTest.php

diff --git a/tests/phpunit/includes/libs/MemoizedCallableTest.php b/tests/phpunit/includes/libs/MemoizedCallableTest.php
index d99c587..d64ba3d 100644 (file)
--- a/tests/phpunit/includes/libs/MemoizedCallableTest.php
+++ b/tests/phpunit/includes/libs/MemoizedCallableTest.php
@@ -24,14 +24,16 @@ class ArrayBackedMemoizedCallable extends MemoizedCallable {
  * PHP Unit tests for MemoizedCallable class.
  * @covers MemoizedCallable
  */
-class MemoizedCallableTest extends PHPUnit_Framework_TestCase {
+class MemoizedCallableTest extends PHPUnit\Framework\TestCase {
+
+       use MediaWikiCoversValidator;
 
        /**
         * The memoized callable should relate inputs to outputs in the same
         * way as the original underlying callable.
         */
        public function testReturnValuePassedThrough() {
-               $mock = $this->getMockBuilder( 'stdClass' )
+               $mock = $this->getMockBuilder( stdClass::class )
                        ->setMethods( [ 'reverse' ] )->getMock();
                $mock->expects( $this->any() )
                        ->method( 'reverse' )
@@ -48,7 +50,7 @@ class MemoizedCallableTest extends PHPUnit_Framework_TestCase {
         * @requires function apc_store/apcu_store
         */
        public function testCallableMemoized() {
-               $observer = $this->getMockBuilder( 'stdClass' )
+               $observer = $this->getMockBuilder( stdClass::class )
                        ->setMethods( [ 'computeSomething' ] )->getMock();
                $observer->expects( $this->once() )
                        ->method( 'computeSomething' )