Commit Graph

928 Commits

Author SHA1 Message Date
Fabien Potencier d7120d1bf2 merged branch nikic/patch-1 (PR #489)
Commits
-------

7da9f2f Make long var/block tests faster

Discussion
----------

Make long var/block tests faster

When using `*` every single character is a different token, whereas with `x` there is only a single token. I don't think this hurts the actual test, but it improves the test runtime by something like 2/3 seconds on my machine.
2011-10-30 11:43:00 +01:00
nikic 7da9f2f9eb Make long var/block tests faster 2011-10-30 11:03:56 +01:00
Fabien Potencier cf6116c2a8 fixed previous commit 2011-10-29 15:13:27 +02:00
Fabien Potencier b3f472e479 renamed none to null in doc 2011-10-29 14:56:00 +02:00
Fabien Potencier 8d00b42e56 changed the documentation to advertize null as begin the null value and none as an alias 2011-10-29 14:53:37 +02:00
Fabien Potencier dfdd555b9a fixed in operator for empty strings 2011-10-29 14:50:10 +02:00
Fabien Potencier dc15afabb8 merged branch nikic/updateExtensionDocs (PR #488)
Commits
-------

2ebc788 Update extension docs and interface

Discussion
----------

Update extension docs and interface

Followup to #484: Twig isn't using globals for functions anymore.
2011-10-29 14:38:23 +02:00
nikic 2ebc788abc Update extension docs and interface
Twig isn't using globals for functions anymore.
2011-10-29 14:05:14 +02:00
Fabien Potencier 2bd27cf661 fixed typo in doc 2011-10-28 17:23:01 +02:00
Fabien Potencier 1b46f06394 merged branch phmLabs/documentation_return (PR #483)
Commits
-------

389f2c2 Changed mode from 0755 to 0644
c48bd2f Fixed wrong used PHPDoc tags

Discussion
----------

Fixed wrong used PHPDoc tags

@param was used instead of @return

---------------------------------------------------------------------------

by fabpot at 2011/10/25 05:47:59 -0700

Can you revert the mode change (from 0644 to 0755)?
2011-10-27 21:47:32 +02:00
Fabien Potencier b318494cfe added more unit tests for defined and default 2011-10-27 18:35:23 +02:00
Fabien Potencier 29534aada8 fixed the "defined" test and the "default" filter 2011-10-27 18:26:17 +02:00
Fabien Potencier 52a8afd67c added more unit tests (some do not pass... yet) 2011-10-26 22:23:21 +02:00
Fabien Potencier 3201b39f47 added missing supported charset for htmlspecialchars 2011-10-26 11:28:33 +02:00
Fabien Potencier 5e290cbb4d fixed deep nested defined tests 2011-10-26 11:20:38 +02:00
Fabien Potencier 5da378ceaa removed unneeded complexity in GetAttr node 2011-10-26 10:28:26 +02:00
Fabien Potencier 996128dfce added a way to change Twig's options when running integration tests (updated tests accordingly) 2011-10-26 09:29:16 +02:00
Fabien Potencier 13e4b4800e Revert "fixed exception"
This reverts commit df47659e9d.
2011-10-26 08:05:11 +02:00
Fabien Potencier 96e72e408a fixed example in doc (closes #484) 2011-10-25 17:37:58 +02:00
Nils Langner 389f2c2603 Changed mode from 0755 to 0644 2011-10-25 16:49:17 +02:00
Fabien Potencier 22ef32e5eb added some references to the doc 2011-10-25 16:33:42 +02:00
Nils Langner c48bd2f809 Fixed wrong used PHPDoc tags 2011-10-25 14:32:16 +02:00
Fabien Potencier 08f125395c reverted mode change from previous commit 2011-10-25 14:23:37 +02:00
Fabien Potencier 7001217ed3 merged branch phmLabs/Twig_NodeInterface_Bug (PR #482)
Commits
-------

c91357d Moved interfaces

Discussion
----------

Moved interfaces

The Countable and IteratorAggregate interfaces have to be part of the Twig_NodeInterface as the Twig_NodeInterface is used as a typehint and the function tries to iterate over its elements.

E.g:

Twig_NodeTraverser::traverseForVisitor

foreach ($node as $k => $n)
2011-10-25 14:23:22 +02:00
Fabien Potencier fc016bd281 Revert "added a tip for the block tag"
This reverts commit 1a2175fc49.
2011-10-25 14:14:55 +02:00
Nils Langner c91357d0c7 Moved interfaces 2011-10-25 14:13:26 +02:00
Fabien Potencier 1a2175fc49 added a tip for the block tag 2011-10-25 14:11:52 +02:00
Fabien Potencier 5483e995b0 merged branch yegeniy/patch-1 (PR #474)
Commits
-------

cf03a65 add another example add another example to constant.rst

Discussion
----------

add another example

An example for using the `constant` function

---------------------------------------------------------------------------

by yegeniy at 2011/10/19 09:48:37 -0700

Should be ready.

---------------------------------------------------------------------------

by nikic at 2011/10/19 10:58:01 -0700

I think you should just add that as a line to the other example, so you got this in the end:

```rst
``constant``
============

``constant`` returns the constant value for a given string:

.. code-block:: jinja

    {{ some_date|date(constant('DATE_W3C')) }}
    {{ constant('Namespace\\Classname::CONSTANT_NAME') }}
```

---------------------------------------------------------------------------

by fabpot at 2011/10/21 07:24:32 -0700

That's indeed a good addition to the doc. Can you squash your commits in to one before I merge this pull request? Thanks.

---------------------------------------------------------------------------

by yegeniy at 2011/10/22 06:28:58 -0700

Thanks!
2011-10-25 14:01:54 +02:00
Fabien Potencier 25c9df5354 fixed typos 2011-10-25 13:59:24 +02:00
Fabien Potencier 2c7b565132 changed the way extensions are loaded (addFilter/addFunction/addGlobal/addTest/addNodeVisitor/addTokenParser/addExtension can now be called in any order) 2011-10-25 13:58:27 +02:00
Eugene Wolfson cf03a65e8b add another example
add another example to constant.rst
2011-10-22 09:27:23 -04:00
Fabien Potencier d10966132b added Twig_Environment::display() 2011-10-17 13:01:40 +02:00
Fabien Potencier f6961d558d simplified some code 2011-10-17 02:48:36 +02:00
Fabien Potencier a41c6e21d2 added more unit tests 2011-10-17 01:16:34 +02:00
Fabien Potencier e7347160cb added an optimization when the same temporary variable would have been created twice 2011-10-16 22:18:02 +02:00
Fabien Potencier d3178d3406 fixed doc 2011-10-16 11:15:40 +02:00
Fabien Potencier 344043e891 made the escape filter smarter when the encoding is not supported by PHP 2011-10-16 11:12:08 +02:00
Fabien Potencier c015e8184a added a convert_encoding filter 2011-10-16 11:12:06 +02:00
Fabien Potencier 846a2c134d added a Twig_Node_Expression_DefaultFilter to replace the current way of dealing with default filters 2011-10-16 05:46:09 +02:00
Fabien Potencier ac3bb814d5 added public getters on the environment to be able to get various stuff 2011-10-15 10:57:18 +02:00
Fabien Potencier df47659e9d fixed exception 2011-10-15 01:10:30 +02:00
Fabien Potencier 3377d569da fixed download page in the docs 2011-10-14 11:46:15 +02:00
Fabien Potencier 9d6fcb5b32 merged branch trompette/patch-1 (PR #465)
Commits
-------

0451cfd typo

Discussion
----------

typo
2011-10-13 08:20:40 +02:00
Benoît Merlet 0451cfdd16 typo 2011-10-12 15:45:28 +03:00
Fabien Potencier 2408628787 updated CHANGELOG 2011-10-08 14:30:37 +02:00
Fabien Potencier dd0546eaa9 refactored Twig_Node_Expression_GetAttr for better readability of compiled templates 2011-10-08 14:27:18 +02:00
Fabien Potencier a68425118d optimized variable access when possible 2011-10-08 14:27:18 +02:00
Fabien Potencier 4a91f4ff34 refactored 'defined' test and 'default' filter
Node manipulations have been moved outside the compile() method.
That's needed if we want to be able to visit all nodes that will be
compiled.
2011-10-08 14:27:18 +02:00
Fabien Potencier e76fc0cb55 optimized lexer by pre-computing regexes 2011-10-08 14:27:18 +02:00
Fabien Potencier bd5687ee10 made an optimization by removing array_merge usage 2011-10-08 14:27:18 +02:00