Commit Graph

7732 Commits

Author SHA1 Message Date
Fabien Potencier fdff870ff1 Merge branch '1.x'
* 1.x:
  changed the way we store template source in template classes
  added missing method on Twig_Template (important for reserved keyword)
  fixed a phpdoc
  removed usage of realpath in cache key
  fixed Twig cache sharing when used with different versions of PHP
  fixed CS
  fixed a test
  fixed typo
  fixed embed parent token for simple use cases
  fixed typo
2016-09-20 11:20:43 -07:00
Fabien Potencier 2486ea6699 bug #2129 changed the way we store template source in template classes (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

changed the way we store template source in template classes

In #1807 and #1813, we added a way to get the original template source code from a template. This PR greatly simplifies the approach by removing all the black magic :)

This should also fix #2011

ping @nicolas-grekas

Commits
-------

b55d907 changed the way we store template source in template classes
2016-09-20 11:14:37 -07:00
Fabien Potencier b55d907c94 changed the way we store template source in template classes 2016-09-20 10:55:24 -07:00
Fabien Potencier 746a8044fc bug #2132 added missing method on Twig_Template (important for reserved keyword) (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

added missing method on Twig_Template (important for reserved keyword)

Commits
-------

b1f77a4 added missing method on Twig_Template (important for reserved keyword)
2016-09-20 10:54:18 -07:00
Fabien Potencier 78171b0833 minor #2131 fixed a phpdoc (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed a phpdoc

Commits
-------

9c08db0 fixed a phpdoc
2016-09-20 10:53:28 -07:00
Fabien Potencier b1f77a4433 added missing method on Twig_Template (important for reserved keyword) 2016-09-20 10:50:41 -07:00
Fabien Potencier 9c08db0134 fixed a phpdoc 2016-09-20 10:49:30 -07:00
Fabien Potencier 7df1e2f011 bug #2127 removed usage of realpath in cache key (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

removed usage of realpath in cache key

closes #1994

Commits
-------

6f0e3ed removed usage of realpath in cache key
2016-09-20 10:31:38 -07:00
Fabien Potencier 6f0e3edbc5 removed usage of realpath in cache key 2016-09-20 10:26:50 -07:00
Fabien Potencier 2fec9d4c8e bug #2125 fixed Twig cache sharing when used with different versions of PHP (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed Twig cache sharing when used with different versions of PHP

closes #2013

Commits
-------

ecd020d fixed Twig cache sharing when used with different versions of PHP
2016-09-20 10:25:50 -07:00
Fabien Potencier ecd020da9f fixed Twig cache sharing when used with different versions of PHP 2016-09-20 10:24:42 -07:00
Fabien Potencier 03dd9c5e51 fixed CS 2016-09-19 22:07:57 -07:00
Fabien Potencier 26deac3c9b minor #2126 fixed a test (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed a test

While working on #1994, I realize that tests added for #1598 were not useful anymore because of the changes made in #1686. This PR fixes that.

Commits
-------

85fb2a1 fixed a test
2016-09-19 20:37:44 -07:00
Fabien Potencier 85fb2a1f45 fixed a test 2016-09-19 18:26:28 -07:00
Fabien Potencier f61bc838a9 fixed typo 2016-09-19 17:25:59 -07:00
Fabien Potencier 0da2dd4eba bug #2124 fixed embed parent token for simple use cases (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

fixed embed parent token for simple use cases

Not the most elegant solution but solves the problem for when `embed` is used on a non-dynamic template, which should cover almost all use cases.

Commits
-------

a048985 fixed embed parent token for simple use cases
a9082dd fixed typo
2016-09-19 16:40:38 -07:00
Fabien Potencier a0489854ba fixed embed parent token for simple use cases 2016-09-19 16:37:28 -07:00
Fabien Potencier a9082dd29f fixed typo 2016-09-19 16:27:34 -07:00
Fabien Potencier d31008b5cd changed deprecation to an exception 2016-09-19 14:12:05 -07:00
Fabien Potencier 42c993adb5 Merge branch '1.x'
* 1.x:
  enforced Node:: to only contain node instances
2016-09-19 14:00:39 -07:00
Fabien Potencier 75482cf757 feature #2123 deprecated the ability to store non Node instances in Node::$nodes (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

deprecated the ability to store non Node instances in Node::$nodes

Commits
-------

03f18b4 enforced Node:: to only contain node instances
2016-09-19 13:56:49 -07:00
Fabien Potencier 03f18b44f4 enforced Node:: to only contain node instances 2016-09-19 13:32:58 -07:00
Fabien Potencier e2973eef40 Merge branch '1.x'
* 1.x:
  changed the way we store node filenames
2016-09-19 12:13:02 -07:00
Fabien Potencier 6e25c3f143 bug #2122 changed the way we store node filenames (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

changed the way we store node filenames

Commits
-------

4c4657a changed the way we store node filenames
2016-09-19 12:12:12 -07:00
Fabien Potencier 4c4657a764 changed the way we store node filenames 2016-09-19 12:06:19 -07:00
Fabien Potencier 5e3956e0ed feature #1974 refactored extensions management (fabpot)
This PR was merged into the 2.0-dev branch.

Discussion
----------

refactored extensions management

Commits
-------

8b7698f refactored extensions management
2016-09-18 19:34:50 -07:00
Fabien Potencier 8b7698f8ff refactored extensions management 2016-09-18 19:28:32 -07:00
Fabien Potencier 0ffe4f5417 fixed CHANGELOG 2016-09-18 19:17:48 -07:00
Fabien Potencier e82e447194 removed deprecated methods 2016-09-18 19:09:42 -07:00
Fabien Potencier dd44dd0b67 Merge branch '1.x'
* 1.x:
  fixed version
  deprecated some more methods on Twig_Environment
  deprecated Twig_Compiler::getFilename()
2016-09-18 19:07:38 -07:00
Fabien Potencier 4735c4fe8f fixed version 2016-09-18 19:04:04 -07:00
Fabien Potencier ccb7981e5a feature #2119 deprecated some more methods on Twig_Environment (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

deprecated some more methods on Twig_Environment

These methods are sometimes misused (#2020) when called from a template context (Twig_Template::getEnv() has been deprecated as well, but #2106 might re-introduce it).

Anyway, Twig_Environment should not act as a container, so, being able to change the defaults make sense, but retrieving them probably not.

Commits
-------

e548cbe deprecated some more methods on Twig_Environment
2016-09-18 19:03:09 -07:00
Fabien Potencier f38f6bf72d feature #2118 deprecated Twig_Compiler::getFilename() (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

deprecated Twig_Compiler::getFilename()

Using `Twig_Compiler::getFilename()` is very fragile as depending on when it is called, the returned value can be very different (depending on template compilation that can have occurred in between).

see #2020 for such a wrong usage.

Commits
-------

1f41e9f deprecated Twig_Compiler::getFilename()
2016-09-18 19:02:15 -07:00
Fabien Potencier 620613ced8 Merge branch '1.x'
* 1.x: (23 commits)
  changed a test to make it more robust
  bumped version to 1.24.3-DEV
  prepared the 1.24.2 release
  updated CHANGELOG
  Floor - use cast and not intval
  fixed CS
  Do not mix indention levels
  fixed typo
  Add Visual Studio Code to the list of IDE integrations
  Fixed all deprecation notices by using
  [Doc] Fixed small error in code example
  Update macro.rst
  Update use.rst
  Fix exception message for static method and object without req. params.
  add named macro end-tag documentation
  fixed CS
  Fix load cache
  Minor rst syntax tweaks
  Reset blocks also in doLeaveNode
  fix a case where the autoescaping does not work as expected
  ...
2016-09-18 18:58:25 -07:00
Fabien Potencier 3285e4231d minor #2117 changed a test to make it more robust (fabpot)
This PR was merged into the 1.x branch.

Discussion
----------

changed a test to make it more robust

Commits
-------

ec7a1c1 changed a test to make it more robust
2016-09-18 18:44:16 -07:00
Fabien Potencier e548cbe3a4 deprecated some more methods on Twig_Environment 2016-09-18 18:40:16 -07:00
Fabien Potencier 1f41e9f9e1 deprecated Twig_Compiler::getFilename() 2016-09-18 18:37:52 -07:00
Fabien Potencier ec7a1c1856 changed a test to make it more robust 2016-09-18 18:37:13 -07:00
Fabien Potencier c418d07c64 bumped version to 1.24.3-DEV 2016-09-01 10:55:16 -07:00
Fabien Potencier 33093f6e31 prepared the 1.24.2 release v1.24.2 2016-09-01 10:50:53 -07:00
Fabien Potencier dbe9171cb9 updated CHANGELOG 2016-09-01 10:50:22 -07:00
Fabien Potencier 50b1b87d2f minor #2105 Floor - use cast and not intval (SpacePossum)
This PR was squashed before being merged into the 1.x branch (closes #2105).

Discussion
----------

Floor - use cast and not intval

Use cast in fav. of the `inval`, because;
- its faster
- cannot be overloaded
- less chars

Commits
-------

39d46ac Floor - use cast and not intval
2016-08-31 11:41:07 -07:00
SpacePossum 39d46acf7d Floor - use cast and not intval 2016-08-31 11:41:06 -07:00
Fabien Potencier 1f831ae9ba minor #2099 parenthesis typo (shakealot)
This PR was merged into the 2.0-dev branch.

Discussion
----------

parenthesis typo

Commits
-------

6d11813 parenthesis typo
2016-08-25 10:56:11 -07:00
shakealot 6d11813350 parenthesis typo 2016-08-25 11:39:08 +02:00
Fabien Potencier ffa2b812b0 fixed CS 2016-08-17 17:09:08 -07:00
Fabien Potencier d726bde293 bug #2054 Fix static callable. (SpacePossum)
This PR was merged into the 1.x branch.

Discussion
----------

Fix static callable.

fixes https://github.com/twigphp/Twig/issues/2053

Commits
-------

8f6fd57 Fix exception message for static method and object without req. params.
2016-08-17 17:08:36 -07:00
Fabien Potencier 21039777d8 minor #2062 [DOC] add named macro end-tag documentation (JakeFr)
This PR was merged into the 1.x branch.

Discussion
----------

[DOC] add named macro end-tag documentation

Hello!
Just discover endmacro tag supports name, just like block.
But it is not mentionned in the doc.
So here's a PR

Commits
-------

dcc5f45 add named macro end-tag documentation
2016-08-15 10:25:09 -07:00
Fabien Potencier 13b35b8380 minor #2090 Do not mix indention levels (greg0ire)
This PR was submitted for the master branch but it was merged into the 1.x branch instead (closes #2090).

Discussion
----------

Do not mix indention levels

Not sure if this was intentional, but the "if" line had an indention of 3 spaces,
while the "true" line has an indention of 4 spaces.

Commits
-------

507f697 Do not mix indention levels
2016-08-15 10:21:29 -07:00
Grégoire Paris 507f697ad0 Do not mix indention levels
Not sure if this was intentional, but the "if" line had an indention of 3 spaces,
while the "true" line has an indention of 4 spaces.
2016-08-15 10:21:29 -07:00