Permalink
Commits on Apr 2, 2012
  1. prepared the 1.6.4 release

    committed Apr 2, 2012
Commits on Apr 1, 2012
  1. updated CHANGELOG

    committed Apr 1, 2012
  2. fixed file permission

    committed Apr 1, 2012
  3. 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)
    committed Apr 1, 2012
Commits on Mar 31, 2012
  1. 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
    Nami-Doc committed Mar 31, 2012
  2. fix a bug where when an error would be thrown through the loader (Twi…

    …g_Error_Loader by Twig_Loader_Filesystem, ie) the $trace['line'] would not be set (since we're not in a template)
    Nami-Doc committed Mar 31, 2012
Commits on Mar 23, 2012
  1. 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.
    committed Mar 23, 2012
  2. @lyrixx
Commits on Mar 22, 2012
  1. 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
    committed Mar 22, 2012
  2. @carbonrobot
  3. bumped version to 1.6.4-DEV

    committed Mar 22, 2012
  4. prepared the 1.6.3 release

    committed Mar 22, 2012
Commits on Mar 19, 2012
  1. 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. :)
    committed Mar 19, 2012
  2. simplified code

    committed Mar 19, 2012
  3. @shieldo

    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…

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

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

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

    committed Mar 18, 2012
  5. prepared the 1.6.2 release

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

    The checkSecurity() method must be called by each template as we are not
    using inheritance.
    committed Mar 17, 2012
Commits on Mar 15, 2012
  1. fixed the date filter when a DateTime instance is passed with a speci…

    …fic timezone (closes #660)
    committed Mar 15, 2012
  2. 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.
    committed Mar 15, 2012
Commits on Mar 13, 2012
  1. 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.
    committed Mar 13, 2012
  2. @raulfraile
Commits on Mar 12, 2012
  1. @stof

    Added a trim filter

    Closes #634
    stof committed Mar 12, 2012
Commits on Mar 10, 2012
  1. 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.
    committed Mar 10, 2012
  2. @andrerom
  3. @andrerom

    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.
    andrerom committed Mar 10, 2012