Merge "resourceloader: Re-use internal addLink() for mw.loader.load()"

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

diff --git a/tests/phpunit/includes/content/JsonContentTest.php b/tests/phpunit/includes/content/JsonContentTest.php
index de8e371..8546d96 100644 (file)
--- a/tests/phpunit/includes/content/JsonContentTest.php
+++ b/tests/phpunit/includes/content/JsonContentTest.php
@@ -82,18 +82,18 @@ class JsonContentTest extends MediaWikiLangTestCase {
        }
 
        private function getMockTitle() {
-               return $this->getMockBuilder( 'Title' )
+               return $this->getMockBuilder( Title::class )
                        ->disableOriginalConstructor()
                        ->getMock();
        }
 
        private function getMockUser() {
-               return $this->getMockBuilder( 'User' )
+               return $this->getMockBuilder( User::class )
                        ->disableOriginalConstructor()
                        ->getMock();
        }
        private function getMockParserOptions() {
-               return $this->getMockBuilder( 'ParserOptions' )
+               return $this->getMockBuilder( ParserOptions::class )
                        ->disableOriginalConstructor()
                        ->getMock();
        }
@@ -113,27 +113,27 @@ class JsonContentTest extends MediaWikiLangTestCase {
                        ],
                        [
                                (object)[ 'foo' ],
-                               '<table class="mw-json"><tbody><tr><th>0</th><td class="value">"foo"</td></tr>' .
+                               '<table class="mw-json"><tbody><tr><th>0</th><td class="mw-json-value">"foo"</td></tr>' .
                                '</tbody></table>'
                        ],
                        [
                                (object)[ 'foo', 'bar' ],
-                               '<table class="mw-json"><tbody><tr><th>0</th><td class="value">"foo"</td></tr>' .
-                               '<tr><th>1</th><td class="value">"bar"</td></tr></tbody></table>'
+                               '<table class="mw-json"><tbody><tr><th>0</th><td class="mw-json-value">"foo"</td></tr>' .
+                               '<tr><th>1</th><td class="mw-json-value">"bar"</td></tr></tbody></table>'
                        ],
                        [
                                (object)[ 'baz' => 'foo', 'bar' ],
-                               '<table class="mw-json"><tbody><tr><th>baz</th><td class="value">"foo"</td></tr>' .
-                               '<tr><th>0</th><td class="value">"bar"</td></tr></tbody></table>'
+                               '<table class="mw-json"><tbody><tr><th>baz</th><td class="mw-json-value">"foo"</td></tr>' .
+                               '<tr><th>0</th><td class="mw-json-value">"bar"</td></tr></tbody></table>'
                        ],
                        [
                                (object)[ 'baz' => 1000, 'bar' ],
-                               '<table class="mw-json"><tbody><tr><th>baz</th><td class="value">1000</td></tr>' .
-                               '<tr><th>0</th><td class="value">"bar"</td></tr></tbody></table>'
+                               '<table class="mw-json"><tbody><tr><th>baz</th><td class="mw-json-value">1000</td></tr>' .
+                               '<tr><th>0</th><td class="mw-json-value">"bar"</td></tr></tbody></table>'
                        ],
                        [
                                (object)[ '<script>alert("evil!")</script>' ],
-                               '<table class="mw-json"><tbody><tr><th>0</th><td class="value">"' .
+                               '<table class="mw-json"><tbody><tr><th>0</th><td class="mw-json-value">"' .
                                '&lt;script>alert("evil!")&lt;/script>"' .
                                '</td></tr></tbody></table>',
                        ],
@@ -146,7 +146,7 @@ class JsonContentTest extends MediaWikiLangTestCase {
        public function testFillParserOutput( $data, $expected ) {
                $obj = new JsonContent( FormatJson::encode( $data ) );
                $parserOutput = $obj->getParserOutput( $this->getMockTitle(), null, null, true );
-               $this->assertInstanceOf( 'ParserOutput', $parserOutput );
+               $this->assertInstanceOf( ParserOutput::class, $parserOutput );
                $this->assertEquals( $expected, $parserOutput->getText() );
        }
 }