Permalink
Commits on Jan 11, 2016
  1. bug #1930 Fix Parser context push on stack (molaux)

    This PR was squashed before being merged into the 1.x branch (closes #1930).
    
    Discussion
    ----------
    
    Fix Parser context push on stack
    
    Hello,
    
    With php7RC8, in Twig_Parser, parse method starts by saving current context in
    copying self properties on stack. It sounds like get_object_vars returns now
    references instead of copies of properties (at least for arrays). Consequently,
    when reinitializing Parser for subparse line 92 to 99, the preserved context on
    stack was also erased.
    
    As a result, when calling {{ parent() }} after a {%embed%}{%endembed%}, the restored blockStack being empty, Twig throws a Twig_Error_Syntax('Calling "parent" outside a block is forbidden.'), despite the fact it is really in a block that extends another.
    When calling {{ parent() }} before  the embed tag, all works properly. (It seems that the empty context, resulting of subparses, is not a problem as far as you don't need to access it)
    
    Commits
    -------
    
    07ebdfe Fix Parser context push on stack
    fabpot committed Jan 11, 2016
  2. Fix Parser context push on stack

    molaux committed with fabpot Dec 1, 2015
  3. bumped version to 1.23.4-DEV

    fabpot committed Jan 11, 2016
  4. prepared the 1.23.3 release

    fabpot committed Jan 11, 2016
  5. minor #1958 Fxi typo (SpacePossum)

    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    Fxi typo
    
    twigphp#1957
    and
    twigphp#1956
    
    Commits
    -------
    
    88ab45b Fix typo.
    fabpot committed Jan 11, 2016
  6. Fix typo.

    SpacePossum committed Jan 11, 2016
  7. bumped version to 1.23.3-DEV

    fabpot committed Jan 11, 2016
  8. prepared the 1.23.2 release

    fabpot committed Jan 11, 2016
  9. updated CHANGELOG

    fabpot committed Jan 11, 2016
  10. minor #1954 Improve deprecations message (Ener-Getick)

    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    Improve deprecations message
    
    This PR specifies the version in which some ``Twig_SimpleTest`` were deprecated to make it easier to upgrade a package.
    
    Commits
    -------
    
    fdb1937 Improve deprecations message Add the version in the message
    fabpot committed Jan 11, 2016
  11. bug #1953 rtrim cache dir (SpacePossum)

    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    rtrim cache dir
    
    @see #1951
    
    Commits
    -------
    
    c3ec2fb Make file cache tolerant for trailing (back)slashes on directory configuration.
    fabpot committed Jan 11, 2016
Commits on Jan 7, 2016
  1. minor #1929 [DOC] Fixed typos in advanced.rst (althaus)

    This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #1929).
    
    Discussion
    ----------
    
    [DOC] Fixed typos in advanced.rst
    
    Hey,
    
    there are two typos of `Interace`. Although it sounds cool, `Interface` works better for copy and paste.
    
    Cheers
    Matthais
    
    Commits
    -------
    
    57cd302 [DOC] Fixed typos in advanced.rst
    fabpot committed Jan 7, 2016
  2. [DOC] Fixed typos in advanced.rst

    There are two typos of `Interace`. Although it sounds cool, `Interface` works better for copy and paste.
    althaus committed with fabpot Nov 27, 2015
  3. Improve deprecations message

    Add the version in the message
    GuilhemN committed Jan 6, 2016
Commits on Jan 6, 2016
Commits on Jan 3, 2016
  1. minor #1952 Update copyright year (jeroenvisser101)

    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    Update copyright year
    
    Happy new year!
    
    Commits
    -------
    
    c07c4ab Update copyright year
    fabpot committed Jan 3, 2016
Commits on Jan 1, 2016
  1. Update copyright year

    Happy new year!
    jeroenvisser101 committed Jan 1, 2016
Commits on Dec 26, 2015
  1. minor #1940 Removed usage of deprecated constant (hason)

    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    Removed usage of deprecated constant
    
    Commits
    -------
    
    f19318d Removed usage of deprecated constant
    fabpot committed Dec 26, 2015
  2. minor #1945 skip read-only dir tests on windows and cleanup tmp dirs …

    …correctly (Tobion)
    
    This PR was squashed before being merged into the 1.x branch (closes #1945).
    
    Discussion
    ----------
    
    skip read-only dir tests on windows and cleanup tmp dirs correctly
    
    - fix tests on windows (skipping them as read-only dirs are not possible on windows, only read-only files; read-only attribute on folders (`exec('attrib +R '`) does not prevent files to be created inside them)
    - correctly cleanup tmp directories at the end of tests
    
    Commits
    -------
    
    c6601a1 skip read-only dir tests on windows and cleanup tmp dirs correctly
    fabpot committed Dec 26, 2015
Commits on Dec 14, 2015
Commits on Nov 17, 2015
  1. minor #1921 Fixing a slight typo in interface (jez-strawberrysoup)

    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    Fixing a slight typo in interface
    
    Just a typo in the ExtensionInterface
    
    Commits
    -------
    
    de15975 Fixing a slight typo in interface
    fabpot committed Nov 17, 2015
Commits on Nov 12, 2015
  1. made a small refactoring

    fabpot committed Nov 12, 2015
Commits on Nov 11, 2015
  1. fixed typo

    fabpot committed Nov 11, 2015
Commits on Nov 8, 2015
Commits on Nov 5, 2015
  1. bumped version to 1.23.2-DEV

    fabpot committed Nov 5, 2015
  2. prepared the 1.23.1 release

    fabpot committed Nov 5, 2015
  3. updated CHANGELOG

    fabpot committed Nov 5, 2015
  4. minor #1910 Code grooming (SpacePossum)

    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    Code grooming
    
    Commits
    -------
    
    aa7c53a Add dot to the end of exception messages.
    b8a6e72 set back default
    0f5f9aa Typo in doc
    8bb9b83 CS
    355213b static vs. self
    d4e3ada Code grooming
    fabpot committed Nov 5, 2015
  5. set back default

    SpacePossum committed Nov 5, 2015
  6. Typo in doc

    SpacePossum committed Nov 5, 2015
  7. CS

    SpacePossum committed Nov 5, 2015
  8. static vs. self

    SpacePossum committed Nov 5, 2015