diff --git a/HTML_Template_IT-1.3.1/tests/AllTests.php b/HTML_Template_IT-1.3.1/tests/AllTests.php deleted file mode 100644 index 60c53eb..0000000 --- a/HTML_Template_IT-1.3.1/tests/AllTests.php +++ /dev/null @@ -1,36 +0,0 @@ -addTestSuite('ITTest'); - $suite->addTestSuite('ITXTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'HTML_Template_IT_AllTests::main') { - HTML_Template_IT_AllTests::main(); -} -?> diff --git a/HTML_Template_IT-1.3.1/tests/templates/globals.html b/HTML_Template_IT-1.3.1/tests/templates/globals.html deleted file mode 100644 index 7157f12..0000000 --- a/HTML_Template_IT-1.3.1/tests/templates/globals.html +++ /dev/null @@ -1,13 +0,0 @@ - -{glob}:{var1}# - - -{glob}:{var2}# - - -{glob}:{var3} - - |{glob}:{var4} - -# - diff --git a/HTML_Template_IT-1.3.1/HTML/Template/IT.php b/HTML_Template_IT-1.3.2/HTML/Template/IT.php similarity index 97% rename from HTML_Template_IT-1.3.1/HTML/Template/IT.php rename to HTML_Template_IT-1.3.2/HTML/Template/IT.php index 7f10d0c..9be7015 100755 --- a/HTML_Template_IT-1.3.1/HTML/Template/IT.php +++ b/HTML_Template_IT-1.3.2/HTML/Template/IT.php @@ -11,7 +11,7 @@ * with this package in the file LICENSE, and is available through * the world-wide-web at * http://www.opensource.org/licenses/bsd-license.php - * If you did not receive a copy of the new BSDlicense and are unable + * If you did not receive a copy of the new BSD license and are unable * to obtain it through the world-wide-web, please send a note to * pajoye@php.net so we can mail you a copy immediately. * @@ -48,7 +48,7 @@ define('IT_UNKNOWN_OPTION', -6); * one you can build. template::parse() [phplib template = Isotemplate] requests * you to name a source and a target where the current block gets parsed into. * Source and target can be block names or even handler names. This API gives you - * a maximum of fexibility but you always have to know what you do which is + * a maximum of flexibility but you always have to know what you do which is * quite unusual for php skripter like me. * * I noticed that I do not any control on which block gets parsed into which one. @@ -278,9 +278,9 @@ class HTML_Template_IT * should be preserved although they are empty (no placeholder replaced). * Think of a shopping basket. If it's empty you have to drop a message to * the user. If it's filled you have to show the contents of - * the shopping baseket. Now where do you place the message that the basket + * the shopping basket. Now where do you place the message that the basket * is empty? It's no good idea to place it in you applications as customers - * tend to like unecessary minor text changes. Having another template file + * tend to like unnecessary minor text changes. Having another template file * for an empty basket means that it's very likely that one fine day * the filled and empty basket templates have different layout. I decided * to introduce blocks that to not contain any placeholder but only @@ -288,7 +288,7 @@ class HTML_Template_IT * * Now if there is no replacement done in such a block the block will * be recognized as "empty" and by default ($removeEmptyBlocks = true) be - * stripped off. To avoid thisyou can now call touchBlock() to avoid this. + * stripped off. To avoid this you can now call touchBlock() to avoid this. * * The array $touchedBlocks stores a list of touched block which must not * be removed even if they are empty. @@ -299,14 +299,6 @@ class HTML_Template_IT */ var $touchedBlocks = array(); - /** - * List of blocks which should not be shown even if not "empty" - * @var array $_hiddenBlocks - * @see hideBlock(), $removeEmptyBlocks - * @access private - */ - var $_hiddenBlocks = array(); - /** * Variable cache. * @@ -394,7 +386,7 @@ class HTML_Template_IT ); /** - * Builds some complex regular expressions and optinally sets the + * Builds some complex regular expressions and optionally sets the * file root directory. * * Make sure that you call this constructor if you derive your template @@ -748,7 +740,7 @@ class HTML_Template_IT /** * Sets a variable value. * - * The function can be used eighter like setVariable( "varname", "value") + * The function can be used either like setVariable( "varname", "value") * or with one array $variables["varname"] = "value" * given setVariable($variables) quite like phplib templates set_var(). * @@ -869,7 +861,7 @@ class HTML_Template_IT /** * Sets the template. * - * You can eighter load a template file from disk with + * You can either load a template file from disk with * LoadTemplatefile() or set the template manually using this function. * * @param string $template template content @@ -1002,7 +994,7 @@ class HTML_Template_IT } // end func getGlobalvariables /** - * Recusively builds a list of all blocks within the template. + * Recursively builds a list of all blocks within the template. * * @param string $string string that gets scanned * @@ -1065,7 +1057,7 @@ class HTML_Template_IT */ function getFile($filename) { - if ($filename{0} == '/' && substr($this->fileRoot, -1) == '/') { + if ($filename[0] == '/' && substr($this->fileRoot, -1) == '/') { $filename = substr($filename, 1); } diff --git a/HTML_Template_IT-1.3.1/HTML/Template/ITX.php b/HTML_Template_IT-1.3.2/HTML/Template/ITX.php similarity index 95% rename from HTML_Template_IT-1.3.1/HTML/Template/ITX.php rename to HTML_Template_IT-1.3.2/HTML/Template/ITX.php index fbf2e67..f163f81 100755 --- a/HTML_Template_IT-1.3.1/HTML/Template/ITX.php +++ b/HTML_Template_IT-1.3.2/HTML/Template/ITX.php @@ -11,7 +11,7 @@ * with this package in the file LICENSE, and is available through * the world-wide-web at * http://www.opensource.org/licenses/bsd-license.php - * If you did not receive a copy of the new BSDlicense and are unable + * If you did not receive a copy of the new BSD license and are unable * to obtain it through the world-wide-web, please send a note to * pajoye@php.net so we can mail you a copy immediately. * @@ -36,7 +36,7 @@ require_once 'HTML/Template/IT_Error.php'; * * With this class you get the full power of the phplib template class. * You may have one file with blocks in it but you have as well one main file -* and multiple files one for each block. This is quite usefull when you have +* and multiple files one for each block. This is quite useful when you have * user configurable websites. Using blocks not in the main template allows * you to modify some parts of your layout easily. * @@ -173,7 +173,7 @@ class HTML_Template_ITX extends HTML_Template_IT * Replaces an existing block with new content. * * This function will replace a block of the template and all blocks - * contained in the replaced block and add a new block insted, means + * contained in the replaced block and add a new block instead, means * you can dynamically change your template. * * Note that changing the template structure violates one of the IT[X] @@ -311,7 +311,7 @@ class HTML_Template_ITX extends HTML_Template_IT } elseif (count($parents) > 1) { reset($parents); - while (list($k, $parent) = each($parents)) { + foreach ($parents as $k => $parent) { $msg .= "$parent, "; } $msg = substr($parent, -2); @@ -373,7 +373,7 @@ class HTML_Template_ITX extends HTML_Template_IT * * @return string Name of the (first) block that contains * the specified placeholder. - * If the placeholder was not found or an error occured + * If the placeholder was not found or an error occurred * an empty string is returned. * @throws IT_Error * @access public @@ -397,7 +397,7 @@ class HTML_Template_ITX extends HTML_Template_IT if (is_array($variables = $this->blockvariables[$block])) { // search the value in the list of blockvariables reset($variables); - while (list($k, $variable) = each($variables)) { + foreach ($variables as $k => $variable) { if ($k == $placeholder) { $found = $block; break; @@ -409,7 +409,7 @@ class HTML_Template_ITX extends HTML_Template_IT // search all blocks and return the name of the first block that // contains the placeholder reset($this->blockvariables); - while (list($blockname, $variables) = each($this->blockvariables)) { + foreach ($this->blockvariables as $blockname => $variables) { if (is_array($variables) && isset($variables[$placeholder])) { $found = $blockname; break; @@ -430,7 +430,7 @@ class HTML_Template_ITX extends HTML_Template_IT function performCallback() { reset($this->functions); - while (list($func_id, $function) = each($this->functions)) { + foreach ($this->functions as $func_id => $function) { if (isset($this->callback[$function['name']])) { if ($this->callback[$function['name']]['expandParameters']) { $callFunction = 'call_user_func_array'; @@ -493,7 +493,7 @@ class HTML_Template_ITX extends HTML_Template_IT * * This is an absolutely evil feature. If your application makes heavy * use of such callbacks and you're even implementing if-then etc. on - * the level of a template engine you're reiventing the wheel... - that's + * the level of a template engine you're reinventing the wheel... - that's * actually how PHP came into life. Anyway, sometimes it's handy. * * Consider also using XML/XSLT or native PHP. And please do not push @@ -528,7 +528,7 @@ class HTML_Template_ITX extends HTML_Template_IT * @return boolean False on failure. * @throws IT_Error * @access public - * @deprecated The $callbackobject parameter is depricated since + * @deprecated The $callbackobject parameter is deprecated since * version 1.2 and might be dropped in further versions. */ function setCallbackFunction($tplfunction, $callbackfunction, @@ -536,7 +536,7 @@ class HTML_Template_ITX extends HTML_Template_IT $expandCallbackParameters = false) { if ($tplfunction == '' || $callbackfunction == '') { return new IT_Error("No template function "."('$tplfunction')". - " and/or no callback function ('$callback') given.", + " and/or no callback function ('$callbackfunction') given.", __FILE__, __LINE__); } $this->callback[$tplfunction] = array( @@ -567,7 +567,7 @@ class HTML_Template_ITX extends HTML_Template_IT } // end func setCallbackFunctiontable /** - * Recursively removes all data assiciated with a block, including + * Recursively removes all data associated with a block, including * all inner blocks * * @param string $block block to be removed @@ -610,7 +610,7 @@ class HTML_Template_ITX extends HTML_Template_IT } // end func getBlocklist /** - * Checks wheter a block exists. + * Checks whether a block exists. * * @param string $blockname Blockname * @@ -647,7 +647,7 @@ class HTML_Template_ITX extends HTML_Template_IT } // end func getBlockvariables /** - * Checks wheter a block variable exists. + * Checks whether a block variable exists. * * @param string $block Blockname * @param string $variable Variablename @@ -696,7 +696,7 @@ class HTML_Template_ITX extends HTML_Template_IT while ($head != '' && $args2 = $this->getValue($head, ',')) { $arg2 = trim($args2); - $args[] = ('"' == $arg2{0} || "'" == $arg2{0}) ? + $args[] = ('"' == $arg2[0] || "'" == $arg2[0]) ? substr($arg2, 1, -1) : $arg2; if ($arg2 == $head) { @@ -712,7 +712,7 @@ class HTML_Template_ITX extends HTML_Template_IT } // end func buildFunctionlist /** - * Truncates the given code from the first occurence of + * Truncates the given code from the first occurrence of * $delimiter but ignores $delimiter enclosed by " or '. * * @param string $code The code which should be parsed @@ -782,7 +782,7 @@ class HTML_Template_ITX extends HTML_Template_IT } reset($this->blockvariables[$block]); - while (list($varname, $val) = each($this->blockvariables[$block])) { + foreach ($this->blockvariables[$block] as $varname => $val) { if (isset($variables[$varname])) { unset($this->blockvariables[$block][$varname]); } @@ -840,10 +840,10 @@ class HTML_Template_ITX extends HTML_Template_IT { $parents = array(); reset($this->blocklist); - while (list($blockname, $content) = each($this->blocklist)) { + foreach ($this->blocklist as $blockname => $content) { reset($this->blockvariables[$blockname]); - while (list($varname, $val) = each($this->blockvariables[$blockname])) { + foreach ($this->blockvariables[$blockname] as $varname => $val) { if ($variable == $varname) { $parents[] = $blockname; } @@ -858,8 +858,8 @@ class HTML_Template_ITX extends HTML_Template_IT * calls die() depending on the flags * * @param string $message Warning - * @param string $file File where the warning occured - * @param int $line Linenumber where the warning occured + * @param string $file File where the warning occurred + * @param int $line Linenumber where the warning occurred * * @see $warn, $printWarning, $haltOnWarning * @access private diff --git a/HTML_Template_IT-1.3.1/HTML/Template/IT_Error.php b/HTML_Template_IT-1.3.2/HTML/Template/IT_Error.php similarity index 90% rename from HTML_Template_IT-1.3.1/HTML/Template/IT_Error.php rename to HTML_Template_IT-1.3.2/HTML/Template/IT_Error.php index b5f4134..3cb8170 100644 --- a/HTML_Template_IT-1.3.1/HTML/Template/IT_Error.php +++ b/HTML_Template_IT-1.3.2/HTML/Template/IT_Error.php @@ -11,7 +11,7 @@ * with this package in the file LICENSE, and is available through * the world-wide-web at * http://www.opensource.org/licenses/bsd-license.php - * If you did not receive a copy of the new BSDlicense and are unable + * If you did not receive a copy of the new BSD license and are unable * to obtain it through the world-wide-web, please send a note to * pajoye@php.net so we can mail you a copy immediately. * @@ -53,8 +53,8 @@ class IT_Error extends PEAR_Error * Creates an cache error object. * * @param string $msg error message - * @param string $file file where the error occured - * @param string $line linenumber where the error occured + * @param string $file file where the error occurred + * @param string $line linenumber where the error occurred */ function __construct($msg, $file = __FILE__, $line = __LINE__) { diff --git a/HTML_Template_IT-1.3.1/LICENSE b/HTML_Template_IT-1.3.2/LICENSE similarity index 100% rename from HTML_Template_IT-1.3.1/LICENSE rename to HTML_Template_IT-1.3.2/LICENSE diff --git a/HTML_Template_IT-1.3.1/examples/sample_it.php b/HTML_Template_IT-1.3.2/examples/sample_it.php similarity index 100% rename from HTML_Template_IT-1.3.1/examples/sample_it.php rename to HTML_Template_IT-1.3.2/examples/sample_it.php diff --git a/HTML_Template_IT-1.3.1/examples/sample_itx_addblockfile.php b/HTML_Template_IT-1.3.2/examples/sample_itx_addblockfile.php similarity index 100% rename from HTML_Template_IT-1.3.1/examples/sample_itx_addblockfile.php rename to HTML_Template_IT-1.3.2/examples/sample_itx_addblockfile.php diff --git a/HTML_Template_IT-1.3.1/examples/templates/addblockfile_list.tpl.htm b/HTML_Template_IT-1.3.2/examples/templates/addblockfile_list.tpl.htm similarity index 100% rename from HTML_Template_IT-1.3.1/examples/templates/addblockfile_list.tpl.htm rename to HTML_Template_IT-1.3.2/examples/templates/addblockfile_list.tpl.htm diff --git a/HTML_Template_IT-1.3.1/examples/templates/addblockfile_main.tpl.htm b/HTML_Template_IT-1.3.2/examples/templates/addblockfile_main.tpl.htm similarity index 100% rename from HTML_Template_IT-1.3.1/examples/templates/addblockfile_main.tpl.htm rename to HTML_Template_IT-1.3.2/examples/templates/addblockfile_main.tpl.htm diff --git a/HTML_Template_IT-1.3.1/examples/templates/main.tpl.htm b/HTML_Template_IT-1.3.2/examples/templates/main.tpl.htm similarity index 100% rename from HTML_Template_IT-1.3.1/examples/templates/main.tpl.htm rename to HTML_Template_IT-1.3.2/examples/templates/main.tpl.htm diff --git a/HTML_Template_IT-1.3.1/tests/ITTest.php b/HTML_Template_IT-1.3.2/tests/ITTest.php similarity index 87% rename from HTML_Template_IT-1.3.1/tests/ITTest.php rename to HTML_Template_IT-1.3.2/tests/ITTest.php index 309e116..2e8616f 100644 --- a/HTML_Template_IT-1.3.1/tests/ITTest.php +++ b/HTML_Template_IT-1.3.2/tests/ITTest.php @@ -1,8 +1,15 @@ tpl = new HTML_Template_IT(dirname(__FILE__) . '/templates'); } - function tearDown() + protected function tear_down() { unset($this->tpl); } @@ -173,56 +180,6 @@ class ITTest extends PHPUnit_Framework_TestCase // Not available in stock class - /** - * - */ - /* - function testHideBlock() - { - if (!$this->_methodExists('hideBlock')) { - return; - } - $result = $this->tpl->loadTemplateFile('blockiteration.html', false, true); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading template file: '. $result->getMessage()); - } - $this->tpl->setVariable(array( - 'outer' => 'data', - 'inner' => 'stuff' - )); - // inner_block is not empty, but should be removed nonetheless - $this->tpl->hideBlock('inner_block'); - $this->assertEquals('data#', $this->_stripWhitespace($this->tpl->get())); - } - */ - /** - * - */ - /* - function testSetGlobalVariable() - { - if (!$this->_methodExists('setGlobalVariable')) { - return; - } - $result = $this->tpl->loadTemplateFile('globals.html', false, true); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading template file: '. $result->getMessage()); - } - $this->tpl->setGlobalVariable('glob', 'glob'); - // {var2} is not, block_two should be removed - $this->tpl->setVariable(array( - 'var1' => 'one', - 'var3' => 'three' - )); - for ($i = 0; $i < 3; $i++) { - $this->tpl->setVariable('var4', $i + 1); - $this->tpl->parse('block_four'); - } // for - $this->assertEquals('glob:one#glob:three|glob:1|glob:2|glob:3#', $this->_stripWhitespace($this->tpl->get())); - } - */ - - /** * Test for bug #9501. preg_replace treat $ and \ as * backreferences. IT escapes them. diff --git a/HTML_Template_IT-1.3.1/tests/ITXTest.php b/HTML_Template_IT-1.3.2/tests/ITXTest.php similarity index 99% rename from HTML_Template_IT-1.3.1/tests/ITXTest.php rename to HTML_Template_IT-1.3.2/tests/ITXTest.php index 9f3709b..f5a728c 100644 --- a/HTML_Template_IT-1.3.1/tests/ITXTest.php +++ b/HTML_Template_IT-1.3.2/tests/ITXTest.php @@ -1,6 +1,5 @@ tpl = new HTML_Template_ITX(dirname(__FILE__) . '/templates'); } diff --git a/HTML_Template_IT-1.3.1/tests/templates/__include.html b/HTML_Template_IT-1.3.2/tests/templates/__include.html similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/__include.html rename to HTML_Template_IT-1.3.2/tests/templates/__include.html diff --git a/HTML_Template_IT-1.3.1/tests/templates/addblock.html b/HTML_Template_IT-1.3.2/tests/templates/addblock.html similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/addblock.html rename to HTML_Template_IT-1.3.2/tests/templates/addblock.html diff --git a/HTML_Template_IT-1.3.1/tests/templates/blockiteration.html b/HTML_Template_IT-1.3.2/tests/templates/blockiteration.html similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/blockiteration.html rename to HTML_Template_IT-1.3.2/tests/templates/blockiteration.html diff --git a/HTML_Template_IT-1.3.1/tests/templates/blocks.html b/HTML_Template_IT-1.3.2/tests/templates/blocks.html similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/blocks.html rename to HTML_Template_IT-1.3.2/tests/templates/blocks.html diff --git a/HTML_Template_IT-1.3.1/tests/templates/bug_9853_01.tpl b/HTML_Template_IT-1.3.2/tests/templates/bug_9853_01.tpl similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/bug_9853_01.tpl rename to HTML_Template_IT-1.3.2/tests/templates/bug_9853_01.tpl diff --git a/HTML_Template_IT-1.3.1/tests/templates/bug_9853_02.tpl b/HTML_Template_IT-1.3.2/tests/templates/bug_9853_02.tpl similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/bug_9853_02.tpl rename to HTML_Template_IT-1.3.2/tests/templates/bug_9853_02.tpl diff --git a/HTML_Template_IT-1.3.1/tests/templates/include.html b/HTML_Template_IT-1.3.2/tests/templates/include.html similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/include.html rename to HTML_Template_IT-1.3.2/tests/templates/include.html diff --git a/HTML_Template_IT-1.3.1/tests/templates/loadtemplatefile.html b/HTML_Template_IT-1.3.2/tests/templates/loadtemplatefile.html similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/loadtemplatefile.html rename to HTML_Template_IT-1.3.2/tests/templates/loadtemplatefile.html diff --git a/HTML_Template_IT-1.3.1/tests/templates/placeholderreplacementscope.html b/HTML_Template_IT-1.3.2/tests/templates/placeholderreplacementscope.html similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/placeholderreplacementscope.html rename to HTML_Template_IT-1.3.2/tests/templates/placeholderreplacementscope.html diff --git a/HTML_Template_IT-1.3.1/tests/templates/replaceblock.html b/HTML_Template_IT-1.3.2/tests/templates/replaceblock.html similarity index 100% rename from HTML_Template_IT-1.3.1/tests/templates/replaceblock.html rename to HTML_Template_IT-1.3.2/tests/templates/replaceblock.html diff --git a/package.sig b/package.sig index 4423c0c..e8e9dcd 100644 --- a/package.sig +++ b/package.sig @@ -1,6 +1,6 @@ -----BEGIN PGP SIGNATURE----- -iEYEABECAAYFAlpl7wAACgkQcqMhusJF8XUPAgCgkkhDLmcbWpQvpV5aXtWXmSME -1eAAoMuMxtygcY5OOoitupbXVn1sDGYF -=tmsd +iF0EABECAB0WIQQQ9oz3P4qkJvYXdSlyoyG6wkXxdQUCZ0NbqAAKCRByoyG6wkXx +dVaEAKDCvxZ1ZQmbPgqRjUAkC72ylQzpOwCeO5mQBEJ3+ziJdLnBvRv7trd0l68= +=9MLm -----END PGP SIGNATURE----- diff --git a/package.xml b/package.xml index fc384d0..79fce5c 100644 --- a/package.xml +++ b/package.xml @@ -1,5 +1,5 @@ - + HTML_Template_IT pear.php.net Integrated Templates @@ -36,19 +36,22 @@ There are two classes to use for templating. HTML_Template_IT is used for basic ulf.wendel@phpdoc.de no - 2018-01-22 - + 2024-11-24 + - 1.3.1 + 1.3.2 1.3.0 stable stable - Modified BSD license + BSD-3-Clause -- PR #2: Fixes for deprecated code +- PR # 5: Support for PHP 7.2 +- PR # 9: Remove unused code +- PR #11: fix: Array and string offset access syntax with curly braces is no longer supported +- PR #12: Remove PHP under 5.6 and add last versions of PHP 7 @@ -57,18 +60,16 @@ There are two classes to use for templating. HTML_Template_IT is used for basic - - - - - - + + + + + - @@ -325,10 +326,28 @@ Changes since last stable release (1.2.1): stable 2018-01-22 - Modified BSD license + BSD-3-Clause - PR #2: Fixes for deprecated code + + + 1.3.2 + 1.3.0 + + + stable + stable + + 2024-11-24 + BSD-3-Clause + +- PR #5: Support for PHP 7.2 +- PR #9: Remove unused code +- PR #11: fix: Array and string offset access syntax with curly braces is no longer supported +- PR #12: Remove PHP under 5.6 and add last versions of PHP 7 + +