Merge "Fix sessionfailure i18n message during authentication"

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

diff --git a/tests/phpunit/includes/jobqueue/JobTest.php b/tests/phpunit/includes/jobqueue/JobTest.php
index 6723a0b..0cab702 100644 (file)
--- a/tests/phpunit/includes/jobqueue/JobTest.php
+++ b/tests/phpunit/includes/jobqueue/JobTest.php
@@ -18,7 +18,7 @@ class JobTest extends MediaWikiTestCase {
        }
 
        public function provideTestToString() {
-               $mockToStringObj = $this->getMockBuilder( 'stdClass' )
+               $mockToStringObj = $this->getMockBuilder( stdClass::class )
                        ->setMethods( [ '__toString' ] )->getMock();
                $mockToStringObj->expects( $this->any() )
                        ->method( '__toString' )
@@ -75,8 +75,10 @@ class JobTest extends MediaWikiTestCase {
                                'someCommand  pages={"932737":[0,"Robert_James_Waller"]} ' .
                                'rootJobSignature=45868e99bba89064e4483743ebb9b682ef95c1a7 ' .
                                'rootJobTimestamp=20160309110158 masterPos=' .
-                               '{"file":"db1023-bin.001288","pos":"308257743","asOfTime":1457521464.3814} ' .
-                               'triggeredRecursive=1 ' .
+                               '{"file":"db1023-bin.001288","pos":"308257743","asOfTime":' .
+                               // Embed dynamically because TestSetup sets serialize_precision=17
+                               // which, in PHP 7.1 and 7.2, produces 1457521464.3814001 instead
+                               json_encode( 1457521464.3814 ) . '} ' . 'triggeredRecursive=1 ' .
                                $requestId
                        ],
                ];
@@ -84,7 +86,7 @@ class JobTest extends MediaWikiTestCase {
 
        public function getMockJob( $params ) {
                $mock = $this->getMockForAbstractClass(
-                       'Job',
+                       Job::class,
                        [ 'someCommand', new Title(), $params ],
                        'SomeJob'
                );
@@ -99,7 +101,7 @@ class JobTest extends MediaWikiTestCase {
         * @covers Job::factory
         */
        public function testJobFactory( $handler ) {
-               $this->mergeMWGlobalArrayValue( 'wgJobClasses', [ 'testdummy' => $handler ] );
+               $this->mergeMwGlobalArrayValue( 'wgJobClasses', [ 'testdummy' => $handler ] );
 
                $job = Job::factory( 'testdummy', Title::newMainPage(), [] );
                $this->assertInstanceOf( NullJob::class, $job );