smarty-php/smarty
1
0
Fork 0
mirror of https://github.com/smarty-php/smarty.git synced 2025-11-15 15:09:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,732 Commits 108 Branches 94 Tags
eae19f23b96081be09577ca5bb25aab1407661f2
Commit Graph

4732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AnrDaemon
eae19f23b9 PHP 5.3 compatibility fixes 2020-05-05 01:37:36 +03:00
Sławomir Kaleta
e1c050a32c Fix comment - Method can return string (#583) 2020-04-14 17:26:20 +02:00
Simon Wisselink
fd148f7ade Merge branch 'release/3.1.36' v3.1.36 2020-04-14 16:44:26 +02:00
Simon Wisselink
07772aac90 version bump 2020-04-14 16:44:24 +02:00
Simon Wisselink
08227651fc Fixed #584 2020-04-14 16:44:09 +02:00
Simon Wisselink
e0ea6899c8 fixed version of Smarty::SMARTY_VERSION and updates make-release script to do so automatically from now on 2020-04-14 16:40:44 +02:00
Simon Wisselink
97f700971f Merge branch 'release/3.1.35' v3.1.35 2020-04-14 00:02:48 +02:00
Simon Wisselink
a0abc47588 version bump 2020-04-14 00:02:39 +02:00
Simon Wisselink
728a584ad5 Moved changelog to a keepachangelog.com format and added a release script 2020-04-14 00:02:18 +02:00
Simon Wisselink
290f7cfc3d Moved the isset tests into the test suite 2020-04-13 23:44:39 +02:00
Simon Wisselink
48d24b7ad1 Fix repo layout for package maintainers (#571) 
* Do not ignore lexer subfolder for export as this contains source files and add smarty-lexer as a composer dev-dependency.
* Remove unit tests etc from archive export

Please note that the generated lexer / parser classes are not exactly equivalent, as they have been editing to conform to coding standards afterwards. I did a quick review and there don't seem to be any differences in semantics though.
 2020-04-13 22:32:23 +02:00
Simon Wisselink
19ef8342aa Strip now removes whitespaces after comment (#582) 
* Mark text sections as to be stripped, but do not strip them right away. Combine equivalent sections in chunks at the template level and strip combined chunks where possible.
- simplified Smarty_Internal_TemplateCompilerBase::processText along the way
Fixes #447
 2020-04-13 22:27:42 +02:00
Simon Wisselink
4f89f6d84f Throw SmartyException when setting caching attributes for cacheable plugin as compiling this would fail (#573) 
Fixes #457
 2020-04-13 22:26:24 +02:00
Simon Wisselink
4396351d75 Switched to a more advanced regex to test wheter parameter is a variable (#567) 
* This appears to fix #453, #498, #499 and possibly more issues.
 2020-04-13 22:24:29 +02:00
Simon Wisselink
17d4d43624 Feature/merge smarty-phpunit into tests subfolder (#580) 
* Removed unneeded files and replace dummy.txt with .gitignore files
* Synced unit tests with master codebase, noted TODO's, fixed phpunit scripts and travis config
* fix php7.4 deprecation and remove php7.4 from travis allow_failures since php7.4 is current stable

Co-authored-by: Uwe Tews <uwe.tews@googlemail.com>
Co-authored-by: Uwe Tews <uwe.tews@gmail.com>
Co-authored-by: AnrDaemon <anrdaemon@yandex.ru>
 2020-04-13 15:30:52 +02:00
Simon Wisselink
61e7412807 Merge pull request #570 from vadimkuragkovskiy/master 
fix minor typo
 2020-04-12 11:41:22 +02:00
Vadim Kuragkovskiy
38b5ac72fa fix minor typo 2020-02-07 18:56:25 +02:00
Simon Wisselink
4b29dfce11 Merge pull request #566 from smarty-php/bugfix/506_foreachelse_on_arrayiterators 
Bugfix/506 foreachelse on arrayiterators
 2020-01-27 16:08:35 +01:00
Simon Wisselink
e0df3d47e2 Ignore templates_c dir 2020-01-27 16:04:04 +01:00
Simon Wisselink
62d772e734 Fixed broken nesting and null handling. 2020-01-27 16:02:02 +01:00
Simon Wisselink
388993e9ca Fix foreachelse on arrayiterators 
Keep track of main loop using a do_else variable.
Fixed #506
 2020-01-27 15:24:45 +01:00
Simon Wisselink
97c27a0f2f Merge pull request #503 from SeahunOh/master 
fix typo
 2020-01-26 23:49:57 +01:00
Monte Ohrt
b2ecd98ae0 update changelog to reflect resent pull request merges 2020-01-13 18:56:03 -06:00
mohrt
4911f49b9c Merge pull request #535 from glensc/patch-1 
exclude error_reporting.ini from git export
 2020-01-13 18:51:34 -06:00
mohrt
a62a7caf97 Merge pull request #540 from Hunman/master 
Fixing problem with assigning value to object variables as arrays in smarty_internal_compile_assign
 2020-01-13 18:50:41 -06:00
mohrt
704fcef160 Merge pull request #542 from IT-Experte/master 
Fixed using wrong get and set methods from class memcached
 2020-01-13 18:48:56 -06:00
mohrt
d1f37449a9 Merge pull request #546 from matks/enhance-readme 
Add Travis badge and php compatibility infos in readme
 2020-01-13 18:46:14 -06:00
mohrt
9e9961feae Merge pull request #551 from bits4breakfast/master 
Replace callback typehint with callable
 2020-01-13 18:45:23 -06:00
mohrt
4fb3f616b2 Merge pull request #560 from JercSi/master 
Typo in exception message
 2020-01-13 18:44:07 -06:00
mohrt
e4239d095a Merge pull request #563 from caugner/patch-1 
Fixes the change log date of the 3.1.34 release
 2020-01-13 18:42:54 -06:00
Claas Augner
5547e0177b fix change log date 2020-01-13 18:51:37 +01:00
JercSi
b9b9d30144 Typo in exception message 
Added space between 'line' and line number.
 2019-12-20 09:49:32 +01:00
Monte Ohrt
0137c2e7e6 update change log version 2019-12-12 18:56:47 -06:00
Matteo Galli
c7ee6a3333 Replace callback typehint with callable 
`callback` is not a valid PHP type and makes static analysis tools failing
 2019-08-14 09:34:42 +02:00
Mathieu Ferment
651b129700 Add Travis badge and php compatibility infos in readme 2019-07-04 11:11:51 +02:00
Mathias
6d8d3b67d8 Changed read and write methods for compatibility with class memcached 
The methods of the memcached class have different parameters than the memcache class.
 2019-05-24 12:08:44 +02:00
Sanyi
7bc96d56fe Fix missing parenthesises in smarty_internal_compile_assign 2019-05-13 17:15:14 +02:00
Elan Ruusamäe
78924d8d68 exclude error_reporting.ini from git export 2019-03-02 18:11:04 +02:00
uwetews
c9f0de05f4 Fix PHPunit tests for PHP7 https://github.com/smarty-php/smarty/pull/532 v3.1.34 2019-02-28 07:42:20 +01:00
uwetews
f93f95787f Fix PHPunit tests for PHP7 https://github.com/smarty-php/smarty/pull/532 2019-02-28 05:59:23 +01:00
uwetews
70fc2fd276 Travis fix 2018-12-09 05:06:53 +01:00
uwetews
3ddd960337 Travis fix 2018-12-09 04:42:05 +01:00
uwetews
20bb96c1b0 Revert "Travis fix" 
This reverts commit eca7ec7f48.
 2018-12-09 04:28:51 +01:00
uwetews
22cb50fcda Revert "Travis fix" 
This reverts commit 2db8437354.
 2018-12-09 04:28:28 +01:00
uwetews
f0d1b52094 Revert "Travis fix" 
This reverts commit 4dbaa25cee.
 2018-12-09 04:27:56 +01:00
uwetews
4dbaa25cee Travis fix 2018-12-09 04:23:02 +01:00
uwetews
2db8437354 Travis fix 2018-12-09 04:17:23 +01:00
uwetews
eca7ec7f48 Travis fix 2018-12-09 04:05:30 +01:00
uwetews
d453d9e667 Merge pull request #515 from AnrDaemon/use-classmaps 
Use Composer classmap autoload instead of custom bootstrap.
 2018-11-28 07:01:04 +01:00
AnrDaemon
dc2484dd3c Merge branch 'master' into use-classmaps 2018-11-26 21:21:43 +03:00