Commit Graph

3250 Commits

Author SHA1 Message Date
Fabien Potencier 212ea63ae3 Merge branch '1.x' into 2.x
* 1.x:
  add machine-readable version constants
  Fixing wrong function name in deprecation notice
  bumped version to 1.27.1-DEV
  prepared the 1.27.0 release
2016-11-07 11:39:28 -08:00
Fabien Potencier c575ff2119 minor #2222 add machine-readable version constants (xabbuh)
This PR was merged into the 1.x branch.

Discussion
----------

add machine-readable version constants

This will make it easier to implement version depending features (see https://github.com/symfony/symfony/pull/20440#discussion_r86840491 for an example).

Commits
-------

bf07db4 add machine-readable version constants
2016-11-07 11:37:58 -08:00
Christian Flothmann bf07db4f13 add machine-readable version constants 2016-11-07 19:49:36 +01:00
Fabien Potencier eeeb1c35f8 minor #2209 Fixing wrong function name in deprecation notice (kubawerlos)
This PR was merged into the 1.x branch.

Discussion
----------

Fixing wrong function name in deprecation notice

Commits
-------

0a3d3c7 Fixing wrong function name in deprecation notice
2016-10-28 07:39:51 -07:00
Kuba Werłos 0a3d3c7ce1 Fixing wrong function name in deprecation notice 2016-10-28 15:26:19 +02:00
Fabien Potencier 3ff5abf75b bumped version to 1.27.1-DEV 2016-10-25 12:28:14 -07:00
Fabien Potencier 3c6c0033fd prepared the 1.27.0 release v1.27.0 2016-10-25 12:17:17 -07:00
Fabien Potencier 50c8024766 Merge branch '1.x' into 2.x
* 1.x:
  fixed undefined variables
2016-10-25 10:31:35 -07:00
Fabien Potencier 5e396e559d fixed undefined variables 2016-10-25 10:31:00 -07:00
Fabien Potencier 5e4fa99dc9 removed obsolete code 2016-10-24 16:59:56 -07:00
Fabien Potencier 262d1b6cff Merge branch '1.x' into 2.x
* 1.x:
  deprecated Twig_Parser::getEnvironment()
  moved tests handling in Twig_ParserExpression instead of Twig_Extension_Core
2016-10-24 16:58:36 -07:00
Fabien Potencier 2555dd009c feature #2206 Move tests handling in Twig_ParserExpression instead of Twig_Extension_Core (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

Move tests handling in Twig_ParserExpression instead of Twig_Extension_Core

In my quest to better organize the layers in Twig, I've always find the way we deal with test a bit awkward. This PR moves the code from the Core extension to the Parser, where it belongs, even if if makes hardcoding 'is' and 'is not' twice, but I think SOC is more important here. Especially as I want to remove the `getEnvironment()` from the Parser class at some point. Having everything centralized helps a lot.

Commits
-------

4deb03a deprecated Twig_Parser::getEnvironment()
0d6686e moved tests handling in Twig_ParserExpression instead of Twig_Extension_Core
2016-10-24 16:48:00 -07:00
Fabien Potencier 4deb03aeb1 deprecated Twig_Parser::getEnvironment() 2016-10-24 16:37:44 -07:00
Fabien Potencier 0d6686ec30 moved tests handling in Twig_ParserExpression instead of Twig_Extension_Core 2016-10-24 16:37:28 -07:00
Fabien Potencier b31222134b minor #2205 removed code specific to older versions of PHP (fabpot)
This PR was merged into the 2.x branch.

Discussion
----------

removed code specific to older versions of PHP

Commits
-------

273d0d3 removed code specific to older versions of PHP
2016-10-24 16:05:22 -07:00
Fabien Potencier 273d0d3f98 removed code specific to older versions of PHP 2016-10-24 14:54:48 -07:00
Fabien Potencier a4f31885a3 removed obsolete code 2016-10-24 08:27:35 -07:00
Fabien Potencier 6c60f432db Merge branch '1.x'
* 1.x:
  deprecated Twig_Compiler::addIndentation()
  added a note about when to remove a workaround
  deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor()
2016-10-24 08:27:08 -07:00
Fabien Potencier 9cab8b9f37 feature #2202 deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor() (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor()

I don't even understand why these methods are here. It looks like they never had any usage in the core.

Commits
-------

31c444b deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor()
2016-10-24 08:26:26 -07:00
Fabien Potencier cefaecfc38 feature #2203 deprecated Twig_Compiler::addIndentation() (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

deprecated Twig_Compiler::addIndentation()

Commits
-------

bc499a4 deprecated Twig_Compiler::addIndentation()
2016-10-24 08:25:31 -07:00
Fabien Potencier bc499a47e1 deprecated Twig_Compiler::addIndentation() 2016-10-23 22:44:52 -07:00
Fabien Potencier 7e5c06a3be added a note about when to remove a workaround 2016-10-23 14:24:54 -07:00
Fabien Potencier 31c444b511 deprecated Twig_Parser::addHandler() and Twig_Parser::addNodeVisitor() 2016-10-23 13:50:47 -07:00
Fabien Potencier cda9a0f7a4 Merge branch '1.x'
* 1.x:
  fixed regression when registering two extensions having the same class name
2016-10-23 13:17:01 -07:00
Fabien Potencier c97f3b85c3 bug #2200 fixed regression when registering two extensions with the same class (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed regression when registering two extensions with the same class

fixed #2165

Commits
-------

47432f3 fixed regression when registering two extensions having the same class name
2016-10-23 13:13:39 -07:00
Fabien Potencier 47432f3244 fixed regression when registering two extensions having the same class name 2016-10-23 13:11:53 -07:00
Fabien Potencier 02c0cb59f3 removed obsolete code 2016-10-21 20:25:38 -07:00
Fabien Potencier 37cacdcde8 Merge branch '1.x'
* 1.x:
  removed unneeded abstraction
2016-10-21 20:24:15 -07:00
Fabien Potencier 09bf2bae50 removed unneeded abstraction 2016-10-21 20:23:53 -07:00
Fabien Potencier 07957af326 removed obsolete doc 2016-10-21 17:38:22 -07:00
Fabien Potencier 4eaa29cfae removed obsolete code 2016-10-21 17:36:37 -07:00
Fabien Potencier 0fdae163ea Merge branch '1.x'
* 1.x:
  added missing phpdoc
  made using Twig_SourceContextLoaderInterface required
  made name required for Twig_Source
2016-10-21 17:29:34 -07:00
Fabien Potencier d6e60740d9 added missing phpdoc 2016-10-21 17:19:12 -07:00
Fabien Potencier e98816cfd4 feature #2199 make getSourceContext a requirement for any loader (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
2016-10-21 17:15:21 -07:00
Fabien Potencier 21ecba8c44 made using Twig_SourceContextLoaderInterface required 2016-10-21 17:07:14 -07:00
Fabien Potencier 8c337082bb made name required for Twig_Source 2016-10-21 16:09:51 -07:00
Fabien Potencier 9c50224837 Merge branch '1.x'
* 1.x:
  fixed the filesystem loader with relative paths
2016-10-21 07:04:16 -07:00
Fabien Potencier fbf1391cbd feature #2195 fixed the filesystem loader with relative paths (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed the filesystem loader with relative paths

closes #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
2016-10-21 07:02:50 -07:00
Fabien Potencier a343c92805 fixed the filesystem loader with relative paths 2016-10-21 06:52:23 -07:00
Fabien Potencier 2e10b897ba Merge branch '1.x'
* 1.x:
  fixed Twig_Loader_Chain logic
2016-10-20 08:18:42 -07:00
Fabien Potencier 09aa73f2f2 bug #2192 fixed Twig_Loader_Chain logic (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed Twig_Loader_Chain logic

Commits
-------

a2b9426 fixed Twig_Loader_Chain logic
2016-10-20 08:17:54 -07:00
Fabien Potencier 582cf0bda3 removed obsolete code 2016-10-20 08:16:18 -07:00
Fabien Potencier 0e6740616f Merge branch '1.x'
* 1.x:
  deprecated not supported behavior
2016-10-20 08:16:00 -07:00
Fabien Potencier 345d683e15 minor #2194 deprecated not supported behavior (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

deprecated not supported behavior

Commits
-------

b38f959 deprecated not supported behavior
2016-10-20 08:15:51 -07:00
Fabien Potencier b38f9596e1 deprecated not supported behavior 2016-10-20 07:54:47 -07:00
Fabien Potencier 3d2994b446 Merge branch '1.x'
* 1.x:
  fixed typo
2016-10-19 15:18:41 -07:00
Fabien Potencier 74c1a5d400 fixed typo 2016-10-19 15:18:36 -07:00
Fabien Potencier 917c4678d6 removed obsolete code 2016-10-19 15:10:14 -07:00
Fabien Potencier 7f50a5e8d4 Merge branch '1.x'
* 1.x:
  renamed Twig_Node::getLine() to Twig_Node::getTemplateLine()
  renamed Twig_Node::getName() to Twig_Node::getTemplateName()
  fix deprecation version number
2016-10-19 15:07:54 -07:00
Fabien Potencier 801902ef31 feature #2193 rename Twig_Node::getName to getTemplateName and 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()
2016-10-19 15:05:57 -07:00