- optimization replace internal Smarty::$ds property by DIRECTORY_SEP…

…ARATOR (reverted from commit f7a5316) (reverted from commit beaa293) (reverted from commit 86f3619)
iyifei · Oct 26, 2017 · 4cbc436 · 4cbc436
1 parent eaac933
commit 4cbc436
Show file tree

Hide file tree

Showing 12 changed files with 277 additions and 274 deletions.
diff --git a/change_log.txt b/change_log.txt
@@ -1,8 +1,4 @@
 ===== 3.1.32 - dev ===
-22.10.2017  3.1.32-dev-28
-  - bugfix Smarty version was  not filled in header comment of compiled and cached  files
-  - optimization replace internal Smarty::$ds property by DIRECTORY_SEPARATOR
-
 21.10.2017
   - bugfix custom delimiters could fail since modification of  version 3.1.32-dev-23
     https://github.com/smarty-php/smarty/issues/394

diff --git a/libs/Smarty.class.php b/libs/Smarty.class.php
@@ -100,7 +100,7 @@ class Smarty extends Smarty_Internal_TemplateBase
     /**
      * smarty version
      */
-    const SMARTY_VERSION = '3.1.32-dev-28';
+    const SMARTY_VERSION = '3.1.32-dev-27';
     /**
      * define variable scopes
      */
@@ -544,6 +544,12 @@ class Smarty extends Smarty_Internal_TemplateBase
      * @var Smarty_Internal_Debug
      */
     public $_debug = null;
+    /**
+     * Directory separator
+     *
+     * @var string
+     */
+    public $ds = DIRECTORY_SEPARATOR;
     /**
      * template directory
      *
@@ -936,7 +942,7 @@ public function getPluginsDir()
                 $this->plugins_dir = (array)$this->plugins_dir;
             }
             foreach ($this->plugins_dir as $k => $v) {
-                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, "/\\") . DIRECTORY_SEPARATOR, true);
+                $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, "/\\") . $this->ds, true);
             }
             $this->_cache[ 'plugin_files' ] = array();
             $this->_pluginsDirNormalized = true;
@@ -1127,9 +1133,9 @@ public function _getTemplateId($template_name,
      */
     public function _realpath($path, $realpath = null)
     {
-        $nds = DIRECTORY_SEPARATOR === '/' ? '\\' : '/';
-        // normalize DIRECTORY_SEPARATOR
-        $path = str_replace($nds, DIRECTORY_SEPARATOR, $path);
+        $nds = $this->ds == '/' ? '\\' : '/';
+        // normalize $this->ds
+        $path = str_replace($nds, $this->ds, $path);
         preg_match('%^(?<root>(?:[[:alpha:]]:[\\\\]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?<path>(.*))$%u',
                    $path,
                    $parts);
@@ -1138,13 +1144,13 @@ public function _realpath($path, $realpath = null)
             $parts[ 'root' ] = substr(getcwd(), 0, 2) . $parts[ 'root' ];
         } else {
             if ($realpath !== null && !$parts[ 'root' ]) {
-                $path = getcwd() . DIRECTORY_SEPARATOR . $path;
+                $path = getcwd() . $this->ds . $path;
             }
         }
         // remove noop 'DIRECTORY_SEPARATOR DIRECTORY_SEPARATOR' and 'DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR' patterns
-        $path = preg_replace('#([\\\\/]([.]?[\\\\/])+)#u', DIRECTORY_SEPARATOR, $path);
+        $path = preg_replace('#([\\\\/]([.]?[\\\\/])+)#u', $this->ds, $path);
         // resolve '..DIRECTORY_SEPARATOR' pattern, smallest first
-        if (strpos($path, '..' . DIRECTORY_SEPARATOR) != false &&
+        if (strpos($path, '..' . $this->ds) != false &&
             preg_match_all('#(([.]?[\\\\/])*([.][.])[\\\\/]([.]?[\\\\/])*)+#u', $path, $match)
         ) {
             $counts = array();
@@ -1155,7 +1161,7 @@ public function _realpath($path, $realpath = null)
             foreach ($counts as $count) {
                 $path = preg_replace('#(([\\\\/]([.]?[\\\\/])*[^\\\\/.]+){' . $count .
                                      '}[\\\\/]([.]?[\\\\/])*([.][.][\\\\/]([.]?[\\\\/])*){' . $count . '})(?=[^.])#u',
-                                     DIRECTORY_SEPARATOR,
+                                     $this->ds,
                                      $path);
             }
         }
@@ -1401,7 +1407,7 @@ public function __set($name, $value)
      */
     private function _normalizeDir($dirName, $dir)
     {
-        $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . DIRECTORY_SEPARATOR, true);
+        $this->{$dirName} = $this->_realpath(rtrim($dir, "/\\") . $this->ds, true);
         if (!isset(Smarty::$_muted_directories[ $this->{$dirName} ])) {
             Smarty::$_muted_directories[ $this->{$dirName} ] = null;
         }
@@ -1427,7 +1433,7 @@ private function _normalizeTemplateConfig($isConfig)
         }
         foreach ($dir as $k => $v) {
             if (!isset($processed[ $k ])) {
-                $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . DIRECTORY_SEPARATOR, true);
+                $dir[ $k ] = $v = $this->_realpath(rtrim($v, "/\\") . $this->ds, true);
                 $processed[ $k ] = true;
             }
         }

diff --git a/libs/sysplugins/smarty_internal_cacheresource_file.php b/libs/sysplugins/smarty_internal_cacheresource_file.php
@@ -29,25 +29,23 @@ public function populate(Smarty_Template_Cached $cached, Smarty_Internal_Templat
     {
         $source = &$_template->source;
         $smarty = &$_template->smarty;
-        $_compile_dir_sep = $smarty->use_sub_dirs ? DIRECTORY_SEPARATOR : '^';
+        $_compile_dir_sep = $smarty->use_sub_dirs ? $smarty->ds : '^';
         $_filepath = sha1($source->uid . $smarty->_joined_template_dir);
         $cached->filepath = $smarty->getCacheDir();
         if (isset($_template->cache_id)) {
             $cached->filepath .= preg_replace(array('![^\w|]+!',
-                                                    '![|]+!'),
-                                              array('_',
-                                                    $_compile_dir_sep),
+                                                    '![|]+!'), array('_',
+                                                                     $_compile_dir_sep),
                                               $_template->cache_id) . $_compile_dir_sep;
         }
         if (isset($_template->compile_id)) {
             $cached->filepath .= preg_replace('![^\w]+!', '_', $_template->compile_id) . $_compile_dir_sep;
         }
         // if use_sub_dirs, break file into directories
         if ($smarty->use_sub_dirs) {
-            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . DIRECTORY_SEPARATOR . $_filepath[ 2 ] .
-                                 $_filepath[ 3 ] .
-                                 DIRECTORY_SEPARATOR .
-                                 $_filepath[ 4 ] . $_filepath[ 5 ] . DIRECTORY_SEPARATOR;
+            $cached->filepath .= $_filepath[ 0 ] . $_filepath[ 1 ] . $smarty->ds . $_filepath[ 2 ] . $_filepath[ 3 ] .
+                                 $smarty->ds .
+                                 $_filepath[ 4 ] . $_filepath[ 5 ] . $smarty->ds;
         }
         $cached->filepath .= $_filepath;
         $basename = $source->handler->getBasename($source);
@@ -88,8 +86,7 @@ public function populateTimestamp(Smarty_Template_Cached $cached)
      *
      * @return boolean true or false if the cached content does not exist
      */
-    public function process(Smarty_Internal_Template $_smarty_tpl,
-                            Smarty_Template_Cached $cached = null,
+    public function process(Smarty_Internal_Template $_smarty_tpl, Smarty_Template_Cached $cached = null,
                             $update = false)
     {
         $_smarty_tpl->cached->valid = false;
@@ -111,15 +108,14 @@ public function process(Smarty_Internal_Template $_smarty_tpl,
      */
     public function writeCachedContent(Smarty_Internal_Template $_template, $content)
     {
-        if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath,
-                                                           $content,
+        if ($_template->smarty->ext->_writeFile->writeFile($_template->cached->filepath, $content,
                                                            $_template->smarty) === true
         ) {
             if (function_exists('opcache_invalidate') &&
                 (!function_exists('ini_get') || strlen(ini_get("opcache.restrict_api"))) < 1
             ) {
                 opcache_invalidate($_template->cached->filepath, true);
-            } else if (function_exists('apc_compile_file')) {
+            } elseif (function_exists('apc_compile_file')) {
                 apc_compile_file($_template->cached->filepath);
             }
             $cached = $_template->cached;

diff --git a/libs/sysplugins/smarty_internal_compile_include_php.php b/libs/sysplugins/smarty_internal_compile_include_php.php
@@ -57,6 +57,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         }
         // check and get attributes
         $_attr = $this->getAttributes($compiler, $args);
+
         /** @var Smarty_Internal_Template $_smarty_tpl
          * used in evaluated code
          */
@@ -73,8 +74,8 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
                 $_dir = $compiler->smarty->trusted_dir;
             }
             if (!empty($_dir)) {
-                foreach ((array)$_dir as $_script_dir) {
-                    $_path = $compiler->smarty->_realpath($_script_dir . DIRECTORY_SEPARATOR . $_file, true);
+                foreach ((array) $_dir as $_script_dir) {
+                    $_path = $compiler->smarty->_realpath($_script_dir . $compiler->smarty->ds . $_file, true);
                     if (file_exists($_path)) {
                         $_filepath = $_path;
                         break;
@@ -85,9 +86,11 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         if ($_filepath == false) {
             $compiler->trigger_template_error("{include_php} file '{$_file}' is not readable", null, true);
         }
+
         if (isset($compiler->smarty->security_policy)) {
             $compiler->smarty->security_policy->isTrustedPHPDir($_filepath);
         }
+
         if (isset($_attr[ 'assign' ])) {
             // output will be stored in a smarty variable instead of being displayed
             $_assign = $_attr[ 'assign' ];
@@ -98,6 +101,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
                 $_once = '';
             }
         }
+
         if (isset($_assign)) {
             return "<?php ob_start();\ninclude{$_once} ('{$_filepath}');\n\$_smarty_tpl->assign({$_assign},ob_get_clean());\n?>";
         } else {

diff --git a/libs/sysplugins/smarty_internal_compile_insert.php b/libs/sysplugins/smarty_internal_compile_insert.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Smarty Internal Plugin Compile Insert
  * Compiles the {insert} tag
@@ -55,6 +56,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         $_attr = $this->getAttributes($compiler, $args);
         //Does tag create output
         $compiler->has_output = isset($_attr[ 'assign' ]) ? false : true;
+
         $nocacheParam = $compiler->template->caching && ($compiler->tag_nocache || $compiler->nocache);
         if (!$nocacheParam) {
             // do not compile as nocache code
@@ -64,6 +66,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
         $_smarty_tpl = $compiler->template;
         $_name = null;
         $_script = null;
+
         $_output = '<?php ';
         // save possible attributes
         eval('$_name = @' . $_attr[ 'name' ] . ';');
@@ -93,8 +96,8 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
                     $_dir = $compiler->smarty instanceof SmartyBC ? $compiler->smarty->trusted_dir : null;
                 }
                 if (!empty($_dir)) {
-                    foreach ((array)$_dir as $_script_dir) {
-                        $_script_dir = rtrim($_script_dir, '/\\') . DIRECTORY_SEPARATOR;
+                    foreach ((array) $_dir as $_script_dir) {
+                        $_script_dir = rtrim($_script_dir, '/\\') . $compiler->smarty->ds;
                         if (file_exists($_script_dir . $_script)) {
                             $_filepath = $_script_dir . $_script;
                             break;
@@ -110,8 +113,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
             require_once $_filepath;
             if (!is_callable($_function)) {
                 $compiler->trigger_template_error(" {insert} function '{$_function}' is not callable in script file '{$_script}'",
-                                                  null,
-                                                  true);
+                                                  null, true);
             }
         } else {
             $_filepath = 'null';
@@ -120,8 +122,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
             if (!is_callable($_function)) {
                 // try plugin
                 if (!$_function = $compiler->getPlugin($_name, 'insert')) {
-                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'",
-                                                      null,
+                    $compiler->trigger_template_error("{insert} no function or plugin found for '{$_name}'", null,
                                                       true);
                 }
             }
@@ -148,6 +149,7 @@ public function compile($args, Smarty_Internal_TemplateCompilerBase $compiler)
                 $_output .= "echo {$_function}({$_params},\$_smarty_tpl);?>";
             }
         }
+
         return $_output;
     }
 }
diff --git a/libs/sysplugins/smarty_internal_method_compilealltemplates.php b/libs/sysplugins/smarty_internal_method_compilealltemplates.php
@@ -31,10 +31,7 @@ class Smarty_Internal_Method_CompileAllTemplates
      *
      * @return integer number of template files recompiled
      */
-    public function compileAllTemplates(Smarty $smarty,
-                                        $extension = '.tpl',
-                                        $force_compile = false,
-                                        $time_limit = 0,
+    public function compileAllTemplates(Smarty $smarty, $extension = '.tpl', $force_compile = false, $time_limit = 0,
                                         $max_errors = null)
     {
         return $this->compileAll($smarty, $extension, $force_compile, $time_limit, $max_errors);
@@ -52,11 +49,7 @@ public function compileAllTemplates(Smarty $smarty,
      *
      * @return int number of template files compiled
      */
-    protected function compileAll(Smarty $smarty,
-                                  $extension,
-                                  $force_compile,
-                                  $time_limit,
-                                  $max_errors,
+    protected function compileAll(Smarty $smarty, $extension, $force_compile, $time_limit, $max_errors,
                                   $isConfig = false)
     {
         // switch off time limit
@@ -76,11 +69,11 @@ protected function compileAll(Smarty $smarty,
                 if (substr(basename($_fileinfo->getPathname()), 0, 1) == '.' || strpos($_file, '.svn') !== false) {
                     continue;
                 }
-                if (!substr_compare($_file, $extension, -strlen($extension)) == 0) {
+                if (!substr_compare($_file, $extension, - strlen($extension)) == 0) {
                     continue;
                 }
-                if ($_fileinfo->getPath() !== substr($_dir, 0, -1)) {
-                    $_file = substr($_fileinfo->getPath(), strlen($_dir)) . DIRECTORY_SEPARATOR . $_file;
+                if ($_fileinfo->getPath() !== substr($_dir, 0, - 1)) {
+                    $_file = substr($_fileinfo->getPath(), strlen($_dir)) . $smarty->ds . $_file;
                 }
                 echo "\n<br>", $_dir, '---', $_file;
                 flush();
@@ -99,7 +92,7 @@ protected function compileAll(Smarty $smarty,
                         $isConfig ? Smarty_Template_Config::load($_tpl) : Smarty_Template_Source::load($_tpl);
                     if ($_tpl->mustCompile()) {
                         $_tpl->compileTemplateSource();
-                        $_count++;
+                        $_count ++;
                         echo ' compiled in  ', microtime(true) - $_start_time, ' seconds';
                         flush();
                     } else {
@@ -109,7 +102,7 @@ protected function compileAll(Smarty $smarty,
                 }
                 catch (Exception $e) {
                     echo "\n<br>        ------>Error: ", $e->getMessage(), "<br><br>\n";
-                    $_error_count++;
+                    $_error_count ++;
                 }
                 // free memory
                 unset($_tpl);