Apply phase3 related Title fixes. With one minor addition, Title constructor marked...

Patches by Yuvi Panda

From (bug 28583) Remove all /* private */ declarations in MediaWiki core

diff --git a/includes/Title.php b/includes/Title.php
index 78af3b0..11c2d5b 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -78,9 +78,8 @@ class Title {
 
        /**
         * Constructor
-        * @private
         */
-       /* private */ function __construct() { }
+       protected function __construct() { }
 
        /**
         * Create a new Title from a prefixed DB key

diff --git a/tests/phpunit/includes/SampleTest.php b/tests/phpunit/includes/SampleTest.php
index 3c3553f..fa7c4d5 100644 (file)
--- a/tests/phpunit/includes/SampleTest.php
+++ b/tests/phpunit/includes/SampleTest.php
@@ -88,7 +88,7 @@ class TestSample extends MediaWikiTestCase {
         * See http://www.phpunit.de/manual/3.4/en/appendixes.annotations.html#appendixes.annotations.expectedException
         */
        function testTitleObjectFromObject() {
-               $title = Title::newFromText( new Title( "test" ) );
+               $title = Title::newFromText( Title::newFromText( "test" ) );
                $this->assertEquals( "Test", $title->isLocal() );
        }
 }

diff --git a/tests/phpunit/includes/parser/TagHooks.php b/tests/phpunit/includes/parser/TagHooks.php
index f605072..713ce84 100644 (file)
--- a/tests/phpunit/includes/parser/TagHooks.php
+++ b/tests/phpunit/includes/parser/TagHooks.php
@@ -21,7 +21,7 @@ class TagHookTest extends MediaWikiTestCase {
                $parser = new Parser( $wgParserConf );
                
                $parser->setHook( $tag, array( $this, 'tagCallback' ) );
-               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", new Title( 'Test' ), new ParserOptions );
+               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
                $this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
                
                $parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
@@ -36,7 +36,7 @@ class TagHookTest extends MediaWikiTestCase {
                $parser = new Parser( $wgParserConf );
                
                $parser->setHook( $tag, array( $this, 'tagCallback' ) );
-               $parser->parse( "Foo<$tag>Bar</$tag>Baz", new Title( 'Test' ), new ParserOptions );
+               $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
                $this->fail('Exception not thrown.');
        }
        
@@ -48,7 +48,7 @@ class TagHookTest extends MediaWikiTestCase {
                $parser = new Parser( $wgParserConf );
                
                $parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), 0 );
-               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", new Title( 'Test' ), new ParserOptions );
+               $parserOutput = $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
                $this->assertEquals( "<p>FooOneBaz\n</p>", $parserOutput->getText() );
                
                $parser->mPreprocessor = null; # Break the Parser <-> Preprocessor cycle
@@ -63,7 +63,7 @@ class TagHookTest extends MediaWikiTestCase {
                $parser = new Parser( $wgParserConf );
                
                $parser->setFunctionTagHook( $tag, array( $this, 'functionTagCallback' ), SFH_OBJECT_ARGS );
-               $parser->parse( "Foo<$tag>Bar</$tag>Baz", new Title( 'Test' ), new ParserOptions );
+               $parser->parse( "Foo<$tag>Bar</$tag>Baz", Title::newFromText( 'Test' ), new ParserOptions );
                $this->fail('Exception not thrown.');
        }