Permalink
Commits on Oct 15, 2012
  1. prepared the 1.10.1 release

    committed Oct 15, 2012
Commits on Oct 13, 2012
  1. merged branch Adel-E/update-api-docs (PR #858)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    bee4cd1 Update doc to correspond to the following: http://twig.sensiolabs.org/documentation http://twig.sensiolabs.org/doc/filters/escape.html
    
    Discussion
    ----------
    
    Update api docs
    
    Update doc to correspond to the following:
    http://twig.sensiolabs.org/documentation
    http://twig.sensiolabs.org/doc/filters/escape.html
    committed Oct 13, 2012
Commits on Oct 12, 2012
  1. @Adel-E
  2. optimized macros when imported via the "import" tag

    This commit unifies the way macros are called independently of how they
    were included (via the from or import tag -- see e81c932).
    committed Oct 12, 2012
Commits on Oct 8, 2012
  1. merged branch pierrejoye/master (PR #855)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    d398e55 - drop tsrm fetch, not necessary as it is passed as argument already
    
    Discussion
    ----------
    
    drop unnecessary tsrmls_fetch
    committed Oct 8, 2012
  2. @pierrejoye
Commits on Oct 6, 2012
  1. refactored some unit tests

    committed Oct 6, 2012
Commits on Oct 5, 2012
  1. updated CHANGELOG

    committed Oct 5, 2012
Commits on Oct 4, 2012
  1. merged branch weltling/master (PR #854)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    b013ede fix windows build
    
    Discussion
    ----------
    
    Trivial fix for windows build
    committed Oct 4, 2012
  2. @weltling

    fix windows build

    weltling committed Oct 4, 2012
Commits on Sep 29, 2012
  1. merged branch greg0ire/patch-1 (PR #851)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    d52e15b remove tautology
    
    Discussion
    ----------
    
    remove tautology
    
    We already know the example is "for example".
    committed Sep 29, 2012
  2. fixed blanks in the doc

    committed Sep 29, 2012
  3. @greg0ire

    remove tautology

    greg0ire committed Sep 29, 2012
  4. fixed a doc anchor

    committed Sep 29, 2012
Commits on Sep 28, 2012
  1. updated CHANGELOG

    committed Sep 28, 2012
  2. fixed CS

    committed Sep 28, 2012
  3. merged branch char101/master (PR #844)

    This PR was merged into the master branch.
    
    Commits
    -------
    
    c23ef25 Add assertEquals to NativeExtensionTest.php
    9126dc6 Twig extension: fix case when accessing property of an array casted into object
    34cf8e1 Fix double free
    4980903 Enhancements for twig extension
    db3cb80 Fix NativeExtensionTest
    3485ee7 Native extension: handle dynamic properties defined in the get_properties handler in a per instance fashion.
    
    Discussion
    ----------
    
    Native extension: call get_properties in per instance manner instead of caching it.
    
    Since dynamic properties of an object can be defined by its get_properties handler, we need to call it for each instance.
    
    ---------------------------------------------------------------------------
    
    by char101 at 2012-09-21T10:30:37Z
    
    PHPUnit test result
    
    ```
    PHPUnit 3.7.1 by Sebastian Bergmann.
    
    .S...........................................................   61 / 1253 (  4%)
    .............................................................  122 / 1253 (  9%)
    .............................................................  183 / 1253 ( 14%)
    .............................................................  244 / 1253 ( 19%)
    .............................................................  305 / 1253 ( 24%)
    .............................................................  366 / 1253 ( 29%)
    .............................................................  427 / 1253 ( 34%)
    .............................................................  488 / 1253 ( 38%)
    .............................................................  549 / 1253 ( 43%)
    .............................................................  610 / 1253 ( 48%)
    .............................................................  671 / 1253 ( 53%)
    .............................................................  732 / 1253 ( 58%)
    .............................................................  793 / 1253 ( 63%)
    .............................................................  854 / 1253 ( 68%)
    .............................................................  915 / 1253 ( 73%)
    .............................................................  976 / 1253 ( 77%)
    ............................................................. 1037 / 1253 ( 82%)
    ............................................................. 1098 / 1253 ( 87%)
    ............................................................. 1159 / 1253 ( 92%)
    ............................................................. 1220 / 1253 ( 97%)
    .................................
    
    Time: 4 seconds, Memory: 13.25Mb
    
    OK, but incomplete or skipped tests!
    Tests: 1253, Assertions: 2969, Skipped: 1.
    ```
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-09-21T11:58:51Z
    
    @char101 My previous comment about the way the test should be implemented is still valid. Please rewrite it to use the same way to all other integration tests in Twig
    
    ---------------------------------------------------------------------------
    
    by char101 at 2012-09-23T04:51:36Z
    
    @stof I don't see the reason of using a fixture. The test case works, it accomplishes its goal. It's simple. It doesn't test for a feature, it tests for a specific case where PHP crashes.
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-09-23T13:53:41Z
    
    @char101 I see one: you are building a Twig instance and rendering a template here, which is exactely what the integration tests are doing.
    Btw, your test would fail when running phpunit in strict mode as it does not assert anything
    
    ---------------------------------------------------------------------------
    
    by char101 at 2012-09-24T02:05:58Z
    
    @stof I don't have the desire to change what isn't broken, but you are free to change it as you see fit. As for the assert, I have added it to the test.
    committed Sep 28, 2012
  4. bumped version to 1.10.1-DEV

    committed Sep 28, 2012
  5. prepared the 1.10.0 release

    committed Sep 28, 2012
Commits on Sep 26, 2012
  1. merged branch hason/php52 (PR #849)

    Commits
    -------
    
    adb5d4f Fixed PHP 5.2 incompatibilty
    
    Discussion
    ----------
    
    Fixed PHP 5.2 incompatibilty
    committed Sep 26, 2012
  2. @hason

    Fixed PHP 5.2 incompatibilty

    hason committed Sep 26, 2012
Commits on Sep 24, 2012
  1. @char101
Commits on Sep 21, 2012
  1. @char101
  2. @char101

    Fix double free

    char101 committed Sep 21, 2012
  3. @char101

    Enhancements for twig extension

    - Fix extension memory leak
    - Fix gcc compile warning (cast to const char *)
    - Add TWIG_HAS_DYNAMIC_PROPERTY
    - Remove the previous translation of 'array_key_exists($item, $object)'
      into TWIG_ARRAY_KEY_EXISTS when checking object property because what
      it really means is property_exists which has already been handled by
      TWIG_HAS_PROPERTY and TWIG_HAS_DYNAMIC_PROPERTY
    - Fix native extension spacing
    char101 committed Sep 21, 2012
Commits on Sep 20, 2012
  1. @char101

    Fix NativeExtensionTest

    char101 committed Sep 20, 2012
  2. @char101

    Native extension: handle dynamic properties defined in the get_proper…

    …ties handler in a per instance fashion.
    char101 committed Sep 20, 2012
Commits on Sep 18, 2012
  1. updated CHANGELOG

    committed Sep 18, 2012
  2. tweaked docs

    committed Sep 18, 2012
  3. merged branch drak/reusable_fixtures (PR #805)

    Commits
    -------
    
    36372c6 Made node tests reusable
    
    Discussion
    ----------
    
    Reusable tests and fixtures
    
    This PR makes Twig integration testing reusable for 3rd party extensions.
    
    I have implemented resuable functional tests.
    
    The [test runner](https://github.com/zikula/core/blob/master/src/Zikula/Bundle/CoreBundle/Tests/Twig/IntegrationTest.php) and the [fixtures](https://github.com/zikula/core/tree/master/src/Zikula/Bundle/CoreBundle/Tests/Twig/Fixtures) are the only part that an extension needs to implement itself.
    
    I've included documentation in the PR.
    
    ---------------------------------------------------------------------------
    
    by jusuff at 2012-08-11T20:41:55Z
    
    This PR would make things little easier. Right now tests are organized in confusing way and are hard to implement for Twig extensions
    
    ---------------------------------------------------------------------------
    
    by drak at 2012-08-14T09:09:45Z
    
    @fabpot - This is ready for merging now. When it's merged I'll update the documentation as this PR significantly eases our ability to test extensions.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-09-16T14:28:16Z
    
    @drak Do you plan to update this PR with the code you have in Zikula?
    
    ---------------------------------------------------------------------------
    
    by drak at 2012-09-16T14:37:30Z
    
    @fabpot - Yes, I just need a couple of days (or less).
    
    ---------------------------------------------------------------------------
    
    by drak at 2012-09-17T12:00:34Z
    
    @fabpot - I have ported over the code.
    
    ---------------------------------------------------------------------------
    
    by drak at 2012-09-18T08:23:18Z
    
    @fabpot - I updated Zikula to us this particular branch so there is a practical test. I've updated the links in the top description part of this PR with the relevant links. The PR also refactors Twig's core tests to use the re-usable test base classes.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-09-18T09:01:10Z
    
    @drak Can you squash your commits before I merge? Thanks.
    
    ---------------------------------------------------------------------------
    
    by drak at 2012-09-18T09:14:08Z
    
    @fabpot - I've squashed them now. Thanks!
    committed Sep 18, 2012
  4. Made node tests reusable

    Drak committed Sep 17, 2012