Changelog

Merge branch 'master' of github.com:JonisoftGermany/smarty into JonisoftGermany-master
Do not use obsolete smarty properties '_dir_perms', '_file_perms', 'plugin_search_order' in our own code. (#772 )
2026-08-10 07:21:31 +02:00 · 2022-07-17 00:54:20 +02:00 · 2022-07-17 00:53:25 +02:00 · 2022-07-17 00:13:57 +02:00 · 2020-06-19 21:20:46 +02:00
10 changed files with 43 additions and 256 deletions
@@ -6,6 +6,9 @@ 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 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">
+    <!DOCTYPE html>
+    <html lang="en">
    <head>
        <title>Smarty Debug Console</title>
-        <style type="text/css">
+        <style>
            {literal}
            body, h1, h2, h3, td, th, p {
                font-family: sans-serif;
@@ -31,6 +31,7 @@
                padding: 2px;
                border-top: 1px solid black;
            }
+
            h3 {
                text-align: left;
                font-weight: bold;
@@ -67,11 +68,11 @@
                color: green;
            }

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

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

@@ -84,13 +85,16 @@
                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;
@@ -99,7 +103,6 @@
            #table_config_vars th {
                color: maroon;
            }
-
            {/literal}
        </style>
    </head>
@@ -112,11 +115,11 @@
        <h2>included templates &amp; config files (load time in seconds)</h2>
        <div>
            {foreach $template_data as $template}
-                <font color=brown>{$template.name}</font>
-                <br />&nbsp;&nbsp;<span class="exectime">
+                <span style="color: brown;">{$template.name}</span>
+                <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}
@@ -125,13 +128,22 @@

    <table id="table_assigned_vars">
        {foreach $assigned_vars as $vars}
-            <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}
+            <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}
                </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>

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

    <table id="table_config_vars">
        {foreach $config_vars as $vars}
-            <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}
+            <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}
                </td>
-                <td>{$vars['value']|debug_print_var:10:80 nofilter}</td>
            </tr>
        {/foreach}

@@ -1,25 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty explode modifier plugin
- * Type:     modifier
- * Name:     explode
- * Purpose:  split a string by a string
- *
- * @param string   $separator
- * @param string   $string
- * @param int|null $limit
- *
- * @return array
- */
-function smarty_modifier_explode($separator, $string, ?int $limit = null)
-{
-    // provide $string default to prevent deprecation errors in PHP >=8.1
-    return explode($separator, $string ?? '', $limit ?? PHP_INT_MAX);
-}
@@ -1,26 +0,0 @@
-<?php
-/**
- * Smarty plugin
- *
- * @package    Smarty
- * @subpackage PluginsModifier
- */
-
-/**
- * Smarty number_format modifier plugin
- * Type:     modifier
- * Name:     number_format
- * Purpose:  Format a number with grouped thousands
- *
- * @param float|null  $num
- * @param int         $decimals
- * @param string|null $decimal_separator
- * @param string|null $thousands_separator
- *
- * @return string
- */
-function smarty_modifier_number_format(?float $num, int $decimals = 0, ?string $decimal_separator = ".", ?string $thousands_separator = ",")
-{
-    // provide $num default to prevent deprecation errors in PHP >=8.1
-    return number_format($num ?? 0.0, $decimals, $decimal_separator, $thousands_separator);
-}
@@ -44,7 +44,7 @@ if (!function_exists('smarty_mb_str_replace')) {
                }
            }
        } else {
-            $parts = mb_split(preg_quote($search), $subject ?? "") ?: array();
+            $parts = mb_split(preg_quote($search), $subject) ?: array();
            $count = count($parts) - 1;
            $subject = implode($replace, $parts);
        }
@@ -29,12 +29,7 @@ class Smarty_Internal_Runtime_WriteFile
    {
        $_error_reporting = error_reporting();
        error_reporting($_error_reporting & ~E_NOTICE & ~E_WARNING);
-        $_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);
-        }
+        $old_umask = umask(0);
        $_dirpath = dirname($_filepath);
        // if subdirs, create dir structure
        if ($_dirpath !== '.') {
@@ -42,7 +37,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, $_dir_perms, true)) {
+                if (@mkdir($_dirpath, 0771, true)) {
                    break;
                }
                clearstatcache();
@@ -89,11 +84,9 @@ class Smarty_Internal_Runtime_WriteFile
            error_reporting($_error_reporting);
            throw new SmartyException("unable to write file {$_filepath}");
        }
-        if ($_file_perms !== null) {
-            // set file permissions
-            chmod($_filepath, $_file_perms);
-            umask($old_umask);
-        }
+        // set file permissions
+        chmod($_filepath, 0644);
+        umask($old_umask);
        error_reporting($_error_reporting);
        return true;
    }
@@ -422,9 +422,6 @@ 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();
@@ -1,56 +0,0 @@
-<?php
-
-namespace UnitTests\TemplateSource\TagTests\PluginModifier;
-
-/**
- * class for modifier tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class PluginModifierExplodeTest extends \PHPUnit_Smarty
-{
-    public function setUp(): void
-    {
-        $this->setUpSmarty(__DIR__);
-    }
-
-    /**
-     * @return void
-     * @throws \SmartyException
-     *
-     * @dataProvider explodeDataProvider
-     */
-    public function testExplode($template, $subject, $expectedString)
-    {
-        $this->smarty->setDebugging(true);
-        $this->smarty->assign('subject', $subject);
-
-        $tpl = $this->smarty->createTemplate($template);
-        $res = $this->smarty->fetch($tpl);
-
-        $this->assertEquals($expectedString, $res);
-    }
-
-    public function explodeDataProvider()
-    {
-        return [
-            'default'  => [
-                'template'      => 'string:{","|explode:$subject|json_encode}',
-                'subject'       => 'a,b,c,d',
-                'expectedString' => '["a","b","c","d"]',
-            ],
-            'withNoDelimiterFound'  => [
-                'template'      => 'string:{","|explode:$subject|json_encode}',
-                'subject'       => 'abcd',
-                'expectedString' => '["abcd"]',
-            ],
-            'withNull' => [
-                'template'      => 'string:{","|explode:$subject|json_encode}',
-                'subject'       => null,
-                'expectedString' => '[""]',
-            ],
-        ];
-    }
-}
@@ -1,60 +0,0 @@
-<?php
-
-namespace UnitTests\TemplateSource\TagTests\PluginModifier;
-
-/**
- * class for modifier tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class PluginModifierNumberFormatTest extends \PHPUnit_Smarty
-{
-    public function setUp(): void
-    {
-        $this->setUpSmarty(__DIR__);
-    }
-
-    /**
-     * @return void
-     * @throws \SmartyException
-     *
-     * @dataProvider numberFormatDataProvider
-     */
-    public function testNumberFormat($template, $subject, $expectedString)
-    {
-        $this->smarty->setDebugging(true);
-        $this->smarty->assign('subject', $subject);
-
-        $tpl = $this->smarty->createTemplate($template);
-
-        $this->assertEquals($expectedString, $this->smarty->fetch($tpl));
-    }
-
-    public function numberFormatDataProvider()
-    {
-        return [
-            'default'  => [
-                'template'      => 'string:{$subject|number_format}',
-                'subject'       => 12345,
-                'expectedString' => "12,345",
-            ],
-            'withDecimalDefault'  => [
-                'template'      => 'string:{$subject|number_format}',
-                'subject'       => 12345.6789,
-                'expectedString' => "12,346",
-            ],
-            'withDecimalAndExtras'  => [
-                'template'      => 'string:{$subject|number_format:2:\'-\':\'~\'}',
-                'subject'       => 12345.6789,
-                'expectedString' => "12~345-68",
-            ],
-            'withNull' => [
-                'template'      => 'string:{$subject|number_format}',
-                'subject'       => null,
-                'expectedString' => 0,
-            ],
-        ];
-    }
-}
@@ -1,54 +0,0 @@
-<?php
-
-namespace UnitTests\TemplateSource\TagTests\PluginModifier;
-
-/**
- * class for modifier tests
- *
- * @runTestsInSeparateProcess
- * @preserveGlobalState disabled
- * @backupStaticAttributes enabled
- */
-class PluginModifierReplaceTest extends \PHPUnit_Smarty
-{
-    public function setUp(): void
-    {
-        $this->setUpSmarty(__DIR__);
-    }
-
-    /**
-     * @return void
-     * @throws \SmartyException
-     *
-     * @dataProvider replaceDataProvider
-     */
-    public function testReplace($template, $subject, $expectedString)
-    {
-        $this->smarty->assign('subject', $subject);
-
-        $tpl = $this->smarty->createTemplate($template);
-
-        $this->assertEquals($expectedString, $this->smarty->fetch($tpl));
-    }
-
-    public function replaceDataProvider()
-    {
-        return [
-            'default'  => [
-                'template'      => 'string:{$subject|replace:",":"-"}',
-                'subject'       => "a,b,c,d",
-                'expectedString' => "a-b-c-d",
-            ],
-            'doNothing'  => [
-                'template'      => 'string:{$subject|replace:"":""}',
-                'subject'       => "a,b,c,d",
-                'expectedString' => "a,b,c,d",
-            ],
-            'withNull' => [
-                'template'      => 'string:{$subject|replace:"":""}',
-                'subject'       => null,
-                'expectedString' => "",
-            ],
-        ];
-    }
-}
Author	SHA1	Message	Date
Simon Wisselink	cb95216671	Changelog	2022-07-17 00:54:20 +02:00
Simon Wisselink	d6ac3297df	Merge branch 'master' of github.com:JonisoftGermany/smarty into JonisoftGermany-master	2022-07-17 00:53:25 +02:00
Simon WisselinkandGitHub	560475a2f2	Do not use obsolete smarty properties '_dir_perms', '_file_perms', 'plugin_search_order' in our own code. (#772 )	2022-07-17 00:13:57 +02:00
Stoll, Jonathan	dff1955cd5	Update to HTML5-syntax in debug template * Replace deprecated tags * Use CSS3 selectors * Update html-frame * Remove deprecated syntax * Harmonize syntax in general	2020-06-19 21:20:46 +02:00