Merge "Use the request object provided in User::setCookies"

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

diff --git a/tests/phpunit/includes/libs/GenericArrayObjectTest.php b/tests/phpunit/includes/libs/GenericArrayObjectTest.php
index e2ec474..fd9f80d 100644 (file)
--- a/tests/phpunit/includes/libs/GenericArrayObjectTest.php
+++ b/tests/phpunit/includes/libs/GenericArrayObjectTest.php
@@ -27,10 +27,11 @@
  * @licence GNU GPL v2+
  * @author Jeroen De Dauw < jeroendedauw@gmail.com >
  */
-abstract class GenericArrayObjectTest extends MediaWikiTestCase {
+abstract class GenericArrayObjectTest extends PHPUnit_Framework_TestCase {
 
        /**
-        * Returns objects that can serve as elements in the concrete GenericArrayObject deriving class being tested.
+        * Returns objects that can serve as elements in the concrete
+        * GenericArrayObject deriving class being tested.
         *
         * @since 1.20
         *
@@ -170,7 +171,7 @@ abstract class GenericArrayObjectTest extends MediaWikiTestCase {
        /**
         * @since 1.20
         *
-        * @param callback $function
+        * @param callable $function
         *
         * @covers GenericArrayObject::getObjectType
         */