Skip to content
Permalink
Branch: master
Commits on Oct 22, 2016
  1. removed obsolete doc

    fabpot committed Oct 22, 2016
  2. removed obsolete code

    fabpot committed Oct 22, 2016
  3. Merge branch '1.x'

    fabpot committed Oct 22, 2016
    * 1.x:
      added missing phpdoc
      made using Twig_SourceContextLoaderInterface required
      made name required for Twig_Source
  4. added missing phpdoc

    fabpot committed Oct 22, 2016
  5. feature twigphp#2199 make getSourceContext a requirement for any load…

    fabpot committed Oct 22, 2016
    …er (fabpot)
    
    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    make getSourceContext a requirement for any loader
    
    I'm going to follow the same protocol as for `Twig_ExistsLoaderInterface`.
    
    Commits
    -------
    
    21ecba8 made using Twig_SourceContextLoaderInterface required
    8c33708 made name required for Twig_Source
Commits on Oct 21, 2016
  1. Merge branch '1.x'

    fabpot committed Oct 21, 2016
    * 1.x:
      fixed the filesystem loader with relative paths
  2. feature twigphp#2195 fixed the filesystem loader with relative paths …

    fabpot committed Oct 21, 2016
    …(fabpot)
    
    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    fixed the filesystem loader with relative paths
    
    closes twigphp#2145
    
    TODO
    
     - [x] document the new `$rootPath` option
     - [x] add test with a `$rootPath` different from `getcwd()`
     - [x] test the cache key does not vary when `$rootPath` changes
    
    Commits
    -------
    
    a343c92 fixed the filesystem loader with relative paths
Commits on Oct 20, 2016
  1. Merge branch '1.x'

    fabpot committed Oct 20, 2016
    * 1.x:
      fixed Twig_Loader_Chain logic
  2. bug twigphp#2192 fixed Twig_Loader_Chain logic (fabpot)

    fabpot committed Oct 20, 2016
    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    fixed Twig_Loader_Chain logic
    
    Commits
    -------
    
    a2b9426 fixed Twig_Loader_Chain logic
  3. removed obsolete code

    fabpot committed Oct 20, 2016
  4. Merge branch '1.x'

    fabpot committed Oct 20, 2016
    * 1.x:
      deprecated not supported behavior
  5. minor twigphp#2194 deprecated not supported behavior (fabpot)

    fabpot committed Oct 20, 2016
    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    deprecated not supported behavior
    
    Commits
    -------
    
    b38f959 deprecated not supported behavior
Commits on Oct 19, 2016
  1. Merge branch '1.x'

    fabpot committed Oct 19, 2016
    * 1.x:
      fixed typo
  2. fixed typo

    fabpot committed Oct 19, 2016
  3. removed obsolete code

    fabpot committed Oct 19, 2016
  4. Merge branch '1.x'

    fabpot committed Oct 19, 2016
    * 1.x:
      renamed Twig_Node::getLine() to Twig_Node::getTemplateLine()
      renamed Twig_Node::getName() to Twig_Node::getTemplateName()
      fix deprecation version number
  5. feature twigphp#2193 rename Twig_Node::getName to getTemplateName and…

    fabpot committed Oct 19, 2016
    … Twig_Node::getFile to getTemplateLine (fabpot)
    
    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    rename Twig_Node::getName to getTemplateName and Twig_Node::getFile to getTemplateLine
    
    Commits
    -------
    
    39d94df renamed Twig_Node::getLine() to Twig_Node::getTemplateLine()
    e231aa5 renamed Twig_Node::getName() to Twig_Node::getTemplateName()
  6. fixed Twig_Loader_Chain logic

    fabpot committed Oct 19, 2016
Commits on Oct 18, 2016
  1. minor twigphp#2187 fix deprecation version number (xabbuh)

    fabpot committed Oct 18, 2016
    This PR was merged into the 1.x branch.
    
    Discussion
    ----------
    
    fix deprecation version number
    
    Commits
    -------
    
    62c092b fix deprecation version number
  2. fix deprecation version number

    xabbuh committed Oct 18, 2016
  3. Merge branch '1.x'

    fabpot committed Oct 18, 2016
    * 1.x:
      fixed usage of deprecated features
Commits on Oct 17, 2016
  1. Merge branch '1.x'

    fabpot committed Oct 17, 2016
    * 1.x:
      fixed docs
      fixed typo
      fixed typo
  2. fixed docs

    fabpot committed Oct 17, 2016
  3. fixed typo

    fabpot committed Oct 17, 2016
  4. fixed typo

    fabpot committed Oct 17, 2016
  5. Merge branch '1.x'

    fabpot committed Oct 17, 2016
    * 1.x:
      optimized generated code
  6. optimized generated code

    fabpot committed Oct 17, 2016
  7. removed obsolete code

    fabpot committed Oct 17, 2016
Older
You can’t perform that action at this time.