konrad/twig.git
13 years agoremoved 'joined by' support for the 'for' tag as a tag should not output something...
Fabien Potencier [Tue, 28 Dec 2010 18:28:29 +0000]
removed 'joined by' support for the 'for' tag as a tag should not output something directly

13 years agoadded a note about autoescaping and concatenation in the doc
Fabien Potencier [Thu, 30 Dec 2010 08:17:01 +0000]
added a note about autoescaping and concatenation in the doc

13 years agofixed scope for macros (macros can be imported in a block or outside of a block)
Fabien Potencier [Wed, 29 Dec 2010 09:17:06 +0000]
fixed scope for macros (macros can be imported in a block or outside of a block)

    {% import "macros" as foo %}
    {% from "macros" import foo, bar as bar %}

    {% block foo %}
        {% import "macros" as foofoo %}
        {% from "macros" import foo as foofoo, bar as barbar %}

        {{ foo('something') }}
        {{ bar('something') }}

        {{ foofoo('something') }}
        {{ barbar('something') }}
    {% endblock %}

13 years agofixed typo
Fabien Potencier [Tue, 28 Dec 2010 20:05:58 +0000]
fixed typo

13 years agofixed CS
Fabien Potencier [Tue, 28 Dec 2010 18:50:01 +0000]
fixed CS

13 years agoremoved Template::callFunction
Arnaud Le Blanc [Sun, 26 Dec 2010 11:47:49 +0000]
removed Template::callFunction

13 years agoupdated doc for functions
Arnaud Le Blanc [Sat, 25 Dec 2010 17:19:04 +0000]
updated doc for functions

13 years agoAdded sandbox support for functions
Arnaud Le Blanc [Sat, 25 Dec 2010 15:08:12 +0000]
Added sandbox support for functions

13 years agoAdded auto-escaper support for functions
Arnaud Le Blanc [Fri, 24 Dec 2010 16:21:26 +0000]
Added auto-escaper support for functions

Functions' output is escaped by default and functions can declare
themselves "safe" using the "is_safe" option.

13 years agoHandle functions like filters
Arnaud Le Blanc [Fri, 24 Dec 2010 16:21:10 +0000]
Handle functions like filters

Functions are not global variables anymore. They are resolved at
compile time, and Twig_Function objects are instanciated only when
compiling.

13 years agoResolve imported functions at compile time
Arnaud Le Blanc [Thu, 23 Dec 2010 21:10:18 +0000]
Resolve imported functions at compile time

{% from %} is compiled as {% import %}, the imported module is placed in
a local variable, and calls to imported functions are compiled as calls
to module functions.

13 years agoAdded nodes representing local variables
Arnaud Le Blanc [Thu, 23 Dec 2010 21:07:22 +0000]
Added nodes representing local variables

Allows to use local PHP variables as temporary variables in compiled
templates

13 years agorenamed Template::getParentBlock() and getBlock() to diplayParentBlock() and displayB...
Fabien Potencier [Thu, 30 Dec 2010 08:30:10 +0000]
renamed Template::getParentBlock() and getBlock() to diplayParentBlock() and displayBlock(), which is semantically more correct

13 years agoupdate Core Extension doc
nikic [Thu, 23 Dec 2010 10:26:09 +0000]
update Core Extension doc

13 years agofix Exception documentation, remove use of Twig_SyntaxError
nikic [Thu, 23 Dec 2010 10:14:45 +0000]
fix Exception documentation, remove use of Twig_SyntaxError

13 years agodisallow {% set %}{% endset %}
nikic [Wed, 22 Dec 2010 16:19:37 +0000]
disallow {% set %}{% endset %}

13 years agorename $parser to $stream in parseArguments
nikic [Wed, 22 Dec 2010 16:33:28 +0000]
rename $parser to $stream in parseArguments

13 years agoadded the possibility to look at more than just the very next token
Fabien Potencier [Wed, 22 Dec 2010 10:58:10 +0000]
added the possibility to look at more than just the very next token

13 years agoreadded TokenStream::look()
Fabien Potencier [Wed, 22 Dec 2010 10:49:01 +0000]
readded TokenStream::look()

13 years agoTokenStream changes:
nikic [Mon, 20 Dec 2010 15:41:30 +0000]
TokenStream changes:

 * remove unused look() and rewind()
 * do not shift tokens, but increase a pointer

13 years agoimprove lexer (causes changes in token stream, token and parser)
nikic [Mon, 20 Dec 2010 15:30:50 +0000]
improve lexer (causes changes in token stream, token and parser)

13 years agofixed typo
Fabien Potencier [Wed, 22 Dec 2010 10:33:29 +0000]
fixed typo

13 years agoremove $is_multitarget return in parseMultitargetExpression
nikic [Mon, 20 Dec 2010 17:39:16 +0000]
remove $is_multitarget return in parseMultitargetExpression

Furthermore slightly reordered code thus removing redundant expect()

13 years agoadded some unit tests for previous commit
Fabien Potencier [Mon, 20 Dec 2010 18:05:45 +0000]
added some unit tests for previous commit

13 years agoOne should only be able to assign to variables
nikic [Mon, 20 Dec 2010 17:36:34 +0000]
One should only be able to assign to variables

13 years agoremove unused $lineno variable
nikic [Mon, 20 Dec 2010 17:34:49 +0000]
remove unused $lineno variable

13 years agochange while(1) to while(true)
nikic [Mon, 20 Dec 2010 17:32:42 +0000]
change while(1) to while(true)

13 years agoremove "(,)" hint from syntax error messages (the expect function will do that already)
nikic [Mon, 20 Dec 2010 17:31:31 +0000]
remove "(,)" hint from syntax error messages (the expect function will do that already)

13 years agouse the passed $token in isUnary and isBinary of ExpressionParser
nikic [Mon, 20 Dec 2010 17:27:01 +0000]
use the passed $token in isUnary and isBinary of ExpressionParser

13 years agoGrammer/Hash: array -> hash
nikic [Mon, 20 Dec 2010 16:05:28 +0000]
Grammer/Hash: array -> hash

13 years agotweaked error message
Fabien Potencier [Mon, 20 Dec 2010 14:05:29 +0000]
tweaked error message

13 years agochanged error messages to be more friendly
Fabien Potencier [Mon, 20 Dec 2010 13:48:07 +0000]
changed error messages to be more friendly

13 years agoconverted the cycle filter to a function
Fabien Potencier [Mon, 20 Dec 2010 07:45:45 +0000]
converted the cycle filter to a function

13 years agoconverted the constant filter to a function
Fabien Potencier [Mon, 20 Dec 2010 07:40:02 +0000]
converted the constant filter to a function

13 years agoconverted the range filter to a function
Fabien Potencier [Mon, 20 Dec 2010 07:36:03 +0000]
converted the range filter to a function

13 years agoforced functions to have fn_ as a prefix to avoid name clashes between functions...
Fabien Potencier [Sun, 19 Dec 2010 21:24:10 +0000]
forced functions to have fn_ as a prefix to avoid name clashes between functions and variables

13 years agofixed doc index
Fabien Potencier [Sun, 19 Dec 2010 20:53:00 +0000]
fixed doc index

13 years agofixed typo
Fabien Potencier [Sun, 19 Dec 2010 20:52:54 +0000]
fixed typo

13 years agorewrote the advanced chapter and documented globals and functions
Fabien Potencier [Sun, 19 Dec 2010 18:56:14 +0000]
rewrote the advanced chapter and documented globals and functions

13 years agoadded global variables
Fabien Potencier [Sun, 19 Dec 2010 13:01:21 +0000]
added global variables

13 years agomade macro return their value instead of echoing directly
Fabien Potencier [Sun, 19 Dec 2010 10:42:50 +0000]
made macro return their value instead of echoing directly

13 years agoadded from tag
Fabien Potencier [Sun, 19 Dec 2010 10:26:38 +0000]
added from tag

13 years agoadded support for functions
Fabien Potencier [Sat, 18 Dec 2010 15:20:05 +0000]
added support for functions

13 years agofixed typo
Fabien Potencier [Sun, 19 Dec 2010 10:43:03 +0000]
fixed typo

13 years agomade macros callable when sandbox mode is enabled
Fabien Potencier [Sat, 18 Dec 2010 13:31:15 +0000]
made macros callable when sandbox mode is enabled

13 years agofixed markup
Fabien Potencier [Sat, 18 Dec 2010 13:20:48 +0000]
fixed markup

13 years agoadded a new recipe
Fabien Potencier [Sat, 18 Dec 2010 13:19:40 +0000]
added a new recipe

13 years agofixed if tag documentation
Fabien Potencier [Sat, 18 Dec 2010 12:44:51 +0000]
fixed if tag documentation

13 years agoadded an exception when a macro uses a reserved name
Fabien Potencier [Sat, 18 Dec 2010 12:15:24 +0000]
added an exception when a macro uses a reserved name

13 years agochanged default filter to use the empty test
Fabien Potencier [Sat, 18 Dec 2010 11:56:44 +0000]
changed default filter to use the empty test

13 years agofixed markup in doc
Fabien Potencier [Sat, 18 Dec 2010 10:26:41 +0000]
fixed markup in doc

13 years agoadded the empty test
Fabien Potencier [Sat, 18 Dec 2010 10:26:16 +0000]
added the empty test

13 years agoremoved the 'items' filter, which has been deprecated a long time ago
Fabien Potencier [Sat, 18 Dec 2010 10:21:46 +0000]
removed the 'items' filter, which has been deprecated a long time ago

13 years agosome improvements to for tag compiler
nikic [Thu, 16 Dec 2010 22:30:30 +0000]
some improvements to for tag compiler

13 years agomade a small performance optimization
Fabien Potencier [Sat, 18 Dec 2010 07:04:21 +0000]
made a small performance optimization

13 years agoremoved n/a strings leftover
Fabien Potencier [Sat, 18 Dec 2010 07:02:24 +0000]
removed n/a strings leftover

13 years agobumped version for dev
Fabien Potencier [Thu, 16 Dec 2010 08:48:40 +0000]
bumped version for dev

13 years agoupdated CHANGELOG and bumped version to 0.9.10
Fabien Potencier [Thu, 16 Dec 2010 08:47:09 +0000]
updated CHANGELOG and bumped version to 0.9.10

13 years agotweaked merge filter
Fabien Potencier [Thu, 16 Dec 2010 08:44:10 +0000]
tweaked merge filter

13 years agoadded documentation for the merge filter
Fabien Potencier [Thu, 16 Dec 2010 08:07:55 +0000]
added documentation for the merge filter

13 years agoadded the merge filter
Fabien Potencier [Thu, 16 Dec 2010 07:10:41 +0000]
added the merge filter

13 years agoremoved the possibility to inject a lexer/parser/compiler in the environment constructor
Fabien Potencier [Wed, 15 Dec 2010 12:32:39 +0000]
removed the possibility to inject a lexer/parser/compiler in the environment constructor

13 years agosimplified code
Fabien Potencier [Wed, 15 Dec 2010 12:31:15 +0000]
simplified code

13 years agoconverted documentation to rst
Fabien Potencier [Wed, 15 Dec 2010 11:25:16 +0000]
converted documentation to rst

13 years agomoved the i18n extension to the Twig Extensions repository
Fabien Potencier [Wed, 15 Dec 2010 07:28:13 +0000]
moved the i18n extension to the Twig Extensions repository

13 years agoimprove filesystem loader cache and use '/' instead of DIRECTORY_SEPARATOR
nikic [Tue, 14 Dec 2010 17:49:35 +0000]
improve filesystem loader cache and use '/' instead of DIRECTORY_SEPARATOR

13 years agosimplified code
Fabien Potencier [Tue, 14 Dec 2010 16:52:54 +0000]
simplified code

13 years agosimplified code
Fabien Potencier [Tue, 14 Dec 2010 16:51:44 +0000]
simplified code

13 years agoadded an optimizations options to Twig_Environment
Fabien Potencier [Tue, 14 Dec 2010 16:30:45 +0000]
added an optimizations options to Twig_Environment

13 years agomade some tweak to the security check for the filesystem loader
Fabien Potencier [Tue, 14 Dec 2010 16:24:03 +0000]
made some tweak to the security check for the filesystem loader

13 years agoallow null filenames
nikic [Tue, 14 Dec 2010 15:46:28 +0000]
allow null filenames

13 years agoremoved 'is_escaper' option for filters (a left over from the previous version)
Fabien Potencier [Tue, 14 Dec 2010 15:38:11 +0000]
removed 'is_escaper' option for filters (a left over from the previous version)

13 years agoremoved support for foo.% which does not make sense
Fabien Potencier [Tue, 14 Dec 2010 15:23:56 +0000]
removed support for foo.% which does not make sense

13 years agofixed usage of operators as method names (like is, in, and not)
Fabien Potencier [Tue, 14 Dec 2010 14:19:37 +0000]
fixed usage of operators as method names (like is, in, and not)

13 years agoadded an optimizer to remove the raw filter
Fabien Potencier [Tue, 14 Dec 2010 14:10:35 +0000]
added an optimizer to remove the raw filter

13 years agochanged the order of execution for node visitors
Fabien Potencier [Tue, 14 Dec 2010 14:09:12 +0000]
changed the order of execution for node visitors

13 years agofixed security check in filesystem loader
Fabien Potencier [Tue, 14 Dec 2010 13:36:45 +0000]
fixed security check in filesystem loader

13 years agoadded some unit tests for the filesystem loader
Fabien Potencier [Tue, 14 Dec 2010 13:28:47 +0000]
added some unit tests for the filesystem loader

13 years agofixed default() filter behavior when used with strict_variables set to on
Fabien Potencier [Tue, 14 Dec 2010 13:27:28 +0000]
fixed default() filter behavior when used with strict_variables set to on

13 years agoadded an exception when trying to outdent too much
Fabien Potencier [Tue, 14 Dec 2010 11:54:32 +0000]
added an exception when trying to outdent too much

13 years agotweaked last commit
Fabien Potencier [Tue, 14 Dec 2010 10:50:47 +0000]
tweaked last commit

13 years agoAdding Twig_Environment::clearCacheFiles() to clear cache files that twig makes.
Mark Story [Sun, 12 Dec 2010 02:53:08 +0000]
Adding Twig_Environment::clearCacheFiles() to clear cache files that twig makes.
Refactoring test cases in previous commit.  Adding more tests for clearing cache files.
Fixes #192

13 years agoAdding a test case for caching template class to the filesystem.
Mark Story [Sun, 12 Dec 2010 02:42:48 +0000]
Adding a test case for caching template class to the filesystem.

13 years agofixed filesystem loader compatibility with PHAR files
Fabien Potencier [Tue, 14 Dec 2010 10:36:59 +0000]
fixed filesystem loader compatibility with PHAR files

13 years agoenhanced error messages when an unexpected token is parsed in an expression
Fabien Potencier [Tue, 14 Dec 2010 08:47:56 +0000]
enhanced error messages when an unexpected token is parsed in an expression

13 years agotweaked doc
Fabien Potencier [Tue, 14 Dec 2010 08:16:13 +0000]
tweaked doc

13 years agofixed filename not being added to syntax error messages
Fabien Potencier [Tue, 14 Dec 2010 08:08:17 +0000]
fixed filename not being added to syntax error messages

13 years agochanged array/hashes notation
Fabien Potencier [Tue, 14 Dec 2010 07:53:48 +0000]
changed array/hashes notation

13 years agofixed typo
Fabien Potencier [Tue, 14 Dec 2010 07:18:33 +0000]
fixed typo

13 years agofixed phpdoc, tweaked doc
Fabien Potencier [Tue, 14 Dec 2010 06:54:51 +0000]
fixed phpdoc, tweaked doc

13 years agoadded a note about how to turn off autoescaping
Fabien Potencier [Mon, 13 Dec 2010 17:40:51 +0000]
added a note about how to turn off autoescaping

13 years agoremoved the 'without loop' attribute for the 'for' tag
Fabien Potencier [Mon, 13 Dec 2010 14:59:12 +0000]
removed the 'without loop' attribute for the 'for' tag

13 years agoenhanced the for-loop optimizer pass 2 (patch from nikic)
Fabien Potencier [Mon, 13 Dec 2010 14:46:09 +0000]
enhanced the for-loop optimizer pass 2 (patch from nikic)

13 years agoenhanced the for-loop optimizer (patch from nikic)
Fabien Potencier [Mon, 13 Dec 2010 14:20:03 +0000]
enhanced the for-loop optimizer (patch from nikic)

13 years agoremoved usage of array_replace
Fabien Potencier [Mon, 13 Dec 2010 12:50:59 +0000]
removed usage of array_replace

13 years agoreverted inadvertently committed code
Fabien Potencier [Sun, 12 Dec 2010 13:35:15 +0000]
reverted inadvertently committed code

13 years agoadded the autoescape option to enable/disable autoescaping
Fabien Potencier [Sun, 12 Dec 2010 13:34:07 +0000]
added the autoescape option to enable/disable autoescaping

13 years agofix automatic escaping documentation
nikic [Sat, 11 Dec 2010 22:24:38 +0000]
fix automatic escaping documentation

13 years agofix comment in Optimizer NodeVisitor
nikic [Sat, 11 Dec 2010 22:14:35 +0000]
fix comment in Optimizer NodeVisitor

13 years agoremoved the newline after a comment (closes #195)
Fabien Potencier [Fri, 10 Dec 2010 06:13:32 +0000]
removed the newline after a comment (closes #195)