Commit Graph

1547 Commits

Author SHA1 Message Date
Fabien Potencier 9ee6fe3380 adding missing dots to some exception messages 2016-09-24 12:21:25 -07:00
Fabien Potencier 0980fe0871 fixed error message 2016-09-24 12:10:10 -07:00
Fabien Potencier af2e1111ae bug #2141 added a missing deprecation notice (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

added a missing deprecation notice

Commits
-------

9c27479 added a missing deprecation notice
2016-09-24 12:01:42 -07:00
Fabien Potencier 73d029b212 minor #2143 fixed exception message that might end with a ? (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed exception message that might end with a ?

Commits
-------

5c43548 adding missing dots to some exception messages
fbf99fc fixed exception message that might end with a ?
2016-09-24 12:00:56 -07:00
Fabien Potencier b2a1805146 fixed error message 2016-09-24 12:00:09 -07:00
Javier Eguiluz 23f53d5968 Improved the error message when a child template defines contents outside parent blocks 2016-09-24 11:56:13 -07:00
Fabien Potencier 5c43548dde adding missing dots to some exception messages 2016-09-24 11:53:49 -07:00
Fabien Potencier fbf99fce69 fixed exception message that might end with a ? 2016-09-24 11:34:11 -07:00
Fabien Potencier 9c2747996a added a missing deprecation notice 2016-09-24 11:30:39 -07:00
Fabien Potencier c9aac2403c bumped version to 1.25.1-DEV 2016-09-21 16:20:10 -07:00
Fabien Potencier f16a634ab0 prepared the 1.25.0 release 2016-09-21 16:05:12 -07:00
Fabien Potencier f2a9ef3579 made the getSource() method non-abstract for BC 2016-09-20 14:35:26 -07:00
Fabien Potencier b55d907c94 changed the way we store template source in template classes 2016-09-20 10:55:24 -07:00
Fabien Potencier 746a8044fc bug #2132 added missing method on Twig_Template (important for reserved keyword) (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

added missing method on Twig_Template (important for reserved keyword)

Commits
-------

b1f77a4 added missing method on Twig_Template (important for reserved keyword)
2016-09-20 10:54:18 -07:00
Fabien Potencier b1f77a4433 added missing method on Twig_Template (important for reserved keyword) 2016-09-20 10:50:41 -07:00
Fabien Potencier 9c08db0134 fixed a phpdoc 2016-09-20 10:49:30 -07:00
Fabien Potencier 7df1e2f011 bug #2127 removed usage of realpath in cache key (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

removed usage of realpath in cache key

closes #1994

Commits
-------

6f0e3ed removed usage of realpath in cache key
2016-09-20 10:31:38 -07:00
Fabien Potencier 6f0e3edbc5 removed usage of realpath in cache key 2016-09-20 10:26:50 -07:00
Fabien Potencier 2fec9d4c8e bug #2125 fixed Twig cache sharing when used with different versions of PHP (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed Twig cache sharing when used with different versions of PHP

closes #2013

Commits
-------

ecd020d fixed Twig cache sharing when used with different versions of PHP
2016-09-20 10:25:50 -07:00
Fabien Potencier ecd020da9f fixed Twig cache sharing when used with different versions of PHP 2016-09-20 10:24:42 -07:00
Fabien Potencier 03dd9c5e51 fixed CS 2016-09-19 22:07:57 -07:00
Fabien Potencier f61bc838a9 fixed typo 2016-09-19 17:25:59 -07:00
Fabien Potencier a0489854ba fixed embed parent token for simple use cases 2016-09-19 16:37:28 -07:00
Fabien Potencier 03f18b44f4 enforced Node:: to only contain node instances 2016-09-19 13:32:58 -07:00
Fabien Potencier 4c4657a764 changed the way we store node filenames 2016-09-19 12:06:19 -07:00
Fabien Potencier 4735c4fe8f fixed version 2016-09-18 19:04:04 -07:00
Fabien Potencier ccb7981e5a feature #2119 deprecated some more methods on Twig_Environment (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

deprecated some more methods on Twig_Environment

These methods are sometimes misused (#2020) when called from a template context (Twig_Template::getEnv() has been deprecated as well, but #2106 might re-introduce it).

Anyway, Twig_Environment should not act as a container, so, being able to change the defaults make sense, but retrieving them probably not.

Commits
-------

e548cbe deprecated some more methods on Twig_Environment
2016-09-18 19:03:09 -07:00
Fabien Potencier e548cbe3a4 deprecated some more methods on Twig_Environment 2016-09-18 18:40:16 -07:00
Fabien Potencier 1f41e9f9e1 deprecated Twig_Compiler::getFilename() 2016-09-18 18:37:52 -07:00
Fabien Potencier c418d07c64 bumped version to 1.24.3-DEV 2016-09-01 10:55:16 -07:00
Fabien Potencier 33093f6e31 prepared the 1.24.2 release 2016-09-01 10:50:53 -07:00
SpacePossum 39d46acf7d Floor - use cast and not intval 2016-08-31 11:41:06 -07:00
Fabien Potencier ffa2b812b0 fixed CS 2016-08-17 17:09:08 -07:00
Fabien Potencier d726bde293 bug #2054 Fix static callable. (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

Fix static callable.

fixes https://github.com/twigphp/Twig/issues/2053

Commits
-------

8f6fd57 Fix exception message for static method and object without req. params.
2016-08-17 17:08:36 -07:00
SpacePossum 8f6fd57a7e Fix exception message for static method and object without req. params. 2016-06-22 09:22:42 +02:00
Fabien Potencier 68620b32e4 fixed CS 2016-06-21 09:05:03 +02:00
Fabien Potencier c561e890bd bug #2043 Fix load cache (MaCroTux)
This PR was squashed before being merged into the 1.x branch (closes #2043).

Discussion
----------

Fix load cache

In PHP7 @ do not works and it is resource expensive, switching to if statement.

Commits
-------

b5df3d1 Fix load cache
2016-06-21 09:04:26 +02:00
Javier Feria b5df3d1dbe Fix load cache 2016-06-21 09:04:23 +02:00
Uwe Jäger 48a3487f46 Reset blocks also in doLeaveNode 2016-06-02 08:55:29 +02:00
Uwe Jäger ee6965ed00 fix a case where the autoescaping does not work as expected
The Twig_NodeVisitor_Escaper collects a list of blocks for all templates that it visits. If you define the same block (i.e. with the same name) in txt and html templates this results sometimes in the html block not being escapes.

This is illustrated in the added test.

To fix it, I propose to reset the list of the blocks for each module.

Alternatively we need to make clear that blocks should not share names between text and html templates.
2016-06-02 08:40:59 +02:00
Fabien Potencier a2400a8dd1 bumped version to 1.24.2-DEV 2016-05-30 11:17:27 +02:00
Fabien Potencier 3566d311a9 prepared the 1.24.1 release 2016-05-30 11:11:59 +02:00
Filip Procházka 99e9d1cf41 handle Throwable 2016-05-13 12:08:51 +02:00
Hugo Hamon 2e02f73bf7 [ExpressionParser] forbids true, false, null and none keywords for variables names. 2016-04-23 16:02:43 +02:00
chalasr d455b52e6b Clarify exception message in Twig_Template::getAttribute
Add missing parenthesis

Adapt twig.c extension

Update the C extension

Use php_ucfirst instead of ucfirst

Try to implement a TWIG_UCFIRST in C extension

Last try ucfirst

Rollback twig.c extension

Remove useless ucfirst + update twig.c extension

Fix mis-escaped char

Repeat argument item for sprintf (first try doesnt work)

Remove unexpected breakline in code
2016-03-31 13:09:57 +02:00
Fabien Potencier 212730aa48 marked some Twig_Environment methods as being internal 2016-01-27 06:24:02 +01:00
Fabien Potencier 317f22132d bumped version to 1.24.1-DEV 2016-01-25 22:25:12 +01:00
Fabien Potencier 3e5aa30ebf prepared the 1.24.0 release 2016-01-25 22:22:18 +01:00
Fabien Potencier 25acc19e22 bumped version to 1.24 2016-01-25 22:21:03 +01:00
Fabien Potencier cdd57f33b5 adding support for the ?? operator 2016-01-25 17:15:20 +01:00