Commit Graph

1509 Commits

Author SHA1 Message Date
stealth35 9229ef334d Removed useless code 2012-06-27 17:57:06 +02:00
Fabien Potencier 48a0453865 fixed PHP 5.2 incompatibilty 2012-06-27 11:49:34 +02:00
Fabien Potencier 73d117e672 fixed url escaping strategy for PHP 5.2 2012-06-27 11:18:21 +02:00
Fabien Potencier 7f97a86a43 merged branch Seldaek/date_modify (PR #760)
Commits
-------

2c9e26e Fix date_modify filter for PHP 5.2

Discussion
----------

Fix date_modify filter for PHP 5.2

The return of the object was added in 5.3, this hopefully fixes it.
2012-06-27 11:12:10 +02:00
Jordi Boggiano 2c9e26edbc Fix date_modify filter for PHP 5.2 2012-06-27 10:25:59 +02:00
Fabien Potencier 7657c01e65 added support for more escaping strategies (url, css, and html_attr) 2012-06-27 09:26:36 +02:00
Fabien Potencier cd049dac38 tweaked previous commit 2012-06-26 18:24:26 +02:00
Fabien Potencier 5758be0334 merged branch Seldaek/date_modify (PR #757)
Commits
-------

ae85586 Add docs for date_modify
0366cf6 Fix docs of date filter

Discussion
----------

Date modify filter

This is probably possible via `date(foo)|modify('-1day')|format()`, but it's non obvious and a dedicated filter might be a bit more prominent.

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

by fabpot at 2012-06-22T07:01:32Z

Just a quick thought: As it modifies the date, it should probably be a function, not a filter.

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

by stof at 2012-06-22T07:24:52Z

@fabpot Aren't filters meant to transform the value ?
2012-06-26 18:23:42 +02:00
Fabien Potencier b7ca23f8be fixed nested embed tag calls 2012-06-26 18:15:55 +02:00
Fabien Potencier 73426117f9 merged branch meandmymonkey/clarify-pre_escape (PR #758)
Commits
-------

f840670 clarified documentation of pre_escape option

Discussion
----------

Clarified documentation of pre_escape option

The previous wording could be misunderstood as "tell the filter that the input has already been escaped", which is actually the opposite from how it works.
2012-06-26 17:12:23 +02:00
Andreas Hucks f8406701e5 clarified documentation of pre_escape option 2012-06-25 19:09:27 +02:00
Jordi Boggiano ae85586e6f Add docs for date_modify 2012-06-20 19:45:35 +02:00
Jordi Boggiano 0366cf6185 Fix docs of date filter 2012-06-20 19:45:27 +02:00
Fabien Potencier 4679ad51c5 bumped version to 1.8.4-DEV 2012-06-17 20:52:23 +02:00
Fabien Potencier 147e5d6d60 prepared the 1.8.3 release v1.8.3 2012-06-17 20:48:16 +02:00
Fabien Potencier 120c44d68f fixed paths in the filesystem loader when passing a path that ends with a slash or a backslash (closes #750) 2012-06-14 17:05:56 +02:00
Fabien Potencier 4618d75318 fixed typos 2012-06-14 17:02:35 +02:00
Fabien Potencier 0d5dbedef5 fixed escaping when a project defines a function named html or js (closes #724) 2012-06-14 17:00:45 +02:00
Fabien Potencier 4c9e394c38 added some information about template recompilation (closes #743) 2012-06-14 15:20:28 +02:00
Fabien Potencier 073cfd0180 tweaked doc 2012-06-14 15:15:52 +02:00
Fabien Potencier 793660510f fixed doc (closes #744) 2012-06-14 15:07:01 +02:00
Libert KHE cbe00e1417 added missing comment added (closes #476) 2012-06-14 14:58:01 +02:00
Fabien Potencier ca33207bb2 merged branch adrienbrault/patch-1 (PR #751)
Commits
-------

80a2a7e [Doc] Fix some typos

Discussion
----------

[Doc] Fix some typos

Hi!
2012-06-13 08:24:34 +02:00
Adrien Brault 80a2a7ea1d [Doc] Fix some typos 2012-06-13 01:27:42 +03:00
Fabien Potencier d4511d02b4 fixed chmod mode to apply the umask correctly (closes #749) 2012-06-10 15:14:14 +02:00
Fabien Potencier 018c52fe59 fixed a phpdoc (closes #748) 2012-06-09 08:45:24 +02:00
Fabien Potencier eec924f441 added a note in the CHANGELOG (refs #745) 2012-06-08 16:55:58 +02:00
Fabien Potencier dfc9edce33 merged branch catchamonkey/compiler_outdent (PR #747)
Commits
-------

459a076 The Compiler outdent method will now only reduce the indentation if it's OK  to do so, It moves and modifies the check up above the indentation modification.

Discussion
----------

Compiler outdent step validation moved up and modified

The Compiler outdent method will now only reduce the indentation if it's OK
to do so, It moves and modifies the check up above the indentation modification.
It's a small improvement but saves a wasted decrement of a variable, when you know an exception will be thrown immediately following it.

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

by nikic at 2012-06-07T23:18:00Z

Compared to throwing an exception decrementing a variable has practically no cost ;)

PS: Not saying that the change is bad or something like that, only saying that performance is the wrong reason to do it :)

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

by catchamonkey at 2012-06-07T23:20:23Z

Yeah, there is no performance gain, but the code only executes that which is necessary.
It's like there being no point preparing a response before you know if you are going to send it. (slightly OTT example, but you get what I mean) :)
2012-06-08 16:53:09 +02:00
Chris Sedlmayr 459a0764ea The Compiler outdent method will now only reduce the indentation if it's OK
to do so, It moves and modifies the check up above the indentation modification.
2012-06-07 23:45:55 +01:00
Fabien Potencier 6d072640c4 added Komodo to the list of supported IDEs 2012-05-31 07:17:23 +02:00
Fabien Potencier 12dff669ef added Coda 2 in the list of supported IDEs 2012-05-30 22:55:03 +02:00
Fabien Potencier 82e73f6bf2 bumped version to 1.8.3 2012-05-30 08:18:29 +02:00
Fabien Potencier 2afc513620 prepared the 1.8.2 release v1.8.2 2012-05-30 08:15:36 +02:00
Fabien Potencier b5b7224d5d fixed some CS issues 2012-05-29 20:38:42 +02:00
Fabien Potencier 26db550230 merged branch blaugueux/master (PR #736)
Commits
-------

c53a02d Fixed DateTimeZone support in date filter.

Discussion
----------

Fixed DateTimeZone support in date filter.

Now $date converted to a DateTime has a DateTimeZone in every case.

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

by fabpot at 2012-05-28T19:20:47Z

Can you add some unit tests to avoid regression to happen later? Thanks.

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

by blaugueux at 2012-05-29T07:52:58Z

@fabpot Here they are.

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

by fabpot at 2012-05-29T10:29:28Z

Great! Can you add a note in the CHANGELOG file and then squash your commit before I merge? Thanks.

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

by blaugueux at 2012-05-29T12:52:22Z

Changelog added. First squash of my life, i cannot say if it's good :(

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

by stof at 2012-05-29T12:55:26Z

it is not. you merged your remote branch instead of forcing the push

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

by blaugueux at 2012-05-29T17:12:05Z

Ok @stof, thanks for your help. I think it's good now.

@fabpot Is it ok for you ?
2012-05-29 20:09:42 +02:00
Benjamin Laugueux c53a02de1a Fixed DateTimeZone support in date filter.
Prevents the DateTime object to be updated when changing the DateTimeZone.

Unit tests added.

Updated changelog.
2012-05-29 19:09:23 +02:00
Fabien Potencier 78a935b6ff updated CHANGELOG 2012-05-28 22:55:00 +02:00
Fabien Potencier b6e417ecf7 merged branch maartendekeizer/master (PR #738)
Commits
-------

f0a0036 Add abs filter including unit test and documentation

Discussion
----------

Add abs filter to Twig

With abs it is possible to make negative values positive and leave positive values positive.

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

by maartendekeizer at 2012-05-26T19:02:34Z

Example when using abs

{% if days_left < 0 %}
    {{ days_left|abs }} days to late!
{% else %}
    {{ days_left }} days left
{% endif %}

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

by stof at 2012-05-26T19:12:43Z

I'm not sure about adding this filter in the core. I think it would be better in the Twig-extensions repo. @fabpot thoughts ?

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

by maartendekeizer at 2012-05-26T21:18:47Z

@stof abs is a really basic/natural function it belongs to the base mathematic functions. If this was an implementation of for example the ABC-formula or Pythagoras it must be in the extension repo., but abs is more core related I think.

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

by fabpot at 2012-05-27T07:11:33Z

Can you add some unit tests and squash your commits? Thanks.

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

by maartendekeizer at 2012-05-27T14:40:56Z

First time squashing commits; learned something new :-). I will add a unit test tomorrow.

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

by maartendekeizer at 2012-05-27T17:36:58Z

Unit test and documentation added.

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

by fabpot at 2012-05-27T18:41:25Z

After fixing the markup issue, you will have to squash again ;)

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

by maartendekeizer at 2012-05-27T20:44:29Z

Done

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

by fabpot at 2012-05-28T19:19:55Z

Looks like you have not squash your commits.

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

by maartendekeizer at 2012-05-28T20:05:34Z

@fabot you want one commit for the complete pr?

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

by fabpot at 2012-05-28T20:06:53Z

For such a PR, yes.
2012-05-28 22:54:16 +02:00
Maarten de Keizer f0a0036892 Add abs filter
including unit test and documentation
2012-05-28 22:27:26 +02:00
Fabien Potencier 47e9b95c37 merged branch hhamon/doc_fixes (PR #737)
Commits
-------

953a0ce [doc] fixed Composer section of the introduction. Added a side note to the Composer official documentation for getting more information.

Discussion
----------

[doc] fixed twig version in installation documentation.

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

by lyrixx at 2012-05-25T23:30:01Z

why not use something like "1.*" ?

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

by fabpot at 2012-05-26T05:55:16Z

This is just an example and we are not going to update it with each new release. So, we can either use `1.*` as suggested by @lyrixx or/and add a note referring to the Composer docs.

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

by hhamon at 2012-05-28T05:34:54Z

That's better indeed!

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

by hhamon at 2012-05-28T05:40:46Z

@fabpot you can merge this PR

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

by fabpot at 2012-05-28T06:07:05Z

Can you squash?

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

by hhamon at 2012-05-28T06:31:42Z

@fabpot squashed!
2012-05-28 08:44:30 +02:00
Hugo Hamon 953a0ce602 [doc] fixed Composer section of the introduction. Added a side note to the Composer official documentation for getting more information. 2012-05-28 08:30:24 +02:00
Fabien Potencier 45d0f6fe67 fixed an obsolete comment in phpdoc 2012-05-26 08:30:56 +02:00
Fabien Potencier 573a360971 fixed a regression when using a number in template attributes (closes #733) 2012-05-23 07:50:43 +02:00
Fabien Potencier 843e1f74ee added an example for the loop variable (closes #732) 2012-05-23 07:40:44 +02:00
Fabien Potencier 0fa26d6429 fixed compiler when mbstring.func_overload is set to 2 (closes #731) 2012-05-21 13:39:18 +02:00
Fabien Potencier e28663efd8 fixed CS 2012-05-19 09:41:36 +02:00
Fabien Potencier 875fa010ce bumped version to 1.8.2-DEV 2012-05-17 18:06:57 +02:00
Fabien Potencier 0bee037579 prepared the 1.8.1 release v1.8.1 2012-05-17 18:02:47 +02:00
Fabien Potencier 06da8234ef merged branch Tobion/patch-5 (PR #729)
Commits
-------

b692268 removed leftover of 93c4406f8 and made some language improvements

Discussion
----------

removed leftover of 93c4406f8 and made some language improvements
2012-05-17 09:08:48 +02:00
Tobias Schultze b6922682b0 removed leftover of 93c4406f8 and made some language improvements 2012-05-17 00:21:17 +03:00