Permalink
Switch branches/tags
Commits on Mar 22, 2012
  1. prepared the 1.6.3 release

    fabpot committed Mar 22, 2012
Commits on Mar 19, 2012
  1. merged branch shieldo/patch-1 (PR #670)

    fabpot committed Mar 19, 2012
    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. :)
  2. simplified code

    fabpot committed Mar 19, 2012
  3. fixed incorrect docblock

    shieldo committed Mar 19, 2012
Commits on Mar 18, 2012
  1. fixed compilation of numeric values used in templates when using a lo…

    fabpot committed Mar 18, 2012
    …cale where the decimal separator is not a dot
  2. simplified tests

    fabpot committed Mar 17, 2012
  3. made the strategy used to guess the real template file name and line …

    fabpot committed Mar 17, 2012
    …number in exception messages much faster and more accurate (refs #647)
  4. bumped version to 1.7.0-DEV

    fabpot committed Mar 18, 2012
  5. prepared the 1.6.2 release

    fabpot committed Mar 18, 2012
Commits on Mar 17, 2012
  1. fixed sandbox mode when used with inheritance (closes #656)

    fabpot committed Mar 17, 2012
    The checkSecurity() method must be called by each template as we are not
    using inheritance.
Commits on Mar 15, 2012
  1. merged branch stof/trim_filter (PR #662)

    fabpot committed Mar 15, 2012
    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.
Commits on Mar 13, 2012
  1. merged branch raulfraile/patch-1 (PR #665)

    fabpot committed Mar 13, 2012
    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.
Commits on Mar 12, 2012
  1. Added a trim filter

    stof committed Mar 12, 2012
    Closes #634
Commits on Mar 10, 2012
  1. merged branch andrerom/patch-1 (PR #658)

    fabpot committed Mar 10, 2012
    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.
  2. Added missing @throws in Twig_LoaderInterface

    andrerom committed Mar 10, 2012
    Based on Twig_Loader_Chain implementation, this seems to be the possible exceptions that can be thrown by loaders.
Commits on Mar 1, 2012
  1. fixed typo

    fabpot committed Mar 1, 2012
Commits on Feb 29, 2012
  1. fixed previous commit

    fabpot committed Feb 29, 2012
  2. merged branch robo47/docs-install-via-composer (PR #648)

    fabpot committed Feb 29, 2012
    Commits
    -------
    
    7153ff6 Installing twig via composer
    
    Discussion
    ----------
    
    Installing twig via composer
    
    Installing twig via composer
  3. bumped Twig version

    fabpot committed Feb 29, 2012
  4. fixed typo in the doc

    fabpot committed Feb 29, 2012
  5. fixed typos in the doc

    fabpot committed Feb 29, 2012
  6. prepared the 1.6.1 release

    fabpot committed Feb 29, 2012
Commits on Feb 28, 2012
  1. fixed Twig C extension

    fabpot committed Feb 28, 2012
  2. fixed CS

    fabpot committed Feb 28, 2012
  3. added some unit tests

    fabpot committed Feb 28, 2012
Commits on Feb 27, 2012
  1. Installing twig via composer

    robo47 committed Feb 27, 2012
Commits on Feb 21, 2012
Commits on Feb 19, 2012
  1. Revert "merged branch m0ppers/master (PR #611)"

    fabpot committed Feb 19, 2012
    This reverts commit 5f4e6d7, reversing
    changes made to a61d420.