Merge "Remove obvious function-level profiling"

diff --combined includes/MagicWord.php
index 6418b9f,7476fcf..186821d
--- 1/includes/MagicWord.php
--- 2/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@@ -330,15 -330,12 +330,12 @@@ class MagicWord 
         */
        function load( $id ) {
                global $wgContLang;
-               wfProfileIn( __METHOD__ );
                $this->mId = $id;
                $wgContLang->getMagic( $this );
                if ( !$this->mSynonyms ) {
                        $this->mSynonyms = array( 'brionmademeputthishere' );
-                       wfProfileOut( __METHOD__ );
                        throw new MWException( "Error: invalid magic word '$id'" );
                }
-               wfProfileOut( __METHOD__ );
        }
  
        /**
@@@ -655,7 -652,7 +652,7 @@@
         * This method uses the php feature to do several replacements at the same time,
         * thereby gaining some efficiency. The result is placed in the out variable
         * $result. The return value is true if something was replaced.
 -       * @todo Should this be static? It doesn't seem to be used at all
 +       * @deprecated since 1.25, unused
         *
         * @param array $magicarr
         * @param string $subject
@@@ -664,7 -661,6 +661,7 @@@
         * @return bool
         */
        function replaceMultiple( $magicarr, $subject, &$result ) {
 +              wfDeprecated( __METHOD__, '1.25' );
                $search = array();
                $replace = array();
                foreach ( $magicarr as $id => $replacement ) {

diff --combined includes/page/WikiPage.php
index 7de7f27,5c3d170..a822945
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -557,7 -557,6 +557,6 @@@ class WikiPage implements Page, IDBAcce
         * @return Revision|null
         */
        public function getOldestRevision() {
-               wfProfileIn( __METHOD__ );
  
                // Try using the slave database first, then try the master
                $continue = 2;
@@@ -588,7 -587,6 +587,6 @@@
                        }
                }
  
-               wfProfileOut( __METHOD__ );
                return $row ? Revision::newFromRow( $row ) : null;
        }
  
@@@ -1055,7 -1053,6 +1053,6 @@@
         * @return array Array of authors, duplicates not removed
         */
        public function getLastNAuthors( $num, $revLatest = 0 ) {
-               wfProfileIn( __METHOD__ );
                // First try the slave
                // If that doesn't have the latest revision, try the master
                $continue = 2;
@@@ -1076,7 -1073,6 +1073,6 @@@
                        );
  
                        if ( !$res ) {
-                               wfProfileOut( __METHOD__ );
                                return array();
                        }
  
@@@ -1096,7 -1092,6 +1092,6 @@@
                        $authors[] = $row->rev_user_text;
                }
  
-               wfProfileOut( __METHOD__ );
                return $authors;
        }
  
@@@ -1129,7 -1124,6 +1124,6 @@@
         * @return ParserOutput|bool ParserOutput or false if the revision was not found
         */
        public function getParserOutput( ParserOptions $parserOptions, $oldid = null ) {
-               wfProfileIn( __METHOD__ );
  
                $useParserCache = $this->isParserCacheUsed( $parserOptions, $oldid );
                wfDebug( __METHOD__ . ': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
@@@ -1140,7 -1134,6 +1134,6 @@@
                if ( $useParserCache ) {
                        $parserOutput = ParserCache::singleton()->get( $this, $parserOptions );
                        if ( $parserOutput !== false ) {
-                               wfProfileOut( __METHOD__ );
                                return $parserOutput;
                        }
                }
@@@ -1152,7 -1145,6 +1145,6 @@@
                $pool = new PoolWorkArticleView( $this, $parserOptions, $oldid, $useParserCache );
                $pool->execute();
  
-               wfProfileOut( __METHOD__ );
  
                return $pool->getParserOutput();
        }
@@@ -1228,7 -1220,6 +1220,6 @@@
         * @return int The newly created page_id key, or false if the title already existed
         */
        public function insertOn( $dbw ) {
-               wfProfileIn( __METHOD__ );
  
                $page_id = $dbw->nextSequenceValue( 'page_page_id_seq' );
                $dbw->insert( 'page', array(
@@@ -1251,7 -1242,6 +1242,6 @@@
                        $this->mId = $newid;
                        $this->mTitle->resetArticleID( $newid );
                }
-               wfProfileOut( __METHOD__ );
  
                return $affected ? $newid : false;
        }
@@@ -1274,7 -1264,6 +1264,6 @@@
        ) {
                global $wgContentHandlerUseDB;
  
-               wfProfileIn( __METHOD__ );
  
                $content = $revision->getContent();
                $len = $content ? $content->getSize() : 0;
@@@ -1317,7 -1306,6 +1306,6 @@@
                                                                                                        $this->mLatest, $revision->getContentModel() );
                }
  
-               wfProfileOut( __METHOD__ );
                return $result;
        }
  
@@@ -1342,7 -1330,6 +1330,6 @@@
                        return true;
                }
  
-               wfProfileIn( __METHOD__ );
                if ( $isRedirect ) {
                        $this->insertRedirectEntry( $redirectTitle );
                } else {
@@@ -1354,7 -1341,6 +1341,6 @@@
                if ( $this->getTitle()->getNamespace() == NS_FILE ) {
                        RepoGroup::singleton()->getLocalRepo()->invalidateImageRedirect( $this->getTitle() );
                }
-               wfProfileOut( __METHOD__ );
  
                return ( $dbw->affectedRows() != 0 );
        }
@@@ -1370,7 -1356,6 +1356,6 @@@
         * @return bool
         */
        public function updateIfNewerOn( $dbw, $revision ) {
-               wfProfileIn( __METHOD__ );
  
                $row = $dbw->selectRow(
                        array( 'revision', 'page' ),
@@@ -1382,7 -1367,6 +1367,6 @@@
  
                if ( $row ) {
                        if ( wfTimestamp( TS_MW, $row->rev_timestamp ) >= $revision->getTimestamp() ) {
-                               wfProfileOut( __METHOD__ );
                                return false;
                        }
                        $prev = $row->rev_id;
@@@ -1395,7 -1379,6 +1379,6 @@@
  
                $ret = $this->updateRevisionOn( $dbw, $revision, $prev, $lastRevIsRedirect );
  
-               wfProfileOut( __METHOD__ );
                return $ret;
        }
  
@@@ -1514,7 -1497,6 +1497,6 @@@
         */
        public function replaceSectionContent( $sectionId, Content $sectionContent, $sectionTitle = '',
                $edittime = null ) {
-               wfProfileIn( __METHOD__ );
  
                $baseRevId = null;
                if ( $edittime && $sectionId !== 'new' ) {
@@@ -1525,7 -1507,6 +1507,6 @@@
                        }
                }
  
-               wfProfileOut( __METHOD__ );
                return $this->replaceSectionAtRev( $sectionId, $sectionContent, $sectionTitle, $baseRevId );
        }
  
@@@ -1545,14 -1526,12 +1526,12 @@@
        public function replaceSectionAtRev( $sectionId, Content $sectionContent,
                $sectionTitle = '', $baseRevId = null
        ) {
-               wfProfileIn( __METHOD__ );
  
                if ( strval( $sectionId ) === '' ) {
                        // Whole-page edit; let the whole text through
                        $newContent = $sectionContent;
                } else {
                        if ( !$this->supportsSections() ) {
-                               wfProfileOut( __METHOD__ );
                                throw new MWException( "sections not supported for content model " .
                                        $this->getContentHandler()->getModelID() );
                        }
@@@ -1568,7 -1547,6 +1547,6 @@@
                                if ( !$rev ) {
                                        wfDebug( __METHOD__ . " asked for bogus section (page: " .
                                                $this->getId() . "; section: $sectionId)\n" );
-                                       wfProfileOut( __METHOD__ );
                                        return null;
                                }
  
@@@ -1577,14 -1555,12 +1555,12 @@@
  
                        if ( !$oldContent ) {
                                wfDebug( __METHOD__ . ": no page text\n" );
-                               wfProfileOut( __METHOD__ );
                                return null;
                        }
  
                        $newContent = $oldContent->replaceSection( $sectionId, $sectionContent, $sectionTitle );
                }
  
-               wfProfileOut( __METHOD__ );
                return $newContent;
        }
  
@@@ -1726,10 -1702,8 +1702,8 @@@
                        throw new MWException( 'Something is trying to edit an article with an empty title' );
                }
  
-               wfProfileIn( __METHOD__ );
  
                if ( !$content->getContentHandler()->canBeUsedOn( $this->getTitle() ) ) {
-                       wfProfileOut( __METHOD__ );
                        return Status::newFatal( 'content-not-allowed-here',
                                ContentHandler::getLocalizedName( $content->getModel() ),
                                $this->getTitle()->getPrefixedText() );
@@@ -1758,7 -1732,6 +1732,6 @@@
                                $status->fatal( 'edit-hook-aborted' );
                        }
  
-                       wfProfileOut( __METHOD__ );
                        return $status;
                }
  
@@@ -1805,11 -1778,9 +1778,9 @@@
                                wfDebug( __METHOD__ . ": EDIT_UPDATE specified but article doesn't exist\n" );
                                $status->fatal( 'edit-gone-missing' );
  
-                               wfProfileOut( __METHOD__ );
                                return $status;
                        } elseif ( !$old_content ) {
                                // Sanity check for bug 37225
-                               wfProfileOut( __METHOD__ );
                                throw new MWException( "Could not find text for current revision {$oldid}." );
                        }
  
@@@ -1840,7 -1811,6 +1811,6 @@@
                                        if ( !$status->isOK() ) {
                                                $dbw->rollback( __METHOD__ );
  
-                                               wfProfileOut( __METHOD__ );
                                                return $status;
                                        }
                                        $revisionId = $revision->insertOn( $dbw );
@@@ -1856,7 -1826,6 +1826,6 @@@
  
                                                $dbw->rollback( __METHOD__ );
  
-                                               wfProfileOut( __METHOD__ );
                                                return $status;
                                        }
  
@@@ -1921,7 -1890,6 +1890,6 @@@
                                if ( !$status->isOK() ) {
                                        $dbw->rollback( __METHOD__ );
  
-                                       wfProfileOut( __METHOD__ );
                                        return $status;
                                }
  
@@@ -1935,7 -1903,6 +1903,6 @@@
                                        $dbw->rollback( __METHOD__ );
                                        $status->fatal( 'edit-already-exists' );
  
-                                       wfProfileOut( __METHOD__ );
                                        return $status;
                                }
  
@@@ -2018,7 -1985,6 +1985,6 @@@
                        $user->addAutopromoteOnceGroups( 'onEdit' );
                } );
  
-               wfProfileOut( __METHOD__ );
                return $status;
        }
  
@@@ -2166,7 -2132,6 +2132,6 @@@
        public function doEditUpdates( Revision $revision, User $user, array $options = array() ) {
                global $wgEnableParserCache;
  
-               wfProfileIn( __METHOD__ );
  
                $options += array(
                        'changed' => true,
@@@ -2214,7 -2179,6 +2179,6 @@@
                }
  
                if ( !$this->exists() ) {
-                       wfProfileOut( __METHOD__ );
                        return;
                }
  
@@@ -2279,7 -2243,6 +2243,6 @@@
                        self::onArticleEdit( $this->mTitle );
                }
  
-               wfProfileOut( __METHOD__ );
        }
  
        /**
@@@ -2315,7 -2278,6 +2278,6 @@@
        public function doQuickEditContent( Content $content, User $user, $comment = '', $minor = false,
                $serialFormat = null
        ) {
-               wfProfileIn( __METHOD__ );
  
                $serialized = $content->serialize( $serialFormat );
  
@@@ -2335,7 -2297,6 +2297,6 @@@
  
                Hooks::run( 'NewRevisionFromEditComplete', array( $this, $revision, false, $user ) );
  
-               wfProfileOut( __METHOD__ );
        }
  
        /**
@@@ -3156,7 -3117,7 +3117,7 @@@
         *
         * @param Title $title
         */
 -      public static function onArticleCreate( $title ) {
 +      public static function onArticleCreate( Title $title ) {
                // Update existence markers on article/talk tabs...
                $other = $title->getOtherPage();
  
@@@ -3173,7 -3134,7 +3134,7 @@@
         *
         * @param Title $title
         */
 -      public static function onArticleDelete( $title ) {
 +      public static function onArticleDelete( Title $title ) {
                // Update existence markers on article/talk tabs...
                $other = $title->getOtherPage();
  
@@@ -3214,8 -3175,10 +3175,8 @@@
         * Purge caches on page update etc
         *
         * @param Title $title
 -       * @todo Verify that $title is always a Title object (and never false or
 -       *   null), add Title hint to parameter $title.
         */
 -      public static function onArticleEdit( $title ) {
 +      public static function onArticleEdit( Title $title ) {
                // Invalidate caches of articles which include this page
                DeferredUpdates::addHTMLCacheUpdate( $title, 'templatelinks' );