geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-10-20 02:35:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,435 Commits 25 Branches 275 Tags
fa6f7bb5e20c61dad002f2d07fef8da7aa01bf32
Commit Graph

4435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier fa6f7bb5e2 Merge branch '1.x' into 2.x 
* 1.x:
  fixed Lexer when using custom options containing the # char
  fix major version constant
 2019-04-21 21:41:27 +02:00
Fabien Potencier 442aa216d6 bug #2949 Fix Lexer when using custom options containing the # char (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix Lexer when using custom options containing the # char

closes #2948

Commits
-------

7b5851fe fixed Lexer when using custom options containing the # char
 2019-04-21 21:40:56 +02:00
Fabien Potencier 7b5851feeb fixed Lexer when using custom options containing the # char 2019-04-21 21:05:06 +02:00
Fabien Potencier 5c66e8d0d3 minor #2945 fix major version constant (xabbuh) 
This PR was merged into the 1.x branch.

Discussion
----------

fix major version constant

Commits
-------

57b0a8b9 fix major version constant
 2019-04-18 12:30:56 +02:00
Christian Flothmann 57b0a8b935 fix major version constant 2019-04-18 09:50:46 +02:00
Fabien Potencier bc23e516ce feature #2944 Add template line number to twig_get_attribute() (fabpot) 
This PR was squashed before being merged into the 2.x branch (closes #2944).

Discussion
----------

Add template line number to twig_get_attribute()

Commits
-------

96e2432d added template line number to sandbox security check calls
f37212b0 added template line number to twig_get_attribute()
 2019-04-17 09:12:40 +02:00
Fabien Potencier 96e2432d1f added template line number to sandbox security check calls 2019-04-17 08:53:56 +02:00
Fabien Potencier f37212b022 added template line number to twig_get_attribute() 2019-04-16 22:24:37 +02:00
Fabien Potencier 2973358b15 Merge branch '1.x' into 2.x 
* 1.x:
  fixed phpdoc
  fixed tpyo
  bumped version to 1.39.2-DEV
  prepared the 1.39.1 release
 2019-04-16 21:17:07 +02:00
Fabien Potencier f54b53af03 fixed phpdoc 2019-04-16 21:16:04 +02:00
Fabien Potencier ada496f3a5 removed obsolete code 2019-04-16 20:46:34 +02:00
Fabien Potencier c9f3cb8d9f fixed typo 2019-04-16 19:22:01 +02:00
Fabien Potencier 7dcd04c83a fixed tpyo 2019-04-16 19:18:48 +02:00
Fabien Potencier ca07526840 bumped version to 2.8.2-DEV 2019-04-16 19:15:29 +02:00
Fabien Potencier 91cc2594d3 prepared the 2.8.1 release v2.8.1 2019-04-16 19:14:24 +02:00
Fabien Potencier c470d13d0e bumped version to 1.39.2-DEV 2019-04-16 19:13:45 +02:00
Fabien Potencier 23e7b6f0cf prepared the 1.39.1 release v1.39.1 2019-04-16 19:12:57 +02:00
Fabien Potencier d7d521e4ca updated CHANGELOG 2019-04-16 19:10:43 +02:00
Fabien Potencier 3d13c582ee Merge branch '1.x' into 2.x 
* 1.x:
  fixed EscaperNodeVisitor
  fixed CS
 2019-04-16 19:10:25 +02:00
Fabien Potencier bcb367fc07 bug #2943 Hotfix (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Hotfix

closes #2942

Commits
-------

a3fc6392 fixed EscaperNodeVisitor
 2019-04-16 19:09:47 +02:00
Fabien Potencier a3fc63923a fixed EscaperNodeVisitor 2019-04-16 19:05:39 +02:00
Fabien Potencier 3f177464cc fixed CS 2019-04-16 19:00:14 +02:00
Fabien Potencier ee6ef99d7b feature #2941 Deprecate the 3rd argument of Sandbox error classes (fabpot) 
This PR was squashed before being merged into the 2.x branch (closes #2941).

Discussion
----------

Deprecate the 3rd argument of Sandbox error classes

Commits
-------

a165ce67 added the source for all sandbox security exceptions
d8cb0f97 deprecated the 3rd argument of Sandbox error classes
 2019-04-16 18:49:55 +02:00
Fabien Potencier a165ce67d4 added the source for all sandbox security exceptions 2019-04-16 18:43:11 +02:00
Fabien Potencier d8cb0f9764 deprecated the 3rd argument of Sandbox error classes 2019-04-16 18:43:11 +02:00
Fabien Potencier 1119616c20 fixed CS 2019-04-16 18:42:58 +02:00
Fabien Potencier 6b1a1baaff fixed phpdoc 2019-04-16 18:42:27 +02:00
Fabien Potencier a43bf24f9d feature #2940 Deprecate passing a 4th and 5th arguments to the Sandbox exception classes (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Deprecate passing a 4th and 5th arguments to the Sandbox exception classes

Commits
-------

5312086b deprecated passing a 4th and 5th arguments to the Sandbox exception classes
 2019-04-16 18:16:04 +02:00
Fabien Potencier 5312086b2d deprecated passing a 4th and 5th arguments to the Sandbox exception classes 2019-04-16 18:13:03 +02:00
Fabien Potencier d15d794edf fixed bad merge 2019-04-16 17:49:34 +02:00
Fabien Potencier a90d984587 Merge branch '1.x' into 2.x 
* 1.x:
  fixed various small bugs
  bumped version to 1.39.1-DEV
  prepared the 1.39.0 release
 2019-04-16 17:41:34 +02:00
Fabien Potencier 072c628620 minor #2939 Fix various small bugs (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix various small bugs

Commits
-------

d2cd4d9c fixed various small bugs
 2019-04-16 17:39:42 +02:00
Fabien Potencier d2cd4d9cfa fixed various small bugs 2019-04-16 17:33:43 +02:00
Fabien Potencier 21a15a505f feature #2937 Deprecate Node::setTemplateName() (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Deprecate Node::setTemplateName()

Commits
-------

71bc632a deprecated Node::setTemplateName()
 2019-04-16 17:09:07 +02:00
Fabien Potencier 71bc632ab2 deprecated Node::setTemplateName() 2019-04-16 14:41:14 +02:00
Fabien Potencier 330b524733 bumped version to 2.8.1-DEV 2019-04-16 14:36:57 +02:00
Fabien Potencier 26517b0e87 prepared the 2.8.0 release v2.8.0 2019-04-16 14:36:25 +02:00
Fabien Potencier f8b076b949 bumped version to 1.39.1-DEV 2019-04-16 14:35:41 +02:00
Fabien Potencier 44890db076 prepared the 1.39.0 release v1.39.0 2019-04-16 14:35:10 +02:00
Fabien Potencier 552d1623ab updated CHANGELOG 2019-04-16 07:48:14 +02:00
Fabien Potencier c05cdddb36 Merge branch '1.x' into 2.x 
* 1.x:
  updated CHANGELOG
 2019-04-16 07:47:52 +02:00
Fabien Potencier 1f82f22899 updated CHANGELOG 2019-04-16 07:47:43 +02:00
Fabien Potencier 5e3747f769 Merge branch '1.x' into 2.x 
* 1.x:
  fixed compat with NodeInterface
 2019-04-12 12:40:40 +02:00
Fabien Potencier baec10e850 bug #2936 Fix compat with NodeInterface (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix compat with NodeInterface

/cc @stof

Commits
-------

701d8af6 fixed compat with NodeInterface
 2019-04-12 12:40:04 +02:00
Fabien Potencier 701d8af675 fixed compat with NodeInterface 2019-04-12 12:39:38 +02:00
Fabien Potencier c576797ebc simplified code 2019-04-12 12:19:21 +02:00
Fabien Potencier a6dd76d5a0 Merge branch '1.x' into 2.x 
* 1.x:
  fixed CS
 2019-04-12 12:18:52 +02:00
Fabien Potencier 243024d4e8 fixed CS 2019-04-12 12:16:59 +02:00
Fabien Potencier 95b8ac3501 fixed bad merge 2019-04-12 12:16:31 +02:00
Fabien Potencier 1c80fa7205 Merge branch '1.x' into 2.x 
* 1.x:
  added more tests
  added missing hints in some runtime exceptions
 2019-04-12 12:08:49 +02:00