web/konrad/twig.git
13 years agoSimplify fix.
Joseph Bielawski [Wed, 27 Apr 2011 15:50:08 +0000]
Simplify fix.

13 years agoAdditional tests for issue #307
Joseph Bielawski [Wed, 27 Apr 2011 15:01:08 +0000]
Additional tests for issue #307

13 years agoFix for issue #307
Joseph Bielawski [Wed, 27 Apr 2011 14:57:39 +0000]
Fix for issue #307

13 years agoadded template file information when an error occurs during compilation
Fabien Potencier [Fri, 22 Apr 2011 14:08:07 +0000]
added template file information when an error occurs during compilation

13 years agotweaked Twig_Error to keep the passed line or template when passed in the constructor...
Fabien Potencier [Fri, 22 Apr 2011 14:06:50 +0000]
tweaked Twig_Error to keep the passed line or template when passed in the constructor and findTemplateInfo() was not able to guess it better

13 years agoadded PhpStorm as IDE that supports Twig out of the box
Fabien Potencier [Fri, 22 Apr 2011 07:53:49 +0000]
added PhpStorm as IDE that supports Twig out of the box

13 years agoadded a unit test
Fabien Potencier [Fri, 15 Apr 2011 14:21:45 +0000]
added a unit test

13 years agofixed typos in the doc
Fabien Potencier [Thu, 14 Apr 2011 08:03:43 +0000]
fixed typos in the doc

13 years agotweaked doc
Fabien Potencier [Thu, 14 Apr 2011 05:42:28 +0000]
tweaked doc

13 years agofixed typo in doc
Fabien Potencier [Thu, 14 Apr 2011 05:39:48 +0000]
fixed typo in doc

13 years agoupdated CHANGELOG
Fabien Potencier [Thu, 14 Apr 2011 05:37:17 +0000]
updated CHANGELOG

13 years agoadded null as an alias to none and made TRUE, FALSE, and NONE equivalent to true...
Fabien Potencier [Thu, 14 Apr 2011 05:35:58 +0000]
added null as an alias to none and made TRUE, FALSE, and NONE equivalent to true, false, and none

13 years agoMerge remote branch 'markstory/whitespace'
Fabien Potencier [Thu, 14 Apr 2011 05:22:57 +0000]
Merge remote branch 'markstory/whitespace'

* markstory/whitespace:
  Updating documentation for whitespace trim tags.
  Making trim tags consume all whitespace, both horizontal and vertical.
  Adding additional test suggested by nikic.
  Making a capturing group non capturing, as the group isn't used.
  Moving newline trimming into the regexp used to match end of tags.
  Applying changes suggested by nikic to simplify how end of comments are processed.
  Fixing some whitespace.
  Fixing typo.
  Adding a bit of documentation for whitespace trimming.
  Adding whitespace trimming support to other tag types (comments, variables) Refactoring how whitespace trimming is done, and moving it into a separate option that is combined with other tag types. Adding more tests. Refs #284
  Fixing use of non-existent method name.
  Adding a test case for mixing {%- and %} tags together.
  Adding a test that uses tabs. Added a test for trailing tabs and -%} Refs #284
  Implementing {%- which trims non-newline whitespace preceding it. Refs

13 years agoUpdating documentation for whitespace trim tags.
Mark Story [Thu, 14 Apr 2011 02:15:32 +0000]
Updating documentation for whitespace trim tags.

13 years agoMaking trim tags consume all whitespace, both horizontal and vertical.
Mark Story [Thu, 14 Apr 2011 02:10:57 +0000]
Making trim tags consume all whitespace, both horizontal and vertical.

13 years agoremoved empty if
Fabien Potencier [Tue, 12 Apr 2011 14:04:26 +0000]
removed empty if

13 years agotweaked error message when wrapping an external exception
Fabien Potencier [Tue, 12 Apr 2011 13:37:51 +0000]
tweaked error message when wrapping an external exception

13 years agomade Twig_Error::findTemplateInfo() more robust
Fabien Potencier [Tue, 12 Apr 2011 12:42:00 +0000]
made Twig_Error::findTemplateInfo() more robust

13 years agorefactored some tests
Fabien Potencier [Tue, 12 Apr 2011 08:21:00 +0000]
refactored some tests

13 years agofixed some tests
Fabien Potencier [Tue, 12 Apr 2011 07:35:37 +0000]
fixed some tests

13 years agotweaked error wrapping
Fabien Potencier [Tue, 12 Apr 2011 07:12:05 +0000]
tweaked error wrapping

13 years agorefactored some tests
Fabien Potencier [Tue, 12 Apr 2011 07:22:15 +0000]
refactored some tests

13 years agoremoved line parameter from Twig_Template::getAttribute() and getContext() as the...
Fabien Potencier [Tue, 12 Apr 2011 06:11:29 +0000]
removed line parameter from Twig_Template::getAttribute() and getContext() as the information is now gathered by Twig_Error_Wrapped

13 years agoadded a Twig_Error_Wrapped exception to try to add template name and line when a...
Fabien Potencier [Tue, 12 Apr 2011 05:58:02 +0000]
added a Twig_Error_Wrapped exception to try to add template name and line when a problem occurs at runtime

13 years agoRevert "deleted abstract method doDisplay (maintain BC)"
Fabien Potencier [Tue, 12 Apr 2011 05:54:05 +0000]
Revert "deleted abstract method doDisplay (maintain BC)"

This reverts commit 70d90bedce7788f5aac35357975aaf6c6a584baf.

13 years agoMerge remote branch 'hason/template'
Fabien Potencier [Tue, 12 Apr 2011 05:53:48 +0000]
Merge remote branch 'hason/template'

* hason/template:
  deleted abstract method doDisplay (maintain BC)
  added possibility to customize "display" in the base template class

13 years agoMerge remote branch 'nikic/fixWrongMethodCallInTest'
Fabien Potencier [Mon, 11 Apr 2011 16:51:49 +0000]
Merge remote branch 'nikic/fixWrongMethodCallInTest'

* nikic/fixWrongMethodCallInTest:
  $e->setFilename to $e->setTemplateFile in integrationTest

13 years ago[doc] added the link to the Twig Netbeans plugin.
Hugo Hamon [Wed, 6 Apr 2011 22:31:51 +0000]
[doc] added the link to the Twig Netbeans plugin.

13 years agoAdding additional test suggested by nikic.
Mark Story [Wed, 6 Apr 2011 01:29:38 +0000]
Adding additional test suggested by nikic.

13 years agoMaking a capturing group non capturing, as the group isn't used.
Mark Story [Wed, 6 Apr 2011 01:06:58 +0000]
Making a capturing group non capturing, as the group isn't used.

13 years agoMoving newline trimming into the regexp used to match end of tags.
Mark Story [Sat, 2 Apr 2011 14:11:44 +0000]
Moving newline trimming into the regexp used to match end of tags.

13 years agoApplying changes suggested by nikic to simplify how end of comments are processed.
Mark Story [Sat, 2 Apr 2011 14:08:51 +0000]
Applying changes suggested by nikic to simplify how end of comments are processed.

13 years agoFixing some whitespace.
Mark Story [Sat, 2 Apr 2011 14:05:55 +0000]
Fixing some whitespace.

13 years agoFixing typo.
Mark Story [Fri, 1 Apr 2011 01:24:00 +0000]
Fixing typo.

13 years agoAdding a bit of documentation for whitespace trimming.
Mark Story [Thu, 31 Mar 2011 01:55:15 +0000]
Adding a bit of documentation for whitespace trimming.

13 years ago$e->setFilename to $e->setTemplateFile in integrationTest
nikic [Wed, 30 Mar 2011 15:37:23 +0000]
$e->setFilename to $e->setTemplateFile in integrationTest

13 years agoAdding whitespace trimming support to other tag types (comments, variables)
Mark Story [Wed, 30 Mar 2011 11:33:04 +0000]
Adding whitespace trimming support to other tag types (comments, variables)
Refactoring how whitespace trimming is done, and moving it into a separate option that is combined with other tag types.
Adding more tests.
Refs #284

13 years agoFixing use of non-existent method name.
Mark Story [Wed, 30 Mar 2011 11:32:06 +0000]
Fixing use of non-existent method name.

13 years agoAdding a test case for mixing {%- and %} tags together.
Mark Story [Wed, 23 Mar 2011 03:08:51 +0000]
Adding a test case for mixing {%- and %} tags together.

13 years agoAdding a test that uses tabs.
Mark Story [Wed, 23 Mar 2011 02:59:56 +0000]
Adding a test that uses tabs.
Added a test for trailing tabs and -%}
Refs #284

13 years agoImplementing {%- which trims non-newline whitespace preceding it. Refs
Mark Story [Wed, 23 Mar 2011 02:35:54 +0000]
Implementing {%- which trims non-newline whitespace preceding it. Refs

13 years agofixed CHANGELOG
Fabien Potencier [Sun, 27 Mar 2011 19:17:16 +0000]
fixed CHANGELOG

13 years agoupdated CHANGELOG
Fabien Potencier [Sun, 27 Mar 2011 17:28:16 +0000]
updated CHANGELOG

13 years agoadded some tests
Fabien Potencier [Sun, 27 Mar 2011 16:53:52 +0000]
added some tests

13 years agoMerge remote branch 'nikic/fixSandboxDuplicateMethodCalls'
Fabien Potencier [Sun, 27 Mar 2011 16:49:04 +0000]
Merge remote branch 'nikic/fixSandboxDuplicateMethodCalls'

* nikic/fixSandboxDuplicateMethodCalls:
  fix duplicate call of methods if using sandbox

13 years agoadded a test
Fabien Potencier [Sun, 27 Mar 2011 16:13:59 +0000]
added a test

13 years agoadded some cleanup in unit tests
Fabien Potencier [Sun, 27 Mar 2011 15:50:50 +0000]
added some cleanup in unit tests

13 years agoreplaced the Twig_Environment::load() shortcut by a more useful render() one
Fabien Potencier [Sat, 26 Mar 2011 09:24:45 +0000]
replaced the Twig_Environment::load() shortcut by a more useful render() one

13 years agoEnsure all mbstring calls have the charset specified
Jordi Boggiano [Wed, 23 Mar 2011 15:39:25 +0000]
Ensure all mbstring calls have the charset specified

13 years agoadded Twig_Environment::load() as an alias for loadTemplate()
Fabien Potencier [Tue, 22 Mar 2011 10:58:42 +0000]
added Twig_Environment::load() as an alias for loadTemplate()

13 years agoMerge remote branch 'markstory/ticket-277'
Fabien Potencier [Mon, 21 Mar 2011 18:24:59 +0000]
Merge remote branch 'markstory/ticket-277'

* markstory/ticket-277:
  Updating documentation for blocks, mentioning that block names cannot contain -.  Fixes #277

13 years agoCorrect spelling error (in 3 places): "unkown" -> "unknown"
Marc Abramowitz [Wed, 23 Feb 2011 22:58:01 +0000]
Correct spelling error (in 3 places): "unkown" -> "unknown"

13 years agofix duplicate call of methods if using sandbox
nikic [Thu, 17 Mar 2011 17:26:29 +0000]
fix duplicate call of methods if using sandbox

13 years agomade the charset configurable for the escape filter
Fabien Potencier [Thu, 17 Mar 2011 07:02:42 +0000]
made the charset configurable for the escape filter

13 years agoAdded a link to the Twig TextMate bundle and fixed a typo.
Anomareh [Sun, 13 Mar 2011 02:14:36 +0000]
Added a link to the Twig TextMate bundle and fixed a typo.

13 years agofixed typo
Fabien Potencier [Fri, 11 Mar 2011 18:09:05 +0000]
fixed typo

13 years agoadded a recipe
Fabien Potencier [Fri, 11 Mar 2011 12:29:40 +0000]
added a recipe

13 years agoUpdating documentation for blocks, mentioning that block names cannot contain -....
Mark Story [Fri, 11 Mar 2011 03:35:36 +0000]
Updating documentation for blocks, mentioning that block names cannot contain -.  Fixes #277

13 years ago[Twig] renamed: phpunit.xml -> phpunit.xml.dist
Pascal Borreli [Fri, 11 Mar 2011 00:58:38 +0000]
[Twig] renamed: phpunit.xml -> phpunit.xml.dist

13 years agoupdated CHANGELOG
Fabien Potencier [Mon, 21 Feb 2011 15:04:18 +0000]
updated CHANGELOG

13 years agoupdated documentation and added a unit test
Fabien Potencier [Fri, 18 Feb 2011 15:13:23 +0000]
updated documentation and added a unit test

13 years agocapturing {% set %} should give Twig_Markup
nikic [Wed, 9 Feb 2011 17:27:28 +0000]
capturing {% set %} should give Twig_Markup

13 years agoremove old code for setting all optimizers
nikic [Tue, 8 Feb 2011 20:48:51 +0000]
remove old code for setting all optimizers

13 years agoadd some more DocComments / type hints
nikic [Wed, 9 Feb 2011 17:06:57 +0000]
add some more DocComments / type hints

13 years agoadded support for macro name in the endmacro tag
Fabien Potencier [Thu, 17 Feb 2011 12:36:40 +0000]
added support for macro name in the endmacro tag

13 years agofix some typos
nikic [Tue, 8 Feb 2011 20:52:55 +0000]
fix some typos

13 years agoswap GetAttr constructor arguments for from .. import macros
nikic [Tue, 8 Feb 2011 20:39:32 +0000]
swap GetAttr constructor arguments for from .. import macros

13 years agofixed typos
Fabien Potencier [Tue, 8 Feb 2011 14:39:03 +0000]
fixed typos

13 years agoadded a way for template name to be anything
Fabien Potencier [Sun, 6 Feb 2011 20:09:23 +0000]
added a way for template name to be anything

13 years agoRevert "added the possibility to pass a readable name for templates"
Fabien Potencier [Sun, 6 Feb 2011 20:03:13 +0000]
Revert "added the possibility to pass a readable name for templates"

This reverts commit 7a7c23f197482e1c04c70f10b12c2705f358cde6.

13 years agofixed filter tag
Fabien Potencier [Sat, 5 Feb 2011 22:57:22 +0000]
fixed filter tag

13 years agoadded the possibility to pass a readable name for templates
Fabien Potencier [Fri, 4 Feb 2011 11:46:05 +0000]
added the possibility to pass a readable name for templates

13 years agofixed wrong usage of loadTemplate()
Fabien Potencier [Fri, 4 Feb 2011 11:53:23 +0000]
fixed wrong usage of loadTemplate()

13 years agofixed functions
Martin Hason [Wed, 2 Feb 2011 11:46:49 +0000]
fixed functions

13 years agofixed test covers
Martin Hason [Wed, 2 Feb 2011 11:43:59 +0000]
fixed test covers

13 years agofixed __call()
Fabien Potencier [Thu, 3 Feb 2011 23:51:34 +0000]
fixed __call()

13 years agomake Twig_Error compatible with PHP 5.3.0 >
Martin Hason [Mon, 10 Jan 2011 15:03:48 +0000]
make Twig_Error compatible with PHP 5.3.0 >

13 years agodeleted abstract method doDisplay (maintain BC)
Martin Hason [Wed, 2 Feb 2011 20:20:22 +0000]
deleted abstract method doDisplay (maintain BC)

13 years agoadded possibility to customize "display" in the base template class
Martin Hason [Wed, 2 Feb 2011 13:41:20 +0000]
added possibility to customize "display" in the base template class

13 years agofixes an infinite loop on some Windows configurations
Fabien Potencier [Mon, 31 Jan 2011 07:47:08 +0000]
fixes an infinite loop on some Windows configurations

13 years agofixed possible warning
Fabien Potencier [Thu, 27 Jan 2011 22:12:35 +0000]
fixed possible warning

13 years agofixed the "length" filter for numbers
Fabien Potencier [Sat, 22 Jan 2011 08:12:57 +0000]
fixed the "length" filter for numbers

13 years agomade a small tweak
Fabien Potencier [Mon, 17 Jan 2011 06:45:12 +0000]
made a small tweak

13 years agoadded a note about the main advantage of creating an extension
Fabien Potencier [Sun, 16 Jan 2011 07:00:40 +0000]
added a note about the main advantage of creating an extension

13 years agofixed typo in phpdoc
Fabien Potencier [Sun, 16 Jan 2011 06:55:52 +0000]
fixed typo in phpdoc

13 years agoremoved coupling between Twig_Node and Twig_Template
Fabien Potencier [Sun, 16 Jan 2011 06:46:59 +0000]
removed coupling between Twig_Node and Twig_Template

This coupling was bad as Twig_Node should only be useful
during compilation.

So, the Twig_Node_Expression_GetAttr constants have been moved
to Twig_TemplateInterface.

13 years agomade Twig_Loader_Filesystem more flexible
Fabien Potencier [Sat, 15 Jan 2011 11:05:44 +0000]
made Twig_Loader_Filesystem more flexible

13 years agofixed Template::getAttribute() as properties in PHP are case sensitive
Fabien Potencier [Thu, 13 Jan 2011 09:35:31 +0000]
fixed Template::getAttribute() as properties in PHP are case sensitive

13 years agoadd methods and fix naming of methods in Twig_Error
Martin Hason [Mon, 10 Jan 2011 14:37:35 +0000]
add methods and fix naming of methods in Twig_Error

13 years agofixed documentation for the sandbox security policy
Fabien Potencier [Wed, 12 Jan 2011 09:39:35 +0000]
fixed documentation for the sandbox security policy

13 years agofixed text token with only '0' as content
Fabien Potencier [Mon, 10 Jan 2011 18:13:18 +0000]
fixed text token with only '0' as content

13 years agoadded a test for previous commit
Fabien Potencier [Mon, 10 Jan 2011 18:09:08 +0000]
added a test for previous commit

13 years agofixed the ternary operator
Fabien Potencier [Mon, 10 Jan 2011 18:06:37 +0000]
fixed the ternary operator

13 years agobumped version for dev
Fabien Potencier [Sun, 9 Jan 2011 08:56:15 +0000]
bumped version for dev

13 years agoupdated CHANGELOG and bumped version to 1.0.0-RC1
Fabien Potencier [Sun, 9 Jan 2011 08:47:02 +0000]
updated CHANGELOG and bumped version to 1.0.0-RC1

13 years agoremoved obsolete note from the doc
Fabien Potencier [Sun, 9 Jan 2011 06:47:39 +0000]
removed obsolete note from the doc

13 years agofixed typo in the doc
Fabien Potencier [Sat, 8 Jan 2011 16:04:16 +0000]
fixed typo in the doc

13 years agofixed doc markup
Fabien Potencier [Sat, 8 Jan 2011 14:18:32 +0000]
fixed doc markup

13 years agoadded callbacks for undefined functions and filters
Fabien Potencier [Sat, 8 Jan 2011 14:14:59 +0000]
added callbacks for undefined functions and filters

13 years agoadded a way to catch undefined filters (like functions)
Fabien Potencier [Sat, 8 Jan 2011 13:56:11 +0000]
added a way to catch undefined filters (like functions)