X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FTemplateParser.php;h=3de70fa2a21b34c197a9d0a7e03a04bb18b5cd64;hb=59ebff658ce912c1b0e7ef8d8f9bfec5a4e17b39;hp=0dbf2c73ea74e26aed1b71cb6a1c66fcb9733f4e;hpb=dbbb71b47a8afaed0331a947d4c2e66a512ed36f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index 0dbf2c73ea..d6b101b26d 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -49,9 +49,9 @@ class TemplateParser {
 	 * Constructs the location of the the source Mustache template
 	 * @param string $templateName The name of the template
 	 * @return string
-	 * @throws Exception Disallows upwards directory traversal via $templateName
+	 * @throws UnexpectedValueException Disallows upwards directory traversal via $templateName
 	 */
-	public function getTemplateFilename( $templateName ) {
+	protected function getTemplateFilename( $templateName ) {
 		// Prevent upwards directory traversal using same methods as Title::secureAndSplit
 		if (
 			strpos( $templateName, '.' ) !== false &&
@@ -65,7 +65,7 @@ class TemplateParser {
 				substr( $templateName, -3 ) === '/..'
 			)
 		) {
-			throw new Exception( "Malformed \$templateName: $templateName" );
+			throw new UnexpectedValueException( "Malformed \$templateName: $templateName" );
 		}
 
 		return "{$this->templateDir}/{$templateName}.mustache";
@@ -74,19 +74,19 @@ class TemplateParser {
 	/**
 	 * Returns a given template function if found, otherwise throws an exception.
 	 * @param string $templateName The name of the template (without file suffix)
-	 * @return Function
-	 * @throws Exception
+	 * @return callable
+	 * @throws RuntimeException
 	 */
-	public function getTemplate( $templateName ) {
+	protected function getTemplate( $templateName ) {
 		// If a renderer has already been defined for this template, reuse it
-		if ( isset( $this->renderers[$templateName] ) ) {
+		if ( isset( $this->renderers[$templateName] ) && is_callable( $this->renderers[$templateName] ) ) {
 			return $this->renderers[$templateName];
 		}
 
 		$filename = $this->getTemplateFilename( $templateName );
 
 		if ( !file_exists( $filename ) ) {
-			throw new Exception( "Could not locate template: {$filename}" );
+			throw new RuntimeException( "Could not locate template: {$filename}" );
 		}
 
 		// Read the template file
@@ -103,22 +103,15 @@ class TemplateParser {
 			// See if the compiled PHP code is stored in cache.
 			// CACHE_ACCEL throws an exception if no suitable object cache is present, so fall
 			// back to CACHE_ANYTHING.
-			try {
-				$cache = wfGetCache( CACHE_ACCEL );
-			} catch ( Exception $e ) {
-				$cache = wfGetCache( CACHE_ANYTHING );
-			}
+			$cache = ObjectCache::newAccelerator( CACHE_ANYTHING );
 			$key = wfMemcKey( 'template', $templateName, $fastHash );
 			$code = $this->forceRecompile ? null : $cache->get( $key );
 
 			if ( !$code ) {
 				$code = $this->compileForEval( $fileContents, $filename );
 
-				// Prefix the code with a keyed hash (64 hex chars) as an integrity check
-				$code = hash_hmac( 'sha256', $code, $secretKey ) . $code;
-
-				// Cache the compiled PHP code
-				$cache->set( $key, $code );
+				// Prefix the cached code with a keyed hash (64 hex chars) as an integrity check
+				$cache->set( $key, hash_hmac( 'sha256', $code, $secretKey ) . $code );
 			} else {
 				// Verify the integrity of the cached PHP code
 				$keyedHash = substr( $code, 0, 64 );
@@ -134,7 +127,11 @@ class TemplateParser {
 		}
 
 		$renderer = eval( $code );
-		return $this->renderers[$templateName] = $renderer;
+		if ( !is_callable( $renderer ) ) {
+			throw new RuntimeException( "Requested template, {$templateName}, is not callable" );
+		}
+		$this->renderers[$templateName] = $renderer;
+		return $renderer;
 	}
 
 	/**
@@ -143,14 +140,14 @@ class TemplateParser {
 	 * @param string $fileContents Mustache code
 	 * @param string $filename Name of the template
 	 * @return string PHP code (without '<?php')
-	 * @throws Exception
+	 * @throws RuntimeException
 	 */
-	public function compileForEval( $fileContents, $filename ) {
+	protected function compileForEval( $fileContents, $filename ) {
 		// Compile the template into PHP code
-		$code = self::compile( $fileContents );
+		$code = $this->compile( $fileContents );
 
 		if ( !$code ) {
-			throw new Exception( "Could not compile template: {$filename}" );
+			throw new RuntimeException( "Could not compile template: {$filename}" );
 		}
 
 		// Strip the "<?php" added by lightncandy so that it can be eval()ed
@@ -165,18 +162,20 @@ class TemplateParser {
 	 * Compile the Mustache code into PHP code using LightnCandy
 	 * @param string $code Mustache code
 	 * @return string PHP code (with '<?php')
-	 * @throws Exception
+	 * @throws RuntimeException
 	 */
-	public static function compile( $code ) {
+	protected function compile( $code ) {
 		if ( !class_exists( 'LightnCandy' ) ) {
-			throw new Exception( 'LightnCandy class not defined' );
+			throw new RuntimeException( 'LightnCandy class not defined' );
 		}
 		return LightnCandy::compile(
 			$code,
 			array(
 				// Do not add more flags here without discussion.
 				// If you do add more flags, be sure to update unit tests as well.
-				'flags' => LightnCandy::FLAG_ERROR_EXCEPTION
+				'flags' => LightnCandy::FLAG_ERROR_EXCEPTION,
+				'basedir' => $this->templateDir,
+				'fileext' => '.mustache',
 			)
 		);
 	}