Merge pull request #6036 from mallezie/16629

[civicrm-core.git] / CRM / Core / CodeGen / Util / Template.php

diff --git a/CRM/Core/CodeGen/Util/Template.php b/CRM/Core/CodeGen/Util/Template.php
index f9a509f584d83cfea1055a892bb5dba9db2e0f7e..2590301c347a96d78a74e78a7ed1914e18622dd8 100644 (file)
--- a/CRM/Core/CodeGen/Util/Template.php
+++ b/CRM/Core/CodeGen/Util/Template.php
@@ -9,24 +9,13 @@ class CRM_Core_CodeGen_Util_Template {
   protected $smarty;
   protected $beautifier;
 
-  // FIXME: Set by Main...
-  static public $smartyPluginDirs = array();
-
   /**
    * @param string $filetype
    */
-  function __construct($filetype) {
-    $this->compileDir = CRM_Core_CodeGen_Util_File::createTempDir('templates_c_');
-
+  public function __construct($filetype) {
     $this->filetype = $filetype;
 
-    // TODO use Core Smarty
-    require_once 'Smarty/Smarty.class.php';
-    $this->smarty = new Smarty();
-    $this->smarty->template_dir = './templates';
-    $this->smarty->plugins_dir = self::$smartyPluginDirs;
-    $this->smarty->compile_dir = $this->compileDir;
-    $this->smarty->clear_all_cache();
+    $this->smarty = CRM_Core_CodeGen_Util_Smarty::singleton()->getSmarty();
 
     $this->assign('generated', "DO NOT EDIT.  Generated by CRM_Core_CodeGen");
 
@@ -49,29 +38,29 @@ class CRM_Core_CodeGen_Util_Template {
     }
   }
 
-  function __destruct() {
-    CRM_Core_CodeGen_Util_File::removeDir($this->compileDir);
-  }
-
   /**
-   * @param array $inputs template filenames
-   * @param string $outpath full path to the desired output file
+   * @param array $inputs
+   *   Template filenames.
+   * @param string $outpath
+   *   Full path to the desired output file.
    */
-  function runConcat($inputs, $outpath) {
+  public function runConcat($inputs, $outpath) {
     if (file_exists($outpath)) {
       unlink($outpath);
     }
     foreach ($inputs as $infile) {
       // FIXME: does not beautify.  Document.
-      file_put_contents($outpath, $this->smarty->fetch($infile) ."\n", FILE_APPEND);
+      file_put_contents($outpath, $this->smarty->fetch($infile) . "\n", FILE_APPEND);
     }
   }
 
   /**
-   * @param string $infile filename of the template, without a path
-   * @param string $outpath full path to the desired output file
+   * @param string $infile
+   *   Filename of the template, without a path.
+   * @param string $outpath
+   *   Full path to the desired output file.
    */
-  function run($infile, $outpath) {
+  public function run($infile, $outpath) {
     $renderedContents = $this->smarty->fetch($infile);
 
     if ($this->filetype === 'php') {
@@ -79,7 +68,8 @@ class CRM_Core_CodeGen_Util_Template {
       $this->beautifier->setOutputFile($outpath);
       $this->beautifier->process();
       $this->beautifier->save();
-    } else {
+    }
+    else {
       file_put_contents($outpath, $renderedContents);
     }
   }
@@ -88,16 +78,17 @@ class CRM_Core_CodeGen_Util_Template {
    * @param $key
    * @param $value
    */
-  function assign($key, $value) {
+  public function assign($key, $value) {
     $this->smarty->assign_by_ref($key, $value);
   }
 
   /**
-   * Clear the smarty cache and assign default values
+   * Clear the smarty cache and assign default values.
    * FIXME: unused cos we no longer do evil singleton magick
    */
   protected function reset() {
     $this->smarty->clear_all_assign();
     $this->smarty->clear_all_cache();
   }
+
 }