- improvement impement workaround for HHVM PHP incompatibillity faceb…

…ook/hhvm#4797
smarty-php · Jul 26, 2015 · f9d9ca0 · f9d9ca0
1 parent bb3dfc6
commit f9d9ca0
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 13 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -1,4 +1,7 @@
  ===== 3.1.28-dev===== (xx.xx.2015)
+ 26.07.2015
+  - improvement impement workaround for HHVM PHP incompatibillity https://github.com/facebook/hhvm/issues/4797
+
  25.07.2015
   - bugfix parser did hang on text starting <?something https://github.com/smarty-php/smarty/issues/74
 

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
@@ -111,7 +111,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.28-dev/31';
+    const SMARTY_VERSION = '3.1.28-dev/32';
 
     /**
      * define variable scopes

diff --git a/libs/sysplugins/smarty_cacheresource.php b/libs/sysplugins/smarty_cacheresource.php
@@ -48,10 +48,11 @@ abstract public function populateTimestamp(Smarty_Template_Cached $cached);
      *
      * @param Smarty_Internal_Template $_template template object
      * @param Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update flag if called because cache update
      *
-     * @return boolean true or false if the cached content does not exist
+     * @return bool true or false if the cached content does not exist
      */
-    abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null);
+    abstract public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false);
 
     /**
      * Write the rendered template output to cache

diff --git a/libs/sysplugins/smarty_cacheresource_custom.php b/libs/sysplugins/smarty_cacheresource_custom.php
@@ -119,10 +119,11 @@ public function populateTimestamp(Smarty_Template_Cached $cached)
      *
      * @param  Smarty_Internal_Template $_template template object
      * @param  Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update flag if called because cache update
      *
      * @return boolean                 true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         if (!$cached) {
             $cached = $_template->cached;

diff --git a/libs/sysplugins/smarty_cacheresource_keyvaluestore.php b/libs/sysplugins/smarty_cacheresource_keyvaluestore.php
@@ -81,10 +81,11 @@ public function populateTimestamp(Smarty_Template_Cached $cached)
      *
      * @param  Smarty_Internal_Template $_template template object
      * @param  Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update flag if called because cache update
      *
      * @return boolean                 true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         if (!$cached) {
             $cached = $_template->cached;

diff --git a/libs/sysplugins/smarty_internal_cacheresource_file.php b/libs/sysplugins/smarty_internal_cacheresource_file.php
@@ -86,17 +86,21 @@ public function populateTimestamp(Smarty_Template_Cached $cached)
      *
      * @param Smarty_Internal_Template $_template template object
      * @param Smarty_Template_Cached   $cached    cached object
+     * @param bool                     $update flag if called because cache update
      *
      * @return boolean true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null)
+    public function process(Smarty_Internal_Template $_template, Smarty_Template_Cached $cached = null, $update = false)
     {
         /** @var Smarty_Internal_Template $_smarty_tpl
          * used in included file
          */
         $_smarty_tpl = $_template;
-
-        return @include $_template->cached->filepath;
+        if (strpos(phpversion(), 'hhvm') !== false) {
+            return Smarty_Internal_Extension_Hhvm::includeHhvm($_template, $_template->cached->filepath);
+        } else {
+            return @include $_template->cached->filepath;
+        }
     }
 
     /**

diff --git a/libs/sysplugins/smarty_internal_extension_hhvm.php b/libs/sysplugins/smarty_internal_extension_hhvm.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * Smarty Extension Hhvm
+ *
+ * include patch for modified compiled or cached templates
+ * HHVM does not check if file was modified when including same file multiple times
+ *
+ * @package    Smarty
+ * @subpackage PluginsInternal
+ * @author     Uwe Tews
+ */
+class Smarty_Internal_Extension_Hhvm
+{
+    /**
+     * @param \Smarty_Internal_Template $_template
+     * @param string                    $file file name
+     *
+     * @return mixed
+     */
+    static function includeHhvm(Smarty_Internal_Template $_template, $file)
+    {
+        $_smarty_tpl = $_template;
+        $tmp_file = $_template->smarty->getCompileDir() . 'hhvm' .
+            str_replace(array('.', ','), '_', uniqid(rand(), true)) . '.php';
+        file_put_contents($tmp_file, file_get_contents($file));
+        $result = @include $tmp_file;
+        @unlink($tmp_file);
+        return $result;
+    }
+}
diff --git a/libs/sysplugins/smarty_internal_template.php b/libs/sysplugins/smarty_internal_template.php
@@ -291,7 +291,7 @@ public function render($merge_tpl_vars = false, $no_output_filter = true, $displ
                     $this->properties['tpl_function'] = $this->parent->properties['tpl_function'];
                 }
                 if (!$this->cached->processed) {
-                    $this->cached->process($this);
+                    $this->cached->process($this, true);
                 }
                 $this->smarty->compile_check = $compile_check;
                 $content = $this->getRenderedTemplateCode();

diff --git a/libs/sysplugins/smarty_template_cached.php b/libs/sysplugins/smarty_template_cached.php
@@ -210,10 +210,11 @@ public function isCached(Smarty_Internal_Template $_template)
      * Process cached template
      *
      * @param Smarty_Internal_Template $_template template object
+     * @param bool                     $update flag if called because cache update
      */
-    public function process(Smarty_Internal_Template $_template)
+    public function process(Smarty_Internal_Template $_template, $update = false)
     {
-        if ($this->handler->process($_template, $this) === false) {
+        if ($this->handler->process($_template, $this, $update) === false) {
             $this->valid = false;
         }
         if ($this->valid) {

diff --git a/libs/sysplugins/smarty_template_compiled.php b/libs/sysplugins/smarty_template_compiled.php
@@ -176,7 +176,11 @@ public function process(Smarty_Internal_Template $_template)
                 if (function_exists('opcache_invalidate')) {
                     opcache_invalidate($_template->compiled->filepath);
                 }
-                include($_template->compiled->filepath);
+                if (strpos(phpversion(), 'hhvm') !== false) {
+                    Smarty_Internal_Extension_Hhvm::includeHhvm($_template, $_template->compiled->filepath);
+                } else {
+                    include($_template->compiled->filepath);
+                }
             }
             $_template->smarty->compile_check = $compileCheck;
         } else {
@@ -188,7 +192,11 @@ public function process(Smarty_Internal_Template $_template)
                 if (function_exists('opcache_invalidate')) {
                     opcache_invalidate($_template->compiled->filepath);
                 }
-                include($_template->compiled->filepath);
+                if (strpos(phpversion(), 'hhvm') !== false) {
+                    Smarty_Internal_Extension_Hhvm::includeHhvm($_template, $_template->compiled->filepath);
+                } else {
+                    include($_template->compiled->filepath);
+                }
                 $_template->smarty->compile_check = $compileCheck;
             }
         }