CommentStore: Hard-deprecate newKey()

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

diff --git a/tests/phpunit/includes/DiffHistoryBlobTest.php b/tests/phpunit/includes/DiffHistoryBlobTest.php
index e28a92c..c267a30 100644 (file)
--- a/tests/phpunit/includes/DiffHistoryBlobTest.php
+++ b/tests/phpunit/includes/DiffHistoryBlobTest.php
@@ -10,7 +10,6 @@ class DiffHistoryBlobTest extends MediaWikiTestCase {
 
                if ( !function_exists( 'xdiff_string_rabdiff' ) ) {
                        $this->markTestSkipped( 'The version of xdiff extension is lower than 1.5.0' );
-
                        return;
                }
        }
@@ -28,13 +27,19 @@ class DiffHistoryBlobTest extends MediaWikiTestCase {
                        "Hash of " . addcslashes( $input, "\0..\37!@\@\177..\377" ) );
        }
 
-       public static function provideXdiffAdler32() {
-               return array(
-                       array( '', 'Empty string' ),
-                       array( "\0", 'Null' ),
-                       array( "\0\0\0", "Several nulls" ),
-                       array( "Hello", "An ASCII string" ),
-                       array( str_repeat( "x", 6000 ), "A string larger than xdiff's NMAX (5552)" )
-               );
+       public function provideXdiffAdler32() {
+               // Hack non-empty early return since PHPUnit expands this provider before running
+               // the setUp() which marks the test as skipped.
+               if ( !function_exists( 'xdiff_string_rabdiff' ) ) {
+                       return [ [ '', 'Empty string' ] ];
+               }
+
+               return [
+                       [ '', 'Empty string' ],
+                       [ "\0", 'Null' ],
+                       [ "\0\0\0", "Several nulls" ],
+                       [ "Hello", "An ASCII string" ],
+                       [ str_repeat( "x", 6000 ), "A string larger than xdiff's NMAX (5552)" ]
+               ];
        }
 }