add local testrunners for all supported PHP versions using docker.

2026-08-05 04:54:31 +02:00 · 2022-07-14 23:44:42 +02:00
5 changed files with 35 additions and 43 deletions
@@ -6,9 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [Unreleased]

-### Changed
- Updated HTML of the debug template [#599](https://github.com/smarty-php/smarty/pull/599)
-
 ## [4.1.1] - 2022-05-17

 ### Security
@@ -1,9 +1,9 @@
 {capture name='_smarty_debug' assign=debug_output}
-    <!DOCTYPE html>
-    <html lang="en">
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+    <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
    <head>
        <title>Smarty Debug Console</title>
-        <style>
+        <style type="text/css">
            {literal}
            body, h1, h2, h3, td, th, p {
                font-family: sans-serif;
@@ -31,7 +31,6 @@
                padding: 2px;
                border-top: 1px solid black;
            }
-
            h3 {
                text-align: left;
                font-weight: bold;
@@ -68,11 +67,11 @@
                color: green;
            }

-            tr:nth-child(odd) {
+            .odd {
                background-color: #eeeeee;
            }

-            tr:nth-child(even) {
+            .even {
                background-color: #fafafa;
            }

@@ -85,16 +84,13 @@
                color: black;
                font-weight: bold;
            }
-
            #blue h3 {
                color: blue;
            }
-
            #normal div {
                color: black;
                font-weight: normal;
            }
-
            #table_assigned_vars th {
                color: blue;
                font-weight: bold;
@@ -103,6 +99,7 @@
            #table_config_vars th {
                color: maroon;
            }
+
            {/literal}
        </style>
    </head>
@@ -115,11 +112,11 @@
        <h2>included templates &amp; config files (load time in seconds)</h2>
        <div>
            {foreach $template_data as $template}
-                <span style="color: brown;">{$template.name}</span>
-                <br>&nbsp;&nbsp;<span class="exectime">
+                <font color=brown>{$template.name}</font>
+                <br />&nbsp;&nbsp;<span class="exectime">
                (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"})
                 </span>
-                <br>
+                <br />
            {/foreach}
        </div>
    {/if}
@@ -128,22 +125,13 @@

    <table id="table_assigned_vars">
        {foreach $assigned_vars as $vars}
-            <tr>
-                <td>
-                    <h3 style="color: blue;">${$vars@key}</h3>
-                    {if isset($vars['nocache'])}<strong>Nocache</strong><br>{/if}
-                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
-                </td>
-                <td>
-                    <h3>Value</h3>
-                    {$vars['value']|debug_print_var:10:80 nofilter}
-                </td>
-                <td>
-                    {if isset($vars['attributes'])}
-                        <h3>Attributes</h3>
-                        {$vars['attributes']|debug_print_var nofilter}
-                    {/if}
+            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
+                <td><h3><font color=blue>${$vars@key}</font></h3>
+                    {if isset($vars['nocache'])}<b>Nocache</b><br />{/if}
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
                </td>
+                <td><h3>Value</h3>{$vars['value']|debug_print_var:10:80 nofilter}</td>
+                <td>{if isset($vars['attributes'])}<h3>Attributes</h3>{$vars['attributes']|debug_print_var nofilter} {/if}</td>
         {/foreach}
    </table>

@@ -151,14 +139,11 @@

    <table id="table_config_vars">
        {foreach $config_vars as $vars}
-            <tr>
-                <td>
-                    <h3 style="color: blue;">#{$vars@key}#</h3>
-                    {if isset($vars['scope'])}<strong>Origin:</strong> {$vars['scope']|debug_print_var nofilter}{/if}
-                </td>
-                <td>
-                    {$vars['value']|debug_print_var:10:80 nofilter}
+            <tr class="{if $vars@iteration % 2 eq 0}odd{else}even{/if}">
+                <td><h3><font color=blue>#{$vars@key}#</font></h3>
+                    {if isset($vars['scope'])}<b>Origin:</b> {$vars['scope']|debug_print_var nofilter}{/if}
                </td>
+                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
            </tr>
        {/foreach}

@@ -93,7 +93,7 @@ class Smarty_Internal_Compile_Private_Print_Expression extends Smarty_Internal_C
                }
                // autoescape html
                if ($compiler->template->smarty->escape_html) {
-                    $output = "htmlspecialchars((string) {$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
+                    $output = "htmlspecialchars({$output}, ENT_QUOTES, '" . addslashes(Smarty::$_CHARSET) . "')";
                }
                // loop over registered filters
                if (!empty($compiler->template->smarty->registered_filters[ Smarty::FILTER_VARIABLE ])) {
@@ -29,7 +29,12 @@ class Smarty_Internal_Runtime_WriteFile
    {
        $_error_reporting = error_reporting();
        error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        $old_umask = umask(0);
+        $_file_perms = property_exists($smarty, '_file_perms') ? $smarty->_file_perms : 0644;
+        $_dir_perms =
+            property_exists($smarty, '_dir_perms') ? (isset($smarty->_dir_perms) ? $smarty->_dir_perms : 0777) : 0771;
+        if ($_file_perms !== null) {
+            $old_umask = umask(0);
+        }
        $_dirpath = dirname($_filepath);
        // if subdirs, create dir structure
        if ($_dirpath !== '.') {
@@ -37,7 +42,7 @@ class Smarty_Internal_Runtime_WriteFile
            // loop if concurrency problem occurs
            // see https://bugs.php.net/bug.php?id=35326
            while (!is_dir($_dirpath)) {
-                if (@mkdir($_dirpath, 0771, true)) {
+                if (@mkdir($_dirpath, $_dir_perms, true)) {
                    break;
                }
                clearstatcache();
@@ -84,9 +89,11 @@ class Smarty_Internal_Runtime_WriteFile
            error_reporting($_error_reporting);
            throw new SmartyException("unable to write file {$_filepath}");
        }
-        // set file permissions
-        chmod($_filepath, 0644);
-        umask($old_umask);
+        if ($_file_perms !== null) {
+            // set file permissions
+            chmod($_filepath, $_file_perms);
+            umask($old_umask);
+        }
        error_reporting($_error_reporting);
        return true;
    }
@@ -422,6 +422,9 @@ abstract class Smarty_Internal_TemplateCompilerBase
        try {
            // save template object in compiler class
            $this->template = $template;
+            if (property_exists($this->template->smarty, 'plugin_search_order')) {
+                $this->plugin_search_order = $this->template->smarty->plugin_search_order;
+            }
            if ($this->smarty->debugging) {
                if (!isset($this->smarty->_debug)) {
                    $this->smarty->_debug = new Smarty_Internal_Debug();