Fix up a couple of deprecated calls

Documentation

diff --git a/skins/Chick.php b/skins/Chick.php
index b7cef69..b8b9f34 100644 (file)
--- a/skins/Chick.php
+++ b/skins/Chick.php
@@ -21,6 +21,9 @@ class SkinChick extends SkinTemplate {
        var $skinname = 'chick', $stylename = 'chick',
        $template = 'MonoBookTemplate', $useHeadElement = true;
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
 

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index c395e6a..b9e4115 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -19,6 +19,9 @@ class SkinCologneBlue extends SkinLegacy {
        var $skinname = 'cologneblue', $stylename = 'cologneblue',
                $template = 'CologneBlueTemplate';
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->addModuleStyles( 'skins.cologneblue' );
@@ -55,6 +58,9 @@ class SkinCologneBlue extends SkinLegacy {
 
 class CologneBlueTemplate extends LegacyTemplate {
 
+       /**
+        * @return string
+        */
        function doBeforeContent() {
                $mainPageObj = Title::newMainPage();
 
@@ -95,6 +101,9 @@ class CologneBlueTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @return string
+        */
        function doAfterContent(){
                global $wgLang;
 
@@ -136,6 +145,9 @@ class CologneBlueTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @return string
+        */
        function sysLinks() {
                global $wgUser, $wgLang;
                $li = SpecialPage::getTitleFor( 'Userlogin' );
@@ -194,6 +206,8 @@ class CologneBlueTemplate extends LegacyTemplate {
        /**
         * Compute the sidebar
         * @access private
+        *
+        * @return string
         */
        function quickBar(){
                global $wgOut, $wgUser;
@@ -347,11 +361,19 @@ class CologneBlueTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @param $key string
+        * @return string
+        */
        function menuHead( $key ) {
                $s = "\n<h6>" . wfMsg( $key ) . "</h6>";
                return $s;
        }
 
+       /**
+        * @param $label string
+        * @return string
+        */
        function searchForm( $label = '' ) {
                global $wgRequest, $wgUseTwoButtonsSearchForm;
 

diff --git a/skins/Modern.php b/skins/Modern.php
index 47882c1..da902d1 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -21,6 +21,9 @@ class SkinModern extends SkinTemplate {
        var $skinname = 'modern', $stylename = 'modern',
                $template = 'ModernTemplate', $useHeadElement = true;
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->addModuleStyles ('skins.modern');

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index f57f6eb..a766e94 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -23,6 +23,9 @@ class SkinMonoBook extends SkinTemplate {
        var $skinname = 'monobook', $stylename = 'monobook',
                $template = 'MonoBookTemplate', $useHeadElement = true;
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ) {
                global $wgHandheldStyle;
                parent::setupSkinUserCss( $out );
@@ -211,6 +214,8 @@ echo $footerEnd;
        /**
         * Prints the cactions bar.
         * Shared between MonoBook and Modern
+        *
+        * @param $skin Skin
         */
        function cactions( Skin $skin ) {
 ?>

diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index 597cd23..24dc90b 100644 (file)
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -18,6 +18,9 @@ class SkinNostalgia extends SkinLegacy {
        var $skinname = 'nostalgia', $stylename = 'nostalgia',
                $template = 'NostalgiaTemplate';
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->addModuleStyles( 'skins.nostalgia' );
@@ -27,6 +30,9 @@ class SkinNostalgia extends SkinLegacy {
 
 class NostalgiaTemplate extends LegacyTemplate {
 
+       /**
+        * @return string
+        */
        function doBeforeContent() {
                $s = "\n<div id='content'>\n<div id='top'>\n";
                $s .= '<div id="logo">' . $this->getSkin()->logoText( 'right' ) . '</div>';
@@ -59,6 +65,9 @@ class NostalgiaTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @return string
+        */
        function topLinks() {
                global $wgOut, $wgUser;
                $sep = " |\n";
@@ -105,6 +114,9 @@ class NostalgiaTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @return string
+        */
        function doAfterContent() {
                $s = "\n</div><br clear='all' />\n";
 

diff --git a/skins/Simple.php b/skins/Simple.php
index 87bb0b7..0644377 100644 (file)
--- a/skins/Simple.php
+++ b/skins/Simple.php
@@ -21,6 +21,9 @@ class SkinSimple extends SkinTemplate {
        var $skinname = 'simple', $stylename = 'simple',
                $template = 'MonoBookTemplate', $useHeadElement = true;
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ) {
                parent::setupSkinUserCss( $out );
 

diff --git a/skins/Standard.php b/skins/Standard.php
index 41a796b..ff1e933 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -18,6 +18,9 @@ class SkinStandard extends SkinLegacy {
        var $skinname = 'standard', $stylename = 'standard',
                $template = 'StandardTemplate';
 
+       /**
+        * @param $out OutputPage
+        */
        function setupSkinUserCss( OutputPage $out ){
                parent::setupSkinUserCss( $out );
                $out->AddModuleStyles( 'skins.standard' );
@@ -51,6 +54,9 @@ class SkinStandard extends SkinLegacy {
 
 class StandardTemplate extends LegacyTemplate {
 
+       /**
+        * @return string
+        */
        function doAfterContent() {
                global $wgContLang, $wgLang;
                wfProfileIn( __METHOD__ );
@@ -99,6 +105,9 @@ class StandardTemplate extends LegacyTemplate {
                return $s;
        }
 
+       /**
+        * @return string
+        */
        function quickBar() {
                global $wgOut, $wgUser, $wgRequest, $wgContLang;
 

diff --git a/skins/Vector.php b/skins/Vector.php
index 357c48d..6f21b86 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -108,7 +108,7 @@ class VectorTemplate extends BaseTemplate {
                                }
                                if ( isset( $link['tooltiponly'] ) && $link['tooltiponly'] ) {
                                        $nav[$section][$key]['key'] =
-                                               Linker::tooltip( $xmlID );
+                                               Linker::titleAttrib( $xmlID );
                                } else {
                                        $nav[$section][$key]['key'] =
                                                Xml::expandAttributes( Linker::tooltipAndAccesskeyAttribs( $xmlID ) );
@@ -258,6 +258,8 @@ class VectorTemplate extends BaseTemplate {
 
        /**
         * Render a series of portals
+        *
+        * @params $portals array
         */
        private function renderPortals( $portals ) {
                // Force the rendering of the following portals
@@ -297,7 +299,7 @@ class VectorTemplate extends BaseTemplate {
                        $msg = $name;
                }
                ?>
-<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::tooltip( 'p-' . $name ) ?>>
+<div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo Linker::titleAttrib( 'p-' . $name ) ?>>
        <h5<?php $this->html( 'userlangattributes' ) ?>><?php $msgObj = wfMessage( $msg ); echo htmlspecialchars( $msgObj->exists() ? $msgObj->text() : $msg ); ?></h5>
        <div class="body">
 <?php
@@ -327,6 +329,8 @@ class VectorTemplate extends BaseTemplate {
        /**
         * Render one or more navigations elements by name, automatically reveresed
         * when UI is in RTL mode
+        *
+        * @param $elements array
         */
        private function renderNavigation( $elements ) {
                global $wgVectorUseSimpleSearch, $wgVectorShowVariantName, $wgUser;