Merge "API: Warn when unsupported PHP array syntax is used"

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

diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
index 7c62dca..38fb573 100644 (file)
--- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php
+++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
@@ -4,13 +4,12 @@
  * @group ContentHandler
  */
 class WikitextContentHandlerTest extends MediaWikiLangTestCase {
-
        /**
         * @var ContentHandler
         */
-       var $handler;
+       private $handler;
 
-       public function setUp() {
+       protected function setUp() {
                parent::setUp();
 
                $this->handler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT );
@@ -23,7 +22,10 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase {
                $content = new WikitextContent( 'hello world' );
 
                $this->assertEquals( 'hello world', $this->handler->serializeContent( $content ) );
-               $this->assertEquals( 'hello world', $this->handler->serializeContent( $content, CONTENT_FORMAT_WIKITEXT ) );
+               $this->assertEquals(
+                       'hello world',
+                       $this->handler->serializeContent( $content, CONTENT_FORMAT_WIKITEXT )
+               );
 
                try {
                        $this->handler->serializeContent( $content, 'dummy/foo' );
@@ -98,7 +100,10 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase {
                        array( 'Category:Foo', '#REDIRECT [[:Category:Foo]]' ),
                        array( Title::makeTitle( NS_MAIN, 'en:Foo' ), '#REDIRECT [[en:Foo]]' ),
                        array( Title::makeTitle( NS_MAIN, 'Foo', '', 'en' ), '#REDIRECT [[:en:Foo]]' ),
-                       array( Title::makeTitle( NS_MAIN, 'Bar', 'fragment', 'google' ), '#REDIRECT [[google:Bar#fragment]]' ),
+                       array(
+                               Title::makeTitle( NS_MAIN, 'Bar', 'fragment', 'google' ),
+                               '#REDIRECT [[google:Bar#fragment]]'
+                       ),
                );
        }
 
@@ -183,9 +188,10 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase {
                        ),
 
                        array(
-                               'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut
-                               labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et
-                               ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.',
+                               'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy
+                               eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam
+                               voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet
+                               clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.',
                                'Hello world!',
                                0,
                                '/^Replaced .*Hello/'
@@ -210,7 +216,10 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase {
 
                $summary = $this->handler->getAutosummary( $oldContent, $newContent, $flags );
 
-               $this->assertTrue( (bool)preg_match( $expected, $summary ), "Autosummary didn't match expected pattern $expected: $summary" );
+               $this->assertTrue(
+                       (bool)preg_match( $expected, $summary ),
+                       "Autosummary didn't match expected pattern $expected: $summary"
+               );
        }
 
        /**
@@ -224,6 +233,9 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase {
         * @todo Text case requires database, should be done by a test class in the Database group
         */
        /*
-       public function testGetUndoContent( Revision $current, Revision $undo, Revision $undoafter = null ) {}
+       public function testGetUndoContent( Revision $current, Revision $undo,
+               Revision $undoafter = null
+       ) {
+       }
        */
 }