Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace Twig_SimpleFunction and Twig_Function with Timber_Function by extending both classes depending on Twig version #1464

Merged
merged 21 commits into from Jul 17, 2017
Merged

Replace Twig_SimpleFunction and Twig_Function with Timber_Function by extending both classes depending on Twig version #1464

merged 21 commits into from Jul 17, 2017

Commits on Jun 25, 2017

  1. Replace Twig_SimpleFunction with Twig_Function

    Luís Silva committed Jun 25, 2017
    Copy the full SHA
    eebfc90 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into develop

    Luís Silva committed Jun 25, 2017
    Copy the full SHA
    b2b3fe3 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into develop

    Luís Silva committed Jun 25, 2017
    Copy the full SHA
    8fbfb07 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of https://github.com/luism-s/timber into develop

    Luís Silva committed Jun 25, 2017
    Copy the full SHA
    3843d08 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2017

  1. Merge branch 'master' into develop

    @jarednova
    jarednova committed Jul 7, 2017
    Copy the full SHA
    bc30442 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/timber/timber into develop

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    dafe765 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/luism-s/timber into develop

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    420b1fb View commit details
    Browse the repository at this point in the history

  4. Add composer.lock just to see

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    7653fc3 View commit details
    Browse the repository at this point in the history

  5. Forget composer.lock and try only one version of Twig

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    554b34a View commit details
    Browse the repository at this point in the history

  6. "@luism-s the reason is that Twig 2.x is only compatible w PHP 7+. Wh… 

    …ile this is a wonderful future, that's only about 12% of WP users. So I want to be future-friendly while supporting the other ~88% of users who are on 5.x." bah not fun
    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    b10d8d3 View commit details
    Browse the repository at this point in the history

  7. Test Timber_Function idea

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    a189d7f View commit details
    Browse the repository at this point in the history

  8. Fix namespace bug

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    fca8023 View commit details
    Browse the repository at this point in the history

  9. Timber_Function is part of Timber namespace.. duh

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    2ceba28 View commit details
    Browse the repository at this point in the history

  10. extend Timber_Function from Twig_Function or Twig_SimpleFunction, dep… 

    …ending on Twig version
    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    5970c56 View commit details
    Browse the repository at this point in the history

  11. Fix namespace issue in test

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    40d244a View commit details
    Browse the repository at this point in the history

  12. Add some unit tests to rise coverage

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    3676ac3 View commit details
    Browse the repository at this point in the history

  13. Fix bug in _e function tests

    Luís Silva committed Jul 7, 2017
    Copy the full SHA
    7917d09 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2017

  1. Rename Timber\Timber_Function to Timber\Twig_Function

    Luís Silva committed Jul 17, 2017
    Copy the full SHA
    662e090 View commit details
    Browse the repository at this point in the history

  2. Add 'use' statements

    Luís Silva committed Jul 17, 2017
    Copy the full SHA
    1780137 View commit details
    Browse the repository at this point in the history

  3. Rename Twig Function file

    Luís Silva committed Jul 17, 2017
    Copy the full SHA
    2757d82 View commit details
    Browse the repository at this point in the history

  4. Remove unecessary use statement for Timber\Twig_Function

    Luís Silva committed Jul 17, 2017
    Copy the full SHA
    0e4ea6c View commit details
    Browse the repository at this point in the history