Update for 3.1.32-dev-23

tests/CleanUp.php

@@ -3,29 +3,29 @@
 * This file is part of the Smarty PHPUnit tests.
 *
 */
-foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__), FilesystemIterator::SKIP_DOTS),
-                                       RecursiveIteratorIterator::CHILD_FIRST) as $path) {
+foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(dirname(__FILE__), FilesystemIterator::SKIP_DOTS)) as $path)
+{
     $p = $path->getPathname();
-    if ((strpos($p, '\coverage') !== false) ||
-        ((strpos($p, '\templates_c') === false) && (strpos($p, '\cache\\') === false) &&
-            (strpos($p, '\templates_tmp') === false))
-    ) {
-        continue;
-    }
-    $p = $path->getPathname();
-    $i = 1;
-    //$path->isDir() && !$path->isLink() ? rmdir($path->getPathname()) : unlink($path->getPathname());
-    if ($path->isDir() && !$path->isLink()) {
-        if (strpos($p, '\templates_tmp') !== false) {
-            rmdir($path->getPathname());
+    if ((strpos($p, '\templates_c') !== false) || (strpos($p, '\cache') !== false) ||
+        (strpos($p, '\templates_tmp') !== false)) {
+        $path2 = $path;
+       $pp = $path->getPath();
+        foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path->getPath(). '\\', FilesystemIterator::SKIP_DOTS),
+                                               RecursiveIteratorIterator::CHILD_FIRST) as $path2) {
+            $p2 = $path2->getPathname();
+            if ((strpos($p2, '\templates_c\\') !== false) || (strpos($p2, '\cache\\') !== false) ||
+                (strpos($p2, '\templates_tmp\\') !== false)) {
+                if ($path2->isDir() && !$path2->isLink()) {
+                    rmdir($p2);
                 } else {
-            touch($path->getPathname() . '/dummy.txt');
+                    unlink($p2);
                 }
-    } else {
-        unlink($path->getPathname());
-        if (strpos($p, '\templates_tmp') === false) {
-            touch($path->getPath() . '/dummy.txt');
             }
         }
+        $name = $pp. '\dummy.txt';
+
+        file_put_contents($name,'dummy');
+    }
 }
 
+

tests/UnitTests/A_1/ProtectedFolderVars/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_1/ProtectedFolderVars/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_2/UndefinedTemplateVar/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_2/UndefinedTemplateVar/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/AutoEscape/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/AutoEscape/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/Filter/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/Filter/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/GetterSetter/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/GetterSetter/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/LoadPlugin/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/LoadPlugin/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/MuteExpectedErrors/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/MuteExpectedErrors/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/PluginTests/Shared/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/PluginTests/Shared/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/PluginTests/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/PluginTests/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/SmartyBC/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/A_Core/SmartyBC/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheModify/ModifiedSince/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheModify/ModifiedSince/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheResourceTests/File/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheResourceTests/File/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheResourceTests/Memcache/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheResourceTests/Mysql/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheResourceTests/Mysql/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheResourceTests/Registered/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheResourceTests/_shared/PHPunitplugins/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/CacheResourceTests/_shared/templates/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/Compiler/CompilerPlugin/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/Compiler/CompilerPlugin/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/Compiler/Delimiter/AutoLiteralTest.php

@@ -18,6 +18,7 @@ class AutoliteralTest extends PHPUnit_Smarty
     public function setUp()
     {
         $this->setUpSmarty(dirname(__FILE__));
+        $this->smarty->addPluginsDir("../../__shared/PHPunitplugins/");
     }
 
     public function testInit()
@@ -32,31 +33,27 @@ class AutoliteralTest extends PHPUnit_Smarty
     {
         $this->smarty->setAutoLiteral(true);
         $this->smarty->assign('i','foo');
-        $this->assertEquals('{ $i}foo', $this->smarty->fetch('eval:{ $i}{$i}'));
+        $this->assertEquals('{ $i}foo', $this->smarty->fetch('autoliteral.tpl'));
     }
 
     public function testSetAutoliteral2()
     {
         $this->smarty->setAutoLiteral(false);
+        $this->smarty->setCompileId(1);
         $this->smarty->assign('i','foo');
-        $this->assertEquals('foofoo', $this->smarty->fetch('eval:{ $i}{$i}'));
+        $this->assertEquals('foofoo', $this->smarty->fetch('autoliteral.tpl'));
     }
-    public function testSetAutoliteral3()
-    {
-        $this->smarty->setAutoLiteral(false);
-        $this->smarty->assign('i','foo');
-        $this->assertEquals('{{$i}foo', $this->smarty->fetch('eval:{{$i}{$i}'));
-    }
-    public function testSetAutoliteral4()
-    {
-        $this->smarty->setAutoLiteral(false);
-        $this->smarty->assign('i','foo');
-        $this->assertEquals('{{ $i}foo', $this->smarty->fetch('eval:{{ $i}{$i}'));
-    }
-    public function testSetAutoliteral5()
+
+    public function testSetAutoliteralBlock()
     {
         $this->smarty->setAutoLiteral(true);
-        $this->smarty->assign('i','foo');
-        $this->assertEquals('{ {{$i}foo', $this->smarty->fetch('eval:{ {{$i}{$i}'));
+        $this->assertEquals('{ dummyblock}foo{ /dummyblock}', $this->smarty->fetch('autoliteralblock.tpl'));
     }
+    public function testSetAutoliteralBlock1()
+    {
+        $this->smarty->setAutoLiteral(false);
+        $this->smarty->setCompileId(1);
+        $this->assertEquals('foo', $this->smarty->fetch('autoliteralblock.tpl'));
+    }
+
 }

tests/UnitTests/Compiler/Delimiter/DelimiterTest.php

@@ -35,6 +35,16 @@ class DelimiterTest extends PHPUnit_Smarty
         $tpl = $this->smarty->createTemplate('eval:<{* comment *}><{if true}><{"hello world"}><{/if}>');
         $this->assertEquals("hello world", $this->smarty->fetch($tpl));
     }
+    /**
+     * test <{ }> delimiter
+     */
+    public function testDelimiter10()
+    {
+        $this->smarty->left_delimiter = '<';
+        $this->smarty->right_delimiter = '>';
+        $tpl = $this->smarty->createTemplate('eval:<* comment *><if 1 < 2><"hello world"></if>');
+        $this->assertEquals("hello world", $this->smarty->fetch($tpl));
+    }
 
     /**
      * test <-{ }-> delimiter

tests/UnitTests/Compiler/Delimiter/UserLiteralTest.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Smarty PHPunit tests of delimiter
+ *
+ * @package PHPunit
+ * @author  Uwe Tews
+ */
+
+/**
+ * class for delimiter tests
+ *
+ * @runTestsInSeparateProcess
+ * @preserveGlobalState disabled
+ * @backupStaticAttributes enabled
+ */
+class UserliteralTest extends PHPUnit_Smarty
+{
+    public function setUp()
+    {
+        if (!property_exists('Smarty', 'literals')) {
+            $this->markTestSkipped('user literal support');
+        } else {
+            $this->setUpSmarty(dirname(__FILE__));
+        }
+    }
+
+    public function testInit()
+    {
+        $this->cleanDirs();
+    }
+
+    public function testUserLiteral()
+    {
+        $this->smarty->setAutoLiteral(true);
+        $this->assertEquals('{{ 1 }}', $this->smarty->fetch('userliteral.tpl'));
+    }
+    public function testUserLiteral1()
+    {
+        $this->smarty->setAutoLiteral(false);
+        $this->smarty->setCompileId(1);
+        $this->assertEquals('1', $this->smarty->fetch('userliteral.tpl'));
+    }
+    public function testUserLiteral2()
+    {
+        $this->smarty->setAutoLiteral(false);
+        $this->smarty->setLiterals(array('{{','}}'));
+        $this->assertEquals('{{1}}', $this->smarty->fetch('userliteral1.tpl'));
+    }
+    public function testUserLiteral3()
+    {
+        $this->smarty->setAutoLiteral(false);
+        $this->smarty->setLeftDelimiter('<-');
+        $this->smarty->setRightDelimiter('->');
+        $this->smarty->setLiterals(array('<--','-->'));
+        $this->assertEquals('1 <--1-->', $this->smarty->fetch('userliteral2.tpl'));
+    }
+    public function testUserLiteral4()
+    {
+        $this->smarty->setAutoLiteral(true);
+        $this->smarty->setLeftDelimiter('<-');
+        $this->smarty->setRightDelimiter('->');
+        $this->smarty->setCompileId(1);
+        $this->smarty->setLiterals(array('<--','-->'));
+        $this->assertEquals('<- 1 -> <--1-->', $this->smarty->fetch('userliteral2.tpl'));
+    }
+}

tests/UnitTests/Compiler/Delimiter/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/Compiler/Delimiter/templates/autoliteral.tpl

@@ -0,0 +1 @@
+{ $i}{$i}

tests/UnitTests/Compiler/Delimiter/templates/autoliteralblock.tpl

@@ -0,0 +1 @@
+{ dummyblock}foo{ /dummyblock}

tests/UnitTests/Compiler/Delimiter/templates/userliteral.tpl

@@ -0,0 +1 @@
+{{ 1 }}

tests/UnitTests/Compiler/Delimiter/templates/userliteral1.tpl

@@ -0,0 +1 @@
+{{1}}

tests/UnitTests/Compiler/Delimiter/templates/userliteral2.tpl

@@ -0,0 +1 @@
+<- 1 -> <--1-->

tests/UnitTests/Compiler/Delimiter/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ConfigFileTests/defaultHandler/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ConfigFileTests/file/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Custom/Ambiguous/CustomResourceAmbiguousTest.php

@@ -97,7 +97,7 @@ class CustomResourceAmbiguousTest extends PHPUnit_Smarty
 
     /**
      *
-     * @runInSeparateProcess
+     * @run InSeparateProcess
      * @preserveGlobalState disabled
      *
      */

tests/UnitTests/ResourceTests/Custom/Ambiguous/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Custom/Ambiguous/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Custom/DemoPluginExtendsAll/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Custom/DemoPluginMysql/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/DefaultHandler/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/DefaultHandler/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Eval/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Eval/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Extends/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Extends/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/File/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/File/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/FileIncludePath/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/FileIncludePath/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/FileIndexed/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/FileIndexed/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Php/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Php/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Registered/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Registered/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/ResourcePlugins/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/ResourcePlugins/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Stream/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/Stream/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/String/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/ResourceTests/String/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SecurityTests/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SecurityTests/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/Append/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/Append/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/AppendByRef/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/AppendByRef/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/Assign/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/Assign/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/AssignByRef/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/AssignByRef/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/AssignGlobal/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/AssignGlobal/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/ClearAllAssign/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/ClearAllAssign/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/ClearAssign/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/ClearAssign/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/ClearCompiledTemplate/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/GetTemplateVars/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/GetTemplateVars/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/RegisterBlock/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/RegisterBlock/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/RegisterCompiler/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/RegisterCompiler/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/RegisterFunction/cache/dummy.txt

@@ -0,0 +1 @@
+dummy

tests/UnitTests/SmartyMethodsTests/RegisterFunction/templates_c/dummy.txt

@@ -0,0 +1 @@
+dummy