X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=blobdiff_plain;f=includes%2Fparser%2FParser.php;h=b0f8235006be9509f0b8c303d87557fb41235a66;hb=3e11266ae5e5a33498abb7f028bbc79b5ca93515;hp=acbfc0e516f12bcef9afe5b6cd39b578dea9aef9;hpb=a4296effc728c7bc117325d974cb5647fe02a18d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index acbfc0e516..b0f8235006 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -34,7 +34,7 @@
  * Globals used:
  *    objects:   $wgLang, $wgContLang
  *
- * NOT $wgArticle, $wgUser or $wgTitle. Keep them away!
+ * NOT $wgUser or $wgTitle. Keep them away!
  *
  * settings:
  *  $wgUseDynamicDates*, $wgInterwikiMagic*,
@@ -114,7 +114,7 @@ class Parser {
 
 	# Cleared with clearState():
 	/**
-	 * @var OutputPage
+	 * @var ParserOutput
 	 */
 	var $mOutput;
 	var $mAutonumber, $mDTopen;
@@ -182,7 +182,7 @@ class Parser {
 	 */
 	function __destruct() {
 		if ( isset( $this->mLinkHolders ) ) {
-			$this->mLinkHolders->__destruct();
+			unset( $this->mLinkHolders );
 		}
 		foreach ( $this as $name => $value ) {
 			unset( $this->$name );
@@ -517,7 +517,7 @@ class Parser {
 	 */
 	public function uniqPrefix() {
 		if ( !isset( $this->mUniqPrefix ) ) {
-			# @todo Fixme: this is probably *horribly wrong*
+			# @todo FIXME: This is probably *horribly wrong*
 			# LanguageConverter seems to want $wgParser's uniqPrefix, however
 			# if this is called for a parser cache hit, the parser may not
 			# have ever been initialized in the first place.
@@ -682,10 +682,8 @@ class Parser {
 	 * @param $matches Out parameter, Array: extracted tags
 	 * @param $uniq_prefix
 	 * @return String: stripped text
-	 *
-	 * @static
 	 */
-	public function extractTagsAndParams( $elements, $text, &$matches, $uniq_prefix = '' ) {
+	public static function extractTagsAndParams( $elements, $text, &$matches, $uniq_prefix = '' ) {
 		static $n = 1;
 		$stripped = '';
 		$matches = array();
@@ -754,41 +752,6 @@ class Parser {
 		return $this->mStripList;
 	}
 
-	/**
-	 * @deprecated use replaceVariables
-	 */
-	function strip( $text, $state, $stripcomments = false , $dontstrip = array() ) {
-		return $text;
-	}
-
-	/**
-	 * Restores pre, math, and other extensions removed by strip()
-	 *
-	 * always call unstripNoWiki() after this one
-	 * @private
-	 * @deprecated use $this->mStripState->unstrip()
-	 */
-	function unstrip( $text, $state ) {
-		return $state->unstripGeneral( $text );
-	}
-
-	/**
-	 * Always call this after unstrip() to preserve the order
-	 *
-	 * @private
-	 * @deprecated use $this->mStripState->unstrip()
-	 */
-	function unstripNoWiki( $text, $state ) {
-		return $state->unstripNoWiki( $text );
-	}
-
-	/**
-	 * @deprecated use $this->mStripState->unstripBoth()
-	 */
-	function unstripForHTML( $text ) {
-		return $this->mStripState->unstripBoth( $text );
-	}
-
 	/**
 	 * Add an item to the strip state
 	 * Returns the unique tag which must be inserted into the stripped text
@@ -803,15 +766,6 @@ class Parser {
 		return $rnd;
 	}
 
-	/**
-	 * Interface with html tidy
-	 * @deprecated Use MWTidy::tidy()
-	 */
-	public static function tidy( $text ) {
-		wfDeprecated( __METHOD__ );
-		return MWTidy::tidy( $text );
-	}
-
 	/**
 	 * parse the wiki syntax used to render tables
 	 *
@@ -988,7 +942,6 @@ class Parser {
 		return $out;
 	}
 
-
 	/**
 	 * Helper function for doTableStuff() separating the contents of cells from
 	 * attributes. Particularly useful as there's a possible bug and this action 
@@ -1088,7 +1041,7 @@ class Parser {
 			}
 			$return .= "\n</tr>";
 
-			if ( ( !isset( $table[$i + 1] ) && !$simple ) || ( isset( $table[$i + 1] ) && ( $table[$i]['type'] != $table[$i + 1]['type'] ) ) ) {
+			if ( ( !isset( $table[$i + 1] ) && !$simple ) || ( isset( $table[$i + 1] ) && isset( $table[$i + 1]['type'] ) && $table[$i]['type'] != $table[$i + 1]['type'] ) ) {
 				$return .= '</' . $table[$i]['type'] . '>';
 			}
 			$lastSection = $table[$i]['type'];
@@ -1620,7 +1573,6 @@ class Parser {
 		return $attribs;
 	}
 
-
 	/**
 	 * Replace unusual URL escape codes with their equivalent characters
 	 *
@@ -2012,7 +1964,7 @@ class Parser {
 			}
 
 			# NS_MEDIA is a pseudo-namespace for linking directly to a file
-			# FIXME: Should do batch file existence checks, see comment below
+			# @todo FIXME: Should do batch file existence checks, see comment below
 			if ( $ns == NS_MEDIA ) {
 				wfProfileIn( __METHOD__."-media" );
 				# Give extensions a chance to select the file revision for us
@@ -2032,7 +1984,7 @@ class Parser {
 			# Some titles, such as valid special pages or files in foreign repos, should
 			# be shown as bluelinks even though they're not included in the page table
 			#
-			# FIXME: isAlwaysKnown() can be expensive for file links; we should really do
+			# @todo FIXME: isAlwaysKnown() can be expensive for file links; we should really do
 			# batch file existence checks for NS_FILE and NS_MEDIA
 			if ( $iw == '' && $nt->isAlwaysKnown() ) {
 				$this->mOutput->addLink( $nt );
@@ -2047,18 +1999,6 @@ class Parser {
 		return $holders;
 	}
 
-	/**
-	 * Make a link placeholder. The text returned can be later resolved to a real link with
-	 * replaceLinkHolders(). This is done for two reasons: firstly to avoid further
-	 * parsing of interwiki links, and secondly to allow all existence checks and
-	 * article length checks (for stub links) to be bundled into a single query.
-	 *
-	 * @deprecated
-	 */
-	function makeLinkHolder( &$nt, $text = '', $query = array(), $trail = '', $prefix = '' ) {
-		return $this->mLinkHolders->makeHolder( $nt, $text, $query, $trail, $prefix );
-	}
-
 	/**
 	 * Render a forced-blue link inline; protect against double expansion of
 	 * URLs if we're in a mode that prepends full URL prefixes to internal links.
@@ -2127,6 +2067,8 @@ class Parser {
 	/**#@+
 	 * Used by doBlockLevels()
 	 * @private
+	 *
+	 * @return string
 	 */
 	function closeParagraph() {
 		$result = '';
@@ -2162,6 +2104,8 @@ class Parser {
 	 * These next three functions open, continue, and close the list
 	 * element appropriate to the prefix character passed into them.
 	 * @private
+	 *
+	 * @return string
 	 */
 	function openList( $char ) {
 		$result = $this->closeParagraph();
@@ -2186,6 +2130,8 @@ class Parser {
 	 * TODO: document
 	 * @param $char String
 	 * @private
+	 *
+	 * @return string
 	 */
 	function nextItem( $char ) {
 		if ( '*' === $char || '#' === $char ) {
@@ -2210,6 +2156,8 @@ class Parser {
 	 * TODO: document
 	 * @param $char String
 	 * @private
+	 *
+	 * @return string
 	 */
 	function closeList( $char ) {
 		if ( '*' === $char ) {
@@ -2328,7 +2276,7 @@ class Parser {
 					$output .= $this->openList( $char );
 
 					if ( ';' === $char ) {
-						# FIXME: This is dupe of code above
+						# @todo FIXME: This is dupe of code above
 						if ( $this->findColonNoLinks( $t, $term, $t2 ) !== false ) {
 							$t = $t2;
 							$output .= $term . $this->nextItem( ':' );
@@ -2585,6 +2533,9 @@ class Parser {
 	 * Return value of a magic variable (like PAGENAME)
 	 *
 	 * @private
+	 *
+	 * @param $index integer
+	 * @param $frame PPFrame
 	 */
 	function getVariableValue( $index, $frame=false ) {
 		global $wgContLang, $wgSitename, $wgServer;
@@ -2933,6 +2884,8 @@ class Parser {
 	 * dependency requirements.
 	 *
 	 * @private
+	 *
+	 * @return PPNode
 	 */
 	function preprocessToDom( $text, $flags = 0 ) {
 		$dom = $this->getPreprocessor()->preprocessToObj( $text, $flags );
@@ -2941,6 +2894,8 @@ class Parser {
 
 	/**
 	 * Return a three-element array: leading whitespace, string contents, trailing whitespace
+	 *
+	 * @return array
 	 */
 	public static function splitWhitespace( $s ) {
 		$ltrimmed = ltrim( $s );
@@ -2971,6 +2926,8 @@ class Parser {
 	 *        Providing arguments this way may be useful for extensions wishing to perform variable replacement explicitly.
 	 * @param $argsOnly Boolean: only do argument (triple-brace) expansion, not double-brace expansion
 	 * @private
+	 *
+	 * @return string
 	 */
 	function replaceVariables( $text, $frame = false, $argsOnly = false ) {
 		# Is there any text? Also, Prevent too big inclusions!
@@ -2994,7 +2951,11 @@ class Parser {
 		return $text;
 	}
 
-	# Clean up argument array - refactored in 1.9 so parserfunctions can use it, too.
+	/**
+	 * Clean up argument array - refactored in 1.9 so parserfunctions can use it, too.
+	 *
+	 * @return array
+	 */
 	static function createAssocArgs( $args ) {
 		$assocArgs = array();
 		$index = 1;
@@ -3080,10 +3041,11 @@ class Parser {
 		$originalTitle = $part1;
 
 		# $args is a list of argument nodes, starting from index 0, not including $part1
-		# *** FIXME if piece['parts'] is null then the call to getLength() below won't work b/c this $args isn't an object
+		# @todo FIXME: If piece['parts'] is null then the call to getLength() below won't work b/c this $args isn't an object
 		$args = ( null == $piece['parts'] ) ? array() : $piece['parts'];
 		wfProfileOut( __METHOD__.'-setup' );
-
+		wfProfileIn( __METHOD__."-title-$originalTitle" );
+		
 		# SUBST
 		wfProfileIn( __METHOD__.'-modifiers' );
 		if ( !$found ) {
@@ -3301,6 +3263,7 @@ class Parser {
 		# Recover the source wikitext and return it
 		if ( !$found ) {
 			$text = $frame->virtualBracketedImplode( '{{', '|', '}}', $titleWithSpaces, $args );
+			wfProfileOut( __METHOD__."-title-$originalTitle" );
 			wfProfileOut( __METHOD__ );
 			return array( 'object' => $text );
 		}
@@ -3369,6 +3332,7 @@ class Parser {
 			$ret = array( 'text' => $text );
 		}
 
+		wfProfileOut( __METHOD__."-title-$originalTitle" );
 		wfProfileOut( __METHOD__ );
 		return $ret;
 	}
@@ -3376,6 +3340,8 @@ class Parser {
 	/**
 	 * Get the semi-parsed DOM representation of a template with a given title,
 	 * and its redirect destination title. Cached.
+	 *
+	 * @return array
 	 */
 	function getTemplateDom( $title ) {
 		$cacheTitle = $title;
@@ -3440,8 +3406,10 @@ class Parser {
 	/**
 	 * Static function to get a template
 	 * Can be overridden via ParserOptions::setTemplateCallback().
+	 *
+	 * @return array
 	 */
-	static function statelessFetchTemplate( $title, $parser=false ) {
+	static function statelessFetchTemplate( $title, $parser = false ) {
 		$text = $skip = false;
 		$finalTitle = $title;
 		$deps = array();
@@ -3543,8 +3511,6 @@ class Parser {
 		# Register the file as a dependency...
 		$this->mOutput->addImage( $title->getDBkey(), $time, $sha1 );
 		if ( $file && !$title->equals( $file->getTitle() ) ) {
-			# We fetched a rev from a different title; register it too...
-			$this->mOutput->addImage( $file->getTitle()->getDBkey(), $time, $sha1 );
 			# Update fetched file title 
 			$title = $file->getTitle();
 		}
@@ -3553,6 +3519,8 @@ class Parser {
 
 	/**
 	 * Transclude an interwiki link.
+	 *
+	 * @return string
 	 */
 	function interwikiTransclude( $title, $action ) {
 		global $wgEnableScaryTranscluding;
@@ -3569,6 +3537,10 @@ class Parser {
 		return $this->fetchScaryTemplateMaybeFromCache( $url );
 	}
 
+	/**
+	 * @param $url string
+	 * @return Mixed|String
+	 */
 	function fetchScaryTemplateMaybeFromCache( $url ) {
 		global $wgTranscludeCacheExpiry;
 		$dbr = wfGetDB( DB_SLAVE );
@@ -3593,10 +3565,14 @@ class Parser {
 		return $text;
 	}
 
-
 	/**
 	 * Triple brace replacement -- used for template arguments
 	 * @private
+	 *
+	 * @param $peice array
+	 * @param $frame PPFrame
+	 *
+	 * @return array
 	 */
 	function argSubstitution( $piece, $frame ) {
 		wfProfileIn( __METHOD__ );
@@ -3650,6 +3626,8 @@ class Parser {
 	 *     inner      Contents of extension element
 	 *     noClose    Original text did not have a close tag
 	 * @param $frame PPFrame
+	 *
+	 * @return string
 	 */
 	function extensionSubstitution( $params, $frame ) {
 		$name = $frame->expand( $params['name'] );
@@ -3792,7 +3770,7 @@ class Parser {
 		}
 		# (bug 8068) Allow control over whether robots index a page.
 		#
-		# FIXME (bug 14899): __INDEX__ always overrides __NOINDEX__ here!  This
+		# @todo FIXME: Bug 14899: __INDEX__ always overrides __NOINDEX__ here!  This
 		# is not desirable, the last one on the page should win.
 		if ( isset( $this->mDoubleUnderscores['noindex'] ) && $this->mTitle->canUseNoindex() ) {
 			$this->mOutput->setIndexPolicy( 'noindex' );
@@ -4048,7 +4026,7 @@ class Parser {
 			# HTML names must be case-insensitively unique (bug 10721).
 			# This does not apply to Unicode characters per
 			# http://dev.w3.org/html5/spec/infrastructure.html#case-sensitivity-and-string-comparison
-			# FIXME: We may be changing them depending on the current locale.
+			# @todo FIXME: We may be changing them depending on the current locale.
 			$arrayKey = strtolower( $safeHeadline );
 			if ( $legacyHeadline === false ) {
 				$legacyArrayKey = false;
@@ -4402,7 +4380,7 @@ class Parser {
 			return $text;
 		}
 
-		# FIXME: regex doesn't respect extension tags or nowiki
+		# @todo FIXME: Regex doesn't respect extension tags or nowiki
 		#  => Move this logic to braceSubstitution()
 		$substWord = MagicWord::get( 'subst' );
 		$substRegex = '/\{\{(?!(?:' . $substWord->getBaseRegex() . '))/x' . $substWord->getRegexCase();
@@ -4654,7 +4632,7 @@ class Parser {
 	}
 
 	/**
-	 * FIXME: update documentation. makeLinkObj() is deprecated.
+	 * @todo FIXME: Update documentation. makeLinkObj() is deprecated.
 	 * Replace <!--LINK--> link placeholders with actual links, in the buffer
 	 * Placeholders created in Skin::makeLinkObj()
 	 * Returns an array of link CSS classes, indexed by PDBK.
@@ -4904,7 +4882,7 @@ class Parser {
 						switch( $paramName ) {
 						case 'manualthumb':
 						case 'alt':
-							# @todo Fixme: possibly check validity here for
+							# @todo FIXME: Possibly check validity here for
 							# manualthumb? downstream behavior seems odd with
 							# missing manual thumbs.
 							$validated = true;
@@ -5057,7 +5035,6 @@ class Parser {
 	 * @param $text String
 	 * @param $frame PPFrame
 	 * @return String
-	 * @private
 	 */
 	function attributeStripCallback( &$text, $frame = false ) {
 		$text = $this->replaceVariables( $text, $frame );
@@ -5067,6 +5044,8 @@ class Parser {
 
 	/**
 	 * Accessor
+	 *
+	 * @return array
 	 */
 	function getTags() {
 		return array_merge( array_keys( $this->mTransparentTagHooks ), array_keys( $this->mTagHooks ) );
@@ -5081,7 +5060,7 @@ class Parser {
 	function replaceTransparentTags( $text ) {
 		$matches = array();
 		$elements = array_keys( $this->mTransparentTagHooks );
-		$text = $this->extractTagsAndParams( $elements, $text, $matches, $this->mUniqPrefix );
+		$text = self::extractTagsAndParams( $elements, $text, $matches, $this->mUniqPrefix );
 
 		foreach ( $matches as $marker => $data ) {
 			list( $element, $content, $params, $tag ) = $data;
@@ -5235,10 +5214,10 @@ class Parser {
 	 * This function returns $oldtext after the content of the section
 	 * specified by $section has been replaced with $text.
 	 *
-	 * @param $text String: former text of the article
+	 * @param $oldtext String: former text of the article
 	 * @param $section Numeric: section identifier
 	 * @param $text String: replacing text
-	 * #return String: modified text
+	 * @return String: modified text
 	 */
 	public function replaceSection( $oldtext, $section, $text ) {
 		return $this->extractSections( $oldtext, $section, "replace", $text );
@@ -5256,7 +5235,7 @@ class Parser {
 	/**
 	 * Get the revision object for $this->mRevisionId
 	 *
-	 * @return either a Revision object or null
+	 * @return Revision|null either a Revision object or null
 	 */
 	protected function getRevisionObject() {
 		if ( !is_null( $this->mRevisionObject ) ) {
@@ -5402,7 +5381,8 @@ class Parser {
 		$text = preg_replace( '/\[\[:?([^[|]+)\|([^[]+)\]\]/', '$2', $text );
 		$text = preg_replace( '/\[\[:?([^[]+)\|?\]\]/', '$1', $text );
 
-		# Strip external link markup (FIXME: Not Tolerant to blank link text
+		# Strip external link markup
+		# @todo FIXME: Not tolerant to blank link text
 		# I.E. [http://www.mediawiki.org] will render as [1] or something depending
 		# on how many empty links there are on the page - need to figure that out.
 		$text = preg_replace( '/\[(?:' . wfUrlProtocols() . ')([^ ]+?) ([^[]+)\]/', '$2', $text );
@@ -5417,6 +5397,8 @@ class Parser {
 
 	/**
 	 * strip/replaceVariables/unstrip for preprocessor regression testing
+	 *
+	 * @return string
 	 */
 	function testSrvus( $text, $title, ParserOptions $options, $outputType = self::OT_HTML ) {
 		if ( !$title instanceof Title ) {
@@ -5455,6 +5437,8 @@ class Parser {
 	 * This will call the callback function twice, with 'aaa' and 'bbb'. Those
 	 * two strings will be replaced with the value returned by the callback in
 	 * each case.
+	 *
+	 * @return string
 	 */
 	function markerSkipCallback( $s, $callback ) {
 		$i = 0;
@@ -5491,6 +5475,8 @@ class Parser {
 	 * array can later be loaded into another parser instance with
 	 * unserializeHalfParsedText(). The text can then be safely incorporated into
 	 * the return value of a parser hook.
+	 *
+	 * @return array
 	 */
 	function serializeHalfParsedText( $text ) {
 		wfProfileIn( __METHOD__ );
@@ -5539,7 +5525,9 @@ class Parser {
 	 * serializeHalfParsedText(), is compatible with the current version of the
 	 * parser.
 	 *
-	 * @param $data Array.
+	 * @param $data Array
+	 *
+	 * @return bool
 	 */
 	function isValidHalfParsedText( $data ) {
 		return isset( $data['version'] ) && $data['version'] == self::HALF_PARSED_VERSION;