Commit Graph

1353 Commits

Author SHA1 Message Date
Fabien Potencier 53e89ef2eb fixed doc indexes 2012-04-03 09:07:53 +02:00
Fabien Potencier e9c1433a99 renamed a test 2012-04-03 09:07:04 +02:00
Fabien Potencier 1f6e640d96 added compilation checks to avoid misuses of the sandbox tag 2012-04-03 09:03:41 +02:00
Fabien Potencier 2055f567f9 fixed Twig unit tests when a template must throw an exception 2012-04-03 08:59:31 +02:00
Fabien Potencier 3f962ba89e enhance error reporting in Twig unit tests 2012-04-03 08:49:35 +02:00
Fabien Potencier 8656bd2afe added doc for the sandbox tag 2012-04-03 08:38:32 +02:00
Fabien Potencier 7ea15600ee added a note about sandbox policy checks in the doc (refs #677) 2012-04-03 07:32:06 +02:00
Fabien Potencier 999e54efb0 fixed filesystem loader freshness logic for high traffic websites (closes #682) 2012-04-03 07:20:26 +02:00
Fabien Potencier 50421c8620 bumped version to 1.6.4-DEV 2012-04-02 19:45:40 +02:00
Fabien Potencier ff61094aa3 prepared the 1.6.4 release v1.6.4 2012-04-02 19:42:18 +02:00
Fabien Potencier aa4efe1c0a updated CHANGELOG 2012-04-01 10:25:37 +02:00
Fabien Potencier 9473315752 fixed file permission 2012-04-01 10:24:05 +02:00
Fabien Potencier e3b5998a6d merged branch Nami-Doc/patch-1 (PR #680)
Commits
-------

27ffef0 The question I'm asking myself now is : how could I get $trace['line'] is not set if there's a check before the <= ? anyway, fixed
36618fe fix a bug where when an error would be thrown through the loader (Twig_Error_Loader by Twig_Loader_Filesystem, ie) the $trace['line'] would not be set (since we're not in a template)

Discussion
----------

fix a bug where when an error would be thrown through the loader

(Twig_Error_Loader by Twig_Loader_Filesystem, ie) the $trace['line'] would not be set (since we're not in a template)

thanks

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

by Nami-Doc at 2012-03-31T20:00:31Z

fixed, thanks @stof. Now I wonder (as I just wrote) : how could I get the error with that isset here ?

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

by stof at 2012-03-31T20:05:45Z

@Nami-Doc what was the exact error you got ?

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

by Nami-Doc at 2012-03-31T20:09:51Z

Php states that $trace['line'] isn't set

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

by Nami-Doc at 2012-03-31T20:23:33Z

O.K., got it. this has been fixed in #675, but composer (great tool) installed me last tag, but I think it's better to check it outside the loop anyway (micro-micro-optimisation)
2012-04-01 10:22:57 +02:00
Fabien Potencier 27f55cc567 fixed performance when compiling large files 2012-04-01 10:06:09 +02:00
Nami-Doc 27ffef077a The question I'm asking myself now is : how could I get $trace['line'] is not set if there's a check before the <= ? anyway, fixed 2012-03-31 22:59:45 +03:00
Nami-Doc 36618fe101 fix a bug where when an error would be thrown through the loader (Twig_Error_Loader by Twig_Loader_Filesystem, ie) the $trace['line'] would not be set (since we're not in a template) 2012-03-31 19:45:34 +03:00
Fabien Potencier dfb523eab6 made a small optimization when there is only one trait used in a template 2012-03-31 15:26:42 +02:00
Fabien Potencier 1e9a1ae0be optimized parent template creation when the template does not use dynamic inheritance 2012-03-31 15:21:57 +02:00
Fabien Potencier 6e2fd68e7b merged branch lyrixx/error-guess (PR #675)
Commits
-------

d0ae029 Fixed notice in Twig_Error::guessTemplateLine

Discussion
----------

Fixed notice in Twig_Error::guessTemplateLine

Sometimes, `trace['line']` is not available and makes notice.

You can see tests in https://github.com/lyrixx/Silex-Kitchen-Edition/tree/composer.
2012-03-24 00:23:13 +01:00
Grégoire Pineau d0ae0294c0 Fixed notice in Twig_Error::guessTemplateLine 2012-03-23 23:59:21 +01:00
Fabien Potencier a980023df8 merged branch carbonatethis/Documentation (PR #674)
Commits
-------

bf0cc53 Added code snippet to documentation to describe handling null values with date filter

Discussion
----------

Date filter docs update

Added code snippet to documentation to describe handling null values with date filter
2012-03-22 19:43:11 +01:00
cb bf0cc537e3 Added code snippet to documentation to describe handling null values with date filter 2012-03-22 13:12:09 -05:00
Fabien Potencier ab016bd605 bumped version to 1.6.4-DEV 2012-03-22 18:31:45 +01:00
Fabien Potencier c2a53a2614 prepared the 1.6.3 release v1.6.3 2012-03-22 18:28:15 +01:00
Fabien Potencier a4fa6db03b added documentation for the trim filter 2012-03-22 14:34:27 +01:00
Fabien Potencier 4a0773a8ad fixed usage of Z_ADDREF_P for PHP 5.2 in the C extension 2012-03-22 14:25:00 +01:00
Fabien Potencier 405cbb5be2 merged branch shieldo/patch-1 (PR #670)
Commits
-------

7f0cca0 fixed incorrect docblock

Discussion
----------

fixed incorrect docblock

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

by shieldo at 2012-03-19T18:15:41Z

True, and done.

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

by fabpot at 2012-03-19T18:19:33Z

Can you rebase your PR and squash your commits so that we don't have the merge? Thanks.

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

by shieldo at 2012-03-19T18:43:28Z

Sorry about that.  Done. :)
2012-03-19 19:52:05 +01:00
Fabien Potencier 141d622dc9 simplified code 2012-03-19 19:17:36 +01:00
Douglas Greenshields 7f0cca0f7c fixed incorrect docblock 2012-03-19 18:13:53 +00:00
Fabien Potencier 90931b0a27 fixed compilation of numeric values used in templates when using a locale where the decimal separator is not a dot 2012-03-19 00:08:15 +01:00
Fabien Potencier 96632fb481 simplified tests 2012-03-18 03:33:46 +01:00
Fabien Potencier 49ee8d6e41 made the strategy used to guess the real template file name and line number in exception messages much faster and more accurate (refs #647) 2012-03-18 03:33:46 +01:00
Fabien Potencier 2ecd314dc1 bumped version to 1.7.0-DEV 2012-03-18 03:33:04 +01:00
Fabien Potencier f43cc520d6 prepared the 1.6.2 release v1.6.2 2012-03-18 03:23:00 +01:00
Fabien Potencier 50e73b20cb fixed sandbox mode when used with inheritance (closes #656)
The checkSecurity() method must be called by each template as we are not
using inheritance.
2012-03-17 17:11:40 +01:00
Fabien Potencier c0a9c8bb3e added preserveKeys support for the slice filter (closes #669) 2012-03-17 12:42:13 +01:00
Fabien Potencier a3310e75a1 fixed the date filter when a DateTime instance is passed with a specific timezone (closes #660) 2012-03-15 17:24:51 +01:00
Fabien Potencier f1186c3832 merged branch stof/trim_filter (PR #662)
Commits
-------

d942d11 Added a trim filter

Discussion
----------

Added a trim filter

This adds a trim filter in Twig as most people thought it deserves being in the core rather than in the extensions.

Closes #634

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

by fabpot at 2012-03-13T16:47:15Z

I would have added a second option to control whether you trim on both side, only on the left, or only the right. What do you think?

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

by nikic at 2012-03-13T17:15:43Z

@fabpot In that case I'd rather add two additional functions `trim_left` (mapping to `ltrim`) and `trim_right` (mapping to `rtrim`). Should be more obvious than some flag at the end :)

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

by stof at 2012-03-13T18:47:38Z

I tend to think that separate filters would indeed be more obvious. What do you prefer @fabpot ?

And for the flag, how would you specify the option to use ? Using a string ? Using boolean flags is not appropriate here (as we have 3 meaningful cases) and I don't really like the string solution.

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

by fabpot at 2012-03-13T18:53:08Z

I don't like the idea of having 3 different filter just for trimming. That seems overkill to me.

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

by stof at 2012-03-13T19:14:12Z

which API do you suggest for the filter then ?

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

by fabpot at 2012-03-13T19:23:51Z

I've no definitive idea. So, perhaps we can just merge what you've done for now.

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

by Koc at 2012-03-13T20:17:17Z

+1 for merge this. There are different filters for different trimming.

I cannot remember but there are some situations when we got string with whitespaces in variable and `{{- my_variable -}}` couldn't help and we cann't use `spaceless` filter because `my_vaiable` contains not html for example.

upd: oh, sorry, I haven't noticed comment from @nikic .

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

by Tobion at 2012-03-13T21:05:09Z

I suggest `function trim($left = true, $right = true)` but `left` and `right` could also be strings.
That would cover all cases.

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

by raulfraile at 2012-03-13T23:43:28Z

I think 3 different filters would be much clearer than using string/boolean parameters. IMO is the same case than strtolower/strtoupper.
2012-03-15 07:25:00 +01:00
Fabien Potencier f034073fed merged branch raulfraile/patch-1 (PR #665)
Commits
-------

0519419 Updated 'convert_encoding' filter documentation

Discussion
----------

Updated 'convert_encoding' filter documentation

Updated 'convert_encoding' filter documentation to clarify which extension will be used in case both `iconv` and `mbstring` are installed.
2012-03-13 17:44:20 +01:00
Raul Fraile 0519419bfd Updated 'convert_encoding' filter documentation 2012-03-13 17:33:49 +01:00
Christophe Coevoet d942d11f2f Added a trim filter
Closes #634
2012-03-12 14:56:44 +01:00
Fabien Potencier c5ef990807 merged branch andrerom/patch-1 (PR #658)
Commits
-------

be07174 Added @return doc on Twig_LoaderInterface->isFresh()
8315992 Added missing @throws in Twig_LoaderInterface

Discussion
----------

Added missing @throws in Twig_LoaderInterface

Based on Twig_Loader_Chain implementation, this seems to be the possible exception that can be thrown by loaders.
2012-03-10 19:52:41 +01:00
andrerom be0717431c Added @return doc on Twig_LoaderInterface->isFresh() 2012-03-10 16:58:52 +01:00
andrerom 8315992979 Added missing @throws in Twig_LoaderInterface
Based on Twig_Loader_Chain implementation, this seems to be the possible exceptions that can be thrown by loaders.
2012-03-10 16:39:02 +01:00
Fabien Potencier 9f322ab2fd fixed typo 2012-03-01 15:11:11 +01:00
Fabien Potencier e765183c62 fixed previous commit 2012-02-29 22:20:34 +01:00
Fabien Potencier a64a98431f merged branch robo47/docs-install-via-composer (PR #648)
Commits
-------

7153ff6 Installing twig via composer

Discussion
----------

Installing twig via composer

Installing twig via composer
2012-02-29 22:18:38 +01:00
Fabien Potencier c18a0e60fe bumped Twig version 2012-02-29 22:10:49 +01:00
Fabien Potencier 75b954c183 fixed typo in the doc 2012-02-29 22:02:48 +01:00
Fabien Potencier e9cfd2ec85 fixed typos in the doc 2012-02-29 22:00:20 +01:00