geckon01/Twig
1
0
Fork 0
mirror of https://github.com/twigphp/Twig.git synced 2026-09-18 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,681 Commits 16 Branches 274 Tags
dce7bd9e143a1b7b2fe59092b623187cff64eee4
Commit Graph

4681 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabien Potencier dce7bd9e14 Merge branch '2.x' into 3.x 
* 2.x:
  macros imported "globally" in a template are now available in macros without re-importing them
  added more tests
  added some tests
 2019-05-17 14:16:15 +02:00
Fabien Potencier f6855c6182 feature #3012 Macros imported "globally" in a template are now available in macros without re-importing them (fabpot) 
This PR was merged into the 2.x branch.

Discussion
----------

Macros imported "globally" in a template are now available in macros without re-importing them

closes #1790, closes #1052, closes #2414, closes #2442

Commits
-------

e1381640 macros imported "globally" in a template are now available in macros without re-importing them
 2019-05-17 14:15:30 +02:00
Fabien Potencier e138164015 macros imported "globally" in a template are now available in macros without re-importing them 2019-05-17 13:03:55 +02:00
Fabien Potencier cd49c5d44b added more tests 2019-05-17 11:15:47 +02:00
Fabien Potencier 8a9308c268 Merge branch '1.x' into 2.x 
* 1.x:
  added some tests
 2019-05-17 09:44:35 +02:00
Fabien Potencier f74ce7190a added some tests 2019-05-17 08:38:57 +02:00
Fabien Potencier 65722d52b4 Merge branch '2.x' into 3.x 
* 2.x:
  bumped version to 2.11
  bumped version to 1.42
 2019-05-17 08:24:14 +02:00
Fabien Potencier 3d1e5f6493 bumped version to 2.11 2019-05-17 08:23:38 +02:00
Fabien Potencier 26b21cc24c Merge branch '1.x' into 2.x 
* 1.x:
  bumped version to 1.42
 2019-05-17 08:23:11 +02:00
Fabien Potencier 0f5a056968 bumped version to 1.42 2019-05-17 08:22:23 +02:00
Fabien Potencier b2fc808c1d Merge branch '2.x' into 3.x 
* 2.x:
  fixed typo
  fixed tests
  fixed a PHP fatal error when calling a macro imported in the template in a nested block
  fixed typo
  added some tests
  fixed a regression
 2019-05-17 08:14:55 +02:00
Fabien Potencier c8d2cc3ae5 Merge branch '1.x' into 2.x 
* 1.x:
  fixed typo
 2019-05-17 08:14:40 +02:00
Fabien Potencier b086d4f4bb fixed typo 2019-05-17 08:14:31 +02:00
Fabien Potencier a571638929 fixed tests 2019-05-17 08:14:18 +02:00
Fabien Potencier e9a09d90c3 Merge branch '1.x' into 2.x 
* 1.x:
  fixed a PHP fatal error when calling a macro imported in the template in a nested block
 2019-05-17 08:09:05 +02:00
Fabien Potencier 62748c9559 bug #3013 Fix a PHP fatal error when calling a macro imported in the template in a nested block (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix a PHP fatal error when calling a macro imported in the template in a nested block

Commits
-------

11353ce3 fixed a PHP fatal error when calling a macro imported in the template in a nested block
 2019-05-17 08:08:49 +02:00
Fabien Potencier 11353ce3a7 fixed a PHP fatal error when calling a macro imported in the template in a nested block 2019-05-17 08:04:06 +02:00
Fabien Potencier bb01eb1c9c Merge branch '1.x' into 2.x 
* 1.x:
  fixed typo
 2019-05-16 21:07:33 +02:00
Fabien Potencier 8c80142ba3 fixed typo 2019-05-16 21:07:25 +02:00
Fabien Potencier 4e1c3b8a7c Merge branch '1.x' into 2.x 
* 1.x:
  added some tests
 2019-05-16 21:02:31 +02:00
Fabien Potencier 6b341104ec added some tests 2019-05-16 21:02:14 +02:00
Fabien Potencier 73326f0ddc Merge branch '1.x' into 2.x 
* 1.x:
  fixed a regression
 2019-05-16 20:18:06 +02:00
Fabien Potencier bd1f9eb39b bug #3011 Fix a regression (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix a regression

Commits
-------

3c7602b9 fixed a regression
 2019-05-16 20:17:10 +02:00
Fabien Potencier 3c7602b9da fixed a regression 2019-05-16 19:44:44 +02:00
Fabien Potencier 3c0f3d21b9 Merge branch '2.x' into 3.x 
* 2.x:
  made code more readable
 2019-05-16 16:32:02 +02:00
Fabien Potencier e671f267ce Merge branch '1.x' into 2.x 
* 1.x:
  made code more readable
 2019-05-16 16:31:36 +02:00
Fabien Potencier 06670f3630 made code more readable 2019-05-16 16:30:26 +02:00
Fabien Potencier 50f8df7fc7 Merge branch '2.x' into 3.x 
* 2.x:
  tweaked the error message when using extends in a block/macro
 2019-05-16 16:17:01 +02:00
Fabien Potencier ad1d08a431 Merge branch '1.x' into 2.x 
* 1.x:
  tweaked the error message when using extends in a block/macro
 2019-05-16 16:16:50 +02:00
Fabien Potencier 0968176a05 bug #3010 Tweak the error message when using extends in a block/macro (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Tweak the error message when using extends in a block/macro

Commits
-------

70c1b3a2 tweaked the error message when using extends in a block/macro
 2019-05-16 16:16:26 +02:00
Fabien Potencier 70c1b3a2c2 tweaked the error message when using extends in a block/macro 2019-05-16 16:07:04 +02:00
Fabien Potencier 2e8354bdee Merge branch '2.x' into 3.x 
* 2.x:
  simplified code
  fixed a PHP fatal error when calling a macro, imported in the template, in another macro
 2019-05-16 14:16:52 +02:00
Fabien Potencier b0f29468f0 simplified code 2019-05-16 14:16:39 +02:00
Fabien Potencier 10d1145ef6 Merge branch '1.x' into 2.x 
* 1.x:
  fixed a PHP fatal error when calling a macro, imported in the template, in another macro
 2019-05-16 14:16:01 +02:00
Fabien Potencier 6315ea4786 bug #3009 Fix a PHP fatal error when calling a macro, imported in the template, in another macro (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix a PHP fatal error when calling a macro, imported in the template, in another macro

The current code iterates over all imported functions (traversing all the scopes). So, the macro was found at compilation time, but didn't work at runtime, leading to a PHP fatal error. Now, you get a proper exception at compilation time.

Commits
-------

ba9b9681 fixed a PHP fatal error when calling a macro, imported in the template, in another macro
 2019-05-16 14:15:37 +02:00
Fabien Potencier ba9b9681ca fixed a PHP fatal error when calling a macro, imported in the template, in another macro 2019-05-16 14:09:44 +02:00
Fabien Potencier 6e6719605b Merge branch '2.x' into 3.x 
* 2.x:
  tweaked error messages
  fixed wrong error message on "import" and "from"
  bumped version to 2.10.1-DEV
  prepared the 2.10.0 release
  bumped version to 1.41.1-DEV
  prepared the 1.41.0 release
  Correct Twig_SimpleFilter/Twig_SimpleFunction/Twig_SimpleTest deprecation doc (Revert: moved to namespaced classes by default)
  fixed PHP 7.4 support
 2019-05-16 11:43:04 +02:00
Fabien Potencier b5ad4c36cf Merge branch '1.x' into 2.x 
* 1.x:
  tweaked error messages
  fixed wrong error message on "import" and "from"
  bumped version to 1.41.1-DEV
  prepared the 1.41.0 release
 2019-05-16 11:42:35 +02:00
Fabien Potencier 0747f226f7 minor #3008 Tweak an error message (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Tweak an error message

Commits
-------

19164de7 tweaked error messages
 2019-05-16 11:37:12 +02:00
Fabien Potencier 19164de77b tweaked error messages 2019-05-16 11:32:52 +02:00
Fabien Potencier f81a1523c0 bug #3007 Fix wrong error message on "import" and "from" (fabpot) 
This PR was merged into the 1.x branch.

Discussion
----------

Fix wrong error message on "import" and "from"

Commits
-------

118462c1 fixed wrong error message on "import" and "from"
 2019-05-16 11:28:20 +02:00
Fabien Potencier 118462c16d fixed wrong error message on "import" and "from" 2019-05-16 11:17:43 +02:00
Fabien Potencier f597addf79 bumped version to 2.10.1-DEV 2019-05-14 14:04:22 +02:00
Fabien Potencier 5240e21982 prepared the 2.10.0 release v2.10.0 2019-05-14 14:03:52 +02:00
Fabien Potencier b03f07e961 bumped version to 1.41.1-DEV 2019-05-14 13:59:47 +02:00
Fabien Potencier 575cd50283 prepared the 1.41.0 release v1.41.0 2019-05-14 13:59:08 +02:00
Fabien Potencier c304a3dded Merge branch '1.x' into 2.x 
* 1.x:
  Correct Twig_SimpleFilter/Twig_SimpleFunction/Twig_SimpleTest deprecation doc (Revert: moved to namespaced classes by default)
  fixed PHP 7.4 support
 2019-05-14 13:48:42 +02:00
Fabien Potencier a77e7f8f63 minor #3001 Correct Twig_SimpleFilter, Twig_SimpleFunction, Twig_SimpleTest deprecation doc (blankse) 
This PR was merged into the 1.x branch.

Discussion
----------

Correct Twig_SimpleFilter, Twig_SimpleFunction, Twig_SimpleTest deprecation doc

Reverts https://github.com/twigphp/Twig/commit/3632a46e82fbb391b0fc72674bd8946e0b7c5bf7 for deprecated.rst

Commits
-------

65047482 Correct Twig_SimpleFilter/Twig_SimpleFunction/Twig_SimpleTest deprecation doc (Revert: moved to namespaced classes by default)
 2019-05-14 13:41:12 +02:00
Sebastian Blank 65047482be Correct Twig_SimpleFilter/Twig_SimpleFunction/Twig_SimpleTest deprecation doc (Revert: moved to namespaced classes by default) 2019-05-14 12:17:20 +02:00
Fabien Potencier 44f02b2242 fixed PHP 7.4 support 2019-05-14 11:44:36 +02:00