resourceloader: Don't cache minification of user.tokens

[lhc/web/wiklou.git] / includes / TemplateParser.php

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index 0131fe6..3de70fa 100644 (file)
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -51,7 +51,7 @@ class TemplateParser {
         * @return string
         * @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 &&
@@ -77,7 +77,7 @@ class TemplateParser {
         * @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] ) && is_callable( $this->renderers[$templateName] ) ) {
                        return $this->renderers[$templateName];
@@ -103,11 +103,7 @@ 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( array(), CACHE_ANYTHING );
                        $key = wfMemcKey( 'template', $templateName, $fastHash );
                        $code = $this->forceRecompile ? null : $cache->get( $key );
 
@@ -145,9 +141,9 @@ class TemplateParser {
         * @return string PHP code (without '<?php')
         * @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 RuntimeException( "Could not compile template: {$filename}" );
@@ -167,7 +163,7 @@ class TemplateParser {
         * @return string PHP code (with '<?php')
         * @throws RuntimeException
         */
-       public static function compile( $code ) {
+       protected function compile( $code ) {
                if ( !class_exists( 'LightnCandy' ) ) {
                        throw new RuntimeException( 'LightnCandy class not defined' );
                }